arpakitlib 1.8.67__tar.gz → 1.8.69__tar.gz

{arpakitlib-1.8.67 → arpakitlib-1.8.69}/PKG-INFO

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

arpakitlib-1.8.69/arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json

@@ -0,0 +1,4 @@
+{
+  "arpakitlib_project_template_version": "5",
+  "arpakitlib_project_template_subversion": "18"
+}

{arpakitlib-1.8.67 → arpakitlib-1.8.69}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/check_sqlalchemy_db.py

@@ -4,7 +4,7 @@ from fastapi import APIRouter
 from project.api.authorize import require_api_key_dbm_api_authorize_middleware, APIAuthorizeData, \
     require_user_token_dbm_api_authorize_middleware, api_authorize
 from project.api.schema.out.common.error import ErrorCommonSO
-from project.api.schema.out.common.ok import OkSO
+from project.api.schema.out.common.ok import OkCommonSO
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
@@ -15,7 +15,7 @@ api_router = APIRouter()
     path="",
     name="Check sqlalchemy db",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=OkSO | ErrorCommonSO
+    response_model=OkCommonSO | ErrorCommonSO
 )
 async def _(
         *,
@@ -32,4 +32,4 @@ async def _(
         ]))
 ):
     get_cached_sqlalchemy_db().check_conn()
-    return OkSO()
+    return OkCommonSO()

{arpakitlib-1.8.67 → arpakitlib-1.8.69}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/clear_log_file.py

@@ -5,7 +5,7 @@ from arpakitlib.ar_logging_util import init_log_file
 from project.api.authorize import require_api_key_dbm_api_authorize_middleware, APIAuthorizeData, \
     require_user_token_dbm_api_authorize_middleware, api_authorize
 from project.api.schema.out.common.error import ErrorCommonSO
-from project.api.schema.out.common.ok import OkSO
+from project.api.schema.out.common.ok import OkCommonSO
 from project.core.settings import get_cached_settings
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
@@ -16,7 +16,7 @@ api_router = APIRouter()
     path="",
     name="Clear log file",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=OkSO | ErrorCommonSO
+    response_model=OkCommonSO | ErrorCommonSO
 )
 def _(
         *,
@@ -35,4 +35,4 @@ def _(
     init_log_file(log_filepath=get_cached_settings().log_filepath)
     with open(file=get_cached_settings().log_filepath, mode="w") as f:
         f.write("")
-    return OkSO()
+    return OkCommonSO()

{arpakitlib-1.8.67 → arpakitlib-1.8.69}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/init_sqlalchemy_db.py

@@ -4,7 +4,7 @@ from fastapi import APIRouter
 from project.api.authorize import APIAuthorizeData, api_authorize, require_user_token_dbm_api_authorize_middleware, \
     require_api_key_dbm_api_authorize_middleware, require_not_prod_mode_api_authorize_middleware
 from project.api.schema.out.common.error import ErrorCommonSO
-from project.api.schema.out.common.ok import OkSO
+from project.api.schema.out.common.ok import OkCommonSO
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
@@ -15,7 +15,7 @@ api_router = APIRouter()
     path="",
     name="Init sqlalchemy db",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=OkSO | ErrorCommonSO,
+    response_model=OkCommonSO | ErrorCommonSO,
 )
 async def _(
         *,
@@ -33,4 +33,4 @@ async def _(
         ]))
 ):
     get_cached_sqlalchemy_db().init()
-    return OkSO()
+    return OkCommonSO()

{arpakitlib-1.8.67 → arpakitlib-1.8.69}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/make_test_data_1.py

@@ -4,7 +4,7 @@ from fastapi import APIRouter
 from project.api.authorize import require_api_key_dbm_api_authorize_middleware, APIAuthorizeData, \
     require_user_token_dbm_api_authorize_middleware, api_authorize
 from project.api.schema.out.common.error import ErrorCommonSO
-from project.api.schema.out.common.ok import OkSO
+from project.api.schema.out.common.ok import OkCommonSO
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 from project.test_data.make_test_data_1 import make_test_data_1
 
@@ -15,7 +15,7 @@ api_router = APIRouter()
     path="",
     name="Make test data 1",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=OkSO | ErrorCommonSO
+    response_model=OkCommonSO | ErrorCommonSO
 )
 def _(
         *,
@@ -32,4 +32,4 @@ def _(
         ]))
 ):
     make_test_data_1()
-    return OkSO()
+    return OkCommonSO()

{arpakitlib-1.8.67 → arpakitlib-1.8.69}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/reinit_sqlalchemy_db.py

@@ -5,7 +5,7 @@ from project.api.authorize import APIAuthorizeData, api_authorize, require_user_
     require_not_prod_mode_api_authorize_middleware, \
     require_api_key_dbm_api_authorize_middleware
 from project.api.schema.out.common.error import ErrorCommonSO
-from project.api.schema.out.common.ok import OkSO
+from project.api.schema.out.common.ok import OkCommonSO
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
@@ -16,7 +16,7 @@ api_router = APIRouter()
     path="",
     name="Reinit sqlalchemy db",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=OkSO | ErrorCommonSO,
+    response_model=OkCommonSO | ErrorCommonSO,
 )
 async def _(
         *,
@@ -34,4 +34,4 @@ async def _(
         ]))
 ):
     get_cached_sqlalchemy_db().reinit()
-    return OkSO()
+    return OkCommonSO()

arpakitlib-1.8.69/arpakitlib/_arpakit_project_template_v_5/project/api/router/client/get_current_user.py

@@ -0,0 +1,45 @@
+from __future__ import annotations
+
+import fastapi.requests
+import sqlalchemy
+from fastapi import APIRouter
+from sqlalchemy.orm import joinedload
+
+from project.api.authorize import APIAuthorizeData, api_authorize, require_user_token_dbm_api_authorize_middleware, \
+    require_api_key_dbm_api_authorize_middleware
+from project.api.schema.out.client.complicated_user_1 import ComplicatedUser1ClientSO
+from project.api.schema.out.common.error import ErrorCommonSO
+from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
+from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
+
+api_router = APIRouter()
+
+
+@api_router.get(
+    "",
+    name="Get current user",
+    status_code=fastapi.status.HTTP_200_OK,
+    response_model=ComplicatedUser1ClientSO | ErrorCommonSO,
+)
+async def _(
+        *,
+        request: fastapi.requests.Request,
+        response: fastapi.responses.Response,
+        api_auth_data: APIAuthorizeData = fastapi.Depends(api_authorize(middlewares=[
+            require_api_key_dbm_api_authorize_middleware(
+                require_active=True
+            ),
+            require_user_token_dbm_api_authorize_middleware(
+                require_active_user_token=True,
+                require_user_roles=[UserDBM.Roles.client]
+            )
+        ]))
+):
+    async with get_cached_sqlalchemy_db().new_async_session() as async_session:
+        user_dbm = await async_session.scalar(
+            sqlalchemy
+            .select(UserDBM)
+            .filter(UserDBM.id == api_auth_data.user_token_dbm.user_id)
+            .options(joinedload(UserDBM.user_tokens))
+        )
+    return ComplicatedUser1ClientSO.from_dbm(simple_dbm=user_dbm)

arpakitlib-1.8.67/arpakitlib/_arpakit_project_template_v_5/project/api/router/client/get_current_user.py → arpakitlib-1.8.69/arpakitlib/_arpakit_project_template_v_5/project/api/router/client/get_current_user_token.py

@@ -5,7 +5,7 @@ from fastapi import APIRouter
 
 from project.api.authorize import APIAuthorizeData, api_authorize, require_user_token_dbm_api_authorize_middleware, \
     require_api_key_dbm_api_authorize_middleware
-from project.api.schema.out.client.user import User1ClientSO
+from project.api.schema.out.client.complicated_user_token_1 import ComplicatedUserToken1ClientSO
 from project.api.schema.out.common.error import ErrorCommonSO
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
@@ -14,9 +14,9 @@ api_router = APIRouter()
 
 @api_router.get(
     "",
-    name="Get current user",
+    name="Get current user token",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=User1ClientSO | ErrorCommonSO,
+    response_model=ComplicatedUserToken1ClientSO | ErrorCommonSO,
 )
 async def _(
         *,
@@ -32,6 +32,6 @@ async def _(
             )
         ]))
 ):
-    return User1ClientSO.from_dbm(
-        simple_dbm=api_auth_data.user_token_dbm.user
+    return ComplicatedUserToken1ClientSO.from_dbm(
+        simple_dbm=api_auth_data.user_token_dbm
     )

arpakitlib-1.8.69/arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/client/complicated_user_1.py

@@ -0,0 +1,21 @@
+from __future__ import annotations
+
+from project.api.schema.out.client.user import User1ClientSO
+from project.api.schema.out.client.user_token import UserToken1ClientSO
+from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
+
+
+class ComplicatedUser1ClientSO(User1ClientSO):
+    user_tokens: list[UserToken1ClientSO]
+
+    @classmethod
+    def from_dbm(cls, *, simple_dbm: UserDBM, **kwargs) -> ComplicatedUser1ClientSO:
+        return cls.model_validate(simple_dbm.simple_dict(
+            include_columns_and_sd_properties=cls.model_fields.keys(),
+            kwargs={
+                "user_tokens": [
+                    UserToken1ClientSO.from_dbm(simple_dbm=d)
+                    for d in simple_dbm.user_tokens
+                ]
+            }
+        ))

arpakitlib-1.8.69/arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/client/complicated_user_token_1.py

@@ -0,0 +1,19 @@
+from __future__ import annotations
+
+from project.api.schema.out.client.user import User1ClientSO
+from project.api.schema.out.client.user_token import UserToken1ClientSO
+from project.sqlalchemy_db_.sqlalchemy_model import UserTokenDBM
+
+
+class ComplicatedUserToken1ClientSO(UserToken1ClientSO):
+    user: User1ClientSO
+
+    @classmethod
+    def from_dbm(cls, *, simple_dbm: UserTokenDBM, **kwargs) -> ComplicatedUserToken1ClientSO:
+        simple_dict = simple_dbm.simple_dict(
+            include_columns_and_sd_properties=cls.model_fields.keys(),
+            kwargs={
+                "user": User1ClientSO.from_dbm(simple_dbm=simple_dbm.user)
+            }
+        )
+        return cls.model_validate(simple_dict)

{arpakitlib-1.8.67 → arpakitlib-1.8.69}/arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/common/ok.py

@@ -1,5 +1,5 @@
 from project.api.schema.common import BaseSO
 
 
-class OkSO(BaseSO):
+class OkCommonSO(BaseSO):
     is_ok: bool = True

{arpakitlib-1.8.67 → arpakitlib-1.8.69}/arpakitlib/_arpakit_project_template_v_5/project/test_data/make_test_data_1.py

@@ -37,7 +37,7 @@ def make_test_data_1():
         _logger.info(arpakit_user)
 
         for i in range(1000):
-            user_token_dbm = UserTokenDBM(user_id=arpakit_user.id)
+            user_token_dbm = UserTokenDBM(user_id=arpakit_user.id, value=str(i))
             session.add(user_token_dbm)
             _logger.info(user_token_dbm)
         session.commit()

{arpakitlib-1.8.67 → arpakitlib-1.8.69}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "arpakitlib"
-version = "1.8.67"
+version = "1.8.69"
 description = "arpakitlib"
 authors = [
     { name = "arpakit_support", email = "support@arpakit.com" }

arpakitlib-1.8.67/arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json

@@ -1,4 +0,0 @@
-{
-  "arpakitlib_project_template_version": "5",
-  "arpakitlib_project_template_subversion": "17"
-}

arpakitlib-1.8.67/arpakitlib/_arpakit_project_template_v_5/project/api/router/client/get_current_user_token.py

@@ -1,53 +0,0 @@
-import fastapi.requests
-from fastapi import APIRouter
-
-from project.api.authorize import APIAuthorizeData, api_authorize, require_user_token_dbm_api_authorize_middleware, \
-    require_api_key_dbm_api_authorize_middleware
-from project.api.schema.out.client.user import User1ClientSO
-from project.api.schema.out.client.user_token import UserToken1ClientSO
-from project.api.schema.out.common.error import ErrorCommonSO
-from project.sqlalchemy_db_.sqlalchemy_model import UserDBM, UserTokenDBM
-
-
-class _UserToken1ClientSO(UserToken1ClientSO):
-    user: User1ClientSO
-
-    @classmethod
-    def from_dbm(cls, *, simple_dbm: UserTokenDBM) -> UserToken1ClientSO:
-        simple_dict = simple_dbm.simple_dict(
-            include_columns_and_sd_properties=cls.model_fields.keys(),
-            kwargs={
-                "user": simple_dbm.user.simple_dict(
-                    include_columns_and_sd_properties=User1ClientSO.model_fields.keys()
-                )
-            }
-        )
-        return cls.model_validate(simple_dict)
-
-
-api_router = APIRouter()
-
-
-@api_router.get(
-    "",
-    name="Get current user token",
-    status_code=fastapi.status.HTTP_200_OK,
-    response_model=_UserToken1ClientSO | ErrorCommonSO,
-)
-async def _(
-        *,
-        request: fastapi.requests.Request,
-        response: fastapi.responses.Response,
-        api_auth_data: APIAuthorizeData = fastapi.Depends(api_authorize(middlewares=[
-            require_api_key_dbm_api_authorize_middleware(
-                require_active=True
-            ),
-            require_user_token_dbm_api_authorize_middleware(
-                require_active_user_token=True,
-                require_user_roles=[UserDBM.Roles.client]
-            )
-        ]))
-):
-    return _UserToken1ClientSO.from_dbm(
-        simple_dbm=api_auth_data.user_token_dbm
-    )