Update app.py

app.py

@@ -1,19 +1,58 @@
 import gradio as gr
-from deep_agent import agent
+from deep_agent import invoke_agent_for_user
 import os
 import re
+import traceback
+import uuid
+import hashlib
 
 os.makedirs("static", exist_ok=True)
 
-def process_delivery_query(query):
-    """Process delivery queries and return text + map"""
+def get_user_id(request: gr.Request) -> str:
+    """
+    Generate a unique user ID based on session or IP.
+    
+    In production, replace this with proper authentication:
+    - OAuth tokens
+    - Session cookies
+    - Database user IDs
+    """
+    if request:
+        session_hash = request.session_hash if hasattr(request, 'session_hash') else None
+        if session_hash:
+            return f"user_{session_hash}"
+        
+        # Fallback to IP-based ID (not ideal for production)
+        client_ip = request.client.host if hasattr(request, 'client') else "unknown"
+        return f"user_{hashlib.md5(client_ip.encode()).hexdigest()[:8]}"
+    
+    # Fallback for testing
+    return f"user_{uuid.uuid4().hex[:8]}"
+
+
+def process_delivery_query(query, user_session_id, request: gr.Request):
+    """
+    Process delivery queries with multi-user support.
+    
+    Each user has isolated memory and cannot access other users' data.
+    """
     if not query.strip():
-        return "<div style='color:#388e3c; padding:20px; background:#e8f5e9; border-radius:8px;'>Please enter a query</div>", None
+        return "<div style='color:#d32f2f; padding:20px; background:#ffebee; border-radius:8px; border-left:4px solid #d32f2f;'>Please enter a query</div>", None, user_session_id
     
     try:
-        result = agent.invoke({
-            "messages": [{"role": "user", "content": query}]
-        })
+
+        user_id = get_user_id(request)
+        
+
+        if not user_session_id:
+            user_session_id = str(uuid.uuid4())
+        
+
+        result = invoke_agent_for_user(
+            user_id=user_id,
+            message=query,
+            thread_id=user_session_id
+        )
         
         response_text = ""
         if isinstance(result, dict) and "messages" in result:
@@ -23,216 +62,326 @@ def process_delivery_query(query):
                     break
         else:
             response_text = str(result)
+        
+        print("="*60)
+        print(f"USER: {user_id} | THREAD: {user_session_id}")
+        print("AGENT RESPONSE:")
+        print(response_text)
+        print("="*60)
+        
 
         map_file_path = None
         map_url_pattern = r'/view-map/([^\s\)]+\.html)'
         map_match = re.search(map_url_pattern, response_text)
-        
+
         if map_match:
             map_filename = map_match.group(1)
-            map_file_path = f"static/{map_filename}"
+            map_file_path = os.path.join("static", map_filename)
+
         elif os.path.exists("static"):
-            map_files = [f for f in os.listdir("static") if f.startswith("route_") and f.endswith(".html")]
+            map_files = [
+                f for f in os.listdir("static")
+                if (
+                    f.startswith("route_")
+                    or f.startswith("traffic_")
+                    or f.startswith("weather_")
+                ) and f.endswith(".html")
+            ]
             if map_files:
-                map_files.sort(key=lambda x: os.path.getmtime(os.path.join("static", x)), reverse=True)
-                map_file_path = f"static/{map_files[0]}"
+                map_files.sort(
+                    key=lambda x: os.path.getmtime(os.path.join("static", x)),
+                    reverse=True,
+                )
+                map_file_path = os.path.join("static", map_files[0])
+
 
         response_text = re.sub(map_url_pattern, '', response_text)
         response_text = re.sub(r'INTERACTIVE MAP:.*?\n', '', response_text)
-        
-        html_response = response_text
-        html_response = html_response.replace('PRIMARY ROUTE:', '<h3 style="color:#2e7d32; margin-top:25px; border-left:4px solid #2e7d32; padding-left:15px;">PRIMARY ROUTE</h3>')
-        html_response = html_response.replace('ROUTE COMPARISON:', '<h3 style="color:#388e3c; margin-top:25px; border-left:4px solid #388e3c; padding-left:15px;">ROUTE COMPARISON</h3>')
-        html_response = html_response.replace('Cost Estimate', '<h3 style="color:#4caf50; margin-top:25px; border-left:4px solid #4caf50; padding-left:15px;">Cost Estimate</h3>')
-        html_response = html_response.replace('Traffic Analysis', '<h3 style="color:#66bb6a; margin-top:25px; border-left:4px solid #66bb6a; padding-left:15px;">Traffic Analysis</h3>')
-        html_response = html_response.replace('Route Analysis', '<h3 style="color:#2e7d32; margin-top:25px; border-left:4px solid #2e7d32; padding-left:15px;">Route Analysis</h3>')
-        
-        html_response = html_response.replace('\n\n', '<br><br>')
-        html_response = html_response.replace('\n', '<br>')
-        html_response = f"<div style='font-family: system-ui; line-height:1.8; color:#2f3e46; padding:20px;'>{html_response}</div>"
 
-        return html_response, map_file_path
+        html_response = format_response(response_text)
+
+        map_display = None
+        if map_file_path and os.path.exists(map_file_path):
+            with open(map_file_path, 'r', encoding='utf-8') as f:
+                map_html = f.read()
+
+            map_display = f"""
+            <div style='width:100%; height:650px; border-radius:12px; overflow:hidden; 
+                        box-shadow:0 4px 12px rgba(0,0,0,0.15); border:1px solid #e0e0e0;'>
+                <iframe srcdoc='{map_html.replace("'", "&apos;")}' 
+                        style='width:100%; height:100%; border:none;'>
+                </iframe>
+            </div>
+            """
+
+        return html_response, map_display, user_session_id
 
+    
     except Exception as e:
+        traceback.print_exc()
         error_html = f"""
-        <div style='padding:25px; background:#e8f5e9; border-left:5px solid #388e3c; border-radius:10px;'>
-            <h3 style='color:#388e3c; margin:0 0 15px 0;'>Error Occurred</h3>
-            <p style='margin:0 0 10px 0; color:#33691e;'><strong>Error:</strong> {str(e)}</p>
-            <div style='margin-top:15px; padding:15px; background:#fff; border-radius:8px;'>
-                <p style='margin:0; font-size:14px; color:#4e5d4b;'>
-                    <strong>Tips:</strong><br>
-                    - Use full city names: "Mumbai, Maharashtra, India"<br>
-                    - Include country for international routes<br>
-                    - Check spelling of location names
-                </p>
-            </div>
+        <div style='padding:25px; background:#ffebee; border-left:5px solid #ef5350; 
+                    border-radius:10px; box-shadow:0 2px 8px rgba(0,0,0,0.1);'>
+            <h3 style='color:#c62828; margin:0 0 15px 0; font-weight:600;'>Error Occurred</h3>
+            <p style='margin:0; color:#b71c1c; line-height:1.6;'><strong>Details:</strong> {str(e)}</p>
         </div>
         """
-        return error_html, None
+        return error_html, None, user_session_id
+
+
+def format_response(text):
+    """Format response text into structured HTML sections"""
+    
+    if not text or len(text.strip()) < 10:
+        return """<div style='padding:40px; text-align:center; color:#757575; background:#fafafa; 
+                         border-radius:10px; min-height:300px; display:flex; align-items:center; 
+                         justify-content:center;'>
+                         <div><p style='font-size:1.1em;'>No response received</p></div></div>"""
+    
+
+    sections = {
+        'route': '',
+        'weather': '',
+        'traffic': '',
+        'cost': '',
+        'other': ''
+    }
+    
+    current_section = 'other'
+    lines = text.split('\n')
+    
+    for line in lines:
+        line_upper = line.upper()
+        if 'ROUTE' in line_upper and ('SUMMARY' in line_upper or 'ANALYSIS' in line_upper):
+            current_section = 'route'
+            continue
+        elif 'WEATHER' in line_upper and ('CONDITION' in line_upper or 'ANALYSIS' in line_upper):
+            current_section = 'weather'
+            continue
+        elif 'TRAFFIC' in line_upper and 'ANALYSIS' in line_upper:
+            current_section = 'traffic'
+            continue
+        elif 'COST' in line_upper and ('ESTIMATE' in line_upper or 'BREAKDOWN' in line_upper):
+            current_section = 'cost'
+            continue
+        
+        sections[current_section] += line + '\n'
+    
+    html = "<div style='font-family: -apple-system, BlinkMacSystemFont, \"Segoe UI\", Roboto, sans-serif;'>"
+    
+    cards_created = 0
+    
+    if sections['route'].strip():
+        html += create_card("Route Information", sections['route'], "#78C841", "route")
+        cards_created += 1
+    
+    if sections['traffic'].strip():
+        html += create_card("Traffic Analysis", sections['traffic'], "#f57c00", "traffic")
+        cards_created += 1
+    
+    if sections['weather'].strip():
+        html += create_card("Weather Conditions", sections['weather'], "#6B8E23", "weather")
+        cards_created += 1
+    
+    if sections['cost'].strip():
+        html += create_card("Cost Estimate", sections['cost'], "#7b1fa2", "cost")
+        cards_created += 1
+    
+    if cards_created == 0:
+        html += f"""<div style='padding:20px; background:#f5f5f5; border-radius:10px; line-height:1.8;'>
+                    {text.replace('\n', '<br>')}</div>"""
+    
+    html += "</div>"
+    return html
+
+
+def create_card(title, content, color, card_type):
+    """Create a styled card for each section"""
+    
+    formatted_content = content.strip()
+    
+    if not formatted_content or len(formatted_content) < 3:
+        return ""
+    
+    formatted_content = formatted_content.replace('\n', '<br>')
+    
+    formatted_content = re.sub(
+        r'(Distance:|Duration:|ETA:|Base Duration:|Adjusted ETA:|Temperature:|Traffic:|Cost:|Vehicle:|Origin:|Destination:|Current Traffic:|Traffic Factor:|Expected Delay:|Advice:|Recommended Vehicle:|Total Cost:|Weather Alerts?:|Condition:)',
+        r'<strong>\1</strong>',
+        formatted_content
+    )
+    
+    if 'WARNING' in formatted_content.upper() or 'ALERT' in formatted_content.upper() or 'Heavy' in formatted_content:
+        border_color = '#ef5350'
+        bg_color = '#ffebee'
+    else:
+        border_color = color
+        bg_color = f'{color}15'
+    
+    card_html = f"""
+    <div style='margin-bottom:20px; border-radius:10px; overflow:hidden; 
+                box-shadow:0 2px 8px rgba(0,0,0,0.1); border-left:4px solid {border_color};'>
+        <div style='background:{color}; color:white; padding:15px; font-weight:600; font-size:1.1em;'>
+            {title}
+        </div>
+        <div style='background:{bg_color}; padding:20px; line-height:1.8; color:#2e2e2e;'>
+            {formatted_content}
+        </div>
+    </div>
+    """
+    return card_html
+
+
+def clear_all():
+    """Clear all outputs"""
+    return (
+        "",
+        "<div style='padding:40px; text-align:center; color:#757575; background:#fafafa; border-radius:10px; min-height:300px; display:flex; align-items:center; justify-content:center;'><div><p style='font-size:1.1em;'>Your route details will appear here</p><p style='font-size:0.9em; margin-top:10px; color:#9e9e9e;'>Enter a query and click Send to get started</p></div></div>",
+        "<div style='padding:40px; text-align:center; color:#757575; background:#fafafa; border-radius:10px; min-height:600px; display:flex; align-items:center; justify-content:center;'><div><p style='font-size:1.1em;'>Interactive map will appear here</p><p style='font-size:0.9em; margin-top:10px; color:#9e9e9e;'>Plan a route to see the map</p></div></div>",
+        None  
+    )
+
 
 with gr.Blocks(
-    theme=gr.themes.Soft(primary_hue="green", secondary_hue="lime"),
-    title="SparkDeliver AI",
+    theme=gr.themes.Soft(primary_hue="green", secondary_hue="emerald"),
+    title="SparkDelivery - Intelligent Route Planning",
     css="""
-        body, html {
-            margin: 0;
-            padding: 0;
-            width: 100%;
-            overflow-x: hidden;
-        }
-        .gradio-container {
-            max-width: 100% !important;
-            width: 100% !important;
-            padding: 0 !important;
-            margin: 0 auto !important;
+        .gradio-container { max-width: 100% !important; }
+        .input-box textarea { font-size: 1.05em !important; }
+        button.primary { 
+            background: #78C841 !important; 
+            border-color: #78C841 !important;
+            color: white !important;
         }
-        .block {
-            width: 100% !important;
-        }
-        #root > div {
-            width: 100% !important;
+        button.primary:hover { 
+            background: #5d8a47 !important; 
+            border-color: #5d8a47 !important;
         }
     """
 ) as demo:
     
+
+    user_session_state = gr.State(value=None)
+    
     gr.HTML("""
-    <div style='
-        text-align: center;
-        padding: 30px;
-        background: linear-gradient(135deg, #81c784 0%, #66bb6a 100%);
-        border-radius: 15px;
-        color: white;
-        margin-bottom: 30px;
-        box-shadow: 0 10px 30px rgba(76, 175, 80, 0.25);
-    '>
-        <h1 style='margin:0; font-size:2.8em; font-weight:700;'>
-            SparkDeliver AI
+    <div style='text-align:center; padding:40px 30px; 
+                background:linear-gradient(135deg, #78C841 0%, #5d8a47 100%);
+                border-radius:15px; color:white; margin-bottom:30px; 
+                box-shadow:0 10px 30px rgba(76,118,59,0.3);'>
+        <h1 style='margin:0; font-size:3em; font-weight:700; letter-spacing:-1px;'>
+            🚚 SparkDelivery
         </h1>
-        <p style='margin:15px 0 0 0; font-size:1.3em; opacity:0.95; font-weight:300;'>
-            Real-time Route Planning | Cost Analysis | Traffic Intelligence
+        <p style='margin:20px 0 0 0; font-size:1.2em; opacity:0.95; font-weight:300;'>
+            Intelligent Route Planning with Real-Time Weather and Traffic Analysis
         </p>
-        <p style='margin:10px 0 0 0; font-size:1em; opacity:0.85;'>
+        <div style='margin-top:20px; font-size:0.95em; opacity:0.85;'>
+            <p style='margin:20px 0 0 0; font-size:1.2em; opacity:0.95; font-weight:300;'>
             Powered by SparkBrains
         </p>
+        </div>
     </div>
     """)
-    
+
     with gr.Row():
-        with gr.Column(scale=2):
-            gr.Markdown("### Enter Your Delivery Query")
-            
+        with gr.Column(scale=1):
+            gr.Markdown("### Query Input")
             query_input = gr.Textbox(
                 label="",
-                placeholder="Example: Plan a delivery route from Mumbai, Maharashtra to Pune, Maharashtra with 500kg cargo",
-                lines=6,
-                show_label=False
+                placeholder="Examples:\n• Plan route from Mumbai to Pune\n• Route from Delhi to Jaipur with 500kg package\n• What was my last route?\n• Save preference: I prefer morning deliveries",
+                lines=5,
+                show_label=False,
+                elem_classes=["input-box"]
             )
             
             with gr.Row():
-                submit_btn = gr.Button(
-                    "Optimize Delivery", 
-                    variant="primary", 
-                    size="lg",
-                    scale=4
-                )
-                clear_btn = gr.ClearButton(
-                    [query_input], 
-                    value="Clear",
-                    size="lg",
-                    scale=1
-                )
+                submit_btn = gr.Button("Send", variant="primary", size="lg", scale=3, elem_classes=["primary"])
+                clear_btn = gr.Button("Clear", size="lg", scale=1)
+            
+            gr.Markdown("### Quick Examples")
+            gr.Examples(
+                examples=[
+                    "Plan route from Delhi to Chandigarh",
+                    "Route from Mumbai to Pune with 200kg cargo",
+                    "What was my last route?",
+                    "Save preference: I prefer morning deliveries",
+                    "Traffic conditions Bhopal to Jaipur",
+                    "Weather conditions Mumbai to Pune",
+                ],
+                inputs=query_input,
+                label=""
+            )
+
+    gr.Markdown("---")
+    
+    gr.Markdown("## Results")
     
     with gr.Row():
-        with gr.Column(scale=3):
-            gr.Markdown("### Route Analysis")
-            output = gr.HTML(label="", show_label=False)
-        
         with gr.Column(scale=2):
+            gr.Markdown("### Route Details")
+            output = gr.HTML(
+                label="",
+                show_label=False,
+                value="""<div style='padding:40px; text-align:center; color:#757575; background:#fafafa; 
+                         border-radius:10px; min-height:300px; display:flex; align-items:center; 
+                         justify-content:center;'>
+                         <div><p style='font-size:1.1em;'>Your route details will appear here</p>
+                         <p style='font-size:0.9em; margin-top:10px; color:#9e9e9e;'>
+                         Enter a query and click Send to get started</p></div></div>"""
+            )
+        
+        with gr.Column(scale=3):
             gr.Markdown("### Interactive Map")
             map_output = gr.HTML(
                 label="",
                 show_label=False,
-                value="<div style='padding:40px; text-align:center; color:#388e3c; background:#f1f8e9; border-radius:10px; min-height:400px; display:flex; align-items:center; justify-content:center;'><div><p>Map will appear here after route planning</p></div></div>"
+                value="""<div style='padding:40px; text-align:center; color:#757575; background:#fafafa; 
+                         border-radius:10px; min-height:600px; display:flex; align-items:center; 
+                         justify-content:center;'>
+                         <div><p style='font-size:1.1em;'>Interactive map will appear here</p>
+                         <p style='font-size:0.9em; margin-top:10px; color:#9e9e9e;'>
+                         Plan a route to see the map</p></div></div>"""
             )
     
-    def process_and_display(query):
-        """Process query and return both text and map"""
-        text_result, map_path = process_delivery_query(query)
-        
-        if map_path and os.path.exists(map_path):
-            with open(map_path, 'r', encoding='utf-8') as f:
-                map_html = f.read()
-            
-            map_display = f"""
-            <div style='width:100%; height:600px; border-radius:10px; overflow:hidden; box-shadow:0 4px 6px rgba(0,0,0,0.1);'>
-                <iframe srcdoc='{map_html.replace("'", "&apos;")}' 
-                        style='width:100%; height:100%; border:none;'>
-                </iframe>
-            </div>
-            """
-            return text_result, map_display
-        else:
-            no_map = """
-            <div style='padding:40px; text-align:center; color:#388e3c; background:#f1f8e9; border-radius:10px; min-height:400px; display:flex; align-items:center; justify-content:center;'>
-                <div>
-                    <p>No map available for this query</p>
-                </div>
-            </div>
-            """
-            return text_result, no_map
-    
+    def reset_before_new_query():
+        return (
+            "<div style='padding:40px; text-align:center; color:#757575; background:#fafafa; border-radius:10px; min-height:300px;'>Processing new request...</div>",
+            "<div style='padding:40px; text-align:center; color:#757575; background:#fafafa; border-radius:10px; min-height:600px;'>Loading new map...</div>",
+        )
+
+
     submit_btn.click(
-        fn=process_and_display,
-        inputs=query_input,
+        fn=reset_before_new_query, 
+        inputs=None, 
         outputs=[output, map_output]
+    ).then(
+        fn=process_delivery_query,
+        inputs=[query_input, user_session_state], 
+        outputs=[output, map_output, user_session_state],
     )
     
-    gr.Markdown("### Try These Example Queries")
-    gr.Examples(
-        examples=[
-            "Plan route from Delhi, India to Jaipur, Rajasthan, India",
-            "Check traffic conditions between Bangalore, Karnataka and Chennai, Tamil Nadu",
-            "Find optimal route from Mumbai, Maharashtra to Pune, Maharashtra with 500kg cargo",
-            "What's the best route from Kolkata to Bhubaneswar?",
-        ],
-        inputs=query_input,
-        label=""
+    query_input.submit(
+        fn=process_delivery_query,
+        inputs=[query_input, user_session_state],  
+        outputs=[output, map_output, user_session_state]
     )
     
-    gr.HTML("""
-    <div style='margin-top:30px; padding:25px; background:#f1f8e9; border-radius:15px;'>
-        <h3 style='margin:0 0 20px 0; color:#2e7d32;'>Features</h3>
-        <div style='display:grid; grid-template-columns: repeat(auto-fit, minmax(200px, 1fr)); gap:15px;'>
-            <div style='padding:15px; background:white; border-radius:10px; border-left:4px solid #2e7d32;'>
-                <strong>Interactive Maps</strong>
-                <p style='margin:5px 0 0 0; font-size:0.9em; color:#4e5d4b;'>Visual turn-by-turn directions</p>
-            </div>
-            <div style='padding:15px; background:white; border-radius:10px; border-left:4px solid #388e3c;'>
-                <strong>Cost Optimization</strong>
-                <p style='margin:5px 0 0 0; font-size:0.9em; color:#4e5d4b;'>Real-world pricing estimates</p>
-            </div>
-            <div style='padding:15px; background:white; border-radius:10px; border-left:4px solid #66bb6a;'>
-                <strong>Traffic Analysis</strong>
-                <p style='margin:5px 0 0 0; font-size:0.9em; color:#4e5d4b;'>Live traffic patterns</p>
-            </div>
-            <div style='padding:15px; background:white; border-radius:10px; border-left:4px solid #81c784;'>
-                <strong>Route Comparison</strong>
-                <p style='margin:5px 0 0 0; font-size:0.9em; color:#4e5d4b;'>Multiple route options</p>
-            </div>
-        </div>
-    </div>
-    """)
-    
+    clear_btn.click(
+        fn=clear_all,
+        inputs=None,
+        outputs=[query_input, output, map_output, user_session_state]
+    )
+
     gr.Markdown("---")
     gr.Markdown(
-        "<div style='text-align:center; color:#4e5d4b; font-size:0.9em;'>"
-        "Built with DeepAgents | LangChain | Groq | OpenStreetMap<br>"
-        "Ready for Multi-Agent Hub Integration"
+        "<div style='text-align:center; color:#666; font-size:0.9em; padding:20px;'>"
+        "Powered by DeepAgents | LangChain | Gemini | OpenStreetMap | OpenWeatherMap | TomTom<br>"
+        "<span style='color:#78C841; font-size:0.85em; font-weight:600;'>Real-time routing with multi-user memory isolation</span>"
         "</div>"
     )
 
 if __name__ == "__main__":
     demo.launch(
         server_name="0.0.0.0",
-        server_port=7860,
-    )
+        server_port=7861,
+        share=False
+    )