malevich-coretools 0.3.28__py3-none-any.whl → 0.3.30__py3-none-any.whl

malevich_coretools/abstract/abstract.py

@@ -373,11 +373,17 @@ class AppLog(BaseModel):
     data: List[LogsResult]
 
 
+class PipelineInfo(BaseModel):
+    conditions: Dict[str, Dict[int, bool]]  # condition bindId -> iteration -> value
+    fails: Dict[str, List[int]]             # bindId -> fail iterations (1 in common situation)
+
+
 class AppLogs(BaseModel):
     operationId: Alias.Id
     dagLogs: str = ""
     data: Dict[str, AppLog] = {}
     error: Optional[str] = None
+    pipeline: Optional[PipelineInfo] = None # only for pipeline
 
 
 class AppLogsWithResults(AppLogs):

malevich_coretools/abstract/pipeline.py

@@ -33,7 +33,7 @@ class BaseArgument(BaseModel):
 
 class Argument(BaseArgument):
     group: Optional[List[BaseArgument]] = None          # for constructed dfs, sink
-    # conditions: Optional[Dict[str, bool]] = None        # valid only for alternative, bindConditionId -> value, must be specified explicitly, then it will be derived from the pipeline structure
+    conditions: Optional[Dict[str, bool]] = None        # valid only for alternative, bindConditionId -> value, must be specified explicitly, then it will be derived from the pipeline structure
 
     def validation(self) -> None:
         if self.group is not None:
@@ -44,9 +44,25 @@ class Argument(BaseArgument):
             assert (self.id is not None) + (self.collectionName is not None) + (self.collectionId is not None) == 1, "one way of constructing the argument must be chosen"
 
 
-class AlternativeArgument(Argument):
-    # alternative: Optional[List[Argument]] = None        # if set - should be only one valid argument with conditions
-    pass
+class AlternativeArgument(BaseArgument):
+    group: Optional[List[BaseArgument]] = None          # for constructed dfs, sink
+    alternative: Optional[List[Argument]] = None        # if set - should be only one valid argument with conditions
+
+    def validation(self) -> None:
+        if self.group is not None:
+            assert self.id is None and self.collectionName is None and self.collectionId is None, "one way of constructing the argument must be chosen"
+            for subarg in self.group:
+                subarg.validation()
+        elif self.alternative is not None:
+            for alt_arg in self.alternative:
+                if alt_arg.group is not None:
+                    assert alt_arg.id is None and alt_arg.collectionName is None and alt_arg.collectionId is None, "one way of constructing the argument must be chosen"
+                    for subarg in alt_arg.group:
+                        subarg.validation()
+                else:
+                    assert (self.id is not None) + (self.collectionName is not None) + (self.collectionId is not None) == 1, "one way of constructing the argument must be chosen"
+        else:
+            assert (self.id is not None) + (self.collectionName is not None) + (self.collectionId is not None) == 1, "one way of constructing the argument must be chosen"
 
 
 class AppEntity(BaseModel):

{malevich_coretools-0.3.28.dist-info → malevich_coretools-0.3.30.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: malevich-coretools
-Version: 0.3.28
+Version: 0.3.30
 Author: Andrew Pogrebnoj
 Author-email: andrew@onjulius.co
 License-File: LICENSE

{malevich_coretools-0.3.28.dist-info → malevich_coretools-0.3.30.dist-info}/RECORD

@@ -1,8 +1,8 @@
 malevich_coretools/__init__.py,sha256=DJtPESxkCZD2SbTZTrR_x0TKDQ4MJpmBqGw5YpKYidM,134
 malevich_coretools/utils.py,sha256=yIFBlvBZe_HqcyTGeWtZdEIz9ABs41sCNPO7SFDH9Kk,107271
 malevich_coretools/abstract/__init__.py,sha256=8AC5ZukRGkTtN-XP14DY5z2HrJqN5LLlnmcMqvWwtWU,76
-malevich_coretools/abstract/abstract.py,sha256=v012y0NCwgl6vjb0Zir31Vn6tgFrbYHU_IfV_xrWjNM,14307
-malevich_coretools/abstract/pipeline.py,sha256=7IJXuQT9WJmlJDIIRxGBpxNE3my1gy_CYxhMHvfv8cI,3291
+malevich_coretools/abstract/abstract.py,sha256=7Z6LfUqLwcwvOMmoqX4dxRKbVbYfA4D4mdi-rVGjJ7U,14585
+malevich_coretools/abstract/pipeline.py,sha256=nTdoIhEmpfDaNK19KCy588RbppMv3S0o6eV6W_t6_hM,4444
 malevich_coretools/abstract/statuses.py,sha256=9ISSw_evsylBshLXoU44TCoFOrZm4bXIxyAFFDqdUWc,333
 malevich_coretools/admin/__init__.py,sha256=zdIcHs3T_NZ8HYWts-O7OpBEWHIu779QDZMGF5HRCLg,35
 malevich_coretools/admin/utils.py,sha256=68fbVsZ-Rmi4YMiOirr6_i03ruT-ts7xSuUntb7JdHs,3015
@@ -20,8 +20,8 @@ malevich_coretools/secondary/kafka_utils.py,sha256=SIUnBFyfwsquN6MAUrEkKCw-1l797
 malevich_coretools/tools/__init__.py,sha256=jDxlCa5Dr6Y43qlI7JwsRAlBkKmFeTHTEnjNUvu-0iw,46
 malevich_coretools/tools/abstract.py,sha256=B1RW1FeNHrQ6r1k-cQZ4k4noCRXkIGt-JUwVoXEDkAg,4466
 malevich_coretools/tools/vast.py,sha256=63tvy70qQV9vnK0eWytlgjBGSnfA7l3kSIDgACBbMMs,12893
-malevich_coretools-0.3.28.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-malevich_coretools-0.3.28.dist-info/METADATA,sha256=MYGkdSRISF_Z_Un_y_YoniwVU5w3xeXH51bpidgmODA,265
-malevich_coretools-0.3.28.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
-malevich_coretools-0.3.28.dist-info/top_level.txt,sha256=wDX3s1Tso0otBPNrFRfXqyNpm48W4Bp5v6JfbITO2Z8,19
-malevich_coretools-0.3.28.dist-info/RECORD,,
+malevich_coretools-0.3.30.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+malevich_coretools-0.3.30.dist-info/METADATA,sha256=3qUA4rMW18BpH_IcDl0-aPAxk8MlmNQ7xiF9IFhHhAw,265
+malevich_coretools-0.3.30.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
+malevich_coretools-0.3.30.dist-info/top_level.txt,sha256=wDX3s1Tso0otBPNrFRfXqyNpm48W4Bp5v6JfbITO2Z8,19
+malevich_coretools-0.3.30.dist-info/RECORD,,

{malevich_coretools-0.3.28.dist-info → malevich_coretools-0.3.30.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (71.1.0)
+Generator: setuptools (72.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any