Update app.py

app.py

@@ -587,93 +587,78 @@ def create_main_interface():
             return ["", None, gr.update(active_key="error"), gr.update(open=False)]
 
     async def execute_search_and_generate(query, setting):
-        try:
-            print(f"Executing web search for query: {query}")  # 디버깅용
-            
-            # 검색 실행
-            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,
-                    "domain": "google.com",
-                    "loc": "United States",
-                    "lang": "en",
-                    "device": "desktop",
-                    "serp_type": "news",  # 뉴스 검색으로 변경
-                    "page": "1",
-                    "num": "10",
-                    "date_range": date_range,
-                    "sort_by": "date"
-                }
-            }
-            
-            headers = {
-                "accept": "application/json",
-                "content-type": "application/json",
-                "authorization": "Bearer V38CNn4HXpLtynJQyOeoUensTEYoFy8PBUxKpDqAW1pawT1vfJ2BWtPQ98h6"
-            }
-            
-            # 세션 설정 및 재시도 로직 추가
-            session = requests.Session()
-            retries = Retry(total=3, backoff_factor=0.5)
-            session.mount('https://', HTTPAdapter(max_retries=retries))
-            
-            print("Sending search request...")  # 디버깅용
-            response = session.post(url, json=payload, headers=headers, timeout=(5, 15))
-            response.raise_for_status()
-            results = response.json()
-            print(f"Search results received: {len(results.get('results', []))} items")  # 디버깅용
-            
-            # 검색 결과를 HTML로 변환
-            search_content = "<div class='search-summary'><h2>Search Results</h2>"
-            if 'results' in results and isinstance(results['results'], list):
-                search_results = results['results']
-                if len(search_results) > 5:
-                    search_results = search_results[:5]
-                
-                for result in search_results:
-                    title = result.get('title', 'No Title')
-                    url = result.get('url', '#')
-                    snippet = result.get('snippet', 'No description available')
-                    time = result.get('time', '')
+          try:
+               # 검색 실행
+               url = "https://api.serphouse.com/serp/live"
+               payload = {
+                    "data": {
+                         "q": query,
+                         "domain": "google.com", 
+                         "lang": "en",
+                         "device": "desktop",
+                         "serp_type": "news",  # 뉴스 검색으로 변경
+                         "page": "1",
+                         "num": "10"
+                    }
+               }
+               headers = {
+                    "accept": "application/json",
+                    "content-type": "application/json",
+                    "authorization": "Bearer V38CNn4HXpLtynJQyOeoUensTEYoFy8PBUxKpDqAW1pawT1vfJ2BWtPQ98h6"
+               }
+               
+               response = requests.post(url, headers=headers, json=payload)
+               results = response.json()
+               
+               # 검색 결과를 HTML로 변환하고 요약
+               search_summary = "<div class='search-results'>\n"
+               search_summary += "<h2>최신 뉴스 검색 결과</h2>\n"
+               
+               if 'results' in results and 'news' in results['results']:
+                    for item in results['results']['news'][:5]:  # 상위 5개 결과만 사용
+                         search_summary += f"""
+                              <div class="search-item">
+                                   <h3><a href="{item['url']}" target="_blank">{item['title']}</a></h3>
+                                   <p>{item['snippet']}</p>
+                                   <div class="search-meta">
+                                        <span class="source">{item['channel']}</span>
+                                        <span class="time">{item['time']}</span>
+                                   </div>
+                              </div>
+                         """
+               search_summary += "</div>"
+
+               # 검색 결과를 포함한 향상된 프롬프트 생성
+               enhanced_prompt = f"""Based on the latest news search results, create a comprehensive and visually appealing response:
+
+Search Query: {query}
+
+Search Results Summary:
+{search_summary}
+
+Please create a response that:
+1. Summarizes the key information from the search results
+2. Presents the information in a clear and organized way
+3. Uses appropriate HTML formatting for better visual presentation
+4. Includes relevant quotes or statistics when available
+5. Provides proper attribution to sources
+
+Response should be in HTML format with appropriate styling.
+"""
+
+               # async generator를 처리하기 위한 수정
+               async for result in demo_instance.generation_code(enhanced_prompt, setting):
+                    final_result = result
+               return final_result
                     
-                    search_content += f"""
-                        <div class="search-item">
-                            <h3><a href="{url}" target="_blank">{title}</a></h3>
-                            <p>{snippet}</p>
-                            <span class="search-time">{time}</span>
-                        </div>
-                    """
-            search_content += "</div>"
-            
-            # 검색 결과를 포함한 프롬프트 생성
-            enhanced_prompt = f"""Based on these recent news results, create a visually appealing and informative response:
-            {search_content}
-            
-            Original query: {query}
-            
-            Create a comprehensive visual response that incorporates relevant information from the news results.
-            """
-            
-            # async generator를 처리하기 위한 수정
-            async for result in demo_instance.generation_code(enhanced_prompt, setting):
-                final_result = result
-            return final_result
-            
-        except Exception as e:
-            print(f"Search error: {str(e)}")
-            return [
-                "",
-                None,
-                gr.update(active_key="error"),
-                gr.update(open=False)
-            ]
+          except Exception as e:
+               print(f"Search error: {str(e)}")
+               return [
+                    "",
+                    None,
+                    gr.update(active_key="error"),
+                    gr.update(open=False)
+               ]
 
     def execute_code(query: str):
         if not query or query.strip() == '':