2026-04-03 13:34:27 +08:00
|
|
|
|
"""
|
|
|
|
|
|
Schema-driven LLM JSON 调用:统一 bind `json_object`、空输出重试、解析校验、结构化日志。
|
|
|
|
|
|
|
|
|
|
|
|
`extract_json_payload` 仅在 **decode 失败时** 作为一次兼容性重试;命中时打
|
|
|
|
|
|
`event=llm_json_compat_strip_hit` 便于后续下线该路径(见计划 Step 13;生产观测零命中后再删 compat)。
|
|
|
|
|
|
"""
|
|
|
|
|
|
|
|
|
|
|
|
from __future__ import annotations
|
|
|
|
|
|
|
|
|
|
|
|
import hashlib
|
|
|
|
|
|
import json
|
|
|
|
|
|
import time
|
|
|
|
|
|
from dataclasses import dataclass
|
|
|
|
|
|
from typing import Any, Callable, Literal, TypeVar
|
|
|
|
|
|
|
|
|
|
|
|
from pydantic import BaseModel, ValidationError
|
|
|
|
|
|
|
feat(eval): memoir A/B chapter judging and eval-web parity with dialogue
- Judge baseline excerpt and library chapter separately; build_memoir_compare_summary for gate, nine-dim and leaf deltas.
- Memoir SSE chapter payload: baseline_judge, compare_summary, baseline_judge_error.
- MemoirJudgeOutput: loose score coercion and post-validate clamp; memoir judge prompt caps from settings.
- app-eval-web: two-column MemoirScoreCard layout, MemoirCompareSummary, chapter blocks and CSS.
- Add memoir_compare_summary, log_events, celery_log_context, memoir_pipeline_progress; tests and migration 0014.
- Misc: memory/evidence and enrichment paths, task/orchestrator updates, internal-eval docs, env examples.
2026-04-10 10:23:43 +08:00
|
|
|
|
try:
|
|
|
|
|
|
from openai import (
|
|
|
|
|
|
ContentFilterFinishReasonError as _OpenAIContentFilterFinishReasonError,
|
|
|
|
|
|
)
|
|
|
|
|
|
except ImportError: # 兼容性:旧版 SDK 无此类
|
|
|
|
|
|
_OpenAIContentFilterFinishReasonError = None
|
|
|
|
|
|
|
2026-04-03 13:34:27 +08:00
|
|
|
|
from app.core.agent_logging import agent_verbose_enabled, log_agent_payload
|
|
|
|
|
|
from app.core.json_utils import extract_json_payload
|
|
|
|
|
|
from app.core.langchain_llm import (
|
|
|
|
|
|
bind_json_object_mode,
|
|
|
|
|
|
ensure_json_object_prompt_has_json_keyword,
|
|
|
|
|
|
)
|
2026-04-27 14:34:30 +08:00
|
|
|
|
from app.core.llm_errors import LlmHttpErrorVendor, format_llm_http_error_message
|
|
|
|
|
|
from app.core.llm_http_openai_chat_errors import should_log_openai_error_as_warning
|
feat: OpenTelemetry LGTM observability, dev tooling, and memoir UX fixes (#31)
* add staging ios app build script
* feat(api): add OpenTelemetry LGTM stack for local observability
Wire OTel traces, metrics, and logs through a collector to Tempo,
Prometheus, and Loki, with custom LLM instrumentation, dev compose overlay,
Grafana provisioning, env templates, and development.sh auto-start.
Co-authored-by: Cursor <cursoragent@cursor.com>
* feat: expand observability, harden dev tooling, and fix expo staging UX
Add business and LLM Prometheus metrics with Grafana dashboards, alerting,
and a metrics verification script. Wire telemetry through adapters and core
LLM paths, and document the local LGTM workflow.
Fix development.sh for macOS bash 3.2, open Grafana and eval-web in Chrome,
and repair eval-web auto-open (unbound EVAL_WEB_BROWSER_SCHEDULED). Merge
internal-eval into the main dev script with improved compose handling.
Require EXPO_PUBLIC_* at build time, improve iOS HTTP ATS for staging IPs,
show memoir empty state instead of load errors when no chapters exist, and
add jest env setup plus chapter list response normalization.
Co-authored-by: Cursor <cursoragent@cursor.com>
* chore: enable Grafana Assistant Cursor plugin
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: memoir empty state and repair withdrawn 0020_chapters_book_id stamp
Show empty memoir UI when the chapter list succeeds with no items; treat auth/404 as non-fatal. Extend alembic revision repair so local dev DBs stamped with the removed 0020_chapters_book_id migration can roll back and upgrade to 0019.
Co-authored-by: Cursor <cursoragent@cursor.com>
---------
Co-authored-by: Kevin <kevin@brighteng.org>
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-20 15:12:21 +08:00
|
|
|
|
from app.core.llm_telemetry import (
|
|
|
|
|
|
extract_token_usage,
|
|
|
|
|
|
infer_provider_model,
|
|
|
|
|
|
llm_call_span,
|
|
|
|
|
|
record_llm_call,
|
|
|
|
|
|
)
|
2026-04-03 13:34:27 +08:00
|
|
|
|
from app.core.logging import get_logger
|
|
|
|
|
|
|
|
|
|
|
|
logger = get_logger(__name__)
|
|
|
|
|
|
|
|
|
|
|
|
T = TypeVar("T", bound=BaseModel)
|
|
|
|
|
|
|
|
|
|
|
|
ErrorKind = Literal["invoke", "decode", "validation"]
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class LLMCallError(Exception):
|
|
|
|
|
|
"""未提供 fallback_factory 且调用链失败时抛出。"""
|
|
|
|
|
|
|
|
|
|
|
|
def __init__(
|
|
|
|
|
|
self,
|
|
|
|
|
|
kind: ErrorKind,
|
|
|
|
|
|
message: str,
|
|
|
|
|
|
*,
|
|
|
|
|
|
raw_content: str | None = None,
|
|
|
|
|
|
) -> None:
|
|
|
|
|
|
super().__init__(message)
|
|
|
|
|
|
self.kind: ErrorKind = kind
|
|
|
|
|
|
self.raw_content: str | None = raw_content
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
|
|
|
|
class LLMCallMeta:
|
|
|
|
|
|
agent: str
|
|
|
|
|
|
schema_name: str
|
|
|
|
|
|
max_tokens: int
|
|
|
|
|
|
duration_ms: float
|
|
|
|
|
|
attempts: int
|
|
|
|
|
|
parse_ok: bool
|
|
|
|
|
|
used_fallback: bool
|
|
|
|
|
|
error_kind: str | None
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def _prompt_sha12(prompt: str) -> str:
|
|
|
|
|
|
return hashlib.sha256((prompt or "").encode("utf-8")).hexdigest()[:12]
|
|
|
|
|
|
|
|
|
|
|
|
|
feat(eval): memoir A/B chapter judging and eval-web parity with dialogue
- Judge baseline excerpt and library chapter separately; build_memoir_compare_summary for gate, nine-dim and leaf deltas.
- Memoir SSE chapter payload: baseline_judge, compare_summary, baseline_judge_error.
- MemoirJudgeOutput: loose score coercion and post-validate clamp; memoir judge prompt caps from settings.
- app-eval-web: two-column MemoirScoreCard layout, MemoirCompareSummary, chapter blocks and CSS.
- Add memoir_compare_summary, log_events, celery_log_context, memoir_pipeline_progress; tests and migration 0014.
- Misc: memory/evidence and enrichment paths, task/orchestrator updates, internal-eval docs, env examples.
2026-04-10 10:23:43 +08:00
|
|
|
|
def _iter_exception_chain(exc: BaseException):
|
|
|
|
|
|
"""包含自身与 ``__cause__`` / ``__context__`` 链,去重防环。"""
|
|
|
|
|
|
seen: set[int] = set()
|
|
|
|
|
|
cur: BaseException | None = exc
|
|
|
|
|
|
while cur is not None and id(cur) not in seen:
|
|
|
|
|
|
yield cur
|
|
|
|
|
|
seen.add(id(cur))
|
|
|
|
|
|
cur = cur.__cause__ or cur.__context__
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def _is_content_filter_refusal(exc: BaseException) -> bool:
|
|
|
|
|
|
"""OpenAI / Azure 等内容审核拦截:无模型 JSON 可解析,属可预期失败,不宜打 ERROR 堆栈。"""
|
|
|
|
|
|
for e in _iter_exception_chain(exc):
|
|
|
|
|
|
if _OpenAIContentFilterFinishReasonError is not None and isinstance(
|
|
|
|
|
|
e,
|
|
|
|
|
|
_OpenAIContentFilterFinishReasonError,
|
|
|
|
|
|
):
|
|
|
|
|
|
return True
|
|
|
|
|
|
msg = str(e).lower()
|
|
|
|
|
|
if "content filter" in msg and (
|
|
|
|
|
|
"reject" in msg or "blocked" in msg or "filter" in msg
|
|
|
|
|
|
):
|
|
|
|
|
|
return True
|
|
|
|
|
|
return False
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
_LLM_MSG_CONTENT_FILTER = (
|
|
|
|
|
|
"模型输出被服务商内容安全策略拦截(content filter),通常与提示或上下文中触发了合规扫描有关;"
|
|
|
|
|
|
"可尝试更换模型、缩短送入模型的正文/证据节选,或在服务商控制台调整内容过滤策略。"
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
2026-04-27 14:34:30 +08:00
|
|
|
|
def _format_llm_invoke_error_message(
|
|
|
|
|
|
exc: BaseException, *, http_error_vendor: LlmHttpErrorVendor = "deepseek"
|
|
|
|
|
|
) -> str:
|
feat(eval): memoir A/B chapter judging and eval-web parity with dialogue
- Judge baseline excerpt and library chapter separately; build_memoir_compare_summary for gate, nine-dim and leaf deltas.
- Memoir SSE chapter payload: baseline_judge, compare_summary, baseline_judge_error.
- MemoirJudgeOutput: loose score coercion and post-validate clamp; memoir judge prompt caps from settings.
- app-eval-web: two-column MemoirScoreCard layout, MemoirCompareSummary, chapter blocks and CSS.
- Add memoir_compare_summary, log_events, celery_log_context, memoir_pipeline_progress; tests and migration 0014.
- Misc: memory/evidence and enrichment paths, task/orchestrator updates, internal-eval docs, env examples.
2026-04-10 10:23:43 +08:00
|
|
|
|
if _is_content_filter_refusal(exc):
|
|
|
|
|
|
return _LLM_MSG_CONTENT_FILTER
|
2026-04-27 14:34:30 +08:00
|
|
|
|
friendly = format_llm_http_error_message(exc, http_error_vendor)
|
|
|
|
|
|
if friendly is not None:
|
|
|
|
|
|
return friendly
|
feat(eval): memoir A/B chapter judging and eval-web parity with dialogue
- Judge baseline excerpt and library chapter separately; build_memoir_compare_summary for gate, nine-dim and leaf deltas.
- Memoir SSE chapter payload: baseline_judge, compare_summary, baseline_judge_error.
- MemoirJudgeOutput: loose score coercion and post-validate clamp; memoir judge prompt caps from settings.
- app-eval-web: two-column MemoirScoreCard layout, MemoirCompareSummary, chapter blocks and CSS.
- Add memoir_compare_summary, log_events, celery_log_context, memoir_pipeline_progress; tests and migration 0014.
- Misc: memory/evidence and enrichment paths, task/orchestrator updates, internal-eval docs, env examples.
2026-04-10 10:23:43 +08:00
|
|
|
|
return str(exc)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def _log_invoke_failure(*, agent: str, exc: BaseException, sync: bool) -> None:
|
|
|
|
|
|
if _is_content_filter_refusal(exc):
|
|
|
|
|
|
logger.info(
|
|
|
|
|
|
"event=llm_content_filter_blocked agent={} sync={} detail={}",
|
|
|
|
|
|
agent,
|
|
|
|
|
|
sync,
|
|
|
|
|
|
str(exc)[:500],
|
|
|
|
|
|
)
|
|
|
|
|
|
return
|
|
|
|
|
|
tag = "llm_json_call" if sync else "allm_json_call"
|
2026-04-27 14:34:30 +08:00
|
|
|
|
if should_log_openai_error_as_warning(exc):
|
|
|
|
|
|
logger.bind(agent=agent).warning(
|
|
|
|
|
|
"{} provider http error: {}", tag, str(exc)[:800]
|
|
|
|
|
|
)
|
|
|
|
|
|
return
|
feat(eval): memoir A/B chapter judging and eval-web parity with dialogue
- Judge baseline excerpt and library chapter separately; build_memoir_compare_summary for gate, nine-dim and leaf deltas.
- Memoir SSE chapter payload: baseline_judge, compare_summary, baseline_judge_error.
- MemoirJudgeOutput: loose score coercion and post-validate clamp; memoir judge prompt caps from settings.
- app-eval-web: two-column MemoirScoreCard layout, MemoirCompareSummary, chapter blocks and CSS.
- Add memoir_compare_summary, log_events, celery_log_context, memoir_pipeline_progress; tests and migration 0014.
- Misc: memory/evidence and enrichment paths, task/orchestrator updates, internal-eval docs, env examples.
2026-04-10 10:23:43 +08:00
|
|
|
|
logger.bind(agent=agent).exception("{} invoke error: {}", tag, exc)
|
|
|
|
|
|
|
|
|
|
|
|
|
2026-04-03 13:34:27 +08:00
|
|
|
|
def _invoke_raw_sync(
|
|
|
|
|
|
llm: Any,
|
|
|
|
|
|
prompt: str,
|
|
|
|
|
|
*,
|
|
|
|
|
|
max_tokens: int,
|
|
|
|
|
|
agent: str,
|
|
|
|
|
|
retry_empty: bool,
|
feat: OpenTelemetry LGTM observability, dev tooling, and memoir UX fixes (#31)
* add staging ios app build script
* feat(api): add OpenTelemetry LGTM stack for local observability
Wire OTel traces, metrics, and logs through a collector to Tempo,
Prometheus, and Loki, with custom LLM instrumentation, dev compose overlay,
Grafana provisioning, env templates, and development.sh auto-start.
Co-authored-by: Cursor <cursoragent@cursor.com>
* feat: expand observability, harden dev tooling, and fix expo staging UX
Add business and LLM Prometheus metrics with Grafana dashboards, alerting,
and a metrics verification script. Wire telemetry through adapters and core
LLM paths, and document the local LGTM workflow.
Fix development.sh for macOS bash 3.2, open Grafana and eval-web in Chrome,
and repair eval-web auto-open (unbound EVAL_WEB_BROWSER_SCHEDULED). Merge
internal-eval into the main dev script with improved compose handling.
Require EXPO_PUBLIC_* at build time, improve iOS HTTP ATS for staging IPs,
show memoir empty state instead of load errors when no chapters exist, and
add jest env setup plus chapter list response normalization.
Co-authored-by: Cursor <cursoragent@cursor.com>
* chore: enable Grafana Assistant Cursor plugin
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: memoir empty state and repair withdrawn 0020_chapters_book_id stamp
Show empty memoir UI when the chapter list succeeds with no items; treat auth/404 as non-fatal. Extend alembic revision repair so local dev DBs stamped with the removed 0020_chapters_book_id migration can roll back and upgrade to 0019.
Co-authored-by: Cursor <cursoragent@cursor.com>
---------
Co-authored-by: Kevin <kevin@brighteng.org>
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-20 15:12:21 +08:00
|
|
|
|
) -> tuple[str, int, int, int]:
|
2026-04-03 13:34:27 +08:00
|
|
|
|
prompt_for_api = ensure_json_object_prompt_has_json_keyword(prompt)
|
|
|
|
|
|
bound = bind_json_object_mode(llm, max_tokens=max_tokens)
|
|
|
|
|
|
tag = agent or "json_object"
|
|
|
|
|
|
sha = _prompt_sha12(prompt_for_api)
|
|
|
|
|
|
attempts = 2 if retry_empty else 1
|
feat: OpenTelemetry LGTM observability, dev tooling, and memoir UX fixes (#31)
* add staging ios app build script
* feat(api): add OpenTelemetry LGTM stack for local observability
Wire OTel traces, metrics, and logs through a collector to Tempo,
Prometheus, and Loki, with custom LLM instrumentation, dev compose overlay,
Grafana provisioning, env templates, and development.sh auto-start.
Co-authored-by: Cursor <cursoragent@cursor.com>
* feat: expand observability, harden dev tooling, and fix expo staging UX
Add business and LLM Prometheus metrics with Grafana dashboards, alerting,
and a metrics verification script. Wire telemetry through adapters and core
LLM paths, and document the local LGTM workflow.
Fix development.sh for macOS bash 3.2, open Grafana and eval-web in Chrome,
and repair eval-web auto-open (unbound EVAL_WEB_BROWSER_SCHEDULED). Merge
internal-eval into the main dev script with improved compose handling.
Require EXPO_PUBLIC_* at build time, improve iOS HTTP ATS for staging IPs,
show memoir empty state instead of load errors when no chapters exist, and
add jest env setup plus chapter list response normalization.
Co-authored-by: Cursor <cursoragent@cursor.com>
* chore: enable Grafana Assistant Cursor plugin
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: memoir empty state and repair withdrawn 0020_chapters_book_id stamp
Show empty memoir UI when the chapter list succeeds with no items; treat auth/404 as non-fatal. Extend alembic revision repair so local dev DBs stamped with the removed 0020_chapters_book_id migration can roll back and upgrade to 0019.
Co-authored-by: Cursor <cursoragent@cursor.com>
---------
Co-authored-by: Kevin <kevin@brighteng.org>
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-20 15:12:21 +08:00
|
|
|
|
last_in, last_out = 0, 0
|
2026-04-03 13:34:27 +08:00
|
|
|
|
for attempt in range(attempts):
|
|
|
|
|
|
response = bound.invoke(prompt_for_api)
|
feat: OpenTelemetry LGTM observability, dev tooling, and memoir UX fixes (#31)
* add staging ios app build script
* feat(api): add OpenTelemetry LGTM stack for local observability
Wire OTel traces, metrics, and logs through a collector to Tempo,
Prometheus, and Loki, with custom LLM instrumentation, dev compose overlay,
Grafana provisioning, env templates, and development.sh auto-start.
Co-authored-by: Cursor <cursoragent@cursor.com>
* feat: expand observability, harden dev tooling, and fix expo staging UX
Add business and LLM Prometheus metrics with Grafana dashboards, alerting,
and a metrics verification script. Wire telemetry through adapters and core
LLM paths, and document the local LGTM workflow.
Fix development.sh for macOS bash 3.2, open Grafana and eval-web in Chrome,
and repair eval-web auto-open (unbound EVAL_WEB_BROWSER_SCHEDULED). Merge
internal-eval into the main dev script with improved compose handling.
Require EXPO_PUBLIC_* at build time, improve iOS HTTP ATS for staging IPs,
show memoir empty state instead of load errors when no chapters exist, and
add jest env setup plus chapter list response normalization.
Co-authored-by: Cursor <cursoragent@cursor.com>
* chore: enable Grafana Assistant Cursor plugin
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: memoir empty state and repair withdrawn 0020_chapters_book_id stamp
Show empty memoir UI when the chapter list succeeds with no items; treat auth/404 as non-fatal. Extend alembic revision repair so local dev DBs stamped with the removed 0020_chapters_book_id migration can roll back and upgrade to 0019.
Co-authored-by: Cursor <cursoragent@cursor.com>
---------
Co-authored-by: Kevin <kevin@brighteng.org>
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-20 15:12:21 +08:00
|
|
|
|
last_in, last_out = extract_token_usage(response)
|
2026-04-03 13:34:27 +08:00
|
|
|
|
content = (getattr(response, "content", None) or "").strip()
|
|
|
|
|
|
if content:
|
|
|
|
|
|
if attempt > 0:
|
|
|
|
|
|
logger.info(
|
|
|
|
|
|
"json_object 空内容重试成功 agent={} prompt_sha12={}",
|
|
|
|
|
|
tag,
|
|
|
|
|
|
sha,
|
|
|
|
|
|
)
|
feat: OpenTelemetry LGTM observability, dev tooling, and memoir UX fixes (#31)
* add staging ios app build script
* feat(api): add OpenTelemetry LGTM stack for local observability
Wire OTel traces, metrics, and logs through a collector to Tempo,
Prometheus, and Loki, with custom LLM instrumentation, dev compose overlay,
Grafana provisioning, env templates, and development.sh auto-start.
Co-authored-by: Cursor <cursoragent@cursor.com>
* feat: expand observability, harden dev tooling, and fix expo staging UX
Add business and LLM Prometheus metrics with Grafana dashboards, alerting,
and a metrics verification script. Wire telemetry through adapters and core
LLM paths, and document the local LGTM workflow.
Fix development.sh for macOS bash 3.2, open Grafana and eval-web in Chrome,
and repair eval-web auto-open (unbound EVAL_WEB_BROWSER_SCHEDULED). Merge
internal-eval into the main dev script with improved compose handling.
Require EXPO_PUBLIC_* at build time, improve iOS HTTP ATS for staging IPs,
show memoir empty state instead of load errors when no chapters exist, and
add jest env setup plus chapter list response normalization.
Co-authored-by: Cursor <cursoragent@cursor.com>
* chore: enable Grafana Assistant Cursor plugin
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: memoir empty state and repair withdrawn 0020_chapters_book_id stamp
Show empty memoir UI when the chapter list succeeds with no items; treat auth/404 as non-fatal. Extend alembic revision repair so local dev DBs stamped with the removed 0020_chapters_book_id migration can roll back and upgrade to 0019.
Co-authored-by: Cursor <cursoragent@cursor.com>
---------
Co-authored-by: Kevin <kevin@brighteng.org>
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-20 15:12:21 +08:00
|
|
|
|
return content, attempt + 1, last_in, last_out
|
2026-04-03 13:34:27 +08:00
|
|
|
|
if attempt == 0 and retry_empty:
|
|
|
|
|
|
logger.warning(
|
|
|
|
|
|
"json_object 返回空 content,将重试 agent={} attempt={} prompt_sha12={}",
|
|
|
|
|
|
tag,
|
|
|
|
|
|
attempt,
|
|
|
|
|
|
sha,
|
|
|
|
|
|
)
|
|
|
|
|
|
logger.warning("json_object 仍为空 agent={} prompt_sha12={}", tag, sha)
|
feat: OpenTelemetry LGTM observability, dev tooling, and memoir UX fixes (#31)
* add staging ios app build script
* feat(api): add OpenTelemetry LGTM stack for local observability
Wire OTel traces, metrics, and logs through a collector to Tempo,
Prometheus, and Loki, with custom LLM instrumentation, dev compose overlay,
Grafana provisioning, env templates, and development.sh auto-start.
Co-authored-by: Cursor <cursoragent@cursor.com>
* feat: expand observability, harden dev tooling, and fix expo staging UX
Add business and LLM Prometheus metrics with Grafana dashboards, alerting,
and a metrics verification script. Wire telemetry through adapters and core
LLM paths, and document the local LGTM workflow.
Fix development.sh for macOS bash 3.2, open Grafana and eval-web in Chrome,
and repair eval-web auto-open (unbound EVAL_WEB_BROWSER_SCHEDULED). Merge
internal-eval into the main dev script with improved compose handling.
Require EXPO_PUBLIC_* at build time, improve iOS HTTP ATS for staging IPs,
show memoir empty state instead of load errors when no chapters exist, and
add jest env setup plus chapter list response normalization.
Co-authored-by: Cursor <cursoragent@cursor.com>
* chore: enable Grafana Assistant Cursor plugin
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: memoir empty state and repair withdrawn 0020_chapters_book_id stamp
Show empty memoir UI when the chapter list succeeds with no items; treat auth/404 as non-fatal. Extend alembic revision repair so local dev DBs stamped with the removed 0020_chapters_book_id migration can roll back and upgrade to 0019.
Co-authored-by: Cursor <cursoragent@cursor.com>
---------
Co-authored-by: Kevin <kevin@brighteng.org>
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-20 15:12:21 +08:00
|
|
|
|
return "", attempts, last_in, last_out
|
2026-04-03 13:34:27 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
async def _invoke_raw_async(
|
|
|
|
|
|
llm: Any,
|
|
|
|
|
|
prompt: str,
|
|
|
|
|
|
*,
|
|
|
|
|
|
max_tokens: int,
|
|
|
|
|
|
agent: str,
|
|
|
|
|
|
retry_empty: bool,
|
feat: OpenTelemetry LGTM observability, dev tooling, and memoir UX fixes (#31)
* add staging ios app build script
* feat(api): add OpenTelemetry LGTM stack for local observability
Wire OTel traces, metrics, and logs through a collector to Tempo,
Prometheus, and Loki, with custom LLM instrumentation, dev compose overlay,
Grafana provisioning, env templates, and development.sh auto-start.
Co-authored-by: Cursor <cursoragent@cursor.com>
* feat: expand observability, harden dev tooling, and fix expo staging UX
Add business and LLM Prometheus metrics with Grafana dashboards, alerting,
and a metrics verification script. Wire telemetry through adapters and core
LLM paths, and document the local LGTM workflow.
Fix development.sh for macOS bash 3.2, open Grafana and eval-web in Chrome,
and repair eval-web auto-open (unbound EVAL_WEB_BROWSER_SCHEDULED). Merge
internal-eval into the main dev script with improved compose handling.
Require EXPO_PUBLIC_* at build time, improve iOS HTTP ATS for staging IPs,
show memoir empty state instead of load errors when no chapters exist, and
add jest env setup plus chapter list response normalization.
Co-authored-by: Cursor <cursoragent@cursor.com>
* chore: enable Grafana Assistant Cursor plugin
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: memoir empty state and repair withdrawn 0020_chapters_book_id stamp
Show empty memoir UI when the chapter list succeeds with no items; treat auth/404 as non-fatal. Extend alembic revision repair so local dev DBs stamped with the removed 0020_chapters_book_id migration can roll back and upgrade to 0019.
Co-authored-by: Cursor <cursoragent@cursor.com>
---------
Co-authored-by: Kevin <kevin@brighteng.org>
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-20 15:12:21 +08:00
|
|
|
|
) -> tuple[str, int, int, int]:
|
2026-04-03 13:34:27 +08:00
|
|
|
|
prompt_for_api = ensure_json_object_prompt_has_json_keyword(prompt)
|
|
|
|
|
|
bound = bind_json_object_mode(llm, max_tokens=max_tokens)
|
|
|
|
|
|
tag = agent or "json_object"
|
|
|
|
|
|
sha = _prompt_sha12(prompt_for_api)
|
|
|
|
|
|
attempts = 2 if retry_empty else 1
|
feat: OpenTelemetry LGTM observability, dev tooling, and memoir UX fixes (#31)
* add staging ios app build script
* feat(api): add OpenTelemetry LGTM stack for local observability
Wire OTel traces, metrics, and logs through a collector to Tempo,
Prometheus, and Loki, with custom LLM instrumentation, dev compose overlay,
Grafana provisioning, env templates, and development.sh auto-start.
Co-authored-by: Cursor <cursoragent@cursor.com>
* feat: expand observability, harden dev tooling, and fix expo staging UX
Add business and LLM Prometheus metrics with Grafana dashboards, alerting,
and a metrics verification script. Wire telemetry through adapters and core
LLM paths, and document the local LGTM workflow.
Fix development.sh for macOS bash 3.2, open Grafana and eval-web in Chrome,
and repair eval-web auto-open (unbound EVAL_WEB_BROWSER_SCHEDULED). Merge
internal-eval into the main dev script with improved compose handling.
Require EXPO_PUBLIC_* at build time, improve iOS HTTP ATS for staging IPs,
show memoir empty state instead of load errors when no chapters exist, and
add jest env setup plus chapter list response normalization.
Co-authored-by: Cursor <cursoragent@cursor.com>
* chore: enable Grafana Assistant Cursor plugin
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: memoir empty state and repair withdrawn 0020_chapters_book_id stamp
Show empty memoir UI when the chapter list succeeds with no items; treat auth/404 as non-fatal. Extend alembic revision repair so local dev DBs stamped with the removed 0020_chapters_book_id migration can roll back and upgrade to 0019.
Co-authored-by: Cursor <cursoragent@cursor.com>
---------
Co-authored-by: Kevin <kevin@brighteng.org>
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-20 15:12:21 +08:00
|
|
|
|
last_in, last_out = 0, 0
|
2026-04-03 13:34:27 +08:00
|
|
|
|
for attempt in range(attempts):
|
|
|
|
|
|
response = await bound.ainvoke(prompt_for_api)
|
feat: OpenTelemetry LGTM observability, dev tooling, and memoir UX fixes (#31)
* add staging ios app build script
* feat(api): add OpenTelemetry LGTM stack for local observability
Wire OTel traces, metrics, and logs through a collector to Tempo,
Prometheus, and Loki, with custom LLM instrumentation, dev compose overlay,
Grafana provisioning, env templates, and development.sh auto-start.
Co-authored-by: Cursor <cursoragent@cursor.com>
* feat: expand observability, harden dev tooling, and fix expo staging UX
Add business and LLM Prometheus metrics with Grafana dashboards, alerting,
and a metrics verification script. Wire telemetry through adapters and core
LLM paths, and document the local LGTM workflow.
Fix development.sh for macOS bash 3.2, open Grafana and eval-web in Chrome,
and repair eval-web auto-open (unbound EVAL_WEB_BROWSER_SCHEDULED). Merge
internal-eval into the main dev script with improved compose handling.
Require EXPO_PUBLIC_* at build time, improve iOS HTTP ATS for staging IPs,
show memoir empty state instead of load errors when no chapters exist, and
add jest env setup plus chapter list response normalization.
Co-authored-by: Cursor <cursoragent@cursor.com>
* chore: enable Grafana Assistant Cursor plugin
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: memoir empty state and repair withdrawn 0020_chapters_book_id stamp
Show empty memoir UI when the chapter list succeeds with no items; treat auth/404 as non-fatal. Extend alembic revision repair so local dev DBs stamped with the removed 0020_chapters_book_id migration can roll back and upgrade to 0019.
Co-authored-by: Cursor <cursoragent@cursor.com>
---------
Co-authored-by: Kevin <kevin@brighteng.org>
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-20 15:12:21 +08:00
|
|
|
|
last_in, last_out = extract_token_usage(response)
|
2026-04-03 13:34:27 +08:00
|
|
|
|
content = (getattr(response, "content", None) or "").strip()
|
|
|
|
|
|
if content:
|
|
|
|
|
|
if attempt > 0:
|
|
|
|
|
|
logger.info(
|
|
|
|
|
|
"json_object 空内容重试成功 agent={} prompt_sha12={}",
|
|
|
|
|
|
tag,
|
|
|
|
|
|
sha,
|
|
|
|
|
|
)
|
feat: OpenTelemetry LGTM observability, dev tooling, and memoir UX fixes (#31)
* add staging ios app build script
* feat(api): add OpenTelemetry LGTM stack for local observability
Wire OTel traces, metrics, and logs through a collector to Tempo,
Prometheus, and Loki, with custom LLM instrumentation, dev compose overlay,
Grafana provisioning, env templates, and development.sh auto-start.
Co-authored-by: Cursor <cursoragent@cursor.com>
* feat: expand observability, harden dev tooling, and fix expo staging UX
Add business and LLM Prometheus metrics with Grafana dashboards, alerting,
and a metrics verification script. Wire telemetry through adapters and core
LLM paths, and document the local LGTM workflow.
Fix development.sh for macOS bash 3.2, open Grafana and eval-web in Chrome,
and repair eval-web auto-open (unbound EVAL_WEB_BROWSER_SCHEDULED). Merge
internal-eval into the main dev script with improved compose handling.
Require EXPO_PUBLIC_* at build time, improve iOS HTTP ATS for staging IPs,
show memoir empty state instead of load errors when no chapters exist, and
add jest env setup plus chapter list response normalization.
Co-authored-by: Cursor <cursoragent@cursor.com>
* chore: enable Grafana Assistant Cursor plugin
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: memoir empty state and repair withdrawn 0020_chapters_book_id stamp
Show empty memoir UI when the chapter list succeeds with no items; treat auth/404 as non-fatal. Extend alembic revision repair so local dev DBs stamped with the removed 0020_chapters_book_id migration can roll back and upgrade to 0019.
Co-authored-by: Cursor <cursoragent@cursor.com>
---------
Co-authored-by: Kevin <kevin@brighteng.org>
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-20 15:12:21 +08:00
|
|
|
|
return content, attempt + 1, last_in, last_out
|
2026-04-03 13:34:27 +08:00
|
|
|
|
if attempt == 0 and retry_empty:
|
|
|
|
|
|
logger.warning(
|
|
|
|
|
|
"json_object 返回空 content,将重试 agent={} attempt={} prompt_sha12={}",
|
|
|
|
|
|
tag,
|
|
|
|
|
|
attempt,
|
|
|
|
|
|
sha,
|
|
|
|
|
|
)
|
|
|
|
|
|
logger.warning("json_object 仍为空 agent={} prompt_sha12={}", tag, sha)
|
feat: OpenTelemetry LGTM observability, dev tooling, and memoir UX fixes (#31)
* add staging ios app build script
* feat(api): add OpenTelemetry LGTM stack for local observability
Wire OTel traces, metrics, and logs through a collector to Tempo,
Prometheus, and Loki, with custom LLM instrumentation, dev compose overlay,
Grafana provisioning, env templates, and development.sh auto-start.
Co-authored-by: Cursor <cursoragent@cursor.com>
* feat: expand observability, harden dev tooling, and fix expo staging UX
Add business and LLM Prometheus metrics with Grafana dashboards, alerting,
and a metrics verification script. Wire telemetry through adapters and core
LLM paths, and document the local LGTM workflow.
Fix development.sh for macOS bash 3.2, open Grafana and eval-web in Chrome,
and repair eval-web auto-open (unbound EVAL_WEB_BROWSER_SCHEDULED). Merge
internal-eval into the main dev script with improved compose handling.
Require EXPO_PUBLIC_* at build time, improve iOS HTTP ATS for staging IPs,
show memoir empty state instead of load errors when no chapters exist, and
add jest env setup plus chapter list response normalization.
Co-authored-by: Cursor <cursoragent@cursor.com>
* chore: enable Grafana Assistant Cursor plugin
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: memoir empty state and repair withdrawn 0020_chapters_book_id stamp
Show empty memoir UI when the chapter list succeeds with no items; treat auth/404 as non-fatal. Extend alembic revision repair so local dev DBs stamped with the removed 0020_chapters_book_id migration can roll back and upgrade to 0019.
Co-authored-by: Cursor <cursoragent@cursor.com>
---------
Co-authored-by: Kevin <kevin@brighteng.org>
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-20 15:12:21 +08:00
|
|
|
|
return "", attempts, last_in, last_out
|
2026-04-03 13:34:27 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def _parse_and_validate(
|
|
|
|
|
|
raw: str,
|
|
|
|
|
|
schema: type[T],
|
|
|
|
|
|
*,
|
|
|
|
|
|
agent: str,
|
|
|
|
|
|
) -> T:
|
|
|
|
|
|
s = (raw or "").strip()
|
|
|
|
|
|
if not s:
|
|
|
|
|
|
raise LLMCallError(
|
|
|
|
|
|
"decode", "empty llm content for json parse", raw_content=raw
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
data: Any
|
|
|
|
|
|
try:
|
|
|
|
|
|
data = json.loads(s)
|
|
|
|
|
|
except json.JSONDecodeError:
|
|
|
|
|
|
stripped = extract_json_payload(s)
|
|
|
|
|
|
if stripped != s:
|
|
|
|
|
|
logger.warning(
|
|
|
|
|
|
"event=llm_json_compat_strip_hit agent={} prompt_kind=decode_retry",
|
|
|
|
|
|
agent,
|
|
|
|
|
|
)
|
|
|
|
|
|
try:
|
|
|
|
|
|
data = json.loads(stripped)
|
|
|
|
|
|
except json.JSONDecodeError as e:
|
|
|
|
|
|
raise LLMCallError(
|
|
|
|
|
|
"decode",
|
|
|
|
|
|
f"json decode failed: {e}",
|
|
|
|
|
|
raw_content=s[:4096],
|
|
|
|
|
|
) from e
|
|
|
|
|
|
|
|
|
|
|
|
try:
|
|
|
|
|
|
return schema.model_validate(data)
|
|
|
|
|
|
except ValidationError as e:
|
|
|
|
|
|
raise LLMCallError(
|
|
|
|
|
|
"validation",
|
|
|
|
|
|
f"pydantic validation failed: {e}",
|
|
|
|
|
|
raw_content=s[:4096],
|
|
|
|
|
|
) from e
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def _emit_meta(
|
|
|
|
|
|
*,
|
|
|
|
|
|
agent: str,
|
|
|
|
|
|
schema_name: str,
|
|
|
|
|
|
max_tokens: int,
|
|
|
|
|
|
t0: float,
|
|
|
|
|
|
attempts: int,
|
|
|
|
|
|
parse_ok: bool,
|
|
|
|
|
|
used_fallback: bool,
|
|
|
|
|
|
error_kind: str | None,
|
feat: OpenTelemetry LGTM observability, dev tooling, and memoir UX fixes (#31)
* add staging ios app build script
* feat(api): add OpenTelemetry LGTM stack for local observability
Wire OTel traces, metrics, and logs through a collector to Tempo,
Prometheus, and Loki, with custom LLM instrumentation, dev compose overlay,
Grafana provisioning, env templates, and development.sh auto-start.
Co-authored-by: Cursor <cursoragent@cursor.com>
* feat: expand observability, harden dev tooling, and fix expo staging UX
Add business and LLM Prometheus metrics with Grafana dashboards, alerting,
and a metrics verification script. Wire telemetry through adapters and core
LLM paths, and document the local LGTM workflow.
Fix development.sh for macOS bash 3.2, open Grafana and eval-web in Chrome,
and repair eval-web auto-open (unbound EVAL_WEB_BROWSER_SCHEDULED). Merge
internal-eval into the main dev script with improved compose handling.
Require EXPO_PUBLIC_* at build time, improve iOS HTTP ATS for staging IPs,
show memoir empty state instead of load errors when no chapters exist, and
add jest env setup plus chapter list response normalization.
Co-authored-by: Cursor <cursoragent@cursor.com>
* chore: enable Grafana Assistant Cursor plugin
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: memoir empty state and repair withdrawn 0020_chapters_book_id stamp
Show empty memoir UI when the chapter list succeeds with no items; treat auth/404 as non-fatal. Extend alembic revision repair so local dev DBs stamped with the removed 0020_chapters_book_id migration can roll back and upgrade to 0019.
Co-authored-by: Cursor <cursoragent@cursor.com>
---------
Co-authored-by: Kevin <kevin@brighteng.org>
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-20 15:12:21 +08:00
|
|
|
|
provider: str,
|
|
|
|
|
|
model: str,
|
|
|
|
|
|
prompt_sha12: str,
|
|
|
|
|
|
input_tokens: int = 0,
|
|
|
|
|
|
output_tokens: int = 0,
|
|
|
|
|
|
span: Any | None = None,
|
2026-04-03 13:34:27 +08:00
|
|
|
|
) -> None:
|
|
|
|
|
|
meta = LLMCallMeta(
|
|
|
|
|
|
agent=agent,
|
|
|
|
|
|
schema_name=schema_name,
|
|
|
|
|
|
max_tokens=max_tokens,
|
|
|
|
|
|
duration_ms=(time.perf_counter() - t0) * 1000,
|
|
|
|
|
|
attempts=attempts,
|
|
|
|
|
|
parse_ok=parse_ok,
|
|
|
|
|
|
used_fallback=used_fallback,
|
|
|
|
|
|
error_kind=error_kind,
|
|
|
|
|
|
)
|
feat: OpenTelemetry LGTM observability, dev tooling, and memoir UX fixes (#31)
* add staging ios app build script
* feat(api): add OpenTelemetry LGTM stack for local observability
Wire OTel traces, metrics, and logs through a collector to Tempo,
Prometheus, and Loki, with custom LLM instrumentation, dev compose overlay,
Grafana provisioning, env templates, and development.sh auto-start.
Co-authored-by: Cursor <cursoragent@cursor.com>
* feat: expand observability, harden dev tooling, and fix expo staging UX
Add business and LLM Prometheus metrics with Grafana dashboards, alerting,
and a metrics verification script. Wire telemetry through adapters and core
LLM paths, and document the local LGTM workflow.
Fix development.sh for macOS bash 3.2, open Grafana and eval-web in Chrome,
and repair eval-web auto-open (unbound EVAL_WEB_BROWSER_SCHEDULED). Merge
internal-eval into the main dev script with improved compose handling.
Require EXPO_PUBLIC_* at build time, improve iOS HTTP ATS for staging IPs,
show memoir empty state instead of load errors when no chapters exist, and
add jest env setup plus chapter list response normalization.
Co-authored-by: Cursor <cursoragent@cursor.com>
* chore: enable Grafana Assistant Cursor plugin
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: memoir empty state and repair withdrawn 0020_chapters_book_id stamp
Show empty memoir UI when the chapter list succeeds with no items; treat auth/404 as non-fatal. Extend alembic revision repair so local dev DBs stamped with the removed 0020_chapters_book_id migration can roll back and upgrade to 0019.
Co-authored-by: Cursor <cursoragent@cursor.com>
---------
Co-authored-by: Kevin <kevin@brighteng.org>
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-20 15:12:21 +08:00
|
|
|
|
bind = {
|
|
|
|
|
|
"event": "llm_json_call",
|
|
|
|
|
|
"agent": meta.agent,
|
|
|
|
|
|
"schema": meta.schema_name,
|
|
|
|
|
|
"max_tokens": meta.max_tokens,
|
|
|
|
|
|
"duration_ms": round(meta.duration_ms, 2),
|
|
|
|
|
|
"attempts": meta.attempts,
|
|
|
|
|
|
"parse_ok": meta.parse_ok,
|
|
|
|
|
|
"used_fallback": meta.used_fallback,
|
|
|
|
|
|
"error_kind": meta.error_kind,
|
|
|
|
|
|
"provider": provider,
|
|
|
|
|
|
"prompt_sha12": prompt_sha12,
|
|
|
|
|
|
}
|
|
|
|
|
|
logger.bind(**bind).info("llm_json_call_done")
|
|
|
|
|
|
record_llm_call(
|
2026-04-03 13:34:27 +08:00
|
|
|
|
agent=meta.agent,
|
feat: OpenTelemetry LGTM observability, dev tooling, and memoir UX fixes (#31)
* add staging ios app build script
* feat(api): add OpenTelemetry LGTM stack for local observability
Wire OTel traces, metrics, and logs through a collector to Tempo,
Prometheus, and Loki, with custom LLM instrumentation, dev compose overlay,
Grafana provisioning, env templates, and development.sh auto-start.
Co-authored-by: Cursor <cursoragent@cursor.com>
* feat: expand observability, harden dev tooling, and fix expo staging UX
Add business and LLM Prometheus metrics with Grafana dashboards, alerting,
and a metrics verification script. Wire telemetry through adapters and core
LLM paths, and document the local LGTM workflow.
Fix development.sh for macOS bash 3.2, open Grafana and eval-web in Chrome,
and repair eval-web auto-open (unbound EVAL_WEB_BROWSER_SCHEDULED). Merge
internal-eval into the main dev script with improved compose handling.
Require EXPO_PUBLIC_* at build time, improve iOS HTTP ATS for staging IPs,
show memoir empty state instead of load errors when no chapters exist, and
add jest env setup plus chapter list response normalization.
Co-authored-by: Cursor <cursoragent@cursor.com>
* chore: enable Grafana Assistant Cursor plugin
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: memoir empty state and repair withdrawn 0020_chapters_book_id stamp
Show empty memoir UI when the chapter list succeeds with no items; treat auth/404 as non-fatal. Extend alembic revision repair so local dev DBs stamped with the removed 0020_chapters_book_id migration can roll back and upgrade to 0019.
Co-authored-by: Cursor <cursoragent@cursor.com>
---------
Co-authored-by: Kevin <kevin@brighteng.org>
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-20 15:12:21 +08:00
|
|
|
|
schema_name=meta.schema_name,
|
|
|
|
|
|
provider=provider,
|
|
|
|
|
|
model=model,
|
|
|
|
|
|
duration_ms=meta.duration_ms,
|
2026-04-03 13:34:27 +08:00
|
|
|
|
attempts=meta.attempts,
|
|
|
|
|
|
parse_ok=meta.parse_ok,
|
|
|
|
|
|
used_fallback=meta.used_fallback,
|
|
|
|
|
|
error_kind=meta.error_kind,
|
feat: OpenTelemetry LGTM observability, dev tooling, and memoir UX fixes (#31)
* add staging ios app build script
* feat(api): add OpenTelemetry LGTM stack for local observability
Wire OTel traces, metrics, and logs through a collector to Tempo,
Prometheus, and Loki, with custom LLM instrumentation, dev compose overlay,
Grafana provisioning, env templates, and development.sh auto-start.
Co-authored-by: Cursor <cursoragent@cursor.com>
* feat: expand observability, harden dev tooling, and fix expo staging UX
Add business and LLM Prometheus metrics with Grafana dashboards, alerting,
and a metrics verification script. Wire telemetry through adapters and core
LLM paths, and document the local LGTM workflow.
Fix development.sh for macOS bash 3.2, open Grafana and eval-web in Chrome,
and repair eval-web auto-open (unbound EVAL_WEB_BROWSER_SCHEDULED). Merge
internal-eval into the main dev script with improved compose handling.
Require EXPO_PUBLIC_* at build time, improve iOS HTTP ATS for staging IPs,
show memoir empty state instead of load errors when no chapters exist, and
add jest env setup plus chapter list response normalization.
Co-authored-by: Cursor <cursoragent@cursor.com>
* chore: enable Grafana Assistant Cursor plugin
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: memoir empty state and repair withdrawn 0020_chapters_book_id stamp
Show empty memoir UI when the chapter list succeeds with no items; treat auth/404 as non-fatal. Extend alembic revision repair so local dev DBs stamped with the removed 0020_chapters_book_id migration can roll back and upgrade to 0019.
Co-authored-by: Cursor <cursoragent@cursor.com>
---------
Co-authored-by: Kevin <kevin@brighteng.org>
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-20 15:12:21 +08:00
|
|
|
|
prompt_sha12=prompt_sha12,
|
|
|
|
|
|
input_tokens=input_tokens,
|
|
|
|
|
|
output_tokens=output_tokens,
|
|
|
|
|
|
span=span,
|
|
|
|
|
|
)
|
2026-04-03 13:34:27 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def llm_json_call(
|
|
|
|
|
|
llm: Any,
|
|
|
|
|
|
prompt: str,
|
|
|
|
|
|
schema: type[T],
|
|
|
|
|
|
*,
|
|
|
|
|
|
max_tokens: int,
|
|
|
|
|
|
agent: str,
|
|
|
|
|
|
fallback_factory: Callable[[], T] | None = None,
|
|
|
|
|
|
retry_empty: bool = True,
|
2026-04-27 14:34:30 +08:00
|
|
|
|
http_error_vendor: LlmHttpErrorVendor = "deepseek",
|
2026-04-03 13:34:27 +08:00
|
|
|
|
) -> T:
|
|
|
|
|
|
"""同步:invoke → 解析 JSON → `schema.model_validate`;失败时 `fallback_factory` 或 `LLMCallError`。"""
|
|
|
|
|
|
schema_name = getattr(schema, "__name__", str(schema))
|
feat: OpenTelemetry LGTM observability, dev tooling, and memoir UX fixes (#31)
* add staging ios app build script
* feat(api): add OpenTelemetry LGTM stack for local observability
Wire OTel traces, metrics, and logs through a collector to Tempo,
Prometheus, and Loki, with custom LLM instrumentation, dev compose overlay,
Grafana provisioning, env templates, and development.sh auto-start.
Co-authored-by: Cursor <cursoragent@cursor.com>
* feat: expand observability, harden dev tooling, and fix expo staging UX
Add business and LLM Prometheus metrics with Grafana dashboards, alerting,
and a metrics verification script. Wire telemetry through adapters and core
LLM paths, and document the local LGTM workflow.
Fix development.sh for macOS bash 3.2, open Grafana and eval-web in Chrome,
and repair eval-web auto-open (unbound EVAL_WEB_BROWSER_SCHEDULED). Merge
internal-eval into the main dev script with improved compose handling.
Require EXPO_PUBLIC_* at build time, improve iOS HTTP ATS for staging IPs,
show memoir empty state instead of load errors when no chapters exist, and
add jest env setup plus chapter list response normalization.
Co-authored-by: Cursor <cursoragent@cursor.com>
* chore: enable Grafana Assistant Cursor plugin
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: memoir empty state and repair withdrawn 0020_chapters_book_id stamp
Show empty memoir UI when the chapter list succeeds with no items; treat auth/404 as non-fatal. Extend alembic revision repair so local dev DBs stamped with the removed 0020_chapters_book_id migration can roll back and upgrade to 0019.
Co-authored-by: Cursor <cursoragent@cursor.com>
---------
Co-authored-by: Kevin <kevin@brighteng.org>
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-20 15:12:21 +08:00
|
|
|
|
provider, model = infer_provider_model(llm, http_error_vendor=http_error_vendor)
|
|
|
|
|
|
prompt_sha12 = _prompt_sha12(prompt)
|
|
|
|
|
|
|
|
|
|
|
|
with llm_call_span(
|
|
|
|
|
|
agent=agent,
|
|
|
|
|
|
schema_name=schema_name,
|
|
|
|
|
|
provider=provider,
|
|
|
|
|
|
model=model,
|
|
|
|
|
|
prompt_sha12=prompt_sha12,
|
|
|
|
|
|
max_tokens=max_tokens,
|
|
|
|
|
|
) as span:
|
|
|
|
|
|
return _llm_json_call_sync_body(
|
|
|
|
|
|
llm,
|
|
|
|
|
|
prompt,
|
|
|
|
|
|
schema,
|
|
|
|
|
|
max_tokens=max_tokens,
|
|
|
|
|
|
agent=agent,
|
|
|
|
|
|
fallback_factory=fallback_factory,
|
|
|
|
|
|
retry_empty=retry_empty,
|
|
|
|
|
|
http_error_vendor=http_error_vendor,
|
|
|
|
|
|
schema_name=schema_name,
|
|
|
|
|
|
provider=provider,
|
|
|
|
|
|
model=model,
|
|
|
|
|
|
prompt_sha12=prompt_sha12,
|
|
|
|
|
|
span=span,
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def _llm_json_call_sync_body(
|
|
|
|
|
|
llm: Any,
|
|
|
|
|
|
prompt: str,
|
|
|
|
|
|
schema: type[T],
|
|
|
|
|
|
*,
|
|
|
|
|
|
max_tokens: int,
|
|
|
|
|
|
agent: str,
|
|
|
|
|
|
fallback_factory: Callable[[], T] | None,
|
|
|
|
|
|
retry_empty: bool,
|
|
|
|
|
|
http_error_vendor: LlmHttpErrorVendor,
|
|
|
|
|
|
schema_name: str,
|
|
|
|
|
|
provider: str,
|
|
|
|
|
|
model: str,
|
|
|
|
|
|
prompt_sha12: str,
|
|
|
|
|
|
span: Any,
|
|
|
|
|
|
) -> T:
|
|
|
|
|
|
t0 = time.perf_counter()
|
2026-04-03 13:34:27 +08:00
|
|
|
|
attempts_used = 0
|
feat: OpenTelemetry LGTM observability, dev tooling, and memoir UX fixes (#31)
* add staging ios app build script
* feat(api): add OpenTelemetry LGTM stack for local observability
Wire OTel traces, metrics, and logs through a collector to Tempo,
Prometheus, and Loki, with custom LLM instrumentation, dev compose overlay,
Grafana provisioning, env templates, and development.sh auto-start.
Co-authored-by: Cursor <cursoragent@cursor.com>
* feat: expand observability, harden dev tooling, and fix expo staging UX
Add business and LLM Prometheus metrics with Grafana dashboards, alerting,
and a metrics verification script. Wire telemetry through adapters and core
LLM paths, and document the local LGTM workflow.
Fix development.sh for macOS bash 3.2, open Grafana and eval-web in Chrome,
and repair eval-web auto-open (unbound EVAL_WEB_BROWSER_SCHEDULED). Merge
internal-eval into the main dev script with improved compose handling.
Require EXPO_PUBLIC_* at build time, improve iOS HTTP ATS for staging IPs,
show memoir empty state instead of load errors when no chapters exist, and
add jest env setup plus chapter list response normalization.
Co-authored-by: Cursor <cursoragent@cursor.com>
* chore: enable Grafana Assistant Cursor plugin
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: memoir empty state and repair withdrawn 0020_chapters_book_id stamp
Show empty memoir UI when the chapter list succeeds with no items; treat auth/404 as non-fatal. Extend alembic revision repair so local dev DBs stamped with the removed 0020_chapters_book_id migration can roll back and upgrade to 0019.
Co-authored-by: Cursor <cursoragent@cursor.com>
---------
Co-authored-by: Kevin <kevin@brighteng.org>
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-20 15:12:21 +08:00
|
|
|
|
input_tokens = 0
|
|
|
|
|
|
output_tokens = 0
|
2026-04-03 13:34:27 +08:00
|
|
|
|
raw = ""
|
|
|
|
|
|
|
|
|
|
|
|
try:
|
feat: OpenTelemetry LGTM observability, dev tooling, and memoir UX fixes (#31)
* add staging ios app build script
* feat(api): add OpenTelemetry LGTM stack for local observability
Wire OTel traces, metrics, and logs through a collector to Tempo,
Prometheus, and Loki, with custom LLM instrumentation, dev compose overlay,
Grafana provisioning, env templates, and development.sh auto-start.
Co-authored-by: Cursor <cursoragent@cursor.com>
* feat: expand observability, harden dev tooling, and fix expo staging UX
Add business and LLM Prometheus metrics with Grafana dashboards, alerting,
and a metrics verification script. Wire telemetry through adapters and core
LLM paths, and document the local LGTM workflow.
Fix development.sh for macOS bash 3.2, open Grafana and eval-web in Chrome,
and repair eval-web auto-open (unbound EVAL_WEB_BROWSER_SCHEDULED). Merge
internal-eval into the main dev script with improved compose handling.
Require EXPO_PUBLIC_* at build time, improve iOS HTTP ATS for staging IPs,
show memoir empty state instead of load errors when no chapters exist, and
add jest env setup plus chapter list response normalization.
Co-authored-by: Cursor <cursoragent@cursor.com>
* chore: enable Grafana Assistant Cursor plugin
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: memoir empty state and repair withdrawn 0020_chapters_book_id stamp
Show empty memoir UI when the chapter list succeeds with no items; treat auth/404 as non-fatal. Extend alembic revision repair so local dev DBs stamped with the removed 0020_chapters_book_id migration can roll back and upgrade to 0019.
Co-authored-by: Cursor <cursoragent@cursor.com>
---------
Co-authored-by: Kevin <kevin@brighteng.org>
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-20 15:12:21 +08:00
|
|
|
|
raw, attempts_used, input_tokens, output_tokens = _invoke_raw_sync(
|
2026-04-03 13:34:27 +08:00
|
|
|
|
llm,
|
|
|
|
|
|
prompt,
|
|
|
|
|
|
max_tokens=max_tokens,
|
|
|
|
|
|
agent=agent,
|
|
|
|
|
|
retry_empty=retry_empty,
|
|
|
|
|
|
)
|
|
|
|
|
|
out = _parse_and_validate(raw, schema, agent=agent)
|
|
|
|
|
|
_emit_meta(
|
|
|
|
|
|
agent=agent,
|
|
|
|
|
|
schema_name=schema_name,
|
|
|
|
|
|
max_tokens=max_tokens,
|
|
|
|
|
|
t0=t0,
|
|
|
|
|
|
attempts=attempts_used,
|
|
|
|
|
|
parse_ok=True,
|
|
|
|
|
|
used_fallback=False,
|
|
|
|
|
|
error_kind=None,
|
feat: OpenTelemetry LGTM observability, dev tooling, and memoir UX fixes (#31)
* add staging ios app build script
* feat(api): add OpenTelemetry LGTM stack for local observability
Wire OTel traces, metrics, and logs through a collector to Tempo,
Prometheus, and Loki, with custom LLM instrumentation, dev compose overlay,
Grafana provisioning, env templates, and development.sh auto-start.
Co-authored-by: Cursor <cursoragent@cursor.com>
* feat: expand observability, harden dev tooling, and fix expo staging UX
Add business and LLM Prometheus metrics with Grafana dashboards, alerting,
and a metrics verification script. Wire telemetry through adapters and core
LLM paths, and document the local LGTM workflow.
Fix development.sh for macOS bash 3.2, open Grafana and eval-web in Chrome,
and repair eval-web auto-open (unbound EVAL_WEB_BROWSER_SCHEDULED). Merge
internal-eval into the main dev script with improved compose handling.
Require EXPO_PUBLIC_* at build time, improve iOS HTTP ATS for staging IPs,
show memoir empty state instead of load errors when no chapters exist, and
add jest env setup plus chapter list response normalization.
Co-authored-by: Cursor <cursoragent@cursor.com>
* chore: enable Grafana Assistant Cursor plugin
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: memoir empty state and repair withdrawn 0020_chapters_book_id stamp
Show empty memoir UI when the chapter list succeeds with no items; treat auth/404 as non-fatal. Extend alembic revision repair so local dev DBs stamped with the removed 0020_chapters_book_id migration can roll back and upgrade to 0019.
Co-authored-by: Cursor <cursoragent@cursor.com>
---------
Co-authored-by: Kevin <kevin@brighteng.org>
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-20 15:12:21 +08:00
|
|
|
|
provider=provider,
|
|
|
|
|
|
model=model,
|
|
|
|
|
|
prompt_sha12=prompt_sha12,
|
|
|
|
|
|
input_tokens=input_tokens,
|
|
|
|
|
|
output_tokens=output_tokens,
|
|
|
|
|
|
span=span,
|
2026-04-03 13:34:27 +08:00
|
|
|
|
)
|
|
|
|
|
|
if agent_verbose_enabled():
|
|
|
|
|
|
log_agent_payload(
|
|
|
|
|
|
logger,
|
|
|
|
|
|
f"{agent}.prompt",
|
|
|
|
|
|
ensure_json_object_prompt_has_json_keyword(prompt),
|
|
|
|
|
|
)
|
|
|
|
|
|
log_agent_payload(logger, f"{agent}.response", raw)
|
|
|
|
|
|
return out
|
|
|
|
|
|
except LLMCallError as e:
|
|
|
|
|
|
used_fb = fallback_factory is not None
|
|
|
|
|
|
_emit_meta(
|
|
|
|
|
|
agent=agent,
|
|
|
|
|
|
schema_name=schema_name,
|
|
|
|
|
|
max_tokens=max_tokens,
|
|
|
|
|
|
t0=t0,
|
|
|
|
|
|
attempts=attempts_used,
|
|
|
|
|
|
parse_ok=False,
|
|
|
|
|
|
used_fallback=used_fb,
|
|
|
|
|
|
error_kind=e.kind,
|
feat: OpenTelemetry LGTM observability, dev tooling, and memoir UX fixes (#31)
* add staging ios app build script
* feat(api): add OpenTelemetry LGTM stack for local observability
Wire OTel traces, metrics, and logs through a collector to Tempo,
Prometheus, and Loki, with custom LLM instrumentation, dev compose overlay,
Grafana provisioning, env templates, and development.sh auto-start.
Co-authored-by: Cursor <cursoragent@cursor.com>
* feat: expand observability, harden dev tooling, and fix expo staging UX
Add business and LLM Prometheus metrics with Grafana dashboards, alerting,
and a metrics verification script. Wire telemetry through adapters and core
LLM paths, and document the local LGTM workflow.
Fix development.sh for macOS bash 3.2, open Grafana and eval-web in Chrome,
and repair eval-web auto-open (unbound EVAL_WEB_BROWSER_SCHEDULED). Merge
internal-eval into the main dev script with improved compose handling.
Require EXPO_PUBLIC_* at build time, improve iOS HTTP ATS for staging IPs,
show memoir empty state instead of load errors when no chapters exist, and
add jest env setup plus chapter list response normalization.
Co-authored-by: Cursor <cursoragent@cursor.com>
* chore: enable Grafana Assistant Cursor plugin
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: memoir empty state and repair withdrawn 0020_chapters_book_id stamp
Show empty memoir UI when the chapter list succeeds with no items; treat auth/404 as non-fatal. Extend alembic revision repair so local dev DBs stamped with the removed 0020_chapters_book_id migration can roll back and upgrade to 0019.
Co-authored-by: Cursor <cursoragent@cursor.com>
---------
Co-authored-by: Kevin <kevin@brighteng.org>
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-20 15:12:21 +08:00
|
|
|
|
provider=provider,
|
|
|
|
|
|
model=model,
|
|
|
|
|
|
prompt_sha12=prompt_sha12,
|
|
|
|
|
|
input_tokens=input_tokens,
|
|
|
|
|
|
output_tokens=output_tokens,
|
|
|
|
|
|
span=span,
|
2026-04-03 13:34:27 +08:00
|
|
|
|
)
|
|
|
|
|
|
if agent_verbose_enabled():
|
|
|
|
|
|
log_agent_payload(
|
|
|
|
|
|
logger,
|
|
|
|
|
|
f"{agent}.prompt",
|
|
|
|
|
|
ensure_json_object_prompt_has_json_keyword(prompt),
|
|
|
|
|
|
)
|
|
|
|
|
|
log_agent_payload(logger, f"{agent}.response", raw)
|
|
|
|
|
|
if fallback_factory is not None:
|
|
|
|
|
|
return fallback_factory()
|
|
|
|
|
|
raise
|
|
|
|
|
|
except Exception as e:
|
feat(eval): memoir A/B chapter judging and eval-web parity with dialogue
- Judge baseline excerpt and library chapter separately; build_memoir_compare_summary for gate, nine-dim and leaf deltas.
- Memoir SSE chapter payload: baseline_judge, compare_summary, baseline_judge_error.
- MemoirJudgeOutput: loose score coercion and post-validate clamp; memoir judge prompt caps from settings.
- app-eval-web: two-column MemoirScoreCard layout, MemoirCompareSummary, chapter blocks and CSS.
- Add memoir_compare_summary, log_events, celery_log_context, memoir_pipeline_progress; tests and migration 0014.
- Misc: memory/evidence and enrichment paths, task/orchestrator updates, internal-eval docs, env examples.
2026-04-10 10:23:43 +08:00
|
|
|
|
_log_invoke_failure(agent=agent, exc=e, sync=True)
|
2026-04-03 13:34:27 +08:00
|
|
|
|
used_fb = fallback_factory is not None
|
|
|
|
|
|
_emit_meta(
|
|
|
|
|
|
agent=agent,
|
|
|
|
|
|
schema_name=schema_name,
|
|
|
|
|
|
max_tokens=max_tokens,
|
|
|
|
|
|
t0=t0,
|
|
|
|
|
|
attempts=attempts_used,
|
|
|
|
|
|
parse_ok=False,
|
|
|
|
|
|
used_fallback=used_fb,
|
|
|
|
|
|
error_kind="invoke",
|
feat: OpenTelemetry LGTM observability, dev tooling, and memoir UX fixes (#31)
* add staging ios app build script
* feat(api): add OpenTelemetry LGTM stack for local observability
Wire OTel traces, metrics, and logs through a collector to Tempo,
Prometheus, and Loki, with custom LLM instrumentation, dev compose overlay,
Grafana provisioning, env templates, and development.sh auto-start.
Co-authored-by: Cursor <cursoragent@cursor.com>
* feat: expand observability, harden dev tooling, and fix expo staging UX
Add business and LLM Prometheus metrics with Grafana dashboards, alerting,
and a metrics verification script. Wire telemetry through adapters and core
LLM paths, and document the local LGTM workflow.
Fix development.sh for macOS bash 3.2, open Grafana and eval-web in Chrome,
and repair eval-web auto-open (unbound EVAL_WEB_BROWSER_SCHEDULED). Merge
internal-eval into the main dev script with improved compose handling.
Require EXPO_PUBLIC_* at build time, improve iOS HTTP ATS for staging IPs,
show memoir empty state instead of load errors when no chapters exist, and
add jest env setup plus chapter list response normalization.
Co-authored-by: Cursor <cursoragent@cursor.com>
* chore: enable Grafana Assistant Cursor plugin
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: memoir empty state and repair withdrawn 0020_chapters_book_id stamp
Show empty memoir UI when the chapter list succeeds with no items; treat auth/404 as non-fatal. Extend alembic revision repair so local dev DBs stamped with the removed 0020_chapters_book_id migration can roll back and upgrade to 0019.
Co-authored-by: Cursor <cursoragent@cursor.com>
---------
Co-authored-by: Kevin <kevin@brighteng.org>
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-20 15:12:21 +08:00
|
|
|
|
provider=provider,
|
|
|
|
|
|
model=model,
|
|
|
|
|
|
prompt_sha12=prompt_sha12,
|
|
|
|
|
|
input_tokens=input_tokens,
|
|
|
|
|
|
output_tokens=output_tokens,
|
|
|
|
|
|
span=span,
|
2026-04-03 13:34:27 +08:00
|
|
|
|
)
|
|
|
|
|
|
if agent_verbose_enabled():
|
|
|
|
|
|
log_agent_payload(
|
|
|
|
|
|
logger,
|
|
|
|
|
|
f"{agent}.prompt",
|
|
|
|
|
|
ensure_json_object_prompt_has_json_keyword(prompt),
|
|
|
|
|
|
)
|
|
|
|
|
|
log_agent_payload(logger, f"{agent}.response", raw)
|
|
|
|
|
|
if fallback_factory is not None:
|
|
|
|
|
|
return fallback_factory()
|
|
|
|
|
|
raise LLMCallError(
|
|
|
|
|
|
"invoke",
|
2026-04-27 14:34:30 +08:00
|
|
|
|
_format_llm_invoke_error_message(e, http_error_vendor=http_error_vendor),
|
2026-04-03 13:34:27 +08:00
|
|
|
|
raw_content=raw[:4096] if raw else None,
|
|
|
|
|
|
) from e
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
async def allm_json_call(
|
|
|
|
|
|
llm: Any,
|
|
|
|
|
|
prompt: str,
|
|
|
|
|
|
schema: type[T],
|
|
|
|
|
|
*,
|
|
|
|
|
|
max_tokens: int,
|
|
|
|
|
|
agent: str,
|
|
|
|
|
|
fallback_factory: Callable[[], T] | None = None,
|
|
|
|
|
|
retry_empty: bool = True,
|
2026-04-27 14:34:30 +08:00
|
|
|
|
http_error_vendor: LlmHttpErrorVendor = "deepseek",
|
2026-04-03 13:34:27 +08:00
|
|
|
|
) -> T:
|
|
|
|
|
|
"""异步版,语义与 `llm_json_call` 一致。"""
|
|
|
|
|
|
schema_name = getattr(schema, "__name__", str(schema))
|
feat: OpenTelemetry LGTM observability, dev tooling, and memoir UX fixes (#31)
* add staging ios app build script
* feat(api): add OpenTelemetry LGTM stack for local observability
Wire OTel traces, metrics, and logs through a collector to Tempo,
Prometheus, and Loki, with custom LLM instrumentation, dev compose overlay,
Grafana provisioning, env templates, and development.sh auto-start.
Co-authored-by: Cursor <cursoragent@cursor.com>
* feat: expand observability, harden dev tooling, and fix expo staging UX
Add business and LLM Prometheus metrics with Grafana dashboards, alerting,
and a metrics verification script. Wire telemetry through adapters and core
LLM paths, and document the local LGTM workflow.
Fix development.sh for macOS bash 3.2, open Grafana and eval-web in Chrome,
and repair eval-web auto-open (unbound EVAL_WEB_BROWSER_SCHEDULED). Merge
internal-eval into the main dev script with improved compose handling.
Require EXPO_PUBLIC_* at build time, improve iOS HTTP ATS for staging IPs,
show memoir empty state instead of load errors when no chapters exist, and
add jest env setup plus chapter list response normalization.
Co-authored-by: Cursor <cursoragent@cursor.com>
* chore: enable Grafana Assistant Cursor plugin
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: memoir empty state and repair withdrawn 0020_chapters_book_id stamp
Show empty memoir UI when the chapter list succeeds with no items; treat auth/404 as non-fatal. Extend alembic revision repair so local dev DBs stamped with the removed 0020_chapters_book_id migration can roll back and upgrade to 0019.
Co-authored-by: Cursor <cursoragent@cursor.com>
---------
Co-authored-by: Kevin <kevin@brighteng.org>
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-20 15:12:21 +08:00
|
|
|
|
provider, model = infer_provider_model(llm, http_error_vendor=http_error_vendor)
|
|
|
|
|
|
prompt_sha12 = _prompt_sha12(prompt)
|
|
|
|
|
|
|
|
|
|
|
|
with llm_call_span(
|
|
|
|
|
|
agent=agent,
|
|
|
|
|
|
schema_name=schema_name,
|
|
|
|
|
|
provider=provider,
|
|
|
|
|
|
model=model,
|
|
|
|
|
|
prompt_sha12=prompt_sha12,
|
|
|
|
|
|
max_tokens=max_tokens,
|
|
|
|
|
|
) as span:
|
|
|
|
|
|
return await _allm_json_call_async_body(
|
|
|
|
|
|
llm,
|
|
|
|
|
|
prompt,
|
|
|
|
|
|
schema,
|
|
|
|
|
|
max_tokens=max_tokens,
|
|
|
|
|
|
agent=agent,
|
|
|
|
|
|
fallback_factory=fallback_factory,
|
|
|
|
|
|
retry_empty=retry_empty,
|
|
|
|
|
|
http_error_vendor=http_error_vendor,
|
|
|
|
|
|
schema_name=schema_name,
|
|
|
|
|
|
provider=provider,
|
|
|
|
|
|
model=model,
|
|
|
|
|
|
prompt_sha12=prompt_sha12,
|
|
|
|
|
|
span=span,
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
async def _allm_json_call_async_body(
|
|
|
|
|
|
llm: Any,
|
|
|
|
|
|
prompt: str,
|
|
|
|
|
|
schema: type[T],
|
|
|
|
|
|
*,
|
|
|
|
|
|
max_tokens: int,
|
|
|
|
|
|
agent: str,
|
|
|
|
|
|
fallback_factory: Callable[[], T] | None,
|
|
|
|
|
|
retry_empty: bool,
|
|
|
|
|
|
http_error_vendor: LlmHttpErrorVendor,
|
|
|
|
|
|
schema_name: str,
|
|
|
|
|
|
provider: str,
|
|
|
|
|
|
model: str,
|
|
|
|
|
|
prompt_sha12: str,
|
|
|
|
|
|
span: Any,
|
|
|
|
|
|
) -> T:
|
|
|
|
|
|
t0 = time.perf_counter()
|
2026-04-03 13:34:27 +08:00
|
|
|
|
attempts_used = 0
|
feat: OpenTelemetry LGTM observability, dev tooling, and memoir UX fixes (#31)
* add staging ios app build script
* feat(api): add OpenTelemetry LGTM stack for local observability
Wire OTel traces, metrics, and logs through a collector to Tempo,
Prometheus, and Loki, with custom LLM instrumentation, dev compose overlay,
Grafana provisioning, env templates, and development.sh auto-start.
Co-authored-by: Cursor <cursoragent@cursor.com>
* feat: expand observability, harden dev tooling, and fix expo staging UX
Add business and LLM Prometheus metrics with Grafana dashboards, alerting,
and a metrics verification script. Wire telemetry through adapters and core
LLM paths, and document the local LGTM workflow.
Fix development.sh for macOS bash 3.2, open Grafana and eval-web in Chrome,
and repair eval-web auto-open (unbound EVAL_WEB_BROWSER_SCHEDULED). Merge
internal-eval into the main dev script with improved compose handling.
Require EXPO_PUBLIC_* at build time, improve iOS HTTP ATS for staging IPs,
show memoir empty state instead of load errors when no chapters exist, and
add jest env setup plus chapter list response normalization.
Co-authored-by: Cursor <cursoragent@cursor.com>
* chore: enable Grafana Assistant Cursor plugin
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: memoir empty state and repair withdrawn 0020_chapters_book_id stamp
Show empty memoir UI when the chapter list succeeds with no items; treat auth/404 as non-fatal. Extend alembic revision repair so local dev DBs stamped with the removed 0020_chapters_book_id migration can roll back and upgrade to 0019.
Co-authored-by: Cursor <cursoragent@cursor.com>
---------
Co-authored-by: Kevin <kevin@brighteng.org>
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-20 15:12:21 +08:00
|
|
|
|
input_tokens = 0
|
|
|
|
|
|
output_tokens = 0
|
2026-04-03 13:34:27 +08:00
|
|
|
|
raw = ""
|
|
|
|
|
|
|
|
|
|
|
|
try:
|
feat: OpenTelemetry LGTM observability, dev tooling, and memoir UX fixes (#31)
* add staging ios app build script
* feat(api): add OpenTelemetry LGTM stack for local observability
Wire OTel traces, metrics, and logs through a collector to Tempo,
Prometheus, and Loki, with custom LLM instrumentation, dev compose overlay,
Grafana provisioning, env templates, and development.sh auto-start.
Co-authored-by: Cursor <cursoragent@cursor.com>
* feat: expand observability, harden dev tooling, and fix expo staging UX
Add business and LLM Prometheus metrics with Grafana dashboards, alerting,
and a metrics verification script. Wire telemetry through adapters and core
LLM paths, and document the local LGTM workflow.
Fix development.sh for macOS bash 3.2, open Grafana and eval-web in Chrome,
and repair eval-web auto-open (unbound EVAL_WEB_BROWSER_SCHEDULED). Merge
internal-eval into the main dev script with improved compose handling.
Require EXPO_PUBLIC_* at build time, improve iOS HTTP ATS for staging IPs,
show memoir empty state instead of load errors when no chapters exist, and
add jest env setup plus chapter list response normalization.
Co-authored-by: Cursor <cursoragent@cursor.com>
* chore: enable Grafana Assistant Cursor plugin
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: memoir empty state and repair withdrawn 0020_chapters_book_id stamp
Show empty memoir UI when the chapter list succeeds with no items; treat auth/404 as non-fatal. Extend alembic revision repair so local dev DBs stamped with the removed 0020_chapters_book_id migration can roll back and upgrade to 0019.
Co-authored-by: Cursor <cursoragent@cursor.com>
---------
Co-authored-by: Kevin <kevin@brighteng.org>
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-20 15:12:21 +08:00
|
|
|
|
raw, attempts_used, input_tokens, output_tokens = await _invoke_raw_async(
|
2026-04-03 13:34:27 +08:00
|
|
|
|
llm,
|
|
|
|
|
|
prompt,
|
|
|
|
|
|
max_tokens=max_tokens,
|
|
|
|
|
|
agent=agent,
|
|
|
|
|
|
retry_empty=retry_empty,
|
|
|
|
|
|
)
|
|
|
|
|
|
out = _parse_and_validate(raw, schema, agent=agent)
|
|
|
|
|
|
_emit_meta(
|
|
|
|
|
|
agent=agent,
|
|
|
|
|
|
schema_name=schema_name,
|
|
|
|
|
|
max_tokens=max_tokens,
|
|
|
|
|
|
t0=t0,
|
|
|
|
|
|
attempts=attempts_used,
|
|
|
|
|
|
parse_ok=True,
|
|
|
|
|
|
used_fallback=False,
|
|
|
|
|
|
error_kind=None,
|
feat: OpenTelemetry LGTM observability, dev tooling, and memoir UX fixes (#31)
* add staging ios app build script
* feat(api): add OpenTelemetry LGTM stack for local observability
Wire OTel traces, metrics, and logs through a collector to Tempo,
Prometheus, and Loki, with custom LLM instrumentation, dev compose overlay,
Grafana provisioning, env templates, and development.sh auto-start.
Co-authored-by: Cursor <cursoragent@cursor.com>
* feat: expand observability, harden dev tooling, and fix expo staging UX
Add business and LLM Prometheus metrics with Grafana dashboards, alerting,
and a metrics verification script. Wire telemetry through adapters and core
LLM paths, and document the local LGTM workflow.
Fix development.sh for macOS bash 3.2, open Grafana and eval-web in Chrome,
and repair eval-web auto-open (unbound EVAL_WEB_BROWSER_SCHEDULED). Merge
internal-eval into the main dev script with improved compose handling.
Require EXPO_PUBLIC_* at build time, improve iOS HTTP ATS for staging IPs,
show memoir empty state instead of load errors when no chapters exist, and
add jest env setup plus chapter list response normalization.
Co-authored-by: Cursor <cursoragent@cursor.com>
* chore: enable Grafana Assistant Cursor plugin
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: memoir empty state and repair withdrawn 0020_chapters_book_id stamp
Show empty memoir UI when the chapter list succeeds with no items; treat auth/404 as non-fatal. Extend alembic revision repair so local dev DBs stamped with the removed 0020_chapters_book_id migration can roll back and upgrade to 0019.
Co-authored-by: Cursor <cursoragent@cursor.com>
---------
Co-authored-by: Kevin <kevin@brighteng.org>
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-20 15:12:21 +08:00
|
|
|
|
provider=provider,
|
|
|
|
|
|
model=model,
|
|
|
|
|
|
prompt_sha12=prompt_sha12,
|
|
|
|
|
|
input_tokens=input_tokens,
|
|
|
|
|
|
output_tokens=output_tokens,
|
|
|
|
|
|
span=span,
|
2026-04-03 13:34:27 +08:00
|
|
|
|
)
|
|
|
|
|
|
if agent_verbose_enabled():
|
|
|
|
|
|
log_agent_payload(
|
|
|
|
|
|
logger,
|
|
|
|
|
|
f"{agent}.prompt",
|
|
|
|
|
|
ensure_json_object_prompt_has_json_keyword(prompt),
|
|
|
|
|
|
)
|
|
|
|
|
|
log_agent_payload(logger, f"{agent}.response", raw)
|
|
|
|
|
|
return out
|
|
|
|
|
|
except LLMCallError as e:
|
|
|
|
|
|
used_fb = fallback_factory is not None
|
|
|
|
|
|
_emit_meta(
|
|
|
|
|
|
agent=agent,
|
|
|
|
|
|
schema_name=schema_name,
|
|
|
|
|
|
max_tokens=max_tokens,
|
|
|
|
|
|
t0=t0,
|
|
|
|
|
|
attempts=attempts_used,
|
|
|
|
|
|
parse_ok=False,
|
|
|
|
|
|
used_fallback=used_fb,
|
|
|
|
|
|
error_kind=e.kind,
|
feat: OpenTelemetry LGTM observability, dev tooling, and memoir UX fixes (#31)
* add staging ios app build script
* feat(api): add OpenTelemetry LGTM stack for local observability
Wire OTel traces, metrics, and logs through a collector to Tempo,
Prometheus, and Loki, with custom LLM instrumentation, dev compose overlay,
Grafana provisioning, env templates, and development.sh auto-start.
Co-authored-by: Cursor <cursoragent@cursor.com>
* feat: expand observability, harden dev tooling, and fix expo staging UX
Add business and LLM Prometheus metrics with Grafana dashboards, alerting,
and a metrics verification script. Wire telemetry through adapters and core
LLM paths, and document the local LGTM workflow.
Fix development.sh for macOS bash 3.2, open Grafana and eval-web in Chrome,
and repair eval-web auto-open (unbound EVAL_WEB_BROWSER_SCHEDULED). Merge
internal-eval into the main dev script with improved compose handling.
Require EXPO_PUBLIC_* at build time, improve iOS HTTP ATS for staging IPs,
show memoir empty state instead of load errors when no chapters exist, and
add jest env setup plus chapter list response normalization.
Co-authored-by: Cursor <cursoragent@cursor.com>
* chore: enable Grafana Assistant Cursor plugin
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: memoir empty state and repair withdrawn 0020_chapters_book_id stamp
Show empty memoir UI when the chapter list succeeds with no items; treat auth/404 as non-fatal. Extend alembic revision repair so local dev DBs stamped with the removed 0020_chapters_book_id migration can roll back and upgrade to 0019.
Co-authored-by: Cursor <cursoragent@cursor.com>
---------
Co-authored-by: Kevin <kevin@brighteng.org>
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-20 15:12:21 +08:00
|
|
|
|
provider=provider,
|
|
|
|
|
|
model=model,
|
|
|
|
|
|
prompt_sha12=prompt_sha12,
|
|
|
|
|
|
input_tokens=input_tokens,
|
|
|
|
|
|
output_tokens=output_tokens,
|
|
|
|
|
|
span=span,
|
2026-04-03 13:34:27 +08:00
|
|
|
|
)
|
|
|
|
|
|
if agent_verbose_enabled():
|
|
|
|
|
|
log_agent_payload(
|
|
|
|
|
|
logger,
|
|
|
|
|
|
f"{agent}.prompt",
|
|
|
|
|
|
ensure_json_object_prompt_has_json_keyword(prompt),
|
|
|
|
|
|
)
|
|
|
|
|
|
log_agent_payload(logger, f"{agent}.response", raw)
|
|
|
|
|
|
if fallback_factory is not None:
|
|
|
|
|
|
return fallback_factory()
|
|
|
|
|
|
raise
|
|
|
|
|
|
except Exception as e:
|
feat(eval): memoir A/B chapter judging and eval-web parity with dialogue
- Judge baseline excerpt and library chapter separately; build_memoir_compare_summary for gate, nine-dim and leaf deltas.
- Memoir SSE chapter payload: baseline_judge, compare_summary, baseline_judge_error.
- MemoirJudgeOutput: loose score coercion and post-validate clamp; memoir judge prompt caps from settings.
- app-eval-web: two-column MemoirScoreCard layout, MemoirCompareSummary, chapter blocks and CSS.
- Add memoir_compare_summary, log_events, celery_log_context, memoir_pipeline_progress; tests and migration 0014.
- Misc: memory/evidence and enrichment paths, task/orchestrator updates, internal-eval docs, env examples.
2026-04-10 10:23:43 +08:00
|
|
|
|
_log_invoke_failure(agent=agent, exc=e, sync=False)
|
2026-04-03 13:34:27 +08:00
|
|
|
|
used_fb = fallback_factory is not None
|
|
|
|
|
|
_emit_meta(
|
|
|
|
|
|
agent=agent,
|
|
|
|
|
|
schema_name=schema_name,
|
|
|
|
|
|
max_tokens=max_tokens,
|
|
|
|
|
|
t0=t0,
|
|
|
|
|
|
attempts=attempts_used,
|
|
|
|
|
|
parse_ok=False,
|
|
|
|
|
|
used_fallback=used_fb,
|
|
|
|
|
|
error_kind="invoke",
|
feat: OpenTelemetry LGTM observability, dev tooling, and memoir UX fixes (#31)
* add staging ios app build script
* feat(api): add OpenTelemetry LGTM stack for local observability
Wire OTel traces, metrics, and logs through a collector to Tempo,
Prometheus, and Loki, with custom LLM instrumentation, dev compose overlay,
Grafana provisioning, env templates, and development.sh auto-start.
Co-authored-by: Cursor <cursoragent@cursor.com>
* feat: expand observability, harden dev tooling, and fix expo staging UX
Add business and LLM Prometheus metrics with Grafana dashboards, alerting,
and a metrics verification script. Wire telemetry through adapters and core
LLM paths, and document the local LGTM workflow.
Fix development.sh for macOS bash 3.2, open Grafana and eval-web in Chrome,
and repair eval-web auto-open (unbound EVAL_WEB_BROWSER_SCHEDULED). Merge
internal-eval into the main dev script with improved compose handling.
Require EXPO_PUBLIC_* at build time, improve iOS HTTP ATS for staging IPs,
show memoir empty state instead of load errors when no chapters exist, and
add jest env setup plus chapter list response normalization.
Co-authored-by: Cursor <cursoragent@cursor.com>
* chore: enable Grafana Assistant Cursor plugin
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: memoir empty state and repair withdrawn 0020_chapters_book_id stamp
Show empty memoir UI when the chapter list succeeds with no items; treat auth/404 as non-fatal. Extend alembic revision repair so local dev DBs stamped with the removed 0020_chapters_book_id migration can roll back and upgrade to 0019.
Co-authored-by: Cursor <cursoragent@cursor.com>
---------
Co-authored-by: Kevin <kevin@brighteng.org>
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-20 15:12:21 +08:00
|
|
|
|
provider=provider,
|
|
|
|
|
|
model=model,
|
|
|
|
|
|
prompt_sha12=prompt_sha12,
|
|
|
|
|
|
input_tokens=input_tokens,
|
|
|
|
|
|
output_tokens=output_tokens,
|
|
|
|
|
|
span=span,
|
2026-04-03 13:34:27 +08:00
|
|
|
|
)
|
|
|
|
|
|
if agent_verbose_enabled():
|
|
|
|
|
|
log_agent_payload(
|
|
|
|
|
|
logger,
|
|
|
|
|
|
f"{agent}.prompt",
|
|
|
|
|
|
ensure_json_object_prompt_has_json_keyword(prompt),
|
|
|
|
|
|
)
|
|
|
|
|
|
log_agent_payload(logger, f"{agent}.response", raw)
|
|
|
|
|
|
if fallback_factory is not None:
|
|
|
|
|
|
return fallback_factory()
|
|
|
|
|
|
raise LLMCallError(
|
|
|
|
|
|
"invoke",
|
2026-04-27 14:34:30 +08:00
|
|
|
|
_format_llm_invoke_error_message(e, http_error_vendor=http_error_vendor),
|
2026-04-03 13:34:27 +08:00
|
|
|
|
raw_content=raw[:4096] if raw else None,
|
|
|
|
|
|
) from e
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
__all__ = [
|
|
|
|
|
|
"LLMCallError",
|
|
|
|
|
|
"LLMCallMeta",
|
2026-04-27 14:34:30 +08:00
|
|
|
|
"LlmHttpErrorVendor",
|
2026-04-03 13:34:27 +08:00
|
|
|
|
"allm_json_call",
|
|
|
|
|
|
"llm_json_call",
|
|
|
|
|
|
]
|