Feat/workflow phase2 (#4687)

api/core/tools/tool/builtin_tool.py

@@ -2,9 +2,8 @@
 from core.model_runtime.entities.llm_entities import LLMResult
 from core.model_runtime.entities.message_entities import PromptMessage, SystemPromptMessage, UserPromptMessage
 from core.tools.entities.tool_entities import ToolProviderType
-from core.tools.entities.user_entities import UserToolProvider
-from core.tools.model.tool_model_manager import ToolModelManager
 from core.tools.tool.tool import Tool
+from core.tools.utils.model_invocation_utils import ModelInvocationUtils
 from core.tools.utils.web_reader_tool import get_url
 
 _SUMMARY_PROMPT = """You are a professional language researcher, you are interested in the language
@@ -34,7 +33,7 @@ class BuiltinTool(Tool):
             :return: the model result
         """
         # invoke model
-        return ToolModelManager.invoke(
+        return ModelInvocationUtils.invoke(
             user_id=user_id,
             tenant_id=self.runtime.tenant_id,
             tool_type='builtin',
@@ -43,7 +42,7 @@ class BuiltinTool(Tool):
         )
     
     def tool_provider_type(self) -> ToolProviderType:
-        return UserToolProvider.ProviderType.BUILTIN
+        return ToolProviderType.BUILT_IN
     
     def get_max_tokens(self) -> int:
         """
@@ -52,7 +51,7 @@ class BuiltinTool(Tool):
             :param model_config: the model config
             :return: the max tokens
         """
-        return ToolModelManager.get_max_llm_context_tokens(
+        return ModelInvocationUtils.get_max_llm_context_tokens(
             tenant_id=self.runtime.tenant_id,
         )
 
@@ -63,7 +62,7 @@ class BuiltinTool(Tool):
             :param prompt_messages: the prompt messages
             :return: the tokens
         """
-        return ToolModelManager.calculate_tokens(
+        return ModelInvocationUtils.calculate_tokens(
             tenant_id=self.runtime.tenant_id,
             prompt_messages=prompt_messages
         )