sync update from LAN repo (source dhk-1 @ 3e87be55)
This commit is contained in:
1 parent
ab6068a7c1
commit
42f2a26fa8
1482 files changed
+227759
-9584
No files matched your search
@@ -28,7 +28,7 @@ from pydantic import BaseModel, ConfigDict, Field, field_validator
|
||||
|
||||
from app.gateway.deps import get_optional_user_from_request
|
||||
from deerflow.config.app_config import AppConfig, reload_app_config
|
||||
from deerflow.config.model_config import ModelConfig
|
||||
from deerflow.config.model_config import ModelConfig, WriteFileTransport
|
||||
from deerflow.models.factory import create_chat_model
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
@@ -50,6 +50,7 @@ _EDITOR_FIELDS = frozenset(
|
||||
"base_url",
|
||||
"request_timeout",
|
||||
"max_retries",
|
||||
"max_input_tokens",
|
||||
"max_tokens",
|
||||
"temperature",
|
||||
"stream_usage",
|
||||
@@ -61,6 +62,7 @@ _EDITOR_FIELDS = frozenset(
|
||||
"thinking",
|
||||
"use_responses_api",
|
||||
"output_version",
|
||||
"write_file_transport",
|
||||
}
|
||||
)
|
||||
_PRESERVED_FIELDS = frozenset(ModelConfig.model_fields) | _EDITOR_FIELDS
|
||||
@@ -77,6 +79,7 @@ class ModelAdminItem(BaseModel):
|
||||
base_url: str | None = None
|
||||
request_timeout: float | None = None
|
||||
max_retries: int | None = None
|
||||
max_input_tokens: int | None = None
|
||||
max_tokens: int | None = None
|
||||
temperature: float | None = None
|
||||
stream_usage: bool | None = None
|
||||
@@ -88,6 +91,7 @@ class ModelAdminItem(BaseModel):
|
||||
thinking: dict[str, Any] | None = None
|
||||
use_responses_api: bool | None = None
|
||||
output_version: str | None = None
|
||||
write_file_transport: WriteFileTransport = WriteFileTransport.NATIVE
|
||||
extra_settings: dict[str, Any] = Field(default_factory=dict)
|
||||
api_key_configured: bool = False
|
||||
api_key_source: str | None = None
|
||||
@@ -117,6 +121,7 @@ class ModelUpsertRequest(BaseModel):
|
||||
base_url: str | None = Field(default=None, max_length=2048)
|
||||
request_timeout: float | None = Field(default=None, ge=1, le=600)
|
||||
max_retries: int | None = Field(default=None, ge=0, le=20)
|
||||
max_input_tokens: int | None = Field(default=None, ge=1, le=10_000_000)
|
||||
max_tokens: int | None = Field(default=None, ge=1, le=1_000_000)
|
||||
temperature: float | None = Field(default=None, ge=0, le=2)
|
||||
stream_usage: bool | None = None
|
||||
@@ -128,6 +133,10 @@ class ModelUpsertRequest(BaseModel):
|
||||
thinking: dict[str, Any] | None = None
|
||||
use_responses_api: bool | None = None
|
||||
output_version: str | None = Field(default=None, max_length=128)
|
||||
# Optional on the wire so older administrator UIs preserve an existing
|
||||
# bridge setting during edits. New models still resolve to ModelConfig's
|
||||
# native default when the field is omitted.
|
||||
write_file_transport: WriteFileTransport | None = None
|
||||
extra_settings: dict[str, Any] = Field(default_factory=dict)
|
||||
|
||||
@field_validator("name", "use", "model")
|
||||
@@ -183,6 +192,7 @@ def _to_admin_item(raw: dict[str, Any]) -> ModelAdminItem:
|
||||
base_url=raw.get("base_url"),
|
||||
request_timeout=raw.get("request_timeout"),
|
||||
max_retries=raw.get("max_retries"),
|
||||
max_input_tokens=raw.get("max_input_tokens"),
|
||||
max_tokens=raw.get("max_tokens"),
|
||||
temperature=raw.get("temperature"),
|
||||
stream_usage=raw.get("stream_usage"),
|
||||
@@ -194,6 +204,7 @@ def _to_admin_item(raw: dict[str, Any]) -> ModelAdminItem:
|
||||
thinking=copy.deepcopy(raw.get("thinking")),
|
||||
use_responses_api=raw.get("use_responses_api"),
|
||||
output_version=raw.get("output_version"),
|
||||
write_file_transport=raw.get("write_file_transport", WriteFileTransport.NATIVE),
|
||||
extra_settings=extra,
|
||||
api_key_configured=bool(api_key),
|
||||
api_key_source=_mask_env_source(api_key),
|
||||
@@ -296,6 +307,9 @@ def _restore_backup(path: Path, backup_path: Path) -> None:
|
||||
def _request_to_raw_model(payload: ModelUpsertRequest, existing: dict[str, Any] | None = None) -> dict[str, Any]:
|
||||
merged = copy.deepcopy(existing or {})
|
||||
supplied = payload.model_dump(exclude={"extra_settings", "clear_api_key"}, exclude_none=True)
|
||||
transport = supplied.get("write_file_transport")
|
||||
if isinstance(transport, WriteFileTransport):
|
||||
supplied["write_file_transport"] = transport.value
|
||||
merged.update(supplied)
|
||||
for key, value in payload.extra_settings.items():
|
||||
normalized = str(key).strip()
|
||||
|
||||
Reference in new issue
Block a user