Update app.py

app.py

@@ -1,121 +1,70 @@
 import gradio as gr
 import requests
 from datetime import datetime, timedelta
-import pycountry
-import json
 
-# NewsAPI key
-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):
-    return [f"{keyword} news", f"{keyword} technology", f"{keyword} company", f"latest {keyword}"]
-
-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':
-        base_url = "https://newsapi.org/v2/everything"
-        params = {
-            'apiKey': API_KEY,
-            'q': keyword,
-            'language': 'en',
-            'sortBy': 'publishedAt',
-            'pageSize': min(article_count * 2, 100)  # 요청 기사 수를 2배로 늘림 (최대 100)
-        }
-    else:
-        base_url = "https://newsapi.org/v2/top-headlines"
-        params = {
-            'apiKey': API_KEY,
-            'q': keyword,
-            'country': country_code,
-            'pageSize': min(article_count * 2, 100)  # 요청 기사 수를 2배로 늘림 (최대 100)
-        }
-    
-    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"
-
-    try:
-        response = requests.get(base_url, params=params, timeout=10)
-        response.raise_for_status()
-        news_data = response.json()
-
-        debug_info += f"API Response Status: {response.status_code}\n"
-        debug_info += f"API Response Headers: {json.dumps(dict(response.headers), indent=2)}\n\n"
-        debug_info += f"API Response Body: {json.dumps(news_data, indent=2)}\n\n"
-
-    except requests.RequestException as e:
-        return f"<p style='color: red;'>Error fetching news: {str(e)}</p><pre>{debug_info}</pre>"
-
-    if news_data['status'] != 'ok':
-        return f"<p style='color: red;'>API Error: {news_data.get('message', 'Unknown error occurred')}</p><pre>{debug_info}</pre>"
-
-    articles = news_data['articles']
-    
-    # removed 기사 필터링
-    filtered_articles = [article for article in articles if article.get('title') != '[Removed]' and article.get('description') != '[Removed]']
-    
-    if not filtered_articles:
-        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>"
-                           f"<p>Suggestions:</p>"
-                           f"<ul>"
-                           f"<li>Try one of these related keywords: {', '.join(related_keywords)}</li>"
-                           f"<li>Increase the number of articles</li>"
-                           f"<li>Check for any spelling errors in your keyword</li>"
-                           f"</ul>")
-            return suggestions + f"<pre>{debug_info}</pre>"
-
-    html_output = f"<h2>News results for '{keyword}' in {country}</h2>"
-    if country_code == 'all':
-        html_output += "<p><em>Showing results from all countries</em></p>"
+# Google Custom Search API 키와 검색 엔진 ID
+API_KEY = "YOUR_API_KEY_HERE"
+SEARCH_ENGINE_ID = "YOUR_SEARCH_ENGINE_ID_HERE"
+
+# 지원되는 국가 리스트
+COUNTRIES = {
+    'United States': 'countryUS', 'United Kingdom': 'countryGB', 'India': 'countryIN', 
+    'Australia': 'countryAU', 'Canada': 'countryCA', 'Germany': 'countryDE', 
+    'France': 'countryFR', 'Italy': 'countryIT', 'Spain': 'countryES', 'Brazil': 'countryBR',
+    'Mexico': 'countryMX', 'Argentina': 'countryAR', 'Japan': 'countryJP', 
+    'South Korea': 'countryKR', 'Russia': 'countryRU', 'China': 'countryCN', 
+    'Netherlands': 'countryNL', 'Sweden': 'countrySE', 'Poland': 'countryPL', 'Turkey': 'countryTR'
+}
+
+def search_news(keyword, country):
+    # 24시간 전 날짜 계산
+    one_day_ago = (datetime.now() - timedelta(days=1)).strftime("%Y-%m-%d")
+
+    # API 요청 URL 및 매개변수 설정
+    url = "https://www.googleapis.com/customsearch/v1"
+    params = {
+        'key': API_KEY,
+        'cx': SEARCH_ENGINE_ID,
+        'q': keyword,
+        'dateRestrict': 'd1',  # 최근 1일 내 결과만
+        'lr': 'lang_en',  # 영어 결과만
+        'sort': 'date',  # 날짜순 정렬
+        'num': 10,  # 최대 10개 결과
+        'siteSearch': 'news.google.com',  # Google News로 제한
+    }
+
+    if country != 'All Countries':
+        params['cr'] = COUNTRIES[country]
+
+    # 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['snippet']
+            formatted_results += f"<h3><a href='{link}' target='_blank'>{title}</a></h3>"
+            formatted_results += f"<p>{snippet}</p><br>"
     else:
-        html_output += f"<p><em>Showing results specifically for {country}</em></p>"
-    
-    html_output += f"<p>Found {len(filtered_articles)} relevant articles (after removing any '[Removed]' articles)</p>"
-    
-    for article in filtered_articles[:article_count]:  # 요청한 기사 수만큼만 표시
-        title = article['title']
-        link = article['url']
-        pub_date = datetime.strptime(article['publishedAt'], "%Y-%m-%dT%H:%M:%SZ")
-        source = article.get('source', {}).get('name', 'Unknown Source')
-        description = article.get('description', 'No description available')
-        
-        html_output += f"""
-        <div style='margin-bottom: 20px; padding: 10px; border: 1px solid #ddd; border-radius: 5px;'>
-            <h3><a href='{link}' target='_blank' style='text-decoration: none; color: #1a0dab;'>{title}</a></h3>
-            <p style='color: #006621;'>{source}</p>
-            <p style='color: #545454;'>{pub_date.strftime('%Y-%m-%d %H:%M:%S')}</p>
-            <p>{description}</p>
-        </div>
-        """
+        formatted_results = f"No news found for '{keyword}' in {country} within the last 24 hours."
 
-    html_output += f"<details><summary>Debug Info</summary><pre>{debug_info}</pre></details>"
-    return html_output
+    return formatted_results
 
+# Gradio 인터페이스 생성
 iface = gr.Interface(
-    fn=get_news,
+    fn=search_news,
     inputs=[
-        gr.Textbox(label="Enter keyword"),
-        gr.Slider(minimum=10, maximum=100, step=10, value=10, label="Number of Articles"),
-        gr.Dropdown(choices=list(COUNTRIES.values()), value="All Countries", label="Select Country")
+        gr.Textbox(label="Enter keyword (in English)"),
+        gr.Dropdown(choices=['All Countries'] + list(COUNTRIES.keys()), label="Select Country")
     ],
     outputs=gr.HTML(),
-    title="Advanced Visual News Search",
-    description="Search for news articles using NewsAPI. Results will be specific to the selected country when applicable.",
-    theme=gr.themes.Soft()
+    title="Google News Search",
+    description="Search for news articles from the last 24 hours using Google Custom Search API."
 )
 
+# 애플리케이션 실행
 iface.launch()