Update main.py

main.py

@@ -1,80 +1,66 @@
-from fastapi import FastAPI
 import gradio as gr
 import google.generativeai as genai
-from weather import get_current_weather
+import requests
 import os
-import uvicorn
 import json
 
-app = FastAPI()
+# Configure Gemini
 genai.configure(api_key=os.getenv("GEMINI_API_KEY"))
 model = genai.GenerativeModel('gemini-pro')
 
-# Tools configuration
-tools = [
-    {
-        "name": "get_current_weather",
-        "description": "Get current weather information",
-        "parameters": {
-            "type": "object",
-            "properties": {
-                "location": {
-                    "type": "string",
-                    "description": "City name, e.g. Paris, France"
-                }
-            },
-            "required": ["location"]
-        }
-    }
-]
-
-def execute_tool_call(tool_call):
-    func_name = tool_call["name"]
-    args = json.loads(tool_call["arguments"])
+def get_current_weather(location: str) -> str:
+    """Get current weather using weatherapi.com"""
+    api_key = os.getenv("WEATHER_API_KEY")
+    if not api_key:
+        return "Weather API key not set"
     
-    if func_name == "get_current_weather":
-        return get_current_weather(args["location"])
-    else:
-        return f"Error: Unknown function {func_name}"
+    try:
+        response = requests.get(
+            "http://api.weatherapi.com/v1/current.json",
+            params={"key": api_key, "q": location, "aqi": "no"},
+            timeout=10
+        )
+        response.raise_for_status()
+        data = response.json()
+        current = data["current"]
+        return (
+            f"Weather in {data['location']['name']}:\n"
+            f"• Temperature: {current['temp_c']}°C\n"
+            f"• Condition: {current['condition']['text']}\n"
+            f"• Humidity: {current['humidity']}%\n"
+            f"• Wind: {current['wind_kph']} km/h"
+        )
+    except Exception as e:
+        return f"Error fetching weather: {str(e)}"
 
 def process_message(message):
-    # Generate tool use suggestions
-    response = model.generate_content(
-        f"Analyze if user needs weather info: {message}. Respond ONLY with JSON:"
-        '{{"needs_weather": true|false, "location": "city"}}'
-    )
+    """Process user message with Gemini"""
+    # First check if it's a weather request
+    if "weather" in message.lower():
+        # Simple extraction - get the last word as location
+        location = message.split()[-1] if len(message.split()) > 1 else "London"
+        return get_current_weather(location)
     
+    # Otherwise use Gemini
     try:
-        analysis = json.loads(response.text)
-        if analysis.get("needs_weather", False):
-            location = analysis.get("location", "London")
-            return get_current_weather(location)
-    except:
-        pass
-    
-    # Regular response
-    chat = model.start_chat(history=[])
-    response = chat.send_message(message)
-    return response.text
-
-# Gradio Interface with new message format
-with gr.Blocks() as demo:
-    chatbot = gr.Chatbot(height=500, type="messages")
-    msg = gr.Textbox(label="Message")
-    clear = gr.Button("Clear")
-
-    def respond(message, chat_history):
-        bot_message = process_message(message)
-        # Append user and bot messages
-        chat_history.append({"role": "user", "content": message})
-        chat_history.append({"role": "assistant", "content": bot_message})
-        return "", chat_history
+        response = model.generate_content(message)
+        return response.text
+    except Exception as e:
+        return f"Gemini error: {str(e)}"
 
-    msg.submit(respond, [msg, chatbot], [msg, chatbot])
-    clear.click(lambda: None, None, chatbot, queue=False)
+# Gradio Interface
+def chat_interface(message, history):
+    """Gradio chat function"""
+    bot_message = process_message(message)
+    return bot_message
 
-app = gr.mount_gradio_app(app, demo, path="/")
+demo = gr.ChatInterface(
+    fn=chat_interface,
+    title="MCP Server",
+    description="Ask about anything or request weather updates",
+    examples=["What's the weather in Paris?", "Explain quantum computing"]
+)
 
+# For Hugging Face Spaces
 if __name__ == "__main__":
-    port = int(os.getenv("PORT", 8000))
-    uvicorn.run(app, host="0.0.0.0", port=port)
+    demo.launch(server_name="0.0.0.0", server_port=7860)