malevich-coretools 0.3.16__tar.gz → 0.3.18__tar.gz

{malevich_coretools-0.3.16/malevich_coretools.egg-info → malevich_coretools-0.3.18}/PKG-INFO

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

malevich_coretools-0.3.18/VERSION

@@ -0,0 +1 @@
+0.3.18

{malevich_coretools-0.3.16 → malevich_coretools-0.3.18}/malevich_coretools/abstract/pipeline.py

@@ -32,7 +32,8 @@ class BaseArgument(BaseModel):
 
 
 class Argument(BaseArgument):
-    group: Optional[List[BaseArgument]] = None                    # for constructed dfs, sink
+    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
 
     def validation(self) -> None:
         if self.group is not None:
@@ -43,12 +44,16 @@ 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
+
+
 class AppEntity(BaseModel):
     cfg: Optional[str] = None                           # local cfg for processor/condition
-    arguments: Dict[str, Argument] = {}                 # TODO or List[Argument]?
+    arguments: Dict[str, AlternativeArgument] = {}      # TODO or List[Argument]?
     conditions: Optional[Dict[str, bool]] = None        # condition bindId to it result
 
-    loopArguments: Optional[Dict[str, Argument]] = None # other calls, TODO or List[Argument]?, problems
+    loopArguments: Optional[Dict[str, AlternativeArgument]] = None  # other calls, TODO or List[Argument]?, problems
     loopConditions: Optional[Dict[str, bool]] = None    # condition bindId to it result for loop
 
     image: JsonImage

{malevich_coretools-0.3.16 → malevich_coretools-0.3.18}/malevich_coretools/utils.py

@@ -1918,7 +1918,7 @@ def get_pipeline(
         batcher = Config.BATCHER
     if batcher is not None:
         return batcher.add("getPipelineById", vars={"id": id}, result_model=Pipeline)
-    return f.get_userTasks_id(id, auth=auth, conn_url=conn_url)
+    return f.get_userPipelines_id(id, auth=auth, conn_url=conn_url)
 
 
 def get_pipeline_real(

{malevich_coretools-0.3.16 → malevich_coretools-0.3.18/malevich_coretools.egg-info}/PKG-INFO

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

malevich_coretools-0.3.16/VERSION

@@ -1 +0,0 @@
-0.3.16