opensource
/
dify
mirror of https://github.com/langgenius/dify.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move funcs

This commit is contained in:
takatost 2024-03-07 10:09:23 +08:00
parent 079cc082a3
commit 3e54cb26be
2 changed files with 10 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
api/core/workflow/workflow_engine_manager.py
View File

@ -51,30 +51,6 @@ node_classes = {
class WorkflowEngineManager:
def get_draft_workflow(self, app_model: App) -> Optional[Workflow]:
"""
Get draft workflow
"""
# fetch draft workflow by app_model
workflow = db.session.query(Workflow).filter(
Workflow.tenant_id == app_model.tenant_id,
Workflow.app_id == app_model.id,
Workflow.version == 'draft'
).first()
# return draft workflow
return workflow
def get_published_workflow(self, app_model: App) -> Optional[Workflow]:
"""
Get published workflow
"""
if not app_model.workflow_id:
return None
# fetch published workflow by workflow_id
return self.get_workflow(app_model, app_model.workflow_id)
def get_workflow(self, app_model: App, workflow_id: str) -> Optional[Workflow]:
"""
Get workflow
@ -404,7 +380,6 @@ class WorkflowEngineManager:
:param max_execution_time: max execution time
:return:
"""
# TODO check queue is stopped
return time.perf_counter() - start_at > max_execution_time
def _run_workflow_node(self, workflow_run_state: WorkflowRunState,

14
api/services/workflow_service.py
View File

@ -26,22 +26,28 @@ class WorkflowService:
"""
Get draft workflow
"""
workflow_engine_manager = WorkflowEngineManager()
# fetch draft workflow by app_model
workflow = db.session.query(Workflow).filter(
Workflow.tenant_id == app_model.tenant_id,
Workflow.app_id == app_model.id,
Workflow.version == 'draft'
).first()
# return draft workflow
return workflow_engine_manager.get_draft_workflow(app_model=app_model)
return workflow
def get_published_workflow(self, app_model: App) -> Optional[Workflow]:
"""
Get published workflow
"""
if not app_model.workflow_id:
return None
workflow_engine_manager = WorkflowEngineManager()
# return published workflow
return workflow_engine_manager.get_published_workflow(app_model=app_model)
# fetch published workflow by workflow_id
return workflow_engine_manager.get_workflow(app_model, app_model.workflow_id)
def sync_draft_workflow(self, app_model: App,
graph: dict,