fix(maf): harden phase 5 approval safety

This commit is contained in:
董宏凯 committed 2026-08-02 14:32:49 +08:00
1 parent f82363d81f
commit a55992e31c
11 files changed
+489 -146

No files matched your search

@@ -1,4 +1,7 @@
import asyncio
# ruff: noqa: E402
# load_dotenv() must run before application imports because they read environment
# configuration during import-time initialisation.
import asyncio
import logging
import os
import queue
@@ -21,83 +24,83 @@ from fastapi.middleware.cors import CORSMiddleware
# origins, and "Failed to fetch" in the browser.
load_dotenv()
from app.gateway.auth.disabled_mode import is_auth_disabled # noqa: E402
from app.gateway.auth_middleware import AuthMiddleware
from app.gateway.config import get_gateway_config
from app.gateway.csrf_middleware import CSRFMiddleware
from app.gateway.deps import langgraph_runtime
from app.gateway.routers import (
ai_writing,
admin_active_runs,
admin_users,
agents,
artifacts,
assistants_compat,
auth,
browser_context,
business_mapping,
channels,
checkpoint_migration,
feedback,
dashboard_sessions,
html_page_favorites,
intent,
knowledge,
knowledge_ingest,
light_apps,
llm_metrics,
maf_roundtable,
mcp,
memory,
menu_overrides,
models,
multi_agent,
notifications,
open_3qfx,
open_chat,
parallel_agent_tasks,
parallel_agents,
position_roundtable,
positions,
position_roles,
public_config,
public_embed,
public_leaderboard,
public_scheduled_tasks,
recommend,
flow_extract,
recommended_questions,
roundtable_chains,
roundtable_diagnostics,
roundtable_draft_shares,
roundtable_drafts,
roundtable_jobs,
roundtable_task_drafts,
runs,
scheduled_tasks,
sensitive_words,
skill_addresses,
skills,
suggestions,
system_settings,
tags,
task_buttons,
taskcop_tasks,
task_reports,
thread_runs,
tool_metrics,
thread_shares,
threads,
uploads,
user_preferences,
user_prompts,
weknora_sources,
writing,
)
from deerflow.config import app_config as deerflow_app_config
from deerflow.config.app_config import apply_logging_level
from deerflow.runtime.scheduler import ScheduledTaskService, set_scheduled_task_service
from app.gateway.auth.disabled_mode import is_auth_disabled # noqa: E402
from app.gateway.auth_middleware import AuthMiddleware
from app.gateway.config import get_gateway_config
from app.gateway.csrf_middleware import CSRFMiddleware
from app.gateway.deps import langgraph_runtime
from app.gateway.routers import (
admin_active_runs,
admin_users,
agents,
ai_writing,
artifacts,
assistants_compat,
auth,
browser_context,
business_mapping,
channels,
checkpoint_migration,
dashboard_sessions,
feedback,
flow_extract,
html_page_favorites,
intent,
knowledge,
knowledge_ingest,
light_apps,
llm_metrics,
maf_roundtable,
mcp,
memory,
menu_overrides,
models,
multi_agent,
notifications,
open_3qfx,
open_chat,
parallel_agent_tasks,
parallel_agents,
position_roles,
position_roundtable,
positions,
public_config,
public_embed,
public_leaderboard,
public_scheduled_tasks,
recommend,
recommended_questions,
roundtable_chains,
roundtable_diagnostics,
roundtable_draft_shares,
roundtable_drafts,
roundtable_jobs,
roundtable_task_drafts,
runs,
scheduled_tasks,
sensitive_words,
skill_addresses,
skills,
suggestions,
system_settings,
tags,
task_buttons,
task_reports,
taskcop_tasks,
thread_runs,
thread_shares,
threads,
tool_metrics,
uploads,
user_preferences,
user_prompts,
weknora_sources,
writing,
)
from deerflow.config import app_config as deerflow_app_config
from deerflow.config.app_config import apply_logging_level
from deerflow.runtime.scheduler import ScheduledTaskService, set_scheduled_task_service
AppConfig = deerflow_app_config.AppConfig
get_app_config = deerflow_app_config.get_app_config
@@ -333,10 +336,10 @@ async def _run_db_migrations() -> None:
deadline = asyncio.get_running_loop().time() + timeout_s
while result_queue.empty():
if asyncio.get_running_loop().time() >= deadline:
raise asyncio.TimeoutError
raise TimeoutError
await asyncio.sleep(0.2)
result = result_queue.get_nowait()
except asyncio.TimeoutError:
except TimeoutError:
logger.error(
"Database migration did not finish within %.0fs; continuing startup on create_all schema. "
"Likely cause: MySQL metadata-lock wait or a slow DDL. Set DEER_FLOW_SKIP_ALEMBIC=1 "
@@ -1003,7 +1006,7 @@ async def _maf_approval_scanner_loop(app: Any) -> None:
service = getattr(app.state, "maf_roundtable_service", None)
config = getattr(service, "config", None)
interval = max(1, int(getattr(config, "approval_scan_interval_seconds", 10) or 10))
interval = max(5, int(getattr(config, "approval_scan_interval_seconds", 30) or 30))
while True:
try:
await _scan_maf_approval_expiry(app)
@@ -1014,6 +1017,36 @@ async def _maf_approval_scanner_loop(app: Any) -> None:
await asyncio.sleep(interval)
def _start_maf_approval_scanner(app: Any) -> asyncio.Task[None] | None:
"""Start the MAF-only approval scanner when the feature is enabled."""
service = getattr(app.state, "maf_roundtable_service", None)
if service is None or not getattr(service, "enabled", False):
return None
task = asyncio.create_task(_maf_approval_scanner_loop(app))
app.state.maf_approval_scanner_task = task
logger.info(
"MAF approval expiry scanner started (interval=%ss)",
getattr(service.config, "approval_scan_interval_seconds", 30),
)
return task
async def _stop_maf_approval_scanner(app: Any) -> None:
"""Cancel and await the MAF approval scanner during Gateway shutdown."""
task = getattr(app.state, "maf_approval_scanner_task", None)
if task is None:
return
task.cancel()
try:
await task
except asyncio.CancelledError:
pass
except Exception:
logger.exception("MAF approval expiry scanner shutdown error")
@asynccontextmanager
async def lifespan(app: FastAPI) -> AsyncGenerator[None, None]:
"""Application lifespan handler."""
@@ -1187,15 +1220,7 @@ async def lifespan(app: FastAPI) -> AsyncGenerator[None, None]:
# MAF-only approval expiry scanner. Legacy DeerFlow, old roundtable
# and AI-writing paths never enter this loop.
try:
maf_service = getattr(app.state, "maf_roundtable_service", None)
if maf_service is not None and getattr(maf_service, "enabled", False):
app.state.maf_approval_scanner_task = asyncio.create_task(
_maf_approval_scanner_loop(app)
)
logger.info(
"MAF approval expiry scanner started (interval=%ss)",
getattr(maf_service.config, "approval_scan_interval_seconds", 10),
)
_start_maf_approval_scanner(app)
except Exception:
logger.exception("MAF approval expiry scanner failed to start (non-fatal)")
@@ -1267,15 +1292,7 @@ async def lifespan(app: FastAPI) -> AsyncGenerator[None, None]:
except Exception:
logger.exception("Concurrency sampler shutdown error")
maf_approval_scanner_task = getattr(app.state, "maf_approval_scanner_task", None)
if maf_approval_scanner_task is not None:
maf_approval_scanner_task.cancel()
try:
await maf_approval_scanner_task
except asyncio.CancelledError:
pass
except Exception:
logger.exception("MAF approval expiry scanner shutdown error")
await _stop_maf_approval_scanner(app)
# ?? 7 ????AI ?? graph ???? checkpointer / in-flight task?
# thread ??? LangGraph Server ? checkpointer ???lifespan ???
@@ -223,7 +223,11 @@ def derive_target_key(
def _is_stable_scalar(value: Any) -> bool:
"""Whether a configured target field can safely identify one target."""
if value is None or isinstance(value, (str, bool, int)):
if isinstance(value, str):
return bool(value.strip())
if value is None:
return False
if isinstance(value, (bool, int)):
return True
return isinstance(value, float) and isfinite(value)