malevich-coretools 0.3.18__py3-none-any.whl → 0.3.20__py3-none-any.whl

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:
@@ -45,7 +45,8 @@ class Argument(BaseArgument):
 
 
 class AlternativeArgument(Argument):
-    alternative: Optional[List[Argument]] = None        # if set - should be only one valid argument with conditions
+    # alternative: Optional[List[Argument]] = None        # if set - should be only one valid argument with conditions
+    pass
 
 
 class AppEntity(BaseModel):

malevich_coretools/funcs/funcs.py

@@ -10,6 +10,7 @@ import requests
 from requests.models import Response
 
 from malevich_coretools.abstract.abstract import *  # noqa: F403
+from malevich_coretools.abstract.pipeline import Pipeline
 from malevich_coretools.funcs.checks import check_profile_mode
 from malevich_coretools.secondary import Config, model_from_json, show_logs_func
 from malevich_coretools.secondary.const import *  # noqa: F403
@@ -457,12 +458,12 @@ def get_userPipelines_mapIds(*args, **kwargs) -> ResultIdsMap:
     return model_from_json(send_to_core_get(USER_PIPELINES_MAP_IDS, *args, **kwargs), ResultIdsMap)
 
 
-def get_userPipelines_id(id: str, *args, **kwargs) -> UserTask:
-    return model_from_json(send_to_core_get(USER_PIPELINES_ID(id, None), *args, **kwargs), UserTask)
+def get_userPipelines_id(id: str, *args, **kwargs) -> Pipeline:
+    return model_from_json(send_to_core_get(USER_PIPELINES_ID(id, None), *args, **kwargs), Pipeline)
 
 
-def get_userPipelines_realId(id: str, *args, **kwargs) -> UserTask:
-    return model_from_json(send_to_core_get(USER_PIPELINES_REAL_ID(id), *args, **kwargs), UserTask)
+def get_userPipelines_realId(id: str, *args, **kwargs) -> Pipeline:
+    return model_from_json(send_to_core_get(USER_PIPELINES_REAL_ID(id), *args, **kwargs), Pipeline)
 
 
 def post_userPipelines(data: UserTask, wait: bool, *args, **kwargs) -> Alias.Id:

{malevich_coretools-0.3.18.dist-info → malevich_coretools-0.3.20.dist-info}/METADATA

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

{malevich_coretools-0.3.18.dist-info → malevich_coretools-0.3.20.dist-info}/RECORD

@@ -2,7 +2,7 @@ malevich_coretools/__init__.py,sha256=DJtPESxkCZD2SbTZTrR_x0TKDQ4MJpmBqGw5YpKYid
 malevich_coretools/utils.py,sha256=B43dLGRjEH-dtJJ6Vgjgb8uZEYhQG6VzdZWrxQPRzsU,105355
 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=9k3M6Ih8kxLjIDbhZH3fVdVPU7Fd8RL6KDQiaEPQ6xo,3266
+malevich_coretools/abstract/pipeline.py,sha256=AdHQIpOMZMNJt6f17MK_s2k6FM2Kc_ImAn4LJuDbZAM,3279
 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
@@ -10,7 +10,7 @@ malevich_coretools/batch/__init__.py,sha256=taxyZl8YOZd2EBd3leN6slzMkejUtjQ64Na3
 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
-malevich_coretools/funcs/funcs.py,sha256=cQXDAuwWNb6DcpF98PR-65sMBpIfSnjqMHTUibiumVk,36448
+malevich_coretools/funcs/funcs.py,sha256=VVw2gKy8LEdb4_dU9W1Orb6imZk_LYWJMu7OZFbnMwA,36506
 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
@@ -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.18.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-malevich_coretools-0.3.18.dist-info/METADATA,sha256=OiMBqzx9b36moeyY5a6UWb1B5mq89MH_min1FeVnS2I,265
-malevich_coretools-0.3.18.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-malevich_coretools-0.3.18.dist-info/top_level.txt,sha256=wDX3s1Tso0otBPNrFRfXqyNpm48W4Bp5v6JfbITO2Z8,19
-malevich_coretools-0.3.18.dist-info/RECORD,,
+malevich_coretools-0.3.20.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+malevich_coretools-0.3.20.dist-info/METADATA,sha256=2wNFKOTyLSII7sAxJQQGrH-1pMtAckGvLnZ49p11pow,265
+malevich_coretools-0.3.20.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+malevich_coretools-0.3.20.dist-info/top_level.txt,sha256=wDX3s1Tso0otBPNrFRfXqyNpm48W4Bp5v6JfbITO2Z8,19
+malevich_coretools-0.3.20.dist-info/RECORD,,