Update app.py

app.py

@@ -2,114 +2,72 @@ import gradio as gr
 import requests
 from datetime import datetime, timedelta
 import json
-
+from functools import lru_cache
 
 # Google Custom Search API 키와 검색 엔진 ID
 API_KEY = "AIzaSyB8wNdEL8-SAvelRq-zenLLU-cUEmsj7uE"
 SEARCH_ENGINE_ID = "c01abc75e1b95483d"
 
-
-# 지원되는 국가 리스트 (Google Custom Search API에서 지원하는 모든 국가)
+# 지원되는 국가 리스트
 COUNTRIES = {
-    'Afghanistan': 'countryAF', 'Albania': 'countryAL', 'Algeria': 'countryDZ', 'American Samoa': 'countryAS', 
-    'Andorra': 'countryAD', 'Angola': 'countryAO', 'Anguilla': 'countryAI', 'Antarctica': 'countryAQ', 
-    'Antigua and Barbuda': 'countryAG', 'Argentina': 'countryAR', 'Armenia': 'countryAM', 'Aruba': 'countryAW', 
-    'Australia': 'countryAU', 'Austria': 'countryAT', 'Azerbaijan': 'countryAZ', 'Bahamas': 'countryBS', 
-    'Bahrain': 'countryBH', 'Bangladesh': 'countryBD', 'Barbados': 'countryBB', 'Belarus': 'countryBY', 
-    'Belgium': 'countryBE', 'Belize': 'countryBZ', 'Benin': 'countryBJ', 'Bermuda': 'countryBM', 
-    'Bhutan': 'countryBT', 'Bolivia': 'countryBO', 'Bosnia and Herzegovina': 'countryBA', 'Botswana': 'countryBW', 
-    'Bouvet Island': 'countryBV', 'Brazil': 'countryBR', 'British Indian Ocean Territory': 'countryIO', 
-    'Brunei Darussalam': 'countryBN', 'Bulgaria': 'countryBG', 'Burkina Faso': 'countryBF', 'Burundi': 'countryBI', 
-    'Cambodia': 'countryKH', 'Cameroon': 'countryCM', 'Canada': 'countryCA', 'Cape Verde': 'countryCV', 
-    'Cayman Islands': 'countryKY', 'Central African Republic': 'countryCF', 'Chad': 'countryTD', 'Chile': 'countryCL', 
-    'China': 'countryCN', 'Christmas Island': 'countryCX', 'Cocos (Keeling) Islands': 'countryCC', 'Colombia': 'countryCO', 
-    'Comoros': 'countryKM', 'Congo': 'countryCG', 'Congo, Democratic Republic': 'countryCD', 'Cook Islands': 'countryCK', 
-    'Costa Rica': 'countryCR', "Cote D'Ivoire": 'countryCI', 'Croatia': 'countryHR', 'Cuba': 'countryCU', 'Cyprus': 'countryCY', 
-    'Czech Republic': 'countryCZ', 'Denmark': 'countryDK', 'Djibouti': 'countryDJ', 'Dominica': 'countryDM', 
-    'Dominican Republic': 'countryDO', 'Ecuador': 'countryEC', 'Egypt': 'countryEG', 'El Salvador': 'countrySV', 
-    'Equatorial Guinea': 'countryGQ', 'Eritrea': 'countryER', 'Estonia': 'countryEE', 'Ethiopia': 'countryET', 
-    'Falkland Islands (Malvinas)': 'countryFK', 'Faroe Islands': 'countryFO', 'Fiji': 'countryFJ', 'Finland': 'countryFI', 
-    'France': 'countryFR', 'French Guiana': 'countryGF', 'French Polynesia': 'countryPF', 'French Southern Territories': 'countryTF', 
-    'Gabon': 'countryGA', 'Gambia': 'countryGM', 'Georgia': 'countryGE', 'Germany': 'countryDE', 'Ghana': 'countryGH', 
-    'Gibraltar': 'countryGI', 'Greece': 'countryGR', 'Greenland': 'countryGL', 'Grenada': 'countryGD', 'Guadeloupe': 'countryGP', 
-    'Guam': 'countryGU', 'Guatemala': 'countryGT', 'Guinea': 'countryGN', 'Guinea-Bissau': 'countryGW', 'Guyana': 'countryGY', 
-    'Haiti': 'countryHT', 'Heard Island and Mcdonald Islands': 'countryHM', 'Holy See (Vatican City State)': 'countryVA', 
-    'Honduras': 'countryHN', 'Hong Kong': 'countryHK', 'Hungary': 'countryHU', 'Iceland': 'countryIS', 'India': 'countryIN', 
-    'Indonesia': 'countryID', 'Iran, Islamic Republic of': 'countryIR', 'Iraq': 'countryIQ', 'Ireland': 'countryIE', 
-    'Israel': 'countryIL', 'Italy': 'countryIT', 'Jamaica': 'countryJM', 'Japan': 'countryJP', 'Jordan': 'countryJO', 
-    'Kazakhstan': 'countryKZ', 'Kenya': 'countryKE', 'Kiribati': 'countryKI', "Korea, Democratic People's Republic of": 'countryKP', 
-    'Korea, Republic of': 'countryKR', 'Kuwait': 'countryKW', 'Kyrgyzstan': 'countryKG', "Lao People's Democratic Republic": 'countryLA', 
-    'Latvia': 'countryLV', 'Lebanon': 'countryLB', 'Lesotho': 'countryLS', 'Liberia': 'countryLR', 'Libyan Arab Jamahiriya': 'countryLY', 
-    'Liechtenstein': 'countryLI', 'Lithuania': 'countryLT', 'Luxembourg': 'countryLU', 'Macao': 'countryMO', 
-    'Macedonia, The Former Yugoslav Republic of': 'countryMK', 'Madagascar': 'countryMG', 'Malawi': 'countryMW', 
-    'Malaysia': 'countryMY', 'Maldives': 'countryMV', 'Mali': 'countryML', 'Malta': 'countryMT', 'Marshall Islands': 'countryMH', 
-    'Martinique': 'countryMQ', 'Mauritania': 'countryMR', 'Mauritius': 'countryMU', 'Mayotte': 'countryYT', 'Mexico': 'countryMX', 
-    'Micronesia, Federated States of': 'countryFM', 'Moldova, Republic of': 'countryMD', 'Monaco': 'countryMC', 'Mongolia': 'countryMN', 
-    'Montserrat': 'countryMS', 'Morocco': 'countryMA', 'Mozambique': 'countryMZ', 'Myanmar': 'countryMM', 'Namibia': 'countryNA', 
-    'Nauru': 'countryNR', 'Nepal': 'countryNP', 'Netherlands': 'countryNL', 'Netherlands Antilles': 'countryAN', 'New Caledonia': 'countryNC', 
-    'New Zealand': 'countryNZ', 'Nicaragua': 'countryNI', 'Niger': 'countryNE', 'Nigeria': 'countryNG', 'Niue': 'countryNU', 
-    'Norfolk Island': 'countryNF', 'Northern Mariana Islands': 'countryMP', 'Norway': 'countryNO', 'Oman': 'countryOM', 
-    'Pakistan': 'countryPK', 'Palau': 'countryPW', 'Palestinian Territory, Occupied': 'countryPS', 'Panama': 'countryPA', 
-    'Papua New Guinea': 'countryPG', 'Paraguay': 'countryPY', 'Peru': 'countryPE', 'Philippines': 'countryPH', 'Pitcairn': 'countryPN', 
-    'Poland': 'countryPL', 'Portugal': 'countryPT', 'Puerto Rico': 'countryPR', 'Qatar': 'countryQA', 'Reunion': 'countryRE', 
-    'Romania': 'countryRO', 'Russian Federation': 'countryRU', 'Rwanda': 'countryRW', 'Saint Helena': 'countrySH', 
-    'Saint Kitts and Nevis': 'countryKN', 'Saint Lucia': 'countryLC', 'Saint Pierre and Miquelon': 'countryPM', 
-    'Saint Vincent and the Grenadines': 'countryVC', 'Samoa': 'countryWS', 'San Marino': 'countrySM', 'Sao Tome and Principe': 'countryST', 
-    'Saudi Arabia': 'countrySA', 'Senegal': 'countrySN', 'Serbia and Montenegro': 'countryCS', 'Seychelles': 'countrySC', 
-    'Sierra Leone': 'countrySL', 'Singapore': 'countrySG', 'Slovakia': 'countrySK', 'Slovenia': 'countrySI', 'Solomon Islands': 'countrySB', 
-    'Somalia': 'countrySO', 'South Africa': 'countryZA', 'South Georgia and the South Sandwich Islands': 'countryGS', 'Spain': 'countryES', 
-    'Sri Lanka': 'countryLK', 'Sudan': 'countrySD', 'Suriname': 'countrySR', 'Svalbard and Jan Mayen': 'countrySJ', 'Swaziland': 'countrySZ', 
-    'Sweden': 'countrySE', 'Switzerland': 'countryCH', 'Syrian Arab Republic': 'countrySY', 'Taiwan, Province of China': 'countryTW', 
-    'Tajikistan': 'countryTJ', 'Tanzania, United Republic of': 'countryTZ', 'Thailand': 'countryTH', 'Timor-Leste': 'countryTL', 
-    'Togo': 'countryTG', 'Tokelau': 'countryTK', 'Tonga': 'countryTO', 'Trinidad and Tobago': 'countryTT', 'Tunisia': 'countryTN', 
-    'Turkey': 'countryTR', 'Turkmenistan': 'countryTM', 'Turks and Caicos Islands': 'countryTC', 'Tuvalu': 'countryTV', 'Uganda': 'countryUG', 
-    'Ukraine': 'countryUA', 'United Arab Emirates': 'countryAE', 'United Kingdom': 'countryGB', 'United States': 'countryUS', 
-    'United States Minor Outlying Islands': 'countryUM', 'Uruguay': 'countryUY', 'Uzbekistan': 'countryUZ', 'Vanuatu': 'countryVU', 
-    'Venezuela': 'countryVE', 'Viet Nam': 'countryVN', 'Virgin Islands, British': 'countryVG', 'Virgin Islands, U.S.': 'countryVI', 
-    'Wallis and Futuna': 'countryWF', 'Western Sahara': 'countryEH', 'Yemen': 'countryYE', 'Zambia': 'countryZM', 'Zimbabwe': 'countryZW'
+    'United States': 'US', 'United Kingdom': 'GB', 'Canada': 'CA', 'Australia': 'AU', 'India': 'IN',
+    'Germany': 'DE', 'France': 'FR', 'Japan': 'JP', 'South Korea': 'KR', 'Brazil': 'BR',
+    'Mexico': 'MX', 'Spain': 'ES', 'Italy': 'IT', 'Netherlands': 'NL', 'Russia': 'RU',
+    'Sweden': 'SE', 'Switzerland': 'CH', 'Poland': 'PL', 'Turkey': 'TR', 'Saudi Arabia': 'SA'
 }
 
+@lru_cache(maxsize=100)
+def cached_search(cache_key):
+    return search_news_impl(*json.loads(cache_key))
+
 def search_news(keyword, country):
-    # 24시간 전 날짜 계산
-    one_day_ago = (datetime.now() - timedelta(days=1)).isoformat()
+    cache_key = json.dumps((keyword, country))
+    return cached_search(cache_key)
 
-    # API 요청 URL 및 매개변수 설정
+def search_news_impl(keyword, country):
     url = "https://www.googleapis.com/customsearch/v1"
     params = {
         'key': API_KEY,
         'cx': SEARCH_ENGINE_ID,
-        'q': keyword,
-        'dateRestrict': 'd1',  # 최근 1일 내 결과만
+        'q': f"{keyword} when:1d",  # 최근 1일 내 결과만
         'lr': 'lang_en',  # 영어 결과만
         'sort': 'date',  # 날짜순 정렬
         'num': 100,  # 최대 100개 결과
-        'siteSearch': 'news.google.com',  # Google News로 제한
     }
 
     if country != 'All Countries':
-        params['cr'] = COUNTRIES[country]
+        params['gl'] = COUNTRIES[country]
+
+    try:
+        response = requests.get(url, params=params)
+        response.raise_for_status()
+        results = response.json()
+
+        debug_info = f"API Request URL: {response.url}\n"
+        debug_info += f"API Response Status: {response.status_code}\n"
+        debug_info += f"API Response Body: {json.dumps(results, indent=2)}\n"
 
-    # API 요청
-    response = requests.get(url, params=params)
-    results = response.json()
+        formatted_results = ""
+        if 'items' in results:
+            for item in results['items']:
+                title = item['title']
+                link = item['link']
+                snippet = item.get('snippet', 'No snippet available')
+                formatted_results += f"<h3><a href='{link}' target='_blank'>{title}</a></h3>"
+                formatted_results += f"<p>{snippet}</p><br>"
+            formatted_results += f"<p>Total results: {len(results['items'])}</p>"
+        else:
+            formatted_results = f"No news found for '{keyword}' in {country} within the last 24 hours."
 
-    # 디버그 정보
-    debug_info = f"API Request URL: {response.url}\n"
-    debug_info += f"API Response Status: {response.status_code}\n"
-    debug_info += f"API Response Body: {json.dumps(results, indent=2)}\n"
+    except requests.exceptions.HTTPError as e:
+        formatted_results = f"An error occurred: {str(e)}"
+        debug_info = f"Error: {str(e)}\n"
+        debug_info += f"API Response Status: {e.response.status_code}\n"
+        debug_info += f"API Response Body: {e.response.text}\n"
 
-    # 결과 포맷팅
-    formatted_results = ""
-    if 'items' in results:
-        for item in results['items']:
-            title = item['title']
-            link = item['link']
-            snippet = item['snippet']
-            formatted_results += f"<h3><a href='{link}' target='_blank'>{title}</a></h3>"
-            formatted_results += f"<p>{snippet}</p><br>"
-        formatted_results += f"<p>Total results: {len(results['items'])}</p>"
-    else:
-        formatted_results = f"No news found for '{keyword}' in {country} within the last 24 hours."
+    except Exception as e:
+        formatted_results = f"An unexpected error occurred: {str(e)}"
+        debug_info = f"Unexpected Error: {str(e)}\n"
 
     formatted_results += f"<details><summary>Debug Info</summary><pre>{debug_info}</pre></details>"