Skip to content

ServerKit is a lightweight, modern server control panel for managing web applications, databases, and services on your VPS or dedicated server. Built with Python/Flask backend and React frontend.

Drop imports that shadowed module-level names

Juan Denis6400b76a7d40
diff --git a/backend/app/api/secrets_webhooks.py b/backend/app/api/secrets_webhooks.py
index 17eeb24c..0bc0fcd1 100644
--- a/backend/app/api/secrets_webhooks.py
+++ b/backend/app/api/secrets_webhooks.py
@@ -8,7 +8,7 @@ from app.middleware.rbac import get_current_user, require_workspace_access, requ
from app.services.secret_vault_service import SecretService, SecretVaultService
from app.services.webhook_gateway_service import WebhookGatewayService
from app.services.workspace_service import WorkspaceService
-from app.models import User, Workspace
+from app.models import Workspace
bp = Blueprint('secrets_webhooks', __name__)
@@ -30,8 +30,6 @@ def _resolve_ws():
?workspace_id) to a workspace id, or None for an unscoped view — mirrors the
servers/apps scoping (#33). Lenient: a stale/unknown context degrades to
None rather than erroring."""
- from app.models import User
- from app.services.workspace_service import WorkspaceService
user = get_current_user()
return WorkspaceService.resolve_workspace_id(user, _resolve_ws_value())
diff --git a/backend/app/services/git_service.py b/backend/app/services/git_service.py
index bf66b811..1baa6a84 100644
--- a/backend/app/services/git_service.py
+++ b/backend/app/services/git_service.py
@@ -43,7 +43,6 @@ class GitService:
@staticmethod
def _generate_secret() -> str:
"""Generate a random webhook secret."""
- import secrets
return secrets.token_hex(32)
@classmethod
diff --git a/backend/app/services/secret_vault_service.py b/backend/app/services/secret_vault_service.py
index 2bac0837..8a926e0a 100644
--- a/backend/app/services/secret_vault_service.py
+++ b/backend/app/services/secret_vault_service.py
@@ -227,9 +227,8 @@ class SecretService:
@classmethod
def resolve_env_dict(cls, vault_id: int, prefix: str = '') -> Dict[str, str]:
"""Resolve vault secrets to an env-style dict (server-side use only)."""
- secrets = Secret.query.filter_by(vault_id=vault_id).all()
env = {}
- for s in secrets:
+ for s in Secret.query.filter_by(vault_id=vault_id).all():
if s.is_expired:
continue
value = s.value