malevich-coretools 0.3.45__py3-none-any.whl → 0.3.47__py3-none-any.whl

malevich_coretools/abstract/abstract.py

@@ -154,9 +154,16 @@ class TaskPolicy(BaseModel):
 
 
 class Schedule(BaseModel):
-    delay: int                      # seconds
-    startAfter: int = 0             # seconds
-    count: Optional[int] = None     # iters
+    delay: Optional[int] = None         # seconds
+    startAfter: Optional[int] = None    # seconds
+    count: Optional[int] = None         # iters
+    cron: Optional[str] = None
+
+    def validate(self) -> None:
+        if self.cron is None:
+            assert self.delay is not None, "cron or delay should set"
+        else:
+            assert self.delay is None and self.startAfter is None and self.count is None, "should set cron or other"
 
 
 class Schedules(BaseModel):
@@ -189,11 +196,13 @@ class MainTask(BaseModel):
     profileMode: Optional[str] = None
     withLogs: bool = False  # use only in prepare
     saveFails: bool = True
+    scaleCount: int = 1
     scaleInfo: List[ScaleInfo]
     component: TaskComponent
     policy: TaskPolicy
     schedule: Optional[Schedule] = None
     restrictions: Optional[Restrictions] = Restrictions()
+    tags: Optional[Dict[str, str]] = None
 
 
 class MainPipeline(BaseModel):
@@ -218,6 +227,8 @@ class MainPipeline(BaseModel):
     run: bool = True
     synthetic: bool = False
     saveFails: bool = True
+    scaleCount: int = 1
+    tags: Optional[Dict[str, str]] = None
 
 
 class RunTask(Operation):
@@ -319,6 +330,10 @@ class ResultUserCfg(BaseModel):
     id: Alias.Id
 
 
+class ResultTags(BaseModel):
+    idToTags: Dict[str, Optional[Dict[str, str]]]
+
+
 # TODO add smth from Cfg
 class AppSettings(BaseModel):
     taskId: Optional[Alias.Id] = None
@@ -420,6 +435,7 @@ class FunctionInfo(BaseModel):
     arguments: List[Tuple[str, Optional[str]]]
     finishMsg: Optional[str] = None
     doc: Optional[str] = None
+    tags: Optional[Dict[str, str]] = None
 
 
 class InputFunctionInfo(FunctionInfo):
@@ -448,6 +464,7 @@ class InitInfo(BaseModel):
     prepare: bool
     argname: Optional[str] = None
     doc: Optional[str] = None
+    tags: Optional[Dict[str, str]] = None
 
 
 class AppFunctionsInfo(BaseModel):
@@ -649,3 +666,8 @@ class MCPTool(MCPToolSimple):
 class MCPToolCall(BaseModel):
     name: str
     arguments: Dict[str, Any]
+
+
+class RunsFilter(BaseModel):
+    data: Optional[Dict[str, str]] = None
+    withTags: bool = False

malevich_coretools/funcs/funcs.py

@@ -1056,6 +1056,14 @@ async def get_run_activeRuns_async(*args, **kwargs) -> ResultIds:
     return model_from_json(await send_to_core_get_async(TEMP_RUN_ACTIVE_RUNS, *args, **kwargs), ResultIds)
 
 
+def post_run_activeRuns(data: RunsFilter, *args, **kwargs) -> Union[ResultIds, ResultTags]:
+    return model_from_json(send_to_core_modify(TEMP_RUN_ACTIVE_RUNS, data, *args, **kwargs), ResultTags if data.withTags else ResultIds)
+
+
+async def post_run_activeRuns_async(data: RunsFilter, *args, **kwargs) -> Union[ResultIds, ResultTags]:
+    return model_from_json(await send_to_core_modify_async(TEMP_RUN_ACTIVE_RUNS, data, *args, **kwargs), ResultTags if data.withTags else ResultIds)
+
+
 def get_run_mainTaskCfg(id: str, *args, **kwargs) -> MainTaskCfg:
     return model_from_json(send_to_core_get(TEMP_RUN_MAIN_TASK_CFG(id), *args, **kwargs), MainTaskCfg)
 

malevich_coretools/utils.py

@@ -2846,20 +2846,30 @@ def get_run_condition(
 
 
 def get_run_active_runs(
+    tags: Optional[Dict[str, str]] = None,
+    with_tags: bool = False,
     *,
     auth: Optional[AUTH] = None,
     conn_url: Optional[str] = None,
     batcher: Optional[Batcher] = None,
     is_async: bool = False,
-) -> ResultIds:
-    """return list running operationIds"""
+) -> Union[ResultIds, ResultTags]:
+    """return list running operationIds, filter by tags if set, return id -> tags if with_tags"""
     if batcher is None:
         batcher = Config.BATCHER
-    if batcher is not None:
-        return batcher.add("getActiveRuns", result_model=ResultIds)
-    if is_async:
-        return f.get_run_activeRuns_async(auth=auth, conn_url=conn_url)
-    return f.get_run_activeRuns(auth=auth, conn_url=conn_url)
+    if tags is not None or with_tags:
+        data = RunsFilter(data=tags, withTags=with_tags)
+        if batcher is not None:
+            return batcher.add("postActiveRuns", data=data, result_model=ResultTags if with_tags else ResultIds)
+        if is_async:
+            return f.post_run_activeRuns_async(data, auth=auth, conn_url=conn_url)
+        return f.post_run_activeRuns(data, auth=auth, conn_url=conn_url)
+    else:
+        if batcher is not None:
+            return batcher.add("getActiveRuns", result_model=ResultIds)
+        if is_async:
+            return f.get_run_activeRuns_async(auth=auth, conn_url=conn_url)
+        return f.get_run_activeRuns(auth=auth, conn_url=conn_url)
 
 
 def get_run_main_task_cfg(
@@ -3161,6 +3171,7 @@ def task_full(
     policy: TaskPolicy = None,
     schedule: Optional[Schedule] = None,
     restrictions: Optional[Restrictions] = None,
+    tags: Optional[Dict[str, str]] = None,
     wait: bool = True,
     *,
     auth: Optional[AUTH] = None,
@@ -3188,6 +3199,8 @@ def task_full(
         restrictions: (Optional[Restrictions]): permissions to handle deployment
         wait (bool): is it worth waiting for the result or immediately return `operation_id`
         auth (Optional[AUTH]): redefined auth if not None"""
+    if schedule is not None:
+        schedule.validate()
     if batcher is None:
         batcher = Config.BATCHER
     if scaleInfo is None:
@@ -3217,6 +3230,7 @@ def task_full(
         policy=policy,
         schedule=schedule,
         restrictions=restrictions,
+        tags=tags,
     )
     if batcher is not None:
         return batcher.add("sendTask", data=data, result_model=AppLogs)
@@ -3263,6 +3277,7 @@ def task_prepare(
     component: TaskComponent = None,
     policy: TaskPolicy = None,
     restrictions: Optional[Restrictions] = None,
+    tags: Optional[Dict[str, str]] = None,
     wait: bool = True,
     *,
     auth: Optional[AUTH] = None,
@@ -3332,6 +3347,7 @@ def task_prepare(
         component=component,
         policy=policy,
         restrictions=restrictions,
+        tags=tags,
     )
     if batcher is not None:
         return batcher.add("sendTask", data=data, result_model=AppLogs)
@@ -3393,6 +3409,8 @@ def task_run(
         schedule: (Optional[Schedule]): schedule task runs settings - return scheduleId instead of operationId
         wait (bool): is it worth waiting for the result or immediately return `operation_id`
         auth (Optional[AUTH]): redefined auth if not None"""
+    if schedule is not None:
+        schedule.validate()
     if batcher is None:
         batcher = Config.BATCHER
     if run_id is None:
@@ -3447,6 +3465,7 @@ def pipeline_full(
     restrictions: Optional[Restrictions] = None,
     scaleInfo: List[ScaleInfo] = None,
     save_fails: bool = True,
+    tags: Optional[Dict[str, str]] = None,
     with_show: bool = True,
     long: bool = False,
     long_timeout: Optional[int] = WAIT_RESULT_TIMEOUT,
@@ -3458,6 +3477,8 @@ def pipeline_full(
     batcher: Optional[Batcher] = None,
     is_async: bool = False,
 ) -> Union[Alias.Id, AppLogs]:
+    if schedule is not None:
+        schedule.validate()
     if batcher is None:
         batcher = Config.BATCHER
     if scaleInfo is None:
@@ -3489,6 +3510,8 @@ def pipeline_full(
         kafkaModeUrl=None,
         run=True,
         saveFails=save_fails,
+        scaleCount=1,
+        tags=tags,
     )
     if batcher is not None:
         return batcher.add("sendPipeline", data=data, result_model=AppLogs)
@@ -3535,6 +3558,8 @@ def pipeline_prepare(
     kafka_mode_url_response: Optional[str] = None,
     synthetic: bool = False,
     save_fails: bool = True,
+    scale_count: int = 1,
+    tags: Optional[Dict[str, str]] = None,
     with_show: bool = True,
     long: bool = False,
     long_timeout: Optional[int] = WAIT_RESULT_TIMEOUT,
@@ -3577,6 +3602,8 @@ def pipeline_prepare(
         run=False,
         synthetic=synthetic,
         saveFails=save_fails,
+        scaleCount=scale_count,
+        tags=tags,
     )
     if batcher is not None:
         return batcher.add("sendPipeline", data=data, result_model=AppLogs)

{malevich_coretools-0.3.45.dist-info → malevich_coretools-0.3.47.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: malevich-coretools
-Version: 0.3.45
+Version: 0.3.47
 Author: Andrew Pogrebnoj
 Author-email: andrew@onjulius.co
 License-File: LICENSE

{malevich_coretools-0.3.45.dist-info → malevich_coretools-0.3.47.dist-info}/RECORD

@@ -1,7 +1,7 @@
 malevich_coretools/__init__.py,sha256=DJtPESxkCZD2SbTZTrR_x0TKDQ4MJpmBqGw5YpKYidM,134
-malevich_coretools/utils.py,sha256=OlwY4ivtozu6JoXateYrnJ6bMX9JTEBdnNC8JXdsXEo,150106
+malevich_coretools/utils.py,sha256=frBqEnAbY6iUmYOsvbT_RQnczI6Vd-TRaODuNv2o9RA,151198
 malevich_coretools/abstract/__init__.py,sha256=6vQ08c8HPYyT_pPkKlc-EwQKE8xG3HTEo2p_GiI5rik,142
-malevich_coretools/abstract/abstract.py,sha256=4WtqG1PaZSztnbwWYScCSzwk7gL57AJfQ_WCWIUGpho,15684
+malevich_coretools/abstract/abstract.py,sha256=EtA80K_mk-PkK8oBmP7VpsR1YRDdAb382tMiSlyjZTc,16388
 malevich_coretools/abstract/operations.py,sha256=cWlo2xzW-rzkTInzpDjBYeL68KfLYqSpZJRzCQ4OzjA,3070
 malevich_coretools/abstract/pipeline.py,sha256=HwhYp5G9yaZYaeDypChfpNd2W-kmJQfM9I54uek0B9k,7914
 malevich_coretools/abstract/statuses.py,sha256=9ISSw_evsylBshLXoU44TCoFOrZm4bXIxyAFFDqdUWc,333
@@ -11,7 +11,7 @@ malevich_coretools/batch/__init__.py,sha256=taxyZl8YOZd2EBd3leN6slzMkejUtjQ64Na3
 malevich_coretools/batch/utils.py,sha256=FRmCYU-zr-RjgT1Mo3CUNcB2mW1t_gKCJazcMx6aIW4,7719
 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=Ht9WChcF8vQaKU0FeQFdX0VjdYTEnau7zYTK2pJnMzM,82252
+malevich_coretools/funcs/funcs.py,sha256=DLellIap5bGejIKsIHIPJE6hlSdee_s8mKmpiO7yZ0I,82738
 malevich_coretools/funcs/helpers.py,sha256=hKLES296_hrINOIGLJuRi1XvI-vLccmQKL0Y_32iffU,11411
 malevich_coretools/secondary/__init__.py,sha256=048HqvG36_1WdDVZK_RuECmaf14Iq2fviUysG1inlaE,78
 malevich_coretools/secondary/config.py,sha256=hRlSJuPQnhKyt1wmOAJX_XmcliaO0fPGbW94AE_Mazs,463
@@ -21,8 +21,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.45.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-malevich_coretools-0.3.45.dist-info/METADATA,sha256=0USgUH9IwYJaf6M52tW6vey7-_m8Iu4xDqQ5V_PhjV4,347
-malevich_coretools-0.3.45.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-malevich_coretools-0.3.45.dist-info/top_level.txt,sha256=wDX3s1Tso0otBPNrFRfXqyNpm48W4Bp5v6JfbITO2Z8,19
-malevich_coretools-0.3.45.dist-info/RECORD,,
+malevich_coretools-0.3.47.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+malevich_coretools-0.3.47.dist-info/METADATA,sha256=P-bhnS-PLZtBopMVlAlJFcD5ODFVHSmqPxjtezRCFAI,347
+malevich_coretools-0.3.47.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+malevich_coretools-0.3.47.dist-info/top_level.txt,sha256=wDX3s1Tso0otBPNrFRfXqyNpm48W4Bp5v6JfbITO2Z8,19
+malevich_coretools-0.3.47.dist-info/RECORD,,