opensource
/
dify
mirror of https://github.com/langgenius/dify.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix validation (#28985) 

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
This commit is contained in:
wangxiaolei 2025-12-02 10:25:52 +08:00 committed by GitHub
parent 0a22bc5d05
commit e8f93380d1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
api/core/app/entities/app_invoke_entities.py
View File

@ -4,15 +4,15 @@ from typing import TYPE_CHECKING, Any, Optional
from pydantic import BaseModel, ConfigDict, Field, ValidationInfo, field_validator from pydantic import BaseModel, ConfigDict, Field, ValidationInfo, field_validator
if TYPE_CHECKING:
from core.ops.ops_trace_manager import TraceQueueManager
from constants import UUID_NIL from constants import UUID_NIL
from core.app.app_config.entities import EasyUIBasedAppConfig, WorkflowUIBasedAppConfig from core.app.app_config.entities import EasyUIBasedAppConfig, WorkflowUIBasedAppConfig
from core.entities.provider_configuration import ProviderModelBundle from core.entities.provider_configuration import ProviderModelBundle
from core.file import File, FileUploadConfig from core.file import File, FileUploadConfig
from core.model_runtime.entities.model_entities import AIModelEntity from core.model_runtime.entities.model_entities import AIModelEntity
if TYPE_CHECKING:
from core.ops.ops_trace_manager import TraceQueueManager
class InvokeFrom(StrEnum): class InvokeFrom(StrEnum):
""" """
@ -130,7 +130,7 @@ class AppGenerateEntity(BaseModel):
# extra parameters, like: auto_generate_conversation_name # extra parameters, like: auto_generate_conversation_name
extras: dict[str, Any] = Field(default_factory=dict) extras: dict[str, Any] = Field(default_factory=dict)
# tracing instance; use forward ref to avoid circular import at import time # tracing instance
trace_manager: Optional["TraceQueueManager"] = None trace_manager: Optional["TraceQueueManager"] = None
@ -275,23 +275,14 @@ class RagPipelineGenerateEntity(WorkflowAppGenerateEntity):
start_node_id: str | None = None start_node_id: str | None = None
# NOTE: Avoid importing heavy tracing modules at import time to prevent circular imports. from core.ops.ops_trace_manager import TraceQueueManager
# Forward reference to TraceQueueManager is kept as a string; we rebuild with a stub now to
# avoid Pydantic forward-ref errors in test contexts, and with the real class at app startup.
AppGenerateEntity.model_rebuild()
# Minimal stub to satisfy Pydantic model_rebuild in environments where the real type is not importable yet. EasyUIBasedAppGenerateEntity.model_rebuild()
class _TraceQueueManagerStub: ConversationAppGenerateEntity.model_rebuild()
pass ChatAppGenerateEntity.model_rebuild()
CompletionAppGenerateEntity.model_rebuild()
AgentChatAppGenerateEntity.model_rebuild()
_ns = {"TraceQueueManager": _TraceQueueManagerStub} AdvancedChatAppGenerateEntity.model_rebuild()
AppGenerateEntity.model_rebuild(_types_namespace=_ns) WorkflowAppGenerateEntity.model_rebuild()
EasyUIBasedAppGenerateEntity.model_rebuild(_types_namespace=_ns) RagPipelineGenerateEntity.model_rebuild()
ConversationAppGenerateEntity.model_rebuild(_types_namespace=_ns)
ChatAppGenerateEntity.model_rebuild(_types_namespace=_ns)
CompletionAppGenerateEntity.model_rebuild(_types_namespace=_ns)
AgentChatAppGenerateEntity.model_rebuild(_types_namespace=_ns)
AdvancedChatAppGenerateEntity.model_rebuild(_types_namespace=_ns)
WorkflowAppGenerateEntity.model_rebuild(_types_namespace=_ns)
RagPipelineGenerateEntity.model_rebuild(_types_namespace=_ns)