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

feat(oauth): rename ToolProviderCredentialType to CredentialType for consistency

Browse Source
This commit is contained in:
Harry
2025-07-04 14:29:17 +08:00
parent 26b46b88c9
commit 9f053f3bbc
9 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
api/services/tools/builtin_tools_manage_service.py
View File

@ -19,7 +19,7 @@ from core.tools.entities.api_entities import (
ToolProviderCredentialApiEntity,
ToolProviderCredentialInfoApiEntity,
)
from core.tools.entities.tool_entities import ToolProviderCredentialType
from core.tools.entities.tool_entities import CredentialType
from core.tools.errors import ToolNotFoundError, ToolProviderCredentialValidationError, ToolProviderNotFoundError
from core.tools.plugin_tool.provider import PluginToolProviderController
from core.tools.tool_label_manager import ToolLabelManager
@ -96,7 +96,7 @@ class BuiltinToolManageService:
@staticmethod
def list_builtin_provider_credentials_schema(
provider_name: str, credential_type: ToolProviderCredentialType, tenant_id: str
provider_name: str, credential_type: CredentialType, tenant_id: str
):
"""
list builtin provider credentials schema
@ -123,7 +123,7 @@ class BuiltinToolManageService:
raise ValueError(f"you have not added provider {provider}")
try:
if ToolProviderCredentialType.of(db_provider.credential_type).is_editable():
if CredentialType.of(db_provider.credential_type).is_editable():
provider_controller = ToolManager.get_builtin_provider(provider, tenant_id)
if not provider_controller.need_credentials:
raise ValueError(f"provider {provider} does not need credentials")
@ -166,7 +166,7 @@ class BuiltinToolManageService:
@staticmethod
def add_builtin_tool_provider(
user_id: str,
api_type: ToolProviderCredentialType,
api_type: CredentialType,
tenant_id: str,
provider: str,
credentials: dict,
@ -237,7 +237,7 @@ class BuiltinToolManageService:
@staticmethod
def generate_builtin_tool_provider_name(
tenant_id: str, provider: str, credential_type: ToolProviderCredentialType
tenant_id: str, provider: str, credential_type: CredentialType
) -> str:
try:
db_providers = (

10
api/services/tools/tools_transform_service.py
View File

@ -15,8 +15,8 @@ from core.tools.entities.common_entities import I18nObject
from core.tools.entities.tool_bundle import ApiToolBundle
from core.tools.entities.tool_entities import (
ApiProviderAuthType,
CredentialType,
ToolParameter,
ToolProviderCredentialType,
ToolProviderType,
)
from core.tools.plugin_tool.provider import PluginToolProviderController
@ -113,9 +113,9 @@ class ToolTransformService:
schema = {
x.to_basic_provider_config().name: x
for x in provider_controller.get_credentials_schema_by_type(
ToolProviderCredentialType.of(db_provider.credential_type)
CredentialType.of(db_provider.credential_type)
if db_provider
else ToolProviderCredentialType.API_KEY
else CredentialType.API_KEY
)
}
@ -139,7 +139,7 @@ class ToolTransformService:
config=[
x.to_basic_provider_config()
for x in provider_controller.get_credentials_schema_by_type(
ToolProviderCredentialType.of(db_provider.credential_type)
CredentialType.of(db_provider.credential_type)
)
],
cache=ToolProviderCredentialsCache(
@ -329,7 +329,7 @@ class ToolTransformService:
id=provider.id,
name=provider.name,
provider=provider.provider,
credential_type=ToolProviderCredentialType.of(provider.credential_type),
credential_type=CredentialType.of(provider.credential_type),
is_default=provider.is_default,
credentials=credentials,
)