mirror of
https://github.com/pewdiepie-archdaemon/odysseus.git
synced 2026-10-15 19:32:21 +02:00
* feat(settings): opt-in reasoning effort for utility model calls Add utility_reasoning_effort (empty = provider default) and let utility calls inherit a chat session's effort only on that session's matching endpoint+model route. Explicit caller effort wins; otherwise the utility setting wins over session inheritance on utility-chain routes. Resolve the chain and setting per user and validate levels against model evidence. No-session work uses the setting only, with no chat-effort crossover. - src/utility_effort.py owns effort_for_call and candidate_effort_factory - remove global effort fill from llm_call/llm_call_async; utility call sites pass effort explicitly, so unrelated calls on the same route do not pick it up - wire auto-title, memory/persona/skill extraction, memory suggest/import/ audit, compaction, auto-sort, and per-owner background task candidates - wire no-session email writing-style, summary, and translation calls, plus skills evaluation, necessity/retrieval audits, and improvement - deliberately exclude email replies because thinking_mode='off' - add the optional candidate_request_factory to llm_call_async_with_fallback - add sync llm_call reasoning_effort and include it in the cache key - show the Utility Model effort selector only for advertised levels Fixes #6569 * fix(utility): exclude email replies and support inherited effort in settings Pass reasoning_effort='' to task_llm_call_async for scheduled reply drafting to honor the email reply exclusion. In AI settings, resolve the effective Default Chat endpoint and model when Utility is set to 'Same as chat' so supported reasoning effort levels can be selected. * feat(utility): support same-as-chat effort and session model fallback in compaction In AI settings, show 'Same as chat' as the default effort option when Utility Model is inherited, and support an explicit 'Provider default' (off) override. Pass the active session fallback in context compaction callers so compaction shares the live chat session's model and reasoning effort for maximum prompt/KV cache affinity. * fix(settings): clarify chat effort inheritance and keep option visible Label inherited effort as 'Same as chat (when supported)' and mention cache affinity and latency speedups in the help text. Ensure the effort control remains visible when the utility model is set to 'Same as chat' even if the default chat model lacks advertised reasoning levels, and populate candidate levels across configured endpoints so the user can configure effort or keep provider default. * feat(settings): per-fallback reasoning effort for utility model Each utility fallback row gets an Effort select, shown only when the selected model advertises reasoning levels. The choice is stored as reasoning_effort on the utility_model_fallbacks entry and sent only to that candidate; an empty value means provider default. * fix(utility): transmit reasoning effort in non-streaming calls --------- Co-authored-by: Alexandre Teixeira <111787685+alteixeira20@users.noreply.github.com>
117 lines
4.2 KiB
Python
117 lines
4.2 KiB
Python
"""Shared resolver for background-task AI endpoints."""
|
|
|
|
from src.endpoint_resolver import (
|
|
resolve_endpoint,
|
|
resolve_utility_fallback_candidates,
|
|
same_endpoint_base as _same_endpoint_base,
|
|
)
|
|
from src.llm_core import llm_call_async_with_fallback
|
|
from src.interactive_gate import wait_for_interactive_quiet
|
|
|
|
|
|
def resolve_task_endpoint(fallback_url=None, fallback_model=None, fallback_headers=None, owner=None):
|
|
"""Return (endpoint_url, model, headers) for background tasks.
|
|
|
|
Reads task_endpoint_id / task_model from admin settings.
|
|
Falls back to the provided values when the setting is empty or the
|
|
endpoint cannot be resolved.
|
|
"""
|
|
return resolve_endpoint("task", fallback_url, fallback_model, fallback_headers, owner=owner)
|
|
|
|
|
|
def resolve_task_candidates(
|
|
fallback_url=None,
|
|
fallback_model=None,
|
|
fallback_headers=None,
|
|
override_url=None,
|
|
override_model=None,
|
|
override_headers=None,
|
|
owner=None,
|
|
):
|
|
"""Return ordered background-task LLM candidates.
|
|
|
|
Order:
|
|
1. configured Background Tasks endpoint/model, or caller fallback
|
|
2. Utility endpoint/model
|
|
3. Default endpoint/model
|
|
4. Utility fallback chain
|
|
"""
|
|
candidates = []
|
|
|
|
def _append(url, model, headers):
|
|
if not url or not model:
|
|
return
|
|
key = (url, model)
|
|
if any((u, m) == key for u, m, _ in candidates):
|
|
return
|
|
candidates.append((url, model, headers or {}))
|
|
|
|
if override_url and override_model:
|
|
headers = override_headers or {}
|
|
try:
|
|
from src.database import ModelEndpoint, SessionLocal
|
|
from src.endpoint_resolver import normalize_base, resolve_endpoint_runtime, build_headers
|
|
db = SessionLocal()
|
|
try:
|
|
from src.auth_helpers import owner_filter
|
|
query = db.query(ModelEndpoint).filter(ModelEndpoint.is_enabled == True)
|
|
for ep in owner_filter(query, ModelEndpoint, owner).all():
|
|
base = normalize_base(getattr(ep, "base_url", "") or "")
|
|
if _same_endpoint_base(override_url, base):
|
|
runtime_base, api_key = resolve_endpoint_runtime(ep, owner=owner)
|
|
headers = build_headers(api_key, runtime_base or base)
|
|
break
|
|
finally:
|
|
db.close()
|
|
except Exception:
|
|
pass
|
|
_append(override_url, override_model, headers)
|
|
_append(*resolve_task_endpoint(fallback_url, fallback_model, fallback_headers, owner=owner))
|
|
_append(*resolve_endpoint("utility", owner=owner))
|
|
_append(*resolve_endpoint("default", owner=owner))
|
|
for url, model, headers in resolve_utility_fallback_candidates(owner=owner):
|
|
_append(url, model, headers)
|
|
return candidates
|
|
|
|
|
|
async def task_llm_call_async(
|
|
messages,
|
|
*,
|
|
fallback_url=None,
|
|
fallback_model=None,
|
|
fallback_headers=None,
|
|
override_url=None,
|
|
override_model=None,
|
|
override_headers=None,
|
|
owner=None,
|
|
**kwargs,
|
|
):
|
|
"""Call the shared background-task LLM candidate chain."""
|
|
resolver_kwargs = {
|
|
"fallback_url": fallback_url,
|
|
"fallback_model": fallback_model,
|
|
"fallback_headers": fallback_headers,
|
|
"owner": owner,
|
|
}
|
|
if override_url is not None:
|
|
resolver_kwargs["override_url"] = override_url
|
|
if override_model is not None:
|
|
resolver_kwargs["override_model"] = override_model
|
|
if override_headers is not None:
|
|
resolver_kwargs["override_headers"] = override_headers
|
|
candidates = resolve_task_candidates(
|
|
**resolver_kwargs,
|
|
)
|
|
if not candidates:
|
|
raise RuntimeError("No LLM endpoint available for background task")
|
|
await wait_for_interactive_quiet("background task LLM")
|
|
kwargs.setdefault("workload", "background")
|
|
if kwargs.get("reasoning_effort") is None:
|
|
kwargs.pop("reasoning_effort", None)
|
|
from src.utility_effort import candidate_effort_factory
|
|
|
|
factory = candidate_effort_factory(owner)
|
|
if factory is not None:
|
|
kwargs.setdefault("candidate_request_factory", factory)
|
|
return await llm_call_async_with_fallback(candidates, messages=messages, **kwargs)
|