This commit is contained in:
Lars committed 2026-08-26 10:42:20 +02:00
1 parent 60f0d2830d
commit 53b1eff833
62 files changed
+6578 -355

No files matched your search

+32 -17
View File
@@ -9,15 +9,17 @@ import privacy_placeholders
from db import get_db, row_to_dict
from entitlements import EntitlementError, check_feature_access, increment_feature_usage
from placeholders import PlaceholderError, resolve_template
from privacy_gateway import GatewayRequest, PrivacyGatewayError, complete, last_trace, public_trace
from privacy_gateway import GatewayRequest, PrivacyGatewayError, complete
from journal_reconstruct import parse_dialogue_line
class EngineError(Exception):
def __init__(self, code: str, message: str, status_code: int = 400):
def __init__(self, code: str, message: str, status_code: int = 400, diagnostics: dict | None = None):
super().__init__(message)
self.code = code
self.message = message
self.status_code = status_code
self.diagnostics = diagnostics or {}
def load_active_prompt(slug: str) -> dict:
@@ -54,12 +56,26 @@ def preview_prompt(prompt: dict, context: dict[str, Any] | None = None) -> dict:
def user_source_text(dialogue_context: str) -> str:
parts = []
for line in (dialogue_context or "").splitlines():
if line.startswith("user:"):
parsed = parse_dialogue_line(line)
if parsed and parsed["role"] == "user":
parts.append(parsed["body"])
elif line.startswith("user:"):
parts.append(line[5:].lstrip())
return "\n".join(parts)
def execute_prompt(prompt: dict, profile_id: str, purpose: str, data_class: str, context: dict[str, Any] | None = None) -> dict:
def execute_prompt(
prompt: dict,
profile_id: str,
purpose: str,
data_class: str,
context: dict[str, Any] | None = None,
*,
max_tokens: int | None = None,
disable_context_compression: bool = False,
budget=None,
diagnostics: dict[str, Any] | None = None,
) -> dict:
preview = preview_prompt(prompt, context)
feature_id = prompt.get("required_feature") or "ai_calls"
try:
@@ -68,19 +84,13 @@ def execute_prompt(prompt: dict, profile_id: str, purpose: str, data_class: str,
raise EngineError(exc.code, exc.message, exc.status_code) from exc
try:
ctx = context or {}
source_text = user_source_text(ctx.get("dialogue_context") or "")
extras = []
if purpose == "journal_generate":
extras = [part for part in (ctx.get("existing_text"), ctx.get("writing_profile")) if part]
elif purpose == "profile_review":
source_text = ctx.get("source_text") or ""
extras = [part for part in (ctx.get("review_package"),) if part]
if extras:
source_text = "\n".join(part for part in (source_text, *extras) if part)
elif not source_text:
source_text = preview["rendered"]
if purpose == "profile_review" and ctx.get("source_text"):
source_text = "\n".join(
part for part in (ctx.get("existing_text"), ctx.get("writing_profile")) if part
part for part in (ctx.get("source_text"), ctx.get("review_package"), source_text) if part
)
elif not (source_text or "").strip():
source_text = user_source_text(ctx.get("dialogue_context") or "")
result = complete(
GatewayRequest(
prompt_id=prompt["id"],
@@ -92,16 +102,21 @@ def execute_prompt(prompt: dict, profile_id: str, purpose: str, data_class: str,
"source_text": source_text,
"privacy_tokens": preview["privacy_tokens"],
"prompt_slug": prompt.get("slug"),
"max_tokens": max_tokens,
"disable_context_compression": disable_context_compression,
"budget": budget,
"diagnostics": diagnostics or {},
},
)
)
except PrivacyGatewayError as exc:
raise EngineError(exc.code, exc.message, exc.status_code) from exc
raise EngineError(exc.code, exc.message, exc.status_code, getattr(exc, "diagnostics", None)) from exc
increment_feature_usage(profile_id, feature_id)
return {
**preview,
"llm": True,
"content": result.content,
"provider": result.provider,
"trace": public_trace(last_trace()),
"trace": result.trace,
"diagnostics": result.diagnostics,
}