diff --git a/api/controllers/console/workspace/tool_providers.py b/api/controllers/console/workspace/tool_providers.py index 162e74b3a1..e41375e52b 100644 --- a/api/controllers/console/workspace/tool_providers.py +++ b/api/controllers/console/workspace/tool_providers.py @@ -807,7 +807,7 @@ class ToolOAuthCustomClient(Resource): tenant_id=current_user.current_tenant_id, provider=provider ) ) - + @setup_required @login_required @account_initialization_required @@ -845,6 +845,7 @@ class ToolBuiltinProviderGetCredentialInfoApi(Resource): ) ) + class ToolProviderMCPApi(Resource): @setup_required @login_required diff --git a/api/controllers/inner_api/plugin/plugin.py b/api/controllers/inner_api/plugin/plugin.py index 6c4500af50..5dfe41eb6b 100644 --- a/api/controllers/inner_api/plugin/plugin.py +++ b/api/controllers/inner_api/plugin/plugin.py @@ -175,7 +175,7 @@ class PluginInvokeToolApi(Resource): provider=payload.provider, tool_name=payload.tool, tool_parameters=payload.tool_parameters, - credential_id=payload.credential_id + credential_id=payload.credential_id, ), ) diff --git a/api/core/agent/strategy/plugin.py b/api/core/agent/strategy/plugin.py index 90e5782c47..04661581a7 100644 --- a/api/core/agent/strategy/plugin.py +++ b/api/core/agent/strategy/plugin.py @@ -60,7 +60,5 @@ class PluginAgentStrategy(BaseAgentStrategy): conversation_id=conversation_id, app_id=app_id, message_id=message_id, - context=PluginInvokeContext( - credentials=credentials or InvokeCredentials() - ), + context=PluginInvokeContext(credentials=credentials or InvokeCredentials()), ) diff --git a/api/core/plugin/impl/oauth.py b/api/core/plugin/impl/oauth.py index 19ebceb42b..d73e5d9f9e 100644 --- a/api/core/plugin/impl/oauth.py +++ b/api/core/plugin/impl/oauth.py @@ -56,7 +56,6 @@ class OAuthHandler(BasePluginClient): Get credentials from the given request. """ - try: # encode request to raw http request raw_request_bytes = self._convert_request_to_raw_data(request) diff --git a/api/core/tools/builtin_tool/provider.py b/api/core/tools/builtin_tool/provider.py index 39de030f18..a70ded9efd 100644 --- a/api/core/tools/builtin_tool/provider.py +++ b/api/core/tools/builtin_tool/provider.py @@ -125,7 +125,7 @@ class BuiltinToolProviderController(ToolProviderController): if credential_type == CredentialType.API_KEY.value: return self.entity.credentials_schema.copy() if self.entity.credentials_schema else [] raise ValueError(f"Invalid credential type: {credential_type}") - + def get_oauth_client_schema(self) -> list[ProviderConfig]: """ returns the oauth client schema of the provider diff --git a/api/core/tools/tool_manager.py b/api/core/tools/tool_manager.py index 2be8f48b54..d61856a8f5 100644 --- a/api/core/tools/tool_manager.py +++ b/api/core/tools/tool_manager.py @@ -207,7 +207,7 @@ class ToolManager: # if the provider has been deleted, raise an error if builtin_provider is None: raise ToolProviderNotFoundError(f"provider has been deleted: {credential_id}") - + # fallback to the default provider if builtin_provider is None: # use the default provider diff --git a/api/core/tools/utils/encryption.py b/api/core/tools/utils/encryption.py index 4aa5412a5e..5fdfd3b9d1 100644 --- a/api/core/tools/utils/encryption.py +++ b/api/core/tools/utils/encryption.py @@ -127,6 +127,7 @@ class ProviderConfigEncrypter: def create_provider_encrypter(tenant_id: str, config: list[BasicProviderConfig], cache: ProviderConfigCache): return ProviderConfigEncrypter(tenant_id=tenant_id, config=config, provider_config_cache=cache), cache + def create_tool_provider_encrypter(tenant_id: str, controller: ToolProviderController): cache = SingletonProviderCredentialsCache( tenant_id=tenant_id, diff --git a/api/core/tools/utils/uuid_utils.py b/api/core/tools/utils/uuid_utils.py index dff49e0c84..bdcc33259d 100644 --- a/api/core/tools/utils/uuid_utils.py +++ b/api/core/tools/utils/uuid_utils.py @@ -5,7 +5,6 @@ def is_valid_uuid(uuid_str: str | None) -> bool: if uuid_str is None or len(uuid_str) == 0: return False try: - uuid.UUID(uuid_str) return True except Exception: