refactor: keep only model discovery, drop redundant routing changes

- Revert routes.py and streaming.py to master: resolve_model_provider()
  already handles provider routing and base_url passthrough for all models.
- Fix indentation error in config.py (2-space indent on comment line).
- Fix auto_detected_models scope: initialize before try block.
- Remove unused urllib.parse import.
- Simplify unknown-provider model group logic.
- Remove verbose comments and redundant variable assignments.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Nathan Esquenazi
2026-04-02 09:15:41 -07:00
parent d9293c6097
commit b784fff104
3 changed files with 48 additions and 106 deletions

View File

@@ -17,7 +17,7 @@ from api.config import (
SESSIONS, SESSIONS_MAX, LOCK, STREAMS, STREAMS_LOCK, CANCEL_FLAGS,
SERVER_START_TIME, CLI_TOOLSETS, _INDEX_HTML_PATH, get_available_models,
IMAGE_EXTS, MD_EXTS, MIME_MAP, MAX_FILE_BYTES, MAX_UPLOAD_BYTES,
CHAT_LOCK, load_settings, save_settings, cfg,
CHAT_LOCK, load_settings, save_settings,
)
from api.helpers import require, bad, safe_resolve, j, t, read_body
from api.models import (
@@ -679,28 +679,12 @@ def _handle_chat_start(handler, body):
model = body.get('model') or s.model
s.workspace = workspace; s.model = model; s.save()
set_last_workspace(workspace)
# Read base_url from config.yaml for this model
# cfg is a global variable loaded at module load time
model_cfg = cfg.get('model', {})
base_url = model_cfg.get('base_url', '')
# Use resolve_model_provider to get the correct model, provider, and base_url
# This handles all providers including local Ollama/LM Studio endpoints
from api.config import resolve_model_provider
resolved_model, resolved_provider, resolved_base_url = resolve_model_provider(model)
stream_id = uuid.uuid4().hex
q = queue.Queue()
with STREAMS_LOCK: STREAMS[stream_id] = q
kwargs = {}
# Pass resolved provider and base_url to the streaming handler
kwargs['provider'] = resolved_provider
kwargs['base_url'] = resolved_base_url
thr = threading.Thread(
target=_run_agent_streaming,
args=(s.session_id, msg, resolved_model, workspace, stream_id, attachments),
kwargs=kwargs,
args=(s.session_id, msg, model, workspace, stream_id, attachments),
daemon=True,
)
thr.start()