sqladmin columns updated

petrCher · petrCher · commit 9d1c1e928e7a · 2026-05-09T12:09:19.000+03:00
diff --git a/auth_backend/__init__.py b/auth_backend/__init__.py
@@ -1,4 +1,3 @@
 import os
 
-
 __version__ = os.getenv('APP_VERSION', 'dev')
diff --git a/auth_backend/__main__.py b/auth_backend/__main__.py
@@ -1,5 +1,4 @@
 from auth_backend.cli.process import process
 
-
 if __name__ == '__main__':
     process()
diff --git a/auth_backend/admin/admin.py b/auth_backend/admin/admin.py
@@ -1,23 +1,23 @@
 from sqladmin import ModelView
 
-from auth_backend.models.db import Scope, Group, User
+from auth_backend.models.db import Group, Scope, User
 
 
 class ScopeAdmin(ModelView, model=Scope):
     name = "Scope"
     name_plural = "Scopes"
-    column_list = ["id", "name", "comment", "is_deleted", "create_ts"]
+    column_list = ["id", "name", "comment", "is_deleted"]
     column_searchable_list = ["name", "comment"]
 
 
 class GroupAdmin(ModelView, model=Group):
     name = "Group"
     name_plural = "Groups"
-    column_list = ["id", "name", "parent_id", "is_deleted", "create_ts"]
+    column_list = ["id", "name", "scopes", "users", "parent_id", "is_deleted"]
     column_searchable_list = ["name"]
 
 
 class UserAdmin(ModelView, model=User):
     name = "User"
     name_plural = "Users"
-    column_list = ["id", "is_deleted", "create_ts"]
+    column_list = ["id", "scopes", "groups"]
diff --git a/auth_backend/auth_method/__init__.py b/auth_backend/auth_method/__init__.py
@@ -5,7 +5,6 @@
 from .session import Session
 from .userdata_mixin import UserdataMixin
 
-
 __all__ = [
     "Session",
     "AUTH_METHODS",
diff --git a/auth_backend/auth_method/base.py b/auth_backend/auth_method/base.py
@@ -12,7 +12,6 @@
 from auth_backend.models.db import AuthMethod, User, UserSession
 from auth_backend.settings import get_settings
 
-
 logger = logging.getLogger(__name__)
 settings = get_settings()
 
diff --git a/auth_backend/auth_method/oauth.py b/auth_backend/auth_method/oauth.py
@@ -15,7 +15,6 @@
 from .method_mixins import LoginableMixin, RegistrableMixin
 from .userdata_mixin import UserdataMixin
 
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/auth_backend/auth_method/outer.py b/auth_backend/auth_method/outer.py
@@ -12,7 +12,6 @@
 from auth_backend.models.db import AuthMethod, UserSession
 from auth_backend.utils.security import UnionAuth
 
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/auth_backend/auth_plugins/__init__.py b/auth_backend/auth_plugins/__init__.py
@@ -16,7 +16,6 @@
 from .vk import VkAuth
 from .yandex import YandexAuth
 
-
 __all__ = [
     "AUTH_METHODS",
     "AuthPluginMeta",
diff --git a/auth_backend/auth_plugins/airflow.py b/auth_backend/auth_plugins/airflow.py
@@ -6,7 +6,6 @@
 from auth_backend.auth_method.outer import ConnectionIssue, OuterAuthMeta
 from auth_backend.settings import Settings
 
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/auth_backend/auth_plugins/authentic.py b/auth_backend/auth_plugins/authentic.py
@@ -20,7 +20,6 @@
 from auth_backend.settings import Settings
 from auth_backend.utils.security import UnionAuth
 
-
 AUTH_METHOD_ID_PARAM_NAME = 'user_id'
 logger = logging.getLogger(__name__)
 
diff --git a/auth_backend/auth_plugins/coder.py b/auth_backend/auth_plugins/coder.py
@@ -6,7 +6,6 @@
 from auth_backend.auth_method.outer import ConnectionIssue, OuterAuthMeta
 from auth_backend.settings import Settings
 
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/auth_backend/auth_plugins/email.py b/auth_backend/auth_plugins/email.py
@@ -22,7 +22,6 @@
 from auth_backend.utils.smtp import SendEmailMessage
 from auth_backend.utils.string import random_string
 
-
 settings = get_settings()
 logger = logging.getLogger(__name__)
 
diff --git a/auth_backend/auth_plugins/github.py b/auth_backend/auth_plugins/github.py
@@ -18,7 +18,6 @@
 from auth_backend.settings import Settings
 from auth_backend.utils.security import UnionAuth
 
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/auth_backend/auth_plugins/google.py b/auth_backend/auth_plugins/google.py
@@ -20,7 +20,6 @@
 from auth_backend.settings import Settings
 from auth_backend.utils.security import UnionAuth
 
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/auth_backend/auth_plugins/keycloak.py b/auth_backend/auth_plugins/keycloak.py
@@ -18,7 +18,6 @@
 from auth_backend.settings import Settings
 from auth_backend.utils.security import UnionAuth
 
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/auth_backend/auth_plugins/lkmsu.py b/auth_backend/auth_plugins/lkmsu.py
@@ -20,7 +20,6 @@
 from auth_backend.utils.security import UnionAuth
 from auth_backend.utils.string import concantenate_strings
 
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/auth_backend/auth_plugins/mailu.py b/auth_backend/auth_plugins/mailu.py
@@ -6,7 +6,6 @@
 from auth_backend.auth_method.outer import ConnectionIssue, OuterAuthMeta
 from auth_backend.settings import Settings
 
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/auth_backend/auth_plugins/postgres.py b/auth_backend/auth_plugins/postgres.py
@@ -10,7 +10,6 @@
 from auth_backend.auth_method import OuterAuthMeta
 from auth_backend.settings import Settings
 
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/auth_backend/auth_plugins/telegram.py b/auth_backend/auth_plugins/telegram.py
@@ -20,7 +20,6 @@
 from auth_backend.utils.security import UnionAuth
 from auth_backend.utils.string import concantenate_strings
 
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/auth_backend/auth_plugins/vk.py b/auth_backend/auth_plugins/vk.py
@@ -20,7 +20,6 @@
 
 from ..schemas.types.scopes import Scope
 
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/auth_backend/auth_plugins/yandex.py b/auth_backend/auth_plugins/yandex.py
@@ -19,7 +19,6 @@
 from auth_backend.utils.security import UnionAuth
 from auth_backend.utils.string import concantenate_strings
 
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/auth_backend/cli/process.py b/auth_backend/cli/process.py
@@ -11,7 +11,6 @@
 from .user import create_user
 from .user_group import create_user_group
 
-
 settings = get_settings()
 engine = create_engine(str(settings.DB_DSN))
 Session = sessionmaker(bind=engine)
diff --git a/auth_backend/kafka/kafka.py b/auth_backend/kafka/kafka.py
@@ -9,7 +9,6 @@
 from auth_backend.kafka.kafkameta import KafkaMeta
 from auth_backend.settings import get_settings
 
-
 log = logging.getLogger(__name__)
 
 
diff --git a/auth_backend/models/__init__.py b/auth_backend/models/__init__.py
@@ -2,5 +2,4 @@
 from .db import AuthMethod, User, UserSession
 from .dynamic_settings import DynamicOption
 
-
 __all__ = ["Base", "User", "UserSession", "AuthMethod", "DynamicOption"]
diff --git a/auth_backend/models/db.py b/auth_backend/models/db.py
@@ -15,7 +15,6 @@
 from auth_backend.settings import get_settings
 from auth_backend.utils.user_session_basics import session_expires_date
 
-
 settings = get_settings()
 logger = logging.getLogger(__name__)
 
diff --git a/auth_backend/routes/__init__.py b/auth_backend/routes/__init__.py
@@ -1,5 +1,4 @@
 from . import exc_handlers
 from .base import app
 
-
 __all__ = ["app", "exc_handlers"]
diff --git a/auth_backend/routes/base.py b/auth_backend/routes/base.py
@@ -2,13 +2,12 @@
 
 from fastapi import FastAPI
 from fastapi_sqlalchemy import DBSessionMiddleware
-from starlette.middleware.cors import CORSMiddleware
-
 from sqladmin import Admin
 from sqlalchemy import create_engine
-from auth_backend.admin.admin import ScopeAdmin, GroupAdmin, UserAdmin
+from starlette.middleware.cors import CORSMiddleware
 
 from auth_backend import __version__
+from auth_backend.admin.admin import GroupAdmin, ScopeAdmin, UserAdmin
 from auth_backend.auth_method import AuthPluginMeta
 from auth_backend.kafka.kafka import get_kafka_producer
 from auth_backend.settings import get_settings
@@ -44,7 +43,7 @@ async def lifespan(app: FastAPI):
     lifespan=lifespan,
 )
 
-admin=Admin(app, engine=engine, title='Admin panel')
+admin = Admin(app, engine=engine, title='Admin panel')
 
 app.add_middleware(
     DBSessionMiddleware,
diff --git a/auth_backend/routes/groups.py b/auth_backend/routes/groups.py
@@ -10,7 +10,6 @@
 from auth_backend.schemas.models import Group, GroupGet, GroupPatch, GroupPost, GroupsGet
 from auth_backend.utils.security import UnionAuth
 
-
 groups = APIRouter(prefix="/group", tags=["Groups"])
 
 
diff --git a/auth_backend/routes/oidc.py b/auth_backend/routes/oidc.py
@@ -13,7 +13,6 @@
 from auth_backend.utils.jwt import create_jwks
 from auth_backend.utils.oidc_token import OidcGrantType, token_by_client_credentials, token_by_refresh_token
 
-
 settings = get_settings()
 router = APIRouter(prefix="/openid", tags=["OpenID"])
 logger = logging.getLogger(__name__)
diff --git a/auth_backend/routes/scopes.py b/auth_backend/routes/scopes.py
@@ -8,7 +8,6 @@
 from auth_backend.schemas.models import ScopeGet, ScopePatch, ScopePost
 from auth_backend.utils.security import UnionAuth
 
-
 scopes = APIRouter(prefix="/scope", tags=["Scopes"])
 
 
diff --git a/auth_backend/routes/user.py b/auth_backend/routes/user.py
@@ -23,7 +23,6 @@
 )
 from auth_backend.utils.security import UnionAuth
 
-
 logger = logging.getLogger(__name__)
 user = APIRouter(prefix="/user", tags=["User"])
 
diff --git a/auth_backend/routes/user_session.py b/auth_backend/routes/user_session.py
@@ -26,7 +26,6 @@
 from auth_backend.utils import user_session_control
 from auth_backend.utils.security import UnionAuth
 
-
 user_session = APIRouter(prefix="", tags=["User session"])
 logger = logging.getLogger(__name__)
 
diff --git a/auth_backend/utils/jwt.py b/auth_backend/utils/jwt.py
@@ -12,7 +12,6 @@
 
 from auth_backend.settings import get_settings
 
-
 settings = get_settings()
 
 
diff --git a/auth_backend/utils/security.py b/auth_backend/utils/security.py
@@ -12,7 +12,6 @@
 from auth_backend.utils.user_session_basics import session_expires_date
 from auth_backend.utils.user_session_control import SESSION_UPDATE_SCOPE
 
-
 settings = get_settings()
 
 
diff --git a/auth_backend/utils/smtp.py b/auth_backend/utils/smtp.py
@@ -12,7 +12,6 @@
 from auth_backend.models.db import UserMessageDelay
 from auth_backend.settings import Settings, get_settings
 
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/auth_backend/utils/user_session_basics.py b/auth_backend/utils/user_session_basics.py
@@ -2,7 +2,6 @@
 
 from auth_backend.settings import get_settings
 
-
 settings = get_settings()
 
 
diff --git a/auth_backend/utils/user_session_control.py b/auth_backend/utils/user_session_control.py
@@ -13,7 +13,6 @@
 from auth_backend.utils.string import random_string
 from auth_backend.utils.user_session_basics import session_expires_date
 
-
 SESSION_UPDATE_SCOPE = 'auth.session.update'
 
 settings = get_settings()
diff --git a/migrations/env.py b/migrations/env.py
@@ -6,7 +6,6 @@
 from auth_backend.models.base import Base
 from auth_backend.settings import get_settings
 
-
 # this is the Alembic Config object, which provides
 # access to the values within the .ini file in use.
 config = context.config
diff --git a/migrations/versions/2d29fc132e89_fix_base_users_group.py b/migrations/versions/2d29fc132e89_fix_base_users_group.py
@@ -12,7 +12,6 @@
 
 from auth_backend.models.db import Group, User
 
-
 # revision identifiers, used by Alembic.
 revision = '2d29fc132e89'
 down_revision = 'dcb89e72d446'
diff --git a/migrations/versions/586cf0e784e5_scopes.py b/migrations/versions/586cf0e784e5_scopes.py
@@ -9,7 +9,6 @@
 import sqlalchemy as sa
 from alembic import op
 
-
 # revision identifiers, used by Alembic.
 revision = '586cf0e784e5'
 down_revision = 'b07c0ca33c2b'
diff --git a/migrations/versions/5d71a2a2405d_verified_user_group.py b/migrations/versions/5d71a2a2405d_verified_user_group.py
@@ -9,7 +9,6 @@
 import sqlalchemy as sa
 from alembic import op
 
-
 # revision identifiers, used by Alembic.
 revision = '5d71a2a2405d'
 down_revision = '2d29fc132e89'
diff --git a/migrations/versions/6c27352ee53b_unique_scopes.py b/migrations/versions/6c27352ee53b_unique_scopes.py
@@ -7,7 +7,6 @@
 
 from alembic import op
 
-
 revision = '6c27352ee53b'
 down_revision = '586cf0e784e5'
 branch_labels = None
diff --git a/migrations/versions/6dffd8e42152_193_add_unbounded_sessions.py b/migrations/versions/6dffd8e42152_193_add_unbounded_sessions.py
@@ -9,7 +9,6 @@
 import sqlalchemy as sa
 from alembic import op
 
-
 # revision identifiers, used by Alembic.
 revision = '6dffd8e42152'
 down_revision = '2d29fc132e89'
diff --git a/migrations/versions/7c1cd7ceacd8_dynamic_option_model.py b/migrations/versions/7c1cd7ceacd8_dynamic_option_model.py
@@ -12,7 +12,6 @@
 
 from auth_backend.models.db import Group, Scope, User
 
-
 # revision identifiers, used by Alembic.
 revision = '7c1cd7ceacd8'
 down_revision = 'bda218c91211'
diff --git a/migrations/versions/b07c0ca33c2b_groups.py b/migrations/versions/b07c0ca33c2b_groups.py
@@ -10,7 +10,6 @@
 from alembic import op
 from sqlalchemy.dialects import postgresql
 
-
 # revision identifiers, used by Alembic.
 revision = 'b07c0ca33c2b'
 down_revision = 'bd7ac9cbdfc8'
diff --git a/migrations/versions/bd7ac9cbdfc8_init.py b/migrations/versions/bd7ac9cbdfc8_init.py
@@ -3,7 +3,6 @@
 import sqlalchemy as sa
 from alembic import op
 
-
 revision = 'bd7ac9cbdfc8'
 down_revision = None
 branch_labels = None
diff --git a/migrations/versions/bda218c91211_user_session_ts.py b/migrations/versions/bda218c91211_user_session_ts.py
diff --git a/migrations/versions/c03c6b509881_rollback_unique_scopes.py b/migrations/versions/c03c6b509881_rollback_unique_scopes.py
diff --git a/migrations/versions/dcb89e72d446_session_security_scopes.py b/migrations/versions/dcb89e72d446_session_security_scopes.py
diff --git a/migrations/versions/fa4691ad1054_email_delay.py b/migrations/versions/fa4691ad1054_email_delay.py
diff --git a/tests/test_routes/test_change_email.py b/tests/test_routes/test_change_email.py
diff --git a/tests/test_routes/test_change_password.py b/tests/test_routes/test_change_password.py
diff --git a/tests/test_routes/test_delete_last_auth_method.py b/tests/test_routes/test_delete_last_auth_method.py
diff --git a/tests/test_routes/test_email_message_delay.py b/tests/test_routes/test_email_message_delay.py
diff --git a/tests/test_routes/test_login.py b/tests/test_routes/test_login.py
diff --git a/tests/test_routes/test_logout.py b/tests/test_routes/test_logout.py
diff --git a/tests/test_routes/test_oidc.py b/tests/test_routes/test_oidc.py
diff --git a/tests/test_routes/test_registration.py b/tests/test_routes/test_registration.py
diff --git a/tests/test_routes/test_user_sessions.py b/tests/test_routes/test_user_sessions.py
diff --git a/tests/test_unit/test_jwt.py b/tests/test_unit/test_jwt.py
diff --git a/tests/test_unit/test_update_user.py b/tests/test_unit/test_update_user.py

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`	`1`	`import os`
`2`	`2`
`3`		`-`
`4`	`3`	`__version__ = os.getenv('APP_VERSION', 'dev')`