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.
Python astracloudflarecontrol-panelcyberpaneldnsfablehosting-control-panelhosting-panelkimi-k3server-managementserverkitubuntu-web-panelwebserver
Drop imports that shadowed module-level names
Juan Denis6400b76a7d40
diff --git a/backend/app/api/secrets_webhooks.py b/backend/app/api/secrets_webhooks.pyindex 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, requfrom app.services.secret_vault_service import SecretService, SecretVaultServicefrom app.services.webhook_gateway_service import WebhookGatewayServicefrom app.services.workspace_service import WorkspaceService-from app.models import User, Workspace+from app.models import Workspacebp = Blueprint('secrets_webhooks', __name__)@@ -30,8 +30,6 @@ def _resolve_ws():?workspace_id) to a workspace id, or None for an unscoped view — mirrors theservers/apps scoping (#33). Lenient: a stale/unknown context degrades toNone rather than erroring."""- from app.models import User- from app.services.workspace_service import WorkspaceServiceuser = 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.pyindex bf66b811..1baa6a84 100644--- a/backend/app/services/git_service.py+++ b/backend/app/services/git_service.py@@ -43,7 +43,6 @@ class GitService:@staticmethoddef _generate_secret() -> str:"""Generate a random webhook secret."""- import secretsreturn secrets.token_hex(32)@classmethoddiff --git a/backend/app/services/secret_vault_service.py b/backend/app/services/secret_vault_service.pyindex 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:@classmethoddef 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:continuevalue = s.value