arpakitlib 1.7.236__py3-none-any.whl → 1.7.237__py3-none-any.whl

arpakitlib/_arpakit_project_template/src/db/sqlalchemy_model.py

@@ -1,8 +1,13 @@
 from arpakitlib.ar_sqlalchemy_model_util import SimpleDBM
 from arpakitlib.ar_sqlalchemy_util import get_string_info_from_declarative_base
 
+
 # ...
 
 
+def import_project_sqlalchemy_models():
+    pass
+
+
 if __name__ == '__main__':
     print(get_string_info_from_declarative_base(SimpleDBM))

arpakitlib/_arpakit_project_template/src/db/util.py

@@ -1,20 +1,15 @@
-import importlib
-from contextlib import suppress
 from functools import lru_cache
-from typing import Any
 
+from arpakitlib.ar_sqlalchemy_model_util import BaseDBM
 from arpakitlib.ar_sqlalchemy_util import SQLAlchemyDB
 from src.core.settings import get_cached_settings
+from src.db.sqlalchemy_model import import_project_sqlalchemy_models
 
 
-def get_base_dbm() -> Any:
+def get_base_dbm() -> type[BaseDBM]:
     from arpakitlib.ar_sqlalchemy_model_util import import_ar_sqlalchemy_models
     import_ar_sqlalchemy_models()
-
-    with suppress(Exception):
-        importlib.import_module("src.db.sqlalchemy_model")
-
-    from arpakitlib.ar_sqlalchemy_model_util import BaseDBM
+    import_project_sqlalchemy_models()
     return BaseDBM
 
 
@@ -22,7 +17,7 @@ def create_sqlalchemy_db() -> SQLAlchemyDB:
     return SQLAlchemyDB(
         db_url=get_cached_settings().sql_db_url,
         db_echo=get_cached_settings().sql_db_echo,
-        base_declarative_base=get_base_dbm()
+        base_dbm=get_base_dbm()
     )
 
 

arpakitlib/ar_sqlalchemy_util.py

@@ -10,6 +10,7 @@ from sqlalchemy.orm import sessionmaker, DeclarativeBase
 from sqlalchemy.orm.session import Session
 
 from arpakitlib.ar_datetime_util import now_utc_dt
+from arpakitlib.ar_sqlalchemy_model_util import BaseDBM
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 
@@ -27,7 +28,7 @@ class SQLAlchemyDB:
             *,
             db_url: str = "postgresql://arpakitlib:arpakitlib@localhost:50629/arpakitlib",
             db_echo: bool = False,
-            base_declarative_base: Any | None = None,
+            base_dbm: type[BaseDBM] | None = None,
             db_models: list[Any] | None = None,
     ):
         self._logger = logging.getLogger(self.__class__.__name__)
@@ -41,7 +42,7 @@ class SQLAlchemyDB:
         )
         self.sessionmaker = sessionmaker(bind=self.engine)
         self.func_new_session_counter = 0
-        self.base_declarative_base = base_declarative_base
+        self.base_dbm = base_dbm
 
     def drop_celery_tables(self):
         with self.engine.connect() as connection:

{arpakitlib-1.7.236.dist-info → arpakitlib-1.7.237.dist-info}/METADATA

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

{arpakitlib-1.7.236.dist-info → arpakitlib-1.7.237.dist-info}/RECORD

@@ -96,8 +96,8 @@ arpakitlib/_arpakit_project_template/src/db/_check_conn_sqlalchemy_db.py,sha256=
 arpakitlib/_arpakit_project_template/src/db/_init_sqlalchemy_db.py,sha256=tHJ1NBUAR-9uAktx2RfPikzGGguhwEWfrWdj1y0XV-w,231
 arpakitlib/_arpakit_project_template/src/db/_reinit_sqlalchemy_db.py,sha256=_4O_xr6FXt3qcWOmO82CKG3XX6_RqbqaOYSEygxpBfA,339
 arpakitlib/_arpakit_project_template/src/db/const.py,sha256=dcvj5C9E2F2KCsGZPBBncQf_EvVJAC1qQgnyD8P4ZEw,6
-arpakitlib/_arpakit_project_template/src/db/sqlalchemy_model.py,sha256=nXtayUkBaVb6tWx5qJgXZLbLOTVAjnSLpSDxBm7yZLc,234
-arpakitlib/_arpakit_project_template/src/db/util.py,sha256=2cif54TfFxxhaL5Kv6U0AKdUPCk-auLYdyr3PjSVY-g,849
+arpakitlib/_arpakit_project_template/src/db/sqlalchemy_model.py,sha256=tIdSerx8m6FA0cx4PDNJF8cWY1utpS_g0sZ0jBzUAbI,286
+arpakitlib/_arpakit_project_template/src/db/util.py,sha256=Ww0CYifxFcNkRvMedmDu806_Ic_Hbb1C5KQX8UsiLdc,787
 arpakitlib/_arpakit_project_template/src/operation_execution/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/src/operation_execution/_remove_operations.py,sha256=KsvAk2zQCp0PX6-QiRW0LKHoJfmH0wVJcBZviFqAoBI,471
 arpakitlib/_arpakit_project_template/src/operation_execution/_start_operation_executor_worker.py,sha256=K861UI9LFNxfCoPpQ5AJX-oUwjB6bfFNKScKsyU9Xd8,575
@@ -195,14 +195,14 @@ arpakitlib/ar_settings_util.py,sha256=rnoTqbRuhiq7294D4crD5kbnU8-gNWJbwGU_Ls2gJo
 arpakitlib/ar_sleep_util.py,sha256=OaLtRaJQWMkGjfj_mW1RB2P4RaSWsAIH8LUoXqsH0zM,1061
 arpakitlib/ar_sqladmin_util.py,sha256=6Nv9VQssk9PB0piyuss__soYKdjVhdbIeXIv4AgUxmQ,2660
 arpakitlib/ar_sqlalchemy_model_util.py,sha256=ezui1VEVuABYgrywpP_A2wYvDBlIxwQTZ0HQgBJfZE0,6293
-arpakitlib/ar_sqlalchemy_util.py,sha256=Wh5utY-kITx2-BBjldhNqWCElOzG8fyX9w_Qzvq--W4,3996
+arpakitlib/ar_sqlalchemy_util.py,sha256=355uSCRbMd76YlHBPdSWKWTTx6OfzzyL5-0i9rqiQsI,4023
 arpakitlib/ar_ssh_runner_util.py,sha256=e9deuUdBW7Eh0Exx2nTBhk57SaOZYaJaSjNk8q6dbJk,6804
 arpakitlib/ar_str_util.py,sha256=yU5gOwNXUQaH5b_tM5t6fXUn9oUcv5EQbVnq2wXXIpQ,3378
 arpakitlib/ar_type_util.py,sha256=9C3ErtUVs0tAUqtK-foFzjJOykfBOntfCz2IogDOgfA,4134
 arpakitlib/ar_yookassa_api_client_util.py,sha256=VozuZeCJjmLd1zj2BdC9WfiAQ3XYOrIMsdpNK-AUlm0,5347
 arpakitlib/ar_zabbix_api_client_util.py,sha256=Q-VR4MvoZ9aHwZeYZr9G3LwN-ANx1T5KFmF6pvPM-9M,6402
-arpakitlib-1.7.236.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.7.236.dist-info/METADATA,sha256=jk4iLCg5Nys9UUGG5jvp5FNqbncTfGSHONEi81P2wAo,3310
-arpakitlib-1.7.236.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-arpakitlib-1.7.236.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.7.236.dist-info/RECORD,,
+arpakitlib-1.7.237.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.7.237.dist-info/METADATA,sha256=CJEzn3Ay4uUnanrRm4BqRunvG1QwyYlKJqByp0iXpp8,3310
+arpakitlib-1.7.237.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+arpakitlib-1.7.237.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.7.237.dist-info/RECORD,,