Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: cleanup tools, remove useless code #4833

Merged
merged 1 commit into from
May 31, 2024
Merged

chore: cleanup tools, remove useless code #4833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions api/core/tools/provider/builtin/vectorizer/tools/vectorizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,4 @@ def get_runtime_parameters(self) -> list[ToolParameter]:
options=[i.name for i in self.list_default_image_variables()]
)
]

def is_tool_available(self) -> bool:
return len(self.list_default_image_variables()) > 0

85 changes: 0 additions & 85 deletions api/core/tools/provider/builtin_tool_provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@
from os import listdir, path
from typing import Any

from core.tools.entities.api_entities import UserToolProviderCredentials
from core.tools.entities.tool_entities import ToolParameter, ToolProviderCredentials, ToolProviderType
from core.tools.entities.values import ToolLabelEnum, default_tool_label_dict
from core.tools.errors import (
ToolNotFoundError,
ToolParameterValidationError,
ToolProviderCredentialValidationError,
ToolProviderNotFoundError,
)
from core.tools.provider.tool_provider import ToolProviderController
Expand Down Expand Up @@ -84,15 +82,6 @@ def get_credentials_schema(self) -> dict[str, ToolProviderCredentials]:

return self.credentials_schema.copy()

def user_get_credentials_schema(self) -> UserToolProviderCredentials:
"""
returns the credentials schema of the provider, this method is used for user

:return: the credentials schema
"""
credentials = self.credentials_schema.copy()
return UserToolProviderCredentials(credentials=credentials)

def get_tools(self) -> list[Tool]:
"""
returns a list of tools that the provider can provide
Expand Down Expand Up @@ -222,80 +211,6 @@ def validate_parameters(self, tool_id: int, tool_name: str, tool_parameters: dic
default_value = bool(default_value)

tool_parameters[parameter] = default_value

def validate_credentials_format(self, credentials: dict[str, Any]) -> None:
"""
validate the format of the credentials of the provider and set the default value if needed

:param credentials: the credentials of the tool
"""
credentials_schema = self.credentials_schema
if credentials_schema is None:
return

credentials_need_to_validate: dict[str, ToolProviderCredentials] = {}
for credential_name in credentials_schema:
credentials_need_to_validate[credential_name] = credentials_schema[credential_name]

for credential_name in credentials:
if credential_name not in credentials_need_to_validate:
raise ToolProviderCredentialValidationError(f'credential {credential_name} not found in provider {self.identity.name}')

# check type
credential_schema = credentials_need_to_validate[credential_name]
if credential_schema == ToolProviderCredentials.CredentialsType.SECRET_INPUT or \
credential_schema == ToolProviderCredentials.CredentialsType.TEXT_INPUT:
if not isinstance(credentials[credential_name], str):
raise ToolProviderCredentialValidationError(f'credential {credential_schema.label.en_US} should be string')

elif credential_schema.type == ToolProviderCredentials.CredentialsType.SELECT:
if not isinstance(credentials[credential_name], str):
raise ToolProviderCredentialValidationError(f'credential {credential_schema.label.en_US} should be string')

options = credential_schema.options
if not isinstance(options, list):
raise ToolProviderCredentialValidationError(f'credential {credential_schema.label.en_US} options should be list')

if credentials[credential_name] not in [x.value for x in options]:
raise ToolProviderCredentialValidationError(f'credential {credential_schema.label.en_US} should be one of {options}')
elif credential_schema.type == ToolProviderCredentials.CredentialsType.BOOLEAN:
if isinstance(credentials[credential_name], bool):
pass
elif isinstance(credentials[credential_name], str):
if credentials[credential_name].lower() == 'true':
credentials[credential_name] = True
elif credentials[credential_name].lower() == 'false':
credentials[credential_name] = False
else:
raise ToolProviderCredentialValidationError(f'credential {credential_schema.label.en_US} should be boolean')
elif isinstance(credentials[credential_name], int):
if credentials[credential_name] == 1:
credentials[credential_name] = True
elif credentials[credential_name] == 0:
credentials[credential_name] = False
else:
raise ToolProviderCredentialValidationError(f'credential {credential_schema.label.en_US} should be boolean')
else:
raise ToolProviderCredentialValidationError(f'credential {credential_schema.label.en_US} should be boolean')

if credentials[credential_name] or credentials[credential_name] == False:
credentials_need_to_validate.pop(credential_name)

for credential_name in credentials_need_to_validate:
credential_schema = credentials_need_to_validate[credential_name]
if credential_schema.required:
raise ToolProviderCredentialValidationError(f'credential {credential_schema.label.en_US} is required')

# the credential is not set currently, set the default value if needed
if credential_schema.default is not None:
default_value = credential_schema.default
# parse default value into the correct type
if credential_schema.type == ToolProviderCredentials.CredentialsType.SECRET_INPUT or \
credential_schema.type == ToolProviderCredentials.CredentialsType.TEXT_INPUT or \
credential_schema.type == ToolProviderCredentials.CredentialsType.SELECT:
default_value = str(default_value)

credentials[credential_name] = default_value

def validate_credentials(self, credentials: dict[str, Any]) -> None:
"""
Expand Down
10 changes: 0 additions & 10 deletions api/core/tools/provider/tool_provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

from pydantic import BaseModel

from core.tools.entities.api_entities import UserToolProviderCredentials
from core.tools.entities.tool_entities import (
ToolParameter,
ToolProviderCredentials,
Expand All @@ -27,15 +26,6 @@ def get_credentials_schema(self) -> dict[str, ToolProviderCredentials]:
"""
return self.credentials_schema.copy()

def user_get_credentials_schema(self) -> UserToolProviderCredentials:
"""
returns the credentials schema of the provider, this method is used for user

:return: the credentials schema
"""
credentials = self.credentials_schema.copy()
return UserToolProviderCredentials(credentials=credentials)

@abstractmethod
def get_tools(self) -> list[Tool]:
"""
Expand Down
8 changes: 0 additions & 8 deletions api/core/tools/tool/tool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,14 +326,6 @@ def get_all_runtime_parameters(self) -> list[ToolParameter]:

return parameters

def is_tool_available(self) -> bool:
"""
check if the tool is available

:return: if the tool is available
"""
return True

def create_image_message(self, image: str, save_as: str = '') -> ToolInvokeMessage:
"""
create an image message
Expand Down
Loading