arpakitlib 1.8.205__py3-none-any.whl → 1.8.207__py3-none-any.whl

arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/operation.py

@@ -17,6 +17,7 @@ class OperationMV(SimpleMV, model=OperationDBM):
         OperationDBM.creation_dt,
         OperationDBM.status,
         OperationDBM.type,
+        OperationDBM.marker,
         OperationDBM.title,
         OperationDBM.execution_start_dt,
         OperationDBM.execution_finish_dt,
@@ -35,6 +36,7 @@ class OperationMV(SimpleMV, model=OperationDBM):
         OperationDBM.creation_dt,
         OperationDBM.status,
         OperationDBM.type,
+        OperationDBM.marker,
         OperationDBM.title,
         OperationDBM.execution_start_dt,
         OperationDBM.execution_finish_dt,
@@ -50,6 +52,7 @@ class OperationMV(SimpleMV, model=OperationDBM):
         OperationDBM.slug,
         OperationDBM.status,
         OperationDBM.type,
+        OperationDBM.marker,
         OperationDBM.title,
         OperationDBM.execution_start_dt,
         OperationDBM.execution_finish_dt,

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

@@ -23,11 +23,15 @@ class OperationDBM(SimpleDBM):
         executing = "executing"
         executed_without_error = "executed_without_error"
         executed_with_error = "executed_with_error"
+        cancelled = "cancelled"
 
     class Types(Enumeration):
         healthcheck_ = "healthcheck"
         raise_fake_error_ = "raise_fake_error"
 
+    class Markers(Enumeration):
+        nothing = "nothing"
+
     status: Mapped[str] = mapped_column(
         sqlalchemy.TEXT,
         nullable=False,
@@ -41,6 +45,11 @@ class OperationDBM(SimpleDBM):
         index=True,
         insert_default=Types.healthcheck_
     )
+    marker: Mapped[str | None] = mapped_column(
+        sqlalchemy.TEXT,
+        nullable=True,
+        index=True,
+    )
     title: Mapped[str | None] = mapped_column(
         sqlalchemy.TEXT,
         nullable=True,
@@ -86,6 +95,8 @@ class OperationDBM(SimpleDBM):
             parts.append(f"type={self.type}")
         return f"{self.entity_name} ({', '.join(parts)})"
 
+    # ---validators---
+
     @validates("status")
     def _validate_status(self, key, value, *args, **kwargs):
         if not isinstance(value, str):
@@ -105,6 +116,15 @@ class OperationDBM(SimpleDBM):
             raise ValueError(f"{key=}, {value=}, value is empty")
         return value
 
+    @validates("marker")
+    def _validate_marker(self, key, value, *args, **kwargs):
+        if value is None:
+            return None
+        if not isinstance(value, str):
+            raise ValueError(f"{key=}, {value=}, value is not str")
+        value = make_none_if_blank(value.strip())
+        return value
+
     @validates("title")
     def _validate_title(self, key, value, *args, **kwargs):
         if value is None:
@@ -138,6 +158,8 @@ class OperationDBM(SimpleDBM):
             raise ValueError(f"{key=}, {value=}, value is not dict")
         return value
 
+    # ---more---
+
     def raise_if_executed_with_error(self):
         if self.status == self.Statuses.executed_with_error:
             raise Exception(
@@ -158,6 +180,12 @@ class OperationDBM(SimpleDBM):
             return None
         return self.execution_finish_dt - self.execution_start_dt
 
+    @property
+    def duration_as_str(self) -> str | None:
+        if self.duration is None:
+            return None
+        return str(self.duration)
+
     @property
     def duration_total_seconds(self) -> float | None:
         if self.duration is None:
@@ -166,6 +194,22 @@ class OperationDBM(SimpleDBM):
 
     # ---SDP---
 
+    @property
+    def sdp_duration(self) -> timedelta | None:
+        """
+        При использовании у данной модели .simple_dict данное свойство будет представлено как поле.
+        То есть префикс sdp_ и даёт этот бонус.
+        """
+        return self.duration
+
+    @property
+    def sdp_duration_as_str(self) -> str | None:
+        """
+        При использовании у данной модели .simple_dict данное свойство будет представлено как поле.
+        То есть префикс sdp_ и даёт этот бонус.
+        """
+        return self.duration_as_str
+
     @property
     def sdp_duration_total_seconds(self) -> float | None:
         """

{arpakitlib-1.8.205.dist-info → arpakitlib-1.8.207.dist-info}/METADATA

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

{arpakitlib-1.8.205.dist-info → arpakitlib-1.8.207.dist-info}/RECORD

@@ -251,7 +251,7 @@ arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/event.py,sha256=LjAUY
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/__init__.py,sha256=aKX6k2bEVvfXa9dATYts-sUoWgf4MV3H_PiiUceejr4,596
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/api_key.py,sha256=VTpepKLCKrPnftGD-8Ibp75S0dwUrLlUytRfcXDDcKg,1597
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/common.py,sha256=U4KbXPAoyvgUB2BoPYUOPKLpHQLOdvZp-JdeVnC1MPY,5573
-arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/operation.py,sha256=B3Y3VGM0-3pm1Ib5CWbW3gKYgpMixIPKb4S3GksS314,3659
+arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/operation.py,sha256=IqW9eh0u3-WFkE1oA3yjEboUW2F2zF4cKsp4_FNy2RE,3746
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/story_log.py,sha256=KTyvMty9bozjnC0bSDoTtK1H4LTFfbX_MwqP72Ip5D0,2194
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/user.py,sha256=AhK-2YocK1dM2wMxX_xF0qnsMiI5Pu0Arj5yfDe8Noo,2669
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/user_token.py,sha256=pyeyDTg4rss8-67hIE3-SQlAvNfje6HazuaVnyFBpN8,2054
@@ -265,7 +265,7 @@ arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_db.py
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/__init__.py,sha256=7PQqeYThEBXRrXwJZjuH7yAFu25DVr_IneuMwEF3kUE,731
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/api_key.py,sha256=2X6VPkf1TKq-0319J0tL-rPMvgmkBCjim3Si1dZboMQ,1969
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/common.py,sha256=OuHmYkFUPnSQ5QV8UiAjBax5GLNGGGh1zOYSjKp3nqw,4598
-arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/operation.py,sha256=emIo83GUEoywgh4fGv2xDGIkCtSUPq_2ujRlLEc5woM,5930
+arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/operation.py,sha256=-7uzlux8B7wtqhSd4b_06M40yTDySPIngm3Cwun2lSA,7378
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/story_log.py,sha256=CiNec-x5_z0Pr5Mt-RZXJ1tKJMRn_TAKIaOioG4NK7U,2489
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user.py,sha256=22TE8y2Vm9byLLkIE6RVAMa29d9ILCVg1e1QYi4ONIQ,7898
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user_token.py,sha256=dCCiRZcOiUpqd-DZZ-A6tVM0PzJwa030KFOzPXNyM7A,1929
@@ -416,8 +416,8 @@ arpakitlib/ar_str_util.py,sha256=2lGpnXDf2h1cBZpVf5i1tX_HCv5iBd6IGnrCw4QWWlY,435
 arpakitlib/ar_type_util.py,sha256=Cs_tef-Fc5xeyAF54KgISCsP11NHyzIsglm4S3Xx7iM,4049
 arpakitlib/ar_yookassa_api_client_util.py,sha256=VozuZeCJjmLd1zj2BdC9WfiAQ3XYOrIMsdpNK-AUlm0,5347
 arpakitlib/clone_pydantic_model_fields.py,sha256=Gn9_AIjKknN1eIYK_xH_cMyff3hjOpfwRqs583-rnJs,1167
-arpakitlib-1.8.205.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.8.205.dist-info/METADATA,sha256=dAQv8tIUCoOWRywSXIUlyr0jTCrRA7UQKn9f41fr7JA,3741
-arpakitlib-1.8.205.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-arpakitlib-1.8.205.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.8.205.dist-info/RECORD,,
+arpakitlib-1.8.207.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.8.207.dist-info/METADATA,sha256=Uph40HCZ1aLi9BpYjuxlQgQLr5XU6dXQ4b_ZlhKDtLk,3741
+arpakitlib-1.8.207.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+arpakitlib-1.8.207.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.8.207.dist-info/RECORD,,