mirror of
https://github.com/langgenius/dify.git
synced 2026-05-04 09:28:04 +08:00
feat(api): Implement HITL for Workflow, add is_resumption for start event
This commit is contained in:
QuantumGhost
@ -1,3 +1,3 @@
|
||||
from .workflow_execute_task import chatflow_execute_task
|
||||
from .workflow_execute_task import AppExecutionParams, chatflow_execute_task, resume_app_execution
|
||||
|
||||
__all__ = ["chatflow_execute_task"]
|
||||
__all__ = ["AppExecutionParams", "chatflow_execute_task", "resume_app_execution"]
|
||||
|
||||
@ -12,7 +12,13 @@ from sqlalchemy import Engine, select
|
||||
from sqlalchemy.orm import Session, sessionmaker
|
||||
|
||||
from core.app.apps.advanced_chat.app_generator import AdvancedChatAppGenerator
|
||||
from core.app.entities.app_invoke_entities import AdvancedChatAppGenerateEntity, InvokeFrom
|
||||
from core.app.apps.message_based_app_generator import MessageBasedAppGenerator
|
||||
from core.app.apps.workflow.app_generator import WorkflowAppGenerator
|
||||
from core.app.entities.app_invoke_entities import (
|
||||
AdvancedChatAppGenerateEntity,
|
||||
InvokeFrom,
|
||||
WorkflowAppGenerateEntity,
|
||||
)
|
||||
from core.app.layers.pause_state_persist_layer import PauseStateLayerConfig, WorkflowResumptionContext
|
||||
from core.repositories import DifyCoreRepositoryFactory
|
||||
from core.workflow.runtime import GraphRuntimeState
|
||||
@ -26,6 +32,8 @@ from repositories.factory import DifyAPIRepositoryFactory
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
APP_EXECUTE_QUEUE = "chatflow_execute"
|
||||
|
||||
|
||||
class _UserType(StrEnum):
|
||||
ACCOUNT = "account"
|
||||
@ -66,16 +74,18 @@ User: TypeAlias = Annotated[
|
||||
]
|
||||
|
||||
|
||||
class ChatflowExecutionParams(BaseModel):
|
||||
class AppExecutionParams(BaseModel):
|
||||
app_id: str
|
||||
workflow_id: str
|
||||
tenant_id: str
|
||||
app_mode: AppMode = AppMode.ADVANCED_CHAT
|
||||
user: User
|
||||
args: Mapping[str, Any]
|
||||
|
||||
invoke_from: InvokeFrom
|
||||
streaming: bool = True
|
||||
call_depth: int = 0
|
||||
root_node_id: str | None = None
|
||||
workflow_run_id: uuid.UUID = Field(default_factory=uuid.uuid4)
|
||||
|
||||
@classmethod
|
||||
@ -87,6 +97,9 @@ class ChatflowExecutionParams(BaseModel):
|
||||
args: Mapping[str, Any],
|
||||
invoke_from: InvokeFrom,
|
||||
streaming: bool = True,
|
||||
call_depth: int = 0,
|
||||
root_node_id: str | None = None,
|
||||
workflow_run_id: uuid.UUID | None = None,
|
||||
):
|
||||
user_params: _Account | _EndUser
|
||||
if isinstance(user, Account):
|
||||
@ -99,16 +112,19 @@ class ChatflowExecutionParams(BaseModel):
|
||||
app_id=app_model.id,
|
||||
workflow_id=workflow.id,
|
||||
tenant_id=app_model.tenant_id,
|
||||
app_mode=AppMode.value_of(app_model.mode),
|
||||
user=user_params,
|
||||
args=args,
|
||||
invoke_from=invoke_from,
|
||||
streaming=streaming,
|
||||
workflow_run_id=uuid.uuid4(),
|
||||
call_depth=call_depth,
|
||||
root_node_id=root_node_id,
|
||||
workflow_run_id=workflow_run_id or uuid.uuid4(),
|
||||
)
|
||||
|
||||
|
||||
class _ChatflowRunner:
|
||||
def __init__(self, session_factory: sessionmaker | Engine, exec_params: ChatflowExecutionParams):
|
||||
class _AppRunner:
|
||||
def __init__(self, session_factory: sessionmaker | Engine, exec_params: AppExecutionParams):
|
||||
if isinstance(session_factory, Engine):
|
||||
session_factory = sessionmaker(bind=session_factory)
|
||||
self._session_factory = session_factory
|
||||
@ -130,7 +146,13 @@ class _ChatflowRunner:
|
||||
exec_params = self._exec_params
|
||||
with self._session() as session:
|
||||
workflow = session.get(Workflow, exec_params.workflow_id)
|
||||
if workflow is None:
|
||||
logger.warning("Workflow %s not found for execution", exec_params.workflow_id)
|
||||
return None
|
||||
app = session.get(App, workflow.app_id)
|
||||
if app is None:
|
||||
logger.warning("App %s not found for workflow %s", workflow.app_id, exec_params.workflow_id)
|
||||
return None
|
||||
|
||||
pause_config = PauseStateLayerConfig(
|
||||
session_factory=self._session_factory,
|
||||
@ -139,25 +161,54 @@ class _ChatflowRunner:
|
||||
|
||||
user = self._resolve_user()
|
||||
|
||||
chat_generator = AdvancedChatAppGenerator()
|
||||
|
||||
workflow_run_id = exec_params.workflow_run_id
|
||||
|
||||
with self._setup_flask_context(user):
|
||||
response = chat_generator.generate(
|
||||
response = self._run_app(
|
||||
app=app,
|
||||
workflow=workflow,
|
||||
user=user,
|
||||
pause_state_config=pause_config,
|
||||
)
|
||||
if not exec_params.streaming:
|
||||
return response
|
||||
|
||||
_publish_streaming_response(response, exec_params.workflow_run_id, exec_params.app_mode)
|
||||
|
||||
def _run_app(
|
||||
self,
|
||||
*,
|
||||
app: App,
|
||||
workflow: Workflow,
|
||||
user: Account | EndUser,
|
||||
pause_state_config: PauseStateLayerConfig,
|
||||
):
|
||||
exec_params = self._exec_params
|
||||
if exec_params.app_mode == AppMode.ADVANCED_CHAT:
|
||||
return AdvancedChatAppGenerator().generate(
|
||||
app_model=app,
|
||||
workflow=workflow,
|
||||
user=user,
|
||||
args=exec_params.args,
|
||||
invoke_from=exec_params.invoke_from,
|
||||
streaming=exec_params.streaming,
|
||||
workflow_run_id=workflow_run_id,
|
||||
pause_state_config=pause_config,
|
||||
workflow_run_id=exec_params.workflow_run_id,
|
||||
pause_state_config=pause_state_config,
|
||||
)
|
||||
if exec_params.app_mode == AppMode.WORKFLOW:
|
||||
return WorkflowAppGenerator().generate(
|
||||
app_model=app,
|
||||
workflow=workflow,
|
||||
user=user,
|
||||
args=exec_params.args,
|
||||
invoke_from=exec_params.invoke_from,
|
||||
streaming=exec_params.streaming,
|
||||
call_depth=exec_params.call_depth,
|
||||
root_node_id=exec_params.root_node_id,
|
||||
workflow_run_id=exec_params.workflow_run_id,
|
||||
pause_state_config=pause_state_config,
|
||||
)
|
||||
if not exec_params.streaming:
|
||||
return response
|
||||
|
||||
_publish_streaming_response(response, workflow_run_id)
|
||||
logger.error("Unsupported app mode for execution: %s", exec_params.app_mode)
|
||||
return None
|
||||
|
||||
def _resolve_user(self) -> Account | EndUser:
|
||||
user_params = self._exec_params.user
|
||||
@ -199,13 +250,13 @@ def _coerce_uuid(value: Any) -> uuid.UUID | None:
|
||||
return None
|
||||
|
||||
|
||||
def _publish_streaming_response(response_stream: Iterable[Any], workflow_run_id: Any) -> None:
|
||||
def _publish_streaming_response(response_stream: Iterable[Any], workflow_run_id: Any, app_mode: AppMode) -> None:
|
||||
workflow_run_uuid = _coerce_uuid(workflow_run_id)
|
||||
if workflow_run_uuid is None:
|
||||
logger.warning("Unable to publish streaming response without valid workflow_run_id: %s", workflow_run_id)
|
||||
return
|
||||
|
||||
topic = AdvancedChatAppGenerator.get_response_topic(AppMode.ADVANCED_CHAT, workflow_run_uuid)
|
||||
topic = MessageBasedAppGenerator.get_response_topic(app_mode, workflow_run_uuid)
|
||||
for event in response_stream:
|
||||
try:
|
||||
payload = json.dumps(event)
|
||||
@ -216,18 +267,17 @@ def _publish_streaming_response(response_stream: Iterable[Any], workflow_run_id:
|
||||
topic.publish(payload.encode())
|
||||
|
||||
|
||||
@shared_task(queue="chatflow_execute")
|
||||
@shared_task(queue=APP_EXECUTE_QUEUE)
|
||||
def chatflow_execute_task(payload: str) -> Mapping[str, Any] | None:
|
||||
exec_params = ChatflowExecutionParams.model_validate_json(payload)
|
||||
exec_params = AppExecutionParams.model_validate_json(payload)
|
||||
|
||||
logger.info("chatflow_execute_task run with params: %s", exec_params)
|
||||
|
||||
runner = _ChatflowRunner(db.engine, exec_params=exec_params)
|
||||
runner = _AppRunner(db.engine, exec_params=exec_params)
|
||||
return runner.run()
|
||||
|
||||
|
||||
@shared_task(queue="chatflow_execute", name="resume_chatflow_execution")
|
||||
def resume_chatflow_execution(payload: dict[str, Any]) -> None:
|
||||
def _resume_app_execution(payload: dict[str, Any]) -> None:
|
||||
workflow_run_id = payload["workflow_run_id"]
|
||||
|
||||
session_factory = sessionmaker(bind=db.engine, expire_on_commit=False)
|
||||
@ -245,16 +295,11 @@ def resume_chatflow_execution(payload: dict[str, Any]) -> None:
|
||||
return
|
||||
|
||||
generate_entity = resumption_context.get_generate_entity()
|
||||
if not isinstance(generate_entity, AdvancedChatAppGenerateEntity):
|
||||
logger.error(
|
||||
"Resumption entity is not AdvancedChatAppGenerateEntity for workflow run %s (found %s)",
|
||||
workflow_run_id,
|
||||
type(generate_entity),
|
||||
)
|
||||
return
|
||||
|
||||
graph_runtime_state = GraphRuntimeState.from_snapshot(resumption_context.serialized_graph_runtime_state)
|
||||
|
||||
conversation = None
|
||||
message = None
|
||||
with Session(db.engine, expire_on_commit=False) as session:
|
||||
workflow_run = session.get(WorkflowRun, workflow_run_id)
|
||||
if workflow_run is None:
|
||||
@ -271,29 +316,38 @@ def resume_chatflow_execution(payload: dict[str, Any]) -> None:
|
||||
logger.warning("App %s not found during resume", workflow_run.app_id)
|
||||
return
|
||||
|
||||
if generate_entity.conversation_id is None:
|
||||
logger.warning("Conversation id missing in resumption context for workflow run %s", workflow_run_id)
|
||||
return
|
||||
|
||||
conversation = session.get(Conversation, generate_entity.conversation_id)
|
||||
if conversation is None:
|
||||
logger.warning(
|
||||
"Conversation %s not found for workflow run %s", generate_entity.conversation_id, workflow_run_id
|
||||
)
|
||||
return
|
||||
|
||||
message = session.scalar(
|
||||
select(Message).where(Message.workflow_run_id == workflow_run_id).order_by(Message.created_at.desc())
|
||||
)
|
||||
if message is None:
|
||||
logger.warning("Message not found for workflow run %s", workflow_run_id)
|
||||
return
|
||||
|
||||
user = _resolve_user_for_run(session, workflow_run)
|
||||
if user is None:
|
||||
logger.warning("User %s not found for workflow run %s", workflow_run.created_by, workflow_run_id)
|
||||
return
|
||||
|
||||
if isinstance(generate_entity, AdvancedChatAppGenerateEntity):
|
||||
if generate_entity.conversation_id is None:
|
||||
logger.warning("Conversation id missing in resumption context for workflow run %s", workflow_run_id)
|
||||
return
|
||||
|
||||
conversation = session.get(Conversation, generate_entity.conversation_id)
|
||||
if conversation is None:
|
||||
logger.warning(
|
||||
"Conversation %s not found for workflow run %s", generate_entity.conversation_id, workflow_run_id
|
||||
)
|
||||
return
|
||||
|
||||
message = session.scalar(
|
||||
select(Message).where(Message.workflow_run_id == workflow_run_id).order_by(Message.created_at.desc())
|
||||
)
|
||||
if message is None:
|
||||
logger.warning("Message not found for workflow run %s", workflow_run_id)
|
||||
return
|
||||
|
||||
if not isinstance(generate_entity, (AdvancedChatAppGenerateEntity, WorkflowAppGenerateEntity)):
|
||||
logger.error(
|
||||
"Unsupported resumption entity for workflow run %s (found %s)",
|
||||
workflow_run_id,
|
||||
type(generate_entity),
|
||||
)
|
||||
return
|
||||
|
||||
workflow_run_repo.resume_workflow_pause(workflow_run_id, pause_entity)
|
||||
|
||||
pause_config = PauseStateLayerConfig(
|
||||
@ -301,6 +355,52 @@ def resume_chatflow_execution(payload: dict[str, Any]) -> None:
|
||||
state_owner_user_id=workflow.created_by,
|
||||
)
|
||||
|
||||
if isinstance(generate_entity, AdvancedChatAppGenerateEntity):
|
||||
assert conversation is not None
|
||||
assert message is not None
|
||||
_resume_advanced_chat(
|
||||
app_model=app_model,
|
||||
workflow=workflow,
|
||||
user=user,
|
||||
conversation=conversation,
|
||||
message=message,
|
||||
generate_entity=generate_entity,
|
||||
graph_runtime_state=graph_runtime_state,
|
||||
session_factory=session_factory,
|
||||
pause_state_config=pause_config,
|
||||
workflow_run_id=workflow_run_id,
|
||||
workflow_run=workflow_run,
|
||||
)
|
||||
elif isinstance(generate_entity, WorkflowAppGenerateEntity):
|
||||
_resume_workflow(
|
||||
app_model=app_model,
|
||||
workflow=workflow,
|
||||
user=user,
|
||||
generate_entity=generate_entity,
|
||||
graph_runtime_state=graph_runtime_state,
|
||||
session_factory=session_factory,
|
||||
pause_state_config=pause_config,
|
||||
workflow_run_id=workflow_run_id,
|
||||
workflow_run=workflow_run,
|
||||
workflow_run_repo=workflow_run_repo,
|
||||
pause_entity=pause_entity,
|
||||
)
|
||||
|
||||
|
||||
def _resume_advanced_chat(
|
||||
*,
|
||||
app_model: App,
|
||||
workflow: Workflow,
|
||||
user: Account | EndUser,
|
||||
conversation: Conversation,
|
||||
message: Message,
|
||||
generate_entity: AdvancedChatAppGenerateEntity,
|
||||
graph_runtime_state: GraphRuntimeState,
|
||||
session_factory: sessionmaker,
|
||||
pause_state_config: PauseStateLayerConfig,
|
||||
workflow_run_id: str,
|
||||
workflow_run: WorkflowRun,
|
||||
) -> None:
|
||||
try:
|
||||
triggered_from = WorkflowRunTriggeredFrom(workflow_run.triggered_from)
|
||||
except ValueError:
|
||||
@ -332,7 +432,7 @@ def resume_chatflow_execution(payload: dict[str, Any]) -> None:
|
||||
workflow_execution_repository=workflow_execution_repository,
|
||||
workflow_node_execution_repository=workflow_node_execution_repository,
|
||||
graph_runtime_state=graph_runtime_state,
|
||||
pause_state_config=pause_config,
|
||||
pause_state_config=pause_state_config,
|
||||
)
|
||||
except Exception:
|
||||
logger.exception("Failed to resume chatflow execution for workflow run %s", workflow_run_id)
|
||||
@ -346,4 +446,76 @@ def resume_chatflow_execution(payload: dict[str, Any]) -> None:
|
||||
workflow_run_id,
|
||||
)
|
||||
else:
|
||||
_publish_streaming_response(response, publish_uuid)
|
||||
_publish_streaming_response(response, publish_uuid, AppMode.ADVANCED_CHAT)
|
||||
|
||||
|
||||
def _resume_workflow(
|
||||
*,
|
||||
app_model: App,
|
||||
workflow: Workflow,
|
||||
user: Account | EndUser,
|
||||
generate_entity: WorkflowAppGenerateEntity,
|
||||
graph_runtime_state: GraphRuntimeState,
|
||||
session_factory: sessionmaker,
|
||||
pause_state_config: PauseStateLayerConfig,
|
||||
workflow_run_id: str,
|
||||
workflow_run: WorkflowRun,
|
||||
workflow_run_repo,
|
||||
pause_entity,
|
||||
) -> None:
|
||||
try:
|
||||
triggered_from = WorkflowRunTriggeredFrom(workflow_run.triggered_from)
|
||||
except ValueError:
|
||||
triggered_from = WorkflowRunTriggeredFrom.APP_RUN
|
||||
|
||||
workflow_execution_repository = DifyCoreRepositoryFactory.create_workflow_execution_repository(
|
||||
session_factory=session_factory,
|
||||
user=user,
|
||||
app_id=app_model.id,
|
||||
triggered_from=triggered_from,
|
||||
)
|
||||
workflow_node_execution_repository = DifyCoreRepositoryFactory.create_workflow_node_execution_repository(
|
||||
session_factory=session_factory,
|
||||
user=user,
|
||||
app_id=app_model.id,
|
||||
triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
|
||||
)
|
||||
|
||||
generator = WorkflowAppGenerator()
|
||||
|
||||
try:
|
||||
response = generator.resume(
|
||||
app_model=app_model,
|
||||
workflow=workflow,
|
||||
user=user,
|
||||
application_generate_entity=generate_entity,
|
||||
graph_runtime_state=graph_runtime_state,
|
||||
workflow_execution_repository=workflow_execution_repository,
|
||||
workflow_node_execution_repository=workflow_node_execution_repository,
|
||||
pause_state_config=pause_state_config,
|
||||
)
|
||||
except Exception:
|
||||
logger.exception("Failed to resume workflow execution for workflow run %s", workflow_run_id)
|
||||
raise
|
||||
|
||||
if generate_entity.stream:
|
||||
publish_uuid = _coerce_uuid(generate_entity.workflow_execution_id) or _coerce_uuid(workflow_run_id)
|
||||
if publish_uuid is None:
|
||||
logger.warning(
|
||||
"Unable to publish streaming response for workflow run %s due to missing workflow_run_id",
|
||||
workflow_run_id,
|
||||
)
|
||||
else:
|
||||
_publish_streaming_response(response, publish_uuid, AppMode.WORKFLOW)
|
||||
|
||||
workflow_run_repo.delete_workflow_pause(pause_entity)
|
||||
|
||||
|
||||
@shared_task(queue=APP_EXECUTE_QUEUE, name="resume_app_execution")
|
||||
def resume_app_execution(payload: dict[str, Any]) -> None:
|
||||
_resume_app_execution(payload)
|
||||
|
||||
|
||||
@shared_task(queue=APP_EXECUTE_QUEUE, name="resume_chatflow_execution")
|
||||
def resume_chatflow_execution(payload: dict[str, Any]) -> None:
|
||||
_resume_app_execution(payload)
|
||||
|
||||
@ -26,7 +26,7 @@ from models.account import Account
|
||||
from models.enums import AppTriggerType, CreatorUserRole, WorkflowRunTriggeredFrom, WorkflowTriggerStatus
|
||||
from models.model import App, EndUser, Tenant
|
||||
from models.trigger import WorkflowTriggerLog
|
||||
from models.workflow import Workflow, WorkflowNodeExecutionTriggeredFrom
|
||||
from models.workflow import Workflow, WorkflowNodeExecutionTriggeredFrom, WorkflowRun
|
||||
from repositories.factory import DifyAPIRepositoryFactory
|
||||
from repositories.sqlalchemy_workflow_trigger_log_repository import SQLAlchemyWorkflowTriggerLogRepository
|
||||
from services.errors.app import WorkflowNotFoundError
|
||||
@ -40,12 +40,6 @@ from tasks.workflow_cfs_scheduler.entities import AsyncWorkflowQueue, AsyncWorkf
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
_TRIGGER_TO_RUN_SOURCE = {
|
||||
AppTriggerType.TRIGGER_WEBHOOK: WorkflowRunTriggeredFrom.WEBHOOK,
|
||||
AppTriggerType.TRIGGER_SCHEDULE: WorkflowRunTriggeredFrom.SCHEDULE,
|
||||
AppTriggerType.TRIGGER_PLUGIN: WorkflowRunTriggeredFrom.PLUGIN,
|
||||
}
|
||||
|
||||
|
||||
@shared_task(queue=AsyncWorkflowQueue.PROFESSIONAL_QUEUE)
|
||||
def execute_workflow_professional(task_data_dict: dict[str, Any]):
|
||||
@ -204,44 +198,135 @@ def resume_workflow_execution(task_data_dict: dict[str, Any]) -> None:
|
||||
session_factory = sessionmaker(bind=db.engine, expire_on_commit=False)
|
||||
workflow_run_repo = DifyAPIRepositoryFactory.create_api_workflow_run_repository(session_factory)
|
||||
|
||||
pause_entity = workflow_run_repo.get_workflow_pause(task_data.workflow_run_id)
|
||||
if pause_entity is None:
|
||||
logger.warning("No pause state for workflow run %s", task_data.workflow_run_id)
|
||||
return
|
||||
workflow_run = workflow_run_repo.get_workflow_run_by_id_without_tenant(pause_entity.workflow_execution_id)
|
||||
if workflow_run is None:
|
||||
logger.warning("Workflow run not found for pause entity: pause_entity_id=%s", pause_entity.id)
|
||||
return
|
||||
|
||||
try:
|
||||
resumption_context = WorkflowResumptionContext.loads(pause_entity.get_state().decode())
|
||||
except Exception as exc:
|
||||
logger.exception("Failed to load resumption context for workflow run %s", task_data.workflow_run_id)
|
||||
raise exc
|
||||
|
||||
generate_entity = resumption_context.get_generate_entity()
|
||||
if not isinstance(generate_entity, WorkflowAppGenerateEntity):
|
||||
logger.error(
|
||||
"Unsupported resumption entity for workflow run %s: %s",
|
||||
task_data.workflow_run_id,
|
||||
type(generate_entity),
|
||||
)
|
||||
return
|
||||
|
||||
graph_runtime_state = GraphRuntimeState.from_snapshot(resumption_context.serialized_graph_runtime_state)
|
||||
|
||||
with session_factory() as session:
|
||||
trigger_log_repo = SQLAlchemyWorkflowTriggerLogRepository(session)
|
||||
trigger_log = trigger_log_repo.get_by_id(task_data.workflow_trigger_log_id)
|
||||
if not trigger_log:
|
||||
logger.warning("Trigger log not found for resumption: %s", task_data.workflow_trigger_log_id)
|
||||
return
|
||||
|
||||
pause_entity = workflow_run_repo.get_workflow_pause(task_data.workflow_run_id)
|
||||
if pause_entity is None:
|
||||
logger.warning("No pause state for workflow run %s", task_data.workflow_run_id)
|
||||
return
|
||||
|
||||
try:
|
||||
resumption_context = WorkflowResumptionContext.loads(pause_entity.get_state().decode())
|
||||
except Exception as exc:
|
||||
logger.exception("Failed to load resumption context for workflow run %s", task_data.workflow_run_id)
|
||||
raise exc
|
||||
|
||||
generate_entity = resumption_context.get_generate_entity()
|
||||
if not isinstance(generate_entity, WorkflowAppGenerateEntity):
|
||||
logger.error(
|
||||
"Unsupported resumption entity for workflow run %s: %s",
|
||||
task_data.workflow_run_id,
|
||||
type(generate_entity),
|
||||
)
|
||||
return
|
||||
|
||||
graph_runtime_state = GraphRuntimeState.from_snapshot(resumption_context.serialized_graph_runtime_state)
|
||||
|
||||
workflow = session.scalar(select(Workflow).where(Workflow.id == trigger_log.workflow_id))
|
||||
workflow = session.scalar(select(Workflow).where(Workflow.id == workflow_run.workflow_id))
|
||||
if workflow is None:
|
||||
raise WorkflowNotFoundError(f"Workflow not found: {trigger_log.workflow_id}")
|
||||
|
||||
app_model = session.scalar(select(App).where(App.id == trigger_log.app_id))
|
||||
raise WorkflowNotFoundError(
|
||||
"Workflow not found: workflow_run_id=%s, workflow_id=%s", workflow_run.id, workflow_run.workflow_id
|
||||
)
|
||||
user = _get_user(session, workflow_run)
|
||||
app_model = session.scalar(select(App).where(App.id == workflow_run.app_id))
|
||||
if app_model is None:
|
||||
raise WorkflowNotFoundError(f"App not found: {trigger_log.app_id}")
|
||||
raise _AppNotFoundError(
|
||||
"App not found: app_id=%s, workflow_run_id=%s", workflow_run.app_id, workflow_run.id
|
||||
)
|
||||
|
||||
user = _get_user(session, trigger_log)
|
||||
workflow_execution_repository = DifyCoreRepositoryFactory.create_workflow_execution_repository(
|
||||
session_factory=session_factory,
|
||||
user=user,
|
||||
app_id=generate_entity.app_config.app_id,
|
||||
triggered_from=WorkflowRunTriggeredFrom(workflow_run.triggered_from),
|
||||
)
|
||||
workflow_node_execution_repository = DifyCoreRepositoryFactory.create_workflow_node_execution_repository(
|
||||
session_factory=session_factory,
|
||||
user=user,
|
||||
app_id=generate_entity.app_config.app_id,
|
||||
triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
|
||||
)
|
||||
|
||||
pause_config = PauseStateLayerConfig(
|
||||
session_factory=session_factory,
|
||||
state_owner_user_id=workflow.created_by,
|
||||
)
|
||||
|
||||
generator = WorkflowAppGenerator()
|
||||
start_time = datetime.now(UTC)
|
||||
graph_engine_layers = []
|
||||
trigger_log = _query_trigger_log_info(session_factory, task_data.workflow_run_id)
|
||||
|
||||
if trigger_log:
|
||||
cfs_plan_scheduler_entity = AsyncWorkflowCFSPlanEntity(
|
||||
queue=AsyncWorkflowQueue(trigger_log.queue_name),
|
||||
schedule_strategy=AsyncWorkflowSystemStrategy,
|
||||
granularity=dify_config.ASYNC_WORKFLOW_SCHEDULER_GRANULARITY,
|
||||
)
|
||||
cfs_plan_scheduler = AsyncWorkflowCFSPlanScheduler(plan=cfs_plan_scheduler_entity)
|
||||
|
||||
graph_engine_layers.extend(
|
||||
[
|
||||
TimeSliceLayer(cfs_plan_scheduler),
|
||||
TriggerPostLayer(cfs_plan_scheduler_entity, start_time, trigger_log.id, session_factory),
|
||||
]
|
||||
)
|
||||
|
||||
workflow_run_repo.resume_workflow_pause(task_data.workflow_run_id, pause_entity)
|
||||
|
||||
generator.resume(
|
||||
app_model=app_model,
|
||||
workflow=workflow,
|
||||
user=user,
|
||||
application_generate_entity=generate_entity,
|
||||
graph_runtime_state=graph_runtime_state,
|
||||
workflow_execution_repository=workflow_execution_repository,
|
||||
workflow_node_execution_repository=workflow_node_execution_repository,
|
||||
graph_engine_layers=graph_engine_layers,
|
||||
pause_state_config=pause_config,
|
||||
)
|
||||
workflow_run_repo.delete_workflow_pause(pause_entity)
|
||||
|
||||
|
||||
def _get_user(session: Session, workflow_run: WorkflowRun) -> Account | EndUser:
|
||||
"""Compose user from trigger log"""
|
||||
tenant = session.scalar(select(Tenant).where(Tenant.id == workflow_run.tenant_id))
|
||||
if not tenant:
|
||||
raise _TenantNotFoundError(
|
||||
"Tenant not found for WorkflowRun: tenant_id=%s, workflow_run_id=%s",
|
||||
workflow_run.tenant_id,
|
||||
workflow_run.id,
|
||||
)
|
||||
|
||||
# Get user from trigger log
|
||||
if workflow_run.created_by_role == CreatorUserRole.ACCOUNT:
|
||||
user = session.scalar(select(Account).where(Account.id == workflow_run.created_by))
|
||||
if user:
|
||||
user.current_tenant = tenant
|
||||
else: # CreatorUserRole.END_USER
|
||||
user = session.scalar(select(EndUser).where(EndUser.id == workflow_run.created_by))
|
||||
|
||||
if not user:
|
||||
raise _UserNotFoundError(
|
||||
"User not found: user_id=%s, created_by_role=%s, workflow_run_id=%s",
|
||||
workflow_run.created_by,
|
||||
workflow_run.created_by_role,
|
||||
workflow_run.id,
|
||||
)
|
||||
|
||||
return user
|
||||
|
||||
|
||||
def _query_trigger_log_info(session_factory: sessionmaker[Session], workflow_run_id) -> WorkflowTriggerLog | None:
|
||||
with session_factory() as session, session.begin():
|
||||
trigger_log_repo = SQLAlchemyWorkflowTriggerLogRepository(session)
|
||||
trigger_log = trigger_log_repo.get_by_workflow_run_id(workflow_run_id)
|
||||
if not trigger_log:
|
||||
logger.debug("Trigger log not found for workflow_run: workflow_run_id=%s", workflow_run_id)
|
||||
return
|
||||
|
||||
cfs_plan_scheduler_entity = AsyncWorkflowCFSPlanEntity(
|
||||
queue=trigger_log.queue_name,
|
||||
@ -255,74 +340,14 @@ def resume_workflow_execution(task_data_dict: dict[str, Any]) -> None:
|
||||
except ValueError:
|
||||
trigger_type = AppTriggerType.UNKNOWN
|
||||
|
||||
triggered_from = _TRIGGER_TO_RUN_SOURCE.get(trigger_type, WorkflowRunTriggeredFrom.APP_RUN)
|
||||
|
||||
workflow_execution_repository = DifyCoreRepositoryFactory.create_workflow_execution_repository(
|
||||
session_factory=session_factory,
|
||||
user=user,
|
||||
app_id=generate_entity.app_config.app_id,
|
||||
triggered_from=triggered_from,
|
||||
)
|
||||
workflow_node_execution_repository = DifyCoreRepositoryFactory.create_workflow_node_execution_repository(
|
||||
session_factory=session_factory,
|
||||
user=user,
|
||||
app_id=generate_entity.app_config.app_id,
|
||||
triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
|
||||
)
|
||||
|
||||
pause_config = PauseStateLayerConfig(
|
||||
session_factory=session_factory,
|
||||
state_owner_user_id=workflow.created_by,
|
||||
)
|
||||
|
||||
workflow_run_repo.resume_workflow_pause(task_data.workflow_run_id, pause_entity)
|
||||
|
||||
trigger_log.status = WorkflowTriggerStatus.RUNNING
|
||||
trigger_log_repo.update(trigger_log)
|
||||
session.commit()
|
||||
|
||||
generator = WorkflowAppGenerator()
|
||||
start_time = datetime.now(UTC)
|
||||
|
||||
try:
|
||||
generator.resume(
|
||||
app_model=app_model,
|
||||
workflow=workflow,
|
||||
user=user,
|
||||
application_generate_entity=generate_entity,
|
||||
graph_runtime_state=graph_runtime_state,
|
||||
workflow_execution_repository=workflow_execution_repository,
|
||||
workflow_node_execution_repository=workflow_node_execution_repository,
|
||||
graph_engine_layers=[
|
||||
TimeSliceLayer(cfs_plan_scheduler),
|
||||
TriggerPostLayer(cfs_plan_scheduler_entity, start_time, trigger_log.id, session_factory),
|
||||
],
|
||||
pause_state_config=pause_config,
|
||||
)
|
||||
except Exception as exc:
|
||||
trigger_log.status = WorkflowTriggerStatus.FAILED
|
||||
trigger_log.error = str(exc)
|
||||
trigger_log.finished_at = datetime.now(UTC)
|
||||
trigger_log_repo.update(trigger_log)
|
||||
session.commit()
|
||||
raise
|
||||
class _TenantNotFoundError(Exception):
|
||||
pass
|
||||
|
||||
|
||||
def _get_user(session: Session, trigger_log: WorkflowTriggerLog) -> Account | EndUser:
|
||||
"""Compose user from trigger log"""
|
||||
tenant = session.scalar(select(Tenant).where(Tenant.id == trigger_log.tenant_id))
|
||||
if not tenant:
|
||||
raise ValueError(f"Tenant not found: {trigger_log.tenant_id}")
|
||||
class _UserNotFoundError(Exception):
|
||||
pass
|
||||
|
||||
# Get user from trigger log
|
||||
if trigger_log.created_by_role == CreatorUserRole.ACCOUNT:
|
||||
user = session.scalar(select(Account).where(Account.id == trigger_log.created_by))
|
||||
if user:
|
||||
user.current_tenant = tenant
|
||||
else: # CreatorUserRole.END_USER
|
||||
user = session.scalar(select(EndUser).where(EndUser.id == trigger_log.created_by))
|
||||
|
||||
if not user:
|
||||
raise ValueError(f"User not found: {trigger_log.created_by} (role: {trigger_log.created_by_role})")
|
||||
|
||||
return user
|
||||
class _AppNotFoundError(Exception):
|
||||
pass
|
||||
|
||||
Reference in New Issue
Block a user