feat: 工作流画布支持草稿试运行(target=draft 执行当前草稿图)
This commit is contained in:
1 parent
3384f2e51c
commit
222595d6c4
7 files changed
+198
-32
No files matched your search
@@ -149,26 +149,36 @@ def _public_run(run: dict[str, Any]) -> dict[str, Any]:
|
||||
async def start_run(request: Request, workflow_id: str, body: StartRunBody) -> dict[str, Any]:
|
||||
_require_enabled()
|
||||
user_id = await get_current_user(request)
|
||||
if str(body.target or "").strip().lower() == "draft":
|
||||
# Never silently fall back to the published version when the client
|
||||
# thinks it is exercising the draft — draft snapshots need the explicit
|
||||
# test-run API (not built yet).
|
||||
raise HTTPException(
|
||||
status_code=422,
|
||||
detail={
|
||||
"code": "WORKFLOW_DRAFT_RUN_UNSUPPORTED",
|
||||
"message": "暂不支持运行草稿,请先发布或指定 versionId",
|
||||
},
|
||||
)
|
||||
definitions = _definitions(request)
|
||||
definition = await definitions.get_definition(workflow_id, include_draft=False)
|
||||
is_draft_run = str(body.target or "").strip().lower() == "draft"
|
||||
|
||||
if is_draft_run:
|
||||
# Test-run semantics: execute the CURRENT draft graph (what the canvas
|
||||
# shows right now), versioned as the literal "draft". The compiled
|
||||
# execution graph travels in run.context (never the canvas document),
|
||||
# and the executor prefers it over any published version.
|
||||
definition = await definitions.get_definition(workflow_id, include_draft=True)
|
||||
else:
|
||||
definition = await definitions.get_definition(workflow_id, include_draft=False)
|
||||
if definition is None:
|
||||
raise HTTPException(status_code=404, detail="工作流不存在")
|
||||
if definition.get("owner_id") != user_id and not await _is_admin(request):
|
||||
raise HTTPException(status_code=403, detail={"code": "WORKFLOW_FORBIDDEN", "message": "无权运行该工作流"})
|
||||
|
||||
draft_graph_raw: dict[str, Any] | None = None
|
||||
if is_draft_run:
|
||||
draft_graph_raw = definition.get("draft_graph") or {}
|
||||
if not draft_graph_raw.get("nodes"):
|
||||
raise HTTPException(
|
||||
status_code=400,
|
||||
detail={
|
||||
"code": "WORKFLOW_DRAFT_EMPTY",
|
||||
"message": "草稿还没有可运行的执行图,请先在画布保存一次",
|
||||
},
|
||||
)
|
||||
|
||||
version_id = body.version_id
|
||||
if not version_id:
|
||||
if not version_id and not is_draft_run:
|
||||
versions = await definitions.list_versions(workflow_id)
|
||||
if not versions:
|
||||
raise HTTPException(
|
||||
@@ -176,11 +186,14 @@ async def start_run(request: Request, workflow_id: str, body: StartRunBody) -> d
|
||||
detail={"code": "WORKFLOW_VERSION_NOT_FOUND", "message": "工作流尚未发布任何版本"},
|
||||
)
|
||||
version_id = versions[0]["id"]
|
||||
version = await definitions.get_version(version_id)
|
||||
if version is None or version.get("workflow_id") != workflow_id:
|
||||
raise HTTPException(status_code=404, detail={"code": "WORKFLOW_VERSION_NOT_FOUND", "message": "版本不存在"})
|
||||
if is_draft_run:
|
||||
version_id = "draft"
|
||||
else:
|
||||
version = await definitions.get_version(version_id)
|
||||
if version is None or version.get("workflow_id") != workflow_id:
|
||||
raise HTTPException(status_code=404, detail={"code": "WORKFLOW_VERSION_NOT_FOUND", "message": "版本不存在"})
|
||||
|
||||
graph = WorkflowGraph.model_validate(version.get("graph") or {})
|
||||
graph = WorkflowGraph.model_validate(draft_graph_raw if is_draft_run else (version.get("graph") or {}))
|
||||
inputs = body.resolved_inputs()
|
||||
missing = [key for key in (graph.input_schema.get("required") or []) if inputs.get(str(key)) in (None, "")]
|
||||
if missing:
|
||||
@@ -218,6 +231,11 @@ async def start_run(request: Request, workflow_id: str, body: StartRunBody) -> d
|
||||
|
||||
# Scope the idempotency key per workflow so two workflows can share a client key.
|
||||
key = f"{workflow_id}:{body.idempotency_key}" if body.idempotency_key else None
|
||||
context: dict[str, Any] = {"depth": 0}
|
||||
if is_draft_run:
|
||||
# The draft snapshot rides with the run; the executor prefers it over
|
||||
# the published version. Execution graph only — never the canvas doc.
|
||||
context["draftGraph"] = draft_graph_raw
|
||||
run, created = await runs.create_run(
|
||||
{
|
||||
"workflow_id": workflow_id,
|
||||
@@ -225,7 +243,7 @@ async def start_run(request: Request, workflow_id: str, body: StartRunBody) -> d
|
||||
"owner_id": user_id,
|
||||
"input": inputs,
|
||||
"idempotency_key": key,
|
||||
"context": {"depth": 0},
|
||||
"context": context,
|
||||
}
|
||||
)
|
||||
if created:
|
||||
|
||||
@@ -278,10 +278,46 @@ async def coze_playground_space_save(request: Request) -> dict[str, Any]:
|
||||
return _coze_ok({"id": _DEFAULT_SPACE["id"], "check_not_pass": False})
|
||||
|
||||
|
||||
def _coze_model_type(name: str) -> int:
|
||||
"""Stable positive int32 from the model name.
|
||||
|
||||
The Coze LLM form stores the picked model as ``modelType`` (number) plus
|
||||
``modleName`` (string, upstream typo) — the compiler reads the string, so
|
||||
the number only needs to be stable within a deployment, not reversible.
|
||||
"""
|
||||
digest = 5381
|
||||
for char in name:
|
||||
digest = ((digest * 33) + ord(char)) & 0xFFFFFFFF
|
||||
return digest & 0x7FFFFFFF
|
||||
|
||||
|
||||
@chrome_router.api_route("/api/bot/get_type_list", methods=["GET", "POST"])
|
||||
async def coze_model_type_list(request: Request) -> dict[str, Any]:
|
||||
"""LLM form model list → real DeerFlow models (names only, no secrets).
|
||||
|
||||
The Coze ``Model`` shape is trimmed to what the workflow form consumes:
|
||||
``model_type`` (stable number), ``name`` (the DeerFlow model name, stored
|
||||
verbatim into the node so the runtime can override the model), and empty
|
||||
ability/params maps — ``getLLMModels`` fills in response_format defaults
|
||||
client-side. Parameter tuning panels stay inert: model tuning happens in
|
||||
DeerFlow, the workflow node only picks which model to call.
|
||||
"""
|
||||
await _require_studio_user(request)
|
||||
return _coze_ok({"model_list": []})
|
||||
config = get_app_config()
|
||||
configured = list(getattr(config, 'models', None) or [])
|
||||
model_list = [
|
||||
{
|
||||
"model_type": _coze_model_type(model.name),
|
||||
"name": model.name,
|
||||
"display_name": model.display_name or model.name,
|
||||
"description": "",
|
||||
"model_ability": {},
|
||||
"model_params": [],
|
||||
"is_custom": False,
|
||||
}
|
||||
for model in configured
|
||||
]
|
||||
return _coze_ok({"model_list": model_list})
|
||||
|
||||
|
||||
@router.post("/create")
|
||||
@@ -366,3 +402,60 @@ async def coze_node_template_list(request: Request) -> dict[str, Any]:
|
||||
"plugin_category_list": [],
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
@router.post("/workflow_references")
|
||||
async def coze_workflow_references(request: Request) -> dict[str, Any]:
|
||||
"""Which workflows reference the current one via subworkflow nodes.
|
||||
|
||||
Honest empty answer: the standalone page's subworkflow form is not wired
|
||||
yet, so no canvas can reference another — an empty list is the truthful
|
||||
state, not a placeholder for missing data.
|
||||
"""
|
||||
_require_enabled()
|
||||
await get_current_user(request)
|
||||
return {"code": 0, "msg": "success", "data": {"workflow_list": []}}
|
||||
|
||||
|
||||
@router.post("/nodeDebug")
|
||||
async def coze_node_debug(request: Request) -> dict[str, Any]:
|
||||
"""Single-node debug: NOT wired to the DeerFlow executor.
|
||||
|
||||
Deliberately a business error (Coze envelope code != 0) so the playground
|
||||
surfaces an explicit message instead of pretending the debug succeeded.
|
||||
"""
|
||||
_require_enabled()
|
||||
await get_current_user(request)
|
||||
return {
|
||||
"code": 4003101,
|
||||
"msg": "节点单点调试暂未接入 DeerFlow 执行器,请使用画布下方「试运行」运行整个工作流",
|
||||
}
|
||||
|
||||
|
||||
@router.post("/llm_fc_setting_detail")
|
||||
@router.post("/llm_fc_setting_merged")
|
||||
async def coze_llm_fc_setting(request: Request) -> dict[str, Any]:
|
||||
"""LLM function-call settings detail/merge for plugin/workflow lists.
|
||||
|
||||
No Coze plugins are wired into the canvas, so every detail map is empty.
|
||||
"""
|
||||
_require_enabled()
|
||||
await get_current_user(request)
|
||||
return {
|
||||
"code": 0,
|
||||
"msg": "success",
|
||||
"data": {
|
||||
"plugin_detail_map": {},
|
||||
"plugin_api_detail_map": {},
|
||||
"workflow_detail_map": {},
|
||||
"dataset_detail_map": {},
|
||||
"knowledge_detail_map": {},
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
@chrome_router.post("/api/devops/debugger/v1/coze/testcase/casedata/mget")
|
||||
async def coze_testcase_casedata_mget(request: Request) -> dict[str, Any]:
|
||||
"""Playground test-case fetch: no Coze test cases exist for this page."""
|
||||
await _require_studio_user(request)
|
||||
return {"code": 0, "msg": "success", "data": {"case_data_list": [], "total": 0}}
|
||||
Reference in new issue
Block a user