MVP 0.92
This commit is contained in:
1 parent
60f0d2830d
commit
53b1eff833
62 files changed
+6578
-355
No files matched your search
+56
-4
@@ -2,7 +2,8 @@
|
||||
from __future__ import annotations
|
||||
|
||||
import os
|
||||
from dataclasses import dataclass
|
||||
import re
|
||||
from dataclasses import dataclass, field
|
||||
from urllib.parse import urlparse
|
||||
|
||||
import httpx
|
||||
@@ -11,13 +12,20 @@ from env_loader import load_env_file
|
||||
|
||||
load_env_file()
|
||||
|
||||
CONTEXT_LENGTH_REJECT = re.compile(
|
||||
r"context.?length|maximum context|prompt is too long|too many tokens|"
|
||||
r"context window|max context|exceeds? (?:the )?(?:maximum|context)",
|
||||
re.I,
|
||||
)
|
||||
|
||||
|
||||
class ProviderError(Exception):
|
||||
def __init__(self, code: str, message: str, status_code: int = 503):
|
||||
def __init__(self, code: str, message: str, status_code: int = 503, diagnostics: dict | None = None):
|
||||
super().__init__(message)
|
||||
self.code = code
|
||||
self.message = message
|
||||
self.status_code = status_code
|
||||
self.diagnostics = diagnostics or {}
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
@@ -33,6 +41,19 @@ class ProviderConfig:
|
||||
no_train: bool
|
||||
|
||||
|
||||
@dataclass
|
||||
class ChatResult:
|
||||
content: str
|
||||
model: str | None = None
|
||||
usage: dict = field(default_factory=dict)
|
||||
context_compression: str = "not_applicable"
|
||||
|
||||
|
||||
def is_openrouter(config: ProviderConfig) -> bool:
|
||||
host = (urlparse(config.url or "").hostname or "").lower()
|
||||
return host.endswith("openrouter.ai") or (config.name or "").lower() == "openrouter"
|
||||
|
||||
|
||||
def _truthy(name: str) -> bool:
|
||||
return os.environ.get(name, "").strip().lower() in {"1", "true", "yes", "on"}
|
||||
|
||||
@@ -146,12 +167,23 @@ def detect_provider() -> ProviderConfig | None:
|
||||
)
|
||||
|
||||
|
||||
def complete_chat(config: ProviderConfig, messages: list[dict], *, timeout: float, max_tokens: int | None = None) -> str:
|
||||
def complete_chat(
|
||||
config: ProviderConfig,
|
||||
messages: list[dict],
|
||||
*,
|
||||
timeout: float,
|
||||
max_tokens: int | None = None,
|
||||
disable_context_compression: bool = False,
|
||||
) -> ChatResult:
|
||||
payload: dict = {"model": config.model, "messages": messages}
|
||||
if max_tokens is not None:
|
||||
payload["max_tokens"] = max_tokens
|
||||
compression = "not_applicable"
|
||||
if not config.local:
|
||||
payload["provider"] = {"data_collection": "deny"}
|
||||
if disable_context_compression and is_openrouter(config) and not config.local:
|
||||
payload["plugins"] = [{"id": "context-compression", "enabled": False}]
|
||||
compression = "disabled"
|
||||
headers = {"Content-Type": "application/json"}
|
||||
if config.key:
|
||||
headers["Authorization"] = f"Bearer {config.key}"
|
||||
@@ -163,9 +195,29 @@ def complete_chat(config: ProviderConfig, messages: list[dict], *, timeout: floa
|
||||
except httpx.HTTPError as exc:
|
||||
raise ProviderError("provider_unreachable", f"{config.role}-Provider ist nicht erreichbar.") from exc
|
||||
if response.status_code >= 400:
|
||||
body = ""
|
||||
try:
|
||||
body = response.text or ""
|
||||
except Exception:
|
||||
body = ""
|
||||
if CONTEXT_LENGTH_REJECT.search(body):
|
||||
raise ProviderError(
|
||||
"provider_context_length_rejected",
|
||||
"Der Anbieter hat die Anfrage wegen der Kontextlänge abgelehnt. "
|
||||
"Kanshō hat den Tagesdialog nicht automatisch gekürzt.",
|
||||
502,
|
||||
diagnostics={"http_status": response.status_code, "context_compression": compression},
|
||||
)
|
||||
raise ProviderError("provider_rejected", f"{config.role}-Provider hat die Anfrage abgelehnt.")
|
||||
data = response.json()
|
||||
try:
|
||||
return data["choices"][0]["message"]["content"]
|
||||
content = data["choices"][0]["message"]["content"]
|
||||
except (KeyError, IndexError, TypeError) as exc:
|
||||
raise ProviderError("provider_shape", f"Unerwartete {config.role}-Antwort.") from exc
|
||||
usage = data.get("usage") if isinstance(data.get("usage"), dict) else {}
|
||||
return ChatResult(
|
||||
content=content or "",
|
||||
model=data.get("model") or config.model,
|
||||
usage=usage,
|
||||
context_compression=compression,
|
||||
)
|
||||
Reference in new issue
Block a user