arpakitlib 1.8.40__py3-none-any.whl → 1.8.41__py3-none-any.whl

arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json

@@ -1,4 +1,4 @@
 {
   "arpakitlib_project_template_version": "5",
-  "arpakitlib_project_template_subversion": "8"
+  "arpakitlib_project_template_subversion": "9"
 }

arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_1.py

@@ -1,13 +1,10 @@
 import asyncio
 
-import sqlalchemy
-
-from project.sqlalchemy_db_.sqlalchemy_model import SimpleDBM
+from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
 
 def __sandbox():
-    a = sqlalchemy.inspect(SimpleDBM)
-    print(a)
+    print(UserDBM.Roles.admin)
 
 
 async def __async_sandbox():

arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/admin_authorize.py

@@ -1,14 +1,15 @@
 import logging
 
 import fastapi
+import sqlalchemy
 from sqladmin.authentication import AuthenticationBackend
 
-from arpakitlib.ar_str_util import make_none_if_blank
+from arpakitlib.ar_str_util import make_none_if_blank, strip_if_not_none
 from project.core.settings import get_cached_settings
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 from project.sqlalchemy_db_.sqlalchemy_model import UserTokenDBM, UserDBM
 
-SQLADMIN_AUTH_KEY = "sqladmin_auth_key"
+SQLADMIN_AUTHORIZE_KEY = "sqladmin_authorize_key"
 
 
 class SQLAdminAuth(AuthenticationBackend):
@@ -19,15 +20,8 @@ class SQLAdminAuth(AuthenticationBackend):
     async def login(self, request: fastapi.Request) -> bool:
         form = await request.form()
 
-        username = form.get("username")
-        if username:
-            username = username.strip()
-        username = make_none_if_blank(username)
-
-        password = form.get("password")
-        if password:
-            password = password.strip()
-        password = make_none_if_blank(password)
+        username = make_none_if_blank(strip_if_not_none(form.get("username")))
+        password = make_none_if_blank(strip_if_not_none(form.get("password")))
 
         if (
                 get_cached_settings().sqladmin_authorize_keys is not None
@@ -43,23 +37,46 @@ class SQLAdminAuth(AuthenticationBackend):
                     )
             ):
                 if is_username_correct is True:
-                    request.session.update({SQLADMIN_AUTH_KEY: username})
+                    request.session.update({SQLADMIN_AUTHORIZE_KEY: username})
                 elif is_password_correct is True:
-                    request.session.update({SQLADMIN_AUTH_KEY: password})
+                    request.session.update({SQLADMIN_AUTHORIZE_KEY: password})
                 return True
 
         if get_cached_sqlalchemy_db() is not None and (username is not None or password is not None):
             with get_cached_sqlalchemy_db().new_session() as session:
-                query = session.query(UserTokenDBM)
+                query = session.query(UserTokenDBM).filter(UserTokenDBM.is_active == True)
                 if username is not None:
                     query = query.filter(UserTokenDBM.value == username)
                 elif password is not None:
                     query = query.filter(UserTokenDBM.value == password)
+                else:
+                    raise ValueError("no username and no password")
                 user_token = query.one_or_none()
                 if user_token is not None and user_token.user.compare_roles(UserDBM.Roles.admin):
-                    request.session.update({SQLADMIN_AUTH_KEY: user_token.value})
+                    request.session.update({SQLADMIN_AUTHORIZE_KEY: user_token.value})
                     return True
 
+        if get_cached_sqlalchemy_db() is not None and (username is not None and password is not None):
+            query = session.query(UserDBM)
+            query = query.filter(UserDBM.is_active == True)
+            _or_conditions = [
+                UserDBM.long_id == username,
+                UserDBM.slug == username,
+                UserDBM.email == username,
+            ]
+            if username.isdigit():
+                _or_conditions.append(UserDBM.id == int(username))
+            query = query.filter(sqlalchemy.or_(*_or_conditions))
+            query = query.filter(UserDBM.password == password)
+            user_dbm: UserDBM | None = query.one_or_none()
+            if user_dbm is not None and user_dbm.compare_roles(UserDBM.Roles.admin):
+                new_user_token_dbm = UserTokenDBM(user_id=user_dbm.id)
+                session.add(new_user_token_dbm)
+                session.commit()
+                session.refresh(new_user_token_dbm)
+                request.session.update({SQLADMIN_AUTHORIZE_KEY: new_user_token_dbm.value})
+                return True
+
         return False
 
     async def logout(self, request: fastapi.Request) -> bool:
@@ -67,7 +84,7 @@ class SQLAdminAuth(AuthenticationBackend):
         return True
 
     async def authenticate(self, request: fastapi.Request) -> bool:
-        sqladmin_auth_key = request.session.get(SQLADMIN_AUTH_KEY)
+        sqladmin_auth_key = request.session.get(SQLADMIN_AUTHORIZE_KEY)
         if sqladmin_auth_key:
             sqladmin_auth_key = sqladmin_auth_key.strip()
         sqladmin_auth_key = make_none_if_blank(sqladmin_auth_key)
@@ -82,9 +99,11 @@ class SQLAdminAuth(AuthenticationBackend):
                     UserTokenDBM
                 ).filter(
                     UserTokenDBM.value == sqladmin_auth_key
+                ).filter(
+                    UserTokenDBM.is_active == True
                 )
-                user_token = query.one_or_none()
-                if user_token is not None and user_token.user.compare_roles(UserDBM.Roles.admin):
+                user_token_dbm: UserTokenDBM | None = query.one_or_none()
+                if user_token_dbm is not None and user_token_dbm.user.compare_roles(UserDBM.Roles.admin):
                     return True
 
         return False

arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/user.py

@@ -13,6 +13,7 @@ class UserMV(SimpleMV, model=UserDBM):
         UserDBM.email,
         UserDBM.roles,
         UserDBM.is_active,
+        UserDBM.password,
         UserDBM.tg_id,
         UserDBM.tg_bot_last_action_dt,
         UserDBM.tg_data,

arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user.py

@@ -40,6 +40,11 @@ class UserDBM(SimpleDBM):
         server_default="true",
         nullable=False
     )
+    password: Mapped[str | None] = mapped_column(
+        sqlalchemy.TEXT,
+        index=True,
+        nullable=True
+    )
     tg_id: Mapped[int | None] = mapped_column(
         sqlalchemy.BIGINT,
         unique=True,

{arpakitlib-1.8.40.dist-info → arpakitlib-1.8.41.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: arpakitlib
-Version: 1.8.40
+Version: 1.8.41
 Summary: arpakitlib
 License: Apache-2.0
 Keywords: arpakitlib,arpakit,arpakit-company,arpakitcompany,arpakit_company

{arpakitlib-1.8.40.dist-info → arpakitlib-1.8.41.dist-info}/RECORD

@@ -8,7 +8,7 @@ arpakitlib/_arpakit_project_template_v_5/alembic/env.py,sha256=Qesmnj5A2kB-Doeuf
 arpakitlib/_arpakit_project_template_v_5/alembic/script.py.mako,sha256=MEqL-2qATlST9TAOeYgscMn1uy6HUS9NFvDgl93dMj8,635
 arpakitlib/_arpakit_project_template_v_5/alembic/versions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/alembic.ini,sha256=8fuyeEvGBiPGbxEFy8ISBV3xX_fgVmuhEGpB10_B5Uo,3733
-arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json,sha256=EkctAYkthhQpPLxJPmiuu1VL0gS5R8beKIF07_fLg1o,97
+arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json,sha256=UxuwFiz4xIUfSWNYNCUUkJPV25uB6wWHtAnFWUT0O3Y,97
 arpakitlib/_arpakit_project_template_v_5/command/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/command/alembic_history.sh,sha256=OMnDNtHIksGh9iavWnzbtxcudZW4vjdcISsBXvzZSPw,22
 arpakitlib/_arpakit_project_template_v_5/command/alembic_revision_autogenerate.sh,sha256=yW2i-SBOtBx15Ya0poVQqKkJM5t2JZp06r9AEW-DmGE,46
@@ -198,7 +198,7 @@ arpakitlib/_arpakit_project_template_v_5/project/resource/static/swagger-ui/swag
 arpakitlib/_arpakit_project_template_v_5/project/resource/static/swagger-ui/swagger-ui.js,sha256=yHKu9z0C2kOO5j9n9D8oQzuBLeEoMGrFcMWQN27V554,339285
 arpakitlib/_arpakit_project_template_v_5/project/resource/static/swagger-ui/swagger-ui.js.map,sha256=jeX-b8zAm2jsTGGCznrc49McbLKSfXspwECPhEAp0Xc,1159444
 arpakitlib/_arpakit_project_template_v_5/project/sandbox/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_1.py,sha256=BSfR1KIpJCpAO7Iyiw591wrbuXa893TkR42tydvJNJ0,287
+arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_1.py,sha256=SJ_VICHmbPL6duwOrT2kRnnH_MQrCvbfMRPTS05wazc,246
 arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_2.py,sha256=xKSp7tIBu3Ffp_kgJkwVtdam3BcoFZ44JPVHoRRaP0E,163
 arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_3.py,sha256=xKSp7tIBu3Ffp_kgJkwVtdam3BcoFZ44JPVHoRRaP0E,163
 arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_4.py,sha256=xKSp7tIBu3Ffp_kgJkwVtdam3BcoFZ44JPVHoRRaP0E,163
@@ -215,7 +215,7 @@ arpakitlib/_arpakit_project_template_v_5/project/site/router/__init__.py,sha256=
 arpakitlib/_arpakit_project_template_v_5/project/site/router/main_router.py,sha256=J5jNfgd-3OiWTtuubimEUz6wrOogupj9PkUdDmwz-2U,62
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/add_admin_in_app.py,sha256=JTXLf18DQVsZtoe6yFpZIVJI95rgJofnTe9YKyVwwhQ,851
-arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/admin_authorize.py,sha256=0yL6YIobNvc4SGOV_Hq_NuugoM_b6WD8Pb_0eqgnZHo,3692
+arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/admin_authorize.py,sha256=S5BtbbLEl-D0DlwDPOkWYpjqQhFaUoqvvlElAmbP25c,4937
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/asgi.py,sha256=DRlRPkcOGXOccfP73oKEXolZTsc5VWdQgEG-qoW03ms,99
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/create_sqladmin_app.py,sha256=x5F8--5KA4cmTrb6kAAmp6fVd2TiqxPOzxqUkSEhSG4,1298
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/event.py,sha256=LjAUYNlsX9Sj_QLMzYuTQbbYYbIMHhbsSjTXt-G7lOE,849
@@ -224,7 +224,7 @@ arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/api_key.py
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/common.py,sha256=US1tueTCPvAdse6TLT6yRLUHbvwGGagApYhFJzE_6Yc,576
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/operation.py,sha256=ZPoq3SueGJfR_aWk-a6dIHRNmO1Qa-8kHUW0aR4ZW3g,920
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/story_log.py,sha256=GMSICxW_A8RTCtoENDEjce-R8GRLKtHa-OU5OLMdH5s,720
-arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/user.py,sha256=k7p-7FMkglydvp8Q9ZiEnFN15pGlfKvxqRywBhG9Yyo,771
+arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/user.py,sha256=LYPqVRpaxmicWV3_STW7Ko56vrdeJizeAINknBN12bM,797
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/user_token.py,sha256=OvvWwzZV6QJGt5XL1KPgPSVN5TvBeawgbWSFYX81KUQ,802
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/const.py,sha256=dcvj5C9E2F2KCsGZPBBncQf_EvVJAC1qQgnyD8P4ZEw,6
@@ -234,7 +234,7 @@ arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/common.py,sha256=xhMxNea8ndjmdsNwp_a9L_VUkkRb8jjVLhczxDasNss,2090
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/operation.py,sha256=rwLyqChjx_EOsw9nj333NFxZJ1Qpfj9Yz6POO4Wq690,3670
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/story_log.py,sha256=iarF0bREQAlXlqw0XvTEPkYVAUdRz4idAZEOnqISfCY,1451
-arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user.py,sha256=zURCFrwmB45gq0QKbDFzFHLv9xdkCXWyVCSTZ9SOBzg,4909
+arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user.py,sha256=_pqpJ9ClDguwwi-bWaP1BYkT2vgaIaSw_cqvHvQRFKE,5032
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user_token.py,sha256=CRcpUp93WvcFqOsCcLMEVexWMzUYUtImukDZSeBcJtc,1617
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/util.py,sha256=QSA_nT6aWdtE412-Uj3VTd7yh3dzS4HugDK9FivjTPo,570
 arpakitlib/_arpakit_project_template_v_5/project/test_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -369,8 +369,8 @@ arpakitlib/ar_type_util.py,sha256=Cs_tef-Fc5xeyAF54KgISCsP11NHyzIsglm4S3Xx7iM,40
 arpakitlib/ar_wata_api_client.py,sha256=gdHOqDbuqxhTjVDtRW1DvkRJLdDofCrOq51GTctzLns,242
 arpakitlib/ar_yookassa_api_client_util.py,sha256=VozuZeCJjmLd1zj2BdC9WfiAQ3XYOrIMsdpNK-AUlm0,5347
 arpakitlib/ar_zabbix_api_client_util.py,sha256=AV7yxzG46blyQQDI-is0BwHfzuZlrkiHOkuOpfzQ90A,7934
-arpakitlib-1.8.40.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.8.40.dist-info/METADATA,sha256=I1OI6_YVvUdCClGTe8qPuTQaKFoQYPfasH6O1jy_YQA,3477
-arpakitlib-1.8.40.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-arpakitlib-1.8.40.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.8.40.dist-info/RECORD,,
+arpakitlib-1.8.41.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.8.41.dist-info/METADATA,sha256=zuwhjzTci1nBmftTugfwsuVZpCsWrR7v0ordbnWOzRk,3477
+arpakitlib-1.8.41.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+arpakitlib-1.8.41.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.8.41.dist-info/RECORD,,