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

refactor: list tools

Browse Source
This commit is contained in:
Yeuoly
2024-09-23 18:06:16 +08:00
parent 435e71eb60
commit 7a3e756020
26 changed files with 365 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
api/core/tools/builtin_tool/provider.py
View File

@ -19,9 +19,7 @@ class BuiltinToolProviderController(ToolProviderController):
tools: list[BuiltinTool]
def __init__(self, **data: Any) -> None:
if self.provider_type == ToolProviderType.API:
super().__init__(**data)
return
self.tools = []
# load provider yaml
provider = self.__class__.__module__.split(".")[-1]
@ -76,9 +74,12 @@ class BuiltinToolProviderController(ToolProviderController):
parent_type=BuiltinTool,
)
tool["identity"]["provider"] = provider
tools.append(assistant_tool_class(
entity=ToolEntity(**tool), runtime=ToolRuntime(tenant_id=""),
))
tools.append(
assistant_tool_class(
entity=ToolEntity(**tool),
runtime=ToolRuntime(tenant_id=""),
)
)
self.tools = tools
return tools
@ -142,7 +143,7 @@ class BuiltinToolProviderController(ToolProviderController):
"""
return self.entity.identity.tags or []
def validate_credentials(self, credentials: dict[str, Any]) -> None:
def validate_credentials(self, user_id: str, credentials: dict[str, Any]) -> None:
"""
validate the credentials of the provider
@ -153,10 +154,10 @@ class BuiltinToolProviderController(ToolProviderController):
self.validate_credentials_format(credentials)
# validate credentials
self._validate_credentials(credentials)
self._validate_credentials(user_id, credentials)
@abstractmethod
def _validate_credentials(self, credentials: dict[str, Any]) -> None:
def _validate_credentials(self, user_id: str, credentials: dict[str, Any]) -> None:
"""
validate the credentials of the provider