Update app.py

app.py

@@ -67,7 +67,7 @@ COUNTRIES = {
     'Wallis and Futuna': 'countryWF', 'Western Sahara': 'countryEH', 'Yemen': 'countryYE', 'Zambia': 'countryZM', 'Zimbabwe': 'countryZW'
 }
 
-def search_news(keyword, country):
+def search_news(keyword, country, search_all_countries=False):
     # 24시간 전 날짜 계산
     one_day_ago = (datetime.now() - timedelta(days=1)).strftime("%Y-%m-%d")
 
@@ -80,11 +80,11 @@ def search_news(keyword, country):
         'dateRestrict': 'd1',  # 최근 1일 내 결과만
         'lr': 'lang_en',  # 영어 결과만
         'sort': 'date',  # 날짜순 정렬
-        'num': 10,  # 최대 10개 결과
+        'num': 100,  # 최대 100개 결과
         'siteSearch': 'news.google.com',  # Google News로 제한
     }
 
-    if country != 'All Countries':
+    if not search_all_countries and country != 'All Countries':
         params['cr'] = COUNTRIES[country]
 
     # API 요청
@@ -105,16 +105,46 @@ def search_news(keyword, country):
 
     return formatted_results
 
+def search_all_countries(keyword):
+    def search_country(country_name):
+        result = search_news(keyword, country_name)
+        if "No news found" not in result:
+            return country_name, result
+        return None
+
+    with concurrent.futures.ThreadPoolExecutor(max_workers=20) as executor:
+        future_to_country = {executor.submit(search_country, country): country for country in COUNTRIES.keys()}
+        matching_countries = []
+        for future in concurrent.futures.as_completed(future_to_country):
+            result = future.result()
+            if result:
+                matching_countries.append(result)
+
+    if matching_countries:
+        output = "<h2>Countries with matching news:</h2>"
+        for country, news in matching_countries:
+            output += f"<h3>{country}</h3>{news}<hr>"
+        return output
+    else:
+        return f"No news found for '{keyword}' in any country within the last 24 hours."
+
+def news_search(keyword, country, search_all):
+    if search_all:
+        return search_all_countries(keyword)
+    else:
+        return search_news(keyword, country)
+
 # Gradio 인터페이스 생성
 iface = gr.Interface(
-    fn=search_news,
+    fn=news_search,
     inputs=[
         gr.Textbox(label="Enter keyword (in English)"),
-        gr.Dropdown(choices=['All Countries'] + list(COUNTRIES.keys()), label="Select Country")
+        gr.Dropdown(choices=['All Countries'] + list(COUNTRIES.keys()), label="Select Country"),
+        gr.Checkbox(label="Search all countries")
     ],
     outputs=gr.HTML(),
     title="Google News Search",
-    description="Search for news articles from the last 24 hours using Google Custom Search API."
+    description="Search for news articles from the last 24 hours using Google Custom Search API. You can search in a specific country or across all countries."
 )
 
 # 애플리케이션 실행