Merge branch 'main' into kimi/issue-490

fix: use settings.ollama_url instead of hardcoded fallback in cascade router (#491 )
Co-authored-by: Kimi Agent <kimi@timmy.local> Co-committed-by: Kimi Agent <kimi@timmy.local>
2026-03-19 16:06:57 -04:00 · 2026-03-19 16:02:20 -04:00 · 2026-03-19 15:57:22 -04:00 · 2026-03-19 15:52:29 -04:00 · 2026-03-19 15:44:10 -04:00
3 changed files with 9 additions and 6 deletions
--- a/config/providers.yaml
+++ b/config/providers.yaml
@@ -54,11 +54,12 @@ providers:
        context_window: 2048
        capabilities: [text, vision, streaming]
    
-  # Secondary: OpenAI (if API key available)
+    
+  # Tertiary: OpenAI (if API key available)
  - name: openai-backup
    type: openai
    enabled: false  # Enable by setting OPENAI_API_KEY
-    priority: 2
+    priority: 3
    api_key: "${OPENAI_API_KEY}"  # Loaded from environment
    base_url: null  # Use default OpenAI endpoint
    models:
@@ -70,11 +71,11 @@ providers:
        context_window: 128000
        capabilities: [text, vision, tools, json, streaming]
    
-  # Tertiary: Anthropic (if API key available)
+  # Quaternary: Anthropic (if API key available)
  - name: anthropic-backup
    type: anthropic
    enabled: false  # Enable by setting ANTHROPIC_API_KEY
-    priority: 3
+    priority: 4
    api_key: "${ANTHROPIC_API_KEY}"
    models:
      - name: claude-3-haiku-20240307
--- a/src/dashboard/middleware/csrf.py
+++ b/src/dashboard/middleware/csrf.py
@@ -100,7 +100,7 @@ class CSRFMiddleware(BaseHTTPMiddleware):
            ...

    Usage:
-        app.add_middleware(CSRFMiddleware, secret="your-secret-key")
+        app.add_middleware(CSRFMiddleware, secret=settings.csrf_secret)

    Attributes:
        secret: Secret key for token signing (optional, for future use).
--- a/src/infrastructure/router/cascade.py
+++ b/src/infrastructure/router/cascade.py
@@ -18,6 +18,8 @@ from enum import Enum
 from pathlib import Path
 from typing import Any

+from config import settings
+
 try:
    import yaml
 except ImportError:
@@ -301,7 +303,7 @@ class CascadeRouter:
                # Can't check without requests, assume available
                return True
            try:
-                url = provider.url or "http://localhost:11434"
+                url = provider.url or settings.ollama_url
                response = requests.get(f"{url}/api/tags", timeout=5)
                return response.status_code == 200
            except Exception as exc:
Author	SHA1	Message	Date
Timmy Time	4d8272f64e	Merge branch 'main' into kimi/issue-490 All checks were successful Tests / lint (pull_request) Successful in 3s Details Tests / test (pull_request) Successful in 1m8s Details	2026-03-19 16:06:57 -04:00
Kimi Agent	d70e4f810a	fix: use settings.ollama_url instead of hardcoded fallback in cascade router (#491 ) All checks were successful Tests / lint (push) Successful in 3s Details Tests / test (push) Successful in 1m20s Details Co-authored-by: Kimi Agent <kimi@timmy.local> Co-committed-by: Kimi Agent <kimi@timmy.local>	2026-03-19 16:02:20 -04:00
kimi	0b81a01c90	fix: use settings.ollama_url instead of hardcoded fallback in cascade router All checks were successful Tests / lint (pull_request) Successful in 3s Details Tests / test (pull_request) Successful in 1m5s Details Fixes #490	2026-03-19 15:57:22 -04:00
Kimi Agent	7f20742fcf	fix: replace hardcoded secret placeholder in CSRF middleware docstring (#488 ) All checks were successful Tests / lint (push) Successful in 4s Details Tests / test (push) Successful in 1m11s Details Co-authored-by: Kimi Agent <kimi@timmy.local> Co-committed-by: Kimi Agent <kimi@timmy.local>	2026-03-19 15:52:29 -04:00
Timmy Time	15eb7c3b45	[loop-cycle-538] refactor: remove dead airllm provider from cascade router (#459 ) (#481 ) All checks were successful Tests / lint (push) Successful in 3s Details Tests / test (push) Successful in 1m28s Details	2026-03-19 15:44:10 -04:00