arpakitlib 1.7.232__py3-none-any.whl → 1.7.234__py3-none-any.whl

arpakitlib/_arpakit_project_template/src/db/util.py

@@ -1,18 +1,25 @@
 import importlib
 from contextlib import suppress
 from functools import lru_cache
+from typing import Any
 
 from arpakitlib.ar_sqlalchemy_util import SQLAlchemyDB
 from src.core.settings import get_cached_settings
 
 
-def create_sqlalchemy_db() -> SQLAlchemyDB:
+def get_base_dbm() -> Any:
     with suppress(Exception):
         importlib.import_module("src.db.sqlalchemy_model")
 
+    from arpakitlib.ar_sqlalchemy_model_util import BaseDBM
+    return BaseDBM
+
+
+def create_sqlalchemy_db() -> SQLAlchemyDB:
     return SQLAlchemyDB(
         db_url=get_cached_settings().sql_db_url,
-        db_echo=get_cached_settings().sql_db_echo
+        db_echo=get_cached_settings().sql_db_echo,
+        base_declarative_base=get_base_dbm()
     )
 
 

arpakitlib/ar_sqlalchemy_model_util.py

@@ -4,7 +4,8 @@ from datetime import datetime, timedelta
 from typing import Any
 from uuid import uuid4
 
-from sqlalchemy import inspect, INTEGER, TEXT, TIMESTAMP, func, JSON
+from sqlalchemy import inspect, INTEGER, TEXT, TIMESTAMP, func
+from sqlalchemy.dialects.postgresql import JSON
 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
 
 from arpakitlib.ar_datetime_util import now_utc_dt

arpakitlib/ar_sqlalchemy_util.py

@@ -27,15 +27,10 @@ class SQLAlchemyDB:
             *,
             db_url: str = "postgresql://arpakitlib:arpakitlib@localhost:50629/arpakitlib",
             db_echo: bool = False,
-            need_include_operation_dbm: bool = False,
-            need_include_story_dbm: bool = False,
-            db_models: list[Any] | None = None
+            base_declarative_base: Any | None = None,
+            db_models: list[Any] | None = None,
     ):
         self._logger = logging.getLogger(self.__class__.__name__)
-        self.need_include_operation_dbm = need_include_operation_dbm
-        self.need_include_story_dbm = need_include_story_dbm
-        if self.need_include_operation_dbm:
-            self.need_include_story_dbm = True
         self.engine = create_engine(
             url=db_url,
             echo=db_echo,
@@ -46,6 +41,7 @@ class SQLAlchemyDB:
         )
         self.sessionmaker = sessionmaker(bind=self.engine)
         self.func_new_session_counter = 0
+        self.base_declarative_base = base_declarative_base
 
     def drop_celery_tables(self):
         with self.engine.connect() as connection:

{arpakitlib-1.7.232.dist-info → arpakitlib-1.7.234.dist-info}/METADATA

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

{arpakitlib-1.7.232.dist-info → arpakitlib-1.7.234.dist-info}/RECORD

@@ -97,7 +97,7 @@ arpakitlib/_arpakit_project_template/src/db/_init_sqlalchemy_db.py,sha256=tHJ1NB
 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=a8lj54I-vVGjhDg4SLOxahDjYuiPOSFxU86myCfE1M0,557
+arpakitlib/_arpakit_project_template/src/db/util.py,sha256=BVOCeZbiTNs-gd35A8o8SDilCeVI4dqrQiJGtxZne9A,734
 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
@@ -194,15 +194,15 @@ arpakitlib/ar_schedule_uust_api_client_util.py,sha256=wvHiipgQUQiEBzQkb75h3QkG5x
 arpakitlib/ar_settings_util.py,sha256=rnoTqbRuhiq7294D4crD5kbnU8-gNWJbwGU_Ls2gJoU,2199
 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=DGbXcqD2hukzAiO0aQDUkJ5xOvi3yYnMKzI5y0pMXzs,6217
-arpakitlib/ar_sqlalchemy_util.py,sha256=Hcg1THrDsSR_-8dsY1CG3NWPEv0FqCbkPXFXLtjlSJ0,4207
+arpakitlib/ar_sqlalchemy_model_util.py,sha256=EdADAqTh5lk6h41B6PPlioXshphT2FPfIhmvBlliTYo,6259
+arpakitlib/ar_sqlalchemy_util.py,sha256=Wh5utY-kITx2-BBjldhNqWCElOzG8fyX9w_Qzvq--W4,3996
 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.232.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.7.232.dist-info/METADATA,sha256=u5UvnCTGX9axtIbGyffi6UtPY6gVQEpExj4iOmi5qkU,3310
-arpakitlib-1.7.232.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-arpakitlib-1.7.232.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.7.232.dist-info/RECORD,,
+arpakitlib-1.7.234.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.7.234.dist-info/METADATA,sha256=59pMqAJxvIDD-i8FFVhihN0ySc0XWTTmGUbM39RT7v4,3310
+arpakitlib-1.7.234.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+arpakitlib-1.7.234.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.7.234.dist-info/RECORD,,