Skip to content

Fixes you have not added provider None #10501

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

Merged
merged 2 commits into from
Nov 11, 2024
Merged

Fixes you have not added provider None #10501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea71927
fix(tool): fix error message
smyhw Nov 10, 2024
02e39e7
fix(tool): trailing spaces in provider_name
smyhw Nov 10, 2024
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
3 changes: 2 additions & 1 deletion api/core/tools/tool_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,6 +555,7 @@ def user_get_api_provider(cls, provider: str, tenant_id: str) -> dict:
"""
get tool provider
"""
provider_name = provider
provider: ApiToolProvider = (
db.session.query(ApiToolProvider)
.filter(
Expand All @@ -565,7 +566,7 @@ def user_get_api_provider(cls, provider: str, tenant_id: str) -> dict:
)

if provider is None:
raise ValueError(f"you have not added provider {provider}")
raise ValueError(f"you have not added provider {provider_name}")

try:
credentials = json.loads(provider.credentials_str) or {}
Expand Down
7 changes: 6 additions & 1 deletion api/services/tools/api_tools_manage_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@ def create_api_tool_provider(
if schema_type not in [member.value for member in ApiProviderSchemaType]:
raise ValueError(f"invalid schema type {schema}")

provider_name = provider_name.strip()

# check if the provider exists
provider: ApiToolProvider = (
db.session.query(ApiToolProvider)
Expand Down Expand Up @@ -203,6 +205,7 @@ def list_api_tool_provider_tools(user_id: str, tenant_id: str, provider: str) ->
"""
list api tool provider tools
"""
provider_name = provider
provider: ApiToolProvider = (
db.session.query(ApiToolProvider)
.filter(
Expand All @@ -213,7 +216,7 @@ def list_api_tool_provider_tools(user_id: str, tenant_id: str, provider: str) ->
)

if provider is None:
raise ValueError(f"you have not added provider {provider}")
raise ValueError(f"you have not added provider {provider_name}")

controller = ToolTransformService.api_provider_to_controller(db_provider=provider)
labels = ToolLabelManager.get_tool_labels(controller)
Expand Down Expand Up @@ -246,6 +249,8 @@ def update_api_tool_provider(
if schema_type not in [member.value for member in ApiProviderSchemaType]:
raise ValueError(f"invalid schema type {schema}")

provider_name = provider_name.strip()

# check if the provider exists
provider: ApiToolProvider = (
db.session.query(ApiToolProvider)
Expand Down