arpakitlib 1.7.232__tar.gz → 1.7.233__tar.gz

{arpakitlib-1.7.232 → arpakitlib-1.7.233}/PKG-INFO

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

{arpakitlib-1.7.232 → arpakitlib-1.7.233}/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-1.7.232 → arpakitlib-1.7.233}/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 → arpakitlib-1.7.233}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "arpakitlib"
-version = "1.7.232"
+version = "1.7.233"
 description = "arpakitlib"
 authors = [
     { name = "arpakit", email = "arpakit@gmail.com" },