youngkingdom/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-05-06 02:18:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: circular import

Browse Source
This commit is contained in:
Stream
2026-01-30 07:11:20 +08:00
parent 7926024569
commit ec9ade62f5
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
api/core/plugin/utils/chunk_merger.py
View File

@ -1,11 +1,13 @@
from collections.abc import Generator from collections.abc import Generator
from dataclasses import dataclass, field from dataclasses import dataclass, field
from typing import TypeVar, Union from typing import TYPE_CHECKING, TypeVar
from core.agent.entities import AgentInvokeMessage
from core.tools.entities.tool_entities import ToolInvokeMessage from core.tools.entities.tool_entities import ToolInvokeMessage
MessageType = TypeVar("MessageType", bound=Union[ToolInvokeMessage, AgentInvokeMessage]) if TYPE_CHECKING:
from core.agent.entities import AgentInvokeMessage
MessageType = TypeVar("MessageType", bound=ToolInvokeMessage)
@dataclass @dataclass
@ -87,7 +89,7 @@ def merge_blob_chunks(
), ),
meta=resp.meta, meta=resp.meta,
) )
assert isinstance(merged_message, (ToolInvokeMessage, AgentInvokeMessage)) assert isinstance(merged_message, ToolInvokeMessage)
yield merged_message # type: ignore yield merged_message # type: ignore
# Clean up the buffer # Clean up the buffer
del files[chunk_id] del files[chunk_id]

5
api/core/tools/tool_manager.py
View File

@ -1,3 +1,5 @@
from __future__ import annotations
import json import json
import logging import logging
import mimetypes import mimetypes
@ -31,9 +33,8 @@ from services.enterprise.plugin_manager_service import PluginCredentialType
from services.tools.mcp_tools_manage_service import MCPToolManageService from services.tools.mcp_tools_manage_service import MCPToolManageService
if TYPE_CHECKING: if TYPE_CHECKING:
from core.agent.entities import AgentToolEntity
from core.workflow.nodes.tool.entities import ToolEntity from core.workflow.nodes.tool.entities import ToolEntity
from core.agent.entities import AgentToolEntity
from core.app.entities.app_invoke_entities import InvokeFrom from core.app.entities.app_invoke_entities import InvokeFrom
from core.helper.module_import_helper import load_single_subclass_from_source from core.helper.module_import_helper import load_single_subclass_from_source
from core.helper.position_helper import is_filtered from core.helper.position_helper import is_filtered