diff --git a/api/controllers/console/workspace/models.py b/api/controllers/console/workspace/models.py index d0efb9f369..5cd849725f 100644 --- a/api/controllers/console/workspace/models.py +++ b/api/controllers/console/workspace/models.py @@ -193,7 +193,7 @@ class ModelProviderModelApi(Resource): @login_required @account_initialization_required @with_current_tenant_id - def get(self, tenant_id: str, provider): + def get(self, tenant_id: str, provider: str): model_provider_service = ModelProviderService() models = model_provider_service.get_models_by_provider(tenant_id=tenant_id, provider=provider) diff --git a/api/controllers/console/workspace/tool_providers.py b/api/controllers/console/workspace/tool_providers.py index d05d91ffca..bdf67853e5 100644 --- a/api/controllers/console/workspace/tool_providers.py +++ b/api/controllers/console/workspace/tool_providers.py @@ -278,7 +278,7 @@ class ToolBuiltinProviderListToolsApi(Resource): @setup_required @login_required @account_initialization_required - def get(self, provider): + def get(self, provider: str): _, tenant_id = current_account_with_tenant() return jsonable_encoder( @@ -294,7 +294,7 @@ class ToolBuiltinProviderInfoApi(Resource): @setup_required @login_required @account_initialization_required - def get(self, provider): + def get(self, provider: str): _, tenant_id = current_account_with_tenant() return jsonable_encoder(BuiltinToolManageService.get_builtin_tool_provider_info(tenant_id, provider)) @@ -307,7 +307,7 @@ class ToolBuiltinProviderDeleteApi(Resource): @login_required @is_admin_or_owner_required @account_initialization_required - def post(self, provider): + def post(self, provider: str): _, tenant_id = current_account_with_tenant() payload = BuiltinToolCredentialDeletePayload.model_validate(console_ns.payload or {}) @@ -325,7 +325,7 @@ class ToolBuiltinProviderAddApi(Resource): @setup_required @login_required @account_initialization_required - def post(self, provider): + def post(self, provider: str): user, tenant_id = current_account_with_tenant() user_id = user.id @@ -350,7 +350,7 @@ class ToolBuiltinProviderUpdateApi(Resource): @login_required @is_admin_or_owner_required @account_initialization_required - def post(self, provider): + def post(self, provider: str): user, tenant_id = current_account_with_tenant() user_id = user.id @@ -372,7 +372,7 @@ class ToolBuiltinProviderGetCredentialsApi(Resource): @setup_required @login_required @account_initialization_required - def get(self, provider): + def get(self, provider: str): user, tenant_id = current_account_with_tenant() # Optional list of credential IDs to include even if visibility would hide them # (used when a workflow/agent node still references another member's only_me credential). @@ -393,7 +393,7 @@ class ToolBuiltinProviderGetCredentialsApi(Resource): @console_ns.route("/workspaces/current/tool-provider/builtin//icon") class ToolBuiltinProviderIconApi(Resource): @setup_required - def get(self, provider): + def get(self, provider: str): icon_bytes, mimetype = BuiltinToolManageService.get_builtin_tool_provider_icon(provider) icon_cache_max_age = dify_config.TOOL_ICON_CACHE_MAX_AGE return send_file(io.BytesIO(icon_bytes), mimetype=mimetype, max_age=icon_cache_max_age) @@ -793,7 +793,7 @@ class ToolPluginOAuthApi(Resource): @login_required @is_admin_or_owner_required @account_initialization_required - def get(self, provider): + def get(self, provider: str): tool_provider = ToolProviderID(provider) plugin_id = tool_provider.plugin_id provider_name = tool_provider.provider_name @@ -831,7 +831,7 @@ class ToolPluginOAuthApi(Resource): @console_ns.route("/oauth/plugin//tool/callback") class ToolOAuthCallback(Resource): @setup_required - def get(self, provider): + def get(self, provider: str): context_id = request.cookies.get("context_id") if not context_id: raise Forbidden("context_id not found") @@ -888,7 +888,7 @@ class ToolBuiltinProviderSetDefaultApi(Resource): @login_required @is_admin_or_owner_required @account_initialization_required - def post(self, provider): + def post(self, provider: str): _, current_tenant_id = current_account_with_tenant() payload = BuiltinProviderDefaultCredentialPayload.model_validate(console_ns.payload or {}) return BuiltinToolManageService.set_default_provider( @@ -920,7 +920,7 @@ class ToolOAuthCustomClient(Resource): @setup_required @login_required @account_initialization_required - def get(self, provider): + def get(self, provider: str): _, current_tenant_id = current_account_with_tenant() return jsonable_encoder( BuiltinToolManageService.get_custom_oauth_client_params(tenant_id=current_tenant_id, provider=provider) @@ -929,7 +929,7 @@ class ToolOAuthCustomClient(Resource): @setup_required @login_required @account_initialization_required - def delete(self, provider): + def delete(self, provider: str): _, current_tenant_id = current_account_with_tenant() return jsonable_encoder( BuiltinToolManageService.delete_custom_oauth_client_params(tenant_id=current_tenant_id, provider=provider) @@ -941,7 +941,7 @@ class ToolBuiltinProviderGetOauthClientSchemaApi(Resource): @setup_required @login_required @account_initialization_required - def get(self, provider): + def get(self, provider: str): _, current_tenant_id = current_account_with_tenant() return jsonable_encoder( BuiltinToolManageService.get_builtin_tool_provider_oauth_client_schema( @@ -955,7 +955,7 @@ class ToolBuiltinProviderGetCredentialInfoApi(Resource): @setup_required @login_required @account_initialization_required - def get(self, provider): + def get(self, provider: str): user, tenant_id = current_account_with_tenant() include_credential_ids = request.args.getlist("include_credential_ids") or [ s for s in (request.args.get("include_credential_ids") or "").split(",") if s @@ -1166,7 +1166,7 @@ class ToolMCPDetailApi(Resource): @setup_required @login_required @account_initialization_required - def get(self, provider_id): + def get(self, provider_id: str): _, tenant_id = current_account_with_tenant() with sessionmaker(db.engine).begin() as session: service = MCPToolManageService(session=session) @@ -1195,7 +1195,7 @@ class ToolMCPUpdateApi(Resource): @setup_required @login_required @account_initialization_required - def get(self, provider_id): + def get(self, provider_id: str): _, tenant_id = current_account_with_tenant() with sessionmaker(db.engine).begin() as session: service = MCPToolManageService(session=session) diff --git a/api/controllers/console/workspace/trigger_providers.py b/api/controllers/console/workspace/trigger_providers.py index b3c790f7d7..a87633e5d0 100644 --- a/api/controllers/console/workspace/trigger_providers.py +++ b/api/controllers/console/workspace/trigger_providers.py @@ -77,7 +77,7 @@ class TriggerProviderIconApi(Resource): @setup_required @login_required @account_initialization_required - def get(self, provider): + def get(self, provider: str): user = current_user assert isinstance(user, Account) assert user.current_tenant_id is not None @@ -103,7 +103,7 @@ class TriggerProviderInfoApi(Resource): @setup_required @login_required @account_initialization_required - def get(self, provider): + def get(self, provider: str): """Get info for a trigger provider""" user = current_user assert isinstance(user, Account) @@ -119,7 +119,7 @@ class TriggerSubscriptionListApi(Resource): @login_required @edit_permission_required @account_initialization_required - def get(self, provider): + def get(self, provider: str): """List all trigger subscriptions for the current tenant's provider""" user = current_user assert isinstance(user, Account) @@ -149,7 +149,7 @@ class TriggerSubscriptionBuilderCreateApi(Resource): @login_required @edit_permission_required @account_initialization_required - def post(self, provider): + def post(self, provider: str): """Add a new subscription instance for a trigger provider""" user = current_user assert user.current_tenant_id is not None @@ -178,7 +178,7 @@ class TriggerSubscriptionBuilderGetApi(Resource): @login_required @edit_permission_required @account_initialization_required - def get(self, provider, subscription_builder_id): + def get(self, provider: str, subscription_builder_id: str): """Get a subscription instance for a trigger provider""" return jsonable_encoder( TriggerSubscriptionBuilderService.get_subscription_builder_by_id(subscription_builder_id) @@ -194,7 +194,7 @@ class TriggerSubscriptionBuilderVerifyApi(Resource): @login_required @edit_permission_required @account_initialization_required - def post(self, provider, subscription_builder_id): + def post(self, provider: str, subscription_builder_id: str): """Verify and update a subscription instance for a trigger provider""" user = current_user assert user.current_tenant_id is not None @@ -226,7 +226,7 @@ class TriggerSubscriptionBuilderUpdateApi(Resource): @login_required @edit_permission_required @account_initialization_required - def post(self, provider, subscription_builder_id): + def post(self, provider: str, subscription_builder_id: str): """Update a subscription instance for a trigger provider""" user = current_user assert isinstance(user, Account) @@ -260,7 +260,7 @@ class TriggerSubscriptionBuilderLogsApi(Resource): @login_required @edit_permission_required @account_initialization_required - def get(self, provider, subscription_builder_id): + def get(self, provider: str, subscription_builder_id: str): """Get the request logs for a subscription instance for a trigger provider""" user = current_user assert isinstance(user, Account) @@ -283,7 +283,7 @@ class TriggerSubscriptionBuilderBuildApi(Resource): @login_required @edit_permission_required @account_initialization_required - def post(self, provider, subscription_builder_id): + def post(self, provider: str, subscription_builder_id: str): """Build a subscription instance for a trigger provider""" user = current_user assert user.current_tenant_id is not None @@ -407,7 +407,7 @@ class TriggerOAuthAuthorizeApi(Resource): @setup_required @login_required @account_initialization_required - def get(self, provider): + def get(self, provider: str): """Initiate OAuth authorization flow for a trigger provider""" user = current_user assert isinstance(user, Account) @@ -489,7 +489,7 @@ class TriggerOAuthAuthorizeApi(Resource): @console_ns.route("/oauth/plugin//trigger/callback") class TriggerOAuthCallbackApi(Resource): @setup_required - def get(self, provider): + def get(self, provider: str): """Handle OAuth callback for trigger provider""" context_id = request.cookies.get("context_id") if not context_id: @@ -557,7 +557,7 @@ class TriggerOAuthClientManageApi(Resource): @login_required @is_admin_or_owner_required @account_initialization_required - def get(self, provider): + def get(self, provider: str): """Get OAuth client configuration for a provider""" user = current_user assert user.current_tenant_id is not None @@ -603,7 +603,7 @@ class TriggerOAuthClientManageApi(Resource): @login_required @is_admin_or_owner_required @account_initialization_required - def post(self, provider): + def post(self, provider: str): """Configure custom OAuth client for a provider""" user = current_user assert user.current_tenant_id is not None @@ -629,7 +629,7 @@ class TriggerOAuthClientManageApi(Resource): @login_required @is_admin_or_owner_required @account_initialization_required - def delete(self, provider): + def delete(self, provider: str): """Remove custom OAuth client configuration""" user = current_user assert user.current_tenant_id is not None @@ -657,7 +657,7 @@ class TriggerSubscriptionVerifyApi(Resource): @login_required @edit_permission_required @account_initialization_required - def post(self, provider, subscription_id): + def post(self, provider: str, subscription_id: str): """Verify credentials for an existing subscription (edit mode only)""" user = current_user assert user.current_tenant_id is not None