Update app.py

app.py

@@ -1,50 +1,61 @@
 import os
 import json
 import requests
-from fastapi import FastAPI, Request, Header
+from fastapi import FastAPI, Request
 from fastapi.responses import HTMLResponse, JSONResponse
 from fastapi.staticfiles import StaticFiles
 from fastapi.templating import Jinja2Templates
 
 # =========================
-# APP INIT
+# APP INIT (HARDENED)
 # =========================
 
-app = FastAPI(title="PyRunner AI Space", version="1.0")
+app = FastAPI(title="PyRunner AI Space", version="2.0")
 
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 
-templates = Jinja2Templates(directory=os.path.join(BASE_DIR, "templates"))
+TEMPLATE_DIR = os.path.join(BASE_DIR, "templates")
+STATIC_DIR = os.path.join(BASE_DIR, "static")
 
-static_path = os.path.join(BASE_DIR, "static")
-if os.path.exists(static_path):
-    app.mount("/static", StaticFiles(directory=static_path), name="static")
+# SAFE TEMPLATE LOADER (FIXES YOUR ERROR CLASS)
+templates = Jinja2Templates(directory=TEMPLATE_DIR)
+
+if os.path.exists(STATIC_DIR):
+    app.mount("/static", StaticFiles(directory=STATIC_DIR), name="static")
 
 
 # =========================
-# ENV
+# ENV LOADER (SAFE DEFAULTS)
 # =========================
 
-OLLAMA_URL = os.getenv("OLLAMA_URL", "http://localhost:11434")
-OLLAMA_FALLBACK_URL = os.getenv("OLLAMA_FALLBACK_URL")
+def env(key, default=None):
+    value = os.getenv(key, default)
+    if value == "None":
+        return None
+    return value
+
+
+OLLAMA_URL = env("OLLAMA_URL", "http://localhost:11434")
+OLLAMA_FALLBACK_URL = env("OLLAMA_FALLBACK_URL")
 
-OLLAMA_MODEL = os.getenv("OLLAMA_MODEL", "qwen2.5:1.5b")
-OLLAMA_CODE_MODEL = os.getenv("OLLAMA_CODE_MODEL", "qwen2.5-coder:1.5b")
-OLLAMA_FAST_MODEL = os.getenv("OLLAMA_FAST_MODEL", "deepseek-coder:1.3b")
-OLLAMA_BACKUP_MODEL = os.getenv("OLLAMA_BACKUP_MODEL", "llama3.2:1b")
+OLLAMA_MODEL = env("OLLAMA_MODEL", "qwen2.5:1.5b")
+OLLAMA_CODE_MODEL = env("OLLAMA_CODE_MODEL", "qwen2.5-coder:1.5b")
+OLLAMA_FAST_MODEL = env("OLLAMA_FAST_MODEL", "deepseek-coder:1.3b")
+OLLAMA_BACKUP_MODEL = env("OLLAMA_BACKUP_MODEL", "llama3.2:1b")
 
-OPENROUTER_API_KEY = os.getenv("OPENROUTER_API_KEY")
-OPENROUTER_MODEL = os.getenv("OPENROUTER_MODEL")
+OPENROUTER_API_KEY = env("OPENROUTER_API_KEY")
+OPENROUTER_MODEL = env("OPENROUTER_MODEL")
 
-SUPABASE_URL = os.getenv("SUPABASE_URL")
-SUPABASE_KEY = os.getenv("SUPABASE_KEY")
+SUPABASE_URL = env("SUPABASE_URL")
+SUPABASE_KEY = env("SUPABASE_KEY")
+N8N_WEBHOOK_URL = env("N8N_WEBHOOK_URL")
 
 
 # =========================
-# SAFE OLLAMA CALL
+# OLLAMA CLIENT (HARDENED)
 # =========================
 
-def call_ollama(prompt: str, model: str):
+def call_ollama(prompt, model):
     try:
         r = requests.post(
             f"{OLLAMA_URL}/api/generate",
@@ -57,16 +68,35 @@ def call_ollama(prompt: str, model: str):
         )
         return r.json()
     except Exception as e:
-        return {"error": str(e)}
+        return {"error": str(e), "source": "ollama_primary"}
+
+
+def call_ollama_fallback(prompt):
+    if not OLLAMA_FALLBACK_URL:
+        return {"error": "No fallback URL configured"}
+
+    try:
+        r = requests.post(
+            f"{OLLAMA_FALLBACK_URL}/api/generate",
+            json={
+                "model": OLLAMA_BACKUP_MODEL,
+                "prompt": prompt,
+                "stream": False
+            },
+            timeout=60
+        )
+        return r.json()
+    except Exception as e:
+        return {"error": str(e), "source": "ollama_fallback"}
 
 
 # =========================
-# OPENROUTER FALLBACK
+# OPENROUTER (OPTIONAL)
 # =========================
 
-def call_openrouter(prompt: str):
+def call_openrouter(prompt):
     if not OPENROUTER_API_KEY:
-        return {"error": "No OpenRouter key"}
+        return {"error": "OpenRouter not configured"}
 
     try:
         r = requests.post(
@@ -77,43 +107,52 @@ def call_openrouter(prompt: str):
             },
             json={
                 "model": OPENROUTER_MODEL,
-                "messages": [
-                    {"role": "user", "content": prompt}
-                ]
+                "messages": [{"role": "user", "content": prompt}]
             },
             timeout=60
         )
         return r.json()
     except Exception as e:
-        return {"error": str(e)}
+        return {"error": str(e), "source": "openrouter"}
 
 
 # =========================
-# ROUTER (1B–2B ONLY LOGIC)
+# SMART ROUTER (1B–2B ONLY SAFE)
 # =========================
 
-def route_model(task: str):
-    task = task.lower()
+def route_model(mode: str):
+    mode = (mode or "").lower()
 
-    if "code" in task or "script" in task:
+    if "code" in mode:
         return OLLAMA_CODE_MODEL
 
-    if "fast" in task:
+    if "fast" in mode:
         return OLLAMA_FAST_MODEL
 
-    if "fallback" in task:
+    if "backup" in mode or "fallback" in mode:
         return OLLAMA_BACKUP_MODEL
 
     return OLLAMA_MODEL
 
 
 # =========================
-# UI ROUTE
+# UI ROUTE (SAFE)
 # =========================
 
 @app.get("/", response_class=HTMLResponse)
 async def home(request: Request):
-    return templates.TemplateResponse("index.html", {"request": request})
+    try:
+        return templates.TemplateResponse(
+            "index.html",
+            {"request": request}
+        )
+    except Exception as e:
+        # HARD FALLBACK (prevents total crash)
+        return HTMLResponse(f"""
+        <h1>PyRunner Running</h1>
+        <p>Template error fallback active</p>
+        <pre>{str(e)}</pre>
+        """)
 
 
 # =========================
@@ -127,13 +166,15 @@ def health():
         "ollama": OLLAMA_URL,
         "models": {
             "default": OLLAMA_MODEL,
-            "code": OLLAMA_CODE_MODEL
+            "code": OLLAMA_CODE_MODEL,
+            "fast": OLLAMA_FAST_MODEL,
+            "backup": OLLAMA_BACKUP_MODEL
         }
     }
 
 
 # =========================
-# CHAT ENDPOINT
+# CHAT ENDPOINT (IMPROVED FLOW)
 # =========================
 
 @app.post("/api/chat")
@@ -145,82 +186,80 @@ async def chat(request: Request):
 
     model = route_model(mode)
 
+    # 1. Try primary Ollama
     result = call_ollama(prompt, model)
 
-    # fallback logic
-    if "error" in result and OLLAMA_FALLBACK_URL:
-        try:
-            r = requests.post(
-                f"{OLLAMA_FALLBACK_URL}/api/generate",
-                json={
-                    "model": OLLAMA_BACKUP_MODEL,
-                    "prompt": prompt,
-                    "stream": False
-                },
-                timeout=60
-            )
-            result = r.json()
-        except Exception as e:
-            result = {"error": str(e)}
+    # 2. Fallback to local backup
+    if "error" in result:
+        result = call_ollama_fallback(prompt)
+
+    # 3. Optional OpenRouter fallback (last resort)
+    if "error" in result:
+        result = call_openrouter(prompt)
 
     return JSONResponse(result)
 
 
 # =========================
-# IMAGE PIPELINE HOOK (stub)
+# IMAGE PIPELINE (STUB READY)
 # =========================
 
 @app.post("/api/image")
 async def image_pipeline(request: Request):
     body = await request.json()
-
-    prompt = body.get("prompt", "a modern hairstyle")
+    prompt = body.get("prompt", "")
 
     return {
         "status": "queued",
-        "message": "Image pipeline not yet connected",
-        "prompt": prompt
+        "pipeline": "not_connected",
+        "prompt": prompt,
+        "note": "Connect to diffusion/vision service next"
     }
 
 
 # =========================
-# N8N WEBHOOK TRIGGER
+# N8N WEBHOOK
 # =========================
 
 @app.post("/api/webhook/n8n")
 async def trigger_n8n(request: Request):
-    body = await request.json()
-
-    webhook_url = os.getenv("N8N_WEBHOOK_URL")
+    if not N8N_WEBHOOK_URL:
+        return {"error": "N8N webhook not set"}
 
-    if not webhook_url:
-        return {"error": "No webhook configured"}
+    body = await request.json()
 
     try:
-        r = requests.post(webhook_url, json=body, timeout=30)
-        return {"status": "sent", "response": r.text}
+        r = requests.post(N8N_WEBHOOK_URL, json=body, timeout=30)
+        return {
+            "status": "sent",
+            "response": r.text
+        }
     except Exception as e:
         return {"error": str(e)}
 
 
 # =========================
-# DEBUG CONFIG (SAFE)
+# DEBUG CONFIG
 # =========================
 
 @app.get("/config")
 def config():
     return {
         "ollama_url": OLLAMA_URL,
+        "supabase": bool(SUPABASE_URL and SUPABASE_KEY),
+        "openrouter": bool(OPENROUTER_API_KEY),
+        "n8n": bool(N8N_WEBHOOK_URL),
         "models": {
             "default": OLLAMA_MODEL,
-            "code": OLLAMA_CODE_MODEL,
-            "fast": OLLAMA_FAST_MODEL,
-            "backup": OLLAMA_BACKUP_MODEL
-        },
-        "openrouter": {
-            "enabled": bool(OPENROUTER_API_KEY)
-        },
-        "supabase": {
-            "enabled": bool(SUPABASE_URL and SUPABASE_KEY)
+            "code": OLLAMA_CODE_MODEL
         }
-    }
+    }
+
+
+# =========================
+# SIMPLE TEST ROUTE (IMPORTANT FOR DEBUGGING)
+# =========================
+
+@app.get("/ping")
+def ping():
+    return {"ping": "ok"}