jyapayne/dify
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(api): improve handling of tools field and cleanup variable usage (#10553)

Browse source
This commit is contained in:
-LAN- 2024-11-12 00:08:04 +08:00 • committed by GitHub
commit 16b9665033
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
api/services/tools/api_tools_manage_service.py
View file

@ -116,7 +116,7 @@ class ApiToolManageService:
provider_name = provider_name.strip()
# check if the provider exists
provider: ApiToolProvider = (
provider = (
db.session.query(ApiToolProvider)
.filter(
ApiToolProvider.tenant_id == tenant_id,
@ -201,16 +201,15 @@ class ApiToolManageService:
return {"schema": schema}
@staticmethod
def list_api_tool_provider_tools(user_id: str, tenant_id: str, provider: str) -> list[UserTool]:
def list_api_tool_provider_tools(user_id: str, tenant_id: str, provider_name: str) -> list[UserTool]:
"""
list api tool provider tools
"""
provider_name = provider
provider: ApiToolProvider = (
provider = (
db.session.query(ApiToolProvider)
.filter(
ApiToolProvider.tenant_id == tenant_id,
ApiToolProvider.name == provider,
ApiToolProvider.name == provider_name,
)
.first()
)
@ -252,7 +251,7 @@ class ApiToolManageService:
provider_name = provider_name.strip()
# check if the provider exists
provider: ApiToolProvider = (
provider = (
db.session.query(ApiToolProvider)
.filter(
ApiToolProvider.tenant_id == tenant_id,
@ -319,7 +318,7 @@ class ApiToolManageService:
"""
delete tool provider
"""
provider: ApiToolProvider = (
provider = (
db.session.query(ApiToolProvider)
.filter(
ApiToolProvider.tenant_id == tenant_id,
@ -369,7 +368,7 @@ class ApiToolManageService:
if tool_bundle is None:
raise ValueError(f"invalid tool name {tool_name}")
db_provider: ApiToolProvider = (
db_provider = (
db.session.query(ApiToolProvider)
.filter(
ApiToolProvider.tenant_id == tenant_id,