Summarize: LAN primary with local-Ollama rescue + in-app failure guidance

- Engine: when the primary summarizer is out of retries (or misconfigured),
  run_summarize now finishes the job on the configured rescue provider
  (SHONAR_LLM_FALLBACK_*), tags the summary with the provider that wrote it,
  and stores a human note in job.error; success clears stale notes.
- App (auto/lan): passes Ollama as the rescue provider when it is up.
- Detail screen: shows the rescue-swap note in plain words, a red
  'Summary failed' line with Settings -> Summarizer fix instructions and a
  Retry summary button on hard failure.
- Settings copy explains the fallback. 3 new pytest cases (14/14 pass);
  live E2E on 2026-09-18: sarcastic summary v6 via LAN on attempt 2.
This commit is contained in:
avi 2026-09-17 21:44:02 -05:00
commit 3061629dc5
6 changed files with 172 additions and 8 deletions

View file

@ -90,6 +90,14 @@ class Settings(BaseSettings):
llm_base_url: str = ""
llm_api_key: str = Field(default="", repr=False)
# Rescue summarizer tried when the PRIMARY one fails mid-job (desktop:
# LAN GPU server primary, local Ollama fallback). "none" disables the
# fallback; the primary's error then stands as today.
llm_fallback_provider: str = "none" # none | openai_compat | ollama
llm_fallback_model: str = ""
llm_fallback_base_url: str = ""
llm_fallback_api_key: str = Field(default="", repr=False)
# Search needs no setting: services/search.py picks its path by SQL
# dialect (SQLite substring scan / Postgres tsvector). A Meilisearch or
# OpenSearch backend would replace that module, not add a config knob.

View file

@ -160,3 +160,32 @@ def get_llm_provider(settings: Settings) -> LlmProvider | None:
model=settings.llm_model,
)
raise ProviderConfigError(f"Unknown LLM provider: {settings.llm_provider!r}")
def get_llm_fallback_provider(settings: Settings) -> LlmProvider | None:
"""Rescue provider tried when the primary summarize fails mid-job.
None means "no fallback configured" — the primary's error stands.
Same kinds as get_llm_provider, built from the llm_fallback_* settings.
"""
kind = settings.llm_fallback_provider.strip().lower()
if kind in ("", "none"):
return None
if kind == "openai_compat":
from shonar.services.ai.openai_compat import OpenAICompatProvider
return OpenAICompatProvider(
base_url=settings.llm_fallback_base_url,
model=settings.llm_fallback_model,
api_key=settings.llm_fallback_api_key,
)
if kind == "ollama":
from shonar.services.ai.ollama import OllamaProvider
return OllamaProvider(
base_url=settings.llm_fallback_base_url,
model=settings.llm_fallback_model,
)
raise ProviderConfigError(
f"Unknown LLM fallback provider: {settings.llm_fallback_provider!r}"
)

View file

@ -39,7 +39,9 @@ from shonar.db.models import (
)
from shonar.services.ai import (
AIError,
ProviderConfigError,
ProviderTransientError,
get_llm_fallback_provider,
get_llm_provider,
get_transcription_provider,
)
@ -479,19 +481,48 @@ async def run_summarize(ctx: dict, recording_id: str) -> None:
job.stage = "summarizing"
rec.processing_status = ProcessingStatus.processing
await session.commit() # visible before the long LLM call
fallback_note: str | None = None
result_provider = provider.name # overwritten only on the rescue path
try:
result = await provider.summarize(
text, title=rec.title, tone=job.tone,
on_progress=_async_progress_writer(job.id))
except AIError as e:
await _fail(session, rec, job, str(e), ctx, e)
await session.commit()
return
await store_summary(session, rec, result.to_dict(), provider.name,
# Transient failures keep their normal retry budget first (the
# LAN GPU often recovers on try 2); the rescue summarizer runs
# when the primary is OUT of tries or misconfigured, and only
# if one is configured. The summary then comes from the
# fallback and job.error carries a note for the UI.
retryable = (isinstance(e, ProviderTransientError)
and _job_try(ctx) < MAX_TRIES)
# (result, provider_name, note) when the rescue succeeds.
rescue: tuple[object, str, str] | None = None
if not retryable:
fallback = get_llm_fallback_provider(settings)
if fallback is not None:
try:
fb_result = await fallback.summarize(
text, title=rec.title, tone=job.tone,
on_progress=_async_progress_writer(job.id))
except AIError as fe:
logger.warning(
"summarize fallback (%s) also failed: %s",
fallback.name, fe)
else:
rescue = (fb_result, fallback.name, (
f'primary "{provider.name}" failed ({e}). '
f'This summary was written by "{fallback.name}".'))
if rescue is None:
await _fail(session, rec, job, str(e), ctx, e)
await session.commit()
return
result, result_provider, fallback_note = rescue
await store_summary(session, rec, result.to_dict(), result_provider,
result.model, tone=job.tone)
job.status = JobStatus.succeeded
job.stage = None
job.progress = 100
job.error = fallback_note # None on the clean path: clears stale notes
job.finished_at = utcnow()
rec.processing_status = ProcessingStatus.completed
rec.processing_error = None