Fix SyntaxError in ask_openai function

app.py

@@ -3,7 +3,6 @@ import logging
 import httpx
 from dotenv import load_dotenv
 import gradio as gr
-from typing import AsyncGenerator, List, Dict
 
 # Configure logging
 logging.basicConfig(level=logging.INFO)
@@ -16,20 +15,11 @@ logger.info(f"OPENAI_API_KEY present: {'OPENAI_API_KEY' in os.environ}")
 logger.info(f"ANTHROPIC_API_KEY present: {'ANTHROPIC_API_KEY' in os.environ}")
 logger.info(f"GEMINI_API_KEY present: {'GEMINI_API_KEY' in os.environ}")
 
-async def ask_openai(query: str, history: List[Dict[str, str]]) -> AsyncGenerator[str, None]:
+async def ask_openai(query: str):
     openai_api_key = os.getenv("OPENAI_API_KEY")
     if not openai_api_key:
         logger.error("OpenAI API key not provided")
-        yield "Error: OpenAI API key not provided."
-        return
-
-    # Build message history
-    messages = []
-    for msg in history:
-        messages.append({"role": "user", "content": msg["user"]})
-        if msg["bot"]:
-            messages.append({"role": "assistant", "content": msg["bot"]})
-    messages.append({"role": "user", "content": query})
+        return "Error: OpenAI API key not provided."
 
     headers = {
         "Authorization": f"Bearer {openai_api_key}",
@@ -38,54 +28,30 @@ async def ask_openai(query: str, history: List[Dict[str, str]]) -> AsyncGenerato
 
     payload = {
         "model": "gpt-3.5-turbo",
-        "messages": messages,
-        "stream": True
+        "messages": [{"role": "user", "content": query}]
     }
 
     try:
         async with httpx.AsyncClient() as client:
-            async with client.stream("POST", "https://api.openai.com/v1/chat/completions", headers=headers, json=payload) as response:
-                response.raise_for_status()
-                async for chunk in response.aiter_text():
-                    if chunk:
-                        # Parse the streaming chunk (JSON lines)
-                        lines = chunk.splitlines()
-                        for line in lines:
-                            if line.startswith("data: "):
-                                data = line[6:]  # Remove "data: " prefix
-                                if data == "[DONE]":
-                                    break
-                                try:
-                                    json_data = eval(data)  # Safely parse JSON
-                                    if "choices" inㅇ json_data and json_data["choices"]:
-                                        delta = json_data["choices"][0].get("delta", {})
-                                        if "content" in delta:
-                                            yield delta["content"]
-                                except Exception as e:
-                                    logger.error(f"Error parsing OpenAI stream chunk: {str(e)}")
-                                    yield f"Error parsing stream: {str(e)}"
+            response = await client.post("https://api.openai.com/v1/chat/completions", headers=headers, json=payload)
+        
+        response.raise_for_status()
+        answer = response.json()['choices'][0]['message']['content']
+        return answer
 
     except httpx.HTTPStatusError as e:
         logger.error(f"OpenAI HTTP Status Error: {e.response.status_code}, {e.response.text}")
-        yield f"Error: OpenAI HTTP Status Error: {e.response.status_code}, {e.response.text}"
+        return f"Error: OpenAI HTTP Status Error: {e.response.status_code}, {e.response.text}"
     except Exception as e:
         logger.error(f"OpenAI Error: {str(e)}")
-        yield f"Error: OpenAI Error: {str(e)}"
+        return f"Error: OpenAI Error: {str(e)}"
 
-async def ask_anthropic(query: str, history: List[Dict[str, str]]) -> str:
+async def ask_anthropic(query: str):
     anthropic_api_key = os.getenv("ANTHROPIC_API_KEY")
     if not anthropic_api_key:
         logger.error("Anthropic API key not provided")
         return "Error: Anthropic API key not provided."
 
-    # Build message history
-    messages = []
-    for msg in history:
-        messages.append({"role": "user", "content": msg["user"]})
-        if msg["bot"]:
-            messages.append({"role": "assistant", "content": msg["bot"]})
-    messages.append({"role": "user", "content": query})
-
     headers = {
         "x-api-key": anthropic_api_key,
         "anthropic-version": "2023-06-01",
@@ -95,7 +61,7 @@ async def ask_anthropic(query: str, history: List[Dict[str, str]]) -> str:
     payload = {
         "model": "claude-3-5-sonnet-20241022",
         "max_tokens": 1024,
-        "messages": messages
+        "messages": [{"role": "user", "content": query}]
     }
 
     try:
@@ -105,7 +71,8 @@ async def ask_anthropic(query: str, history: List[Dict[str, str]]) -> str:
         
         response.raise_for_status()
         logger.info(f"Anthropic response: {response.json()}")
-        return response.json()['content'][0]['text']
+        answer = response.json()['content'][0]['text']
+        return answer
 
     except httpx.HTTPStatusError as e:
         logger.error(f"Anthropic HTTP Status Error: {e.response.status_code}, {e.response.text}")
@@ -114,24 +81,18 @@ async def ask_anthropic(query: str, history: List[Dict[str, str]]) -> str:
         logger.error(f"Anthropic Error: {str(e)}")
         return f"Error: Anthropic Error: {str(e)}"
 
-async def ask_gemini(query: str, history: List[Dict[str, str]]) -> str:
+async def ask_gemini(query: str):
     gemini_api_key = os.getenv("GEMINI_API_KEY")
     if not gemini_api_key:
         logger.error("Gemini API key not provided")
         return "Error: Gemini API key not provided."
 
-    # Gemini doesn't natively support chat history in the same way, so we concatenate history as text
-    history_text = ""
-    for msg in history:
-        history_text += f"User: {msg['user']}\nAssistant: {msg['bot']}\n" if msg["bot"] else f"User: {msg['user']}\n"
-    full_query = history_text + f"User: {query}\n"
-
     headers = {
         "Content-Type": "application/json"
     }
 
     payload = {
-        "contents": [{"parts": [{"text": full_query}]}]
+        "contents": [{"parts": [{"text": query}]}]
     }
 
     try:
@@ -143,7 +104,8 @@ async def ask_gemini(query: str, history: List[Dict[str, str]]) -> str:
             )
         
         response.raise_for_status()
-        return response.json()['candidates'][0]['content']['parts'][0]['text']
+        answer = response.json()['candidates'][0]['content']['parts'][0]['text']
+        return answer
 
     except httpx.HTTPStatusError as e:
         logger.error(f"Gemini HTTP Status Error: {e.response.status_code}, {e.response.text}")
@@ -152,29 +114,31 @@ async def ask_gemini(query: str, history: List[Dict[str, str]]) -> str:
         logger.error(f"Gemini Error: {str(e)}")
         return f"Error: Gemini Error: {str(e)}"
 
-async def query_model(query: str, provider: str, history: List[Dict[str, str]]):
+async def query_model(query: str, provider: str):
     provider = provider.lower()
     if provider == "openai":
-        async for chunk in ask_openai(query, history):
-            yield chunk
+        return await ask_openai(query)
     elif provider == "anthropic":
-        yield await ask_anthropic(query, history)
+        return await ask_anthropic(query)
     elif provider == "gemini":
-        yield await ask_gemini(query, history)
+        return await ask_gemini(query)
     else:
-        yield f"Error: Unknown provider: {provider}"
+        return f"Error: Unknown provider: {provider}"
 
 # Gradio interface
-with gr.Blocks(theme=gr.themes.Soft()) as demo:
-    gr.Markdown("# Multi-Model Chat")
-    gr.Markdown("Chat with OpenAI, Anthropic, or Gemini. Select a provider and start typing!")
+with gr.Blocks() as demo:
+    gr.Markdown("# Multi-Model Selector")
+    gr.Markdown("Select a provider and enter a query to get a response from the chosen AI model.")
+    
+    provider = gr.Dropdown(choices=["OpenAI", "Anthropic", "Gemini"], label="Select Provider")
+    query = gr.Textbox(label="Enter your query", placeholder="e.g., What is the capital of the United States?")
+    submit_button = gr.Button("Submit")
+    output = gr.Textbox(label="Response", interactive=False)
     
-    provider = gr.Dropdown(choices=["OpenAI", "Anthropic", "Gemini"], label="Select Provider", value="OpenAI")
-    chatbot = gr.ChatInterface(
+    submit_button.click(
         fn=query_model,
-        additional_inputs=[provider],
-        title="",
-        description=""
+        inputs=[query, provider],
+        outputs=output
     )
 
 # Launch the Gradio app