Merge remote-tracking branch 'refs/remotes/origin/main' into feat/evaluation

api/fields/_value_type_serializer.py

@@ -1,7 +1,7 @@
 from typing import TypedDict
 
-from core.workflow.variables.segments import Segment
-from core.workflow.variables.types import SegmentType
+from dify_graph.variables.segments import Segment
+from dify_graph.variables.types import SegmentType
 
 
 class _VarTypedDict(TypedDict, total=False):

api/fields/conversation_fields.py

@@ -5,7 +5,7 @@ from typing import Any, TypeAlias
 
 from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator
 
-from core.workflow.file import File
+from dify_graph.file import File
 
 JSONValue: TypeAlias = Any
 

api/fields/member_fields.py

@@ -5,7 +5,7 @@ from datetime import datetime
 from flask_restx import fields
 from pydantic import BaseModel, ConfigDict, computed_field, field_validator
 
-from core.workflow.file import helpers as file_helpers
+from dify_graph.file import helpers as file_helpers
 
 simple_account_fields = {
     "id": fields.String,

api/fields/message_fields.py

@@ -7,7 +7,7 @@ from uuid import uuid4
 from pydantic import BaseModel, ConfigDict, Field, field_validator
 
 from core.entities.execution_extra_content import ExecutionExtraContentDomainModel
-from core.workflow.file import File
+from dify_graph.file import File
 from fields.conversation_fields import AgentThought, JSONValue, MessageFile
 
 JSONValueType: TypeAlias = JSONValue

api/fields/raws.py

@@ -1,6 +1,6 @@
 from flask_restx import fields
 
-from core.workflow.file import File
+from dify_graph.file import File
 
 
 class FilesContainedField(fields.Raw):

api/fields/workflow_fields.py

@@ -1,7 +1,7 @@
 from flask_restx import fields
 
 from core.helper import encrypter
-from core.workflow.variables import SecretVariable, SegmentType, VariableBase
+from dify_graph.variables import SecretVariable, SegmentType, VariableBase
 from fields.member_fields import simple_account_fields
 from libs.helper import TimestampField