AI/dify
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git synced 2025-07-24 02:54:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: workflow log run time error (#7130)

Browse Source
This commit is contained in:
Joe 2024-08-09 14:46:31 +08:00 committed by GitHub
parent 34cab0e0b7
commit 7201b56a6d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/core/app/task_pipeline/workflow_cycle_manage.py
View File

@ -40,6 +40,7 @@ from models.workflow import (
WorkflowRunStatus, WorkflowRunStatus,
WorkflowRunTriggeredFrom, WorkflowRunTriggeredFrom,
) )
from services.workflow_service import WorkflowService
class WorkflowCycleManage(WorkflowIterationCycleManage): class WorkflowCycleManage(WorkflowIterationCycleManage):
@ -97,7 +98,6 @@ class WorkflowCycleManage(WorkflowIterationCycleManage):
def _workflow_run_success( def _workflow_run_success(
self, workflow_run: WorkflowRun, self, workflow_run: WorkflowRun,
start_at: float,
total_tokens: int, total_tokens: int,
total_steps: int, total_steps: int,
outputs: Optional[str] = None, outputs: Optional[str] = None,
@ -107,7 +107,6 @@ class WorkflowCycleManage(WorkflowIterationCycleManage):
""" """
Workflow run success Workflow run success
:param workflow_run: workflow run :param workflow_run: workflow run
:param start_at: start time
:param total_tokens: total tokens :param total_tokens: total tokens
:param total_steps: total steps :param total_steps: total steps
:param outputs: outputs :param outputs: outputs
@ -116,7 +115,7 @@ class WorkflowCycleManage(WorkflowIterationCycleManage):
""" """
workflow_run.status = WorkflowRunStatus.SUCCEEDED.value workflow_run.status = WorkflowRunStatus.SUCCEEDED.value
workflow_run.outputs = outputs workflow_run.outputs = outputs
workflow_run.elapsed_time = time.perf_counter() - start_at workflow_run.elapsed_time = WorkflowService.get_elapsed_time(workflow_run_id=workflow_run.id)
workflow_run.total_tokens = total_tokens workflow_run.total_tokens = total_tokens
workflow_run.total_steps = total_steps workflow_run.total_steps = total_steps
workflow_run.finished_at = datetime.now(timezone.utc).replace(tzinfo=None) workflow_run.finished_at = datetime.now(timezone.utc).replace(tzinfo=None)
@ -139,7 +138,6 @@ class WorkflowCycleManage(WorkflowIterationCycleManage):
def _workflow_run_failed( def _workflow_run_failed(
self, workflow_run: WorkflowRun, self, workflow_run: WorkflowRun,
start_at: float,
total_tokens: int, total_tokens: int,
total_steps: int, total_steps: int,
status: WorkflowRunStatus, status: WorkflowRunStatus,
@ -150,7 +148,6 @@ class WorkflowCycleManage(WorkflowIterationCycleManage):
""" """
Workflow run failed Workflow run failed
:param workflow_run: workflow run :param workflow_run: workflow run
:param start_at: start time
:param total_tokens: total tokens :param total_tokens: total tokens
:param total_steps: total steps :param total_steps: total steps
:param status: status :param status: status
@ -159,7 +156,7 @@ class WorkflowCycleManage(WorkflowIterationCycleManage):
""" """
workflow_run.status = status.value workflow_run.status = status.value
workflow_run.error = error workflow_run.error = error
workflow_run.elapsed_time = time.perf_counter() - start_at workflow_run.elapsed_time = WorkflowService.get_elapsed_time(workflow_run_id=workflow_run.id)
workflow_run.total_tokens = total_tokens workflow_run.total_tokens = total_tokens
workflow_run.total_steps = total_steps workflow_run.total_steps = total_steps
workflow_run.finished_at = datetime.now(timezone.utc).replace(tzinfo=None) workflow_run.finished_at = datetime.now(timezone.utc).replace(tzinfo=None)
@ -542,7 +539,6 @@ class WorkflowCycleManage(WorkflowIterationCycleManage):
if isinstance(event, QueueStopEvent): if isinstance(event, QueueStopEvent):
workflow_run = self._workflow_run_failed( workflow_run = self._workflow_run_failed(
workflow_run=workflow_run, workflow_run=workflow_run,
start_at=self._task_state.start_at,
total_tokens=self._task_state.total_tokens, total_tokens=self._task_state.total_tokens,
total_steps=self._task_state.total_steps, total_steps=self._task_state.total_steps,
status=WorkflowRunStatus.STOPPED, status=WorkflowRunStatus.STOPPED,
@ -565,7 +561,6 @@ class WorkflowCycleManage(WorkflowIterationCycleManage):
elif isinstance(event, QueueWorkflowFailedEvent): elif isinstance(event, QueueWorkflowFailedEvent):
workflow_run = self._workflow_run_failed( workflow_run = self._workflow_run_failed(
workflow_run=workflow_run, workflow_run=workflow_run,
start_at=self._task_state.start_at,
total_tokens=self._task_state.total_tokens, total_tokens=self._task_state.total_tokens,
total_steps=self._task_state.total_steps, total_steps=self._task_state.total_steps,
status=WorkflowRunStatus.FAILED, status=WorkflowRunStatus.FAILED,
@ -583,7 +578,6 @@ class WorkflowCycleManage(WorkflowIterationCycleManage):
workflow_run = self._workflow_run_success( workflow_run = self._workflow_run_success(
workflow_run=workflow_run, workflow_run=workflow_run,
start_at=self._task_state.start_at,
total_tokens=self._task_state.total_tokens, total_tokens=self._task_state.total_tokens,
total_steps=self._task_state.total_steps, total_steps=self._task_state.total_steps,
outputs=outputs, outputs=outputs,

22
api/services/workflow_service.py
View File

@ -319,3 +319,25 @@ class WorkflowService:
) )
else: else:
raise ValueError(f"Invalid app mode: {app_model.mode}") raise ValueError(f"Invalid app mode: {app_model.mode}")
@classmethod
def get_elapsed_time(cls, workflow_run_id: str) -> float:
"""
Get elapsed time
"""
elapsed_time = 0.0
# fetch workflow node execution by workflow_run_id
workflow_nodes = (
db.session.query(WorkflowNodeExecution)
.filter(WorkflowNodeExecution.workflow_run_id == workflow_run_id)
.order_by(WorkflowNodeExecution.created_at.asc())
.all()
)
if not workflow_nodes:
return elapsed_time
for node in workflow_nodes:
elapsed_time += node.elapsed_time
return elapsed_time