arpakitlib 1.8.9__py3-none-any.whl → 1.8.10__py3-none-any.whl

arpakitlib/_arpakit_project_template_v_2/project/sqlalchemy_db_/sqlalchemy_db.py

@@ -2,7 +2,7 @@ from functools import lru_cache
 
 from arpakitlib.ar_sqlalchemy_util import SQLAlchemyDb
 from project.core.settings import get_cached_settings
-from project.sqlalchemy_db_.sqlalchemy_model.common import get_simple_dbm
+from project.sqlalchemy_db_.sqlalchemy_model import SimpleDBM
 
 
 def create_sqlalchemy_db() -> SQLAlchemyDb | None:
@@ -13,7 +13,7 @@ def create_sqlalchemy_db() -> SQLAlchemyDb | None:
         sync_db_url=get_cached_settings().sqlalchemy_sync_db_url,
         async_db_url=get_cached_settings().sqlalchemy_async_db_url,
         db_echo=get_cached_settings().sqlalchemy_db_echo,
-        base_dbm=get_simple_dbm()
+        base_dbm=SimpleDBM
     )
 
 

arpakitlib/_arpakit_project_template_v_2/project/sqlalchemy_db_/sqlalchemy_model/__init__.py

@@ -1,3 +1,7 @@
+from arpakitlib.ar_sqlalchemy_util import get_string_info_from_declarative_base
 from project.sqlalchemy_db_.sqlalchemy_model.common import SimpleDBM
 from project.sqlalchemy_db_.sqlalchemy_model.operation import OperationDBM
 from project.sqlalchemy_db_.sqlalchemy_model.story_log import StoryLogDBM
+
+if __name__ == '__main__':
+    print(get_string_info_from_declarative_base(SimpleDBM))

arpakitlib/_arpakit_project_template_v_2/project/sqlalchemy_db_/sqlalchemy_model/common.py

@@ -33,9 +33,10 @@ class SimpleDBM(BaseDBM):
         return f"{self.__class__.__name__.removesuffix('DBM')} (id={self.id}, slug={self.slug})"
 
 
-def get_simple_dbm() -> type[SimpleDBM]:
+def get_simple_dbm_class() -> type[SimpleDBM]:
+    from project.sqlalchemy_db_.sqlalchemy_model import SimpleDBM
     return SimpleDBM
 
 
 if __name__ == '__main__':
-    print(get_string_info_from_declarative_base(SimpleDBM))
+    print(get_string_info_from_declarative_base(get_simple_dbm_class()))

arpakitlib/_arpakit_project_template_v_2/project/sqlalchemy_db_/sqlalchemy_model/operation.py

@@ -1,5 +1,7 @@
+from __future__ import annotations
+
 from datetime import datetime, timedelta
-from typing import Any
+from typing import Any, TYPE_CHECKING
 
 import sqlalchemy
 from sqlalchemy.dialects import postgresql
@@ -8,6 +10,9 @@ from sqlalchemy.orm import mapped_column, Mapped
 from arpakitlib.ar_enumeration_util import Enumeration
 from project.sqlalchemy_db_.sqlalchemy_model.common import SimpleDBM
 
+if TYPE_CHECKING:
+    pass
+
 
 class OperationDBM(SimpleDBM):
     __tablename__ = "operation"
@@ -20,7 +25,7 @@ class OperationDBM(SimpleDBM):
 
     class Types(Enumeration):
         healthcheck_ = "healthcheck"
-        raise_fake_error_ = "raise_fake_error_"
+        raise_fake_error_ = "raise_fake_error"
 
     status: Mapped[str] = mapped_column(
         sqlalchemy.TEXT, index=True, insert_default=Statuses.waiting_for_execution,
@@ -29,6 +34,7 @@ class OperationDBM(SimpleDBM):
     type: Mapped[str] = mapped_column(
         sqlalchemy.TEXT, index=True, insert_default=Types.healthcheck_, nullable=False
     )
+    title: Mapped[str | None] = mapped_column(sqlalchemy.TEXT, insert_default=None, nullable=True)
     execution_start_dt: Mapped[datetime | None] = mapped_column(sqlalchemy.TIMESTAMP(timezone=True), nullable=True)
     execution_finish_dt: Mapped[datetime | None] = mapped_column(sqlalchemy.TIMESTAMP(timezone=True), nullable=True)
     input_data: Mapped[dict[str, Any]] = mapped_column(
@@ -38,10 +44,16 @@ class OperationDBM(SimpleDBM):
         nullable=False
     )
     output_data: Mapped[dict[str, Any]] = mapped_column(
-        postgresql.JSON, insert_default={}, server_default="{}", nullable=False
+        postgresql.JSON,
+        insert_default={},
+        server_default="{}",
+        nullable=False
     )
     error_data: Mapped[dict[str, Any]] = mapped_column(
-        postgresql.JSON, insert_default={}, server_default="{}", nullable=False
+        postgresql.JSON,
+        insert_default={},
+        server_default="{}",
+        nullable=False
     )
 
     def raise_if_executed_with_error(self):
@@ -70,6 +82,10 @@ class OperationDBM(SimpleDBM):
 
     @property
     def sdp_duration_total_seconds(self) -> float | None:
+        """
+        При использовании у данной модели .simple_dict данное свойство будет представлено как поле.
+        То есть префикс sdp_ и даёт этот бонус.
+        """
         return self.duration_total_seconds
 
 

arpakitlib/_arpakit_project_template_v_2/project/sqlalchemy_db_/sqlalchemy_model/story_log.py

@@ -1,4 +1,6 @@
-from typing import Any
+from __future__ import annotations
+
+from typing import Any, TYPE_CHECKING
 
 import sqlalchemy
 from sqlalchemy.dialects import postgresql
@@ -7,6 +9,9 @@ from sqlalchemy.orm import mapped_column, Mapped
 from arpakitlib.ar_enumeration_util import Enumeration
 from project.sqlalchemy_db_.sqlalchemy_model.common import SimpleDBM
 
+if TYPE_CHECKING:
+    pass
+
 
 class StoryLogDBM(SimpleDBM):
     __tablename__ = "story_log"
@@ -23,8 +28,8 @@ class StoryLogDBM(SimpleDBM):
     level: Mapped[str] = mapped_column(
         sqlalchemy.TEXT, insert_default=Levels.info, server_default=Levels.info, index=True, nullable=False
     )
-    type: Mapped[str | None] = mapped_column(sqlalchemy.TEXT, index=True, default=None, nullable=True)
-    title: Mapped[str | None] = mapped_column(sqlalchemy.TEXT, index=True, default=None, nullable=True)
+    type: Mapped[str | None] = mapped_column(sqlalchemy.TEXT, index=True, insert_default=None, nullable=True)
+    title: Mapped[str | None] = mapped_column(sqlalchemy.TEXT, insert_default=None, nullable=True)
     data: Mapped[dict[str, Any]] = mapped_column(
         postgresql.JSON, insert_default={}, server_default="{}", nullable=False
     )

arpakitlib/ar_sqlalchemy_util.py

@@ -57,6 +57,8 @@ def generate_sqlalchemy_url(
 
 class BaseDBM(DeclarativeBase):
     __abstract__ = True
+    __table_args__ = {"extend_existing": True}
+
     _bus_data: dict[str, Any] | None = None
 
     @property
@@ -102,7 +104,7 @@ class BaseDBM(DeclarativeBase):
     def simple_dict_with_sd_properties(self) -> dict[str, Any]:
         return self.simple_dict(include_sd_properties=True)
 
-    def simple_json(self, *, include_sd_properties: bool = True) -> str:
+    def simple_dict_json(self, *, include_sd_properties: bool = True) -> str:
         return safely_transfer_obj_to_json_str(self.simple_dict(include_sd_properties=include_sd_properties))
 
 

{arpakitlib-1.8.9.dist-info → arpakitlib-1.8.10.dist-info}/METADATA

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

{arpakitlib-1.8.9.dist-info → arpakitlib-1.8.10.dist-info}/RECORD

@@ -168,11 +168,11 @@ arpakitlib/_arpakit_project_template_v_2/project/sqladmin_/admin_auth.py,sha256=
 arpakitlib/_arpakit_project_template_v_2/project/sqladmin_/model_view.py,sha256=JcrO6FoAuJHslqURbZSHimPR5TxQpebgzQr0bJnx49M,2334
 arpakitlib/_arpakit_project_template_v_2/project/sqlalchemy_db_/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_2/project/sqlalchemy_db_/const.py,sha256=dcvj5C9E2F2KCsGZPBBncQf_EvVJAC1qQgnyD8P4ZEw,6
-arpakitlib/_arpakit_project_template_v_2/project/sqlalchemy_db_/sqlalchemy_db.py,sha256=9UktO2fZsxRggWLbkcXHtu99bPpx2xCfgRMaH8KnHg4,761
-arpakitlib/_arpakit_project_template_v_2/project/sqlalchemy_db_/sqlalchemy_model/__init__.py,sha256=Ua9EHLexr3OKVXymgO-VATRUJx37tL8kUVY0w3-bTqM,218
-arpakitlib/_arpakit_project_template_v_2/project/sqlalchemy_db_/sqlalchemy_model/common.py,sha256=u0J3Aem-uukUyEzoDIUzrEhWJ2bhm9gAnmI-tn7V1y4,1452
-arpakitlib/_arpakit_project_template_v_2/project/sqlalchemy_db_/sqlalchemy_model/operation.py,sha256=3x1TQbK0qFuI8BADGiice0GHqzrlEcMUEDG2E2g50X8,2802
-arpakitlib/_arpakit_project_template_v_2/project/sqlalchemy_db_/sqlalchemy_model/story_log.py,sha256=NjMKPV-WIc_7LORrWzNMXFyrVCaX6vTNTPkLc9n6amU,1151
+arpakitlib/_arpakit_project_template_v_2/project/sqlalchemy_db_/sqlalchemy_db.py,sha256=1y3FaMFzm_5UM2poqtBve_UP_mh1vjs--krq6yO8PsA,742
+arpakitlib/_arpakit_project_template_v_2/project/sqlalchemy_db_/sqlalchemy_model/__init__.py,sha256=9UheLINBHeqprpoFvWFG2keqd8QrMP_DscTnxVpJD6M,386
+arpakitlib/_arpakit_project_template_v_2/project/sqlalchemy_db_/sqlalchemy_model/common.py,sha256=cm2gPgOTv1IqX9rwKZ7TTLaed0C0l8BKn04Z8ggnpLg,1537
+arpakitlib/_arpakit_project_template_v_2/project/sqlalchemy_db_/sqlalchemy_model/operation.py,sha256=ZyK6jRVYM7K_ze2LDaYBwqTP6MkTFjtQMTD-HroX0jg,3293
+arpakitlib/_arpakit_project_template_v_2/project/sqlalchemy_db_/sqlalchemy_model/story_log.py,sha256=NKJVph0xO6uu3GBeujus9hAvDFhuvGyS-QbuMDfNhaU,1232
 arpakitlib/_arpakit_project_template_v_2/project/sqlalchemy_db_/util.py,sha256=QSA_nT6aWdtE412-Uj3VTd7yh3dzS4HugDK9FivjTPo,570
 arpakitlib/_arpakit_project_template_v_2/project/test_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_2/project/test_data/make_test_data_1.py,sha256=yRKf6HYZ2do2g7tAUB172nHA_u-yS9cyHhbinahc7sc,285
@@ -249,7 +249,7 @@ arpakitlib/ar_schedule_uust_api_client_util.py,sha256=rXI2_3OTaIBgR-GixM1Ti-Ue1f
 arpakitlib/ar_settings_util.py,sha256=Y5wi_cmsjDjfJpM0VJHjbo0NoVPKfypKaD1USowwDtQ,1327
 arpakitlib/ar_sleep_util.py,sha256=OaLtRaJQWMkGjfj_mW1RB2P4RaSWsAIH8LUoXqsH0zM,1061
 arpakitlib/ar_sqladmin_util.py,sha256=Jd33EX_fAso4bvrcDhNEYOUlUHkudbadNGOJDg7rqhQ,301
-arpakitlib/ar_sqlalchemy_util.py,sha256=o9LwEE_DfNr1mD5wzJ4X2ciUPzFo95wwSGdqggs29FM,9247
+arpakitlib/ar_sqlalchemy_util.py,sha256=82brTPqx_poWq-DJ9sDqbdhMvEYKl8HXNBklx05pfnw,9300
 arpakitlib/ar_ssh_runner_util.py,sha256=e9deuUdBW7Eh0Exx2nTBhk57SaOZYaJaSjNk8q6dbJk,6804
 arpakitlib/ar_steam_payment_api_client_util.py,sha256=onvb3jt9bWfsCLbVLaApbN_-cqCu1CduVhM9GhG5yTA,250
 arpakitlib/ar_str_util.py,sha256=yU5gOwNXUQaH5b_tM5t6fXUn9oUcv5EQbVnq2wXXIpQ,3378
@@ -257,8 +257,8 @@ arpakitlib/ar_type_util.py,sha256=Cs_tef-Fc5xeyAF54KgISCsP11NHyzIsglm4S3Xx7iM,40
 arpakitlib/ar_wata_api_client.py,sha256=gdHOqDbuqxhTjVDtRW1DvkRJLdDofCrOq51GTctzLns,242
 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.8.9.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.8.9.dist-info/METADATA,sha256=exyUm21smtm7DCbGrEqR0UxeZDNczJSw7Xb_-nB8XDI,3316
-arpakitlib-1.8.9.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-arpakitlib-1.8.9.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.8.9.dist-info/RECORD,,
+arpakitlib-1.8.10.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.8.10.dist-info/METADATA,sha256=Uruudz0SOQJJOLfVA8K_hRAMXy1NFNGb5H7COxaIKDo,3317
+arpakitlib-1.8.10.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+arpakitlib-1.8.10.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.8.10.dist-info/RECORD,,