From d48bdf3e14189e8610c2c6fb4673d65bcfd06710 Mon Sep 17 00:00:00 2001
From: Yeuoly <admin@srmxy.cn>
Date: Wed, 3 Apr 2024 12:02:51 +0800
Subject: [PATCH] chore: generic

---
 api/services/tools_manage_service.py    | 14 +----
 api/services/tools_transform_service.py | 75 +++++++++++++++----------
 2 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/api/services/tools_manage_service.py b/api/services/tools_manage_service.py
index f342c019f6..16b1ba3f76 100644
--- a/api/services/tools_manage_service.py
+++ b/api/services/tools_manage_service.py
@@ -281,19 +281,7 @@ class ToolManageService:
             raise ValueError(f'you have not added provider {provider}')
         
         return [
-            UserTool(
-                author=tool_bundle.author,
-                name=tool_bundle.operation_id,
-                label=I18nObject(
-                    en_US=tool_bundle.operation_id,
-                    zh_Hans=tool_bundle.operation_id
-                ),
-                description=I18nObject(
-                    en_US=tool_bundle.summary or '',
-                    zh_Hans=tool_bundle.summary or ''
-                ),
-                parameters=tool_bundle.parameters
-            ) for tool_bundle in provider.tools
+            ToolTransformService.tool_to_user_tool(tool_bundle) for tool_bundle in provider.tools
         ]
 
     @staticmethod
diff --git a/api/services/tools_transform_service.py b/api/services/tools_transform_service.py
index d54b1e0437..3ef9f52e62 100644
--- a/api/services/tools_transform_service.py
+++ b/api/services/tools_transform_service.py
@@ -5,6 +5,7 @@ from typing import Optional, Union
 from flask import current_app
 
 from core.model_runtime.entities.common_entities import I18nObject
+from core.tools.entities.tool_bundle import ApiBasedToolBundle
 from core.tools.entities.tool_entities import ApiProviderAuthType, ToolParameter, ToolProviderCredentials
 from core.tools.entities.user_entities import UserTool, UserToolProvider
 from core.tools.provider.api_tool_provider import ApiBasedToolProviderController
@@ -211,40 +212,56 @@ class ToolTransformService:
     
     @staticmethod
     def tool_to_user_tool(
-        tool: Tool, credentials: dict = None, tenant_id: str = None
+        tool: Union[ApiBasedToolBundle, Tool], credentials: dict = None, tenant_id: str = None
     ) -> UserTool:
         """
         convert tool to user tool
         """
-        # fork tool runtime
-        tool = tool.fork_tool_runtime(meta={
-            'credentials': credentials,
-            'tenant_id': tenant_id,
-        })
+        if isinstance(tool, Tool):
+            # fork tool runtime
+            tool = tool.fork_tool_runtime(meta={
+                'credentials': credentials,
+                'tenant_id': tenant_id,
+            })
 
-        # get tool parameters
-        parameters = tool.parameters or []
-        # get tool runtime parameters
-        runtime_parameters = tool.get_runtime_parameters() or []
-        # override parameters
-        current_parameters = parameters.copy()
-        for runtime_parameter in runtime_parameters:
-            found = False
-            for index, parameter in enumerate(current_parameters):
-                if parameter.name == runtime_parameter.name and parameter.form == runtime_parameter.form:
-                    current_parameters[index] = runtime_parameter
-                    found = True
-                    break
+            # get tool parameters
+            parameters = tool.parameters or []
+            # get tool runtime parameters
+            runtime_parameters = tool.get_runtime_parameters() or []
+            # override parameters
+            current_parameters = parameters.copy()
+            for runtime_parameter in runtime_parameters:
+                found = False
+                for index, parameter in enumerate(current_parameters):
+                    if parameter.name == runtime_parameter.name and parameter.form == runtime_parameter.form:
+                        current_parameters[index] = runtime_parameter
+                        found = True
+                        break
 
-            if not found and runtime_parameter.form == ToolParameter.ToolParameterForm.FORM:
-                current_parameters.append(runtime_parameter)
+                if not found and runtime_parameter.form == ToolParameter.ToolParameterForm.FORM:
+                    current_parameters.append(runtime_parameter)
 
-        user_tool = UserTool(
-            author=tool.identity.author,
-            name=tool.identity.name,
-            label=tool.identity.label,
-            description=tool.description.human,
-            parameters=current_parameters
-        )
+            user_tool = UserTool(
+                author=tool.identity.author,
+                name=tool.identity.name,
+                label=tool.identity.label,
+                description=tool.description.human,
+                parameters=current_parameters
+            )
 
-        return user_tool
\ No newline at end of file
+            return user_tool
+        
+        if isinstance(tool, ApiBasedToolBundle):
+            return UserTool(
+                author=tool.author,
+                name=tool.operation_id,
+                label=I18nObject(
+                    en_US=tool.operation_id,
+                    zh_Hans=tool.operation_id
+                ),
+                description=I18nObject(
+                    en_US=tool.summary or '',
+                    zh_Hans=tool.summary or ''
+                ),
+                parameters=tool.parameters
+            )
\ No newline at end of file