Update theme/app.py

theme/app.py

@@ -1,5 +1,6 @@
 import os
 import requests
+from pathlib import Path
 from fastapi import FastAPI, Request
 from fastapi.responses import JSONResponse, HTMLResponse
 from fastapi.templating import Jinja2Templates
@@ -8,13 +9,13 @@ from fastapi.templating import Jinja2Templates
 # APP INIT
 # =========================
 
-app = FastAPI(title="PyRunner Agent OS", version="3.1")
+app = FastAPI(title="PyRunner Agent OS", version="3.2")
 
-BASE_DIR = os.path.dirname(os.path.abspath(__file__))
-templates = Jinja2Templates(directory=os.path.join(BASE_DIR, "templates"))
+BASE_DIR = Path(__file__).resolve().parent
+templates = Jinja2Templates(directory=str(BASE_DIR / "templates"))
 
 # =========================
-# ENV
+# CONFIG
 # =========================
 
 OLLAMA_URL = os.getenv("OLLAMA_URL", "http://localhost:11434")
@@ -26,11 +27,11 @@ MODELS = {
     "fallback": os.getenv("OLLAMA_BACKUP_MODEL", "llama3.2:1b")
 }
 
-TIMEOUT = (5, 120)  # connect, read
+TIMEOUT = 90
 
 
 # =========================
-# SAFE OLLAMA CALL
+# OLLAMA CORE CALL (SAFE)
 # =========================
 
 def call_ollama(prompt: str, model: str):
@@ -46,14 +47,10 @@ def call_ollama(prompt: str, model: str):
         )
 
         if r.status_code != 200:
-            return {
-                "error": f"Ollama error {r.status_code}",
-                "raw": r.text
-            }
+            return {"error": f"Ollama HTTP {r.status_code}", "raw": r.text}
 
         data = r.json()
 
-        # normalize output
         return {
             "response": data.get("response", "").strip(),
             "raw": data
@@ -67,27 +64,30 @@ def call_ollama(prompt: str, model: str):
 # CLEAN OUTPUT PARSER
 # =========================
 
-def clean_text(text: str) -> str:
+def clean_category(text: str) -> str:
     if not text:
         return "general"
 
-    return (
-        text.lower()
-        .replace("\n", "")
-        .replace(".", "")
-        .strip()
-    )
+    text = text.lower().strip()
+
+    # force valid categories only
+    valid = ["code", "vision", "fashion", "hairstyle", "general"]
+
+    for v in valid:
+        if v in text:
+            return v
+
+    return "general"
 
 
 # =========================
 # ORCHESTRATOR
 # =========================
 
-def orchestrator_agent(user_input: str):
-    prompt = f"""
-You are an AI classifier.
+def orchestrator(user_input: str):
 
-Return ONLY ONE word:
+    prompt = f"""
+Classify into ONE word only:
 
 code
 vision
@@ -95,14 +95,14 @@ fashion
 hairstyle
 general
 
-User:
+Input:
 {user_input}
 """
 
     res = call_ollama(prompt, MODELS["orchestrator"])
 
     if "response" in res:
-        return clean_text(res["response"])
+        return clean_category(res["response"])
 
     return "general"
 
@@ -111,25 +111,19 @@ User:
 # AGENTS
 # =========================
 
-def coder_agent(prompt):
+def coder(prompt):
     return call_ollama(prompt, MODELS["coder"])
 
 
-def fashion_agent(prompt):
-    return call_ollama(
-        f"Fashion analysis:\n{prompt}",
-        MODELS["fast"]
-    )
+def fashion(prompt):
+    return call_ollama(f"Fashion analysis:\n{prompt}", MODELS["fast"])
 
 
-def hairstyle_agent(prompt):
-    return call_ollama(
-        f"Hairstyle analysis:\n{prompt}",
-        MODELS["fast"]
-    )
+def hairstyle(prompt):
+    return call_ollama(f"Hairstyle analysis:\n{prompt}", MODELS["fast"])
 
 
-def fallback_agent(prompt):
+def fallback(prompt):
     return call_ollama(prompt, MODELS["fallback"])
 
 
@@ -137,18 +131,18 @@ def fallback_agent(prompt):
 # ROUTER
 # =========================
 
-def route_agent(category: str, prompt: str):
+def route(category: str, prompt: str):
 
     if category == "code":
-        return coder_agent(prompt)
+        return coder(prompt)
 
     if category == "fashion":
-        return fashion_agent(prompt)
+        return fashion(prompt)
 
     if category == "hairstyle":
-        return hairstyle_agent(prompt)
+        return hairstyle(prompt)
 
-    return fallback_agent(prompt)
+    return fallback(prompt)
 
 
 # =========================
@@ -157,10 +151,13 @@ def route_agent(category: str, prompt: str):
 
 @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:
+        return HTMLResponse(f"<h1>Template Error</h1><pre>{e}</pre>")
 
 
 # =========================
@@ -182,36 +179,40 @@ def health():
 @app.post("/api/agent")
 async def agent(request: Request):
 
-    body = await request.json()
-    user_input = body.get("prompt", "")
+    try:
+        body = await request.json()
+        prompt = body.get("prompt", "")
 
-    if not user_input:
-        return JSONResponse({
-            "error": "No prompt provided"
-        }, status_code=400)
+        if not prompt:
+            return JSONResponse(
+                {"error": "missing prompt"},
+                status_code=400
+            )
 
-    # 1. classify
-    category = orchestrator_agent(user_input)
+        category = orchestrator(prompt)
+        result = route(category, prompt)
 
-    # 2. route
-    result = route_agent(category, user_input)
+        if isinstance(result, dict) and "error" in result:
+            result = fallback(prompt)
 
-    # 3. fallback safety
-    if isinstance(result, dict) and "error" in result:
-        result = fallback_agent(user_input)
+        return {
+            "category": category,
+            "result": result.get("response", result)
+        }
 
-    return JSONResponse({
-        "category": category,
-        "result": result.get("response", result)
-    })
+    except Exception as e:
+        return JSONResponse(
+            {"error": str(e)},
+            status_code=500
+        )
 
 
 # =========================
-# IMAGE PIPELINE HOOK
+# IMAGE PIPELINE (STABLE STUB)
 # =========================
 
 @app.post("/api/image")
-async def image_pipeline(request: Request):
+async def image(request: Request):
     return {
         "status": "queued",
         "pipeline": "vision_stub"