arpakitlib 1.5.19__tar.gz → 1.5.20__tar.gz

{arpakitlib-1.5.19 → arpakitlib-1.5.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arpakitlib
-Version: 1.5.19
+Version: 1.5.20
 Summary: arpakitlib
 License: Apache-2.0
 Author: arpakit

{arpakitlib-1.5.19 → arpakitlib-1.5.20}/arpakitlib/ar_datetime_util.py

@@ -19,7 +19,7 @@ def now_utc_dt() -> datetime:
     return datetime.now(tz=pytz.UTC)
 
 
-def now_dt(tz = pytz.UTC) -> datetime:
+def now_dt(tz=pytz.UTC) -> datetime:
     return datetime.now(tz=tz)
 
 

arpakitlib-1.5.19/arpakitlib/ar_sqlalchemy_util.py → arpakitlib-1.5.20/arpakitlib/ar_easy_sqlalchemy_util.py

@@ -1,49 +1,15 @@
 import logging
-from datetime import timedelta, datetime
+from datetime import timedelta
 from typing import Any
 from uuid import uuid4
 
-from sqlalchemy import create_engine, QueuePool, text, func, inspect, INTEGER, TEXT, TIMESTAMP
-from sqlalchemy.orm import sessionmaker, DeclarativeBase, Mapped, mapped_column
+from sqlalchemy import create_engine, QueuePool, text, func
+from sqlalchemy.orm import sessionmaker
 from sqlalchemy.orm.session import Session
 
-from arpakitlib.ar_datetime_util import now_utc_dt
-from arpakitlib.ar_json_util import safely_transfer_to_json_str
-
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 
 
-class BaseDBM(DeclarativeBase):
-    __abstract__ = True
-    _bus_data: dict[str, Any] | None = None
-
-    @property
-    def bus_data(self) -> dict[str, Any]:
-        if self._bus_data is None:
-            self._bus_data = {}
-        return self._bus_data
-
-    def simple_dict(self) -> dict[str, Any]:
-        return {c.key: getattr(self, c.key) for c in inspect(self).mapper.column_attrs}
-
-    def simple_json(self) -> str:
-        return safely_transfer_to_json_str(self.simple_dict())
-
-
-class SimpleDBM(BaseDBM):
-    __abstract__ = True
-
-    id: Mapped[int] = mapped_column(
-        INTEGER, primary_key=True, autoincrement=True, nullable=False
-    )
-    long_id: Mapped[str] = mapped_column(
-        TEXT, insert_default=uuid4, unique=True, nullable=False
-    )
-    creation_dt: Mapped[datetime] = mapped_column(
-        TIMESTAMP(timezone=True), insert_default=now_utc_dt, index=True, nullable=False
-    )
-
-
 class EasySQLAlchemyDB:
     def __init__(self, *, db_url: str, echo: bool = False):
         self._logger = logging.getLogger(self.__class__.__name__)
@@ -73,14 +39,17 @@ class EasySQLAlchemyDB:
             self._logger.info("celery tables data were removed")
 
     def init(self):
+        from arpakitlib.ar_sqlalchemy_model_util import BaseDBM
         BaseDBM.metadata.create_all(bind=self.engine, checkfirst=True)
         self._logger.info("db was inited")
 
     def drop(self):
+        from arpakitlib.ar_sqlalchemy_model_util import BaseDBM
         BaseDBM.metadata.drop_all(bind=self.engine, checkfirst=True)
         self._logger.info("db was dropped")
 
     def reinit(self):
+        from arpakitlib.ar_sqlalchemy_model_util import BaseDBM
         BaseDBM.metadata.drop_all(bind=self.engine, checkfirst=True)
         BaseDBM.metadata.create_all(bind=self.engine, checkfirst=True)
         self._logger.info("db was reinited")
@@ -101,14 +70,14 @@ class EasySQLAlchemyDB:
             return False
         return True
 
-    def generate_unique_id(self, *, class_dbm: type[SimpleDBM]):
+    def generate_unique_id(self, *, class_dbm: Any):
         with self.new_session() as session:
             res: int = session.query(func.max(class_dbm.id)).scalar()
             while session.query(class_dbm).filter(class_dbm.id == res).first() is not None:
                 res += 1
         return res
 
-    def generate_unique_long_id(self, *, class_dbm: type[SimpleDBM]):
+    def generate_unique_long_id(self, *, class_dbm: Any):
         with self.new_session() as session:
             res: str = str(uuid4())
             while session.query(class_dbm).filter(class_dbm.long_id == res).first() is not None:

arpakitlib-1.5.20/arpakitlib/ar_sqlalchemy_model_util.py

@@ -0,0 +1,42 @@
+from datetime import datetime
+from typing import Any
+from uuid import uuid4
+
+from sqlalchemy import inspect, INTEGER, TEXT, TIMESTAMP
+from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
+
+from arpakitlib.ar_datetime_util import now_utc_dt
+from arpakitlib.ar_json_util import safely_transfer_to_json_str
+
+_ARPAKIT_LIB_MODULE_VERSION = "3.0"
+
+
+class BaseDBM(DeclarativeBase):
+    __abstract__ = True
+    _bus_data: dict[str, Any] | None = None
+
+    @property
+    def bus_data(self) -> dict[str, Any]:
+        if self._bus_data is None:
+            self._bus_data = {}
+        return self._bus_data
+
+    def simple_dict(self) -> dict[str, Any]:
+        return {c.key: getattr(self, c.key) for c in inspect(self).mapper.column_attrs}
+
+    def simple_json(self) -> str:
+        return safely_transfer_to_json_str(self.simple_dict())
+
+
+class SimpleDBM(BaseDBM):
+    __abstract__ = True
+
+    id: Mapped[int] = mapped_column(
+        INTEGER, primary_key=True, autoincrement=True, nullable=False
+    )
+    long_id: Mapped[str] = mapped_column(
+        TEXT, insert_default=uuid4, unique=True, nullable=False
+    )
+    creation_dt: Mapped[datetime] = mapped_column(
+        TIMESTAMP(timezone=True), insert_default=now_utc_dt, index=True, nullable=False
+    )

{arpakitlib-1.5.19 → arpakitlib-1.5.20}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "arpakitlib"
-version = "1.5.19"
+version = "1.5.20"
 description = "arpakitlib"
 authors = ["arpakit <arpakit@gmail.com>"]
 license = "Apache License 2.0"