Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

refactor(models): migrate workflow models to TypeBase (#40815)

Asuka Minato8b0a17ce472a
diff --git a/api/core/repositories/sqlalchemy_workflow_execution_repository.py b/api/core/repositories/sqlalchemy_workflow_execution_repository.py
index 699526597a6..20ffb2ebed0 100644
--- a/api/core/repositories/sqlalchemy_workflow_execution_repository.py
+++ b/api/core/repositories/sqlalchemy_workflow_execution_repository.py
@@ -212,6 +212,9 @@ class SQLAlchemyWorkflowExecutionRepository(WorkflowExecutionRepository):
return
# Preserve the original start time for pause/resume flows.
db_model.created_at = existing_model.created_at
+ # The control repository owns these fields. Dataclass defaults must not clear them on merge.
+ db_model.task_id = existing_model.task_id
+ db_model.stop_requested_at = existing_model.stop_requested_at
# SQLAlchemy merge intelligently handles both insert and update operations
# based on the presence of the primary key
diff --git a/api/core/repositories/sqlalchemy_workflow_node_execution_repository.py b/api/core/repositories/sqlalchemy_workflow_node_execution_repository.py
index dd0603b27bf..ca38d2b5c48 100644
--- a/api/core/repositories/sqlalchemy_workflow_node_execution_repository.py
+++ b/api/core/repositories/sqlalchemy_workflow_node_execution_repository.py
@@ -10,7 +10,7 @@ from concurrent.futures import ThreadPoolExecutor
from typing import Any, override
import psycopg2.errors
-from sqlalchemy import UnaryExpression, and_, asc, desc, or_, select
+from sqlalchemy import UnaryExpression, and_, asc, desc, or_, select, update
from sqlalchemy.engine import Engine
from sqlalchemy.exc import IntegrityError
from sqlalchemy.orm import sessionmaker
@@ -393,7 +393,7 @@ class SQLAlchemyWorkflowNodeExecutionRepository(WorkflowNodeExecutionRepository)
@override
def save_many(self, executions: Sequence[WorkflowNodeExecution]) -> None:
- """Upsert a cleanup batch in one transaction, preserving existing offloads."""
+ """Upsert a cleanup batch in one transaction, preserving workspace bindings and existing offloads."""
if not executions:
return
db_models = [self._to_db_model(execution) for execution in executions]
@@ -431,6 +431,8 @@ class SQLAlchemyWorkflowNodeExecutionRepository(WorkflowNodeExecutionRepository)
if existing is None:
session.add(db_model)
continue
+ # The workspace service owns this binding, independently of engine snapshots.
+ db_model.agent_workspace_binding_id = existing.agent_workspace_binding_id
process_data = keep_agent_and_tool_ids(existing.process_data_dict, db_model.process_data_dict)
db_model.process_data = _deterministic_json_dump(process_data) if process_data is not None else None
if db_model.triggered_from_workflow_id is None:
@@ -457,7 +459,8 @@ class SQLAlchemyWorkflowNodeExecutionRepository(WorkflowNodeExecutionRepository)
"""
Persist the database model to the database.
- Checks if a record with the same ID exists and either updates it or creates a new one.
+ Create a new record or update only fields owned by execution persistence.
+ The workspace store owns the workspace binding independently of execution snapshots.
Args:
db_model: The database model to persist
@@ -475,7 +478,15 @@ class SQLAlchemyWorkflowNodeExecutionRepository(WorkflowNodeExecutionRepository)
),
)
# Check if record already exists
- existing = session.get(WorkflowNodeExecutionModel, db_model.id)
+ execution_scope = (
+ WorkflowNodeExecutionModel.id == db_model.id,
+ WorkflowNodeExecutionModel.tenant_id == self._tenant_id,
+ WorkflowNodeExecutionModel.app_id == self._app_id,
+ WorkflowNodeExecutionModel.workflow_id == db_model.workflow_id,
+ WorkflowNodeExecutionModel.workflow_run_id == db_model.workflow_run_id,
+ WorkflowNodeExecutionModel.triggered_from == self._triggered_from,
+ )
+ existing = session.scalar(select(WorkflowNodeExecutionModel).where(*execution_scope))
if existing:
merged_process_data = keep_agent_and_tool_ids(
@@ -485,10 +496,33 @@ class SQLAlchemyWorkflowNodeExecutionRepository(WorkflowNodeExecutionRepository)
db_model.process_data = (
_deterministic_json_dump(merged_process_data) if merged_process_data is not None else None
)
- # Update existing record by copying all non-private attributes
- for key, value in db_model.__dict__.items():
- if not key.startswith("_"):
- setattr(existing, key, value)
+ # Dataclass defaults can include fields owned by other stores.
+ # Copy only the fields populated by execution conversion.
+ session.execute(
+ update(WorkflowNodeExecutionModel)
+ .where(*execution_scope)
+ .values(
+ index=db_model.index,
+ predecessor_node_id=db_model.predecessor_node_id,
+ node_execution_id=db_model.node_execution_id,
+ node_id=db_model.node_id,
+ node_type=db_model.node_type,
+ title=db_model.title,
+ inputs=db_model.inputs,
+ process_data=db_model.process_data,
+ outputs=db_model.outputs,
+ status=db_model.status,
+ error=db_model.error,
+ elapsed_time=db_model.elapsed_time,
+ execution_metadata=db_model.execution_metadata,
+ created_at=db_model.created_at,
+ created_by_role=db_model.created_by_role,
+ created_by=db_model.created_by,
+ finished_at=db_model.finished_at,
+ triggered_from_workflow_id=db_model.triggered_from_workflow_id,
+ triggered_from_node_execution_id=db_model.triggered_from_node_execution_id,
+ )
+ )
else:
# Add new record
session.add(db_model)
diff --git a/api/models/workflow.py b/api/models/workflow.py
index 3708720a530..3653a3f30ab 100644
--- a/api/models/workflow.py
+++ b/api/models/workflow.py
@@ -2,6 +2,7 @@ import copy
import json
import logging
from collections.abc import Generator, Mapping, Sequence
+from dataclasses import field
from datetime import datetime
from enum import StrEnum
from typing import TYPE_CHECKING, Any, Optional, TypedDict, cast
@@ -72,12 +73,12 @@ from graphon.variables import SecretVariable, Segment, SegmentType, VariableBase
from libs import helper
from .account import Account
-from .base import Base, DefaultFieldsDCMixin, TypeBase
+from .base import DefaultFieldsDCMixin, TypeBase
from .engine import db
from .enums import CreatorUserRole, DraftVariableType, ExecutionOffLoadType, WorkflowRunTriggeredFrom
-# UploadFile and workflow execution offload use TypeBase, so importing the class object keeps
-# relationship joins explicit where the related execution model still uses Base.
+# UploadFile and workflow execution models use TypeBase; importing the class object keeps
+# their relationship joins explicit.
from .model import UploadFile
from .types import EnumText, LongText, StringUUID
from .utils.file_input_compat import (
@@ -165,7 +166,7 @@ class _InvalidGraphDefinitionError(Exception):
pass
-class Workflow(Base): # bug
+class Workflow(TypeBase):
"""
Workflow, for `Workflow App` and `Chat App workflow mode`.
@@ -211,39 +212,62 @@ class Workflow(Base): # bug
),
)
- id: Mapped[str] = mapped_column(StringUUID, default=lambda: str(uuid4()))
- tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
- app_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
- type: Mapped[WorkflowType] = mapped_column(EnumText(WorkflowType, length=255), nullable=False)
+ tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False, default=None)
+ app_id: Mapped[str] = mapped_column(StringUUID, nullable=False, default=None)
+ type: Mapped[WorkflowType] = mapped_column(EnumText(WorkflowType, length=255), nullable=False, default=None)
kind: Mapped[WorkflowKind | None] = mapped_column(
EnumText(WorkflowKind, length=255), nullable=True, default=WorkflowKind.STANDARD
)
- version: Mapped[str] = mapped_column(String(255), nullable=False)
+ version: Mapped[str] = mapped_column(String(255), nullable=False, default=None)
+ id: Mapped[str] = mapped_column(
+ StringUUID,
+ insert_default=lambda: str(uuid4()),
+ default_factory=lambda: str(uuid4()),
+ )
# User-facing version number, unique and monotonically increasing within an app, displayed as `#N`.
# NULL for draft workflows and for versions published before numbering was introduced.
version_number: Mapped[int | None] = mapped_column(sa.Integer, nullable=True, default=None)
marked_name: Mapped[str] = mapped_column(String(255), default="")
marked_comment: Mapped[str] = mapped_column(String(255), default="")
- graph: Mapped[str] = mapped_column(LongText)
- _features: Mapped[str] = mapped_column("features", LongText)
- created_by: Mapped[str] = mapped_column(StringUUID, nullable=False)
- created_at: Mapped[datetime] = mapped_column(DateTime, nullable=False, server_default=func.current_timestamp())
- updated_by: Mapped[str | None] = mapped_column(StringUUID)
+ graph: Mapped[str] = mapped_column(LongText, default=None)
+ _features: Mapped[Any] = mapped_column("features", LongText, default=None)
+ created_by: Mapped[str] = mapped_column(StringUUID, nullable=False, default=None)
+ created_at: Mapped[datetime] = mapped_column(
+ DateTime,
+ nullable=False,
+ insert_default=naive_utc_now,
+ default_factory=naive_utc_now,
+ server_default=func.current_timestamp(),
+ init=False,
+ )
+ updated_by: Mapped[str | None] = mapped_column(StringUUID, default=None)
updated_at: Mapped[datetime] = mapped_column(
DateTime,
nullable=False,
- default=func.current_timestamp(),
+ insert_default=naive_utc_now,
+ default_factory=naive_utc_now,
server_default=func.current_timestamp(),
onupdate=func.current_timestamp(),
+ init=False,
)
- _environment_variables: Mapped[str] = mapped_column("environment_variables", LongText, nullable=False, default="{}")
- _conversation_variables: Mapped[str] = mapped_column(
+ _environment_variables: Mapped[Any] = mapped_column("environment_variables", LongText, nullable=False, default="{}")
+ _conversation_variables: Mapped[Any] = mapped_column(
"conversation_variables", LongText, nullable=False, default="{}"
)
- _rag_pipeline_variables: Mapped[str] = mapped_column(
+ _rag_pipeline_variables: Mapped[Any] = mapped_column(
"rag_pipeline_variables", LongText, nullable=False, default="{}"
)
+ def __post_init__(self) -> None:
+ if not isinstance(self._environment_variables, str):
+ environment_variables = self._environment_variables
+ self._environment_variables = "{}"
+ self.environment_variables = environment_variables
+ if not isinstance(self._conversation_variables, str):
+ self.conversation_variables = self._conversation_variables
+ if not isinstance(self._rag_pipeline_variables, str):
+ self.rag_pipeline_variables = self._rag_pipeline_variables
+
VERSION_DRAFT = "draft"
@classmethod
@@ -716,7 +740,7 @@ class Workflow(Base): # bug
return str(d)
-class WorkflowVersionCounter(Base):
+class WorkflowVersionCounter(TypeBase):
"""Monotonic per-app allocator for `Workflow.version_number`.
One row per app, holding the highest number handed out so far. Numbers are never
@@ -757,7 +781,7 @@ class WorkflowRunDict(TypedDict):
exceptions_count: int
-class WorkflowRun(Base):
+class WorkflowRun(TypeBase):
"""
Workflow Run
@@ -803,35 +827,41 @@ class WorkflowRun(Base):
sa.Index("workflow_run_task_id_idx", "task_id", postgresql_where=sa.text("task_id IS NOT NULL")),
)
- id: Mapped[str] = mapped_column(StringUUID, default=lambda: str(uuid4()))
- tenant_id: Mapped[str] = mapped_column(StringUUID)
- app_id: Mapped[str] = mapped_column(StringUUID)
-
- # Public cancellation uses a task ID distinct from the workflow run ID.
- # Nullable for historical runs whose task ID is recovered on pause replay.
- task_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True)
- stop_requested_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)
-
- workflow_id: Mapped[str] = mapped_column(StringUUID)
- type: Mapped[WorkflowType] = mapped_column(EnumText(WorkflowType, length=255))
- triggered_from: Mapped[WorkflowRunTriggeredFrom] = mapped_column(EnumText(WorkflowRunTriggeredFrom, length=255))
- version: Mapped[str] = mapped_column(String(255))
- graph: Mapped[str | None] = mapped_column(LongText)
- inputs: Mapped[str | None] = mapped_column(LongText)
+ tenant_id: Mapped[str] = mapped_column(StringUUID, default=None)
+ app_id: Mapped[str] = mapped_column(StringUUID, default=None)
+ workflow_id: Mapped[str] = mapped_column(StringUUID, default=None)
+ type: Mapped[WorkflowType] = mapped_column(EnumText(WorkflowType, length=255), default=None)
+ triggered_from: Mapped[WorkflowRunTriggeredFrom] = mapped_column(
+ EnumText(WorkflowRunTriggeredFrom, length=255), default=None
+ )
+ version: Mapped[str] = mapped_column(String(255), default=None)
+ # Historical runs can lack a task ID until pause replay.
+ task_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)
+ stop_requested_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True, default=None)
status: Mapped[WorkflowExecutionStatus] = mapped_column(
EnumText(WorkflowExecutionStatus, length=255),
nullable=False,
+ default=None,
+ )
+ created_by_role: Mapped[CreatorUserRole] = mapped_column(EnumText(CreatorUserRole, length=255), default=None)
+ created_by: Mapped[str] = mapped_column(StringUUID, nullable=False, default=None)
+ id: Mapped[str] = mapped_column(
+ StringUUID,
+ insert_default=lambda: str(uuid4()),
+ default_factory=lambda: str(uuid4()),
)
+ graph: Mapped[str | None] = mapped_column(LongText, default=None)
+ inputs: Mapped[str | None] = mapped_column(LongText, default=None)
outputs: Mapped[str | None] = mapped_column(LongText, default="{}")
- error: Mapped[str | None] = mapped_column(LongText)
- elapsed_time: Mapped[float] = mapped_column(sa.Float, nullable=False, server_default=sa.text("0"))
- total_tokens: Mapped[int] = mapped_column(sa.BigInteger, server_default=sa.text("0"))
- total_steps: Mapped[int] = mapped_column(sa.Integer, server_default=sa.text("0"), nullable=True)
- created_by_role: Mapped[CreatorUserRole] = mapped_column(EnumText(CreatorUserRole, length=255)) # account, end_user
- created_by: Mapped[str] = mapped_column(StringUUID, nullable=False)
- created_at: Mapped[datetime] = mapped_column(DateTime, nullable=False, server_default=func.current_timestamp())
- finished_at: Mapped[datetime | None] = mapped_column(DateTime)
- exceptions_count: Mapped[int] = mapped_column(sa.Integer, server_default=sa.text("0"), nullable=True)
+ error: Mapped[str | None] = mapped_column(LongText, default=None)
+ elapsed_time: Mapped[float] = mapped_column(sa.Float, nullable=False, server_default=sa.text("0"), default=0)
+ total_tokens: Mapped[int] = mapped_column(sa.BigInteger, server_default=sa.text("0"), default=0)
+ total_steps: Mapped[int] = mapped_column(sa.Integer, server_default=sa.text("0"), nullable=True, default=0)
+ created_at: Mapped[datetime] = mapped_column(
+ DateTime, nullable=False, server_default=func.current_timestamp(), init=False
+ )
+ finished_at: Mapped[datetime | None] = mapped_column(DateTime, default=None)
+ exceptions_count: Mapped[int] = mapped_column(sa.Integer, server_default=sa.text("0"), nullable=True, default=0)
pause: Mapped[Optional["WorkflowPause"]] = orm.relationship(
lambda: WorkflowPause,
@@ -840,6 +870,7 @@ class WorkflowRun(Base):
# require explicit preloading.
lazy="raise",
back_populates="workflow_run",
+ init=False,
)
def created_by_account(self, session: orm.Session) -> Account | None:
@@ -890,28 +921,29 @@ class WorkflowRun(Base):
@classmethod
def from_dict(cls, data: dict[str, Any]) -> "WorkflowRun":
- return cls(
- id=data.get("id"),
- tenant_id=data.get("tenant_id"),
- app_id=data.get("app_id"),
- workflow_id=data.get("workflow_id"),
- type=data.get("type"),
- triggered_from=data.get("triggered_from"),
- version=data.get("version"),
+ workflow_run = cls(
+ id=data["id"],
+ tenant_id=data["tenant_id"],
+ app_id=data["app_id"],
+ workflow_id=data["workflow_id"],
+ type=data["type"],
+ triggered_from=data["triggered_from"],
+ version=data["version"],
graph=json.dumps(data.get("graph")),
inputs=json.dumps(data.get("inputs")),
- status=data.get("status"),
+ status=data["status"],
outputs=json.dumps(data.get("outputs")),
error=data.get("error"),
- elapsed_time=data.get("elapsed_time"),
- total_tokens=data.get("total_tokens"),
- total_steps=data.get("total_steps"),
- created_by_role=data.get("created_by_role"),
- created_by=data.get("created_by"),
- created_at=data.get("created_at"),
+ elapsed_time=data["elapsed_time"],
+ total_tokens=data["total_tokens"],
+ total_steps=data["total_steps"],
+ created_by_role=data["created_by_role"],
+ created_by=data["created_by"],
finished_at=data.get("finished_at"),
- exceptions_count=data.get("exceptions_count"),
+ exceptions_count=data["exceptions_count"],
)
+ workflow_run.created_at = data["created_at"]
+ return workflow_run
class WorkflowNodeExecutionTriggeredFrom(StrEnum):
@@ -925,7 +957,7 @@ class WorkflowNodeExecutionTriggeredFrom(StrEnum):
RAG_PIPELINE_RUN = "rag-pipeline-run"
-class WorkflowNodeExecutionModel(Base): # This model is expected to have `offload_data` preloaded in most cases.
+class WorkflowNodeExecutionModel(TypeBase): # This model is expected to have `offload_data` preloaded in most cases.
"""
Workflow Node Execution
@@ -1025,37 +1057,42 @@ class WorkflowNodeExecutionModel(Base): # This model is expected to have `offlo
),
)
- id: Mapped[str] = mapped_column(StringUUID, default=lambda: str(uuid4()))
- tenant_id: Mapped[str] = mapped_column(StringUUID)
- app_id: Mapped[str] = mapped_column(StringUUID)
- workflow_id: Mapped[str] = mapped_column(StringUUID)
+ tenant_id: Mapped[str] = mapped_column(StringUUID, default=None)
+ app_id: Mapped[str] = mapped_column(StringUUID, default=None)
+ workflow_id: Mapped[str] = mapped_column(StringUUID, default=None)
triggered_from: Mapped[WorkflowNodeExecutionTriggeredFrom] = mapped_column(
- EnumText(WorkflowNodeExecutionTriggeredFrom, length=255)
- )
- workflow_run_id: Mapped[str | None] = mapped_column(StringUUID)
- triggered_from_workflow_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True)
- triggered_from_node_execution_id: Mapped[str | None] = mapped_column(String(255), nullable=True)
- index: Mapped[int] = mapped_column(sa.Integer)
- predecessor_node_id: Mapped[str | None] = mapped_column(String(255))
- node_execution_id: Mapped[str | None] = mapped_column(String(255))
- node_id: Mapped[str] = mapped_column(String(255))
- node_type: Mapped[str] = mapped_column(String(255))
- title: Mapped[str] = mapped_column(String(255))
- agent_workspace_binding_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True)
- inputs: Mapped[str | None] = mapped_column(LongText)
- process_data: Mapped[str | None] = mapped_column(LongText)
- outputs: Mapped[str | None] = mapped_column(LongText)
- status: Mapped[WorkflowNodeExecutionStatus] = mapped_column(EnumText(WorkflowNodeExecutionStatus, length=255))
- error: Mapped[str | None] = mapped_column(LongText)
- elapsed_time: Mapped[float] = mapped_column(sa.Float, server_default=sa.text("0"))
- execution_metadata: Mapped[str | None] = mapped_column(LongText)
- created_at: Mapped[datetime] = mapped_column(DateTime, server_default=func.current_timestamp())
- created_by_role: Mapped[CreatorUserRole] = mapped_column(EnumText(CreatorUserRole, length=255))
- created_by: Mapped[str] = mapped_column(StringUUID)
- finished_at: Mapped[datetime | None] = mapped_column(DateTime)
-
- # WorkflowNodeExecutionOffload uses TypeBase while this model uses Base, so both the target and join
- # must resolve lazily as class objects instead of relying on string lookup across registries.
+ EnumText(WorkflowNodeExecutionTriggeredFrom, length=255), default=None
+ )
+ index: Mapped[int] = mapped_column(sa.Integer, default=None)
+ node_id: Mapped[str] = mapped_column(String(255), default=None)
+ node_type: Mapped[str] = mapped_column(String(255), default=None)
+ title: Mapped[str] = mapped_column(String(255), default=None)
+ status: Mapped[WorkflowNodeExecutionStatus] = mapped_column(
+ EnumText(WorkflowNodeExecutionStatus, length=255), default=None
+ )
+ created_by_role: Mapped[CreatorUserRole] = mapped_column(EnumText(CreatorUserRole, length=255), default=None)
+ created_by: Mapped[str] = mapped_column(StringUUID, default=None)
+ id: Mapped[str] = mapped_column(
+ StringUUID,
+ insert_default=lambda: str(uuid4()),
+ default_factory=lambda: str(uuid4()),
+ )
+ workflow_run_id: Mapped[str | None] = mapped_column(StringUUID, default=None)
+ predecessor_node_id: Mapped[str | None] = mapped_column(String(255), default=None)
+ node_execution_id: Mapped[str | None] = mapped_column(String(255), default=None)
+ agent_workspace_binding_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)
+ inputs: Mapped[str | None] = mapped_column(LongText, default=None)
+ process_data: Mapped[str | None] = mapped_column(LongText, default=None)
+ outputs: Mapped[str | None] = mapped_column(LongText, default=None)
+ error: Mapped[str | None] = mapped_column(LongText, default=None)
+ elapsed_time: Mapped[float] = mapped_column(sa.Float, server_default=sa.text("0"), default=0)
+ execution_metadata: Mapped[str | None] = mapped_column(LongText, default=None)
+ created_at: Mapped[datetime] = mapped_column(DateTime, server_default=func.current_timestamp(), init=False)
+ finished_at: Mapped[datetime | None] = mapped_column(DateTime, default=None)
+ triggered_from_workflow_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)
+ triggered_from_node_execution_id: Mapped[str | None] = mapped_column(String(255), nullable=True, default=None)
+
+ # Resolve the relationship lazily because the target class is declared below.
offload_data: Mapped[list["WorkflowNodeExecutionOffload"]] = orm.relationship(
lambda: WorkflowNodeExecutionOffload,
primaryjoin=lambda: (
@@ -1064,6 +1101,7 @@ class WorkflowNodeExecutionModel(Base): # This model is expected to have `offlo
uselist=True,
lazy="raise",
back_populates="execution",
+ init=False,
)
@staticmethod
@@ -1251,6 +1289,7 @@ class WorkflowNodeExecutionOffload(TypeBase):
file_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
execution: Mapped[WorkflowNodeExecutionModel] = orm.relationship(
+ lambda: WorkflowNodeExecutionModel,
foreign_keys=[node_execution_id],
lazy="raise",
uselist=False,
@@ -1555,7 +1594,7 @@ class ConversationVariable(TypeBase):
_EDITABLE_SYSTEM_VARIABLE = frozenset(("query", "files"))
-class WorkflowDraftVariable(Base):
+class WorkflowDraftVariable(TypeBase):
"""`WorkflowDraftVariable` record variables and outputs generated during
debugging workflow or chatflow.
@@ -1584,25 +1623,35 @@ class WorkflowDraftVariable(Base):
__allow_unmapped__ = True
# id is the unique identifier of a draft variable.
- id: Mapped[str] = mapped_column(StringUUID, primary_key=True, default=lambda: str(uuid4()))
+ id: Mapped[str] = mapped_column(
+ StringUUID,
+ primary_key=True,
+ insert_default=lambda: str(uuid4()),
+ default_factory=lambda: str(uuid4()),
+ init=False,
+ )
created_at: Mapped[datetime] = mapped_column(
DateTime,
nullable=False,
- default=naive_utc_now,
+ insert_default=naive_utc_now,
+ default_factory=naive_utc_now,
server_default=func.current_timestamp(),
+ init=False,
)
updated_at: Mapped[datetime] = mapped_column(
DateTime,
nullable=False,
- default=naive_utc_now,
+ insert_default=naive_utc_now,
+ default_factory=naive_utc_now,
server_default=func.current_timestamp(),
onupdate=func.current_timestamp(),
+ init=False,
)
# "`app_id` maps to the `id` field in the `model.App` model."
- app_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
+ app_id: Mapped[str] = mapped_column(StringUUID, nullable=False, default=None)
# Owner of this draft variable.
#
# This field is nullable during migration and will be migrated to NOT NULL
@@ -1629,18 +1678,18 @@ class WorkflowDraftVariable(Base):
#
# However, there's one caveat. The id of the first "Answer" node in chatflow is "answer". (Other
# "Answer" node conform the rules above.)
- node_id: Mapped[str] = mapped_column(sa.String(255), nullable=False, name="node_id")
+ node_id: Mapped[str] = mapped_column(sa.String(255), nullable=False, name="node_id", default=None)
# From `VARIABLE_PATTERN`, we may conclude that the length of a top level variable is less than
# 80 chars.
- name: Mapped[str] = mapped_column(sa.String(255), nullable=False)
+ name: Mapped[str] = mapped_column(sa.String(255), nullable=False, default=None)
description: Mapped[str] = mapped_column(
sa.String(255),
default="",
nullable=False,
)
- selector: Mapped[str] = mapped_column(sa.String(255), nullable=False, name="selector")
+ selector: Mapped[str] = mapped_column(sa.String(255), nullable=False, name="selector", default=None)
# The data type of this variable's value
#
@@ -1648,12 +1697,12 @@ class WorkflowDraftVariable(Base):
# which may differ from the original value's type. Typically, they are the same,
# but in cases where the structurally truncated value still exceeds the size limit,
# text slicing is applied, and the `value_type` is converted to `STRING`.
- value_type: Mapped[SegmentType] = mapped_column(EnumText(SegmentType, length=20))
+ value_type: Mapped[SegmentType] = mapped_column(EnumText(SegmentType, length=20), default=None)
# The variable's value serialized as a JSON string
#
# If the variable is offloaded, `value` contains a truncated version, not the full original value.
- value: Mapped[str] = mapped_column(LongText, nullable=False, name="value")
+ value: Mapped[str] = mapped_column(LongText, nullable=False, name="value", default=None)
# Controls whether the variable should be displayed in the variable inspection panel
visible: Mapped[bool] = mapped_column(sa.Boolean, nullable=False, default=True)
@@ -1693,14 +1742,14 @@ class WorkflowDraftVariable(Base):
),
)
- # WorkflowDraftVariableFile uses TypeBase while WorkflowDraftVariable uses Base, so the relationship
- # must resolve the class object lazily instead of relying on string lookup across registries.
+ # Resolve lazily because WorkflowDraftVariableFile is declared later in this module.
variable_file: Mapped[Optional["WorkflowDraftVariableFile"]] = orm.relationship(
lambda: WorkflowDraftVariableFile,
foreign_keys=[file_id],
lazy="raise",
uselist=False,
primaryjoin=lambda: orm.foreign(WorkflowDraftVariable.file_id) == WorkflowDraftVariableFile.id,
+ init=False,
)
# Cache for deserialized value
@@ -1714,20 +1763,7 @@ class WorkflowDraftVariable(Base):
#
# Use double underscore prefix for better encapsulation,
# making this attribute harder to access from outside the class.
- __value: Segment | None
-
- def __init__(self, *args: Any, **kwargs: Any) -> None:
- """
- The constructor of `WorkflowDraftVariable` is not intended for
- direct use outside this file. Its solo purpose is setup private state
- used by the model instance.
-
- Please use the factory methods
- (`new_conversation_variable`, `new_sys_variable`, `new_node_variable`)
- defined below to create instances of this class.
- """
- super().__init__(*args, **kwargs)
- self.__value = None
+ __value: Segment | None = field(default=None, init=False, repr=False)
@orm.reconstructor
def _init_on_load(self):
diff --git a/api/services/rag_pipeline/rag_pipeline.py b/api/services/rag_pipeline/rag_pipeline.py
index c91932e6305..4c085c5f4d0 100644
--- a/api/services/rag_pipeline/rag_pipeline.py
+++ b/api/services/rag_pipeline/rag_pipeline.py
@@ -389,14 +389,14 @@ class RagPipelineService:
workflow = Workflow(
tenant_id=pipeline.tenant_id,
app_id=pipeline.id,
- features="{}",
- type=WorkflowType.RAG_PIPELINE.value,
+ _features="{}",
+ type=WorkflowType.RAG_PIPELINE,
version="draft",
graph=json.dumps(graph),
created_by=account.id,
- environment_variables=environment_variables,
- conversation_variables=conversation_variables,
- rag_pipeline_variables=rag_pipeline_variables,
+ _environment_variables=environment_variables,
+ _conversation_variables=conversation_variables,
+ _rag_pipeline_variables=rag_pipeline_variables,
)
self._session.add(workflow)
self._session.flush()
diff --git a/api/services/rag_pipeline/rag_pipeline_dsl_service.py b/api/services/rag_pipeline/rag_pipeline_dsl_service.py
index dc7556c8b96..04f1ddb4d7d 100644
--- a/api/services/rag_pipeline/rag_pipeline_dsl_service.py
+++ b/api/services/rag_pipeline/rag_pipeline_dsl_service.py
@@ -634,14 +634,14 @@ class RagPipelineDslService:
workflow = Workflow(
tenant_id=pipeline.tenant_id,
app_id=pipeline.id,
- features="{}",
+ _features="{}",
type=WorkflowType.RAG_PIPELINE,
version="draft",
graph=json.dumps(graph),
created_by=account.id,
- environment_variables=environment_variables,
- conversation_variables=conversation_variables,
- rag_pipeline_variables=rag_pipeline_variables_list,
+ _environment_variables=environment_variables,
+ _conversation_variables=conversation_variables,
+ _rag_pipeline_variables=rag_pipeline_variables_list,
)
self._session.add(workflow)
self._session.flush()
diff --git a/api/services/rag_pipeline/rag_pipeline_transform_service.py b/api/services/rag_pipeline/rag_pipeline_transform_service.py
index 4aa959b6d16..64e9814438a 100644
--- a/api/services/rag_pipeline/rag_pipeline_transform_service.py
+++ b/api/services/rag_pipeline/rag_pipeline_transform_service.py
@@ -263,26 +263,26 @@ class RagPipelineTransformService:
draft_workflow = Workflow(
tenant_id=pipeline.tenant_id,
app_id=pipeline.id,
- features="{}",
+ _features="{}",
type=WorkflowType.RAG_PIPELINE,
version="draft",
graph=json.dumps(graph),
created_by=account_id,
- environment_variables=environment_variables,
- conversation_variables=conversation_variables,
- rag_pipeline_variables=rag_pipeline_variables_list,
+ _environment_variables=environment_variables,
+ _conversation_variables=conversation_variables,
+ _rag_pipeline_variables=rag_pipeline_variables_list,
)
published_workflow = Workflow(
tenant_id=pipeline.tenant_id,
app_id=pipeline.id,
- features="{}",
+ _features="{}",
type=WorkflowType.RAG_PIPELINE,
version=str(datetime.now(UTC).replace(tzinfo=None)),
graph=json.dumps(graph),
created_by=account_id,
- environment_variables=environment_variables,
- conversation_variables=conversation_variables,
- rag_pipeline_variables=rag_pipeline_variables_list,
+ _environment_variables=environment_variables,
+ _conversation_variables=conversation_variables,
+ _rag_pipeline_variables=rag_pipeline_variables_list,
)
session.add(draft_workflow)
session.add(published_workflow)
diff --git a/api/services/snippet_service.py b/api/services/snippet_service.py
index 9716d1655b7..17851e29e6b 100644
--- a/api/services/snippet_service.py
+++ b/api/services/snippet_service.py
@@ -578,14 +578,14 @@ class SnippetService:
workflow = Workflow(
tenant_id=snippet.tenant_id,
app_id=snippet.id,
- features="{}",
+ _features="{}",
type=WorkflowType.WORKFLOW,
kind=WorkflowKind.SNIPPET,
version="draft",
graph=json.dumps(graph),
created_by=account.id,
- environment_variables=[],
- conversation_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
)
else:
# Update existing draft workflow
diff --git a/api/services/workflow/workflow_converter.py b/api/services/workflow/workflow_converter.py
index c36edca335a..4e38563cfa3 100644
--- a/api/services/workflow/workflow_converter.py
+++ b/api/services/workflow/workflow_converter.py
@@ -224,13 +224,13 @@ class WorkflowConverter:
workflow = Workflow(
tenant_id=app_model.tenant_id,
app_id=app_model.id,
- type=WorkflowType.from_app_mode(new_app_mode).value,
+ type=WorkflowType.from_app_mode(new_app_mode),
version=Workflow.VERSION_DRAFT,
graph=json.dumps(graph),
- features=json.dumps(features),
+ _features=json.dumps(features),
created_by=account_id,
- environment_variables=[],
- conversation_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
)
session.add(workflow)
diff --git a/api/services/workflow_restore.py b/api/services/workflow_restore.py
index 083235d228c..c54694ba9ea 100644
--- a/api/services/workflow_restore.py
+++ b/api/services/workflow_restore.py
@@ -34,16 +34,14 @@ def apply_published_workflow_snapshot_to_draft(
the published source row before the caller commits.
"""
if not draft_workflow:
- workflow_type = (
- source_workflow.type.value if isinstance(source_workflow.type, WorkflowType) else source_workflow.type
- )
+ workflow_type = WorkflowType(source_workflow.type)
draft_workflow = Workflow(
tenant_id=tenant_id,
app_id=app_id,
type=workflow_type,
version=Workflow.VERSION_DRAFT,
graph=source_workflow.graph,
- features=source_workflow.serialized_features,
+ _features=source_workflow.serialized_features,
created_by=account.id,
)
draft_workflow.copy_serialized_variable_storage_from(source_workflow)
diff --git a/api/services/workflow_service.py b/api/services/workflow_service.py
index c69293dab79..ed64d903130 100644
--- a/api/services/workflow_service.py
+++ b/api/services/workflow_service.py
@@ -471,13 +471,13 @@ class WorkflowService:
workflow = Workflow(
tenant_id=app_model.tenant_id,
app_id=app_model.id,
- type=WorkflowType.from_app_mode(app_model.mode).value,
+ type=WorkflowType.from_app_mode(app_model.mode),
version=Workflow.VERSION_DRAFT,
graph=json.dumps(graph),
- features=json.dumps(features),
+ _features=json.dumps(features),
created_by=account.id,
- environment_variables=initial_environment_variables,
- conversation_variables=conversation_variables,
+ _environment_variables=initial_environment_variables,
+ _conversation_variables=conversation_variables,
)
session.add(workflow)
# update draft workflow if found
diff --git a/api/tasks/trigger_processing_tasks.py b/api/tasks/trigger_processing_tasks.py
index cd671b93817..9af225e319e 100644
--- a/api/tasks/trigger_processing_tasks.py
+++ b/api/tasks/trigger_processing_tasks.py
@@ -168,11 +168,11 @@ def _record_trigger_failure_log(
app_id=workflow.app_id,
workflow_id=workflow.id,
type=workflow.type,
- triggered_from=WorkflowRunTriggeredFrom.PLUGIN.value,
+ triggered_from=WorkflowRunTriggeredFrom.PLUGIN,
version=workflow.version,
graph=workflow.graph,
inputs=json.dumps(failure_inputs),
- status=WorkflowExecutionStatus.FAILED.value,
+ status=WorkflowExecutionStatus.FAILED,
outputs="{}",
error=error_message,
elapsed_time=0.0,
@@ -180,10 +180,10 @@ def _record_trigger_failure_log(
total_steps=0,
created_by_role=created_by_role,
created_by=created_by,
- created_at=now,
finished_at=now,
exceptions_count=0,
)
+ workflow_run.created_at = now
session.add(workflow_run)
session.flush()
diff --git a/api/tests/e2e_tests/containers/controllers/console/app/test_chat_conversation_status_count_api.py b/api/tests/e2e_tests/containers/controllers/console/app/test_chat_conversation_status_count_api.py
index 5f17ecf8df0..2adae56b8b8 100644
--- a/api/tests/e2e_tests/containers/controllers/console/app/test_chat_conversation_status_count_api.py
+++ b/api/tests/e2e_tests/containers/controllers/console/app/test_chat_conversation_status_count_api.py
@@ -16,6 +16,7 @@ from models.account import AccountStatus, TenantAccountRole, TenantStatus
from models.enums import ConversationFromSource, CreatorUserRole
from models.model import App, AppMode, Conversation, Message
from models.workflow import WorkflowRun
+from models.workflow import WorkflowType as ModelWorkflowType
from tests.e2e_tests.containers.controllers.console.helpers import ensure_dify_setup
@@ -86,7 +87,7 @@ def _create_workflow_run(db_session: Session, app_id: str, tenant_id: str, accou
tenant_id=tenant_id,
app_id=app_id,
workflow_id=str(uuid.uuid4()),
- type="chat",
+ type=ModelWorkflowType("chat"),
triggered_from="app-run",
version="1.0.0",
graph=json.dumps({"nodes": [], "edges": []}),
@@ -98,8 +99,8 @@ def _create_workflow_run(db_session: Session, app_id: str, tenant_id: str, accou
total_steps=0,
created_by_role=CreatorUserRole.ACCOUNT,
created_by=account_id,
- created_at=naive_utc_now(),
)
+ workflow_run.created_at = naive_utc_now()
db_session.add(workflow_run)
db_session.commit()
return workflow_run
diff --git a/api/tests/e2e_tests/containers/controllers/web/test_human_input_form.py b/api/tests/e2e_tests/containers/controllers/web/test_human_input_form.py
index afbfbf0434d..160c4c67039 100644
--- a/api/tests/e2e_tests/containers/controllers/web/test_human_input_form.py
+++ b/api/tests/e2e_tests/containers/controllers/web/test_human_input_form.py
@@ -139,8 +139,8 @@ def test_get_human_input_form_resolves_runtime_select_options(
total_steps=0,
created_by_role=CreatorUserRole.ACCOUNT,
created_by=account.id,
- created_at=datetime.now(UTC).replace(tzinfo=None),
)
+ workflow_run.created_at = datetime.now(UTC).replace(tzinfo=None)
db_session_with_containers.add(workflow_run)
db_session_with_containers.flush()
diff --git a/api/tests/e2e_tests/containers/core/app/layers/test_pause_state_persist_layer.py b/api/tests/e2e_tests/containers/core/app/layers/test_pause_state_persist_layer.py
index d5d4e7de52b..7f89508a45d 100644
--- a/api/tests/e2e_tests/containers/core/app/layers/test_pause_state_persist_layer.py
+++ b/api/tests/e2e_tests/containers/core/app/layers/test_pause_state_persist_layer.py
@@ -32,6 +32,7 @@ from models.account import Tenant, TenantAccountJoin, TenantAccountRole
from models.enums import WorkflowRunTriggeredFrom
from models.model import AppMode
from models.workflow import Workflow, WorkflowNodeExecutionTriggeredFrom, WorkflowPause, WorkflowRun
+from models.workflow import WorkflowType as ModelWorkflowType
from repositories.sqlalchemy_api_workflow_run_repository import DifyAPISQLAlchemyWorkflowRunRepository
from services.workflow_run_agg import WorkflowRunAgg
@@ -158,10 +159,10 @@ def workflow_case(db_session_with_containers: Session) -> WorkflowCase:
id=str(uuid4()),
tenant_id=tenant.id,
app_id=str(uuid4()),
- type="workflow",
+ type=ModelWorkflowType("workflow"),
version="draft",
graph=json.dumps(graph),
- features="{}",
+ _features="{}",
created_by=account.id,
)
session.add(workflow)
diff --git a/api/tests/e2e_tests/containers/core/workflow/test_human_input_resume_node_execution.py b/api/tests/e2e_tests/containers/core/workflow/test_human_input_resume_node_execution.py
index 6b7f4b07f9f..2c8e465c5f3 100644
--- a/api/tests/e2e_tests/containers/core/workflow/test_human_input_resume_node_execution.py
+++ b/api/tests/e2e_tests/containers/core/workflow/test_human_input_resume_node_execution.py
@@ -34,6 +34,7 @@ from models.enums import CreatorUserRole, WorkflowRunTriggeredFrom
from models.human_input import HumanInputDelivery, HumanInputForm, HumanInputFormRecipient
from models.model import App, AppMode, IconType
from models.workflow import Workflow, WorkflowNodeExecutionModel, WorkflowNodeExecutionTriggeredFrom, WorkflowRun
+from models.workflow import WorkflowType as ModelWorkflowType
from services.workflow_persistence import PersistenceWorkflowInfo, WorkflowPersistenceLayer
from services.workflow_run_index import WorkflowRunIndex
from tests.workflow_test_utils import build_test_graph_init_params
@@ -202,13 +203,13 @@ class TestHumanInputResumeNodeExecutionIntegration:
workflow = Workflow(
tenant_id=tenant.id,
app_id=app.id,
- type="workflow",
+ type=ModelWorkflowType("workflow"),
version="draft",
graph='{"nodes": [], "edges": []}',
- features='{"file_upload": {"enabled": false}}',
+ _features='{"file_upload": {"enabled": false}}',
created_by=account.id,
- created_at=naive_utc_now(),
)
+ workflow.created_at = naive_utc_now()
db_session_with_containers.add(workflow)
db_session_with_containers.commit()
diff --git a/api/tests/e2e_tests/containers/models/test_conversation_status_count.py b/api/tests/e2e_tests/containers/models/test_conversation_status_count.py
index 079ef49fd59..33c45b5a176 100644
--- a/api/tests/e2e_tests/containers/models/test_conversation_status_count.py
+++ b/api/tests/e2e_tests/containers/models/test_conversation_status_count.py
@@ -13,7 +13,7 @@ import pytest
from sqlalchemy.orm import Session
from graphon.enums import WorkflowExecutionStatus
-from models.enums import ConversationFromSource, ConversationStatus, CustomizeTokenStrategy, InvokeFrom
+from models.enums import ConversationFromSource, ConversationStatus, CreatorUserRole, CustomizeTokenStrategy, InvokeFrom
from models.model import App, AppMode, Conversation, Message, Site
from models.workflow import Workflow, WorkflowRun, WorkflowRunTriggeredFrom, WorkflowType
@@ -90,7 +90,7 @@ class TestConversationStatusCount:
triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
version="draft",
status=status,
- created_by_role="account",
+ created_by_role=CreatorUserRole.ACCOUNT,
created_by=created_by,
)
db_session.add(run)
diff --git a/api/tests/e2e_tests/containers/models/test_workflow_node_execution_model.py b/api/tests/e2e_tests/containers/models/test_workflow_node_execution_model.py
index 61f65fda961..1d3451de1cc 100644
--- a/api/tests/e2e_tests/containers/models/test_workflow_node_execution_model.py
+++ b/api/tests/e2e_tests/containers/models/test_workflow_node_execution_model.py
@@ -12,6 +12,7 @@ from uuid import uuid4
import pytest
from sqlalchemy.orm import Session
+from graphon.enums import WorkflowNodeExecutionStatus
from models.account import Account
from models.enums import CreatorUserRole, EndUserType
from models.model import App, AppMode, EndUser
@@ -72,7 +73,7 @@ class TestWorkflowNodeExecutionModelCreatedBy:
return app
def _make_execution(
- self, tenant_id: str, app_id: str, created_by_role: str, created_by: str
+ self, tenant_id: str, app_id: str, created_by_role: CreatorUserRole, created_by: str
) -> WorkflowNodeExecutionModel:
return WorkflowNodeExecutionModel(
tenant_id=tenant_id,
@@ -89,7 +90,7 @@ class TestWorkflowNodeExecutionModelCreatedBy:
inputs=None,
process_data=None,
outputs=None,
- status="succeeded",
+ status=WorkflowNodeExecutionStatus.SUCCEEDED,
error=None,
elapsed_time=0.0,
execution_metadata=None,
@@ -105,7 +106,7 @@ class TestWorkflowNodeExecutionModelCreatedBy:
execution = self._make_execution(
tenant_id=app.tenant_id,
app_id=app.id,
- created_by_role=CreatorUserRole.ACCOUNT.value,
+ created_by_role=CreatorUserRole.ACCOUNT,
created_by=account.id,
)
@@ -122,7 +123,7 @@ class TestWorkflowNodeExecutionModelCreatedBy:
execution = self._make_execution(
tenant_id=app.tenant_id,
app_id=app.id,
- created_by_role=CreatorUserRole.END_USER.value,
+ created_by_role=CreatorUserRole.END_USER,
created_by=account.id,
)
@@ -142,7 +143,7 @@ class TestWorkflowNodeExecutionModelCreatedBy:
execution = self._make_execution(
tenant_id=tenant_id,
app_id=app.id,
- created_by_role=CreatorUserRole.END_USER.value,
+ created_by_role=CreatorUserRole.END_USER,
created_by=end_user.id,
)
@@ -161,7 +162,7 @@ class TestWorkflowNodeExecutionModelCreatedBy:
execution = self._make_execution(
tenant_id=tenant_id,
app_id=app.id,
- created_by_role=CreatorUserRole.ACCOUNT.value,
+ created_by_role=CreatorUserRole.ACCOUNT,
created_by=end_user.id,
)
diff --git a/api/tests/e2e_tests/containers/repositories/test_sqlalchemy_api_workflow_node_execution_repository.py b/api/tests/e2e_tests/containers/repositories/test_sqlalchemy_api_workflow_node_execution_repository.py
index 7fbffd48feb..d35153beebc 100644
--- a/api/tests/e2e_tests/containers/repositories/test_sqlalchemy_api_workflow_node_execution_repository.py
+++ b/api/tests/e2e_tests/containers/repositories/test_sqlalchemy_api_workflow_node_execution_repository.py
@@ -51,11 +51,11 @@ def _create_node_execution(
error=None,
elapsed_time=0.0,
execution_metadata="{}",
- created_at=now + timedelta(seconds=created_at_offset_seconds),
created_by_role=CreatorUserRole.ACCOUNT,
created_by=created_by,
finished_at=None,
)
+ node_execution.created_at = now + timedelta(seconds=created_at_offset_seconds)
session.add(node_execution)
session.flush()
return node_execution
@@ -63,10 +63,8 @@ def _create_node_execution(
class TestDifyAPISQLAlchemyWorkflowNodeExecutionRepository:
def test_load_full_process_data_returns_inline_mapping(self, db_session_with_containers: Session) -> None:
- execution = WorkflowNodeExecutionModel(
- process_data='{"request": "inline"}',
- offload_data=[],
- )
+ execution = WorkflowNodeExecutionModel(process_data='{"request": "inline"}')
+ execution.offload_data = []
engine = db_session_with_containers.get_bind()
assert isinstance(engine, Engine)
repository = DifyAPISQLAlchemyWorkflowNodeExecutionRepository(sessionmaker(bind=engine, expire_on_commit=False))
@@ -78,7 +76,8 @@ class TestDifyAPISQLAlchemyWorkflowNodeExecutionRepository:
db_session_with_containers: Session,
monkeypatch: pytest.MonkeyPatch,
) -> None:
- execution = WorkflowNodeExecutionModel(process_data="{}", offload_data=[])
+ execution = WorkflowNodeExecutionModel(process_data="{}")
+ execution.offload_data = []
monkeypatch.setattr(
WorkflowNodeExecutionModel,
"load_full_process_data",
diff --git a/api/tests/e2e_tests/containers/repositories/test_sqlalchemy_api_workflow_run_repository.py b/api/tests/e2e_tests/containers/repositories/test_sqlalchemy_api_workflow_run_repository.py
index f08dd267975..0b9ab1023dd 100644
--- a/api/tests/e2e_tests/containers/repositories/test_sqlalchemy_api_workflow_run_repository.py
+++ b/api/tests/e2e_tests/containers/repositories/test_sqlalchemy_api_workflow_run_repository.py
@@ -30,6 +30,7 @@ from models.human_input import (
RecipientType,
)
from models.workflow import WorkflowAppLog, WorkflowAppLogCreatedFrom, WorkflowPause, WorkflowPauseReason, WorkflowRun
+from models.workflow import WorkflowType as ModelWorkflowType
from repositories.entities.workflow_pause import WorkflowPauseEntity
from repositories.sqlalchemy_api_workflow_run_repository import (
DifyAPISQLAlchemyWorkflowRunRepository,
@@ -71,7 +72,7 @@ def _create_workflow_run(
tenant_id=scope.tenant_id,
app_id=scope.app_id,
workflow_id=scope.workflow_id,
- type="workflow",
+ type=ModelWorkflowType("workflow"),
triggered_from=WorkflowRunTriggeredFrom.DEBUGGING,
version="draft",
graph="{}",
@@ -79,8 +80,8 @@ def _create_workflow_run(
status=status,
created_by_role=CreatorUserRole.ACCOUNT,
created_by=scope.user_id,
- created_at=created_at or naive_utc_now(),
)
+ workflow_run.created_at = created_at or naive_utc_now()
session.add(workflow_run)
session.commit()
return workflow_run
diff --git a/api/tests/e2e_tests/containers/repositories/test_sqlalchemy_workflow_node_execution_repository.py b/api/tests/e2e_tests/containers/repositories/test_sqlalchemy_workflow_node_execution_repository.py
index f5c624d3154..8339795b062 100644
--- a/api/tests/e2e_tests/containers/repositories/test_sqlalchemy_workflow_node_execution_repository.py
+++ b/api/tests/e2e_tests/containers/repositories/test_sqlalchemy_workflow_node_execution_repository.py
@@ -81,11 +81,11 @@ def _create_node_execution_model(
error=None,
elapsed_time=1.5,
execution_metadata="{}",
- created_at=datetime.now(),
created_by_role=CreatorUserRole.ACCOUNT,
created_by=str(uuid4()),
finished_at=None,
)
+ model.created_at = datetime.now()
session.add(model)
session.flush()
return model
diff --git a/api/tests/e2e_tests/containers/repositories/test_sqlalchemy_workflow_run_cleanup_repository.py b/api/tests/e2e_tests/containers/repositories/test_sqlalchemy_workflow_run_cleanup_repository.py
index 7fc557f9b11..70287ade4fc 100644
--- a/api/tests/e2e_tests/containers/repositories/test_sqlalchemy_workflow_run_cleanup_repository.py
+++ b/api/tests/e2e_tests/containers/repositories/test_sqlalchemy_workflow_run_cleanup_repository.py
@@ -12,7 +12,16 @@ from sqlalchemy.orm import Session, sessionmaker
from graphon.entities.pause_reason import PauseReasonType
from graphon.enums import WorkflowExecutionStatus, WorkflowType
from models.enums import CreatorUserRole, WorkflowRunTriggeredFrom
-from models.workflow import WorkflowAppLog, WorkflowAppLogCreatedFrom, WorkflowPause, WorkflowPauseReason, WorkflowRun
+from models.workflow import (
+ WorkflowAppLog,
+ WorkflowAppLogCreatedFrom,
+ WorkflowPause,
+ WorkflowPauseReason,
+ WorkflowRun,
+)
+from models.workflow import (
+ WorkflowType as ModelWorkflowType,
+)
from repositories.sqlalchemy_api_workflow_run_repository import DifyAPISQLAlchemyWorkflowRunRepository
@@ -40,7 +49,7 @@ def _create_workflow_run(
created_at: datetime,
tenant_id: str | None = None,
workflow_id: str | None = None,
- workflow_type: str = WorkflowType.WORKFLOW,
+ workflow_type: ModelWorkflowType = ModelWorkflowType.WORKFLOW,
) -> WorkflowRun:
workflow_run = WorkflowRun(
id=str(uuid4()),
@@ -55,8 +64,8 @@ def _create_workflow_run(
status=status,
created_by_role=CreatorUserRole.ACCOUNT,
created_by=scope.user_id,
- created_at=created_at,
)
+ workflow_run.created_at = created_at
session.add(workflow_run)
session.commit()
return workflow_run
@@ -130,7 +139,7 @@ class TestGetCleanupRefsBatchByTimeRange:
db_session_with_containers,
scope,
created_at=base + timedelta(minutes=1),
- workflow_type=WorkflowType.CHAT,
+ workflow_type=ModelWorkflowType.CHAT,
)
_create_workflow_run(db_session_with_containers, scope, created_at=base + timedelta(minutes=3))
diff --git a/api/tests/e2e_tests/containers/repositories/test_workflow_run_repository.py b/api/tests/e2e_tests/containers/repositories/test_workflow_run_repository.py
index d6f0657380b..e8383f656b4 100644
--- a/api/tests/e2e_tests/containers/repositories/test_workflow_run_repository.py
+++ b/api/tests/e2e_tests/containers/repositories/test_workflow_run_repository.py
@@ -59,8 +59,8 @@ def _create_workflow_run(
status=status,
created_by_role=CreatorUserRole.ACCOUNT,
created_by=scope.user_id,
- created_at=now + created_at_offset if created_at_offset is not None else now,
)
+ workflow_run.created_at = now + created_at_offset if created_at_offset is not None else now
session.add(workflow_run)
session.commit()
return workflow_run
diff --git a/api/tests/e2e_tests/containers/services/test_app_generate_service.py b/api/tests/e2e_tests/containers/services/test_app_generate_service.py
index ccb7e0658a1..585be482a38 100644
--- a/api/tests/e2e_tests/containers/services/test_app_generate_service.py
+++ b/api/tests/e2e_tests/containers/services/test_app_generate_service.py
@@ -14,6 +14,7 @@ from models import App
from models.enums import EndUserType
from models.model import EndUser
from models.workflow import Workflow
+from models.workflow import WorkflowType as ModelWorkflowType
from services.app_generate_service import AppGenerateService
from services.errors.app import WorkflowIdFormatError, WorkflowNotFoundError
from tests.e2e_tests.containers.helpers import generate_valid_password
@@ -215,10 +216,14 @@ class TestAppGenerateService:
workflow = Workflow(
id=str(uuid.uuid4()),
app_id=app.id,
- name=fake.company(),
- description=fake.text(max_nb_chars=100),
- type="workflow",
- status="published",
+ tenant_id=app.tenant_id,
+ marked_name=fake.company(),
+ marked_comment=fake.text(max_nb_chars=100),
+ type=ModelWorkflowType.WORKFLOW,
+ version="published",
+ graph='{"nodes": [], "edges": []}',
+ _features="{}",
+ created_by=app.created_by,
)
db_session_with_containers.add(workflow)
diff --git a/api/tests/e2e_tests/containers/services/test_delete_archived_workflow_run.py b/api/tests/e2e_tests/containers/services/test_delete_archived_workflow_run.py
index 62d6dd489a5..3bc42f335a0 100644
--- a/api/tests/e2e_tests/containers/services/test_delete_archived_workflow_run.py
+++ b/api/tests/e2e_tests/containers/services/test_delete_archived_workflow_run.py
@@ -16,6 +16,7 @@ from graphon.enums import WorkflowExecutionStatus
from libs.archive_storage import ArchiveStorage
from models.enums import CreatorUserRole, WorkflowRunTriggeredFrom
from models.workflow import WorkflowArchiveLog, WorkflowRun
+from models.workflow import WorkflowType as ModelWorkflowType
from services.retention.workflow_run.constants import ARCHIVE_BUNDLE_NAME, ARCHIVE_SCHEMA_VERSION
from services.retention.workflow_run.delete_archived_workflow_run import ArchivedWorkflowRunDeletion
@@ -54,7 +55,7 @@ class TestArchivedWorkflowRunDeletion:
tenant_id=tenant_id,
app_id=str(uuid4()),
workflow_id=str(uuid4()),
- type="workflow",
+ type=ModelWorkflowType("workflow"),
triggered_from=WorkflowRunTriggeredFrom.DEBUGGING,
version="1.0.0",
graph="{}",
@@ -66,10 +67,10 @@ class TestArchivedWorkflowRunDeletion:
total_steps=1,
created_by_role=CreatorUserRole.ACCOUNT,
created_by=str(uuid4()),
- created_at=created_at,
finished_at=created_at,
exceptions_count=0,
)
+ run.created_at = created_at
db_session_with_containers.add(run)
db_session_with_containers.commit()
return run
diff --git a/api/tests/e2e_tests/containers/services/test_webhook_service.py b/api/tests/e2e_tests/containers/services/test_webhook_service.py
index f544acf43ca..6dc943d9ef1 100644
--- a/api/tests/e2e_tests/containers/services/test_webhook_service.py
+++ b/api/tests/e2e_tests/containers/services/test_webhook_service.py
@@ -13,6 +13,7 @@ from models.enums import AppTriggerStatus, AppTriggerType
from models.model import App
from models.trigger import AppTrigger, WorkflowWebhookTrigger
from models.workflow import Workflow
+from models.workflow import WorkflowType as ModelWorkflowType
from services.trigger.webhook_service import WebhookService
from tests.e2e_tests.containers.helpers import accounts as account_fixtures
from tests.e2e_tests.containers.helpers import generate_valid_password
@@ -100,12 +101,12 @@ def test_data(
workflow = Workflow(
tenant_id=tenant.id,
app_id=app.id,
- type="workflow",
+ type=ModelWorkflowType("workflow"),
graph=json.dumps(workflow_data),
- features=json.dumps({}),
+ _features=json.dumps({}),
created_by=account.id,
- environment_variables=[],
- conversation_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
version="1.0",
)
db_session_with_containers.add(workflow)
diff --git a/api/tests/e2e_tests/containers/services/test_webhook_service_relationships.py b/api/tests/e2e_tests/containers/services/test_webhook_service_relationships.py
index acb786fc758..ad2e9d62fd2 100644
--- a/api/tests/e2e_tests/containers/services/test_webhook_service_relationships.py
+++ b/api/tests/e2e_tests/containers/services/test_webhook_service_relationships.py
@@ -18,6 +18,7 @@ from models.enums import AppTriggerStatus, AppTriggerType, EndUserType
from models.model import App, EndUser
from models.trigger import AppTrigger, WorkflowWebhookTrigger
from models.workflow import Workflow
+from models.workflow import WorkflowType as ModelWorkflowType
from services.errors.app import QuotaExceededError
from services.trigger.webhook_service import WebhookService
@@ -138,13 +139,13 @@ class WebhookServiceRelationshipFactory:
workflow = Workflow(
tenant_id=app.tenant_id,
app_id=app.id,
- type="workflow",
+ type=ModelWorkflowType("workflow"),
graph=json.dumps(graph),
- features=json.dumps({}),
+ _features=json.dumps({}),
created_by=account.id,
updated_by=account.id,
- environment_variables=[],
- conversation_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
version=version,
)
db_session_with_containers.add(workflow)
diff --git a/api/tests/e2e_tests/containers/services/test_workflow_app_service.py b/api/tests/e2e_tests/containers/services/test_workflow_app_service.py
index d8fb636057f..a2c115f6430 100644
--- a/api/tests/e2e_tests/containers/services/test_workflow_app_service.py
+++ b/api/tests/e2e_tests/containers/services/test_workflow_app_service.py
@@ -13,6 +13,7 @@ from graphon.enums import WorkflowExecutionStatus
from models import EndUser, Workflow, WorkflowAppLog, WorkflowRun
from models.enums import CreatorUserRole, EndUserType
from models.workflow import WorkflowAppLogCreatedFrom
+from models.workflow import WorkflowType as ModelWorkflowType
from repositories.workflow_app_log_query_repository import WorkflowAppLogQueryRepository
from services.workflow_app_log_query_service import WorkflowAppLogQueryService
from tests.e2e_tests.containers.helpers import accounts as account_fixtures
@@ -207,7 +208,7 @@ class TestWorkflowAppLogQueryService:
id=str(uuid.uuid4()),
tenant_id=app.tenant_id,
app_id=app.id,
- type="workflow",
+ type=ModelWorkflowType.WORKFLOW,
version="1.0.0",
graph=json.dumps({"nodes": [], "edges": []}),
_features=json.dumps({}),
@@ -223,7 +224,7 @@ class TestWorkflowAppLogQueryService:
tenant_id=app.tenant_id,
app_id=app.id,
workflow_id=workflow.id,
- type="workflow",
+ type=ModelWorkflowType.WORKFLOW,
triggered_from="app-run",
version="1.0.0",
graph=json.dumps({"nodes": [], "edges": []}),
@@ -235,9 +236,9 @@ class TestWorkflowAppLogQueryService:
total_steps=3,
created_by_role=CreatorUserRole.ACCOUNT,
created_by=account.id,
- created_at=datetime.now(UTC),
finished_at=datetime.now(UTC),
)
+ workflow_run.created_at = datetime.now(UTC)
db_session_with_containers.add(workflow_run)
db_session_with_containers.commit()
@@ -362,7 +363,7 @@ class TestWorkflowAppLogQueryService:
tenant_id=app.tenant_id,
app_id=app.id,
workflow_id=workflow.id,
- type="workflow",
+ type=ModelWorkflowType.WORKFLOW,
triggered_from="app-run",
version="1.0.0",
graph=json.dumps({"nodes": [], "edges": []}),
@@ -371,8 +372,8 @@ class TestWorkflowAppLogQueryService:
outputs=json.dumps({"result": "50% discount applied", "status": "success"}),
created_by_role=CreatorUserRole.ACCOUNT,
created_by=account.id,
- created_at=datetime.now(UTC),
)
+ workflow_run_1.created_at = datetime.now(UTC)
db_session_with_containers.add(workflow_run_1)
db_session_with_containers.flush()
@@ -404,7 +405,7 @@ class TestWorkflowAppLogQueryService:
tenant_id=app.tenant_id,
app_id=app.id,
workflow_id=workflow.id,
- type="workflow",
+ type=ModelWorkflowType.WORKFLOW,
triggered_from="app-run",
version="1.0.0",
graph=json.dumps({"nodes": [], "edges": []}),
@@ -413,8 +414,8 @@ class TestWorkflowAppLogQueryService:
outputs=json.dumps({"result": "test_data_value found", "status": "success"}),
created_by_role=CreatorUserRole.ACCOUNT,
created_by=account.id,
- created_at=datetime.now(UTC),
)
+ workflow_run_2.created_at = datetime.now(UTC)
db_session_with_containers.add(workflow_run_2)
db_session_with_containers.flush()
@@ -446,7 +447,7 @@ class TestWorkflowAppLogQueryService:
tenant_id=app.tenant_id,
app_id=app.id,
workflow_id=workflow.id,
- type="workflow",
+ type=ModelWorkflowType.WORKFLOW,
triggered_from="app-run",
version="1.0.0",
graph=json.dumps({"nodes": [], "edges": []}),
@@ -455,8 +456,8 @@ class TestWorkflowAppLogQueryService:
outputs=json.dumps({"result": "100% different result", "status": "success"}),
created_by_role=CreatorUserRole.ACCOUNT,
created_by=account.id,
- created_at=datetime.now(UTC),
)
+ workflow_run_4.created_at = datetime.now(UTC)
db_session_with_containers.add(workflow_run_4)
db_session_with_containers.flush()
@@ -501,7 +502,7 @@ class TestWorkflowAppLogQueryService:
id=str(uuid.uuid4()),
tenant_id=app.tenant_id,
app_id=app.id,
- type="workflow",
+ type=ModelWorkflowType.WORKFLOW,
version="1.0.0",
graph=json.dumps({"nodes": [], "edges": []}),
_features=json.dumps({}),
@@ -522,7 +523,7 @@ class TestWorkflowAppLogQueryService:
tenant_id=app.tenant_id,
app_id=app.id,
workflow_id=workflow.id,
- type="workflow",
+ type=ModelWorkflowType.WORKFLOW,
triggered_from="app-run",
version="1.0.0",
graph=json.dumps({"nodes": [], "edges": []}),
@@ -534,9 +535,9 @@ class TestWorkflowAppLogQueryService:
total_steps=3,
created_by_role=CreatorUserRole.ACCOUNT,
created_by=account.id,
- created_at=datetime.now(UTC) + timedelta(minutes=i),
finished_at=datetime.now(UTC) + timedelta(minutes=i + 1) if status != "running" else None,
)
+ workflow_run.created_at = datetime.now(UTC) + timedelta(minutes=i)
db_session_with_containers.add(workflow_run)
db_session_with_containers.commit()
@@ -600,7 +601,7 @@ class TestWorkflowAppLogQueryService:
id=str(uuid.uuid4()),
tenant_id=app.tenant_id,
app_id=app.id,
- type="workflow",
+ type=ModelWorkflowType.WORKFLOW,
version="1.0.0",
graph=json.dumps({"nodes": [], "edges": []}),
_features=json.dumps({}),
@@ -628,7 +629,7 @@ class TestWorkflowAppLogQueryService:
tenant_id=app.tenant_id,
app_id=app.id,
workflow_id=workflow.id,
- type="workflow",
+ type=ModelWorkflowType.WORKFLOW,
triggered_from="app-run",
version="1.0.0",
graph=json.dumps({"nodes": [], "edges": []}),
@@ -640,9 +641,9 @@ class TestWorkflowAppLogQueryService:
total_steps=3,
created_by_role=CreatorUserRole.ACCOUNT,
created_by=account.id,
- created_at=timestamp,
finished_at=timestamp + timedelta(minutes=1),
)
+ workflow_run.created_at = timestamp
db_session_with_containers.add(workflow_run)
db_session_with_containers.commit()
@@ -712,7 +713,7 @@ class TestWorkflowAppLogQueryService:
id=str(uuid.uuid4()),
tenant_id=app.tenant_id,
app_id=app.id,
- type="workflow",
+ type=ModelWorkflowType.WORKFLOW,
version="1.0.0",
graph=json.dumps({"nodes": [], "edges": []}),
_features=json.dumps({}),
@@ -733,7 +734,7 @@ class TestWorkflowAppLogQueryService:
tenant_id=app.tenant_id,
app_id=app.id,
workflow_id=workflow.id,
- type="workflow",
+ type=ModelWorkflowType.WORKFLOW,
triggered_from="app-run",
version="1.0.0",
graph=json.dumps({"nodes": [], "edges": []}),
@@ -745,9 +746,9 @@ class TestWorkflowAppLogQueryService:
total_steps=3,
created_by_role=CreatorUserRole.ACCOUNT,
created_by=account.id,
- created_at=datetime.now(UTC) + timedelta(minutes=i),
finished_at=datetime.now(UTC) + timedelta(minutes=i + 1),
)
+ workflow_run.created_at = datetime.now(UTC) + timedelta(minutes=i)
db_session_with_containers.add(workflow_run)
db_session_with_containers.commit()
@@ -826,7 +827,7 @@ class TestWorkflowAppLogQueryService:
id=str(uuid.uuid4()),
tenant_id=app.tenant_id,
app_id=app.id,
- type="workflow",
+ type=ModelWorkflowType.WORKFLOW,
version="1.0.0",
graph=json.dumps({"nodes": [], "edges": []}),
_features=json.dumps({}),
@@ -861,7 +862,7 @@ class TestWorkflowAppLogQueryService:
tenant_id=app.tenant_id,
app_id=app.id,
workflow_id=workflow.id,
- type="workflow",
+ type=ModelWorkflowType.WORKFLOW,
triggered_from="app-run",
version="1.0.0",
graph=json.dumps({"nodes": [], "edges": []}),
@@ -873,9 +874,9 @@ class TestWorkflowAppLogQueryService:
total_steps=3,
created_by_role=CreatorUserRole.ACCOUNT,
created_by=account.id,
- created_at=datetime.now(UTC) + timedelta(minutes=i),
finished_at=datetime.now(UTC) + timedelta(minutes=i + 1),
)
+ workflow_run.created_at = datetime.now(UTC) + timedelta(minutes=i)
db_session_with_containers.add(workflow_run)
db_session_with_containers.commit()
@@ -903,7 +904,7 @@ class TestWorkflowAppLogQueryService:
tenant_id=app.tenant_id,
app_id=app.id,
workflow_id=workflow.id,
- type="workflow",
+ type=ModelWorkflowType.WORKFLOW,
triggered_from="app-run",
version="1.0.0",
graph=json.dumps({"nodes": [], "edges": []}),
@@ -915,9 +916,9 @@ class TestWorkflowAppLogQueryService:
total_steps=3,
created_by_role=CreatorUserRole.END_USER,
created_by=end_user.id,
- created_at=datetime.now(UTC) + timedelta(minutes=i + 10),
finished_at=datetime.now(UTC) + timedelta(minutes=i + 11),
)
+ workflow_run.created_at = datetime.now(UTC) + timedelta(minutes=i + 10)
db_session_with_containers.add(workflow_run)
db_session_with_containers.commit()
@@ -1020,7 +1021,7 @@ class TestWorkflowAppLogQueryService:
id=str(uuid.uuid4()),
tenant_id=app.tenant_id,
app_id=app.id,
- type="workflow",
+ type=ModelWorkflowType.WORKFLOW,
version="1.0.0",
graph=json.dumps({"nodes": [], "edges": []}),
_features=json.dumps({}),
@@ -1037,7 +1038,7 @@ class TestWorkflowAppLogQueryService:
tenant_id=app.tenant_id,
app_id=app.id,
workflow_id=workflow.id,
- type="workflow",
+ type=ModelWorkflowType.WORKFLOW,
triggered_from="app-run",
version="1.0.0",
graph=json.dumps({"nodes": [], "edges": []}),
@@ -1049,9 +1050,9 @@ class TestWorkflowAppLogQueryService:
total_steps=3,
created_by_role=CreatorUserRole.ACCOUNT,
created_by=account.id,
- created_at=datetime.now(UTC),
finished_at=datetime.now(UTC) + timedelta(minutes=1),
)
+ workflow_run.created_at = datetime.now(UTC)
db_session_with_containers.add(workflow_run)
db_session_with_containers.commit()
@@ -1109,7 +1110,7 @@ class TestWorkflowAppLogQueryService:
id=str(uuid.uuid4()),
tenant_id=app.tenant_id,
app_id=app.id,
- type="workflow",
+ type=ModelWorkflowType.WORKFLOW,
version="1.0.0",
graph=json.dumps({"nodes": [], "edges": []}),
_features=json.dumps({}),
@@ -1125,7 +1126,7 @@ class TestWorkflowAppLogQueryService:
tenant_id=app.tenant_id,
app_id=app.id,
workflow_id=workflow.id,
- type="workflow",
+ type=ModelWorkflowType.WORKFLOW,
triggered_from="app-run",
version="1.0.0",
graph=json.dumps({"nodes": [], "edges": []}),
@@ -1137,9 +1138,9 @@ class TestWorkflowAppLogQueryService:
total_steps=0, # Edge case: 0 steps
created_by_role=CreatorUserRole.ACCOUNT,
created_by=account.id,
- created_at=datetime.now(UTC),
finished_at=datetime.now(UTC),
)
+ workflow_run.created_at = datetime.now(UTC)
db_session_with_containers.add(workflow_run)
db_session_with_containers.commit()
@@ -1279,7 +1280,7 @@ class TestWorkflowAppLogQueryService:
tenant_id=app.tenant_id,
app_id=app.id,
workflow_id=workflow.id,
- type="workflow",
+ type=ModelWorkflowType.WORKFLOW,
triggered_from="app-run",
version="1.0.0",
graph=json.dumps({"nodes": [], "edges": []}),
@@ -1292,9 +1293,9 @@ class TestWorkflowAppLogQueryService:
total_steps=3,
created_by_role=CreatorUserRole.ACCOUNT,
created_by=account.id,
- created_at=datetime.now(UTC) + timedelta(minutes=i),
finished_at=datetime.now(UTC) + timedelta(minutes=i + 1) if status == "succeeded" else None,
)
+ workflow_run.created_at = datetime.now(UTC) + timedelta(minutes=i)
db_session_with_containers.add(workflow_run)
db_session_with_containers.flush()
@@ -1379,7 +1380,7 @@ class TestWorkflowAppLogQueryService:
tenant_id=app.tenant_id,
app_id=app.id,
workflow_id=workflow.id,
- type="workflow",
+ type=ModelWorkflowType.WORKFLOW,
triggered_from="app-run",
version="1.0.0",
graph=json.dumps({"nodes": [], "edges": []}),
@@ -1392,9 +1393,9 @@ class TestWorkflowAppLogQueryService:
total_steps=3,
created_by_role=CreatorUserRole.ACCOUNT,
created_by=account.id,
- created_at=datetime.now(UTC) + timedelta(minutes=i),
finished_at=datetime.now(UTC) + timedelta(minutes=i + 1) if status != "running" else None,
)
+ workflow_run.created_at = datetime.now(UTC) + timedelta(minutes=i)
db_session_with_containers.add(workflow_run)
db_session_with_containers.flush()
@@ -1485,7 +1486,7 @@ class TestWorkflowAppLogQueryService:
tenant_id=app.tenant_id,
app_id=app.id,
workflow_id=workflow.id,
- type="workflow",
+ type=ModelWorkflowType.WORKFLOW,
triggered_from="app-run",
version="1.0.0",
graph=json.dumps({"nodes": [], "edges": []}),
@@ -1497,9 +1498,9 @@ class TestWorkflowAppLogQueryService:
total_steps=3,
created_by_role=CreatorUserRole.ACCOUNT,
created_by=account.id,
- created_at=datetime.now(UTC) + timedelta(minutes=i * 10 + j),
finished_at=datetime.now(UTC) + timedelta(minutes=i * 10 + j + 1),
)
+ workflow_run.created_at = datetime.now(UTC) + timedelta(minutes=i * 10 + j)
db_session_with_containers.add(workflow_run)
db_session_with_containers.flush()
run_ids_by_app[app.id].add(workflow_run.id)
diff --git a/api/tests/e2e_tests/containers/services/test_workflow_run_service.py b/api/tests/e2e_tests/containers/services/test_workflow_run_service.py
index 8f78bd98b01..0c1642b7ac7 100644
--- a/api/tests/e2e_tests/containers/services/test_workflow_run_service.py
+++ b/api/tests/e2e_tests/containers/services/test_workflow_run_service.py
@@ -8,6 +8,7 @@ from faker import Faker
from sqlalchemy import Engine
from sqlalchemy.orm import Session, sessionmaker
+from graphon.enums import WorkflowNodeExecutionStatus
from machinery.context import RequestContext
from models.enums import ConversationFromSource, ConversationStatus, CreatorUserRole
from models.model import (
@@ -16,6 +17,7 @@ from models.model import (
Message,
)
from models.workflow import WorkflowRun
+from models.workflow import WorkflowType as ModelWorkflowType
from repositories.factory import DifyAPIRepositoryFactory
from repositories.sqlalchemy_api_workflow_run_repository import DifyAPISQLAlchemyWorkflowRunRepository
from services.app_service import AppService, CreateAppParams
@@ -146,7 +148,7 @@ class TestWorkflowRunService:
tenant_id=app.tenant_id,
app_id=app.id,
workflow_id=str(uuid.uuid4()),
- type="chat",
+ type=ModelWorkflowType("chat"),
triggered_from=triggered_from,
version="1.0.0",
graph=json.dumps({"nodes": [], "edges": []}),
@@ -158,9 +160,9 @@ class TestWorkflowRunService:
total_steps=3,
created_by_role=CreatorUserRole.ACCOUNT,
created_by=account.id,
- created_at=created_time,
finished_at=created_time,
)
+ workflow_run.created_at = created_time
db_session_with_containers.add(workflow_run)
db_session_with_containers.commit()
@@ -521,13 +523,13 @@ class TestWorkflowRunService:
title=f"Node {i}",
inputs=json.dumps({"input": f"test_input_{i}"}),
process_data=json.dumps({"process": f"test_process_{i}"}),
- status="succeeded",
+ status=WorkflowNodeExecutionStatus.SUCCEEDED,
elapsed_time=0.5,
execution_metadata=json.dumps({"tokens": 50}),
created_by_role=CreatorUserRole.ACCOUNT,
created_by=account.id,
- created_at=datetime.now(UTC),
)
+ node_execution.created_at = datetime.now(UTC)
db_session_with_containers.add(node_execution)
node_executions.append(node_execution)
@@ -543,13 +545,13 @@ class TestWorkflowRunService:
title="Paused Node",
inputs=json.dumps({"input": "paused"}),
process_data=json.dumps({"process": "paused"}),
- status="paused",
+ status=WorkflowNodeExecutionStatus.PAUSED,
elapsed_time=0.5,
execution_metadata=json.dumps({"tokens": 0}),
created_by_role=CreatorUserRole.ACCOUNT,
created_by=account.id,
- created_at=datetime.now(UTC),
)
+ paused_node_execution.created_at = datetime.now(UTC)
db_session_with_containers.add(paused_node_execution)
db_session_with_containers.commit()
diff --git a/api/tests/e2e_tests/containers/services/test_workflow_service.py b/api/tests/e2e_tests/containers/services/test_workflow_service.py
index 86945178042..0ff2a85d4cb 100644
--- a/api/tests/e2e_tests/containers/services/test_workflow_service.py
+++ b/api/tests/e2e_tests/containers/services/test_workflow_service.py
@@ -144,12 +144,12 @@ class TestWorkflowService:
type=WorkflowType.WORKFLOW,
version=Workflow.VERSION_DRAFT,
graph=json.dumps({"nodes": [], "edges": []}),
- features=json.dumps({"features": []}),
+ _features=json.dumps({"features": []}),
# unique_hash is a computed property based on graph and features
created_by=account.id,
updated_by=account.id,
- environment_variables=[],
- conversation_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
)
db_session_with_containers.add(workflow)
@@ -969,11 +969,11 @@ class TestWorkflowService:
type=WorkflowType.WORKFLOW,
version="2026.03.19.001",
graph=json.dumps({"nodes": [], "edges": []}),
- features=json.dumps(legacy_features),
+ _features=json.dumps(legacy_features),
created_by=account.id,
updated_by=account.id,
- environment_variables=[],
- conversation_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
)
draft_workflow = Workflow(
id=fake.uuid4(),
@@ -982,11 +982,11 @@ class TestWorkflowService:
type=WorkflowType.WORKFLOW,
version=Workflow.VERSION_DRAFT,
graph=json.dumps({"nodes": [], "edges": []}),
- features=json.dumps({}),
+ _features=json.dumps({}),
created_by=account.id,
updated_by=account.id,
- environment_variables=[],
- conversation_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
)
db_session_with_containers.add(published_workflow)
db_session_with_containers.add(draft_workflow)
diff --git a/api/tests/e2e_tests/containers/services/tools/test_workflow_tools_manage_service.py b/api/tests/e2e_tests/containers/services/tools/test_workflow_tools_manage_service.py
index d1ad8a7b03c..ae4cdc90602 100644
--- a/api/tests/e2e_tests/containers/services/tools/test_workflow_tools_manage_service.py
+++ b/api/tests/e2e_tests/containers/services/tools/test_workflow_tools_manage_service.py
@@ -10,6 +10,7 @@ from sqlalchemy.orm import Session
from core.tools.entities.tool_entities import WorkflowToolParameterConfiguration
from models.tools import WorkflowToolProvider
from models.workflow import Workflow as WorkflowModel
+from models.workflow import WorkflowType
from services.app_service import AppService, CreateAppParams
from services.tools.workflow_tools_manage_service import WorkflowToolManageService
from tests.e2e_tests.containers.helpers import accounts as account_fixtures
@@ -111,13 +112,13 @@ class TestWorkflowToolManageService:
workflow = WorkflowModel(
tenant_id=tenant.id,
app_id=app.id,
- type="workflow",
+ type=WorkflowType.WORKFLOW,
version="1.0.0",
graph=json.dumps({}),
- features=json.dumps({}),
+ _features=json.dumps({}),
created_by=account.id,
- environment_variables=[],
- conversation_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
)
db_session_with_containers.add(workflow)
diff --git a/api/tests/e2e_tests/containers/services/workflow/test_workflow_deletion.py b/api/tests/e2e_tests/containers/services/workflow/test_workflow_deletion.py
index 3c70dea134f..24317df3629 100644
--- a/api/tests/e2e_tests/containers/services/workflow/test_workflow_deletion.py
+++ b/api/tests/e2e_tests/containers/services/workflow/test_workflow_deletion.py
@@ -11,6 +11,7 @@ from models.account import Account, Tenant, TenantAccountJoin
from models.model import App
from models.tools import WorkflowToolProvider
from models.workflow import Workflow
+from models.workflow import WorkflowType as ModelWorkflowType
from services.workflow_ref_service import WorkflowRef
from services.workflow_service import DraftWorkflowDeletionError, WorkflowInUseError, WorkflowService
@@ -73,7 +74,7 @@ class TestWorkflowDeletion:
id=str(uuid4()),
tenant_id=tenant.id,
app_id=app.id,
- type="workflow",
+ type=ModelWorkflowType("workflow"),
version=version,
graph=json.dumps({"nodes": [], "edges": []}),
_features=json.dumps({}),
diff --git a/api/tests/e2e_tests/containers/services/workflow/test_workflow_event_snapshot_service.py b/api/tests/e2e_tests/containers/services/workflow/test_workflow_event_snapshot_service.py
index d41d3740a46..0e7a92c9225 100644
--- a/api/tests/e2e_tests/containers/services/workflow/test_workflow_event_snapshot_service.py
+++ b/api/tests/e2e_tests/containers/services/workflow/test_workflow_event_snapshot_service.py
@@ -17,10 +17,10 @@ from core.workflow.nodes.human_input.enums import HumanInputFormStatus, ValueSou
from core.workflow.nodes.human_input.pause_reason import HumanInputRequired
from graphon.enums import WorkflowExecutionStatus
from graphon.runtime import RuntimeState, VariablePool
-from models.enums import CreatorUserRole
+from models.enums import CreatorUserRole, WorkflowRunTriggeredFrom
from models.human_input import HumanInputForm
from models.model import AppMode
-from models.workflow import WorkflowRun
+from models.workflow import WorkflowRun, WorkflowType
from repositories.entities.workflow_pause import WorkflowPauseEntity
from services.workflow_event_snapshot_service import _build_snapshot_events
@@ -89,13 +89,13 @@ def _build_resumption_context(workflow_run_id: str) -> WorkflowResumptionContext
def _build_workflow_run(workflow_run_id: str) -> WorkflowRun:
- return WorkflowRun(
+ workflow_run = WorkflowRun(
id=workflow_run_id,
tenant_id=str(uuid4()),
app_id=str(uuid4()),
workflow_id=str(uuid4()),
- type="workflow",
- triggered_from="app-run",
+ type=WorkflowType.WORKFLOW,
+ triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
version="v1",
graph=None,
inputs="{}",
@@ -107,8 +107,9 @@ def _build_workflow_run(workflow_run_id: str) -> WorkflowRun:
total_steps=0,
created_by_role=CreatorUserRole.END_USER,
created_by=str(uuid4()),
- created_at=datetime(2024, 1, 1, tzinfo=UTC),
)
+ workflow_run.created_at = datetime(2024, 1, 1, tzinfo=UTC)
+ return workflow_run
def test_build_snapshot_events_resolves_variable_select_options(db_session_with_containers: Session) -> None:
diff --git a/api/tests/e2e_tests/containers/services/workflow/test_workflow_node_execution_service_repository.py b/api/tests/e2e_tests/containers/services/workflow/test_workflow_node_execution_service_repository.py
index 32b76c34695..d1b35237dc2 100644
--- a/api/tests/e2e_tests/containers/services/workflow/test_workflow_node_execution_service_repository.py
+++ b/api/tests/e2e_tests/containers/services/workflow/test_workflow_node_execution_service_repository.py
@@ -55,11 +55,11 @@ class TestSQLAlchemyWorkflowNodeExecutionServiceRepository:
error=None,
elapsed_time=0.0,
execution_metadata="{}",
- created_at=created_at,
created_by_role=CreatorUserRole.ACCOUNT,
created_by=str(uuid4()),
finished_at=None,
)
+ execution.created_at = created_at
db_session_with_containers.add(execution)
db_session_with_containers.commit()
return execution
diff --git a/api/tests/e2e_tests/containers/tasks/test_mail_human_input_delivery_task.py b/api/tests/e2e_tests/containers/tasks/test_mail_human_input_delivery_task.py
index a2600d2605e..6f5b20c4683 100644
--- a/api/tests/e2e_tests/containers/tasks/test_mail_human_input_delivery_task.py
+++ b/api/tests/e2e_tests/containers/tasks/test_mail_human_input_delivery_task.py
@@ -134,8 +134,8 @@ def _create_workflow_pause_state(
status=WorkflowExecutionStatus.PAUSED,
created_by_role=CreatorUserRole.ACCOUNT,
created_by=account_id,
- created_at=datetime.now(UTC),
)
+ workflow_run.created_at = datetime.now(UTC)
db_session_with_containers.add(workflow_run)
runtime_state = RuntimeState(workflow_id="test-workflow", variable_pool=variable_pool, start_at=0.0)
diff --git a/api/tests/e2e_tests/containers/tasks/test_rag_pipeline_run_tasks.py b/api/tests/e2e_tests/containers/tasks/test_rag_pipeline_run_tasks.py
index 91792e6f81d..ce7ee8669e0 100644
--- a/api/tests/e2e_tests/containers/tasks/test_rag_pipeline_run_tasks.py
+++ b/api/tests/e2e_tests/containers/tasks/test_rag_pipeline_run_tasks.py
@@ -14,6 +14,7 @@ from core.rag.pipeline.queue import TenantIsolatedTaskQueue
from models import Account, AccountStatus, Tenant, TenantAccountJoin, TenantAccountRole, TenantStatus
from models.dataset import Pipeline
from models.workflow import Workflow
+from models.workflow import WorkflowType as ModelWorkflowType
from tasks.rag_pipeline.priority_rag_pipeline_run_task import (
priority_rag_pipeline_run_task,
run_single_rag_pipeline_task,
@@ -98,16 +99,16 @@ class TestRagPipelineRunTasks:
id=str(uuid.uuid4()),
tenant_id=tenant.id,
app_id=str(uuid.uuid4()),
- type="workflow",
+ type=ModelWorkflowType("workflow"),
version="draft",
graph="{}",
- features="{}",
+ _features="{}",
marked_name=fake.company(),
marked_comment=fake.text(max_nb_chars=100),
created_by=account.id,
- environment_variables=[],
- conversation_variables=[],
- rag_pipeline_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
+ _rag_pipeline_variables=[],
)
db_session_with_containers.add(workflow)
db_session_with_containers.commit()
diff --git a/api/tests/e2e_tests/containers/test_workflow_pause_integration.py b/api/tests/e2e_tests/containers/test_workflow_pause_integration.py
index 6e4ac8c0aef..dc7c228675f 100644
--- a/api/tests/e2e_tests/containers/test_workflow_pause_integration.py
+++ b/api/tests/e2e_tests/containers/test_workflow_pause_integration.py
@@ -36,6 +36,7 @@ from models import WorkflowPause as WorkflowPauseModel
from models.account import AccountStatus, Tenant, TenantAccountJoin, TenantAccountRole, TenantStatus
from models.model import UploadFile
from models.workflow import Workflow, WorkflowRun
+from models.workflow import WorkflowType as ModelWorkflowType
from repositories.sqlalchemy_api_workflow_run_repository import (
DifyAPISQLAlchemyWorkflowRunRepository,
_WorkflowRunError,
@@ -216,13 +217,13 @@ class TestWorkflowPauseIntegration:
id=self.test_workflow_id,
tenant_id=self.test_tenant_id,
app_id=self.test_app_id,
- type="workflow",
+ type=ModelWorkflowType("workflow"),
version="draft",
graph='{"nodes": [], "edges": []}',
- features='{"file_upload": {"enabled": false}}',
+ _features='{"file_upload": {"enabled": false}}',
created_by=self.test_user_id,
- created_at=naive_utc_now(),
)
+ self.test_workflow.created_at = naive_utc_now()
# Store session instance
self.session = db_session_with_containers
@@ -271,14 +272,14 @@ class TestWorkflowPauseIntegration:
tenant_id=self.test_tenant_id,
app_id=self.test_app_id,
workflow_id=self.test_workflow_id,
- type="workflow",
+ type=ModelWorkflowType("workflow"),
triggered_from="debugging",
version="draft",
status=status,
created_by=self.test_user_id,
created_by_role="account",
- created_at=naive_utc_now(),
)
+ workflow_run.created_at = naive_utc_now()
self.session.add(workflow_run)
self.session.commit()
return workflow_run
@@ -724,13 +725,13 @@ class TestWorkflowPauseIntegration:
id=str(uuid.uuid4()),
tenant_id=tenant2.id,
app_id=str(uuid.uuid4()),
- type="workflow",
+ type=ModelWorkflowType("workflow"),
version="draft",
graph='{"nodes": [], "edges": []}',
- features='{"file_upload": {"enabled": false}}',
+ _features='{"file_upload": {"enabled": false}}',
created_by=account2.id,
- created_at=naive_utc_now(),
)
+ workflow2.created_at = naive_utc_now()
self.session.add(workflow2)
self.session.commit()
@@ -741,14 +742,14 @@ class TestWorkflowPauseIntegration:
tenant_id=tenant2.id,
app_id=workflow2.app_id,
workflow_id=workflow2.id,
- type="workflow",
+ type=ModelWorkflowType("workflow"),
triggered_from="debugging",
version="draft",
status=WorkflowExecutionStatus.RUNNING,
created_by=account2.id,
created_by_role="account",
- created_at=naive_utc_now(),
)
+ workflow_run2.created_at = naive_utc_now()
self.session.add(workflow_run2)
self.session.commit()
diff --git a/api/tests/e2e_tests/contracts/controllers/service_api/app/test_message_suggested_questions.py b/api/tests/e2e_tests/contracts/controllers/service_api/app/test_message_suggested_questions.py
index 5d4200326f9..b5ef6c019c0 100644
--- a/api/tests/e2e_tests/contracts/controllers/service_api/app/test_message_suggested_questions.py
+++ b/api/tests/e2e_tests/contracts/controllers/service_api/app/test_message_suggested_questions.py
@@ -238,7 +238,7 @@ def test_admitted_identity_and_mode_return_empty_questions_for_invalid_provider_
type=WorkflowType.CHAT,
version="published",
graph='{"nodes":[],"edges":[]}',
- features='{"suggested_questions_after_answer":{"enabled":true}}',
+ _features='{"suggested_questions_after_answer":{"enabled":true}}',
created_by=str(uuid4()),
)
session.add(workflow)
diff --git a/api/tests/e2e_tests/contracts/core/test_file.py b/api/tests/e2e_tests/contracts/core/test_file.py
index eab0176f419..dff4a7f3efc 100644
--- a/api/tests/e2e_tests/contracts/core/test_file.py
+++ b/api/tests/e2e_tests/contracts/core/test_file.py
@@ -2,6 +2,7 @@ import json
from graphon.file import File, FileTransferMethod, FileType, FileUploadConfig
from models.workflow import Workflow
+from models.workflow import WorkflowType as ModelWorkflowType
def test_file_to_dict():
@@ -31,13 +32,13 @@ def test_workflow_features_with_image():
workflow = Workflow(
tenant_id="tenant-1",
app_id="app-1",
- type="chat",
+ type=ModelWorkflowType("chat"),
version="1.0",
graph="{}",
- features=json.dumps(features),
+ _features=json.dumps(features),
created_by="user-1",
- environment_variables=[],
- conversation_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
)
# Get the converted features through the property
diff --git a/api/tests/unit_tests/commands/test_retention.py b/api/tests/unit_tests/commands/test_retention.py
index f19f2cb59a8..db2b51262a7 100644
--- a/api/tests/unit_tests/commands/test_retention.py
+++ b/api/tests/unit_tests/commands/test_retention.py
@@ -69,28 +69,27 @@ class ArchiveDatabase:
) -> str:
run_id = str(uuid4())
with self.session_maker.begin() as session:
- session.add(
- WorkflowRun(
- id=run_id,
- tenant_id=tenant_id,
- app_id=str(uuid4()),
- workflow_id=str(uuid4()),
- type=run_type,
- triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
- version="1",
- graph="{}",
- inputs="{}",
- status=status,
- outputs="{}",
- error=None,
- elapsed_time=0,
- total_tokens=0,
- total_steps=1,
- created_by_role=CreatorUserRole.ACCOUNT,
- created_by=str(uuid4()),
- created_at=created_at or self.end_before - datetime.timedelta(days=1),
- )
+ workflow_record = WorkflowRun(
+ id=run_id,
+ tenant_id=tenant_id,
+ app_id=str(uuid4()),
+ workflow_id=str(uuid4()),
+ type=run_type,
+ triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
+ version="1",
+ graph="{}",
+ inputs="{}",
+ status=status,
+ outputs="{}",
+ error=None,
+ elapsed_time=0,
+ total_tokens=0,
+ total_steps=1,
+ created_by_role=CreatorUserRole.ACCOUNT,
+ created_by=str(uuid4()),
)
+ workflow_record.created_at = created_at or self.end_before - datetime.timedelta(days=1)
+ session.add(workflow_record)
return run_id
def add_node(self, run_id: str, tenant_id: str, *, index: int) -> None:
diff --git a/api/tests/unit_tests/controllers/console/app/test_app.py b/api/tests/unit_tests/controllers/console/app/test_app.py
index ee34f58eed1..0436472cd8c 100644
--- a/api/tests/unit_tests/controllers/console/app/test_app.py
+++ b/api/tests/unit_tests/controllers/console/app/test_app.py
@@ -910,21 +910,22 @@ def _app(
def _workflow(
*, app_id: str = _APP_RESPONSE_MODELS_APP_ID, tenant_id: str = _APP_RESPONSE_MODELS_TENANT_ID
) -> Workflow:
- return Workflow(
+ workflow_record = Workflow(
id=WORKFLOW_ID,
tenant_id=tenant_id,
app_id=app_id,
type=WorkflowType.CHAT,
version=Workflow.VERSION_DRAFT,
graph=json.dumps({"nodes": [], "edges": []}),
- features=json.dumps({}),
+ _features=json.dumps({}),
created_by=ACCOUNT_ID,
- created_at=_ts(8),
updated_by=ACCOUNT_ID,
- updated_at=_ts(9),
- environment_variables=[],
- conversation_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
)
+ workflow_record.updated_at = _ts(9)
+ workflow_record.created_at = _ts(8)
+ return workflow_record
def _persist_response_graph(session: Session) -> _app_response_models_App:
diff --git a/api/tests/unit_tests/controllers/console/app/test_workflow.py b/api/tests/unit_tests/controllers/console/app/test_workflow.py
index e66027d8f24..33db0588532 100644
--- a/api/tests/unit_tests/controllers/console/app/test_workflow.py
+++ b/api/tests/unit_tests/controllers/console/app/test_workflow.py
@@ -120,17 +120,17 @@ def _make_workflow(**overrides) -> Workflow:
type=WorkflowType.WORKFLOW,
version="1",
graph=json.dumps(graph),
- features=json.dumps(features),
+ _features=json.dumps(features),
marked_name="Release 1",
marked_comment="Initial release",
created_by="user-1",
- created_at=datetime(2024, 1, 1, 12, 0, 0),
updated_by=None,
- updated_at=datetime(2024, 1, 1, 12, 1, 0),
- environment_variables=[],
- conversation_variables=[],
- rag_pipeline_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
+ _rag_pipeline_variables=[],
)
+ workflow.created_at = datetime(2024, 1, 1, 12, 0, 0)
+ workflow.updated_at = datetime(2024, 1, 1, 12, 1, 0)
if environment_variables and isinstance(environment_variables[0], dict):
workflow._environment_variables = json.dumps(
{str(index): value for index, value in enumerate(environment_variables)}
diff --git a/api/tests/unit_tests/controllers/console/app/test_workflow_run.py b/api/tests/unit_tests/controllers/console/app/test_workflow_run.py
index 8a11d913c30..6fb5ebc1057 100644
--- a/api/tests/unit_tests/controllers/console/app/test_workflow_run.py
+++ b/api/tests/unit_tests/controllers/console/app/test_workflow_run.py
@@ -208,10 +208,10 @@ def _workflow_run_summary(session: Session, **overrides: object) -> WorkflowRun:
total_steps=2,
created_by_role=CreatorUserRole.ACCOUNT,
created_by="account-1",
- created_at=created_at,
finished_at=created_at,
exceptions_count=0,
)
+ workflow_run.created_at = created_at
for name, value in overrides.items():
setattr(workflow_run, name, value)
workflow_run.retry_index = 0
@@ -243,11 +243,11 @@ def _workflow_run_node_execution(session: Session) -> WorkflowNodeExecutionModel
error=None,
elapsed_time=1.0,
execution_metadata=json.dumps({"total_tokens": 3}),
- created_at=created_at,
created_by_role=CreatorUserRole.ACCOUNT,
created_by="account-1",
finished_at=created_at,
)
+ execution.created_at = created_at
execution.offload_data = []
session.add(execution)
session.commit()
diff --git a/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_workflow.py b/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_workflow.py
index 9aa06e3b934..301fabf13f0 100644
--- a/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_workflow.py
+++ b/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_workflow.py
@@ -294,15 +294,15 @@ def _make_workflow(**overrides: object) -> Workflow:
marked_name="Release 1",
marked_comment="Initial release",
graph=json.dumps({"nodes": [], "edges": []}),
- features=json.dumps({"file_upload": {"enabled": False}}),
+ _features=json.dumps({"file_upload": {"enabled": False}}),
created_by=_RAG_PIPELINE_WORKFLOW_DEFAULT_WORKFLOW_CREATED_BY,
- created_at=datetime(2024, 1, 1, 12, 0, 0),
updated_by=None,
- updated_at=datetime(2024, 1, 1, 12, 1, 0),
- environment_variables=[],
- conversation_variables=[],
- rag_pipeline_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
+ _rag_pipeline_variables=[],
)
+ workflow.created_at = datetime(2024, 1, 1, 12, 0, 0)
+ workflow.updated_at = datetime(2024, 1, 1, 12, 1, 0)
for key, value in overrides.items():
setattr(workflow, key, value)
return workflow
@@ -870,10 +870,12 @@ def make_node_execution(**overrides: Unpack[NodeExecutionOverrides]) -> Workflow
"finished_at": datetime(2026, 1, 1, 0, 0, 1),
}
payload.update(overrides)
+ created_at = payload.pop("created_at")
execution = WorkflowNodeExecutionModel(
triggered_from=WorkflowNodeExecutionTriggeredFrom.RAG_PIPELINE_RUN,
**payload,
)
+ execution.created_at = created_at
execution.offload_data = []
return execution
@@ -902,7 +904,25 @@ def default_workflow_payload() -> WorkflowFactoryPayload:
def make_workflow(**overrides: Unpack[WorkflowFactoryOverrides]) -> Workflow:
payload = default_workflow_payload()
payload.update(overrides)
- return Workflow(**payload)
+ workflow = Workflow(
+ id=payload["id"],
+ tenant_id=payload["tenant_id"],
+ app_id=payload["app_id"],
+ type=WorkflowType(payload["type"]),
+ version=payload["version"],
+ marked_name=payload["marked_name"],
+ marked_comment=payload["marked_comment"],
+ graph=payload["graph"],
+ _features=payload["features"],
+ created_by=payload["created_by"],
+ updated_by=payload["updated_by"],
+ _environment_variables=payload["environment_variables"],
+ _conversation_variables=payload["conversation_variables"],
+ _rag_pipeline_variables=payload["rag_pipeline_variables"],
+ )
+ workflow.created_at = payload["created_at"]
+ workflow.updated_at = payload["updated_at"]
+ return workflow
def _rag_pipeline_workflow_apis_make_account(
diff --git a/api/tests/unit_tests/controllers/console/explore/test_installed_app.py b/api/tests/unit_tests/controllers/console/explore/test_installed_app.py
index a43d7e6f787..26b9951f374 100644
--- a/api/tests/unit_tests/controllers/console/explore/test_installed_app.py
+++ b/api/tests/unit_tests/controllers/console/explore/test_installed_app.py
@@ -146,11 +146,11 @@ def _publish(session: Session, app: App) -> None:
kind=WorkflowKind.STANDARD,
version="1",
graph='{"nodes":[],"edges":[]}',
- features="{}",
+ _features="{}",
created_by=str(uuid4()),
- environment_variables=[],
- conversation_variables=[],
- rag_pipeline_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
+ _rag_pipeline_variables=[],
)
session.add(workflow)
session.flush()
diff --git a/api/tests/unit_tests/controllers/console/explore/test_installed_app_admission.py b/api/tests/unit_tests/controllers/console/explore/test_installed_app_admission.py
index 91f93fd9ef9..5381c521e52 100644
--- a/api/tests/unit_tests/controllers/console/explore/test_installed_app_admission.py
+++ b/api/tests/unit_tests/controllers/console/explore/test_installed_app_admission.py
@@ -28,12 +28,13 @@ from controllers.console.explore.installed_app_admission import get_installed_ap
from controllers.console.flask_admission import console_account_admission
from enums import DeploymentEdition, WebAppAccessMode
from extensions.ext_login import DifyLoginManager, unauthorized_handler
-from graphon.enums import WorkflowExecutionStatus, WorkflowType
+from graphon.enums import WorkflowExecutionStatus
from libs.external_api import ExternalApi
from machinery.context import RequestContext
from models import Account, App, AppMode, InstalledApp, Tenant, WorkflowRun
from models.account import AccountStatus
from models.enums import CreatorUserRole, WorkflowRunTriggeredFrom
+from models.workflow import WorkflowType as ModelWorkflowType
from repositories.installed_app_repository import SQLAlchemyInstalledAppRepository
from services.app_task_service import AppTaskControlService
from services.installed_app_access_service import InstalledAppAccessService, InstalledAppRef
@@ -571,7 +572,7 @@ def running_workflow(
app_id=harness.target_app.id,
workflow_id=str(uuid4()),
task_id=_WORKFLOW_TASK_ID,
- type=WorkflowType.CHAT,
+ type=ModelWorkflowType.CHAT,
triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
version="1",
status=WorkflowExecutionStatus.RUNNING,
diff --git a/api/tests/unit_tests/controllers/console/explore/test_workflow.py b/api/tests/unit_tests/controllers/console/explore/test_workflow.py
index 0290978f50a..f9e710204a5 100644
--- a/api/tests/unit_tests/controllers/console/explore/test_workflow.py
+++ b/api/tests/unit_tests/controllers/console/explore/test_workflow.py
@@ -16,6 +16,7 @@ from graphon.model_runtime.errors.invoke import InvokeError
from models import App, AppMode, InstalledApp, Tenant
from models.enums import CreatorUserRole, WorkflowRunTriggeredFrom
from models.workflow import WorkflowRun
+from models.workflow import WorkflowType as ModelWorkflowType
from repositories.installed_app_repository import SQLAlchemyInstalledAppRepository
from services.account_errors import AccountNotFoundError
from services.app_definition_query_service import AppDefinitionUnavailableError
@@ -114,7 +115,7 @@ def runtime(
app_id=harness.target_app.id,
workflow_id="workflow-1",
task_id=_TASK_ID,
- type=WorkflowType.WORKFLOW,
+ type=ModelWorkflowType(WorkflowType.WORKFLOW),
triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
version="1",
status=WorkflowExecutionStatus.RUNNING,
diff --git a/api/tests/unit_tests/controllers/console/test_human_input_form.py b/api/tests/unit_tests/controllers/console/test_human_input_form.py
index d44c6c81585..ea86f6ae535 100644
--- a/api/tests/unit_tests/controllers/console/test_human_input_form.py
+++ b/api/tests/unit_tests/controllers/console/test_human_input_form.py
@@ -33,6 +33,7 @@ from models.enums import CreatorUserRole, WorkflowRunTriggeredFrom
from models.human_input import RecipientType
from models.model import App, AppMode
from models.workflow import WorkflowRun
+from models.workflow import WorkflowType as ModelWorkflowType
from services.enterprise.rbac_service import RBACService
from services.entities.app_entities import AppAgentBinding
from tests.helpers.unit.config_override import apply_config_overrides
@@ -66,12 +67,12 @@ def _workflow_run(
created_by: str = "user-1",
finished_at: datetime | None = None,
) -> WorkflowRun:
- return WorkflowRun(
+ workflow_run = WorkflowRun(
id="run-1",
tenant_id="t1",
app_id="app-1",
workflow_id="workflow-1",
- type=WorkflowType.WORKFLOW,
+ type=ModelWorkflowType(WorkflowType.WORKFLOW),
triggered_from=WorkflowRunTriggeredFrom.DEBUGGING,
version="draft",
graph="{}",
@@ -79,9 +80,10 @@ def _workflow_run(
status=WorkflowExecutionStatus.SUCCEEDED if finished_at else WorkflowExecutionStatus.RUNNING,
created_by_role=created_by_role,
created_by=created_by,
- created_at=datetime(2024, 1, 1, tzinfo=UTC),
finished_at=finished_at,
)
+ workflow_run.created_at = datetime(2024, 1, 1, tzinfo=UTC)
+ return workflow_run
def test_jsonify_form_definition() -> None:
diff --git a/api/tests/unit_tests/controllers/inner_api/app/test_app.py b/api/tests/unit_tests/controllers/inner_api/app/test_app.py
index 930e3af8c1c..06a357037d4 100644
--- a/api/tests/unit_tests/controllers/inner_api/app/test_app.py
+++ b/api/tests/unit_tests/controllers/inner_api/app/test_app.py
@@ -134,18 +134,20 @@ def _agent(
def _workflow(app: App, *, version: str, created_by: str, entry_node_type: str = "start", **kwargs: object) -> Workflow:
- return Workflow(
+ workflow = Workflow(
tenant_id=app.tenant_id,
app_id=app.id,
type=WorkflowType.WORKFLOW,
version=version,
graph=json.dumps({"nodes": [{"id": "entry", "data": {"type": entry_node_type}}], "edges": []}),
- features="{}",
- environment_variables=[],
- conversation_variables=[],
+ _features="{}",
+ _environment_variables=[],
+ _conversation_variables=[],
created_by=created_by,
- **kwargs,
)
+ for name, value in kwargs.items():
+ setattr(workflow, name, value)
+ return workflow
def _snapshot(
@@ -398,21 +400,28 @@ def _detail(app: Flask, app_id: str) -> EnterpriseAppDetailResponse:
return EnterpriseAppDetailResponse.model_validate(_detail_raw(app, app_id))
-def _run(app: App, status: WorkflowExecutionStatus, created_at: datetime, **kwargs: object) -> WorkflowRun:
- return WorkflowRun(
+def _run(
+ app: App,
+ status: WorkflowExecutionStatus,
+ created_at: datetime,
+ *,
+ triggered_from: WorkflowRunTriggeredFrom = WorkflowRunTriggeredFrom.APP_RUN,
+) -> WorkflowRun:
+ run = WorkflowRun(
tenant_id=app.tenant_id,
app_id=app.id,
workflow_id=app.workflow_id or str(uuid4()),
type=WorkflowType.WORKFLOW,
- triggered_from=kwargs.pop("triggered_from", WorkflowRunTriggeredFrom.APP_RUN),
+ triggered_from=triggered_from,
version="v",
graph="{}",
inputs="{}",
status=status,
created_by_role=CreatorUserRole.END_USER,
created_by=str(uuid4()),
- created_at=created_at,
)
+ run.created_at = created_at
+ return run
def _message(app_id: str, status: MessageStatus, created_at: datetime, invoke_from: InvokeFrom) -> Message:
diff --git a/api/tests/unit_tests/controllers/openapi/test_app_dsl.py b/api/tests/unit_tests/controllers/openapi/test_app_dsl.py
index e4e72e5b2df..2739901140a 100644
--- a/api/tests/unit_tests/controllers/openapi/test_app_dsl.py
+++ b/api/tests/unit_tests/controllers/openapi/test_app_dsl.py
@@ -162,7 +162,7 @@ def test_export_reads_draft_hash_before_building_dsl(
type=WorkflowType.WORKFLOW,
version=Workflow.VERSION_DRAFT,
graph='{"nodes": [], "edges": []}',
- features="{}",
+ _features="{}",
created_by="account-1",
)
sqlite_session.add(draft)
@@ -532,7 +532,7 @@ def test_export_errors_have_canonical_http_responses(
type=WorkflowType.WORKFLOW,
version=Workflow.VERSION_DRAFT,
graph='{"nodes": [], "edges": []}',
- features="{}",
+ _features="{}",
created_by="account-id",
)
)
diff --git a/api/tests/unit_tests/controllers/openapi/test_app_release.py b/api/tests/unit_tests/controllers/openapi/test_app_release.py
index 2aea06fd7aa..368ab8bf342 100644
--- a/api/tests/unit_tests/controllers/openapi/test_app_release.py
+++ b/api/tests/unit_tests/controllers/openapi/test_app_release.py
@@ -18,7 +18,7 @@ def _draft(*, saved_at: datetime, graph: str = _GRAPH) -> Workflow:
type=WorkflowType.WORKFLOW,
version=Workflow.VERSION_DRAFT,
graph=graph,
- features="{}",
+ _features="{}",
created_by="account-1",
)
draft.updated_at = saved_at
@@ -26,7 +26,9 @@ def _draft(*, saved_at: datetime, graph: str = _GRAPH) -> Workflow:
def _run(*, status: WorkflowExecutionStatus = WorkflowExecutionStatus.SUCCEEDED, graph: str = _GRAPH) -> WorkflowRun:
- return WorkflowRun(status=status, graph=graph, created_at=_RUN_STARTED)
+ run = WorkflowRun(status=status, graph=graph)
+ run.created_at = _RUN_STARTED
+ return run
def test_a_passing_run_on_the_unchanged_draft_counts() -> None:
diff --git a/api/tests/unit_tests/controllers/service_api/app/test_workflow.py b/api/tests/unit_tests/controllers/service_api/app/test_workflow.py
index 08383852191..5170ca1a881 100644
--- a/api/tests/unit_tests/controllers/service_api/app/test_workflow.py
+++ b/api/tests/unit_tests/controllers/service_api/app/test_workflow.py
@@ -82,7 +82,7 @@ def _make_workflow_run(
created_at: datetime | None = None,
finished_at: datetime | None = None,
) -> WorkflowRun:
- return WorkflowRun(
+ workflow_run = WorkflowRun(
id=run_id,
tenant_id=tenant_id,
app_id=app_id,
@@ -100,10 +100,11 @@ def _make_workflow_run(
total_steps=1,
created_by_role=CreatorUserRole.END_USER,
created_by="end-user-1",
- created_at=created_at or datetime(2026, 1, 1, tzinfo=UTC),
finished_at=finished_at or datetime(2026, 1, 1, tzinfo=UTC),
exceptions_count=0,
)
+ workflow_run.created_at = created_at or datetime(2026, 1, 1, tzinfo=UTC)
+ return workflow_run
def _make_workflow_app_log(
diff --git a/api/tests/unit_tests/controllers/service_api/app/test_workflow_events.py b/api/tests/unit_tests/controllers/service_api/app/test_workflow_events.py
index d1a8f2277e2..e4356ea2064 100644
--- a/api/tests/unit_tests/controllers/service_api/app/test_workflow_events.py
+++ b/api/tests/unit_tests/controllers/service_api/app/test_workflow_events.py
@@ -47,6 +47,7 @@ from models.enums import CreatorUserRole, EndUserType, MessageStatus, WorkflowRu
from models.human_input import HumanInputForm
from models.model import App, AppMode, EndUser
from models.workflow import Workflow, WorkflowRun, WorkflowType
+from models.workflow import WorkflowType as ModelWorkflowType
from repositories.api_workflow_node_execution_repository import WorkflowNodeExecutionSnapshot
from repositories.entities.workflow_pause import WorkflowPauseEntity
from services.app_generate_service import AppGenerateService
@@ -124,11 +125,11 @@ def _workflow(*, workflow_id: str = "workflow-id", app_id: str = "app-id", tenan
type=WorkflowType.WORKFLOW,
version="1",
graph=json.dumps({"nodes": [], "edges": []}),
- features="{}",
+ _features="{}",
created_by="owner-id",
- environment_variables=[],
- conversation_variables=[],
- rag_pipeline_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
+ _rag_pipeline_variables=[],
)
@@ -267,12 +268,12 @@ class _FakePauseEntity(WorkflowPauseEntity):
def _build_workflow_run(status: WorkflowExecutionStatus) -> WorkflowRun:
- return WorkflowRun(
+ workflow_record = WorkflowRun(
id="run-1",
tenant_id="tenant-1",
app_id="app-1",
workflow_id="workflow-1",
- type="workflow",
+ type=ModelWorkflowType.WORKFLOW,
triggered_from="app-run",
version="v1",
graph=None,
@@ -285,8 +286,9 @@ def _build_workflow_run(status: WorkflowExecutionStatus) -> WorkflowRun:
total_steps=0,
created_by_role=CreatorUserRole.END_USER,
created_by="user-1",
- created_at=datetime(2024, 1, 1, tzinfo=UTC),
)
+ workflow_record.created_at = datetime(2024, 1, 1, tzinfo=UTC)
+ return workflow_record
def _build_snapshot(status: WorkflowNodeExecutionStatus) -> WorkflowNodeExecutionSnapshot:
@@ -823,7 +825,7 @@ def _workflow_events_end_user() -> EndUser:
def _workflow_run(*, created_by_role: CreatorUserRole = CreatorUserRole.END_USER) -> WorkflowRun:
- return WorkflowRun(
+ run = WorkflowRun(
id="run-1",
tenant_id="tenant-1",
app_id="app-1",
@@ -841,8 +843,9 @@ def _workflow_run(*, created_by_role: CreatorUserRole = CreatorUserRole.END_USER
total_steps=0,
created_by_role=created_by_role,
created_by="end-user-1" if created_by_role == CreatorUserRole.END_USER else "account-1",
- created_at=datetime(2026, 1, 1, tzinfo=UTC),
)
+ run.created_at = datetime(2026, 1, 1, tzinfo=UTC)
+ return run
def _workflow_events_mock_repo_for_run(monkeypatch: pytest.MonkeyPatch, workflow_run, sqlite_engine: Engine):
diff --git a/api/tests/unit_tests/controllers/web/test_workflow_events.py b/api/tests/unit_tests/controllers/web/test_workflow_events.py
index acfaf804f7e..ea7d4ba9fb6 100644
--- a/api/tests/unit_tests/controllers/web/test_workflow_events.py
+++ b/api/tests/unit_tests/controllers/web/test_workflow_events.py
@@ -32,7 +32,7 @@ def _workflow_run(
created_by: str = "eu-1",
finished_at: datetime | None = None,
) -> WorkflowRun:
- return WorkflowRun(
+ workflow_run = WorkflowRun(
id="run-1",
tenant_id="tenant-1",
app_id=app_id,
@@ -50,9 +50,10 @@ def _workflow_run(
total_steps=0,
created_by_role=created_by_role,
created_by=created_by,
- created_at=datetime(2024, 1, 1),
finished_at=finished_at,
)
+ workflow_run.created_at = datetime(2024, 1, 1)
+ return workflow_run
# ---------------------------------------------------------------------------
diff --git a/api/tests/unit_tests/controllers/web/test_wraps.py b/api/tests/unit_tests/controllers/web/test_wraps.py
index c93753a2b67..25313dd78df 100644
--- a/api/tests/unit_tests/controllers/web/test_wraps.py
+++ b/api/tests/unit_tests/controllers/web/test_wraps.py
@@ -95,11 +95,11 @@ def _harness(
type=WorkflowType.CHAT,
version="published" if published else "draft",
graph='{"nodes":[]}',
- features="{}",
+ _features="{}",
created_by=str(uuid4()),
- environment_variables=[],
- conversation_variables=[],
- rag_pipeline_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
+ _rag_pipeline_variables=[],
)
if published:
app.workflow_id = workflow.id
diff --git a/api/tests/unit_tests/core/app/app_config/workflow_ui_based_app/variables/test_manager.py b/api/tests/unit_tests/core/app/app_config/workflow_ui_based_app/variables/test_manager.py
index f73205b7dcc..51e4b48258c 100644
--- a/api/tests/unit_tests/core/app/app_config/workflow_ui_based_app/variables/test_manager.py
+++ b/api/tests/unit_tests/core/app/app_config/workflow_ui_based_app/variables/test_manager.py
@@ -199,7 +199,7 @@ class TestWorkflowVariablesConfigManagerConvertRag:
def test_rag_pipeline_none(self, mock_workflow: Workflow) -> None:
# Arrange
- mock_workflow._rag_pipeline_variables = None # pyrefly: ignore[bad-argument-type]
+ mock_workflow._rag_pipeline_variables = None
# Act
result = WorkflowVariablesConfigManager.convert_rag_pipeline_variable(mock_workflow, "node1")
diff --git a/api/tests/unit_tests/core/app/apps/advanced_chat/test_app_generator.py b/api/tests/unit_tests/core/app/apps/advanced_chat/test_app_generator.py
index 9663f197699..61e032d8706 100644
--- a/api/tests/unit_tests/core/app/apps/advanced_chat/test_app_generator.py
+++ b/api/tests/unit_tests/core/app/apps/advanced_chat/test_app_generator.py
@@ -100,7 +100,7 @@ def _app_generator_make_workflow(
type=WorkflowType.CHAT,
version=_app_generator_Workflow.VERSION_DRAFT,
graph="{}",
- features=json.dumps(features or {}),
+ _features=json.dumps(features or {}),
created_by="user",
)
@@ -1869,7 +1869,7 @@ def _pause_resume_make_workflow() -> _pause_resume_Workflow:
type=WorkflowType.CHAT,
version=_pause_resume_Workflow.VERSION_DRAFT,
graph="{}",
- features="{}",
+ _features="{}",
created_by="user",
)
diff --git a/api/tests/unit_tests/core/app/apps/advanced_chat/test_app_runner.py b/api/tests/unit_tests/core/app/apps/advanced_chat/test_app_runner.py
index 8e90f19e04a..0d3c1324070 100644
--- a/api/tests/unit_tests/core/app/apps/advanced_chat/test_app_runner.py
+++ b/api/tests/unit_tests/core/app/apps/advanced_chat/test_app_runner.py
@@ -56,7 +56,7 @@ def _runner(workflow_variables: list[object]) -> AdvancedChatAppRunner:
type=WorkflowType.CHAT,
version=Workflow.VERSION_DRAFT,
graph="{}",
- features="{}",
+ _features="{}",
created_by="44444444-4444-4444-4444-444444444444",
)
workflow.conversation_variables = workflow_variables
@@ -214,7 +214,7 @@ class TestAppRunnerInputModerationCases:
type=WorkflowType.CHAT,
version=Workflow.VERSION_DRAFT,
graph=json.dumps(MINIMAL_GRAPH),
- features="{}",
+ _features="{}",
created_by=str(uuid4()),
)
diff --git a/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_task_pipeline.py b/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_task_pipeline.py
index b7f94f6acf9..6b69b3ef5bc 100644
--- a/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_task_pipeline.py
+++ b/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_task_pipeline.py
@@ -69,6 +69,7 @@ from models.enums import CreatorUserRole, MessageStatus, WorkflowRunTriggeredFro
from models.execution_extra_content import HumanInputContent
from models.model import AppMode, EndUser, Message, MessageFile
from models.workflow import WorkflowRun
+from models.workflow import WorkflowType as ModelWorkflowType
from repositories.sqlalchemy_api_workflow_run_repository import DifyAPISQLAlchemyWorkflowRunRepository
from tests.workflow_test_utils import build_test_variable_pool
@@ -163,7 +164,7 @@ def test_handle_workflow_paused_event_does_not_overwrite_a_concurrent_stop(
app_id="app-1",
workflow_id="workflow-1",
task_id="task-1",
- type=WorkflowType.CHAT,
+ type=ModelWorkflowType(WorkflowType.CHAT),
triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
version="1",
status=WorkflowExecutionStatus.PAUSED,
diff --git a/api/tests/unit_tests/core/app/apps/test_base_app_generator.py b/api/tests/unit_tests/core/app/apps/test_base_app_generator.py
index 890d8edb5dd..b1f0f9c1d88 100644
--- a/api/tests/unit_tests/core/app/apps/test_base_app_generator.py
+++ b/api/tests/unit_tests/core/app/apps/test_base_app_generator.py
@@ -8,7 +8,8 @@ from sqlalchemy.orm import Session
from core.app.apps.base_app_generator import BaseAppGenerator
from graphon.enums import BuiltinNodeTypes, WorkflowExecutionStatus
from graphon.variables.input_entities import VariableEntity, VariableEntityType
-from models import CreatorUserRole, Workflow, WorkflowRun, WorkflowRunTriggeredFrom, WorkflowType
+from models import CreatorUserRole, Workflow, WorkflowRun, WorkflowRunTriggeredFrom
+from models.workflow import WorkflowType as ModelWorkflowType
def _workflow_run(*, graph: str | None) -> WorkflowRun:
@@ -17,7 +18,7 @@ def _workflow_run(*, graph: str | None) -> WorkflowRun:
tenant_id="tenant-1",
app_id="app-1",
workflow_id="workflow-1",
- type=WorkflowType.CHAT,
+ type=ModelWorkflowType.CHAT,
triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
version="1",
graph=graph,
diff --git a/api/tests/unit_tests/core/app/apps/test_workflow_app_runner.py b/api/tests/unit_tests/core/app/apps/test_workflow_app_runner.py
index 9a565925dc0..5768e5f3d45 100644
--- a/api/tests/unit_tests/core/app/apps/test_workflow_app_runner.py
+++ b/api/tests/unit_tests/core/app/apps/test_workflow_app_runner.py
@@ -107,6 +107,7 @@ from models.execution_extra_content import HumanInputContent
from models.human_input import HumanInputForm
from models.model import AppMode
from models.workflow import Workflow, WorkflowKind, WorkflowNodeExecutionTriggeredFrom
+from models.workflow import WorkflowType as ModelWorkflowType
from services.workflow_run_agg import WorkflowRunAgg
from services.workflow_run_index import WorkflowRunIndex
from tests.helpers.unit.model_factories import make_workflow
@@ -1134,7 +1135,7 @@ class TestWorkflowAppRunnerSingleNodeCases:
tenant_id="tenant",
app_id="app",
id="workflow",
- type="workflow",
+ type=ModelWorkflowType.WORKFLOW,
version="v1",
graph=json.dumps({"nodes": [], "edges": []}),
)
@@ -1284,7 +1285,7 @@ class TestWorkflowAppRunnerSingleNodeCases:
tenant_id="tenant",
app_id="app",
id="workflow",
- type="workflow",
+ type=ModelWorkflowType.WORKFLOW,
version="v1",
graph=json.dumps({"nodes": [], "edges": []}),
kind=WorkflowKind.SNIPPET,
diff --git a/api/tests/unit_tests/core/app/apps/workflow/test_generate_task_pipeline.py b/api/tests/unit_tests/core/app/apps/workflow/test_generate_task_pipeline.py
index a01c791fb64..ede492abc76 100644
--- a/api/tests/unit_tests/core/app/apps/workflow/test_generate_task_pipeline.py
+++ b/api/tests/unit_tests/core/app/apps/workflow/test_generate_task_pipeline.py
@@ -105,7 +105,7 @@ def _build_pipeline(run_id: str, unbound_session_factory: sessionmaker[Session])
type=WorkflowType.WORKFLOW,
version=Workflow.VERSION_DRAFT,
graph="{}",
- features=json.dumps({}),
+ _features=json.dumps({}),
created_by="user-id",
)
user = Account(name="user", email="[email protected]")
diff --git a/api/tests/unit_tests/core/llm_generator/test_llm_generator.py b/api/tests/unit_tests/core/llm_generator/test_llm_generator.py
index 64709e5bacd..ba36023dc0c 100644
--- a/api/tests/unit_tests/core/llm_generator/test_llm_generator.py
+++ b/api/tests/unit_tests/core/llm_generator/test_llm_generator.py
@@ -140,11 +140,11 @@ def _persist_node_execution(
error="",
elapsed_time=0.1,
execution_metadata=json.dumps({"agent_log": agent_log}),
- created_at=datetime(2026, 1, 1),
created_by_role=CreatorUserRole.ACCOUNT,
created_by=str(uuid4()),
finished_at=datetime(2026, 1, 1),
)
+ execution.created_at = datetime(2026, 1, 1)
database.add(execution)
database.commit()
return execution
diff --git a/api/tests/unit_tests/core/memory/test_token_buffer_memory.py b/api/tests/unit_tests/core/memory/test_token_buffer_memory.py
index 211a0fe4484..da9449b7d6a 100644
--- a/api/tests/unit_tests/core/memory/test_token_buffer_memory.py
+++ b/api/tests/unit_tests/core/memory/test_token_buffer_memory.py
@@ -199,7 +199,7 @@ def _persist_workflow(database: Database, *, workflow_id: str) -> Workflow:
type=WorkflowType.CHAT,
version="1",
graph="{}",
- features="{}",
+ _features="{}",
created_by="account-1",
)
database.session.add(workflow)
diff --git a/api/tests/unit_tests/core/ops/entities/test_trace_entity.py b/api/tests/unit_tests/core/ops/entities/test_trace_entity.py
index 695578109d7..cd93af24c6f 100644
--- a/api/tests/unit_tests/core/ops/entities/test_trace_entity.py
+++ b/api/tests/unit_tests/core/ops/entities/test_trace_entity.py
@@ -31,7 +31,7 @@ def _bind_trace_database(
def _make_workflow_run() -> WorkflowRun:
- return WorkflowRun(
+ workflow_run = WorkflowRun(
workflow_id="wf-1",
tenant_id="tenant-1",
id="run-1",
@@ -45,7 +45,6 @@ def _make_workflow_run() -> WorkflowRun:
error=None,
total_tokens=0,
total_steps=0,
- created_at=datetime(2026, 1, 1, 0, 0, 0),
finished_at=datetime(2026, 1, 1, 0, 0, 1),
triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
app_id="app-1",
@@ -53,6 +52,8 @@ def _make_workflow_run() -> WorkflowRun:
created_by="user-1",
exceptions_count=0,
)
+ workflow_run.created_at = datetime(2026, 1, 1, 0, 0, 0)
+ return workflow_run
def _make_message_data():
diff --git a/api/tests/unit_tests/core/ops/test_ops_trace_manager.py b/api/tests/unit_tests/core/ops/test_ops_trace_manager.py
index db5a0e38ee6..34783f46478 100644
--- a/api/tests/unit_tests/core/ops/test_ops_trace_manager.py
+++ b/api/tests/unit_tests/core/ops/test_ops_trace_manager.py
@@ -1221,9 +1221,9 @@ class TestOpsTraceManagerCases:
total_steps=1,
created_by_role=CreatorUserRole.ACCOUNT,
created_by="user-1",
- created_at=datetime(2025, 2, 20, 10, 0, 0),
finished_at=datetime(2025, 2, 20, 10, 0, 5),
)
+ workflow_run.created_at = datetime(2025, 2, 20, 10, 0, 0)
database.add_all([log, workflow_run])
database.commit()
repo = DifyAPISQLAlchemyWorkflowRunRepository(sqlite_session_factory)
diff --git a/api/tests/unit_tests/core/ops/unified_trace/test_trace_builder.py b/api/tests/unit_tests/core/ops/unified_trace/test_trace_builder.py
index 799fdb4be33..7997b87ae18 100644
--- a/api/tests/unit_tests/core/ops/unified_trace/test_trace_builder.py
+++ b/api/tests/unit_tests/core/ops/unified_trace/test_trace_builder.py
@@ -29,6 +29,7 @@ from core.ops.unified_trace.trace_builder import (
resolve_session_id,
)
from extensions.ext_database import db
+from graphon.enums import WorkflowNodeExecutionStatus
from models import Account
from models.enums import CreatorUserRole
from models.workflow import WorkflowNodeExecutionModel, WorkflowNodeExecutionTriggeredFrom
@@ -69,38 +70,37 @@ class TestWorkflowToolExportBoundaryCases:
]
):
is_outer = execution_id == "outer-tool"
- sqlite_session.add(
- WorkflowNodeExecutionModel(
- id=execution_id,
- tenant_id="tenant-1",
- app_id=app_id,
- workflow_id=f"{app_id}-workflow",
- workflow_run_id="run-1",
- triggered_from_workflow_id=None if is_outer else "caller-app-workflow",
- triggered_from_node_execution_id=None if is_outer else "outer-tool",
- triggered_from=origin,
- index=index,
- node_execution_id=execution_id,
- node_id=execution_id,
- node_type="tool" if is_outer else "llm",
- title=execution_id,
- inputs=json.dumps(public_inputs if is_outer else {"secret": "private source input"}),
- outputs=json.dumps(public_outputs if is_outer else {"text": "private source output"}),
- process_data=json.dumps(
- {}
- if is_outer
- else {
- "prompts": [{"role": "system", "text": "private source prompt"}],
- "workflow_tool_root_app_id": "caller-app",
- }
- ),
- status="succeeded",
- elapsed_time=1,
- created_at=started_at,
- created_by_role=CreatorUserRole.ACCOUNT,
- created_by="account-1",
- )
+ node_record = WorkflowNodeExecutionModel(
+ id=execution_id,
+ tenant_id="tenant-1",
+ app_id=app_id,
+ workflow_id=f"{app_id}-workflow",
+ workflow_run_id="run-1",
+ triggered_from_workflow_id=None if is_outer else "caller-app-workflow",
+ triggered_from_node_execution_id=None if is_outer else "outer-tool",
+ triggered_from=origin,
+ index=index,
+ node_execution_id=execution_id,
+ node_id=execution_id,
+ node_type="tool" if is_outer else "llm",
+ title=execution_id,
+ inputs=json.dumps(public_inputs if is_outer else {"secret": "private source input"}),
+ outputs=json.dumps(public_outputs if is_outer else {"text": "private source output"}),
+ process_data=json.dumps(
+ {}
+ if is_outer
+ else {
+ "prompts": [{"role": "system", "text": "private source prompt"}],
+ "workflow_tool_root_app_id": "caller-app",
+ }
+ ),
+ status=WorkflowNodeExecutionStatus.SUCCEEDED,
+ elapsed_time=1,
+ created_by_role=CreatorUserRole.ACCOUNT,
+ created_by="account-1",
)
+ node_record.created_at = started_at
+ sqlite_session.add(node_record)
sqlite_session.commit()
info = WorkflowTraceInfo(
tenant_id="tenant-1",
diff --git a/api/tests/unit_tests/core/repositories/test_sqlalchemy_workflow_execution_repository.py b/api/tests/unit_tests/core/repositories/test_sqlalchemy_workflow_execution_repository.py
index ffac4ada98e..8f288337f0e 100644
--- a/api/tests/unit_tests/core/repositories/test_sqlalchemy_workflow_execution_repository.py
+++ b/api/tests/unit_tests/core/repositories/test_sqlalchemy_workflow_execution_repository.py
@@ -253,9 +253,9 @@ class TestSqlalchemyWorkflowExecutionRepositoryCases:
exceptions_count=1,
created_by_role=_sqlalchemy_workflow_execution_repository_CreatorUserRole.ACCOUNT,
created_by=account.id,
- created_at=datetime.now(UTC),
finished_at=datetime.now(UTC),
)
+ db_model.created_at = datetime.now(UTC)
sqlite_session.add(db_model)
sqlite_session.commit()
sqlite_session.expunge_all()
@@ -774,7 +774,7 @@ class TestWorkflowControlPersistenceCases:
tenant_id="tenant-1",
app_id="app-1",
workflow_id="workflow-1",
- type=WorkflowType.WORKFLOW,
+ type=ModelWorkflowType.WORKFLOW,
triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
version="1",
status=WorkflowExecutionStatus.STOPPED,
diff --git a/api/tests/unit_tests/core/repositories/test_sqlalchemy_workflow_node_execution_repository.py b/api/tests/unit_tests/core/repositories/test_sqlalchemy_workflow_node_execution_repository.py
index be042e7aa9f..1636c1d77f0 100644
--- a/api/tests/unit_tests/core/repositories/test_sqlalchemy_workflow_node_execution_repository.py
+++ b/api/tests/unit_tests/core/repositories/test_sqlalchemy_workflow_node_execution_repository.py
@@ -1179,10 +1179,10 @@ class TestWorkflowNodeExecutionTruncationCases:
error=None,
elapsed_time=1.0,
execution_metadata="{}",
- created_at=datetime.now(UTC),
finished_at=None,
- offload_data=[],
)
+ db_model.offload_data = []
+ db_model.created_at = datetime.now(UTC)
domain_model = repo._to_domain_model(db_model)
@@ -1225,9 +1225,8 @@ class TestWorkflowNodeExecutionTruncationCases:
def test_truncated_properties_without_offload_data(self):
"""Test truncated properties when no offload data exists."""
- model = _workflow_node_execution_truncation_WorkflowNodeExecutionModel(
- offload_data=[],
- )
+ model = _workflow_node_execution_truncation_WorkflowNodeExecutionModel()
+ model.offload_data = []
assert model.inputs_truncated is False
assert model.outputs_truncated is False
diff --git a/api/tests/unit_tests/core/workflow/nodes/agent_v2/test_session_store.py b/api/tests/unit_tests/core/workflow/nodes/agent_v2/test_session_store.py
index 8f79940188b..5efbad139e7 100644
--- a/api/tests/unit_tests/core/workflow/nodes/agent_v2/test_session_store.py
+++ b/api/tests/unit_tests/core/workflow/nodes/agent_v2/test_session_store.py
@@ -2,6 +2,7 @@ import json
from collections.abc import Iterator
from contextlib import nullcontext
from dataclasses import replace
+from datetime import datetime
from types import SimpleNamespace
from unittest.mock import MagicMock, patch
@@ -12,6 +13,8 @@ from dify_agent.runtime_backend.errors import SharedWorkspaceUnsupportedError
from sqlalchemy import Engine, event, func, select
from sqlalchemy.orm import Session, sessionmaker
+from core.repositories.sqlalchemy_workflow_node_execution_repository import SQLAlchemyWorkflowNodeExecutionRepository
+from core.workflow.node_execution import WorkflowNodeExecution
from core.workflow.node_execution_process_data import WORKFLOW_TOOL_ROOT_APP_ID_KEY
from core.workflow.nodes.agent_v2.session_store import (
WorkflowAgentSessionScope,
@@ -30,6 +33,7 @@ from models.agent import (
from models.enums import CreatorUserRole, WorkflowRunTriggeredFrom
from models.model import App, AppMode, IconType
from models.workflow import WorkflowNodeExecutionModel, WorkflowNodeExecutionTriggeredFrom, WorkflowRun
+from models.workflow import WorkflowType as ModelWorkflowType
from repositories.app.agent_sandbox_repository import AgentSandboxRepository
from repositories.sqlalchemy_api_workflow_node_execution_repository import (
DifyAPISQLAlchemyWorkflowNodeExecutionRepository,
@@ -37,6 +41,7 @@ from repositories.sqlalchemy_api_workflow_node_execution_repository import (
from repositories.sqlalchemy_api_workflow_run_repository import DifyAPISQLAlchemyWorkflowRunRepository
from services.agent.workspace_service import AgentWorkspaceNotFoundError, AgentWorkspaceService
from services.app_service import AppService
+from tests.helpers.unit.model_factories import make_account
def _scope() -> WorkflowAgentSessionScope:
@@ -473,6 +478,65 @@ def test_load_or_create_persists_binding_on_node_execution(
assert persisted_binding.base_home_snapshot_id == home_snapshot_id
+def test_node_completion_preserves_workspace_binding_and_sandbox_access(
+ monkeypatch: pytest.MonkeyPatch,
+ sqlite_session_factory: sessionmaker[Session],
+) -> None:
+ scope = _scope()
+ repository = SQLAlchemyWorkflowNodeExecutionRepository(
+ sqlite_session_factory,
+ scope.tenant_id,
+ make_account(),
+ scope.app_id,
+ WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
+ )
+ execution = WorkflowNodeExecution(
+ id=scope.node_execution_id,
+ node_execution_id=scope.node_execution_id,
+ workflow_id=scope.workflow_id,
+ workflow_execution_id=scope.workflow_run_id,
+ index=1,
+ node_id=scope.node_id,
+ node_type="agent",
+ title="Agent",
+ status=WorkflowNodeExecutionStatus.RUNNING,
+ created_at=datetime(2026, 9, 23),
+ )
+ repository.save_synchronously(execution)
+ _install_backend_client(monkeypatch)
+ stored = WorkflowAgentWorkspaceStore().load_or_create_node_execution_session(scope, home_snapshot_id=None)
+
+ execution.status = WorkflowNodeExecutionStatus.SUCCEEDED
+ execution.outputs = {"result": "completed"}
+ execution.process_data = {"result": "completed"}
+ execution.elapsed_time = 1.0
+ execution.finished_at = datetime(2026, 9, 23, 0, 0, 1)
+ assert repository._to_db_model(execution).agent_workspace_binding_id is None
+ repository.save(execution)
+
+ with sqlite_session_factory() as session:
+ persisted = session.get(WorkflowNodeExecutionModel, execution.id)
+ assert persisted is not None
+ assert persisted.agent_workspace_binding_id == stored.binding_id
+ assert persisted.status == WorkflowNodeExecutionStatus.SUCCEEDED
+ assert persisted.outputs_dict == {"result": "completed"}
+ assert persisted.process_data_dict == {
+ "result": "completed",
+ "workflow_agent_binding_id": scope.workflow_agent_binding_id,
+ }
+ assert persisted.elapsed_time == 1.0
+ assert persisted.finished_at == execution.finished_at
+ binding = AgentSandboxRepository._resolve_workflow_binding(
+ tenant_id=scope.tenant_id,
+ app_id=scope.app_id,
+ workflow_run_id="run-1",
+ node_id=scope.node_id,
+ node_execution_id=scope.node_execution_id,
+ session=session,
+ )
+ assert binding.backend_binding_ref == stored.backend_binding_ref
+
+
def test_load_existing_pointer_rejects_missing_workflow_identity(sqlite_session: Session) -> None:
execution = _execution_row(binding_id="binding-1", process_data={"existing": "value"})
sqlite_session.add(execution)
@@ -696,7 +760,7 @@ def test_retire_workflow_tool_workspace_follows_persisted_run_owner(
tenant_id="tenant-1",
app_id="app-1",
workflow_id="workflow-1",
- type=WorkflowType.WORKFLOW,
+ type=ModelWorkflowType(WorkflowType.WORKFLOW),
triggered_from=WorkflowRunTriggeredFrom.DEBUGGING,
version="1",
graph="{}",
@@ -807,7 +871,7 @@ def test_deleting_paused_root_app_retires_and_deletes_nested_participants(
tenant_id="tenant-1",
app_id="app-1",
workflow_id="workflow-1",
- type=WorkflowType.WORKFLOW,
+ type=ModelWorkflowType(WorkflowType.WORKFLOW),
triggered_from=WorkflowRunTriggeredFrom.DEBUGGING,
version="1",
graph="{}",
diff --git a/api/tests/unit_tests/enterprise/telemetry/test_draft_trace.py b/api/tests/unit_tests/enterprise/telemetry/test_draft_trace.py
index 2f6926c90de..5068dd14311 100644
--- a/api/tests/unit_tests/enterprise/telemetry/test_draft_trace.py
+++ b/api/tests/unit_tests/enterprise/telemetry/test_draft_trace.py
@@ -27,7 +27,7 @@ def _make_execution(**overrides: object) -> WorkflowNodeExecutionModel:
outputs = overrides.get("outputs_dict", {"answer": "world"})
process_data = overrides.get("process_data_dict", {})
metadata = overrides.get("execution_metadata_dict", {})
- return WorkflowNodeExecutionModel(
+ execution = WorkflowNodeExecutionModel(
id=cast(str, overrides.get("id", "exec-1")),
tenant_id=cast(str, overrides.get("tenant_id", "tenant-1")),
app_id=cast(str, overrides.get("app_id", "app-1")),
@@ -48,7 +48,6 @@ def _make_execution(**overrides: object) -> WorkflowNodeExecutionModel:
error=cast(str | None, overrides.get("error")),
elapsed_time=cast(float, overrides.get("elapsed_time", 1.5)),
execution_metadata=json.dumps(metadata),
- created_at=cast(datetime, overrides.get("created_at", datetime(2024, 1, 1, tzinfo=UTC))),
created_by_role=CreatorUserRole.ACCOUNT,
created_by="user-1",
finished_at=cast(
@@ -56,6 +55,8 @@ def _make_execution(**overrides: object) -> WorkflowNodeExecutionModel:
overrides.get("finished_at", datetime(2024, 1, 1, 0, 0, 5, tzinfo=UTC)),
),
)
+ execution.created_at = cast(datetime, overrides.get("created_at", datetime(2024, 1, 1, tzinfo=UTC)))
+ return execution
# ---------------------------------------------------------------------------
diff --git a/api/tests/unit_tests/events/event_handlers/test_delete_tool_parameters_cache_when_sync_draft_workflow.py b/api/tests/unit_tests/events/event_handlers/test_delete_tool_parameters_cache_when_sync_draft_workflow.py
index 7b13f337611..98fb9f44b72 100644
--- a/api/tests/unit_tests/events/event_handlers/test_delete_tool_parameters_cache_when_sync_draft_workflow.py
+++ b/api/tests/unit_tests/events/event_handlers/test_delete_tool_parameters_cache_when_sync_draft_workflow.py
@@ -6,7 +6,7 @@ from core.tools.errors import ToolProviderNotFoundError
from events.event_handlers import delete_tool_parameters_cache_when_sync_draft_workflow as handler_module
from graphon.nodes.tool.entities import ToolEntity, ToolProviderType
from models.model import App, AppMode, IconType
-from models.workflow import Workflow
+from models.workflow import Workflow, WorkflowType
def test_missing_tool_provider_does_not_log_error_traceback(
@@ -29,13 +29,13 @@ def test_missing_tool_provider_does_not_log_error_traceback(
workflow = Workflow(
tenant_id=app.tenant_id,
app_id=app.id,
- type="workflow",
+ type=WorkflowType.WORKFLOW,
version="draft",
graph='{"nodes": [{"id": "node-id", "data": {"type": "tool"}}]}',
- features="{}",
+ _features="{}",
created_by="account-id",
- environment_variables=[],
- conversation_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
)
tool_entity = ToolEntity(
provider_type=ToolProviderType.MCP,
diff --git a/api/tests/unit_tests/fields/test_workflow_draft_variable_fields.py b/api/tests/unit_tests/fields/test_workflow_draft_variable_fields.py
index aaf556dd784..c941310b626 100644
--- a/api/tests/unit_tests/fields/test_workflow_draft_variable_fields.py
+++ b/api/tests/unit_tests/fields/test_workflow_draft_variable_fields.py
@@ -37,15 +37,15 @@ class TestWorkflowDraftVariableFields:
# Create mock objects with relationships pre-loaded
mock_variable = WorkflowDraftVariable(
file_id="test-file-id",
- variable_file=WorkflowDraftVariableFile(
- size=100000,
- length=50,
- value_type=SegmentType.OBJECT,
- upload_file_id="test-upload-file-id",
- tenant_id=str(uuid.uuid4()),
- app_id=str(uuid.uuid4()),
- user_id=str(uuid.uuid4()),
- ),
+ )
+ mock_variable.variable_file = WorkflowDraftVariableFile(
+ size=100000,
+ length=50,
+ value_type=SegmentType.OBJECT,
+ upload_file_id="test-upload-file-id",
+ tenant_id=str(uuid.uuid4()),
+ app_id=str(uuid.uuid4()),
+ user_id=str(uuid.uuid4()),
)
# Mock the file helpers
diff --git a/api/tests/unit_tests/models/test_workflow.py b/api/tests/unit_tests/models/test_workflow.py
index 000f83b1687..b3c2af1396b 100644
--- a/api/tests/unit_tests/models/test_workflow.py
+++ b/api/tests/unit_tests/models/test_workflow.py
@@ -8,8 +8,8 @@ from uuid import NAMESPACE_URL, UUID, uuid4, uuid5
import pytest
from pydantic import JsonValue
-from sqlalchemy import select
-from sqlalchemy.orm import Session
+from sqlalchemy import inspect, select
+from sqlalchemy.orm import Session, configure_mappers
from constants import HIDDEN_VALUE
from core.helper import encrypter
@@ -34,6 +34,7 @@ from graphon.variables.segments import IntegerSegment, Segment
from models import ConversationVariable
from models import Workflow as _workflow_feature_compatibility_Workflow
from models.account import Account
+from models.base import Base, TypeBase
from models.enums import CreatorUserRole, EndUserType, ExecutionOffLoadType, WorkflowRunTriggeredFrom
from models.model import EndUser, UploadFile
from models.tools import WorkflowToolProvider
@@ -52,8 +53,10 @@ from models.workflow import (
WorkflowNodeExecutionTriggeredFrom,
WorkflowRun,
WorkflowType,
+ WorkflowVersionCounter,
is_system_variable_editable,
)
+from models.workflow import WorkflowType as ModelWorkflowType
class TestConversationVariableCases:
@@ -107,13 +110,13 @@ class TestWorkflowCases:
workflow = _workflow_Workflow(
tenant_id="tenant_id",
app_id="app_id",
- type="workflow",
+ type=ModelWorkflowType("workflow"),
version="draft",
graph="{}",
- features="{}",
+ _features="{}",
created_by="account_id",
- environment_variables=[],
- conversation_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
)
# Create some EnvironmentVariable instances
@@ -138,13 +141,13 @@ class TestWorkflowCases:
workflow = _workflow_Workflow(
tenant_id="tenant_id",
app_id="app_id",
- type="workflow",
+ type=ModelWorkflowType("workflow"),
version="draft",
graph="{}",
- features="{}",
+ _features="{}",
created_by="account_id",
- environment_variables=[],
- conversation_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
)
variable = LLMEnvironmentVariable(
name="for_research",
@@ -167,13 +170,13 @@ class TestWorkflowCases:
workflow = _workflow_Workflow(
tenant_id="tenant_id",
app_id="app_id",
- type="workflow",
+ type=ModelWorkflowType("workflow"),
version="draft",
graph="{}",
- features="{}",
+ _features="{}",
created_by="account_id",
- environment_variables=[],
- conversation_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
)
# Create some EnvironmentVariable instances
@@ -220,13 +223,13 @@ class TestWorkflowCases:
workflow = _workflow_Workflow(
tenant_id="tenant_id",
app_id="app_id",
- type="workflow",
+ type=ModelWorkflowType("workflow"),
version="draft",
graph="{}",
- features="{}",
+ _features="{}",
created_by="account_id",
- environment_variables=[],
- conversation_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
)
# Create some EnvironmentVariable instances
@@ -261,13 +264,13 @@ class TestWorkflowCases:
workflow = _workflow_Workflow(
tenant_id="tenant_id",
app_id="app_id",
- type="workflow",
+ type=ModelWorkflowType("workflow"),
version="draft",
graph="{}",
- features="{}",
+ _features="{}",
created_by="created-account-id",
- environment_variables=[],
- conversation_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
updated_by="updated-account-id",
)
sqlite_session.add_all([decoy_account, updated_account, workflow, created_account])
@@ -282,13 +285,13 @@ class TestWorkflowCases:
workflow = _workflow_Workflow(
tenant_id="tenant_id",
app_id="app_id",
- type="workflow",
+ type=ModelWorkflowType("workflow"),
version="draft",
graph="{}",
- features="{}",
+ _features="{}",
created_by="account_id",
- environment_variables=[],
- conversation_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
)
matching_provider = WorkflowToolProvider(
name="matching-provider",
@@ -656,10 +659,10 @@ class TestWorkflowFeatureCompatibilityCases:
type="",
version="",
graph="",
- features=json.dumps(OLD_VERSION_WORKFLOW_FEATURES),
+ _features=json.dumps(OLD_VERSION_WORKFLOW_FEATURES),
created_by="",
- environment_variables=[],
- conversation_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
)
assert workflow.features_dict == NEW_VERSION_WORKFLOW_FEATURES
@@ -1716,7 +1719,7 @@ def _execution(role: CreatorUserRole, created_by: str) -> WorkflowNodeExecutionM
inputs=None,
process_data=None,
outputs=None,
- status="succeeded",
+ status=WorkflowNodeExecutionStatus.SUCCEEDED,
error=None,
elapsed_time=0.0,
execution_metadata=None,
@@ -2001,7 +2004,7 @@ def _run(role: CreatorUserRole, created_by: str) -> WorkflowRun:
tenant_id="00000000-0000-0000-0000-000000000001",
app_id="00000000-0000-0000-0000-000000000002",
workflow_id=str(uuid4()),
- type="workflow",
+ type=ModelWorkflowType.WORKFLOW,
triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
version="1.0",
status="succeeded",
@@ -2118,7 +2121,7 @@ def test_normalized_features_preserves_stored_payload_without_dirtying_workflow(
type=WorkflowType.CHAT,
version="published",
graph="{}",
- features=stored_features,
+ _features=stored_features,
created_by=str(uuid4()),
)
sqlite_session.add(workflow)
@@ -2130,3 +2133,46 @@ def test_normalized_features_preserves_stored_payload_without_dirtying_workflow(
sqlite_session.expire(workflow)
assert workflow.serialized_features == stored_features
+
+
+class TestWorkflowTypeBaseCases:
+ @staticmethod
+ def test_workflow_models_use_typebase_registry_and_generated_defaults() -> None:
+ models = (
+ _workflow_Workflow,
+ WorkflowVersionCounter,
+ WorkflowRun,
+ WorkflowNodeExecutionModel,
+ WorkflowDraftVariable,
+ )
+
+ typebase_models = {mapper.class_ for mapper in TypeBase.registry.mappers}
+ base_models = {mapper.class_ for mapper in Base.registry.mappers}
+
+ assert all(model in typebase_models for model in models)
+ assert all(model not in base_models for model in models)
+
+ instances = (_workflow_Workflow(), WorkflowRun(), WorkflowNodeExecutionModel(), WorkflowDraftVariable())
+ assert all(instance.id for instance in instances)
+ assert len({instance.id for instance in instances}) == len(instances)
+ assert isinstance(instances[0].created_at, datetime)
+ assert isinstance(instances[-1].created_at, datetime)
+
+ @staticmethod
+ def test_workflow_constructor_serializes_variable_collections_and_configures_offload_relationship() -> None:
+ workflow = _workflow_Workflow(
+ _features="{}",
+ _environment_variables=[],
+ _conversation_variables=[],
+ _rag_pipeline_variables=[],
+ )
+
+ assert workflow._features == "{}"
+ assert json.loads(workflow._environment_variables) == {}
+ assert json.loads(workflow._conversation_variables) == {}
+ assert json.loads(workflow._rag_pipeline_variables) == {}
+
+ configure_mappers()
+ relationship = inspect(WorkflowNodeExecutionModel).relationships["offload_data"]
+ assert relationship.mapper.class_ is WorkflowNodeExecutionOffload
+ assert relationship.back_populates == "execution"
diff --git a/api/tests/unit_tests/providers/trace/trace-mlflow/src/dify_trace_mlflow/test_mlflow_trace.py b/api/tests/unit_tests/providers/trace/trace-mlflow/src/dify_trace_mlflow/test_mlflow_trace.py
index 060e1e32e59..c0e6dc36868 100644
--- a/api/tests/unit_tests/providers/trace/trace-mlflow/src/dify_trace_mlflow/test_mlflow_trace.py
+++ b/api/tests/unit_tests/providers/trace/trace-mlflow/src/dify_trace_mlflow/test_mlflow_trace.py
@@ -36,7 +36,7 @@ from core.ops.entities.trace_entity import (
ToolTraceInfo,
WorkflowTraceInfo,
)
-from graphon.enums import BuiltinNodeTypes
+from graphon.enums import BuiltinNodeTypes, WorkflowNodeExecutionStatus
from models.model import Message
from models.workflow import WorkflowNodeExecutionModel
@@ -170,10 +170,9 @@ def test_workflow_parent_children_usage_metadata_and_explicit_experiment(
app_id="app",
title=name,
node_type=node_type,
- status="succeeded",
+ status=WorkflowNodeExecutionStatus.SUCCEEDED,
inputs='{"question":"synthetic"}',
outputs='{"text":"answer"}',
- created_at=started + timedelta(milliseconds=index),
elapsed_time=0.1,
process_data=json.dumps(
{
@@ -194,13 +193,15 @@ def test_workflow_parent_children_usage_metadata_and_explicit_experiment(
]
)
]
+ for trace_node_index, trace_node_record in enumerate(nodes):
+ trace_node_record.created_at = started + timedelta(milliseconds=trace_node_index)
monkeypatch.setattr(instance, "_get_workflow_nodes", lambda _run_id: nodes)
info = WorkflowTraceInfo(
workflow_id="workflow",
tenant_id="tenant",
workflow_run_id="run",
workflow_run_elapsed_time=1,
- workflow_run_status="succeeded",
+ workflow_run_status=WorkflowNodeExecutionStatus.SUCCEEDED,
workflow_run_inputs={"q": "synthetic", "sys.hidden": "drop"},
workflow_run_outputs={"answer": "answer"},
workflow_run_version="1",
diff --git a/api/tests/unit_tests/repositories/app/test_console_repository.py b/api/tests/unit_tests/repositories/app/test_console_repository.py
index 91eab436241..fe3e5ecc867 100644
--- a/api/tests/unit_tests/repositories/app/test_console_repository.py
+++ b/api/tests/unit_tests/repositories/app/test_console_repository.py
@@ -297,7 +297,7 @@ def test_draft_trigger_enrichment_is_tenant_scoped_and_tolerates_bad_graphs(
"edges": [],
}
),
- features="{}",
+ _features="{}",
created_by=ACTOR,
)
sqlite_session.add(workflow)
diff --git a/api/tests/unit_tests/repositories/test_app_definition_query_repository.py b/api/tests/unit_tests/repositories/test_app_definition_query_repository.py
index 83017e755f9..81f7779e3e2 100644
--- a/api/tests/unit_tests/repositories/test_app_definition_query_repository.py
+++ b/api/tests/unit_tests/repositories/test_app_definition_query_repository.py
@@ -120,7 +120,7 @@ def test_parameter_config_readers_enforce_the_same_ownership(
type=WorkflowType.WORKFLOW if mode == AppMode.WORKFLOW else WorkflowType.CHAT,
version="1",
graph='{"nodes": []}',
- features='{"opening_statement": "Owned config"}',
+ _features='{"opening_statement": "Owned config"}',
created_by=_ACCOUNT_ID,
)
app.workflow_id = config.id if ownership != "unset" else None
@@ -167,15 +167,15 @@ def test_get_published_parameter_config_returns_workflow_features_and_legacy_inp
id="44444444-4444-4444-4444-444444444444",
tenant_id=_TENANT_ID,
app_id=app.id,
- type=workflow_type,
+ type=WorkflowType(workflow_type),
kind=WorkflowKind.STANDARD,
version="1",
graph=json.dumps({"nodes": [{"id": "start", "data": {"type": "start", "variables": [variable]}}]}),
- features=json.dumps({"opening_statement": "Hello from workflow"}),
+ _features=json.dumps({"opening_statement": "Hello from workflow"}),
created_by=_ACCOUNT_ID,
- environment_variables=[],
- conversation_variables=[],
- rag_pipeline_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
+ _rag_pipeline_variables=[],
)
session.add(workflow)
app.workflow_id = workflow.id
@@ -549,7 +549,7 @@ def test_get_tool_icon_sources_reads_workflow_tools(
id=_WORKFLOW_ID,
tenant_id=_TENANT_ID,
app_id=app.id,
- type=workflow_type,
+ type=WorkflowType(workflow_type),
kind=WorkflowKind.STANDARD,
version="1",
graph=json.dumps(
@@ -560,11 +560,11 @@ def test_get_tool_icon_sources_reads_workflow_tools(
]
}
),
- features="{}",
+ _features="{}",
created_by=_ACCOUNT_ID,
- environment_variables=[],
- conversation_variables=[],
- rag_pipeline_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
+ _rag_pipeline_variables=[],
)
session.add(workflow)
app.workflow_id = workflow.id
diff --git a/api/tests/unit_tests/repositories/test_app_preview_query_repository.py b/api/tests/unit_tests/repositories/test_app_preview_query_repository.py
index 99b5f775f32..a6f1a34ca4d 100644
--- a/api/tests/unit_tests/repositories/test_app_preview_query_repository.py
+++ b/api/tests/unit_tests/repositories/test_app_preview_query_repository.py
@@ -719,7 +719,7 @@ class TestAppPreviewQueryRepositoryCases:
type=WorkflowType.CHAT,
version="published",
graph='{"nodes":[],"edges":[]}',
- features=stored_features,
+ _features=stored_features,
created_by=author.id,
updated_by=updater.id,
marked_name="Release",
diff --git a/api/tests/unit_tests/repositories/test_installed_app_repository.py b/api/tests/unit_tests/repositories/test_installed_app_repository.py
index e6d43679807..4ecf3f65254 100644
--- a/api/tests/unit_tests/repositories/test_installed_app_repository.py
+++ b/api/tests/unit_tests/repositories/test_installed_app_repository.py
@@ -263,11 +263,11 @@ def _app_with_publication(
kind=WorkflowKind.STANDARD,
version="draft",
graph='{"nodes":[],"edges":[]}',
- features="{}",
+ _features="{}",
created_by=str(uuid4()),
- environment_variables=[],
- conversation_variables=[],
- rag_pipeline_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
+ _rag_pipeline_variables=[],
)
session.add(workflow)
app.workflow_id = workflow.id
diff --git a/api/tests/unit_tests/repositories/test_sqlalchemy_api_workflow_node_execution_repository.py b/api/tests/unit_tests/repositories/test_sqlalchemy_api_workflow_node_execution_repository.py
index db351810161..dabdf5e83df 100644
--- a/api/tests/unit_tests/repositories/test_sqlalchemy_api_workflow_node_execution_repository.py
+++ b/api/tests/unit_tests/repositories/test_sqlalchemy_api_workflow_node_execution_repository.py
@@ -99,8 +99,11 @@ def test_workflow_history_and_last_execution_exclude_recursive_tool_nodes(
) -> None:
root_id, child_id = str(uuid4()), str(uuid4())
with sqlite_session_factory.begin() as session:
- session.add_all(
- WorkflowNodeExecutionModel(
+ for execution_id, index, origin in (
+ (root_id, 1, WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN),
+ (child_id, 2, WorkflowNodeExecutionTriggeredFrom.WORKFLOW_TOOL),
+ ):
+ execution = WorkflowNodeExecutionModel(
id=execution_id,
tenant_id="tenant",
app_id="app",
@@ -114,13 +117,9 @@ def test_workflow_history_and_last_execution_exclude_recursive_tool_nodes(
triggered_from=origin,
created_by_role=CreatorUserRole.ACCOUNT,
created_by="account",
- created_at=datetime(2026, 1, 1) + timedelta(seconds=index),
- )
- for execution_id, index, origin in (
- (root_id, 1, WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN),
- (child_id, 2, WorkflowNodeExecutionTriggeredFrom.WORKFLOW_TOOL),
)
- )
+ execution.created_at = datetime(2026, 1, 1) + timedelta(seconds=index)
+ session.add(execution)
repository = DifyAPISQLAlchemyWorkflowNodeExecutionRepository(sqlite_session_factory)
history = repository.get_executions_by_workflow_run(tenant_id="tenant", app_id="app", workflow_run_id="run")
@@ -148,8 +147,8 @@ def test_workflow_tool_children_are_scoped_to_exact_parent_and_run(
("legacy-child", "tenant", "run", "source-app", "start", None, None),
]
with sqlite_session_factory.begin() as session:
- session.add_all(
- WorkflowNodeExecutionModel(
+ for index, (execution_id, tenant, run, app, node_type, owner, engine_id) in enumerate(records):
+ execution = WorkflowNodeExecutionModel(
id=execution_id,
tenant_id=tenant,
app_id=app,
@@ -180,10 +179,9 @@ def test_workflow_tool_children_are_scoped_to_exact_parent_and_run(
),
created_by_role=CreatorUserRole.ACCOUNT,
created_by="account",
- created_at=datetime(2026, 1, 1) + timedelta(seconds=index),
)
- for index, (execution_id, tenant, run, app, node_type, owner, engine_id) in enumerate(records)
- )
+ execution.created_at = datetime(2026, 1, 1) + timedelta(seconds=index)
+ session.add(execution)
session.add(
WorkflowNodeExecutionOffload(
tenant_id="tenant",
diff --git a/api/tests/unit_tests/repositories/test_sqlalchemy_api_workflow_run_repository.py b/api/tests/unit_tests/repositories/test_sqlalchemy_api_workflow_run_repository.py
index 1c90c27b257..b89ebad768a 100644
--- a/api/tests/unit_tests/repositories/test_sqlalchemy_api_workflow_run_repository.py
+++ b/api/tests/unit_tests/repositories/test_sqlalchemy_api_workflow_run_repository.py
@@ -18,6 +18,7 @@ from models import Message
from models.enums import ConversationFromSource, CreatorUserRole, MessageStatus, WorkflowRunTriggeredFrom
from models.human_input import HumanInputForm, HumanInputFormRecipient, RecipientType
from models.workflow import WorkflowPause, WorkflowPauseReason, WorkflowRun
+from models.workflow import WorkflowType as ModelWorkflowType
from repositories.api_workflow_run_repository import AppWorkflowRunStats
from repositories.sqlalchemy_api_workflow_run_repository import (
DifyAPISQLAlchemyWorkflowRunRepository,
@@ -195,7 +196,7 @@ def _workflow_run(*, run_id: str, tenant_id: str, status: WorkflowExecutionStatu
tenant_id=tenant_id,
app_id="app-1",
workflow_id="workflow-1",
- type=WorkflowType.WORKFLOW,
+ type=ModelWorkflowType(WorkflowType.WORKFLOW),
triggered_from=WorkflowRunTriggeredFrom.DEBUGGING,
version="1",
graph="{}",
diff --git a/api/tests/unit_tests/repositories/test_webapp_access_query_repository.py b/api/tests/unit_tests/repositories/test_webapp_access_query_repository.py
index 308ba021eb9..af9329bd703 100644
--- a/api/tests/unit_tests/repositories/test_webapp_access_query_repository.py
+++ b/api/tests/unit_tests/repositories/test_webapp_access_query_repository.py
@@ -56,11 +56,11 @@ def _workflow(session: Session, app: App, *, version: str = "published") -> Work
type=WorkflowType.WORKFLOW if app.mode == AppMode.WORKFLOW else WorkflowType.CHAT,
version=version,
graph='{"nodes":[]}',
- features="{}",
+ _features="{}",
created_by=str(uuid4()),
- environment_variables=[],
- conversation_variables=[],
- rag_pipeline_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
+ _rag_pipeline_variables=[],
)
session.add(workflow)
return workflow
diff --git a/api/tests/unit_tests/repositories/test_workflow_app_log_query_repository.py b/api/tests/unit_tests/repositories/test_workflow_app_log_query_repository.py
index 2de5e684a02..1346134f015 100644
--- a/api/tests/unit_tests/repositories/test_workflow_app_log_query_repository.py
+++ b/api/tests/unit_tests/repositories/test_workflow_app_log_query_repository.py
@@ -49,7 +49,7 @@ def _run(
triggered_from: WorkflowRunTriggeredFrom = WorkflowRunTriggeredFrom.APP_RUN,
) -> WorkflowRun:
created_at = datetime(2026, 1, 1, tzinfo=UTC)
- return WorkflowRun(
+ run = WorkflowRun(
id=run_id,
tenant_id=tenant_id,
app_id=app_id,
@@ -67,10 +67,11 @@ def _run(
total_steps=2,
created_by_role=CreatorUserRole.ACCOUNT,
created_by="actor-1",
- created_at=created_at,
finished_at=created_at + timedelta(seconds=1),
exceptions_count=0,
)
+ run.created_at = created_at
+ return run
def test_get_paginated_returns_detached_actor_records_by_role_when_ids_overlap(
diff --git a/api/tests/unit_tests/repositories/test_workflow_tool_source_repository.py b/api/tests/unit_tests/repositories/test_workflow_tool_source_repository.py
index b5181fae723..12be6dd1ce7 100644
--- a/api/tests/unit_tests/repositories/test_workflow_tool_source_repository.py
+++ b/api/tests/unit_tests/repositories/test_workflow_tool_source_repository.py
@@ -228,11 +228,11 @@ def _save_source(session_factory: sessionmaker[Session]) -> None:
kind=WorkflowKind.STANDARD,
version=version,
graph=json.dumps(graph),
- features=json.dumps(_FEATURES),
+ _features=json.dumps(_FEATURES),
created_by=_ACCOUNT_ID,
- environment_variables=[],
- conversation_variables=[],
- rag_pipeline_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
+ _rag_pipeline_variables=[],
)
for workflow_id, version, graph in (
(_PUBLISHED_WORKFLOW_ID, _PUBLISHED_VERSION, _GRAPH),
diff --git a/api/tests/unit_tests/schedule/test_clean_workflow_runlogs_precise.py b/api/tests/unit_tests/schedule/test_clean_workflow_runlogs_precise.py
index b7f8d195661..abbda59b3f0 100644
--- a/api/tests/unit_tests/schedule/test_clean_workflow_runlogs_precise.py
+++ b/api/tests/unit_tests/schedule/test_clean_workflow_runlogs_precise.py
@@ -13,7 +13,7 @@ from sqlalchemy.orm import ORMExecuteState, Session, sessionmaker
from sqlalchemy.pool import ConnectionPoolEntry
from graphon.entities.pause_reason import PauseReasonType
-from graphon.enums import WorkflowExecutionStatus, WorkflowNodeExecutionStatus, WorkflowType
+from graphon.enums import WorkflowExecutionStatus, WorkflowNodeExecutionStatus
from graphon.file import FileTransferMethod, FileType
from models.base import Base
from models.enums import (
@@ -51,6 +51,7 @@ from models.workflow import (
WorkflowPause,
WorkflowPauseReason,
WorkflowRun,
+ WorkflowType,
)
from repositories.factory import DifyAPIRepositoryFactory
diff --git a/api/tests/unit_tests/services/agent/test_dsl_service.py b/api/tests/unit_tests/services/agent/test_dsl_service.py
index 414b65e3d21..680f4fd7569 100644
--- a/api/tests/unit_tests/services/agent/test_dsl_service.py
+++ b/api/tests/unit_tests/services/agent/test_dsl_service.py
@@ -113,10 +113,10 @@ def _workflow(*, workflow_id: str = "workflow-1") -> Workflow:
type=WorkflowType.WORKFLOW,
version=Workflow.VERSION_DRAFT,
graph={"nodes": [], "edges": []},
- features={},
+ _features={},
created_by="account-1",
- environment_variables=[],
- conversation_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
)
diff --git a/api/tests/unit_tests/services/agent/test_observability_service.py b/api/tests/unit_tests/services/agent/test_observability_service.py
index 17acde9fd0c..1bfa9692b94 100644
--- a/api/tests/unit_tests/services/agent/test_observability_service.py
+++ b/api/tests/unit_tests/services/agent/test_observability_service.py
@@ -114,7 +114,7 @@ def _feedback(
def _agent_observability_service_workflow_run(*, workflow_type: WorkflowType = WorkflowType.WORKFLOW) -> WorkflowRun:
created_at = datetime(2026, 7, 21, 7, 0, 19)
- return WorkflowRun(
+ workflow_record = WorkflowRun(
id="workflow-run-1",
tenant_id="tenant-1",
app_id="workflow-app-1",
@@ -132,9 +132,10 @@ def _agent_observability_service_workflow_run(*, workflow_type: WorkflowType = W
total_steps=1,
created_by_role=CreatorUserRole.END_USER,
created_by="end-user-1",
- created_at=created_at,
finished_at=created_at,
)
+ workflow_record.created_at = created_at
+ return workflow_record
def _agent_observability_service_node_execution(
@@ -143,7 +144,7 @@ def _agent_observability_service_node_execution(
status: WorkflowNodeExecutionStatus = WorkflowNodeExecutionStatus.SUCCEEDED,
) -> WorkflowNodeExecutionModel:
created_at = datetime(2026, 7, 23, 7, 0, 19, tzinfo=UTC)
- return WorkflowNodeExecutionModel(
+ node_record = WorkflowNodeExecutionModel(
id=execution_id,
tenant_id="tenant-1",
app_id="workflow-app-1",
@@ -178,11 +179,12 @@ def _agent_observability_service_node_execution(
}
}
),
- created_at=created_at,
created_by_role=CreatorUserRole.END_USER,
created_by="end-user-1",
finished_at=None,
)
+ node_record.created_at = created_at
+ return node_record
def _agent_observability_service_workflow_binding(
diff --git a/api/tests/unit_tests/services/app/test_console_gateway.py b/api/tests/unit_tests/services/app/test_console_gateway.py
index 02abe96505b..5c5e005c8bb 100644
--- a/api/tests/unit_tests/services/app/test_console_gateway.py
+++ b/api/tests/unit_tests/services/app/test_console_gateway.py
@@ -99,12 +99,12 @@ def test_copy_preserves_shared_roster_bindings_and_clones_owned_inline_agents(
id=workflow_id,
tenant_id=tenant_id,
app_id=app_id,
- type=WorkflowType.from_app_mode(mode).value,
+ type=WorkflowType.from_app_mode(mode),
version=Workflow.VERSION_DRAFT,
graph=json.dumps(graph),
- features=json.dumps({}),
- environment_variables=[],
- conversation_variables=[],
+ _features=json.dumps({}),
+ _environment_variables=[],
+ _conversation_variables=[],
created_by=actor_id,
)
roster = Agent(
@@ -551,7 +551,7 @@ def test_real_dsl_export_releases_connection_before_plugin_request(
type=WorkflowType.WORKFLOW,
version=Workflow.VERSION_DRAFT,
graph='{"nodes":[],"edges":[]}',
- features="{}",
+ _features="{}",
created_by=actor,
)
)
diff --git a/api/tests/unit_tests/services/app/test_export_service.py b/api/tests/unit_tests/services/app/test_export_service.py
index 510d86df070..795e45c094f 100644
--- a/api/tests/unit_tests/services/app/test_export_service.py
+++ b/api/tests/unit_tests/services/app/test_export_service.py
@@ -79,7 +79,7 @@ def test_selected_workflow_ownership_and_publication(
type=WorkflowType.WORKFLOW,
version=Workflow.VERSION_DRAFT if selector in {"draft", "default_draft"} else "published",
graph='{"nodes": [], "edges": []}',
- features="{}",
+ _features="{}",
created_by="account-id",
)
)
diff --git a/api/tests/unit_tests/services/app/test_query_service.py b/api/tests/unit_tests/services/app/test_query_service.py
index 3a8b5d7c195..4ea5675f358 100644
--- a/api/tests/unit_tests/services/app/test_query_service.py
+++ b/api/tests/unit_tests/services/app/test_query_service.py
@@ -192,7 +192,7 @@ def test_description_materializes_only_owned_config_and_closes_session(
type=WorkflowType.WORKFLOW,
version=Workflow.VERSION_DRAFT,
created_by="account-id",
- features="{}",
+ _features="{}",
graph=json.dumps(
{
"nodes": [
diff --git a/api/tests/unit_tests/services/rag_pipeline/test_pipeline_generate_service.py b/api/tests/unit_tests/services/rag_pipeline/test_pipeline_generate_service.py
index 84970c38c1e..bf631d0c8ac 100644
--- a/api/tests/unit_tests/services/rag_pipeline/test_pipeline_generate_service.py
+++ b/api/tests/unit_tests/services/rag_pipeline/test_pipeline_generate_service.py
@@ -51,7 +51,7 @@ def _make_workflow(*, workflow_id: str = "wf-1") -> Workflow:
type=WorkflowType.RAG_PIPELINE,
version=Workflow.VERSION_DRAFT,
graph="{}",
- features="{}",
+ _features="{}",
created_by="user-1",
)
diff --git a/api/tests/unit_tests/services/rag_pipeline/test_rag_pipeline.py b/api/tests/unit_tests/services/rag_pipeline/test_rag_pipeline.py
index 59d86a99ef6..88944418c83 100644
--- a/api/tests/unit_tests/services/rag_pipeline/test_rag_pipeline.py
+++ b/api/tests/unit_tests/services/rag_pipeline/test_rag_pipeline.py
@@ -37,6 +37,7 @@ from models.dataset import (
)
from models.enums import DataSourceType, DocumentCreatedFrom, IndexingStatus
from models.workflow import Workflow, WorkflowRun
+from models.workflow import WorkflowType as ModelWorkflowType
from repositories.knowledge.dataset_read_repository import get_pipeline_dataset
from services.credentials.query import CredentialQuery
from services.data_source.credential_gateway import DatasourceProviderCredentialStore
@@ -141,20 +142,20 @@ def _make_workflow(
id=workflow_id,
tenant_id=tenant_id,
app_id=app_id,
- type="workflow",
+ type=ModelWorkflowType.WORKFLOW,
version=version,
marked_name="",
marked_comment="",
graph=json.dumps(graph or {"nodes": []}),
- features=json.dumps(features or {}),
+ _features=json.dumps(features or {}),
created_by=created_by,
- created_at=datetime(2024, 1, 1),
updated_by=None,
- updated_at=datetime(2024, 1, 1),
- environment_variables=[],
- conversation_variables=[],
- rag_pipeline_variables=rag_pipeline_variables or [],
+ _environment_variables=[],
+ _conversation_variables=[],
+ _rag_pipeline_variables=rag_pipeline_variables or [],
)
+ workflow.updated_at = datetime(2024, 1, 1)
+ workflow.created_at = datetime(2024, 1, 1)
return workflow
diff --git a/api/tests/unit_tests/services/rag_pipeline/test_rag_pipeline_dsl_service.py b/api/tests/unit_tests/services/rag_pipeline/test_rag_pipeline_dsl_service.py
index 0209ce5ba1a..354228555cf 100644
--- a/api/tests/unit_tests/services/rag_pipeline/test_rag_pipeline_dsl_service.py
+++ b/api/tests/unit_tests/services/rag_pipeline/test_rag_pipeline_dsl_service.py
@@ -29,7 +29,7 @@ from models.dataset import (
PipelineCustomizedTemplate,
)
from models.enums import DataSourceType
-from models.workflow import Workflow, WorkflowKind, WorkflowType
+from models.workflow import Workflow, WorkflowType
from services.dsl_version import check_version_compatibility
from services.entities.knowledge_entities.rag_pipeline_entities import IconInfo, RagPipelineDatasetCreateEntity
from services.rag_pipeline import rag_pipeline_dsl_service as module
@@ -93,22 +93,14 @@ def _workflow(session: Session, pipeline: Pipeline, *, graph: dict[str, Any] | N
def _workflow_for_dependencies(
*, graph: dict[str, Any], environment_variables: list[LLMEnvironmentVariable] | None = None
) -> Workflow:
- workflow = Workflow(
- id="workflow-dependencies",
+ return make_workflow(
+ workflow_id="workflow-dependencies",
tenant_id="tenant-1",
app_id="pipeline-1",
- type=WorkflowType.RAG_PIPELINE,
- kind=WorkflowKind.STANDARD,
- version=Workflow.VERSION_DRAFT,
- graph=json.dumps(graph),
- features="{}",
- created_by="account-1",
- environment_variables=[],
- conversation_variables=[],
- rag_pipeline_variables=[],
+ workflow_type=WorkflowType.RAG_PIPELINE,
+ graph=graph,
+ environment_variables=environment_variables or [],
)
- workflow.environment_variables = environment_variables or []
- return workflow
def _dataset(
diff --git a/api/tests/unit_tests/services/retention/workflow_run/test_archive_deletion.py b/api/tests/unit_tests/services/retention/workflow_run/test_archive_deletion.py
index 1341618602c..d24fdb56b22 100644
--- a/api/tests/unit_tests/services/retention/workflow_run/test_archive_deletion.py
+++ b/api/tests/unit_tests/services/retention/workflow_run/test_archive_deletion.py
@@ -150,9 +150,9 @@ def test_archive_deletion_removes_only_requested_files_indexes_and_downloads(
total_steps=0,
created_by_role=CreatorUserRole.ACCOUNT,
created_by="account-1",
- created_at=datetime.datetime(2025, 3, 15),
finished_at=datetime.datetime(2025, 3, 15),
)
+ run.created_at = datetime.datetime(2025, 3, 15)
with sqlite_session_factory.begin() as session:
session.add_all([target, other_tenant, other_month, run])
repository = WorkflowRunArchiveBundleQueryRepository(session_factory=sqlite_session_factory)
diff --git a/api/tests/unit_tests/services/retention/workflow_run/test_archive_paid_plan_workflow_run.py b/api/tests/unit_tests/services/retention/workflow_run/test_archive_paid_plan_workflow_run.py
index 96fdc9a629a..6bba9c907e1 100644
--- a/api/tests/unit_tests/services/retention/workflow_run/test_archive_paid_plan_workflow_run.py
+++ b/api/tests/unit_tests/services/retention/workflow_run/test_archive_paid_plan_workflow_run.py
@@ -64,7 +64,7 @@ def _db_disconnect_error() -> OperationalError:
def _run(run_id: str = "run-1") -> WorkflowRun:
"""Build the mapped entity consumed by the archiver without persisting it."""
- return WorkflowRun(
+ workflow_record = WorkflowRun(
id=run_id,
tenant_id="tenant-1",
app_id="app-1",
@@ -82,9 +82,10 @@ def _run(run_id: str = "run-1") -> WorkflowRun:
total_steps=0,
created_by_role=CreatorUserRole.ACCOUNT,
created_by="account-1",
- created_at=_workflow_run_archiver_sqlite_datetime.datetime(2025, 3, 15, 10, 0, 0),
finished_at=_workflow_run_archiver_sqlite_datetime.datetime(2025, 3, 15, 10, 1, 0),
)
+ workflow_record.created_at = _workflow_run_archiver_sqlite_datetime.datetime(2025, 3, 15, 10, 0, 0)
+ return workflow_record
class TestWorkflowRunArchiverSqliteCases:
diff --git a/api/tests/unit_tests/services/retention/workflow_run/test_restore_archived_workflow_run.py b/api/tests/unit_tests/services/retention/workflow_run/test_restore_archived_workflow_run.py
index 4dbc7bc0bd7..8cc34a729c5 100644
--- a/api/tests/unit_tests/services/retention/workflow_run/test_restore_archived_workflow_run.py
+++ b/api/tests/unit_tests/services/retention/workflow_run/test_restore_archived_workflow_run.py
@@ -119,7 +119,9 @@ class WorkflowRunRestoreTestDataFactory:
"exceptions_count": 0,
}
attrs.update(kwargs)
+ run_created_at = attrs.pop("created_at")
run = WorkflowRun(**attrs)
+ run.created_at = run_created_at
return run
@staticmethod
diff --git a/api/tests/unit_tests/services/test_app_generate_service.py b/api/tests/unit_tests/services/test_app_generate_service.py
index 0fcd8ce8932..c74254365e0 100644
--- a/api/tests/unit_tests/services/test_app_generate_service.py
+++ b/api/tests/unit_tests/services/test_app_generate_service.py
@@ -126,10 +126,10 @@ def _make_workflow(
"edges": [],
}
),
- features={},
+ _features={},
created_by=created_by,
- environment_variables=[],
- conversation_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
)
diff --git a/api/tests/unit_tests/services/test_app_preview_details_adapters.py b/api/tests/unit_tests/services/test_app_preview_details_adapters.py
index b14c151cb68..c20e3b49a74 100644
--- a/api/tests/unit_tests/services/test_app_preview_details_adapters.py
+++ b/api/tests/unit_tests/services/test_app_preview_details_adapters.py
@@ -115,7 +115,7 @@ def harness(sqlite_engine: Engine, sqlite_session_factory: sessionmaker[Session]
type=WorkflowType.CHAT,
version="published",
graph='{"nodes":[],"edges":[]}',
- features='{"opening_statement":"Workflow opening"}',
+ _features='{"opening_statement":"Workflow opening"}',
created_by=account.id,
updated_by=account.id,
)
@@ -125,7 +125,7 @@ def harness(sqlite_engine: Engine, sqlite_session_factory: sessionmaker[Session]
type=WorkflowType.CHAT,
version="published",
graph='{"nodes":[],"edges":[]}',
- features='{"opening_statement":"Other tenant workflow"}',
+ _features='{"opening_statement":"Other tenant workflow"}',
created_by=account.id,
)
session.add_all([workflow, decoy_workflow])
diff --git a/api/tests/unit_tests/services/test_app_storage_cleanup_service.py b/api/tests/unit_tests/services/test_app_storage_cleanup_service.py
index 4550e05961a..c8c03f835bb 100644
--- a/api/tests/unit_tests/services/test_app_storage_cleanup_service.py
+++ b/api/tests/unit_tests/services/test_app_storage_cleanup_service.py
@@ -15,7 +15,6 @@ from extensions.storage.storage_type import StorageType
from graphon.entities.pause_reason import PauseReasonType
from graphon.enums import WorkflowExecutionStatus, WorkflowNodeExecutionStatus
from graphon.file import FileTransferMethod, FileType
-from models import WorkflowType
from models.enums import (
ConversationFromSource,
CreatorUserRole,
@@ -33,6 +32,7 @@ from models.workflow import (
WorkflowPauseReason,
WorkflowRun,
)
+from models.workflow import WorkflowType as ModelWorkflowType
from services import app_storage_cleanup_service as cleanup
@@ -117,7 +117,7 @@ def test_nested_offload_cleanup_preserves_retry_references(
tenant_id="tenant-1",
app_id="app-1",
workflow_id="workflow-1",
- type=WorkflowType.CHAT,
+ type=ModelWorkflowType.CHAT,
triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
version="1",
status=WorkflowExecutionStatus.SUCCEEDED,
@@ -365,7 +365,7 @@ def test_pause_files_and_reasons_are_removed_only_after_storage_success(
tenant_id="tenant-1",
app_id="app-1",
workflow_id="workflow-1",
- type=WorkflowType.CHAT,
+ type=ModelWorkflowType.CHAT,
triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
version="1",
status=WorkflowExecutionStatus.PAUSED,
diff --git a/api/tests/unit_tests/services/test_app_task_service.py b/api/tests/unit_tests/services/test_app_task_service.py
index 3082697761e..c741d445621 100644
--- a/api/tests/unit_tests/services/test_app_task_service.py
+++ b/api/tests/unit_tests/services/test_app_task_service.py
@@ -41,6 +41,7 @@ from models.enums import CreatorUserRole, WorkflowRunTriggeredFrom
from models.human_input import HumanInputForm
from models.model import AppMode
from models.workflow import WorkflowNodeExecutionModel, WorkflowNodeExecutionTriggeredFrom, WorkflowPause, WorkflowRun
+from models.workflow import WorkflowType as ModelWorkflowType
from models.workflow import WorkflowType as _legacy_workflow_task_recovery_WorkflowType
from repositories.sqlalchemy_api_workflow_run_repository import DifyAPISQLAlchemyWorkflowRunRepository
from services.app_task_service import AppTaskControlService, AppTaskService
@@ -292,7 +293,7 @@ class TestAppTaskServiceCases:
app_id="app-1",
workflow_id="workflow-1",
task_id="11111111-1111-1111-1111-111111111111",
- type="workflow",
+ type=ModelWorkflowType("workflow"),
version="1",
triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
status=WorkflowExecutionStatus.RUNNING,
@@ -592,7 +593,7 @@ class TestAppTaskServiceCases:
app_id="app-1",
workflow_id="workflow-1",
task_id=task_id,
- type="workflow",
+ type=ModelWorkflowType("workflow"),
version="1",
triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
status=WorkflowExecutionStatus.RUNNING,
@@ -647,12 +648,12 @@ def _seed_pause(
status=WorkflowExecutionStatus.PAUSED,
created_by_role=CreatorUserRole.END_USER,
created_by="user-1",
- created_at=datetime(2026, 10, 10),
elapsed_time=0,
total_tokens=0,
total_steps=1,
exceptions_count=0,
)
+ run.created_at = datetime(2026, 10, 10)
pause = WorkflowPause(workflow_id=run.workflow_id, workflow_run_id=run.id, state_object_key=f"pause/{run.id}")
if pause_id is not None:
pause.id = pause_id
@@ -1110,12 +1111,12 @@ class TestPausedWorkflowStopCases:
status=WorkflowExecutionStatus.PAUSED,
created_by_role=CreatorUserRole.END_USER,
created_by="user-1",
- created_at=datetime(2026, 10, 10),
elapsed_time=1,
total_tokens=0,
total_steps=2,
exceptions_count=0,
)
+ run.created_at = datetime(2026, 10, 10)
run.task_id = "11111111-1111-1111-1111-111111111111"
pause = WorkflowPause(workflow_id=run.workflow_id, workflow_run_id=run.id, state_object_key="state")
sqlite_session.add_all([run, pause])
diff --git a/api/tests/unit_tests/services/test_audio_service.py b/api/tests/unit_tests/services/test_audio_service.py
index 2bb23a75591..44f09737501 100644
--- a/api/tests/unit_tests/services/test_audio_service.py
+++ b/api/tests/unit_tests/services/test_audio_service.py
@@ -249,14 +249,14 @@ class AudioServiceTestDataFactory:
Persisted Workflow model with specified attributes
"""
workflow = Workflow(
- id=kwargs.pop("id", str(uuid4())),
- tenant_id=kwargs.pop("tenant_id", TENANT_ID),
- app_id=kwargs.pop("app_id", APP_ID),
- type=kwargs.pop("type", WorkflowType.CHAT),
- version=kwargs.pop("version", Workflow.VERSION_DRAFT),
- graph=kwargs.pop("graph", "{}"),
+ id=str(uuid4()),
+ tenant_id=TENANT_ID,
+ app_id=APP_ID,
+ type=WorkflowType.CHAT,
+ version=Workflow.VERSION_DRAFT,
+ graph="{}",
_features=json.dumps(features_dict or {}),
- created_by=kwargs.pop("created_by", ACCOUNT_ID),
+ created_by=ACCOUNT_ID,
)
for key, value in kwargs.items():
setattr(workflow, key, value)
diff --git a/api/tests/unit_tests/services/test_clear_free_plan_tenant_expired_logs.py b/api/tests/unit_tests/services/test_clear_free_plan_tenant_expired_logs.py
index 2b4ad04fe07..b527e31a19c 100644
--- a/api/tests/unit_tests/services/test_clear_free_plan_tenant_expired_logs.py
+++ b/api/tests/unit_tests/services/test_clear_free_plan_tenant_expired_logs.py
@@ -177,7 +177,7 @@ def _create_workflow_node_execution(
node_id: str = "node-1",
) -> WorkflowNodeExecutionModel:
"""Create a real mapped node execution returned by the repository boundary."""
- return WorkflowNodeExecutionModel(
+ execution = WorkflowNodeExecutionModel(
id=execution_id,
tenant_id="tenant-1",
app_id="app-1",
@@ -198,16 +198,17 @@ def _create_workflow_node_execution(
error=None,
elapsed_time=0.1,
execution_metadata="{}",
- created_at=REAL_DATETIME(2026, 1, 1),
created_by_role=CreatorUserRole.ACCOUNT,
created_by="account-1",
finished_at=REAL_DATETIME(2026, 1, 1, 0, 0, 1),
)
+ execution.created_at = REAL_DATETIME(2026, 1, 1)
+ return execution
def _create_workflow_run(run_id: str) -> WorkflowRun:
"""Create a real mapped workflow run returned by the repository boundary."""
- return WorkflowRun(
+ workflow_run = WorkflowRun(
id=run_id,
tenant_id="tenant-1",
app_id="app-1",
@@ -225,10 +226,11 @@ def _create_workflow_run(run_id: str) -> WorkflowRun:
total_steps=1,
created_by_role=CreatorUserRole.ACCOUNT,
created_by="account-1",
- created_at=REAL_DATETIME(2026, 1, 1),
finished_at=REAL_DATETIME(2026, 1, 1, 0, 0, 1),
exceptions_count=0,
)
+ workflow_run.created_at = REAL_DATETIME(2026, 1, 1)
+ return workflow_run
def _create_related_records(message_id: str) -> list[object]:
diff --git a/api/tests/unit_tests/services/test_message_suggested_questions_service.py b/api/tests/unit_tests/services/test_message_suggested_questions_service.py
index 8f4f70c678d..f1f291a7e89 100644
--- a/api/tests/unit_tests/services/test_message_suggested_questions_service.py
+++ b/api/tests/unit_tests/services/test_message_suggested_questions_service.py
@@ -440,7 +440,7 @@ def test_advanced_chat_debugger_uses_draft_while_explore_uses_published_workflow
type=WorkflowType.CHAT,
version=version,
graph='{"nodes":[],"edges":[]}',
- features=json.dumps({"suggested_questions_after_answer": {"enabled": True, "prompt": prompt}}),
+ _features=json.dumps({"suggested_questions_after_answer": {"enabled": True, "prompt": prompt}}),
created_by=harness.account.id,
)
session.add(workflow)
@@ -809,7 +809,7 @@ def test_workflow_compatibility_normalization_does_not_dirty_or_write_rows(
type=WorkflowType.CHAT,
version="published",
graph='{"nodes":[],"edges":[]}',
- features=features,
+ _features=features,
created_by=harness.account.id,
)
session.add(workflow)
diff --git a/api/tests/unit_tests/services/test_snippet_service.py b/api/tests/unit_tests/services/test_snippet_service.py
index 22c403f5aab..2fd63128376 100644
--- a/api/tests/unit_tests/services/test_snippet_service.py
+++ b/api/tests/unit_tests/services/test_snippet_service.py
@@ -49,11 +49,11 @@ def _create_workflow(*, workflow_id: str, version: str, graph: dict, features: d
kind=WorkflowKind.SNIPPET.value,
version=version,
graph=json.dumps(graph),
- features=json.dumps(features),
+ _features=json.dumps(features),
created_by="account-1",
- environment_variables=[],
- conversation_variables=[],
- rag_pipeline_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
+ _rag_pipeline_variables=[],
)
@@ -857,11 +857,11 @@ def test_delete_snippet_keeps_agent_with_persisted_external_owner(
type=WorkflowType.WORKFLOW,
version=Workflow.VERSION_DRAFT,
graph="{}",
- features="{}",
+ _features="{}",
created_by="account-1",
- environment_variables=[],
- conversation_variables=[],
- rag_pipeline_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
+ _rag_pipeline_variables=[],
)
external_binding = WorkflowAgentNodeBinding(
tenant_id=snippet.tenant_id,
diff --git a/api/tests/unit_tests/services/test_workflow_draft_variable_service.py b/api/tests/unit_tests/services/test_workflow_draft_variable_service.py
index 1a318171f63..9a3495c8d31 100644
--- a/api/tests/unit_tests/services/test_workflow_draft_variable_service.py
+++ b/api/tests/unit_tests/services/test_workflow_draft_variable_service.py
@@ -24,6 +24,7 @@ from extensions.storage.opendal_storage import OpenDALStorage
from extensions.storage.storage_type import StorageType
from factories.variable_factory import build_segment
from graphon.enums import BuiltinNodeTypes as _workflow_draft_variable_service_BuiltinNodeTypes
+from graphon.enums import WorkflowNodeExecutionStatus
from graphon.file import File, FileTransferMethod, FileType
from graphon.nodes import BuiltinNodeTypes as _workflow_draft_variable_service_sqlite_BuiltinNodeTypes
from graphon.variables.segments import StringSegment
@@ -141,14 +142,18 @@ class TestDraftVarLoaderSimpleCases:
)
variable_file.upload_file = upload_file
- draft_var = WorkflowDraftVariable(
- id="draft-var-id",
+ draft_var = WorkflowDraftVariable.new_node_variable(
+ app_id="app-id",
+ user_id="user-id",
node_id="test-node-id",
name="test_object",
- description="test description",
- selector=json.dumps(["test-node-id", "test_object"]),
- variable_file=variable_file,
+ value=StringSegment(value="truncated"),
+ node_execution_id="execution-id",
+ file_id=variable_file.id,
)
+ draft_var.id = "draft-var-id"
+ draft_var.description = "test description"
+ draft_var.variable_file = variable_file
test_object = {"key1": "value1", "key2": 42}
test_json_content = json.dumps(test_object, ensure_ascii=False, separators=(",", ":"))
@@ -171,9 +176,15 @@ class TestDraftVarLoaderSimpleCases:
def test_load_offloaded_variable_missing_variable_file_unit(self, draft_var_loader):
"""Test that assertion error is raised when variable_file is None."""
- draft_var = WorkflowDraftVariable(
- variable_file=None,
+ draft_var = WorkflowDraftVariable.new_node_variable(
+ app_id="app-id",
+ user_id="user-id",
+ node_id="test-node-id",
+ name="test_variable",
+ value=StringSegment(value="truncated"),
+ node_execution_id="execution-id",
)
+ draft_var.variable_file = None
with pytest.raises(AssertionError):
draft_var_loader._load_offloaded_variable(draft_var)
@@ -187,13 +198,20 @@ class TestDraftVarLoaderSimpleCases:
upload_file_id="upload-file-id",
size=0,
length=0,
- value_type="file",
+ value_type=SegmentType.FILE,
)
variable_file.upload_file = None
- draft_var = WorkflowDraftVariable(
- variable_file=variable_file,
+ draft_var = WorkflowDraftVariable.new_node_variable(
+ app_id="app-id",
+ user_id="user-id",
+ node_id="test-node-id",
+ name="test_variable",
+ value=StringSegment(value="truncated"),
+ node_execution_id="execution-id",
+ file_id=variable_file.id,
)
+ draft_var.variable_file = variable_file
with pytest.raises(AssertionError):
draft_var_loader._load_offloaded_variable(draft_var)
@@ -237,14 +255,18 @@ class TestDraftVarLoaderSimpleCases:
)
variable_file.upload_file = upload_file
- draft_var = WorkflowDraftVariable(
- id="draft-var-id",
+ draft_var = WorkflowDraftVariable.new_node_variable(
+ app_id="app-id",
+ user_id="user-id",
node_id="test-node-id",
name="test_array",
- description="test array description",
- selector=json.dumps(["test-node-id", "test_array"]),
- variable_file=variable_file,
+ value=StringSegment(value="truncated"),
+ node_execution_id="execution-id",
+ file_id=variable_file.id,
)
+ draft_var.id = "draft-var-id"
+ draft_var.description = "test array description"
+ draft_var.variable_file = variable_file
test_array = ["item1", 2, True]
test_json_content = json.dumps(test_array)
@@ -289,13 +311,16 @@ class TestDraftVarLoaderSimpleCases:
)
variable_file.upload_file = upload_file
- draft_var = WorkflowDraftVariable(
- id="draft-var-id",
+ draft_var = WorkflowDraftVariable.new_node_variable(
app_id="app-1",
+ user_id="user-id",
node_id="test-node-id",
name="test_file",
- description="test file description",
+ value=StringSegment(value="truncated"),
+ node_execution_id="execution-id",
)
+ draft_var.id = "draft-var-id"
+ draft_var.description = "test file description"
draft_var._set_selector(["test-node-id", "test_file"])
draft_var.variable_file = variable_file
@@ -1736,7 +1761,7 @@ class TestWorkflowDraftVariableServiceSqliteCases:
inputs='{"input": "test input"}',
process_data='{"test_var": "process_value", "other_var": "other_process"}',
outputs='{"test_var": "output_value", "other_var": "other_output"}',
- status="succeeded",
+ status=WorkflowNodeExecutionStatus.SUCCEEDED,
elapsed_time=1.5,
created_by_role=CreatorUserRole.ACCOUNT,
created_by=str(uuid.uuid4()),
diff --git a/api/tests/unit_tests/services/test_workflow_event_snapshot_service.py b/api/tests/unit_tests/services/test_workflow_event_snapshot_service.py
index 282824e41b3..bd7afbdaea5 100644
--- a/api/tests/unit_tests/services/test_workflow_event_snapshot_service.py
+++ b/api/tests/unit_tests/services/test_workflow_event_snapshot_service.py
@@ -33,6 +33,7 @@ from models.enums import ConversationFromSource, CreatorUserRole
from models.human_input import HumanInputForm, HumanInputFormRecipient, RecipientType
from models.model import AppMode, Message
from models.workflow import WorkflowNodeExecutionModel, WorkflowNodeExecutionTriggeredFrom, WorkflowPause, WorkflowRun
+from models.workflow import WorkflowType as ModelWorkflowType
from repositories.api_workflow_node_execution_repository import WorkflowNodeExecutionSnapshot
from repositories.entities.workflow_pause import WorkflowPauseEntity
from repositories.sqlalchemy_api_workflow_node_execution_repository import (
@@ -87,12 +88,12 @@ class _FakePauseEntity(WorkflowPauseEntity):
def _build_workflow_run(status: WorkflowExecutionStatus) -> WorkflowRun:
- return WorkflowRun(
+ workflow_run = WorkflowRun(
id="run-1",
tenant_id="tenant-1",
app_id="app-1",
workflow_id="workflow-1",
- type="workflow",
+ type=ModelWorkflowType("workflow"),
triggered_from="app-run",
version="v1",
graph=None,
@@ -105,8 +106,9 @@ def _build_workflow_run(status: WorkflowExecutionStatus) -> WorkflowRun:
total_steps=0,
created_by_role=CreatorUserRole.END_USER,
created_by="user-1",
- created_at=datetime(2024, 1, 1, tzinfo=UTC),
)
+ workflow_run.created_at = datetime(2024, 1, 1, tzinfo=UTC)
+ return workflow_run
def _build_snapshot(status: WorkflowNodeExecutionStatus) -> WorkflowNodeExecutionSnapshot:
@@ -213,12 +215,12 @@ def test_resolve_task_id_priority(context_task_id, buffered_task_id, expected) -
def _build_workflow_run_additional(status: WorkflowExecutionStatus = WorkflowExecutionStatus.RUNNING) -> WorkflowRun:
- return WorkflowRun(
+ workflow_run = WorkflowRun(
id="run-1",
tenant_id="tenant-1",
app_id="app-1",
workflow_id="workflow-1",
- type="workflow",
+ type=ModelWorkflowType("workflow"),
triggered_from="app-run",
version="v1",
graph=None,
@@ -231,8 +233,9 @@ def _build_workflow_run_additional(status: WorkflowExecutionStatus = WorkflowExe
total_steps=2,
created_by_role=CreatorUserRole.END_USER,
created_by="user-1",
- created_at=datetime(2024, 1, 1, tzinfo=UTC),
)
+ workflow_run.created_at = datetime(2024, 1, 1, tzinfo=UTC)
+ return workflow_run
def _build_resumption_context_additional(task_id: str) -> WorkflowResumptionContext:
@@ -745,7 +748,6 @@ def test_console_snapshot_replays_node_details_without_exposing_them_by_default(
index=snapshot.index,
status=WorkflowNodeExecutionStatus.SUCCEEDED,
elapsed_time=snapshot.elapsed_time,
- created_at=snapshot.created_at,
finished_at=snapshot.finished_at,
created_by_role=CreatorUserRole.END_USER,
created_by=run.created_by,
@@ -754,8 +756,9 @@ def test_console_snapshot_replays_node_details_without_exposing_them_by_default(
process_data=json.dumps({"action": "approve"}),
outputs=json.dumps({"approved_text": "approved"}),
execution_metadata=json.dumps({"total_tokens": 7}),
- offload_data=[],
)
+ execution.offload_data = []
+ execution.created_at = snapshot.created_at
sqlite_session.add_all([run, execution])
sqlite_session.commit()
node_repo = DifyAPISQLAlchemyWorkflowNodeExecutionRepository(sqlite_session_factory)
diff --git a/api/tests/unit_tests/services/test_workflow_node_execution_trace_service.py b/api/tests/unit_tests/services/test_workflow_node_execution_trace_service.py
index eb2cc1077f6..1324c13c376 100644
--- a/api/tests/unit_tests/services/test_workflow_node_execution_trace_service.py
+++ b/api/tests/unit_tests/services/test_workflow_node_execution_trace_service.py
@@ -43,7 +43,7 @@ def _retry_attempt(retry_index: int, **overrides: object) -> dict[str, object]:
def _execution(process_data: dict[str, object]) -> WorkflowNodeExecutionModel:
- return WorkflowNodeExecutionModel(
+ execution = WorkflowNodeExecutionModel(
id="exec-1",
tenant_id="tenant-1",
app_id="app-1",
@@ -64,11 +64,12 @@ def _execution(process_data: dict[str, object]) -> WorkflowNodeExecutionModel:
error=None,
elapsed_time=3.5,
execution_metadata=json.dumps({"iteration_id": "iteration-1"}),
- created_at=datetime(2023, 11, 14, tzinfo=UTC),
created_by_role=CreatorUserRole.ACCOUNT,
created_by="account-1",
finished_at=datetime(2023, 11, 14, 0, 0, 4, tzinfo=UTC),
)
+ execution.created_at = datetime(2023, 11, 14, tzinfo=UTC)
+ return execution
def _repository(full_process_data: dict[str, object] | None) -> DifyAPIWorkflowNodeExecutionRepository:
diff --git a/api/tests/unit_tests/services/test_workflow_restore.py b/api/tests/unit_tests/services/test_workflow_restore.py
index cb2ff955ec5..da09783f4ee 100644
--- a/api/tests/unit_tests/services/test_workflow_restore.py
+++ b/api/tests/unit_tests/services/test_workflow_restore.py
@@ -2,6 +2,7 @@ import json
from models.account import Account
from models.workflow import Workflow
+from models.workflow import WorkflowType as ModelWorkflowType
from services.workflow_restore import apply_published_workflow_snapshot_to_draft
LEGACY_FEATURES = {
@@ -44,14 +45,14 @@ def _create_workflow(*, workflow_id: str, version: str, features: dict[str, obje
id=workflow_id,
tenant_id="tenant-id",
app_id="app-id",
- type="workflow",
+ type=ModelWorkflowType("workflow"),
version=version,
graph=json.dumps({"nodes": [], "edges": []}),
- features=json.dumps(features),
+ _features=json.dumps(features),
created_by="account-id",
- environment_variables=[],
- conversation_variables=[],
- rag_pipeline_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
+ _rag_pipeline_variables=[],
)
diff --git a/api/tests/unit_tests/services/test_workflow_run_agg.py b/api/tests/unit_tests/services/test_workflow_run_agg.py
index 1d395a6e67c..c65f97eb74f 100644
--- a/api/tests/unit_tests/services/test_workflow_run_agg.py
+++ b/api/tests/unit_tests/services/test_workflow_run_agg.py
@@ -53,6 +53,7 @@ from models.workflow import (
WorkflowPause,
WorkflowRun,
)
+from models.workflow import WorkflowType as ModelWorkflowType
from services.agent.workspace_service import AgentWorkspaceService
from services.workflow.entities import WorkflowScheduleCFSPlanEntity
from services.workflow_run_agg import WorkflowRunAgg
@@ -101,10 +102,10 @@ def _pipeline_tool_runner(
id="source-workflow",
tenant_id="tenant",
app_id="source-app",
- type="workflow",
+ type=ModelWorkflowType.WORKFLOW,
version="v1",
graph=json.dumps(source_graph),
- features="{}",
+ _features="{}",
created_by="user",
)
)
@@ -313,10 +314,10 @@ def make_workflow_runner(
id=workflow_id,
tenant_id=tenant_id,
app_id=app_id,
- type="workflow",
+ type=ModelWorkflowType.WORKFLOW,
version="draft",
graph=json.dumps(graph),
- features="{}",
+ _features="{}",
created_by=user_id,
)
entity = WorkflowAppGenerateEntity(
@@ -648,9 +649,9 @@ class TestWorkflowRunAggCases:
app_id=source_app_id,
tenant_id=tenant_id,
created_by=original_entity.user_id,
- type="workflow",
+ type=ModelWorkflowType.WORKFLOW,
version=version,
- features="{}",
+ _features="{}",
graph=json.dumps(
{
"nodes": [
diff --git a/api/tests/unit_tests/services/test_workflow_run_service.py b/api/tests/unit_tests/services/test_workflow_run_service.py
index b065b2692ca..a3d0c5cff8d 100644
--- a/api/tests/unit_tests/services/test_workflow_run_service.py
+++ b/api/tests/unit_tests/services/test_workflow_run_service.py
@@ -12,8 +12,9 @@ from core.workflow.nodes.human_input.pause_reason import HumanInputRequired
from graphon.entities.pause_reason import SchedulingPause
from graphon.enums import WorkflowExecutionStatus
from machinery.context import RequestContext
-from models import WorkflowRun, WorkflowRunTriggeredFrom, WorkflowType
+from models import WorkflowRun, WorkflowRunTriggeredFrom
from models.enums import CreatorUserRole
+from models.workflow import WorkflowType as ModelWorkflowType
from repositories.sqlalchemy_api_workflow_run_repository import WorkflowRunMessageRef, WorkflowRunPauseRecord
from services import workflow_run_service as service_module
from services.workflow_node_execution_trace_service import WorkflowNodeExecutionTrace
@@ -51,7 +52,7 @@ def _workflow_run(
tenant_id="tenant-1",
app_id="app-1",
workflow_id="workflow-1",
- type=WorkflowType.CHAT,
+ type=ModelWorkflowType.CHAT,
triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
version="1",
graph="{}",
diff --git a/api/tests/unit_tests/services/test_workflow_service.py b/api/tests/unit_tests/services/test_workflow_service.py
index 48e6bd04fb8..a8050e5f731 100644
--- a/api/tests/unit_tests/services/test_workflow_service.py
+++ b/api/tests/unit_tests/services/test_workflow_service.py
@@ -162,11 +162,11 @@ class TestWorkflowAssociatedDataFactory:
type=workflow_type,
version=version,
graph=json.dumps(graph or {"nodes": [], "edges": []}),
- features=json.dumps(features or {}),
+ _features=json.dumps(features or {}),
created_by="user-123",
- environment_variables=[],
- conversation_variables=[],
- rag_pipeline_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
+ _rag_pipeline_variables=[],
)
for key, value in kwargs.items():
setattr(workflow, key, value)
@@ -833,11 +833,11 @@ class TestWorkflowServiceCases:
type=WorkflowType.WORKFLOW,
version="2026-03-19T00:00:00",
graph=json.dumps(TestWorkflowAssociatedDataFactory.create_valid_workflow_graph()),
- features=json.dumps(legacy_features),
+ _features=json.dumps(legacy_features),
created_by=account.id,
- environment_variables=[],
- conversation_variables=[],
- rag_pipeline_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
+ _rag_pipeline_variables=[],
)
draft_workflow = Workflow(
id="draft-workflow-id",
@@ -846,11 +846,11 @@ class TestWorkflowServiceCases:
type=WorkflowType.WORKFLOW,
version=Workflow.VERSION_DRAFT,
graph=json.dumps({"nodes": [], "edges": []}),
- features=json.dumps({}),
+ _features=json.dumps({}),
created_by=account.id,
- environment_variables=[],
- conversation_variables=[],
- rag_pipeline_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
+ _rag_pipeline_variables=[],
)
sqlite_session.add_all([source_workflow, draft_workflow])
sqlite_session.commit()
diff --git a/api/tests/unit_tests/services/tracing/test_provider_dispatch.py b/api/tests/unit_tests/services/tracing/test_provider_dispatch.py
index 8cf3a86cb92..3748b0994de 100644
--- a/api/tests/unit_tests/services/tracing/test_provider_dispatch.py
+++ b/api/tests/unit_tests/services/tracing/test_provider_dispatch.py
@@ -740,10 +740,10 @@ class TestLegacyAliyunTransportCases:
total_tokens=32,
created_by=account.id,
created_by_role=CreatorUserRole.ACCOUNT,
- created_at=_LEGACY_ALIYUN_TRANSPORT_START,
finished_at=_LEGACY_ALIYUN_TRANSPORT_START + timedelta(seconds=1),
elapsed_time=1,
)
+ run.created_at = _LEGACY_ALIYUN_TRANSPORT_START
sqlite_session.add_all([tenant, account, app, membership, run])
nodes = [
WorkflowNodeExecutionModel(
@@ -764,7 +764,6 @@ class TestLegacyAliyunTransportCases:
outputs=json.dumps(
{"text": "ok", "usage": {"prompt_tokens": 21, "completion_tokens": 11, "total_tokens": 32}}
),
- created_at=_LEGACY_ALIYUN_TRANSPORT_START + timedelta(milliseconds=i),
finished_at=_LEGACY_ALIYUN_TRANSPORT_START + timedelta(milliseconds=i + 100),
elapsed_time=0.1,
process_data=json.dumps(
@@ -781,6 +780,8 @@ class TestLegacyAliyunTransportCases:
[("Start", BuiltinNodeTypes.START), ("LLM", BuiltinNodeTypes.LLM), ("End", BuiltinNodeTypes.END)]
)
]
+ for node_index, node_record in enumerate(nodes):
+ node_record.created_at = _LEGACY_ALIYUN_TRANSPORT_START + timedelta(milliseconds=node_index)
sqlite_session.add_all(nodes)
sqlite_session.commit()
info = WorkflowTraceInfo(
@@ -1131,7 +1132,6 @@ class TestLegacyWeaveTransportCases:
created_by_role=CreatorUserRole.ACCOUNT,
inputs=json.dumps({"synthetic": True}),
outputs=json.dumps({"answer": "ok"}),
- created_at=_LEGACY_WEAVE_TRANSPORT_START + timedelta(milliseconds=i),
finished_at=_LEGACY_WEAVE_TRANSPORT_START + timedelta(milliseconds=i + 100),
elapsed_time=0.1,
process_data=json.dumps(
@@ -1152,6 +1152,8 @@ class TestLegacyWeaveTransportCases:
[("Start", BuiltinNodeTypes.START), ("LLM", BuiltinNodeTypes.LLM), ("End", BuiltinNodeTypes.END)]
)
]
+ for node_index, node_record in enumerate(nodes):
+ node_record.created_at = _LEGACY_WEAVE_TRANSPORT_START + timedelta(milliseconds=node_index)
sqlite_session.add_all(nodes)
sqlite_session.commit()
adapter = WeaveDataTrace(_legacy_weave_transport_config())
diff --git a/api/tests/unit_tests/services/tracing/test_recovery.py b/api/tests/unit_tests/services/tracing/test_recovery.py
index 91cda1b9d1d..775662e814e 100644
--- a/api/tests/unit_tests/services/tracing/test_recovery.py
+++ b/api/tests/unit_tests/services/tracing/test_recovery.py
@@ -1044,31 +1044,30 @@ def test_workflow_recovery_requires_committed_terminal_state(
assert app is not None
app.created_by = owner_id
session.add(make_account(account_id=owner_id))
- session.add(
- WorkflowRun(
- id=workflow_run_id,
- tenant_id=case.collection.run.tenant_id,
- app_id=app.id,
- workflow_id=identifier("workflow"),
- type=WorkflowType.WORKFLOW,
- triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
- version="1",
- graph="{}",
- inputs="{}",
- outputs=json.dumps({"result": "persisted workflow output"}),
- status=status,
- error="actual workflow failure"
- if status in {WorkflowExecutionStatus.FAILED, WorkflowExecutionStatus.STOPPED}
- else None,
- created_by=owner_id,
- created_by_role=CreatorUserRole.ACCOUNT,
- created_at=case.now - timedelta(seconds=30),
- finished_at=case.now - timedelta(seconds=10) if finished else None,
- elapsed_time=20,
- total_tokens=0,
- total_steps=0,
- )
+ trace_workflow_record = WorkflowRun(
+ id=workflow_run_id,
+ tenant_id=case.collection.run.tenant_id,
+ app_id=app.id,
+ workflow_id=identifier("workflow"),
+ type=WorkflowType.WORKFLOW,
+ triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
+ version="1",
+ graph="{}",
+ inputs="{}",
+ outputs=json.dumps({"result": "persisted workflow output"}),
+ status=status,
+ error="actual workflow failure"
+ if status in {WorkflowExecutionStatus.FAILED, WorkflowExecutionStatus.STOPPED}
+ else None,
+ created_by=owner_id,
+ created_by_role=CreatorUserRole.ACCOUNT,
+ finished_at=case.now - timedelta(seconds=10) if finished else None,
+ elapsed_time=20,
+ total_tokens=0,
+ total_steps=0,
)
+ trace_workflow_record.created_at = case.now - timedelta(seconds=30)
+ session.add(trace_workflow_record)
run = case.collection.repository.start(
tenant_id=case.collection.run.tenant_id,
app_id=case.collection.run.app_id,
diff --git a/api/tests/unit_tests/services/tracing/test_runtime_bridge.py b/api/tests/unit_tests/services/tracing/test_runtime_bridge.py
index b262125f42c..3776be89018 100644
--- a/api/tests/unit_tests/services/tracing/test_runtime_bridge.py
+++ b/api/tests/unit_tests/services/tracing/test_runtime_bridge.py
@@ -33,7 +33,6 @@ from core.repositories.sqlalchemy_workflow_node_execution_repository import SQLA
from core.workflow.nodes.agent_v2.runtime_request_builder import WorkflowAgentRuntimeBuildContext
from extensions.ext_database import db
from graphon.enums import WorkflowExecutionStatus, WorkflowNodeExecutionStatus
-from graphon.enums import WorkflowType as _workflow_tool_tracing_boundary_WorkflowType
from graphon.runtime import VariablePool
from models.agent import (
Agent,
@@ -189,12 +188,12 @@ def workflow(
triggered_from=_application_trace_handoff_WorkflowRunTriggeredFrom.APP_RUN,
created_by_role=CreatorUserRole.ACCOUNT,
created_by=identifier("owner"),
- created_at=now,
finished_at=now + timedelta(seconds=2),
elapsed_time=2,
total_tokens=0,
total_steps=0,
)
+ row.created_at = now
session.add(row)
trace_run = (
case.collection.repository.start(
@@ -404,42 +403,41 @@ class TestApplicationTraceHandoffCases:
usage: dict[str, int] = (
{"prompt_tokens": 10, "completion_tokens": 5, "total_tokens": 15} if kind == "llm" else {}
)
- session.add(
- WorkflowNodeExecutionModel(
- id=node_id,
- node_execution_id=node_id,
- tenant_id=row.tenant_id,
- app_id=row.app_id,
- workflow_id=row.workflow_id,
- workflow_run_id=row.id,
- triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
- index=index,
- node_id=kind,
- node_type=kind,
- title=kind,
- inputs="{}",
- outputs="{}",
- process_data=json.dumps(
- {
- "model_mode": "chat",
- "model_name": "ordinary-model",
- "model_provider": "openai",
- "usage": usage,
- }
- )
- if kind == "llm"
- else "{}",
- status=WorkflowNodeExecutionStatus.SUCCEEDED,
- elapsed_time=1,
- execution_metadata=json.dumps(
- {"total_tokens": 15 if kind == "llm" else 10, "total_price": "0.02", "currency": "USD"}
- ),
- created_at=row.created_at,
- finished_at=row.finished_at,
- created_by=owner,
- created_by_role=CreatorUserRole.ACCOUNT,
+ node_record = WorkflowNodeExecutionModel(
+ id=node_id,
+ node_execution_id=node_id,
+ tenant_id=row.tenant_id,
+ app_id=row.app_id,
+ workflow_id=row.workflow_id,
+ workflow_run_id=row.id,
+ triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
+ index=index,
+ node_id=kind,
+ node_type=kind,
+ title=kind,
+ inputs="{}",
+ outputs="{}",
+ process_data=json.dumps(
+ {
+ "model_mode": "chat",
+ "model_name": "ordinary-model",
+ "model_provider": "openai",
+ "usage": usage,
+ }
)
+ if kind == "llm"
+ else "{}",
+ status=WorkflowNodeExecutionStatus.SUCCEEDED,
+ elapsed_time=1,
+ execution_metadata=json.dumps(
+ {"total_tokens": 15 if kind == "llm" else 10, "total_price": "0.02", "currency": "USD"}
+ ),
+ finished_at=row.finished_at,
+ created_by=owner,
+ created_by_role=CreatorUserRole.ACCOUNT,
)
+ node_record.created_at = row.created_at
+ session.add(node_record)
invocation = case.collection.repository.invocation(
run_id=managed.id,
agent_id=identifier("agent"),
@@ -920,58 +918,56 @@ def _workflow_tool_tracing_boundary_seed(
tracing_config={"project_url": "https://tracing.test/" + app},
)
)
- session.add(
- WorkflowRun(
- id=ids["run"],
- tenant_id=ids["tenant"],
- app_id=ids["root"],
- workflow_id=ids["root_workflow"],
- type=_workflow_tool_tracing_boundary_WorkflowType.WORKFLOW,
- triggered_from=_workflow_tool_tracing_boundary_WorkflowRunTriggeredFrom.APP_RUN,
- version="1",
- graph=json.dumps(root_graph),
- inputs="{}",
- status=WorkflowExecutionStatus.SUCCEEDED,
- created_by=ids["actor"],
- created_by_role=CreatorUserRole.ACCOUNT,
- created_at=now,
- finished_at=now + timedelta(seconds=3),
- )
+ workflow_record = WorkflowRun(
+ id=ids["run"],
+ tenant_id=ids["tenant"],
+ app_id=ids["root"],
+ workflow_id=ids["root_workflow"],
+ type=_application_trace_handoff_WorkflowType.WORKFLOW,
+ triggered_from=_workflow_tool_tracing_boundary_WorkflowRunTriggeredFrom.APP_RUN,
+ version="1",
+ graph=json.dumps(root_graph),
+ inputs="{}",
+ status=WorkflowExecutionStatus.SUCCEEDED,
+ created_by=ids["actor"],
+ created_by_role=CreatorUserRole.ACCOUNT,
+ finished_at=now + timedelta(seconds=3),
)
+ workflow_record.created_at = now
+ session.add(workflow_record)
for key, node_type in [("root_agent", "agent"), ("root_tool", "tool"), ("child", "agent")]:
child = key == "child"
app = "source" if child else "root"
- session.add(
- WorkflowNodeExecutionModel(
- id=ids[key],
- tenant_id=ids["tenant"],
- app_id=ids[app],
- workflow_id=ids[app + "_workflow"],
- workflow_run_id=ids["run"],
- triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_TOOL
- if child
- else WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
- triggered_from_workflow_id=ids["root_workflow"] if child else None,
- triggered_from_node_execution_id=ids["root_tool"] if child else None,
- node_execution_id=ids[key],
- index=1,
- node_id=key,
- node_type=node_type,
- title=key,
- status=WorkflowNodeExecutionStatus.SUCCEEDED,
- created_by=ids["actor"],
- created_by_role=CreatorUserRole.ACCOUNT,
- created_at=now,
- finished_at=now + timedelta(seconds=2),
- inputs="{}",
- outputs="{}",
- process_data=json.dumps(
- {"workflow_tool_root_app_id": ids["root"], "workflow_tool_invocation_id": "tool-call"}
- )
- if child
- else "{}",
+ node_record = WorkflowNodeExecutionModel(
+ id=ids[key],
+ tenant_id=ids["tenant"],
+ app_id=ids[app],
+ workflow_id=ids[app + "_workflow"],
+ workflow_run_id=ids["run"],
+ triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_TOOL
+ if child
+ else WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
+ triggered_from_workflow_id=ids["root_workflow"] if child else None,
+ triggered_from_node_execution_id=ids["root_tool"] if child else None,
+ node_execution_id=ids[key],
+ index=1,
+ node_id=key,
+ node_type=node_type,
+ title=key,
+ status=WorkflowNodeExecutionStatus.SUCCEEDED,
+ created_by=ids["actor"],
+ created_by_role=CreatorUserRole.ACCOUNT,
+ finished_at=now + timedelta(seconds=2),
+ inputs="{}",
+ outputs="{}",
+ process_data=json.dumps(
+ {"workflow_tool_root_app_id": ids["root"], "workflow_tool_invocation_id": "tool-call"}
)
+ if child
+ else "{}",
)
+ node_record.created_at = now
+ session.add(node_record)
service = ApplicationTracingService(ApplicationTraceRepository(sessions))
apply_config_overrides(monkeypatch, OPS_AGENT_TRACE_ENABLED=True)
monkeypatch.setattr(runtime_bridge, "_service", lambda: service)
diff --git a/api/tests/unit_tests/services/tracing/test_service.py b/api/tests/unit_tests/services/tracing/test_service.py
index d33f8da2223..9bcc701f97b 100644
--- a/api/tests/unit_tests/services/tracing/test_service.py
+++ b/api/tests/unit_tests/services/tracing/test_service.py
@@ -875,29 +875,28 @@ class TestApplicationTraceServiceBoundariesCases:
workflow_id = _application_trace_service_boundaries_identifier("preview-definition")
with case.sessions.begin() as session:
session.add(make_workflow(workflow_id=workflow_id, tenant_id=case.run.tenant_id, app_id=case.run.app_id))
- session.add(
- WorkflowNodeExecutionModel(
- id=node_id,
- node_execution_id=node_id,
- tenant_id=case.run.tenant_id,
- app_id=case.run.app_id,
- workflow_id=workflow_id,
- triggered_from=WorkflowNodeExecutionTriggeredFrom.SINGLE_STEP,
- index=0,
- node_id="agent",
- node_type="agent",
- title="Agent preview",
- inputs='{"secret":"private-input"}',
- outputs='{"answer":"private-output"}',
- process_data="{}",
- status=status,
- elapsed_time=2,
- error="private-model-error" if status == WorkflowNodeExecutionStatus.FAILED else None,
- created_at=datetime(2026, 1, 1),
- created_by=_application_trace_service_boundaries_identifier("account"),
- created_by_role=CreatorUserRole.ACCOUNT,
- )
+ node_record = WorkflowNodeExecutionModel(
+ id=node_id,
+ node_execution_id=node_id,
+ tenant_id=case.run.tenant_id,
+ app_id=case.run.app_id,
+ workflow_id=workflow_id,
+ triggered_from=WorkflowNodeExecutionTriggeredFrom.SINGLE_STEP,
+ index=0,
+ node_id="agent",
+ node_type="agent",
+ title="Agent preview",
+ inputs='{"secret":"private-input"}',
+ outputs='{"answer":"private-output"}',
+ process_data="{}",
+ status=status,
+ elapsed_time=2,
+ error="private-model-error" if status == WorkflowNodeExecutionStatus.FAILED else None,
+ created_by=_application_trace_service_boundaries_identifier("account"),
+ created_by_role=CreatorUserRole.ACCOUNT,
)
+ node_record.created_at = datetime(2026, 1, 1)
+ session.add(node_record)
run = case.repository.start(
tenant_id=case.run.tenant_id,
app_id=case.run.app_id,
diff --git a/api/tests/unit_tests/services/workflow/test_graph_diff.py b/api/tests/unit_tests/services/workflow/test_graph_diff.py
index f56e71c5a2c..b40c1be65c9 100644
--- a/api/tests/unit_tests/services/workflow/test_graph_diff.py
+++ b/api/tests/unit_tests/services/workflow/test_graph_diff.py
@@ -72,7 +72,7 @@ def _workflow(version: str) -> Workflow:
type=WorkflowType.WORKFLOW,
version=version,
graph='{"nodes": [], "edges": []}',
- features="{}",
+ _features="{}",
created_by="account-1",
)
diff --git a/api/tests/unit_tests/services/workflow/test_node_output_inspector_service.py b/api/tests/unit_tests/services/workflow/test_node_output_inspector_service.py
index fbbc07e8a6b..3ec90c25966 100644
--- a/api/tests/unit_tests/services/workflow/test_node_output_inspector_service.py
+++ b/api/tests/unit_tests/services/workflow/test_node_output_inspector_service.py
@@ -70,7 +70,7 @@ def _workflow_run(
nodes: list[dict[str, Any]] | None = None,
graph: str | None = None,
) -> WorkflowRun:
- return WorkflowRun(
+ workflow_run = WorkflowRun(
id=run_id,
workflow_id=workflow_id,
tenant_id=tenant_id,
@@ -88,9 +88,10 @@ def _workflow_run(
total_steps=0,
created_by_role=CreatorUserRole.ACCOUNT,
created_by="account-1",
- created_at=datetime(2024, 1, 1, tzinfo=UTC),
finished_at=None,
)
+ workflow_run.created_at = datetime(2024, 1, 1, tzinfo=UTC)
+ return workflow_run
def _execution(
@@ -109,7 +110,7 @@ def _execution(
workflow_id: str = "workflow-1",
workflow_run_id: str = "run-1",
) -> WorkflowNodeExecutionModel:
- return WorkflowNodeExecutionModel(
+ execution = WorkflowNodeExecutionModel(
tenant_id=tenant_id,
app_id=app_id,
workflow_id=workflow_id,
@@ -128,11 +129,12 @@ def _execution(
elapsed_time=0,
execution_metadata=json.dumps(execution_metadata) if execution_metadata is not None else None,
index=index,
- created_at=created_at or datetime.now(UTC),
created_by_role=CreatorUserRole.ACCOUNT,
created_by="account-1",
finished_at=finished_at,
)
+ execution.created_at = created_at or datetime.now(UTC)
+ return execution
def _agent_v2_node(*, node_id: str = "agent-node-1", title: str = "My Agent") -> dict[str, Any]:
diff --git a/api/tests/unit_tests/services/workflow/test_workflow_converter.py b/api/tests/unit_tests/services/workflow/test_workflow_converter.py
index 3cc8739623d..b95f0fd43e5 100644
--- a/api/tests/unit_tests/services/workflow/test_workflow_converter.py
+++ b/api/tests/unit_tests/services/workflow/test_workflow_converter.py
@@ -420,10 +420,10 @@ def test_convert_to_workflow_should_create_new_app_with_fallback_fields(
type=WorkflowType.WORKFLOW,
version=Workflow.VERSION_DRAFT,
graph="{}",
- features="{}",
+ _features="{}",
created_by="account-1",
- environment_variables=[],
- conversation_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
)
monkeypatch.setattr(converter, "convert_app_model_config_to_workflow", MagicMock(return_value=workflow))
phase_events: list[str] = []
diff --git a/api/tests/unit_tests/tasks/app_generate/test_workflow_execute_task.py b/api/tests/unit_tests/tasks/app_generate/test_workflow_execute_task.py
index 2c622d21657..c83c492a4b0 100644
--- a/api/tests/unit_tests/tasks/app_generate/test_workflow_execute_task.py
+++ b/api/tests/unit_tests/tasks/app_generate/test_workflow_execute_task.py
@@ -116,11 +116,11 @@ def _make_workflow(*, workflow_id: str = "workflow-id", app_id: str = "app-id")
type=WorkflowType.CHAT,
version=Workflow.VERSION_DRAFT,
graph="{}",
- features="{}",
+ _features="{}",
created_by="workflow-owner",
- environment_variables=[],
- conversation_variables=[],
- rag_pipeline_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
+ _rag_pipeline_variables=[],
)
@@ -191,11 +191,11 @@ def _persist_app_and_workflow(session_factory: sessionmaker[Session]) -> None:
type=WorkflowType.CHAT,
version=Workflow.VERSION_DRAFT,
graph="{}",
- features="{}",
+ _features="{}",
created_by="workflow-owner",
- environment_variables=[],
- conversation_variables=[],
- rag_pipeline_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
+ _rag_pipeline_variables=[],
)
with session_factory.begin() as session:
session.add_all([app, workflow])
@@ -222,11 +222,11 @@ def _persist_resumption_models(
type=WorkflowType.CHAT,
version=Workflow.VERSION_DRAFT,
graph="{}",
- features="{}",
+ _features="{}",
created_by="workflow-owner",
- environment_variables=[],
- conversation_variables=[],
- rag_pipeline_variables=[],
+ _environment_variables=[],
+ _conversation_variables=[],
+ _rag_pipeline_variables=[],
)
workflow_run = WorkflowRun(
id=workflow_run_id,
diff --git a/api/tests/unit_tests/tasks/test_workflow_node_execution_tasks.py b/api/tests/unit_tests/tasks/test_workflow_node_execution_tasks.py
index a4c2324db81..9c750d07614 100644
--- a/api/tests/unit_tests/tasks/test_workflow_node_execution_tasks.py
+++ b/api/tests/unit_tests/tasks/test_workflow_node_execution_tasks.py
@@ -16,6 +16,7 @@ from graphon.enums import BuiltinNodeTypes, WorkflowExecutionStatus, WorkflowNod
from models import Account
from models.enums import CreatorUserRole, WorkflowRunTriggeredFrom
from models.workflow import WorkflowNodeExecutionModel, WorkflowNodeExecutionTriggeredFrom, WorkflowRun
+from models.workflow import WorkflowType as ModelWorkflowType
from tasks.workflow_node_execution_tasks import (
_create_node_execution_from_domain,
_update_node_execution_from_domain,
@@ -116,7 +117,7 @@ def _stored_execution(
app_id: str = APP_ID,
process_data: dict[str, object] | None = None,
) -> WorkflowNodeExecutionModel:
- return WorkflowNodeExecutionModel(
+ run = WorkflowNodeExecutionModel(
id=execution_id,
tenant_id=tenant_id,
app_id=app_id,
@@ -137,11 +138,12 @@ def _stored_execution(
error=None,
elapsed_time=0,
execution_metadata="{}",
- created_at=datetime(2026, 8, 12, 1),
created_by_role=CreatorUserRole.ACCOUNT,
created_by=ACCOUNT_ID,
finished_at=None,
)
+ run.created_at = datetime(2026, 8, 12, 1)
+ return run
def test_create_helper_builds_real_mapped_model_with_serialized_runtime_values() -> None:
@@ -386,7 +388,7 @@ def test_delayed_nonterminal_node_write_cannot_revive_or_insert_a_live_node_afte
tenant_id=TENANT_ID,
app_id=APP_ID,
workflow_id=WORKFLOW_ID,
- type=WorkflowType.WORKFLOW,
+ type=ModelWorkflowType(WorkflowType.WORKFLOW),
triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
version="1",
status=WorkflowExecutionStatus.STOPPED,
@@ -454,7 +456,7 @@ def test_delayed_write_preserves_node_cleanup_before_workflow_summary_finishes(
tenant_id=TENANT_ID,
app_id=APP_ID,
workflow_id=WORKFLOW_ID,
- type=WorkflowType.WORKFLOW,
+ type=ModelWorkflowType(WorkflowType.WORKFLOW),
triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
version="1",
status=WorkflowExecutionStatus.RUNNING,