jprdonnelly/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-05-12 21:01:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feat/evaluation' into feat/evaluation

Browse Source 
# Conflicts:
#	api/controllers/console/app/app.py
#	api/services/workflow_service.py
This commit is contained in:
FFXN
2026-04-20 14:08:45 +08:00
parent 2b5dbbc7ff 1767c98449
commit 70bcbbb8c5
734 changed files with 33673 additions and 4795 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
api/models/workflow.py
View File

@@ -8,6 +8,19 @@ from typing import TYPE_CHECKING, Any, Optional, TypedDict, cast
from uuid import uuid4
import sqlalchemy as sa
from graphon.entities.graph_config import NodeConfigDict, NodeConfigDictAdapter
from graphon.entities.pause_reason import HumanInputRequired, PauseReason, PauseReasonType, SchedulingPause
from graphon.enums import (
BuiltinNodeTypes,
NodeType,
WorkflowExecutionStatus,
WorkflowNodeExecutionMetadataKey,
WorkflowNodeExecutionStatus,
)
from graphon.file import File
from graphon.file.constants import maybe_file_object
from graphon.variables import utils as variable_utils
from graphon.variables.variables import FloatVariable, IntegerVariable, RAGPipelineVariable, StringVariable
from sqlalchemy import (
DateTime,
Index,
@@ -31,19 +44,6 @@ from core.workflow.variable_prefixes import (
)
from extensions.ext_storage import Storage
from factories.variable_factory import TypeMismatchError, build_segment_with_type
from graphon.entities.graph_config import NodeConfigDict, NodeConfigDictAdapter
from graphon.entities.pause_reason import HumanInputRequired, PauseReason, PauseReasonType, SchedulingPause
from graphon.enums import (
BuiltinNodeTypes,
NodeType,
WorkflowExecutionStatus,
WorkflowNodeExecutionMetadataKey,
WorkflowNodeExecutionStatus,
)
from graphon.file import File
from graphon.file.constants import maybe_file_object
from graphon.variables import utils as variable_utils
from graphon.variables.variables import FloatVariable, IntegerVariable, RAGPipelineVariable, StringVariable
from libs.datetime_utils import naive_utc_now
from libs.uuid_utils import uuidv7
@@ -53,10 +53,11 @@ if TYPE_CHECKING:
from .model import AppMode, UploadFile
from graphon.variables import SecretVariable, Segment, SegmentType, VariableBase
from constants import DEFAULT_FILE_NUMBER_LIMITS, HIDDEN_VALUE
from core.helper import encrypter
from factories import variable_factory
from graphon.variables import SecretVariable, Segment, SegmentType, VariableBase
from libs import helper
from .account import Account