malevich-coretools 0.3.61__py3-none-any.whl → 0.3.62__py3-none-any.whl

malevich_coretools/abstract/abstract.py

@@ -139,12 +139,8 @@ class ScaleInfo(BaseModel):
 
 
 class TaskComponent(BaseModel):
-    appControl: Optional[str] = None
-    control: Optional[str] = None
-    extra: Optional[str] = None
-    internal: Optional[str] = None
+    main: Optional[str] = None
     keyValue: Optional[str] = None
-    minimal: Optional[str] = None
     objectStorage: Optional[str] = None
 
 
@@ -504,6 +500,24 @@ class OperationOrNone(BaseModel):
     operationId: Optional[Alias.Id] = None
 
 
+class AdminRunInfoReq(OperationOrNone):
+    dmId: Optional[str] = None
+
+
+class AdminDMRegister(BaseModel):
+    id: int
+    url: Optional[str]
+    secret: Optional[str]
+    appSecret: Optional[str]
+    login: Optional[str]
+    actuaryDMId: Optional[int]
+
+
+class AdminDMUnregister(BaseModel):
+    id: str
+    actuaryDMId: Optional[int]
+
+
 class AdminStopOperation(BaseModel):
     operationId: Optional[Alias.Id] = None
     withLogs: bool

malevich_coretools/admin/utils.py

@@ -1,54 +1,245 @@
+from typing import Coroutine, Literal, Union, overload
+
 import malevich_coretools.funcs.funcs as f
 from malevich_coretools.abstract import *  # noqa: F403
 from malevich_coretools.batch import Batcher
 from malevich_coretools.secondary import Config
 
 
+@overload
 def admin_get_runs(
     *,
     auth: Optional[AUTH] = None,
     conn_url: Optional[str] = None,
     batcher: Optional[Batcher] = None,
+    is_async: Literal[False] = False,
 ) -> AdminRunsInfo:
+    pass
+
+
+@overload
+def admin_get_runs(
+    *,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+    batcher: Optional[Batcher] = None,
+    is_async: Literal[True],
+) -> Coroutine[Any, Any, AdminRunsInfo]:
+    pass
+
+
+def admin_get_runs(
+    *,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+    batcher: Optional[Batcher] = None,
+    is_async: bool = False,
+) -> Union[AdminRunsInfo, Coroutine[Any, Any, AdminRunsInfo]]:
     """return info about all runs"""
     if batcher is None:
         batcher = Config.BATCHER
     if batcher is not None:
         return batcher.add("getAllRuns", result_model=AdminRunsInfo)
+    if is_async:
+        return f.get_admin_runs_async(auth=auth, conn_url=conn_url)
     return f.get_admin_runs(auth=auth, conn_url=conn_url)
 
 
+@overload
 def admin_get_run_info(
     id: Alias.Id,
     *,
+    dm_id: Optional[str] = None,
     auth: Optional[AUTH] = None,
     conn_url: Optional[str] = None,
     batcher: Optional[Batcher] = None,
+    is_async: Literal[False] = False,
 ) -> Alias.Json:
+    pass
+
+
+@overload
+def admin_get_run_info(
+    id: Alias.Id,
+    *,
+    dm_id: Optional[str] = None,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+    batcher: Optional[Batcher] = None,
+    is_async: Literal[True],
+) -> Coroutine[Any, Any, Alias.Json]:
+    pass
+
+
+def admin_get_run_info(
+    id: Alias.Id,
+    *,
+    dm_id: Optional[str] = None,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+    batcher: Optional[Batcher] = None,
+    is_async: bool = False,
+) -> Union[Alias.Json, Coroutine[Any, Any, Alias.Json]]:
     """return run info by operation `id`"""
     if batcher is None:
         batcher = Config.BATCHER
-    data = OperationOrNone(operationId=id)
+    data = AdminRunInfoReq(operationId=id, dmId=dm_id)
     if batcher is not None:
         return batcher.add("getRunInfo", data=data)
+    if is_async:
+        return f.get_admin_runs_info_async(data, auth=auth, conn_url=conn_url)
     return f.get_admin_runs_info(data, auth=auth, conn_url=conn_url)
 
 
+@overload
 def admin_get_runs_info(
     *,
+    dm_id: Optional[str] = None,
     auth: Optional[AUTH] = None,
     conn_url: Optional[str] = None,
     batcher: Optional[Batcher] = None,
+    is_async: Literal[False] = False,
 ) -> Alias.Json:
+    pass
+
+
+@overload
+def admin_get_runs_info(
+    *,
+    dm_id: Optional[str] = None,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+    batcher: Optional[Batcher] = None,
+    is_async: Literal[True],
+) -> Coroutine[Any, Any, Alias.Json]:
+    pass
+
+
+def admin_get_runs_info(
+    *,
+    dm_id: Optional[str] = None,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+    batcher: Optional[Batcher] = None,
+    is_async: bool = False,
+) -> Union[Alias.Json, Coroutine[Any, Any, Alias.Json]]:
     """return json: dm id -> info about its runs"""
     if batcher is None:
         batcher = Config.BATCHER
-    data = OperationOrNone()
+    data = AdminRunInfoReq(dmId=dm_id)
     if batcher is not None:
         return batcher.add("getRunInfo", data=data)
+    if is_async:
+        return f.get_admin_runs_info_async(data, auth=auth, conn_url=conn_url)
     return f.get_admin_runs_info(data, auth=auth, conn_url=conn_url)
 
 
+@overload
+def admin_dm_register(
+    id: Optional[int] = None,
+    url: Optional[str] = None,
+    secret: Optional[str] = None,
+    app_secret: Optional[str] = None,
+    login: Optional[str] = None,
+    actuary_dm_id: Optional[int] = None,
+    *,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+    batcher: Optional[Batcher] = None,
+    is_async: Literal[False] = False,
+) -> None:
+    pass
+
+
+@overload
+def admin_dm_register(
+    id: Optional[int] = None,
+    url: Optional[str] = None,
+    secret: Optional[str] = None,
+    app_secret: Optional[str] = None,
+    login: Optional[str] = None,
+    actuary_dm_id: Optional[int] = None,
+    *,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+    batcher: Optional[Batcher] = None,
+    is_async: Literal[True],
+) -> Coroutine[Any, Any, None]:
+    pass
+
+
+def admin_dm_register(
+    id: Optional[int] = None,
+    url: Optional[str] = None,
+    secret: Optional[str] = None,
+    app_secret: Optional[str] = None,
+    login: Optional[str] = None,
+    actuary_dm_id: Optional[int] = None,
+    *,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+    batcher: Optional[Batcher] = None,
+    is_async: bool = False,
+) -> Union[None, Coroutine[Any, Any, None]]:
+    assert id is not None or (url is not None and secret is not None and app_secret is not None and login is not None), "id or url & secret & app_secret & login should set"
+    if batcher is None:
+        batcher = Config.BATCHER
+    data = AdminDMRegister(id=id, url=url, secret=secret, appSecret=app_secret, login=login, actuaryDMId=actuary_dm_id)
+    if batcher is not None:
+        return batcher.add("postDMRegister", data=data)
+    if is_async:
+        return f.post_admin_dm_register_async(data, auth=auth, conn_url=conn_url)
+    return f.post_admin_dm_register(data, auth=auth, conn_url=conn_url)
+
+
+@overload
+def admin_dm_unregister(
+    id: Union[str, int] = 0,
+    actuary_dm_id: Optional[int] = None,
+    *,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+    batcher: Optional[Batcher] = None,
+    is_async: Literal[False] = False,
+) -> None:
+    pass
+
+
+@overload
+def admin_dm_unregister(
+    id: Union[str, int] = 0,
+    actuary_dm_id: Optional[int] = None,
+    *,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+    batcher: Optional[Batcher] = None,
+    is_async: Literal[True],
+) -> Coroutine[Any, Any, None]:
+    pass
+
+
+def admin_dm_unregister(
+    id: Union[str, int] = 0,    # id or login
+    actuary_dm_id: Optional[int] = None,
+    *,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+    batcher: Optional[Batcher] = None,
+    is_async: bool = False,
+) -> Union[None, Coroutine[Any, Any, None]]:
+    if isinstance(id, int):
+        id = f'{id:05d}'
+    if batcher is None:
+        batcher = Config.BATCHER
+    data = AdminDMUnregister(id=id, actuaryDMId=actuary_dm_id)
+    if batcher is not None:
+        return batcher.add("deleteDMRegister", data=data)
+    if is_async:
+        return f.delete_admin_dm_register_async(data, auth=auth, conn_url=conn_url)
+    return f.delete_admin_dm_register(data, auth=auth, conn_url=conn_url)
+
+
+@overload
 def admin_update_superuser(
     login: str,
     is_superuser: bool = True,
@@ -56,16 +247,45 @@ def admin_update_superuser(
     auth: Optional[AUTH] = None,
     conn_url: Optional[str] = None,
     batcher: Optional[Batcher] = None,
+    is_async: Literal[False] = False,
 ) -> Alias.Info:
+    pass
+
+
+@overload
+def admin_update_superuser(
+    login: str,
+    is_superuser: bool = True,
+    *,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+    batcher: Optional[Batcher] = None,
+    is_async: Literal[True],
+) -> Coroutine[Any, Any, Alias.Info]:
+    pass
+
+
+def admin_update_superuser(
+    login: str,
+    is_superuser: bool = True,
+    *,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+    batcher: Optional[Batcher] = None,
+    is_async: bool = False,
+) -> Union[Alias.Info, Coroutine[Any, Any, Alias.Info]]:
     """update user role by login"""
     if batcher is None:
         batcher = Config.BATCHER
     data = Superuser(login=login, isSuperuser=is_superuser)
     if batcher is not None:
         return batcher.add("postUpdateSuperuser", data=data)
+    if is_async:
+        return f.post_admin_update_superuser_async(data, auth=auth, conn_url=conn_url)
     return f.post_admin_update_superuser(data, auth=auth, conn_url=conn_url)
 
 
+@overload
 def admin_delete_run(
     id: Alias.Id,
     withLogs: bool = False,
@@ -73,27 +293,82 @@ def admin_delete_run(
     auth: Optional[AUTH] = None,
     conn_url: Optional[str] = None,
     batcher: Optional[Batcher] = None,
+    is_async: Literal[False] = False,
 ) -> Alias.Json:
+    pass
+
+
+@overload
+def admin_delete_run(
+    id: Alias.Id,
+    withLogs: bool = False,
+    *,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+    batcher: Optional[Batcher] = None,
+    is_async: Literal[True],
+) -> Coroutine[Any, Any, Alias.Json]:
+    pass
+
+
+def admin_delete_run(
+    id: Alias.Id,
+    withLogs: bool = False,
+    *,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+    batcher: Optional[Batcher] = None,
+    is_async: bool = False,
+) -> Union[Alias.Json, Coroutine[Any, Any, Alias.Json]]:
     """delete run by operation `id`"""
     if batcher is None:
         batcher = Config.BATCHER
     data = AdminStopOperation(operationId=id, withLogs=withLogs)
     if batcher is not None:
         return batcher.add("deleteRuns", data=data)
+    if is_async:
+        return f.delete_admin_runs_async(data, auth=auth, conn_url=conn_url)
     return f.delete_admin_runs(data, auth=auth, conn_url=conn_url)
 
 
+@overload
 def admin_delete_runs(
     withLogs: bool = False,
     *,
     auth: Optional[AUTH] = None,
     conn_url: Optional[str] = None,
     batcher: Optional[Batcher] = None,
+    is_async: Literal[False] = False,
 ) -> Alias.Json:
+    pass
+
+
+@overload
+def admin_delete_runs(
+    withLogs: bool = False,
+    *,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+    batcher: Optional[Batcher] = None,
+    is_async: Literal[True],
+) -> Coroutine[Any, Any, Alias.Json]:
+    pass
+
+
+def admin_delete_runs(
+    withLogs: bool = False,
+    *,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+    batcher: Optional[Batcher] = None,
+    is_async: bool = False,
+) -> Union[Alias.Json, Coroutine[Any, Any, Alias.Json]]:
     """delete all runs"""
     if batcher is None:
         batcher = Config.BATCHER
     data = AdminStopOperation(withLogs=withLogs)
     if batcher is not None:
         return batcher.add("deleteRuns", data=data)
+    if is_async:
+        return f.delete_admin_runs_async(data, auth=auth, conn_url=conn_url)
     return f.delete_admin_runs(data, auth=auth, conn_url=conn_url)

malevich_coretools/funcs/funcs.py

@@ -1114,14 +1114,30 @@ async def get_admin_runs_async(*args, **kwargs) -> AdminRunsInfo:
     return model_from_json(await send_to_core_get_async(ADMIN_RUNS, *args, **kwargs), AdminRunsInfo)
 
 
-def get_admin_runs_info(data: OperationOrNone, *args, **kwargs) -> Alias.Json:
+def get_admin_runs_info(data: AdminRunInfoReq, *args, **kwargs) -> Alias.Json:
     return send_to_core_modify(ADMIN_RUNS_INFO, data, *args, **kwargs)
 
 
-async def get_admin_runs_info_async(data: OperationOrNone, *args, **kwargs) -> Alias.Json:
+async def get_admin_runs_info_async(data: AdminRunInfoReq, *args, **kwargs) -> Alias.Json:
     return await send_to_core_modify_async(ADMIN_RUNS_INFO, data, *args, **kwargs)
 
 
+def post_admin_dm_register(data: AdminDMRegister, *args, **kwargs) -> None:
+    return send_to_core_modify(ADMIN_DM_REGISTER, data, *args, **kwargs)
+
+
+async def post_admin_dm_register_async(data: AdminDMRegister, *args, **kwargs) -> None:
+    return await send_to_core_modify_async(ADMIN_DM_REGISTER, data, *args, **kwargs)
+
+
+def delete_admin_dm_register(data: AdminDMUnregister, *args, **kwargs) -> None:
+    return send_to_core_modify(ADMIN_DM_REGISTER, data, *args, **kwargs, is_post=False)
+
+
+async def delete_admin_dm_register_async(data: AdminDMUnregister, *args, **kwargs) -> None:
+    return await send_to_core_modify_async(ADMIN_DM_REGISTER, data, *args, **kwargs, is_post=False)
+
+
 def post_admin_update_superuser(data: Superuser, *args, **kwargs) -> Alias.Info:
     return send_to_core_modify(ADMIN_SUPERUSER, data, *args, **kwargs)
 

malevich_coretools/funcs/helpers.py

@@ -287,21 +287,13 @@ def create_user_config(
 
 
 def create_task_component(
-    app_control: Optional[str] = None,
-    control: Optional[str] = None,
-    extra: Optional[str] = None,
-    internal: Optional[str] = None,
+    main: Optional[str] = None,
     key_value: Optional[str] = None,
-    minimal: Optional[str] = None,
     object_storage: Optional[str] = None,
 ) -> TaskComponent:
     return TaskComponent(
-        appControl=app_control,
-        control=control,
-        extra=extra,
-        internal=internal,
+        main=main,
         keyValue=key_value,
-        minimal=minimal,
         objectStorage=object_storage
     )
 

malevich_coretools/secondary/const.py

@@ -168,6 +168,7 @@ TEMP_RUN_OPERATIONS_IDS = lambda taskId, cfgId: f"{TEMP_RUN_MAIN}/operationsIds/
 ADMIN_MAIN = f"{API_VERSION}/admin"
 ADMIN_RUNS = f"{ADMIN_MAIN}/runs"
 ADMIN_RUNS_INFO = f"{ADMIN_MAIN}/runs/info"
+ADMIN_DM_REGISTER = f"{ADMIN_MAIN}/dm/register"
 ADMIN_SUPERUSER = f"{ADMIN_MAIN}/superuser"
 
 ## ManagerController

malevich_coretools/secondary/helpers.py

@@ -57,7 +57,7 @@ def bool_to_str(b: bool) -> str:
     return "true" if b else "false"
 
 
-def __show_logs_result(res: LogsResult, i: Optional[int]):  # noqa: ANN202
+def __show_logs_result(res: LogsResult, i: Optional[int] = None):  # noqa: ANN202
     if len(res.data) > 0:
         print(f"------- main ({i}):" if i is not None else "------- main:")
         print(res.data)

{malevich_coretools-0.3.61.dist-info → malevich_coretools-0.3.62.dist-info}/METADATA

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

{malevich_coretools-0.3.61.dist-info → malevich_coretools-0.3.62.dist-info}/RECORD

@@ -1,28 +1,28 @@
 malevich_coretools/__init__.py,sha256=DJtPESxkCZD2SbTZTrR_x0TKDQ4MJpmBqGw5YpKYidM,134
 malevich_coretools/utils.py,sha256=9k2I7YMrLtSlfHWkhVuYWdtljZgWKnfJvFDdqexhx-I,275747
 malevich_coretools/abstract/__init__.py,sha256=6vQ08c8HPYyT_pPkKlc-EwQKE8xG3HTEo2p_GiI5rik,142
-malevich_coretools/abstract/abstract.py,sha256=S5yYRhzpqsiIEN083LqUJlvu0MZ9Z__DdOLhS5ZsPdc,17475
+malevich_coretools/abstract/abstract.py,sha256=JZZwDux3RpJgDPVQa3-RjKFZfSceC00sn_aBxsKJeB8,17670
 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
 malevich_coretools/admin/__init__.py,sha256=zdIcHs3T_NZ8HYWts-O7OpBEWHIu779QDZMGF5HRCLg,35
-malevich_coretools/admin/utils.py,sha256=jmqy8qODvPOg1qcY1pBPJWJCdAVGiOFTAFn6Ltyhsms,3015
+malevich_coretools/admin/utils.py,sha256=mGu-zge5FHW2Z2TDhE3YOhOlw2x8NA2CV_XKsY-g4nE,10378
 malevich_coretools/batch/__init__.py,sha256=taxyZl8YOZd2EBd3leN6slzMkejUtjQ64Na31TcT3-I,165
 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=FgBrMRbGrZylVGzew48fUfy2VxRMK9gH-RXmJdyG7F4,85252
-malevich_coretools/funcs/helpers.py,sha256=3-2s5-8hiBeslir8Qa1IgKkHwgYnjPG5w7Kog1e7dHI,13830
+malevich_coretools/funcs/funcs.py,sha256=gG-vAXigztV15451X9Glx4XIn2wo19JHBWllkKyocVk,85942
+malevich_coretools/funcs/helpers.py,sha256=nYbUdtAuSSa9VMr7Oy2y0yvEMLv9EI1jzGq6eynuNLU,13573
 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=r_P9x0F8YFDFmPHF4oCUQJ4Va3v39CYG_Isg16CDpmo,15321
-malevich_coretools/secondary/helpers.py,sha256=9zRU_EjESks_DbDxs6PjaubtKeJWTqOI_fCoTsEsP8w,7979
+malevich_coretools/secondary/const.py,sha256=1x-49VxzVdtk064xn92gQnqlEfMuYAvWcz-vp3D6fO4,15369
+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.61.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-malevich_coretools-0.3.61.dist-info/METADATA,sha256=Itxpu3ReVN0qcFy1YQuozsf4zOZAT6NIY4wmaYe6NNQ,347
-malevich_coretools-0.3.61.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-malevich_coretools-0.3.61.dist-info/top_level.txt,sha256=wDX3s1Tso0otBPNrFRfXqyNpm48W4Bp5v6JfbITO2Z8,19
-malevich_coretools-0.3.61.dist-info/RECORD,,
+malevich_coretools-0.3.62.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+malevich_coretools-0.3.62.dist-info/METADATA,sha256=V99umI8hcAVVlU6TP_LspC-5F55VqF1Ss9fA1pDnpGo,347
+malevich_coretools-0.3.62.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+malevich_coretools-0.3.62.dist-info/top_level.txt,sha256=wDX3s1Tso0otBPNrFRfXqyNpm48W4Bp5v6JfbITO2Z8,19
+malevich_coretools-0.3.62.dist-info/RECORD,,