mirror of
https://github.com/langgenius/dify.git
synced 2026-06-18 07:41:09 +08:00
f533e992d4
Pause-time token emission now draws only from the recipient set each API surface is allowed to act on (emit ⊆ validate), so the CLI/OpenAPI caller is never handed a token the resume endpoint would reject as 404 (WTA-867). A form's recipients are partitioned once, per surface, into a single FormDisposition: the surface-actionable recipient yields `form_token`, while the rest are reported as `approval_channels` (e.g. ["email", "console"]) so the caller is told where approval actually happens. Token and channels are two projections of one decision (disposition_for_surface) loaded by one recipient query (load_form_dispositions_by_form_id); the live pause path and the reconnect snapshot path consume the same FormDisposition so they cannot drift. RecipientType carries its user-facing approval-channel label as an enum tuple value, set in __new__, so a new recipient type cannot be declared without one. Tests: consolidate recipient/disposition/enrich tests into parametrized matrices, add CONSOLE-surface and empty-token coverage, extract a shared fake session for the pause-event tests.
116 lines
4.5 KiB
Python
116 lines
4.5 KiB
Python
"""
|
|
OpenAPI bearer-authed human input form endpoints.
|
|
|
|
GET /apps/<app_id>/form/human_input/<form_token> — fetch paused form definition
|
|
POST /apps/<app_id>/form/human_input/<form_token> — submit form response
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
import logging
|
|
|
|
from flask import Response
|
|
from flask_restx import Resource
|
|
from werkzeug.exceptions import BadRequest
|
|
|
|
from controllers.common.human_input import HumanInputFormSubmitPayload, stringify_form_default_values
|
|
from controllers.common.schema import register_schema_models
|
|
from controllers.openapi import openapi_ns
|
|
from controllers.openapi._contract import accepts, returns
|
|
from controllers.openapi._errors import HumanInputFormNotFound, RecipientSurfaceMismatch
|
|
from controllers.openapi._models import FormSubmitResponse, HumanInputFormDefinitionResponse
|
|
from controllers.openapi.auth.composition import auth_router
|
|
from controllers.openapi.auth.data import AuthData
|
|
from core.workflow.human_input_policy import (
|
|
HumanInputSurface,
|
|
is_recipient_type_allowed_for_surface,
|
|
)
|
|
from extensions.ext_database import db
|
|
from libs.helper import to_timestamp
|
|
from libs.oauth_bearer import Scope
|
|
from models.model import App
|
|
from services.human_input_service import FormNotFoundError, HumanInputService
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
register_schema_models(openapi_ns, HumanInputFormSubmitPayload)
|
|
|
|
|
|
def _jsonify_form_definition(form) -> Response:
|
|
definition_payload = form.get_definition().model_dump()
|
|
payload = {
|
|
"form_content": definition_payload["rendered_content"],
|
|
"inputs": definition_payload["inputs"],
|
|
"resolved_default_values": stringify_form_default_values(definition_payload["default_values"]),
|
|
"user_actions": definition_payload["user_actions"],
|
|
"expiration_time": to_timestamp(form.expiration_time),
|
|
}
|
|
return Response(json.dumps(payload, ensure_ascii=False), mimetype="application/json")
|
|
|
|
|
|
def _ensure_form_belongs_to_app(form, app_model: App) -> None:
|
|
if form.app_id != app_model.id or form.tenant_id != app_model.tenant_id:
|
|
raise HumanInputFormNotFound()
|
|
|
|
|
|
def _ensure_form_is_allowed_for_openapi(form) -> None:
|
|
if not is_recipient_type_allowed_for_surface(form.recipient_type, HumanInputSurface.OPENAPI):
|
|
raise RecipientSurfaceMismatch()
|
|
|
|
|
|
@openapi_ns.route("/apps/<string:app_id>/form/human_input/<string:form_token>")
|
|
class OpenApiWorkflowHumanInputFormApi(Resource):
|
|
@openapi_ns.response(200, "Form definition", openapi_ns.models[HumanInputFormDefinitionResponse.__name__])
|
|
@auth_router.guard(scope=Scope.APPS_RUN)
|
|
def get(self, app_id: str, form_token: str, *, auth_data: AuthData):
|
|
app_model, _caller, _caller_kind = auth_data.require_app_context()
|
|
service = HumanInputService(db.engine)
|
|
form = service.get_form_by_token(form_token)
|
|
if form is None:
|
|
raise HumanInputFormNotFound()
|
|
|
|
_ensure_form_belongs_to_app(form, app_model)
|
|
_ensure_form_is_allowed_for_openapi(form)
|
|
service.ensure_form_active(form)
|
|
return _jsonify_form_definition(form)
|
|
|
|
@auth_router.guard(scope=Scope.APPS_RUN)
|
|
@returns(200, FormSubmitResponse, description="Form submitted")
|
|
@accepts(body=HumanInputFormSubmitPayload)
|
|
def post(self, app_id: str, form_token: str, *, auth_data: AuthData, body: HumanInputFormSubmitPayload):
|
|
app_model, caller, caller_kind = auth_data.require_app_context()
|
|
|
|
service = HumanInputService(db.engine)
|
|
form = service.get_form_by_token(form_token)
|
|
if form is None:
|
|
raise HumanInputFormNotFound()
|
|
|
|
_ensure_form_belongs_to_app(form, app_model)
|
|
_ensure_form_is_allowed_for_openapi(form)
|
|
|
|
submission_user_id: str | None = None
|
|
submission_end_user_id: str | None = None
|
|
if caller_kind == "account":
|
|
submission_user_id = caller.id
|
|
else:
|
|
submission_end_user_id = caller.id
|
|
|
|
if form.recipient_type is None:
|
|
logger.warning("Recipient type is None for form, form_token=%s", form_token)
|
|
raise BadRequest("Form recipient type is invalid")
|
|
|
|
try:
|
|
service.submit_form_by_token(
|
|
recipient_type=form.recipient_type,
|
|
form_token=form_token,
|
|
selected_action_id=body.action,
|
|
form_data=body.inputs,
|
|
submission_user_id=submission_user_id,
|
|
submission_end_user_id=submission_end_user_id,
|
|
)
|
|
except FormNotFoundError:
|
|
raise HumanInputFormNotFound()
|
|
|
|
return FormSubmitResponse()
|