Update app.py

app.py

@@ -1,98 +1,78 @@
 import gradio as gr
 import requests
-import json
-from functools import lru_cache
-from datetime import datetime, timedelta
 
-# Google Custom Search API 키와 검색 엔진 ID
-API_KEY = "AIzaSyB8wNdEL8-SAvelRq-zenLLU-cUEmsj7uE"
-SEARCH_ENGINE_ID = "c01abc75e1b95483d"
+API_KEY = "V38CNn4HXpLtynJQyOeoUensTEYoFy8PBUxKpDqAW1pawT1vfJ2BWtPQ98h6"
 
-# 지원되는 국가 리스트
-COUNTRIES = {
-    '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'
-}
+# List of English-speaking countries supported by SERPHouse API
+ENGLISH_SPEAKING_COUNTRIES = [
+    "United States", "United Kingdom", "Canada", "Australia", "New Zealand",
+    "Ireland", "South Africa", "Jamaica", "Trinidad and Tobago", "Guyana",
+    "Belize", "Barbados", "Bahamas", "Antigua and Barbuda", "Saint Kitts and Nevis",
+    "Dominica", "Saint Lucia", "Saint Vincent and the Grenadines", "Grenada"
+]
 
-@lru_cache(maxsize=100)
-def cached_search(cache_key):
-    return search_news_impl(*json.loads(cache_key))
-
-def search_news(keyword, country):
-    cache_key = json.dumps((keyword, country))
-    return cached_search(cache_key)
-
-def search_news_impl(keyword, country):
-    url = "https://www.googleapis.com/customsearch/v1"
-    
-    # 24시간 전 날짜 계산
-    one_day_ago = (datetime.utcnow() - timedelta(days=1)).strftime("%Y-%m-%d")
+def search_serphouse(query, domain, language, device, serp_type, location, country, verbatim, gfilter, page, num_result):
+    url = "https://api.serphouse.com/serp/live"
     
     params = {
-        'key': API_KEY,
-        'cx': SEARCH_ENGINE_ID,
-        'q': keyword,
-        'dateRestrict': 'd1',  # 최근 1일 내 결과만
-        'sort': 'date',  # 날짜순 정렬
-        'num': 10,  # 결과 수
-        'tbm': 'nws',  # 뉴스 검색으로 제한
+        "q": query,
+        "domain": domain,
+        "lang": language,
+        "device": device,
+        "serp_type": serp_type,
+        "loc": location,
+        "country": country,  # Added country parameter
+        "verbatim": verbatim,
+        "gfilter": gfilter,
+        "page": page,
+        "num_result": num_result
     }
+    
+    headers = {
+        "Authorization": f"Bearer {API_KEY}"
+    }
+    
+    response = requests.get(url, params=params, headers=headers)
+    
+    if response.status_code == 200:
+        return response.json()
+    else:
+        return f"Error: {response.status_code} - {response.text}"
 
-    if country != 'All Countries':
-        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 Headers: {json.dumps(dict(response.headers), indent=2)}\n"
-        debug_info += f"API Response Body: {json.dumps(results, indent=2)}\n"
-
+def format_results(results):
+    if isinstance(results, dict) and "results" in results:
+        organic_results = results["results"].get("organic", [])
         formatted_results = ""
-        if 'items' in results:
-            for item in results['items']:
-                title = item['title']
-                link = item['link']
-                snippet = item.get('snippet', 'No snippet available')
-                published_date = item.get('pagemap', {}).get('metatags', [{}])[0].get('article:published_time', 'Unknown date')
-                formatted_results += f"<h3><a href='{link}' target='_blank'>{title}</a></h3>"
-                formatted_results += f"<p>Published: {published_date}</p>"
-                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 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 Headers: {json.dumps(dict(e.response.headers), indent=2)}\n"
-        debug_info += f"API Response Body: {e.response.text}\n"
-
-    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>"
+        for i, result in enumerate(organic_results, 1):
+            formatted_results += f"{i}. {result['title']}\n"
+            formatted_results += f"   URL: {result['link']}\n"
+            formatted_results += f"   Snippet: {result['snippet']}\n\n"
+        return formatted_results
+    else:
+        return str(results)
 
-    return formatted_results
+def serphouse_search(query, domain, language, device, serp_type, location, country, verbatim, gfilter, page, num_result):
+    results = search_serphouse(query, domain, language, device, serp_type, location, country, verbatim, gfilter, page, num_result)
+    return format_results(results)
 
-# Gradio 인터페이스 생성
 iface = gr.Interface(
-    fn=search_news,
+    fn=serphouse_search,
     inputs=[
-        gr.Textbox(label="Enter keyword (in English)"),
-        gr.Dropdown(choices=['All Countries'] + list(COUNTRIES.keys()), label="Select Country")
+        gr.Textbox(label="Search Query"),
+        gr.Dropdown(["google.com", "google.co.uk", "google.ca", "google.com.au"], label="Domain"),
+        gr.Dropdown(["en"], label="Language"),
+        gr.Radio(["desktop", "mobile"], label="Device"),
+        gr.Dropdown(["web", "news", "images"], label="SERP Type"),
+        gr.Textbox(label="Location"),
+        gr.Dropdown(ENGLISH_SPEAKING_COUNTRIES, label="Country"),  # Added country dropdown
+        gr.Checkbox(label="Verbatim"),
+        gr.Checkbox(label="Google Filter"),
+        gr.Slider(1, 10, 1, label="Page"),
+        gr.Slider(1, 100, 10, label="Number of Results")
     ],
-    outputs=gr.HTML(),
-    title="Google News Search",
-    description="Search for news articles from the last 24 hours using Google Custom Search API."
+    outputs="text",
+    title="SERPHouse Search Interface",
+    description="Enter your search parameters to get results from the SERPHouse API. You can now select an English-speaking country."
 )
 
-# 애플리케이션 실행
 iface.launch()