malevich-coretools 0.3.69__py3-none-any.whl → 0.3.70__py3-none-any.whl

malevich_coretools/abstract/abstract.py

@@ -137,6 +137,10 @@ class Keys(BaseModel):
     data: Dict[str, str]
 
 
+class Statuses(BaseModel):
+    data: Dict[str, str]    # key - runId, value - one of: IN_PROGRESS, SUCCESS, FAILED
+
+
 class ScaleInfo(BaseModel):
     taskId: Optional[Alias.Id] = None
     appId: Alias.Id

malevich_coretools/funcs/funcs.py

@@ -1144,20 +1144,20 @@ async def get_run_condition_async(id: str, *args, **kwargs) -> Condition:
     return model_from_json(await send_to_core_get_async(TEMP_RUN_CONDITION(id), *args, **kwargs), Condition)
 
 
-def get_run_activeRuns(*args, **kwargs) -> ResultIds:
-    return model_from_json(send_to_core_get(TEMP_RUN_ACTIVE_RUNS, *args, **kwargs), ResultIds)
+def get_run_activeRuns(id: Optional[str], *args, **kwargs) -> ResultIds:
+    return model_from_json(send_to_core_get(TEMP_RUN_ACTIVE_RUNS(id), *args, **kwargs), ResultIds)
 
 
-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)
+async def get_run_activeRuns_async(id: Optional[str], *args, **kwargs) -> ResultIds:
+    return model_from_json(await send_to_core_get_async(TEMP_RUN_ACTIVE_RUNS(id), *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)
+    return model_from_json(send_to_core_modify(TEMP_RUN_ACTIVE_RUNS(None), 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)
+    return model_from_json(await send_to_core_modify_async(TEMP_RUN_ACTIVE_RUNS(None), data, *args, **kwargs), ResultTags if data.withTags else ResultIds)
 
 
 def get_run_mainTaskCfg(id: str, *args, **kwargs) -> MainTaskCfg:
@@ -1183,6 +1183,23 @@ def get_run_operationsIds(task_id: str, cfg_id: Optional[str]=None, *args, **kwa
 async def get_run_operationsIds_async(task_id: str, cfg_id: Optional[str]=None, *args, **kwargs) -> ResultIds:
     return model_from_json(await send_to_core_get_async(TEMP_RUN_OPERATIONS_IDS(task_id, cfg_id), *args, **kwargs), ResultIds)
 
+
+def get_run_statuses(id: str, *args, **kwargs) -> Statuses:
+    return model_from_json(send_to_core_get(TEMP_RUN_STATUSES(id), *args, **kwargs), Statuses)
+
+
+async def get_run_statuses_async(id: str, *args, **kwargs) -> Statuses:
+    return model_from_json(await send_to_core_get_async(TEMP_RUN_STATUSES(id), *args, **kwargs), Statuses)
+
+
+def get_run_status(id: str, run_id: str, *args, **kwargs) -> str:
+    return send_to_core_get(TEMP_RUN_STATUS(id, run_id), *args, **kwargs, is_text=True)
+
+
+async def get_run_status_async(id: str, run_id: str, *args, **kwargs) -> str:
+    return await send_to_core_get_async(TEMP_RUN_STATUS(id, run_id), *args, **kwargs, is_text=True)
+
+
 # AdminController
 
 

malevich_coretools/secondary/const.py

@@ -164,10 +164,12 @@ OPERATION_RESULTS_ID = lambda id, wait: with_wait(f"{OPERATION_RESULTS_MAIN}/{ur
 ## TempRunController
 TEMP_RUN_MAIN = f"{API_VERSION}/run"
 TEMP_RUN_CONDITION = lambda operationId: f"{TEMP_RUN_MAIN}/condition/{urllib.parse.quote(str(operationId), safe='')}"
-TEMP_RUN_ACTIVE_RUNS = f"{TEMP_RUN_MAIN}/activeRuns"
+TEMP_RUN_ACTIVE_RUNS = lambda operationId: with_key_values(f"{TEMP_RUN_MAIN}/activeRuns", {"operationId": operationId})
 TEMP_RUN_MAIN_TASK_CFG = lambda operationId: f"{TEMP_RUN_MAIN}/mainTaskCfg/{urllib.parse.quote(str(operationId), safe='')}"
 TEMP_RUN_MAIN_PIPELINE_CFG = lambda operationId: f"{TEMP_RUN_MAIN}/mainPipelineCfg/{urllib.parse.quote(str(operationId), safe='')}"
 TEMP_RUN_OPERATIONS_IDS = lambda taskId, cfgId: f"{TEMP_RUN_MAIN}/operationsIds/{urllib.parse.quote(str(taskId), safe='')}" if cfgId is None else f"{TEMP_RUN_MAIN}/operationsIds/{urllib.parse.quote(str(taskId), safe='')}/{urllib.parse.quote(str(cfgId), safe='')}"
+TEMP_RUN_STATUSES = lambda operationId: f"{TEMP_RUN_MAIN}/statuses/{urllib.parse.quote(str(operationId), safe='')}"
+TEMP_RUN_STATUS = lambda operationId, runId: f"{TEMP_RUN_MAIN}/statuses/{urllib.parse.quote(str(operationId), safe='')}/{urllib.parse.quote(str(runId), safe='')}"
 
 ## AdminController
 ADMIN_MAIN = f"{API_VERSION}/admin"

malevich_coretools/utils.py

@@ -6581,6 +6581,7 @@ def get_run_condition(
 def get_run_active_runs(
     tags: Optional[Dict[str, str]] = None,
     with_tags: bool = False,
+    id: Optional[str] = None,
     *,
     auth: Optional[AUTH] = None,
     conn_url: Optional[str] = None,
@@ -6594,6 +6595,7 @@ def get_run_active_runs(
 def get_run_active_runs(
     tags: Optional[Dict[str, str]] = None,
     with_tags: bool = False,
+    id: Optional[str] = None,
     *,
     auth: Optional[AUTH] = None,
     conn_url: Optional[str] = None,
@@ -6606,16 +6608,18 @@ def get_run_active_runs(
 def get_run_active_runs(
     tags: Optional[Dict[str, str]] = None,
     with_tags: bool = False,
+    id: Optional[str] = None,
     *,
     auth: Optional[AUTH] = None,
     conn_url: Optional[str] = None,
     batcher: Optional[Batcher] = None,
     is_async: bool = False,
 ) -> Union[ResultIds, ResultTags, Coroutine[Any, Any, ResultIds], Coroutine[Any, Any, ResultTags]]:
-    """return list running operationIds, filter by tags if set, return id -> tags if with_tags"""
+    """return list running operationIds, filter by tags if set, return id -> tags if with_tags; if operation `id` set - return runIds"""
     if batcher is None:
         batcher = Config.BATCHER
     if tags is not None or with_tags:
+        assert id is None, "id should be None in this case"
         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)
@@ -6624,10 +6628,10 @@ def get_run_active_runs(
         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)
+            return batcher.add("getActiveRuns", vars={"operationId": id}, 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)
+            return f.get_run_activeRuns_async(id, auth=auth, conn_url=conn_url)
+        return f.get_run_activeRuns(id, auth=auth, conn_url=conn_url)
 
 
 @overload
@@ -6762,6 +6766,93 @@ def get_task_runs(
     return f.get_run_operationsIds(task_id, cfg_id, auth=auth, conn_url=conn_url)
 
 
+@overload
+def get_run_statuses(
+    id: str,
+    *,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+    batcher: Optional[Batcher] = None,
+    is_async: Literal[False] = False,
+) -> Statuses:
+    pass
+
+
+@overload
+def get_run_statuses(
+    id: str,
+    *,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+    batcher: Optional[Batcher] = None,
+    is_async: Literal[True],
+) -> Coroutine[Any, Any, Statuses]:
+    pass
+
+
+def get_run_statuses(
+    id: str,
+    *,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+    batcher: Optional[Batcher] = None,
+    is_async: bool = False,
+) -> Union[Statuses, Coroutine[Any, Any, Statuses]]:
+    """return runs statuses by operation `id`"""
+    if batcher is None:
+        batcher = Config.BATCHER
+    if batcher is not None:
+        return batcher.add("getStatuses", vars={"operationId": id}, result_model=Statuses)
+    if is_async:
+        return f.get_run_statuses_async(id, auth=auth, conn_url=conn_url)
+    return f.get_run_statuses(id, auth=auth, conn_url=conn_url)
+
+
+@overload
+def get_run_status(
+    id: str,
+    run_id: str,
+    *,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+    batcher: Optional[Batcher] = None,
+    is_async: Literal[False] = False,
+) -> str:
+    pass
+
+
+@overload
+def get_run_status(
+    id: str,
+    run_id: str,
+    *,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+    batcher: Optional[Batcher] = None,
+    is_async: Literal[True],
+) -> Coroutine[Any, Any, str]:
+    pass
+
+
+def get_run_status(
+    id: str,
+    run_id: str,
+    *,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+    batcher: Optional[Batcher] = None,
+    is_async: bool = False,
+) -> Union[str, Coroutine[Any, Any, str]]:
+    """return run status by operation `id` and `run_id`: one of: IN_PROGRESS, SUCCESS, FAILED"""
+    if batcher is None:
+        batcher = Config.BATCHER
+    if batcher is not None:
+        return batcher.add("getStatusesOne", vars={"operationId": id, "runId": run_id})
+    if is_async:
+        return f.get_run_status_async(id, run_id, auth=auth, conn_url=conn_url)
+    return f.get_run_status(id, run_id, auth=auth, conn_url=conn_url)
+
+
 # Manager
 
 

{malevich_coretools-0.3.69.dist-info → malevich_coretools-0.3.70.dist-info}/METADATA

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

{malevich_coretools-0.3.69.dist-info → malevich_coretools-0.3.70.dist-info}/RECORD

@@ -1,8 +1,8 @@
 malevich_coretools/__init__.py,sha256=0WUBUhATgnU3tctwv0AxzvRr0zRlW6V5INQljBCLRzo,172
 malevich_coretools/dm_utils.py,sha256=WvjtqVaAiwahej-oMnB5JJKFiAcTRiyNStDu0WpifHs,4775
-malevich_coretools/utils.py,sha256=7YuOpRQ6uV78EnkIiTyVvcj81cIzq8fv529YuImPg98,287286
+malevich_coretools/utils.py,sha256=L78iGAY6mXcJe5_X7083hEyp4uJOLFzWpAC6BEPAQUc,289737
 malevich_coretools/abstract/__init__.py,sha256=6vQ08c8HPYyT_pPkKlc-EwQKE8xG3HTEo2p_GiI5rik,142
-malevich_coretools/abstract/abstract.py,sha256=nkCCC12CTYR5UNJOZzSbUYieRGPhJSsn5KjlJ8MVbrs,17835
+malevich_coretools/abstract/abstract.py,sha256=UMxEcfr83RhS3t6bxWguL1A2n18YpXyWXX5Xg3kvQs4,17952
 malevich_coretools/abstract/operations.py,sha256=cWlo2xzW-rzkTInzpDjBYeL68KfLYqSpZJRzCQ4OzjA,3070
 malevich_coretools/abstract/pipeline.py,sha256=gwVaPZAiV75OCti4wKNusbY8E2XzWyWnh1tngRnH7xk,7664
 malevich_coretools/abstract/statuses.py,sha256=9ISSw_evsylBshLXoU44TCoFOrZm4bXIxyAFFDqdUWc,333
@@ -13,18 +13,18 @@ malevich_coretools/batch/utils.py,sha256=FRmCYU-zr-RjgT1Mo3CUNcB2mW1t_gKCJazcMx6
 malevich_coretools/funcs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 malevich_coretools/funcs/checks.py,sha256=Q5pRtRevQrGv_-SMbn2GgYnulhclDLBXdRtbw2QOYKU,223
 malevich_coretools/funcs/dm_funcs.py,sha256=Z0oSzMb9x6N2yANbIICz6erF9fJ5drg3Zheh-_VTPx4,7812
-malevich_coretools/funcs/funcs.py,sha256=A0h1iZYYzIZBKIBy1dvozezY3lzyNkXXkOdgA8t2kt0,89066
+malevich_coretools/funcs/funcs.py,sha256=L4ifjoaeiisv3btPzGjufG8KzIcqM8GRxUCbgpZGLNU,89799
 malevich_coretools/funcs/helpers.py,sha256=nYbUdtAuSSa9VMr7Oy2y0yvEMLv9EI1jzGq6eynuNLU,13573
 malevich_coretools/secondary/__init__.py,sha256=048HqvG36_1WdDVZK_RuECmaf14Iq2fviUysG1inlaE,78
 malevich_coretools/secondary/config.py,sha256=cjqKiWLm6m1kArOq4DWOHaNxKT_kHP9WUyHVkYe3UeI,487
-malevich_coretools/secondary/const.py,sha256=ssrzKajWNzdRsVbOLjzgVqCI2W9m31yOkgvhZNiEfFk,16360
+malevich_coretools/secondary/const.py,sha256=r-LOxPDNubvL7T7mnUxeFbSdByTGLR5jC1vdw5lrRbo,16706
 malevich_coretools/secondary/helpers.py,sha256=V5xNv-Rt4SNkthTcNnMtYPjiYfoHmwUR8ApU8qFmzT0,7986
 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.69.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-malevich_coretools-0.3.69.dist-info/METADATA,sha256=-cIlf5_7QM6Vm5Nar7S6fQN4QgoVj80aGOOxikwuNe4,347
-malevich_coretools-0.3.69.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-malevich_coretools-0.3.69.dist-info/top_level.txt,sha256=wDX3s1Tso0otBPNrFRfXqyNpm48W4Bp5v6JfbITO2Z8,19
-malevich_coretools-0.3.69.dist-info/RECORD,,
+malevich_coretools-0.3.70.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+malevich_coretools-0.3.70.dist-info/METADATA,sha256=PTHOhAJ6z2Htsq3VYbopw1HHPrhzTq5dDub6j7ZKFC4,347
+malevich_coretools-0.3.70.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+malevich_coretools-0.3.70.dist-info/top_level.txt,sha256=wDX3s1Tso0otBPNrFRfXqyNpm48W4Bp5v6JfbITO2Z8,19
+malevich_coretools-0.3.70.dist-info/RECORD,,