Update app.py

app.py

@@ -3,7 +3,7 @@ import requests
 import json
 from datetime import datetime, timedelta
 
-API_KEY = "V38CNn4HXpLtynJQyOeoUensTEYoFy8PBUxKpDqAW1pawT1vfJ2BWtPQ98h6"
+API_KEY = "YOUR_API_KEY"
 
 MAJOR_COUNTRIES = [
     "United States", "United Kingdom", "Canada", "Australia", "Germany",
@@ -20,11 +20,11 @@ MAJOR_COUNTRIES = [
 
 def search_serphouse(query, country, page, num_result):
     url = "https://api.serphouse.com/serp/live"
-    
+
     now = datetime.utcnow()
     yesterday = now - timedelta(days=1)
     date_range = f"{yesterday.strftime('%Y-%m-%d')},{now.strftime('%Y-%m-%d')}"
-    
+
     payload = {
         "data": {
             "q": query,
@@ -39,13 +39,13 @@ def search_serphouse(query, country, page, num_result):
             "date_range": date_range
         }
     }
-    
+
     headers = {
         "accept": "application/json",
         "content-type": "application/json",
         "authorization": f"Bearer {API_KEY}"
     }
-    
+
     try:
         response = requests.post(url, json=payload, headers=headers)
         response.raise_for_status()
@@ -58,9 +58,8 @@ def search_serphouse(query, country, page, num_result):
 
 def format_results_from_raw(results):
     try:
-        # 디버그 정보 출력
         debug_info = f"Raw API Response:\n{json.dumps(results, indent=2, ensure_ascii=False)}\n\n"
-        
+
         if isinstance(results, dict) and "error" in results:
             return "Error: " + results["error"], debug_info
 
@@ -70,9 +69,9 @@ def format_results_from_raw(results):
         # 'results' 키 내부의 구조 확인
         if 'results' in results:
             results_content = results['results']
-            # 'organic' 키 확인
-            if 'organic' in results_content:
-                news_results = results_content['organic']
+            # 'news' 키 확인
+            if 'news' in results_content:
+                news_results = results_content['news']
             else:
                 news_results = []
         else:
@@ -86,12 +85,12 @@ def format_results_from_raw(results):
             title = result.get("title", "제목 없음")
             link = result.get("url", result.get("link", "#"))
             snippet = result.get("snippet", "내용 없음")
-            source = result.get("source", result.get("channel", "알 수 없음"))
-            date = result.get("date", result.get("time", "알 수 없는 시간"))
-            image_url = result.get("thumbnail", result.get("img", ""))
+            channel = result.get("channel", result.get("source", "알 수 없음"))
+            time = result.get("time", result.get("date", "알 수 없는 시간"))
+            image_url = result.get("img", result.get("thumbnail", ""))
 
-            # 이미지 태그 생성
-            if image_url:
+            # base64로 인코딩된 이미지를 처리
+            if image_url and not image_url.startswith("data:image"):
                 image_html = f'<img src="{image_url}" alt="Image" style="max-width: 100%; height: auto;">'
             else:
                 image_html = ''
@@ -99,7 +98,7 @@ def format_results_from_raw(results):
             article_html = f"""
             <div style="margin-bottom: 20px; border-bottom: 1px solid #ccc; padding-bottom: 20px;">
                 <h3><a href="{link}" target="_blank">{title}</a></h3>
-                <p><strong>{source}</strong> - {date}</p>
+                <p><strong>{channel}</strong> - {time}</p>
                 {image_html}
                 <p>{snippet}</p>
             </div>