mirror of
https://github.com/langgenius/dify.git
synced 2026-02-12 13:00:45 -05:00
b4c0fb9463
Complete phase 2 of the file module migration by replacing the remaining repository-wide legacy imports and deleting the temporary core.file compatibility package introduced in phase 1. What this commit changes - Replace legacy core.file.* imports with core.workflow.file.* across: - controllers - core app/agent/datasource/prompt/rag/tools/variables - factories, fields, libs, models, services - otel parser integration points - unit and integration tests that referenced legacy paths - Migrate residual runtime usages in app/task pipeline paths that still referenced core.file symbols. - Update tests and model serialization helpers that relied on old module paths. - Remove the compatibility bridge package entirely: - delete core/file/__init__.py - delete core/file/constants.py - delete core/file/enums.py - delete core/file/file_manager.py - delete core/file/helpers.py - delete core/file/models.py - delete core/file/tool_file_parser.py Verification - No Python references to core.file remain ( -> empty). - Targeted regression tests for migrated file primitives and factory/type flows passed: - tests/unit_tests/core/test_file.py - tests/unit_tests/factories/test_variable_factory.py - tests/unit_tests/services/test_variable_truncator.py Result - The repository now uses core.workflow.file as the single canonical file namespace. - The migration is fully split into two commits: phase 1 compatibility + phase 2 full cutover.
142 lines
4.2 KiB
Python
142 lines
4.2 KiB
Python
from __future__ import annotations
|
|
|
|
from datetime import datetime
|
|
from typing import TypeAlias
|
|
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 fields.conversation_fields import AgentThought, JSONValue, MessageFile
|
|
|
|
JSONValueType: TypeAlias = JSONValue
|
|
|
|
|
|
class ResponseModel(BaseModel):
|
|
model_config = ConfigDict(from_attributes=True, extra="ignore")
|
|
|
|
|
|
class SimpleFeedback(ResponseModel):
|
|
rating: str | None = None
|
|
|
|
|
|
class RetrieverResource(ResponseModel):
|
|
id: str = Field(default_factory=lambda: str(uuid4()))
|
|
message_id: str = Field(default_factory=lambda: str(uuid4()))
|
|
position: int
|
|
dataset_id: str | None = None
|
|
dataset_name: str | None = None
|
|
document_id: str | None = None
|
|
document_name: str | None = None
|
|
data_source_type: str | None = None
|
|
segment_id: str | None = None
|
|
score: float | None = None
|
|
hit_count: int | None = None
|
|
word_count: int | None = None
|
|
segment_position: int | None = None
|
|
index_node_hash: str | None = None
|
|
content: str | None = None
|
|
summary: str | None = None
|
|
created_at: int | None = None
|
|
|
|
@field_validator("created_at", mode="before")
|
|
@classmethod
|
|
def _normalize_created_at(cls, value: datetime | int | None) -> int | None:
|
|
if isinstance(value, datetime):
|
|
return to_timestamp(value)
|
|
return value
|
|
|
|
|
|
class MessageListItem(ResponseModel):
|
|
id: str
|
|
conversation_id: str
|
|
parent_message_id: str | None = None
|
|
inputs: dict[str, JSONValueType]
|
|
query: str
|
|
answer: str = Field(validation_alias="re_sign_file_url_answer")
|
|
feedback: SimpleFeedback | None = Field(default=None, validation_alias="user_feedback")
|
|
retriever_resources: list[RetrieverResource]
|
|
created_at: int | None = None
|
|
agent_thoughts: list[AgentThought]
|
|
message_files: list[MessageFile]
|
|
status: str
|
|
error: str | None = None
|
|
extra_contents: list[ExecutionExtraContentDomainModel]
|
|
|
|
@field_validator("inputs", mode="before")
|
|
@classmethod
|
|
def _normalize_inputs(cls, value: JSONValueType) -> JSONValueType:
|
|
return format_files_contained(value)
|
|
|
|
@field_validator("created_at", mode="before")
|
|
@classmethod
|
|
def _normalize_created_at(cls, value: datetime | int | None) -> int | None:
|
|
if isinstance(value, datetime):
|
|
return to_timestamp(value)
|
|
return value
|
|
|
|
|
|
class WebMessageListItem(MessageListItem):
|
|
metadata: JSONValueType | None = Field(default=None, validation_alias="message_metadata_dict")
|
|
|
|
|
|
class MessageInfiniteScrollPagination(ResponseModel):
|
|
limit: int
|
|
has_more: bool
|
|
data: list[MessageListItem]
|
|
|
|
|
|
class WebMessageInfiniteScrollPagination(ResponseModel):
|
|
limit: int
|
|
has_more: bool
|
|
data: list[WebMessageListItem]
|
|
|
|
|
|
class SavedMessageItem(ResponseModel):
|
|
id: str
|
|
inputs: dict[str, JSONValueType]
|
|
query: str
|
|
answer: str
|
|
message_files: list[MessageFile]
|
|
feedback: SimpleFeedback | None = Field(default=None, validation_alias="user_feedback")
|
|
created_at: int | None = None
|
|
|
|
@field_validator("inputs", mode="before")
|
|
@classmethod
|
|
def _normalize_inputs(cls, value: JSONValueType) -> JSONValueType:
|
|
return format_files_contained(value)
|
|
|
|
@field_validator("created_at", mode="before")
|
|
@classmethod
|
|
def _normalize_created_at(cls, value: datetime | int | None) -> int | None:
|
|
if isinstance(value, datetime):
|
|
return to_timestamp(value)
|
|
return value
|
|
|
|
|
|
class SavedMessageInfiniteScrollPagination(ResponseModel):
|
|
limit: int
|
|
has_more: bool
|
|
data: list[SavedMessageItem]
|
|
|
|
|
|
class SuggestedQuestionsResponse(ResponseModel):
|
|
data: list[str]
|
|
|
|
|
|
def to_timestamp(value: datetime | None) -> int | None:
|
|
if value is None:
|
|
return None
|
|
return int(value.timestamp())
|
|
|
|
|
|
def format_files_contained(value: JSONValueType) -> JSONValueType:
|
|
if isinstance(value, File):
|
|
return value.model_dump()
|
|
if isinstance(value, dict):
|
|
return {k: format_files_contained(v) for k, v in value.items()}
|
|
if isinstance(value, list):
|
|
return [format_files_contained(v) for v in value]
|
|
return value
|