malevich-coretools 0.3.15__tar.gz → 0.3.17__tar.gz

{malevich_coretools-0.3.15/malevich_coretools.egg-info → malevich_coretools-0.3.17}/PKG-INFO

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

malevich_coretools-0.3.17/VERSION

@@ -0,0 +1 @@
+0.3.17

{malevich_coretools-0.3.15 → malevich_coretools-0.3.17}/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.15 → malevich_coretools-0.3.17}/malevich_coretools/batch/__init__.py

@@ -4,4 +4,5 @@ from .utils import (  # noqa: F401
     BatchOperation,
     BatchOperations,
     DefferOperation,
+    DefferOperationInternal,
 )

{malevich_coretools-0.3.15 → malevich_coretools-0.3.17}/malevich_coretools/secondary/const.py

@@ -3,7 +3,7 @@ from typing import Dict, Optional
 
 import aiohttp
 
-from malevich_coretools.batch import DefferOperation
+from malevich_coretools.batch import DefferOperationInternal
 from malevich_coretools.secondary.helpers import bool_to_str
 
 # const
@@ -26,7 +26,7 @@ def with_key_values(url: str, key_values: Dict[str, Optional[str]]) -> str:
     sep = "?"
     for key, value in key_values.items():
         if value is not None:
-            if isinstance(value, DefferOperation):
+            if isinstance(value, DefferOperationInternal):
                 value = urllib.parse.quote(str(value), safe='')
             elif isinstance(value, str):
                 value = urllib.parse.quote(value, safe='')

{malevich_coretools-0.3.15 → malevich_coretools-0.3.17/malevich_coretools.egg-info}/PKG-INFO

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

malevich_coretools-0.3.15/VERSION

@@ -1 +0,0 @@
-0.3.15