Update app.py

app.py

@@ -6,7 +6,7 @@ import os
 import numpy as np
 import openai
 from dotenv import load_dotenv
-from fastapi import FastAPI
+from fastapi import FastAPI, Request
 from fastapi.responses import HTMLResponse, StreamingResponse
 from fastrtc import (
     AdditionalOutputs,
@@ -672,6 +672,8 @@ class BraveSearchClient:
 
 # Global state for web search settings
 web_search_settings = {}
+current_webrtc_id = None
+current_web_search_enabled = False
 
 
 class OpenAIHandler(AsyncStreamHandler):
@@ -684,15 +686,21 @@ class OpenAIHandler(AsyncStreamHandler):
         )
         self.connection = None
         self.output_queue = asyncio.Queue()
-        self.search_client = None
+        self.search_client = search_client  # Use global search client
         self.function_call_in_progress = False
         self.current_function_args = ""
         self.current_call_id = None
         self.webrtc_id = None
         self.web_search_enabled = False
+        self.startup_called = False
 
     def copy(self):
-        return OpenAIHandler()
+        # Create a new instance that inherits settings
+        new_handler = OpenAIHandler()
+        new_handler.search_client = self.search_client
+        new_handler.webrtc_id = current_webrtc_id  # Use global variable
+        new_handler.web_search_enabled = current_web_search_enabled  # Use global variable
+        return new_handler
 
     async def search_web(self, query: str) -> str:
         """Perform web search and return formatted results"""
@@ -717,9 +725,10 @@ class OpenAIHandler(AsyncStreamHandler):
 
     async def start_up(self):
         """Connect to realtime API with function calling enabled"""
-        # Get web search setting from global state
+        # Check web search setting before connecting
         if self.webrtc_id and self.webrtc_id in web_search_settings:
             self.web_search_enabled = web_search_settings[self.webrtc_id]
+            print(f"Retrieved web_search_enabled={self.web_search_enabled} for webrtc_id={self.webrtc_id}")
         
         print(f"Starting up handler with web_search_enabled={self.web_search_enabled}")
         self.client = openai.AsyncOpenAI()
@@ -731,7 +740,7 @@ class OpenAIHandler(AsyncStreamHandler):
                 "type": "function",
                 "function": {
                     "name": "web_search",
-                    "description": "Search the web for information when the user asks questions about current events, news, or topics that require up-to-date information",
+                    "description": "Search the web for information when the user asks questions about current events, news, weather, prices, or topics that require up-to-date information",
                     "parameters": {
                         "type": "object",
                         "properties": {
@@ -760,15 +769,16 @@ class OpenAIHandler(AsyncStreamHandler):
             if self.web_search_enabled:
                 session_update["instructions"] = (
                     "You are a helpful assistant. When users ask about current events, "
-                    "news, recent information, or topics that might have changed recently, "
+                    "news, recent information, weather, or topics that might have changed recently, "
                     "use the web_search function to find the most up-to-date information. "
-                    "Always search when the user asks about: weather, news, current events, "
-                    "recent updates, prices, or any time-sensitive information."
+                    "Always search when the user asks about: 날씨(weather), 뉴스(news), 현재(current), "
+                    "최근(recent), 최신(latest), 오늘(today), or any time-sensitive information."
                 )
             
             await conn.session.update(session=session_update)
             self.connection = conn
             print(f"Connected with tools: {len(tools)} functions")
+            self.startup_called = True
             
             async for event in self.connection:
                 if event.type == "response.audio_transcript.done":
@@ -876,47 +886,46 @@ stream = Stream(
 )
 
 app = FastAPI()
+
+# Mount the stream
 stream.mount(app)
 
-# Override the offer handler to capture web search settings
-original_offer_handler = stream.offer
+# Intercept the POST body before it reaches the stream
+from starlette.middleware.base import BaseHTTPMiddleware
+from starlette.requests import Request as StarletteRequest
+import io
 
-async def custom_offer_handler(request):
-    """Custom offer handler to process web search settings"""
-    # Extract web search setting from request
-    if hasattr(request, 'web_search_enabled'):
-        web_search_enabled = request.web_search_enabled
-    elif isinstance(request, dict) and 'web_search_enabled' in request:
-        web_search_enabled = request['web_search_enabled']
-    else:
-        web_search_enabled = False
-    
-    # Extract webrtc_id
-    if hasattr(request, 'webrtc_id'):
-        webrtc_id = request.webrtc_id
-    elif isinstance(request, dict) and 'webrtc_id' in request:
-        webrtc_id = request['webrtc_id']
-    else:
-        webrtc_id = None
-    
-    print(f"Received offer - webrtc_id: {webrtc_id}, web_search_enabled: {web_search_enabled}")
-    
-    # Store web search setting
-    if webrtc_id:
-        web_search_settings[webrtc_id] = web_search_enabled
-        handler.webrtc_id = webrtc_id
-        handler.web_search_enabled = web_search_enabled
-        
-        # Restart handler if already connected to update settings
-        if handler.connection:
-            await handler.shutdown()
-            await handler.start_up()
-    
-    # Call original offer handler
-    return await original_offer_handler(request)
+class WebSearchMiddleware(BaseHTTPMiddleware):
+    async def dispatch(self, request: StarletteRequest, call_next):
+        if request.url.path == "/webrtc/offer" and request.method == "POST":
+            # Read the body
+            body = await request.body()
+            
+            # Parse it
+            try:
+                data = json.loads(body)
+                webrtc_id = data.get("webrtc_id")
+                web_search_enabled = data.get("web_search_enabled", False)
+                
+                print(f"Middleware intercepted - webrtc_id: {webrtc_id}, web_search_enabled: {web_search_enabled}")
+                
+                # Store settings globally
+                global current_webrtc_id, current_web_search_enabled
+                if webrtc_id:
+                    current_webrtc_id = webrtc_id
+                    current_web_search_enabled = web_search_enabled
+                    web_search_settings[webrtc_id] = web_search_enabled
+            except:
+                pass
+            
+            # Recreate the request with the body
+            request._body = body
+            
+        response = await call_next(request)
+        return response
 
-# Replace the offer method
-stream.offer = custom_offer_handler
+# Add middleware
+app.add_middleware(WebSearchMiddleware)
 
 @app.get("/outputs")
 async def outputs(webrtc_id: str):