Update app.py

app.py

@@ -8,19 +8,16 @@ import json
 API_KEY = "37d83e266422487b8b2e4cb6e1ff0aa6"
 
 
+
 COUNTRY_CODES = "ae ar at au be bg br ca ch cn co cu cz de eg fr gb gr hk hu id ie il in it jp kr lt lv ma mx my ng nl no nz ph pl pt ro rs ru sa se sg si sk th tr tw ua us ve za".split()
 
 COUNTRIES = {'all': 'All Countries'}
 COUNTRIES.update({code: pycountry.countries.get(alpha_2=code.upper()).name for code in COUNTRY_CODES if pycountry.countries.get(alpha_2=code.upper())})
 
 def get_related_keywords(keyword):
-    # 간단한 관련 키워드 생성 로직 (실제로는 더 복잡한 알고리즘이나 API를 사용할 수 있습니다)
     return [f"{keyword} news", f"{keyword} technology", f"{keyword} company", f"latest {keyword}"]
 
-def get_news(keyword, article_count, country, extend_search=False, search_all_countries=False):
-    if search_all_countries:
-        country = 'All Countries'
-    
+def get_news(keyword, article_count, country):
     country_code = next((code for code, name in COUNTRIES.items() if name == country), 'all')
     
     if country_code == 'all':
@@ -41,9 +38,8 @@ def get_news(keyword, article_count, country, extend_search=False, search_all_co
             'pageSize': article_count
         }
     
-    if not extend_search:
-        two_days_ago = (datetime.utcnow() - timedelta(hours=48)).isoformat()
-        params['from'] = two_days_ago
+    two_days_ago = (datetime.utcnow() - timedelta(hours=48)).isoformat()
+    params['from'] = two_days_ago
 
     debug_info = f"API Request URL: {base_url}\n"
     debug_info += f"Parameters: {json.dumps(params, indent=2)}\n\n"
@@ -66,10 +62,9 @@ def get_news(keyword, article_count, country, extend_search=False, search_all_co
     articles = news_data['articles']
     
     if not articles:
-        if not extend_search:
-            return get_news(keyword, article_count, country, extend_search=True)
-        elif not search_all_countries and country != 'All Countries':
-            return get_news(keyword, article_count, 'All Countries', extend_search=True, search_all_countries=True)
+        if country_code != 'all':
+            # 특정 국가에서 결과가 없을 경우, 전체 국가에서 검색
+            return get_news(keyword, article_count, 'All Countries')
         else:
             related_keywords = get_related_keywords(keyword)
             suggestions = (f"<p>No news found for the keyword '<strong>{keyword}</strong>' in {country}.</p>"
@@ -82,10 +77,10 @@ def get_news(keyword, article_count, country, extend_search=False, search_all_co
             return suggestions + f"<pre>{debug_info}</pre>"
 
     html_output = f"<h2>News results for '{keyword}' in {country}</h2>"
-    if extend_search:
-        html_output += "<p><em>Note: Search range was extended due to limited recent results.</em></p>"
-    if search_all_countries:
-        html_output += "<p><em>Note: Search was expanded to all countries due to limited results in the specified country.</em></p>"
+    if country_code == 'all':
+        html_output += "<p><em>Showing results from all countries</em></p>"
+    else:
+        html_output += f"<p><em>Showing results specifically for {country}</em></p>"
     
     for article in articles:
         title = article['title']
@@ -115,7 +110,7 @@ iface = gr.Interface(
     ],
     outputs=gr.HTML(),
     title="Advanced Visual News Search",
-    description="Search for news articles using NewsAPI. The search will automatically extend if results are limited.",
+    description="Search for news articles using NewsAPI. Results will be specific to the selected country when applicable.",
     theme=gr.themes.Soft()
 )