mirror of
https://github.com/pewdiepie-archdaemon/odysseus.git
synced 2026-10-11 17:32:20 +02:00
refactor(model-routing): centralize explicit foreground fallback policy (#6020)
* refactor(model-routing): centralize explicit foreground fallback policy Make foreground fallback an explicit per-user, availability-only policy shared by streaming Chat, non-stream Chat, and Agent runs. Preserve strict defaults, owner/model and credential boundaries, pinned Agent routes, and truthful per-round provenance/accounting. Carry provider-reported model identifiers through native streaming adapters, non-stream responses, and caches, and keep legacy default_model_fallbacks as tombstoned raw storage that generic settings APIs and agent tools cannot expose or mutate. * fix(agent-loop): restore rebase-dropped qwen routing, workspace prompt, and temperature clamp * fix(model-routing): thread selected endpoint identity, fix cost classification and fallback eligibility * fix(chat): restore stream helpers and harden run stop lifecycle * fix(model-routing): let numeric provider codes win over symbolic rate-limit statuses * fix(agent-loop): apply qwen temperature and notes-tool clamps per fallback candidate * fix(chat): honor queued stop across resend and reload canonical terminal on EOF * fix(chat): track stop queue and cleanup ownership by per-send generation * fix(agent-loop): preserve requested temperature for non-qwen fallback candidates * fix(chat): reserve send ownership before any await and scope stop to the current send * fix(chat): clear the previous run identity at send reservation --------- Co-authored-by: RaresKeY <158580472+RaresKeY@users.noreply.github.com> Co-authored-by: StressTestor <212606152+StressTestor@users.noreply.github.com>
This commit is contained in:
co-authored by
RaresKeY
StressTestor
parent
b52296471b
commit
c4369305f0
@@ -6,8 +6,15 @@ Verifies two critical cases:
|
||||
2. api.deepseek.com must still be treated as tool-capable via the host
|
||||
allow-list (_API_HOSTS), so cloud deepseek users keep working.
|
||||
"""
|
||||
from types import SimpleNamespace
|
||||
|
||||
import pytest
|
||||
from src.agent_loop import _API_HOSTS, _endpoint_lookup_keys, _is_ollama_openai_compat_url
|
||||
from src.agent_loop import (
|
||||
_API_HOSTS,
|
||||
_agent_route_tool_mode,
|
||||
_endpoint_lookup_keys,
|
||||
_is_ollama_openai_compat_url,
|
||||
)
|
||||
from src.llm_core import _is_ollama_native_url
|
||||
|
||||
|
||||
@@ -164,3 +171,57 @@ class TestEndpointLookupKeys:
|
||||
keys = _endpoint_lookup_keys("http://host.docker.internal:11434/api/chat")
|
||||
|
||||
assert "http://host.docker.internal:11434/api" in keys
|
||||
|
||||
|
||||
def test_route_tool_mode_matches_credential_distinct_endpoint(monkeypatch):
|
||||
from core import database
|
||||
from src import endpoint_resolver
|
||||
|
||||
rows = [
|
||||
SimpleNamespace(
|
||||
id="one",
|
||||
base_url="https://same.example/v1",
|
||||
api_key="key-one",
|
||||
provider_auth_id=None,
|
||||
supports_tools=True,
|
||||
),
|
||||
SimpleNamespace(
|
||||
id="two",
|
||||
base_url="https://same.example/v1",
|
||||
api_key="key-two",
|
||||
provider_auth_id=None,
|
||||
supports_tools=False,
|
||||
),
|
||||
]
|
||||
|
||||
class Query:
|
||||
def filter(self, *args, **kwargs):
|
||||
return self
|
||||
|
||||
def all(self):
|
||||
return rows
|
||||
|
||||
class Db:
|
||||
def query(self, *args, **kwargs):
|
||||
return Query()
|
||||
|
||||
def close(self):
|
||||
return None
|
||||
|
||||
monkeypatch.setattr(database, "SessionLocal", lambda: Db())
|
||||
monkeypatch.setattr(
|
||||
endpoint_resolver,
|
||||
"resolve_endpoint_runtime",
|
||||
lambda endpoint, owner=None: (endpoint.base_url, endpoint.api_key),
|
||||
)
|
||||
|
||||
assert _agent_route_tool_mode(
|
||||
"https://same.example/v1",
|
||||
"custom-model",
|
||||
headers={"Authorization": "Bearer key-one"},
|
||||
)[0] is True
|
||||
assert _agent_route_tool_mode(
|
||||
"https://same.example/v1",
|
||||
"custom-model",
|
||||
headers={"Authorization": "Bearer key-two"},
|
||||
)[0] is False
|
||||
|
||||
Reference in New Issue
Block a user