arpakitlib 1.8.205__tar.gz → 1.8.207__tar.gz

{arpakitlib-1.8.205 → arpakitlib-1.8.207}/PKG-INFO

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

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