refactor: list tools

api/core/plugin/entities/plugin_daemon.py

@@ -3,6 +3,8 @@ from typing import Generic, Optional, TypeVar
 
 from pydantic import BaseModel
 
+from core.tools.entities.tool_entities import ToolProviderEntityWithPlugin
+
 T = TypeVar("T", bound=(BaseModel | dict | list | bool))
 
 
@@ -26,4 +28,11 @@ class InstallPluginMessage(BaseModel):
         Error = "error"
 
     event: Event
-    data: str
+    data: str
+
+
+class PluginToolProviderEntity(BaseModel):
+    provider: str
+    plugin_unique_identifier: str
+    plugin_id: str
+    declaration: ToolProviderEntityWithPlugin

api/core/plugin/manager/base.py

@@ -93,7 +93,14 @@ class BasePluginManager:
         Make a request to the plugin daemon inner API and return the response as a model.
         """
         response = self._request(method, path, headers, data, params)
-        rep = PluginDaemonBasicResponse[type](**response.json())
+        json_response = response.json()
+        for provider in json_response.get("data", []):
+            declaration = provider.get("declaration", {}) or {}
+            provider_name = declaration.get("identity", {}).get("name")
+            for tool in declaration.get("tools", []):
+                tool["identity"]["provider"] = provider_name
+
+        rep = PluginDaemonBasicResponse[type](**json_response)
         if rep.code != 0:
             raise ValueError(f"got error from plugin daemon: {rep.message}, code: {rep.code}")
         if rep.data is None:

api/core/plugin/manager/tool.py

@@ -1,13 +1,65 @@
+from collections.abc import Generator
+from typing import Any
+
+from core.plugin.entities.plugin_daemon import PluginToolProviderEntity
 from core.plugin.manager.base import BasePluginManager
-from core.tools.entities.tool_entities import ToolProviderEntity
+from core.tools.entities.tool_entities import ToolInvokeMessage
 
 
 class PluginToolManager(BasePluginManager):
-    def fetch_tool_providers(self, tenant_id: str) -> list[ToolProviderEntity]:
+    def fetch_tool_providers(self, tenant_id: str) -> list[PluginToolProviderEntity]:
         """
         Fetch tool providers for the given asset.
         """
         response = self._request_with_plugin_daemon_response(
-            "GET", f"plugin/{tenant_id}/tools", list[ToolProviderEntity], params={"page": 1, "page_size": 256}
+            "GET", f"plugin/{tenant_id}/tools", list[PluginToolProviderEntity], params={"page": 1, "page_size": 256}
+        )
+        return response
+
+    def invoke(
+        self,
+        tenant_id: str,
+        user_id: str,
+        plugin_unique_identifier: str,
+        tool_provider: str,
+        tool_name: str,
+        credentials: dict[str, Any],
+        tool_parameters: dict[str, Any],
+    ) -> Generator[ToolInvokeMessage, None, None]:
+        response = self._request_with_plugin_daemon_response_stream(
+            "POST",
+            f"plugin/{tenant_id}/tool/invoke",
+            ToolInvokeMessage,
+            data={
+                "plugin_unique_identifier": plugin_unique_identifier,
+                "user_id": user_id,
+                "data": {
+                    "provider": tool_provider,
+                    "tool": tool_name,
+                    "credentials": credentials,
+                    "tool_parameters": tool_parameters,
+                },
+            },
+        )
+        return response
+
+    def validate_provider_credentials(
+        self, tenant_id: str, user_id: str, plugin_unique_identifier: str, provider: str, credentials: dict[str, Any]
+    ) -> bool:
+        """
+        validate the credentials of the provider
+        """
+        response = self._request_with_plugin_daemon_response(
+            "POST",
+            f"plugin/{tenant_id}/tool/validate_credentials",
+            bool,
+            data={
+                "plugin_unique_identifier": plugin_unique_identifier,
+                "user_id": user_id,
+                "data": {
+                    "provider": provider,
+                    "credentials": credentials,
+                },
+            },
         )
         return response