mirror of
https://github.com/langgenius/dify.git
synced 2026-02-12 04:01:29 -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.
92 lines
2.3 KiB
Python
92 lines
2.3 KiB
Python
from __future__ import annotations
|
|
|
|
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
|
|
|
|
simple_account_fields = {
|
|
"id": fields.String,
|
|
"name": fields.String,
|
|
"email": fields.String,
|
|
}
|
|
|
|
|
|
def _to_timestamp(value: datetime | int | None) -> int | None:
|
|
if isinstance(value, datetime):
|
|
return int(value.timestamp())
|
|
return value
|
|
|
|
|
|
def _build_avatar_url(avatar: str | None) -> str | None:
|
|
if avatar is None:
|
|
return None
|
|
if avatar.startswith(("http://", "https://")):
|
|
return avatar
|
|
return file_helpers.get_signed_file_url(avatar)
|
|
|
|
|
|
class ResponseModel(BaseModel):
|
|
model_config = ConfigDict(
|
|
from_attributes=True,
|
|
extra="ignore",
|
|
populate_by_name=True,
|
|
serialize_by_alias=True,
|
|
protected_namespaces=(),
|
|
)
|
|
|
|
|
|
class SimpleAccount(ResponseModel):
|
|
id: str
|
|
name: str
|
|
email: str
|
|
|
|
|
|
class _AccountAvatar(ResponseModel):
|
|
avatar: str | None = None
|
|
|
|
@computed_field(return_type=str | None) # type: ignore[prop-decorator]
|
|
@property
|
|
def avatar_url(self) -> str | None:
|
|
return _build_avatar_url(self.avatar)
|
|
|
|
|
|
class Account(_AccountAvatar):
|
|
id: str
|
|
name: str
|
|
email: str
|
|
is_password_set: bool
|
|
interface_language: str | None = None
|
|
interface_theme: str | None = None
|
|
timezone: str | None = None
|
|
last_login_at: int | None = None
|
|
last_login_ip: str | None = None
|
|
created_at: int | None = None
|
|
|
|
@field_validator("last_login_at", "created_at", mode="before")
|
|
@classmethod
|
|
def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
|
|
return _to_timestamp(value)
|
|
|
|
|
|
class AccountWithRole(_AccountAvatar):
|
|
id: str
|
|
name: str
|
|
email: str
|
|
last_login_at: int | None = None
|
|
last_active_at: int | None = None
|
|
created_at: int | None = None
|
|
role: str
|
|
status: str
|
|
|
|
@field_validator("last_login_at", "last_active_at", "created_at", mode="before")
|
|
@classmethod
|
|
def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
|
|
return _to_timestamp(value)
|
|
|
|
|
|
class AccountWithRoleList(ResponseModel):
|
|
accounts: list[AccountWithRole]
|