arpakitlib 1.8.9__tar.gz → 1.8.10__tar.gz

{arpakitlib-1.8.9 → arpakitlib-1.8.10}/PKG-INFO

@@ -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 → arpakitlib-1.8.10}/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-1.8.9 → arpakitlib-1.8.10}/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-1.8.9 → arpakitlib-1.8.10}/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-1.8.9 → arpakitlib-1.8.10}/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-1.8.9 → arpakitlib-1.8.10}/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-1.8.9 → arpakitlib-1.8.10}/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 → arpakitlib-1.8.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "arpakitlib"
-version = "1.8.9"
+version = "1.8.10"
 description = "arpakitlib"
 authors = [
     { name = "arpakit_support", email = "support@arpakit.com" }