Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

chore(api): remove unnecessary str calls in openapi controllers (#42931)

henrydev23174a90878696
diff --git a/api/controllers/openapi/auth/loaders.py b/api/controllers/openapi/auth/loaders.py
index 12e5b846be6..ac91c35fc4a 100644
--- a/api/controllers/openapi/auth/loaders.py
+++ b/api/controllers/openapi/auth/loaders.py
@@ -106,7 +106,7 @@ def _fetch_workspace(ctx: Context) -> Tenant:
def _workspace_from_app(ctx: Context) -> Tenant:
app = load_app(ctx)
- tenant = TenantService.get_tenant_by_id(str(app.tenant_id), session=ctx.session)
+ tenant = TenantService.get_tenant_by_id(app.tenant_id, session=ctx.session)
if tenant is None or tenant.status == TenantStatus.ARCHIVE:
raise Forbidden("workspace unavailable")
return tenant
@@ -131,7 +131,7 @@ def _fetch_workspace_role(ctx: Context) -> TenantAccountRole:
caller = load_caller(ctx)
if not isinstance(caller, Account) or caller.status != AccountStatus.ACTIVE:
raise NotFound("workspace not found")
- role = TenantService.get_account_role_in_tenant(str(ctx.subject.account_id), str(workspace.id), session=ctx.session)
+ role = TenantService.get_account_role_in_tenant(str(ctx.subject.account_id), workspace.id, session=ctx.session)
if role is None:
raise NotFound("workspace not found")
return role
diff --git a/api/controllers/openapi/auth/requirements.py b/api/controllers/openapi/auth/requirements.py
index 6fc6ab1c0ee..d78b771e68d 100644
--- a/api/controllers/openapi/auth/requirements.py
+++ b/api/controllers/openapi/auth/requirements.py
@@ -134,7 +134,7 @@ class CheckRBACPermission(Requirement):
if not dify_config.RBAC_ENABLED:
return
enforce_rbac_checks(
- tenant_id=str(load_workspace(ctx).id),
+ tenant_id=load_workspace(ctx).id,
account_id=str(subject.account_id),
checks=self.checks,
path_args=dict(ctx.view_args),
@@ -170,7 +170,7 @@ class CheckAppAccess(Requirement):
def run(self, subject: Subject, ctx: Context, session: Session) -> None:
if dify_config.DEPLOYMENT_EDITION != DeploymentEdition.ENTERPRISE:
return
- access_mode = self._access_mode(str(load_app(ctx).id))
+ access_mode = self._access_mode(load_app(ctx).id)
if SystemFeatureService.get_public_system_features().webapp_auth.enabled:
self._assert_mode_allowed(subject, access_mode)
if access_mode == WebAppAccessMode.PRIVATE:
diff --git a/api/controllers/openapi/auth/subjects.py b/api/controllers/openapi/auth/subjects.py
index 84f22e479f2..39166cfc0fd 100644
--- a/api/controllers/openapi/auth/subjects.py
+++ b/api/controllers/openapi/auth/subjects.py
@@ -126,8 +126,8 @@ class ExternalSsoSubject(Subject):
raise Unauthorized("missing context for external user resolution")
return application_services().app_scoped_end_users.commands.get_or_create_end_user_by_type(
EndUserType.OPENAPI,
- tenant_id=str(load_workspace(ctx).id),
- app_id=str(load_app(ctx).id),
+ tenant_id=load_workspace(ctx).id,
+ app_id=load_app(ctx).id,
user_id=identity.email,
)
@@ -144,7 +144,7 @@ class ExternalSsoSubject(Subject):
if identity is None:
return None
account = AccountService.get_account_by_email(identity.email, session=session)
- return str(account.id) if account is not None else None
+ return account.id if account is not None else None
def subject_from_auth(auth: AuthContext) -> Subject: