fix: Map gpt-40 to chatgpt to resolve model discrepancy and support direct routing

core/auth.py

@@ -104,19 +104,33 @@ async def require_ext_secret(
     ] = None,
 ) -> str:
     """
-    FastAPI dependency: validates the bearer token against ``NANCY_EXT_SECRET``.
+    FastAPI dependency: validates the bearer token against ``NANCY_EXT_SECRET``,
+    ``NANCY_API_KEY``, or a SHA-256 hashed token cached dynamically in Upstash Redis.
 
     Used for all ``/ext/*`` endpoints.
     """
     token = _extract_token(request, credentials)
-    if token != settings.nancy_ext_secret:
-        logger.warning(
-            "Invalid extension secret attempt from %s",
-            request.client.host if request.client else "unknown",
-        )
-        raise HTTPException(
-            status_code=status.HTTP_401_UNAUTHORIZED,
-            detail="Invalid extension secret.",
-            headers={"WWW-Authenticate": "Bearer"},
-        )
-    return token
+    
+    # 1. Master Keys Local Bypass (either extension secret or API key)
+    if token in (settings.nancy_ext_secret, settings.nancy_api_key):
+        return token
+
+    # 2. Dynamic Redis Hashed Key validation
+    hashed = hashlib.sha256(token.encode("utf-8")).hexdigest()
+    try:
+        key_meta = await redis_client.get_json(f"nancy:api_keys:{hashed}")
+        if key_meta:
+            return token
+    except Exception as exc:
+        logger.error("Error validating dynamic token for extension: %s", exc)
+
+    logger.warning(
+        "Invalid extension secret/key attempt from %s",
+        request.client.host if request.client else "unknown",
+    )
+    raise HTTPException(
+        status_code=status.HTTP_401_UNAUTHORIZED,
+        detail="Invalid extension secret or API key.",
+        headers={"WWW-Authenticate": "Bearer"},
+    )
+

core/queue.py

@@ -238,6 +238,16 @@ class TaskQueue:
         """Return recent task history."""
         return self._history[-limit:]
 
+    def is_extension_active(self) -> bool:
+        """Check if there is at least one active extension connection."""
+        try:
+            from routers.extension import active_extensions
+            now = time.time()
+            return any((now - last_seen) < 45.0 for last_seen in active_extensions.values())
+        except Exception:
+            return False
+
 
 # Module-level singleton
 task_queue = TaskQueue()
+

core/router.py

@@ -15,7 +15,7 @@ import logging
 from typing import Any
 
 from config import settings
-from models.provider import CircuitState, ProviderConfig, ProviderState
+from models.provider import ProviderConfig, ProviderState
 
 logger = logging.getLogger("nancy.router")
 
@@ -29,6 +29,7 @@ MODEL_TO_PROVIDER: dict[str, str] = {
     "chatgpt": "chatgpt",
     "gpt-4": "chatgpt",
     "gpt-4o": "chatgpt",
+    "gpt-40": "chatgpt",
     "gpt-4o-mini": "chatgpt",
     "gpt-3.5-turbo": "chatgpt",
     # Gemini
@@ -222,6 +223,16 @@ class ProviderRouter:
             and state.check_rate_limit()
         )
 
+    def is_provider_healthy(self, provider: str) -> bool:
+        """Alias for is_provider_available for admin dashboard compatibility."""
+        return self.is_provider_available(provider)
+
+    @property
+    def fallback_chain(self) -> list[str]:
+        """Return the active fallback chain of providers."""
+        return settings.fallback_chain
+
 
 # Module-level singleton
 provider_router = ProviderRouter()
+

models/openai.py

@@ -9,7 +9,7 @@ from __future__ import annotations
 
 import time
 import uuid
-from typing import Any, Literal
+from typing import Literal
 
 from pydantic import BaseModel, Field
 

routers/admin.py

@@ -690,7 +690,7 @@ async def admin_dashboard(request: Request):
     
     # 1. Fetch current queue size
     try:
-        queue_depth = len(task_queue.queue)
+        queue_depth = task_queue.pending_count
     except Exception:
         queue_depth = 0
 
@@ -761,15 +761,16 @@ async def admin_dashboard(request: Request):
         </div>
         """
 
-    # Render dashboard
-    rendered = DASHBOARD_HTML.format(
-        queue_depth=queue_depth,
-        session_count=session_count,
-        ext_status=ext_status,
-        redis_status=redis_status,
-        redis_color=redis_color,
-        session_rows=session_rows,
-        provider_rows=provider_rows
+    # Render dashboard safely using simple replacement to avoid CSS/JS brace clashes
+    rendered = (
+        DASHBOARD_HTML
+        .replace("{queue_depth}", str(queue_depth))
+        .replace("{session_count}", str(session_count))
+        .replace("{ext_status}", str(ext_status))
+        .replace("{redis_status}", str(redis_status))
+        .replace("{redis_color}", str(redis_color))
+        .replace("{session_rows}", str(session_rows))
+        .replace("{provider_rows}", str(provider_rows))
     )
     
     return HTMLResponse(content=rendered)

routers/api.py

@@ -10,9 +10,8 @@ from __future__ import annotations
 
 import asyncio
 import logging
-import time
 from typing import AsyncGenerator
-from fastapi import APIRouter, Depends, HTTPException, Request, status
+from fastapi import APIRouter, Depends, HTTPException, status
 from fastapi.responses import JSONResponse
 from sse_starlette.sse import EventSourceResponse
 
@@ -62,7 +61,7 @@ def parse_tool_call_json(text: str) -> list[dict] | None:
                             val = float(val_strip)
                         else:
                             val = int(val_strip)
-                    except:
+                    except Exception:
                         pass
                 args[key] = val
                 
@@ -96,7 +95,7 @@ def parse_tool_call_json(text: str) -> list[dict] | None:
                     if isinstance(args, str):
                         try:
                             args = json.loads(args)
-                        except:
+                        except Exception:
                             pass
                     
                     call_id = tc.get("id") or f"call_{uuid.uuid4().hex[:12]}"

routers/extension.py

@@ -17,7 +17,7 @@ from typing import AsyncGenerator
 from fastapi import APIRouter, Depends, HTTPException, Request, status
 from sse_starlette.sse import EventSourceResponse
 
-from config import settings
+from pydantic import BaseModel
 from core.auth import require_ext_secret
 from core.queue import task_queue
 from core.router import provider_router
@@ -32,6 +32,26 @@ router = APIRouter(prefix="/ext", tags=["Extension Relay"])
 active_extensions: dict[str, float] = {}
 
 
+class ExtensionLogPayload(BaseModel):
+    extension_id: str
+    level: str
+    provider: str
+    message: str
+
+
+@router.post("/log")
+async def receive_log(
+    payload: ExtensionLogPayload,
+    secret: str = Depends(require_ext_secret),
+):
+    """
+    Receive real-time simulation/scraping logs from the Chrome/Brave Extension.
+    """
+    logger.info("[%s] [%s] %s", payload.provider.upper(), payload.level.upper(), payload.message)
+    return {"status": "ok"}
+
+
+
 @router.get("/tasks/stream")
 async def tasks_stream(
     request: Request,

routers/sessions.py

@@ -14,7 +14,6 @@ from __future__ import annotations
 import logging
 from typing import Any
 from fastapi import APIRouter, Depends, HTTPException, Query, status
-from fastapi.responses import JSONResponse
 from pydantic import BaseModel, Field
 
 from core.auth import require_api_key