diff --git a/api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py b/api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py index 5dd5195449..5af838e057 100644 --- a/api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py +++ b/api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py @@ -9,7 +9,7 @@ from core.entities.agent_entities import PlanningStrategy from core.entities.model_entities import ModelStatus from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError from core.model_manager import ModelInstance, ModelManager -from core.model_runtime.entities.message_entities import PromptMessageTool, SystemPromptMessage, UserPromptMessage +from core.model_runtime.entities.message_entities import PromptMessageTool from core.model_runtime.entities.model_entities import ModelFeature, ModelType from core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel from core.rag.datasource.retrieval_service import RetrievalService diff --git a/api/core/workflow/nodes/knowledge_retrieval/multi_dataset_function_call_router.py b/api/core/workflow/nodes/knowledge_retrieval/multi_dataset_function_call_router.py index 9d723c5cee..84e53952ac 100644 --- a/api/core/workflow/nodes/knowledge_retrieval/multi_dataset_function_call_router.py +++ b/api/core/workflow/nodes/knowledge_retrieval/multi_dataset_function_call_router.py @@ -1,19 +1,8 @@ -from collections.abc import Generator, Sequence -from typing import Optional, Union - -from langchain import PromptTemplate -from langchain.agents.structured_chat.base import HUMAN_MESSAGE_TEMPLATE -from langchain.agents.structured_chat.prompt import PREFIX, SUFFIX +from typing import Union from core.app.entities.app_invoke_entities import ModelConfigWithCredentialsEntity from core.model_manager import ModelInstance -from core.model_runtime.entities.llm_entities import LLMUsage -from core.model_runtime.entities.message_entities import PromptMessage, PromptMessageRole, PromptMessageTool, \ - SystemPromptMessage, UserPromptMessage -from core.prompt.advanced_prompt_transform import AdvancedPromptTransform -from core.prompt.entities.advanced_prompt_entities import ChatModelMessage -from core.workflow.nodes.knowledge_retrieval.entities import KnowledgeRetrievalNodeData -from core.workflow.nodes.llm.llm_node import LLMNode +from core.model_runtime.entities.message_entities import PromptMessageTool, SystemPromptMessage, UserPromptMessage class FunctionCallMultiDatasetRouter: diff --git a/api/core/workflow/nodes/knowledge_retrieval/structed_multi_dataset_router_agent.py b/api/core/workflow/nodes/knowledge_retrieval/structed_multi_dataset_router_agent.py index 33e30f10b4..a2e3cd71a5 100644 --- a/api/core/workflow/nodes/knowledge_retrieval/structed_multi_dataset_router_agent.py +++ b/api/core/workflow/nodes/knowledge_retrieval/structed_multi_dataset_router_agent.py @@ -2,9 +2,7 @@ from collections.abc import Generator, Sequence from typing import Optional, Union from langchain import PromptTemplate -from langchain.agents import AgentOutputParser from langchain.agents.structured_chat.base import HUMAN_MESSAGE_TEMPLATE -from langchain.agents.structured_chat.output_parser import StructuredChatOutputParserWithRetries from langchain.agents.structured_chat.prompt import PREFIX, SUFFIX from langchain.schema import AgentAction @@ -17,7 +15,6 @@ from core.prompt.entities.advanced_prompt_entities import ChatModelMessage from core.rag.retrieval.agent.output_parser.structured_chat import StructuredChatOutputParser from core.workflow.nodes.knowledge_retrieval.entities import KnowledgeRetrievalNodeData from core.workflow.nodes.llm.llm_node import LLMNode -from pydantic import Field FORMAT_INSTRUCTIONS = """Use a json blob to specify a tool by providing an action key (tool name) and an action_input key (tool input). The nouns in the format of "Thought", "Action", "Action Input", "Final Answer" must be expressed in English.