arpakitlib 1.7.236__tar.gz → 1.7.238__tar.gz

{arpakitlib-1.7.236 → arpakitlib-1.7.238}/PKG-INFO

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

arpakitlib-1.7.238/arpakitlib/_arpakit_project_template/src/db/_drop_sqlalchemy_db.py

@@ -0,0 +1,13 @@
+from src.core.settings import get_cached_settings
+from src.core.util import setup_logging
+from src.db.util import get_cached_sqlalchemy_db
+
+
+def _reinit_sqlalchemy_db():
+    setup_logging()
+    get_cached_settings().raise_if_mode_type_prod()
+    get_cached_sqlalchemy_db().drop()
+
+
+if __name__ == '__main__':
+    _reinit_sqlalchemy_db()

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

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