arpakitlib 1.6.3__py3-none-any.whl → 1.6.32__py3-none-any.whl

arpakitlib/ar_sqlalchemy_model_util.py

@@ -25,24 +25,31 @@ class BaseDBM(DeclarativeBase):
             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_dict(self, *, include_sd_properties: bool = True) -> dict[str, Any]:
+        res = {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())
+        if include_sd_properties:
+            for attr_name in dir(self):
+                if attr_name.startswith("sdp_") and isinstance(getattr(type(self), attr_name, None), property):
+                    res[attr_name.removesuffix("sdp_")] = getattr(self, attr_name)
+
+        return res
+
+    def simple_json(self, *, include_sd_properties: bool = True) -> str:
+        return safely_transfer_to_json_str(self.simple_dict(include_sd_properties=include_sd_properties))
 
 
 class SimpleDBM(BaseDBM):
     __abstract__ = True
 
     id: Mapped[int] = mapped_column(
-        INTEGER, primary_key=True, autoincrement=True, sort_order=0, nullable=False
+        INTEGER, primary_key=True, autoincrement=True, sort_order=-3, nullable=False
     )
     long_id: Mapped[str] = mapped_column(
-        TEXT, insert_default=uuid4, unique=True, sort_order=1, nullable=False
+        TEXT, insert_default=uuid4, unique=True, sort_order=-2, nullable=False
     )
     creation_dt: Mapped[datetime] = mapped_column(
-        TIMESTAMP(timezone=True), insert_default=now_utc_dt, index=True, sort_order=2, nullable=False
+        TIMESTAMP(timezone=True), insert_default=now_utc_dt, index=True, sort_order=-1, nullable=False
     )
 
     def __repr__(self):

{arpakitlib-1.6.3.dist-info → arpakitlib-1.6.32.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arpakitlib
-Version: 1.6.3
+Version: 1.6.32
 Summary: arpakitlib
 Home-page: https://github.com/ARPAKIT-Company/arpakitlib
 License: Apache-2.0

{arpakitlib-1.6.3.dist-info → arpakitlib-1.6.32.dist-info}/RECORD

@@ -56,15 +56,15 @@ arpakitlib/ar_postgresql_util.py,sha256=1AuLjEaa1Lg4pzn-ukCVnDi35Eg1k91APRTqZhIJ
 arpakitlib/ar_run_cmd_util.py,sha256=D_rPavKMmWkQtwvZFz-Io5Ak8eSODHkcFeLPzNVC68g,1072
 arpakitlib/ar_schedule_uust_api_client_util.py,sha256=NpCN8GT96aPvE3Lc-IRn653abjI95CmOqNc4pbHIWxo,5780
 arpakitlib/ar_sleep_util.py,sha256=9ZN4Qo4eZ_q3hjM7vNBQjFRcH-9-sqv3QLSjnxVJE90,1405
-arpakitlib/ar_sqlalchemy_model_util.py,sha256=td_V-K7qxIG-mRXD24yTKNZYx2tOjIAXcmBsw0Rkix0,4366
+arpakitlib/ar_sqlalchemy_model_util.py,sha256=ttdgOwQfoHTKqgivBtXoSbJoBCASHDjLEFK5tJ9kNNE,4779
 arpakitlib/ar_sqlalchemy_util.py,sha256=3jKHu5aUFPUQ492dWaisN0Y_-r2Pif16SfNawrQ_6xY,4012
 arpakitlib/ar_ssh_util.py,sha256=jlnss4V4pziBN1rBzoK_lDiWm6nMOqGXfa6NFJSKH-Y,6796
 arpakitlib/ar_str_util.py,sha256=xSEzmsDvRiZVaxyqFFjcgzpphktCbXg2FHcvsd1DYpA,1885
 arpakitlib/ar_type_util.py,sha256=I6jbTz7_dxR1lkhz1JfUb5ZyLLdXVhG_-hzjdgT6N6s,1932
 arpakitlib/ar_yookassa_api_client_util.py,sha256=5GMvu8paByni8buhc1vpHB7n6oXe0gPfj1LSvnyZCrQ,5307
 arpakitlib/ar_zabbix_util.py,sha256=Q-VR4MvoZ9aHwZeYZr9G3LwN-ANx1T5KFmF6pvPM-9M,6402
-arpakitlib-1.6.3.dist-info/LICENSE,sha256=1jqWIkbnMxDfs_i0SXP5qbV6PHjBr1g8506oW7uPjfg,11347
-arpakitlib-1.6.3.dist-info/METADATA,sha256=tuCgfzmnft8cUqIvsXNIh_goZIK6MjxvL03g6bcv86g,2319
-arpakitlib-1.6.3.dist-info/NOTICE,sha256=wHwmiq3wExfFfgMsE5U5TOBP9_l72ocIG82KurEels0,43
-arpakitlib-1.6.3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-arpakitlib-1.6.3.dist-info/RECORD,,
+arpakitlib-1.6.32.dist-info/LICENSE,sha256=1jqWIkbnMxDfs_i0SXP5qbV6PHjBr1g8506oW7uPjfg,11347
+arpakitlib-1.6.32.dist-info/METADATA,sha256=GTVJVV5RZ1XIyDTZdJfOWkrpddmLLZO1hQGtjOVdobk,2320
+arpakitlib-1.6.32.dist-info/NOTICE,sha256=wHwmiq3wExfFfgMsE5U5TOBP9_l72ocIG82KurEels0,43
+arpakitlib-1.6.32.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+arpakitlib-1.6.32.dist-info/RECORD,,