Update app.py

app.py

@@ -2,6 +2,24 @@ import streamlit as st
 import requests
 import logging
 import json
+from datetime import datetime, timedelta
+from requests.adapters import HTTPAdapter
+from urllib3.util.retry import Retry
+
+# --- Optional: translate_query 및 관련 상수 정의 (실제 구현에 맞게 수정) ---
+def translate_query(query, country):
+    # 실제 상황에서는 번역 로직을 구현하세요.
+    return query
+
+COUNTRY_LOCATIONS = {
+    "United States": "United States",
+    "South Korea": "South Korea"
+}
+COUNTRY_LANGUAGES = {
+    "United States": "en",
+    "South Korea": "ko"
+}
+# -------------------------------------------------------------------------
 
 # Configure logging
 logging.basicConfig(level=logging.INFO)
@@ -31,7 +49,11 @@ with st.sidebar:
 
     system_message = st.text_area(
         "System Message",
-        value="You are a deep thinking AI, you may use extremely long chains of thought to deeply consider the problem and deliberate with yourself via systematic reasoning processes to help come to a correct solution prior to answering. You should enclose your thoughts and internal monologue inside tags, and then provide your solution or response to the problem.",
+        value=(
+            "You are a deep thinking AI, you may use extremely long chains of thought to deeply consider the problem and "
+            "deliberate with yourself via systematic reasoning processes to help come to a correct solution prior to answering. "
+            "You should enclose your thoughts and internal monologue inside tags, and then provide your solution or response to the problem."
+        ),
         height=100
     )
 
@@ -62,15 +84,84 @@ def query(payload, api_url):
         logger.error(f"Failed to decode JSON response: {response.text}")
         return None
 
-# Function to perform a web search using SerpHouse API
-def search_web(query):
-    search_url = f"https://api.serphouse.com/serp/live?api_token=V38CNn4HXpLtynJQyOeoUensTEYoFy8PBUxKpDqAW1pawT1vfJ2BWtPQ98h6&q={query}&responseType=json&domain=google&lang=en&serp_type=web"
-    response = requests.get(search_url)
-    if response.status_code == 200:
-        return response.json()
-    else:
-        logger.error(f"Error while searching: {response.status_code}")
-        return None
+# --- 수정된 웹서치 기능 ---
+def search_web(query, country="United States", page=1, num_result=10):
+    url = "https://api.serphouse.com/serp/live"
+    
+    # 최근 24시간 기간 설정
+    now = datetime.utcnow()
+    yesterday = now - timedelta(days=1)
+    date_range = f"{yesterday.strftime('%Y-%m-%d')},{now.strftime('%Y-%m-%d')}"
+    
+    # 쿼리 번역 (필요시)
+    translated_query = translate_query(query, country)
+    
+    payload = {
+        "data": {
+            "q": translated_query,
+            "domain": "google.com",
+            "loc": COUNTRY_LOCATIONS.get(country, "United States"),
+            "lang": COUNTRY_LANGUAGES.get(country, "en"),
+            "device": "desktop",
+            "serp_type": "web",  # 검색 유형을 "web"으로 설정 (원하는 경우 "news" 등으로 변경 가능)
+            "page": str(page),
+            "num": str(num_result),
+            "date_range": date_range,
+            "sort_by": "date"
+        }
+    }
+    
+    # st.secrets에 SERPHOUSE_API_TOKEN이 저장되어 있어야 합니다.
+    api_key = st.secrets.get("SERPHOUSE_API_TOKEN")
+    if not api_key:
+        logger.error("SERPHOUSE_API_TOKEN not found in st.secrets")
+        return {"error": "API token not configured."}
+    
+    headers = {
+        "accept": "application/json",
+        "content-type": "application/json",
+        "authorization": f"Bearer {api_key}"
+    }
+    
+    try:
+        # 세션과 재시도 설정
+        session = requests.Session()
+        retries = Retry(
+            total=5,
+            backoff_factor=1,
+            status_forcelist=[500, 502, 503, 504, 429],
+            allowed_methods=["POST"]
+        )
+        adapter = HTTPAdapter(max_retries=retries)
+        session.mount('http://', adapter)
+        session.mount('https://', adapter)
+        
+        # 연결 및 읽기 타임아웃 30초씩 설정
+        response = session.post(
+            url,
+            json=payload,
+            headers=headers,
+            timeout=(30, 30)
+        )
+        response.raise_for_status()
+        return {"results": response.json(), "translated_query": translated_query}
+        
+    except requests.exceptions.Timeout:
+        return {
+            "error": "검색 시간이 초과되었습니다. 잠시 후 다시 시도해주세요.",
+            "translated_query": query
+        }
+    except requests.exceptions.RequestException as e:
+        return {
+            "error": f"검색 중 오류가 발생했습니다: {str(e)}",
+            "translated_query": query
+        }
+    except Exception as e:
+        return {
+            "error": f"예기치 않은 오류가 발생했습니다: {str(e)}",
+            "translated_query": query
+        }
+# --- 끝 ---
 
 # Chat interface
 st.title("🤖 DeepSeek Chatbot")
@@ -90,22 +181,22 @@ if prompt := st.chat_input("Type your message..."):
 
     try:
         with st.spinner("Generating response..."):
-            # Perform a web search based on the user input
-            search_results = search_web(prompt)
-
-            # Process search results if available
+            # 업데이트된 웹서치 기능을 사용하여 검색 수행
+            search_results = search_web(prompt, country="United States", page=1, num_result=10)
+            
+            # 검색 결과 처리 (API 응답 구조에 따라 적절히 수정 필요)
             if search_results and "results" in search_results:
                 if 'organic' in search_results["results"]:
-                    search_content = "\n".join([f"**{item['title']}**: {item['snippet']}" for item in search_results["results"]["organic"]])
+                    search_content = "\n".join([f"**{item['title']}**: {item['snippet']}" 
+                                                for item in search_results["results"]["organic"]])
                     search_content = f"Here are some search results related to your question:\n\n{search_content}\n\n"
                 else:
                     search_content = "Sorry, no relevant search results found.\n\n"
-
-                # Combine the system message, search results, and user input into a single prompt
+    
                 full_prompt = f"{system_message}\n\n{search_content}User: {prompt}\nAssistant:"
             else:
                 full_prompt = f"{system_message}\n\nUser: {prompt}\nAssistant:"
-
+    
             payload = {
                 "inputs": full_prompt,
                 "parameters": {
@@ -115,30 +206,28 @@ if prompt := st.chat_input("Type your message..."):
                     "return_full_text": False
                 }
             }
-
-            # Dynamically construct the API URL based on the selected model
+    
+            # 선택한 모델에 따른 API URL 동적 구성
             api_url = f"https://api-inference.huggingface.co/models/{selected_model}"
             logger.info(f"Selected model: {selected_model}, API URL: {api_url}")
-
-            # Query the Hugging Face API using the selected model
+    
+            # Hugging Face API에 쿼리 전송
             output = query(payload, api_url)
-
-            # Handle API response
+    
+            # 응답 처리
             if output is not None and isinstance(output, list) and len(output) > 0:
                 if 'generated_text' in output[0]:
-                    # Extract the assistant's response
                     assistant_response = output[0]['generated_text'].strip()
-
-                    # Check for and remove duplicate responses
+    
+                    # 중복 응답 제거 (내부 체인 중 일부 제거)
                     responses = assistant_response.split("\n</think>\n")
                     unique_response = responses[0].strip()
-
+    
                     logger.info(f"Generated response: {unique_response}")
-
-                    # Append response to chat only once
+    
                     with st.chat_message("assistant"):
                         st.markdown(unique_response)
-
+    
                     st.session_state.messages.append({"role": "assistant", "content": unique_response})
                 else:
                     logger.error(f"Unexpected API response structure: {output}")
@@ -146,7 +235,7 @@ if prompt := st.chat_input("Type your message..."):
             else:
                 logger.error(f"Empty or invalid API response: {output}")
                 st.error("Error: Unable to generate a response. Please check the model and try again.")
-
+    
     except Exception as e:
         logger.error(f"Application Error: {str(e)}", exc_info=True)
         st.error(f"Application Error: {str(e)}")