malevich-coretools 0.3.15__py3-none-any.whl → 0.3.17__py3-none-any.whl

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/batch/__init__.py

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

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.dist-info → malevich_coretools-0.3.17.dist-info}/METADATA

@@ -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.dist-info → malevich_coretools-0.3.17.dist-info}/RECORD

@@ -2,11 +2,11 @@ malevich_coretools/__init__.py,sha256=DJtPESxkCZD2SbTZTrR_x0TKDQ4MJpmBqGw5YpKYid
 malevich_coretools/utils.py,sha256=6Uf7J4AvS8nO406uCoSVI8LkPMNdddypcjeZSZrX3Gs,105351
 malevich_coretools/abstract/__init__.py,sha256=8AC5ZukRGkTtN-XP14DY5z2HrJqN5LLlnmcMqvWwtWU,76
 malevich_coretools/abstract/abstract.py,sha256=bnlFn-EbSRQa4QxqGE5Z-XKjqkJg8OXd1b0U6RTNZzQ,14100
-malevich_coretools/abstract/pipeline.py,sha256=2lp4CkmVb8toakjWuYpTA8flw44fO6gWnkW8nSvL1nI,2914
+malevich_coretools/abstract/pipeline.py,sha256=9k3M6Ih8kxLjIDbhZH3fVdVPU7Fd8RL6KDQiaEPQ6xo,3266
 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
-malevich_coretools/batch/__init__.py,sha256=co0xKwCGgHMk-r4Q62U6vUFhRdYsUMIfnx9IE5qvHM4,136
+malevich_coretools/batch/__init__.py,sha256=taxyZl8YOZd2EBd3leN6slzMkejUtjQ64Na31TcT3-I,165
 malevich_coretools/batch/utils.py,sha256=cqX34sfh85dCwLv7qprxatzhYxxj7LqZwjhlmk_3GXQ,7705
 malevich_coretools/funcs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 malevich_coretools/funcs/checks.py,sha256=Q5pRtRevQrGv_-SMbn2GgYnulhclDLBXdRtbw2QOYKU,223
@@ -14,14 +14,14 @@ malevich_coretools/funcs/funcs.py,sha256=cQXDAuwWNb6DcpF98PR-65sMBpIfSnjqMHTUibi
 malevich_coretools/funcs/helpers.py,sha256=CZYza0uQ68ywcfeUE9rP7q0VjsfnLtBp4z0qQZbIkjY,9843
 malevich_coretools/secondary/__init__.py,sha256=048HqvG36_1WdDVZK_RuECmaf14Iq2fviUysG1inlaE,78
 malevich_coretools/secondary/config.py,sha256=hRlSJuPQnhKyt1wmOAJX_XmcliaO0fPGbW94AE_Mazs,463
-malevich_coretools/secondary/const.py,sha256=Q-nrgMwnTT2_drV_TOKbfnrV-UCIsj_8bcKgsVR6nJ0,12585
+malevich_coretools/secondary/const.py,sha256=W6GVTpPYsQgllmOUk5US7yzjq1GxyR_vEQog2KMv14w,12601
 malevich_coretools/secondary/helpers.py,sha256=t-W9g9t0O1EaAX8UOb1wxXFAMawbtDotDH47t0GdjG4,6142
 malevich_coretools/secondary/kafka_utils.py,sha256=SIUnBFyfwsquN6MAUrEkKCw-1l7979Znl7OTQSX2UKo,989
 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.15.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-malevich_coretools-0.3.15.dist-info/METADATA,sha256=FIc3F8RI_oUM9XQ6MwGd5rrMLkeqFtWkHQ2jL51e4V0,265
-malevich_coretools-0.3.15.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-malevich_coretools-0.3.15.dist-info/top_level.txt,sha256=wDX3s1Tso0otBPNrFRfXqyNpm48W4Bp5v6JfbITO2Z8,19
-malevich_coretools-0.3.15.dist-info/RECORD,,
+malevich_coretools-0.3.17.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+malevich_coretools-0.3.17.dist-info/METADATA,sha256=JJrSX_BBH5n38ZDCofUYS88-YmGgut_msZxfAYPkxyk,265
+malevich_coretools-0.3.17.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+malevich_coretools-0.3.17.dist-info/top_level.txt,sha256=wDX3s1Tso0otBPNrFRfXqyNpm48W4Bp5v6JfbITO2Z8,19
+malevich_coretools-0.3.17.dist-info/RECORD,,