sync update from LAN repo (source dhk-1 @ c21a2a4a)
This commit is contained in:
1 parent
264e2200d6
commit
a1fa13a238
122 files changed
+8881
-623
No files matched your search
@@ -16,15 +16,20 @@ from app.gateway.deps import get_current_user_from_request, get_optional_user_fr
|
||||
from deerflow.config import get_app_config
|
||||
from deerflow.config.system_settings import (
|
||||
BUILTIN_THEME_IDS,
|
||||
AIWritingPageDescription,
|
||||
AppearanceRouteParam,
|
||||
AuthenticationSettings,
|
||||
CallMetricsSettings,
|
||||
CompactShortcutButton,
|
||||
ConversationContextSettings,
|
||||
CustomThemePreset,
|
||||
GeneralQaPageDescriptions,
|
||||
HtmlMapSettings,
|
||||
LeaderboardSettings,
|
||||
ModelConcurrencySettings,
|
||||
ModelPromptSuffix,
|
||||
PageDescriptionsSettings,
|
||||
PageHeaderDescription,
|
||||
PluginDomainAgentMapping,
|
||||
PluginManagementSettings,
|
||||
PromptPrefixSettings,
|
||||
@@ -33,6 +38,7 @@ from deerflow.config.system_settings import (
|
||||
RetryKeepPartialSettings,
|
||||
RoundtableRoomLimitSettings,
|
||||
SkillCompressionSettings,
|
||||
SkillVersioningSettings,
|
||||
StrategyProjectSettings,
|
||||
WordHeadingNumberingStyle,
|
||||
WriteFileCompatibilitySettings,
|
||||
@@ -208,6 +214,91 @@ class StrategyProjectSettingsUpdateRequest(BaseModel):
|
||||
taiwan_strait_demo_enabled: bool | None = None
|
||||
|
||||
|
||||
class PageDescriptionsResponse(BaseModel):
|
||||
general_qa: GeneralQaPageDescriptions = Field(default_factory=GeneralQaPageDescriptions)
|
||||
knowledge_base: PageHeaderDescription = Field(default_factory=PageHeaderDescription)
|
||||
ai_writing: AIWritingPageDescription = Field(default_factory=AIWritingPageDescription)
|
||||
strategy_projects: PageHeaderDescription = Field(default_factory=PageHeaderDescription)
|
||||
deep_research: PageHeaderDescription = Field(default_factory=PageHeaderDescription)
|
||||
gongwen: PageHeaderDescription = Field(default_factory=PageHeaderDescription)
|
||||
light_app_management: PageHeaderDescription = Field(default_factory=PageHeaderDescription)
|
||||
light_app_list: PageHeaderDescription = Field(default_factory=PageHeaderDescription)
|
||||
agents: PageHeaderDescription = Field(default_factory=PageHeaderDescription)
|
||||
business_chains: PageHeaderDescription = Field(default_factory=PageHeaderDescription)
|
||||
skills: PageHeaderDescription = Field(default_factory=PageHeaderDescription)
|
||||
knowledge_management: PageHeaderDescription = Field(default_factory=PageHeaderDescription)
|
||||
|
||||
|
||||
class PageDescriptionsUpdateRequest(BaseModel):
|
||||
general_qa: GeneralQaPageDescriptions | None = None
|
||||
knowledge_base: PageHeaderDescription | None = None
|
||||
ai_writing: AIWritingPageDescription | None = None
|
||||
strategy_projects: PageHeaderDescription | None = None
|
||||
deep_research: PageHeaderDescription | None = None
|
||||
gongwen: PageHeaderDescription | None = None
|
||||
light_app_management: PageHeaderDescription | None = None
|
||||
light_app_list: PageHeaderDescription | None = None
|
||||
agents: PageHeaderDescription | None = None
|
||||
business_chains: PageHeaderDescription | None = None
|
||||
skills: PageHeaderDescription | None = None
|
||||
knowledge_management: PageHeaderDescription | None = None
|
||||
|
||||
|
||||
def _page_descriptions_response(
|
||||
settings: PageDescriptionsSettings,
|
||||
) -> PageDescriptionsResponse:
|
||||
return PageDescriptionsResponse(
|
||||
general_qa=settings.general_qa,
|
||||
knowledge_base=settings.knowledge_base,
|
||||
ai_writing=settings.ai_writing,
|
||||
strategy_projects=settings.strategy_projects,
|
||||
deep_research=settings.deep_research,
|
||||
gongwen=settings.gongwen,
|
||||
light_app_management=settings.light_app_management,
|
||||
light_app_list=settings.light_app_list,
|
||||
agents=settings.agents,
|
||||
business_chains=settings.business_chains,
|
||||
skills=settings.skills,
|
||||
knowledge_management=settings.knowledge_management,
|
||||
)
|
||||
|
||||
|
||||
@router.get("/page-descriptions", response_model=PageDescriptionsResponse)
|
||||
async def get_page_descriptions() -> PageDescriptionsResponse:
|
||||
return _page_descriptions_response(load_system_settings().page_descriptions)
|
||||
|
||||
|
||||
@router.put("/page-descriptions", response_model=PageDescriptionsResponse)
|
||||
async def update_page_descriptions(
|
||||
body: PageDescriptionsUpdateRequest,
|
||||
request: Request,
|
||||
) -> PageDescriptionsResponse:
|
||||
await _require_admin(request)
|
||||
current = load_system_settings()
|
||||
updated = PageDescriptionsSettings(
|
||||
general_qa=body.general_qa or current.page_descriptions.general_qa,
|
||||
knowledge_base=body.knowledge_base or current.page_descriptions.knowledge_base,
|
||||
ai_writing=body.ai_writing or current.page_descriptions.ai_writing,
|
||||
strategy_projects=body.strategy_projects or current.page_descriptions.strategy_projects,
|
||||
deep_research=body.deep_research or current.page_descriptions.deep_research,
|
||||
gongwen=body.gongwen or current.page_descriptions.gongwen,
|
||||
light_app_management=(
|
||||
body.light_app_management or current.page_descriptions.light_app_management
|
||||
),
|
||||
light_app_list=body.light_app_list or current.page_descriptions.light_app_list,
|
||||
agents=body.agents or current.page_descriptions.agents,
|
||||
business_chains=body.business_chains or current.page_descriptions.business_chains,
|
||||
skills=body.skills or current.page_descriptions.skills,
|
||||
knowledge_management=(
|
||||
body.knowledge_management or current.page_descriptions.knowledge_management
|
||||
),
|
||||
)
|
||||
saved = save_system_settings(
|
||||
current.model_copy(update={"page_descriptions": updated}),
|
||||
)
|
||||
return _page_descriptions_response(saved.page_descriptions)
|
||||
|
||||
|
||||
@router.get("/ordinary-knowledge-landing", response_model=OrdinaryKnowledgeLanding)
|
||||
async def get_ordinary_knowledge_landing() -> OrdinaryKnowledgeLanding:
|
||||
return OrdinaryKnowledgeLanding(mode=load_system_settings().ordinary_knowledge_landing)
|
||||
@@ -491,6 +582,14 @@ class SkillCompressionUpdateRequest(BaseModel):
|
||||
keep_index_in_prompt: bool | None = None
|
||||
|
||||
|
||||
class SkillVersioningResponse(BaseModel):
|
||||
enabled: bool = Field(..., description="Whether custom-skill version history is active")
|
||||
|
||||
|
||||
class SkillVersioningUpdateRequest(BaseModel):
|
||||
enabled: bool
|
||||
|
||||
|
||||
class ModelConcurrencyResponse(BaseModel):
|
||||
enabled: bool = Field(..., description="Whether per-model concurrency limiting is active")
|
||||
default_limit: int = Field(..., description="Fallback max concurrent runs for models without an explicit override")
|
||||
@@ -532,6 +631,17 @@ class WriteFileCompatibilityUpdateRequest(BaseModel):
|
||||
enabled: bool
|
||||
|
||||
|
||||
class CallMetricsResponse(BaseModel):
|
||||
enabled: bool = Field(
|
||||
default=True,
|
||||
description="Whether new tool and skill calls are recorded for management statistics",
|
||||
)
|
||||
|
||||
|
||||
class CallMetricsUpdateRequest(BaseModel):
|
||||
enabled: bool
|
||||
|
||||
|
||||
class RetryKeepPartialResponse(BaseModel):
|
||||
enabled: bool = Field(
|
||||
default=True,
|
||||
@@ -579,6 +689,7 @@ class RoundtableRoomLimitResponse(BaseModel):
|
||||
enabled: bool = True
|
||||
max_rooms: int = 3
|
||||
max_hold_minutes: int = 30
|
||||
lease_minutes: int = 5
|
||||
max_cycles: int = 8
|
||||
write_file_compatibility_enabled: bool = False
|
||||
|
||||
@@ -587,6 +698,7 @@ class RoundtableRoomLimitUpdateRequest(BaseModel):
|
||||
enabled: bool | None = None
|
||||
max_rooms: int | None = Field(default=None, ge=1, le=20)
|
||||
max_hold_minutes: int | None = Field(default=None, ge=1, le=1440)
|
||||
lease_minutes: int | None = Field(default=None, ge=1, le=60)
|
||||
max_cycles: int | None = Field(default=None, ge=2, le=100)
|
||||
write_file_compatibility_enabled: bool | None = None
|
||||
|
||||
@@ -667,6 +779,32 @@ async def update_write_file_compatibility_setting(
|
||||
)
|
||||
|
||||
|
||||
@router.get("/call-metrics", response_model=CallMetricsResponse)
|
||||
async def get_call_metrics_setting(request: Request) -> CallMetricsResponse:
|
||||
"""Return the administrator-controlled tool/skill metrics switch."""
|
||||
|
||||
await _require_admin(request)
|
||||
return CallMetricsResponse(enabled=load_system_settings().call_metrics.enabled)
|
||||
|
||||
|
||||
@router.put("/call-metrics", response_model=CallMetricsResponse)
|
||||
async def update_call_metrics_setting(
|
||||
body: CallMetricsUpdateRequest,
|
||||
request: Request,
|
||||
) -> CallMetricsResponse:
|
||||
"""Enable or pause new tool/skill metric writes without a restart."""
|
||||
|
||||
await _require_admin(request)
|
||||
current = load_system_settings()
|
||||
saved = save_system_settings(
|
||||
current.model_copy(
|
||||
update={"call_metrics": CallMetricsSettings(enabled=body.enabled)}
|
||||
)
|
||||
)
|
||||
logger.info("Tool and skill call metrics switch changed: enabled=%s", saved.call_metrics.enabled)
|
||||
return CallMetricsResponse(enabled=saved.call_metrics.enabled)
|
||||
|
||||
|
||||
@router.get("/retry-keep-partial", response_model=RetryKeepPartialResponse)
|
||||
async def get_retry_keep_partial_setting() -> RetryKeepPartialResponse:
|
||||
"""Return the retry-keeps-partial display switch (readable by chat clients)."""
|
||||
@@ -734,6 +872,7 @@ def _roundtable_room_limit_response(settings: RoundtableRoomLimitSettings) -> Ro
|
||||
enabled=settings.enabled,
|
||||
max_rooms=settings.max_rooms,
|
||||
max_hold_minutes=settings.max_hold_minutes,
|
||||
lease_minutes=settings.lease_minutes,
|
||||
max_cycles=settings.max_cycles,
|
||||
write_file_compatibility_enabled=settings.write_file_compatibility_enabled,
|
||||
)
|
||||
@@ -760,6 +899,8 @@ async def update_roundtable_room_limit_setting(
|
||||
updates["max_rooms"] = body.max_rooms
|
||||
if body.max_hold_minutes is not None:
|
||||
updates["max_hold_minutes"] = body.max_hold_minutes
|
||||
if body.lease_minutes is not None:
|
||||
updates["lease_minutes"] = body.lease_minutes
|
||||
if body.max_cycles is not None:
|
||||
updates["max_cycles"] = body.max_cycles
|
||||
if body.write_file_compatibility_enabled is not None:
|
||||
@@ -767,10 +908,11 @@ async def update_roundtable_room_limit_setting(
|
||||
updated = current.roundtable_room_limit.model_copy(update=updates)
|
||||
saved = save_system_settings(current.model_copy(update={"roundtable_room_limit": updated}))
|
||||
logger.info(
|
||||
"Roundtable runtime limits changed: enabled=%s max_rooms=%s max_hold_minutes=%s max_cycles=%s write_file_compatibility=%s",
|
||||
"Roundtable runtime limits changed: enabled=%s max_rooms=%s max_hold_minutes=%s lease_minutes=%s max_cycles=%s write_file_compatibility=%s",
|
||||
saved.roundtable_room_limit.enabled,
|
||||
saved.roundtable_room_limit.max_rooms,
|
||||
saved.roundtable_room_limit.max_hold_minutes,
|
||||
saved.roundtable_room_limit.lease_minutes,
|
||||
saved.roundtable_room_limit.max_cycles,
|
||||
saved.roundtable_room_limit.write_file_compatibility_enabled,
|
||||
)
|
||||
@@ -917,6 +1059,42 @@ async def update_skill_compression(body: SkillCompressionUpdateRequest, request:
|
||||
return _skill_compression_to_response(saved.skill_compression)
|
||||
|
||||
|
||||
@router.get("/skill-versioning", response_model=SkillVersioningResponse)
|
||||
async def get_skill_versioning() -> SkillVersioningResponse:
|
||||
"""Return the custom-skill versioning gate for skill detail clients."""
|
||||
|
||||
return SkillVersioningResponse(enabled=load_system_settings().skill_versioning.enabled)
|
||||
|
||||
|
||||
@router.put("/skill-versioning", response_model=SkillVersioningResponse)
|
||||
async def update_skill_versioning(
|
||||
body: SkillVersioningUpdateRequest,
|
||||
request: Request,
|
||||
) -> SkillVersioningResponse:
|
||||
"""Enable/disable custom-skill version capture and switching. Admin only."""
|
||||
|
||||
await _require_admin(request)
|
||||
current = load_system_settings()
|
||||
previous = current.skill_versioning.enabled
|
||||
updated = SkillVersioningSettings(enabled=body.enabled)
|
||||
saved = save_system_settings(current.model_copy(update={"skill_versioning": updated}))
|
||||
|
||||
if body.enabled and not previous:
|
||||
try:
|
||||
from deerflow.skills.versioning import reconcile_custom_skill_versions
|
||||
|
||||
actor = await get_optional_user_from_request(request)
|
||||
actor_id = str(getattr(actor, "id", "") or "") or None
|
||||
await asyncio.to_thread(reconcile_custom_skill_versions, author=actor_id)
|
||||
except Exception:
|
||||
logger.exception("Failed to capture custom-skill baselines after enabling versioning")
|
||||
# The switch remains enabled. Individual skills are bootstrapped
|
||||
# lazily when their version list is first opened or next changed.
|
||||
|
||||
logger.info("Custom skill versioning switch changed: enabled=%s", saved.skill_versioning.enabled)
|
||||
return SkillVersioningResponse(enabled=saved.skill_versioning.enabled)
|
||||
|
||||
|
||||
@router.get("/model-concurrency", response_model=ModelConcurrencyResponse)
|
||||
async def get_model_concurrency(request: Request) -> ModelConcurrencyResponse:
|
||||
"""Return the per-model concurrency-limit configuration. Admin only."""
|
||||
|
||||
Reference in new issue
Block a user