Update app.py

app.py

@@ -567,28 +567,15 @@ def update_placeholder():
     return gr.update(placeholder=get_random_placeholder())
 
 
-        
-def create_main_interface():
-    """메인 인터페이스 생성 함수"""
-    
-    async def handle_generation(query, setting, is_search):
-        try:
-            print(f"Mode: {'Web Search' if is_search else 'Generate'}")  # 디버깅용
-            if is_search:
-                print("Executing search and generate...")  # 디버깅용
-                return await execute_search_and_generate(query, setting)
-            else:
-                print("Executing normal generation...")  # 디버깅용
-                async for result in demo_instance.generation_code(query, setting):
-                    final_result = result
-                return final_result
-        except Exception as e:
-            print(f"Generation error: {str(e)}")
-            return ["", None, gr.update(active_key="error"), gr.update(open=False)]
 
-    async def execute_search_and_generate(query, setting):
+
+def create_main_interface():
+     """메인 인터페이스 생성 함수"""
+     
+     #NEW - 검색 결과를 통합한 응답 생성 함수
+     async def execute_search_and_generate(query, setting):
           try:
-               print(f"Executing search for query: {query}")  # 디버깅용
+               print(f"Executing search for query: {query}")
                
                # 검색 실행
                url = "https://api.serphouse.com/serp/live"
@@ -601,9 +588,7 @@ def create_main_interface():
                          "serp_type": "news",
                          "loc": "United States",
                          "page": "1",
-                         "num": "10",
-                         "ie": "UTF-8",
-                         "tbm": "nws"
+                         "num": "10"
                     }
                }
                headers = {
@@ -611,67 +596,57 @@ def create_main_interface():
                     "Content-Type": "application/json"
                }
                
-               print("Sending API request...")  # 디버깅용
                response = requests.post(url, headers=headers, json=payload)
-               print(f"API Response status: {response.status_code}")  # 디버깅용
-               
-               if response.status_code != 200:
-                    print(f"API Error: {response.text}")  # 디버깅용
-                    raise Exception(f"API request failed with status {response.status_code}")
-                    
                results = response.json()
-               print(f"Got search results: {results.keys()}")  # 디버깅용
+               print(f"Search results: {results}")  # 디버깅용
                
-               # 검색 결과를 HTML로 변환하고 요약
-               search_summary = "<div class='search-results'>\n"
-               search_summary += "<h2>최신 뉴스 검색 결과</h2>\n"
+               # 검색 결과를 HTML로 변환
+               search_content = "```html\n<div class='search-results'>\n"
+               search_content += "<h2>최신 뉴스 검색 결과</h2>\n"
                
+               # API 응답 구조에 맞게 수정
                if 'results' in results:
-                    news_results = results['results'].get('news', [])
-                    print(f"Found {len(news_results)} news items")  # 디버깅용
-                    
-                    for item in news_results[:5]:  # 상위 5개 결과만 사용
-                         search_summary += f"""
+                    news_items = results['results'].get('news', [])
+                    for item in news_items[:5]:
+                         search_content += f"""
                               <div class="search-item">
-                                   <h3><a href="{item.get('url', '#')}">{item.get('title', 'No Title')}</a></h3>
-                                   <p>{item.get('snippet', 'No description available')}</p>
+                                   <h3><a href="{item['url']}" target="_blank">{item['title']}</a></h3>
+                                   <p>{item['snippet']}</p>
                                    <div class="search-meta">
-                                        <span class="source">{item.get('channel', 'Unknown')}</span>
-                                        <span class="time">{item.get('time', '')}</span>
+                                        <span class="source">{item['channel']}</span>
+                                        <span class="time">{item['time']}</span>
                                    </div>
                               </div>
                          """
-               search_summary += "</div>"
+               search_content += "</div>\n```"
 
-               # 검색 결과를 포함한 향상된 프롬프트 생성
+               # 검색 결과를 포함한 프롬프트 생성
                enhanced_prompt = f"""Based on these news search results, create a comprehensive visual summary:
 
-Original Query: {query}
-
-{search_summary}
+{search_content}
 
 Please create a visually appealing HTML response that:
-1. Summarizes the key points from the news results
-2. Organizes information in a clear and structured way
-3. Uses appropriate styling for better readability
-4. Includes important quotes and facts
-5. Cites sources properly
+1. Summarizes the key points from the news
+2. Organizes information in a clear structure
+3. Uses appropriate HTML formatting and styling
+4. Includes relevant quotes and statistics
+5. Provides proper source attribution
 
-Make sure to maintain proper HTML formatting in the response.
-"""
+The response should be in HTML format with appropriate styling."""
 
-               print("Generating response with enhanced prompt...")  # 디버깅용
+               print("Generating response with search results...")  # 디버깅용
                
                # async generator를 처리하기 위한 수정
                async for result in demo_instance.generation_code(enhanced_prompt, setting):
                     final_result = result
+                    print(f"Generated result: {final_result}")  # 디버깅용
                
                print("Response generation completed")  # 디버깅용
                return final_result
                     
           except Exception as e:
-               print(f"Search error: {str(e)}")  # 디버깅용
-               print(f"Full error details: {str(e.__class__.__name__)}: {str(e)}")  # 디버깅용
+               print(f"Search error: {str(e)}")
+               print(f"Full error details: {str(e.__class__.__name__)}: {str(e)}")
                return [
                     "",
                     None,
@@ -694,7 +669,23 @@ Make sure to maintain proper HTML formatting in the response.
             print(f"Error executing code: {str(e)}")
             return None, gr.update(active_key="empty")
 
+        
 
+    
+    async def handle_generation(query, setting, is_search):
+        try:
+            print(f"Mode: {'Web Search' if is_search else 'Generate'}")  # 디버깅용
+            if is_search:
+                print("Executing search and generate...")  # 디버깅용
+                return await execute_search_and_generate(query, setting)
+            else:
+                print("Executing normal generation...")  # 디버깅용
+                async for result in demo_instance.generation_code(query, setting):
+                    final_result = result
+                return final_result
+        except Exception as e:
+            print(f"Generation error: {str(e)}")
+            return ["", None, gr.update(active_key="error"), gr.update(open=False)]
 
 # CSS 파일 내용을 직접 적용
     with open('app.css', 'r', encoding='utf-8') as f: