malevich-coretools 0.2.4__py3-none-any.whl → 0.2.6__py3-none-any.whl

malevich_coretools/abstract/abstract.py

@@ -92,26 +92,26 @@ class User(BaseModel):
 
 class JsonImage(BaseModel):
     ref: str
-    user: Optional[str]
-    token: Optional[str]
+    user: Optional[str] = None
+    token: Optional[str] = None
 
 
 class UserApp(BaseModel):
     appId: Alias.Id
-    inputId: Optional[Alias.Id]
+    inputId: Optional[Alias.Id] = None
     processorId: Alias.Id
-    outputId: Optional[Alias.Id]
-    cfg: Optional[Alias.Json]
+    outputId: Optional[Alias.Id] = None
+    cfg: Optional[Alias.Json] = None
     image: JsonImage
     platform: str
-    platformSettings: Optional[str]
-    collectionsFrom: Optional[Dict[str, str]]
-    extraCollectionsFrom: Optional[Dict[str, str]]
+    platformSettings: Optional[str] = None
+    collectionsFrom: Optional[Dict[str, str]] = None
+    extraCollectionsFrom: Optional[Dict[str, str]] = None
 
 
 class UserTask(BaseModel):
     taskId: Alias.Id
-    appId: Optional[Alias.Id]
+    appId: Optional[Alias.Id] = None
     appsDepends: List[Alias.Id]
     tasksDepends: List[Alias.Id]
     synthetic: bool
@@ -335,14 +335,14 @@ class AppLog(BaseModel):
 
 
 class AppLogs(BaseModel):
-    operationId: str
+    operationId: Alias.Id
     dagLogs: str
     data: Dict[str, AppLog]
     error: Optional[str] = None
 
 
 class LogsTask(BaseModel):
-    operationId: str
+    operationId: Alias.Id
     appId: Optional[str] = None
     taskId: Optional[str] = None
     runId: Optional[str] = None
@@ -394,3 +394,30 @@ class AppFunctionsInfo(BaseModel):
     inits: Dict[str, InitInfo] = dict()
     logs: Optional[str] = None
     instanceInfo: Optional[str] = None  # json with info about instance
+
+
+class TaskInfo(BaseModel):
+    taskId: str
+    apps: Dict[str, UserApp]
+    tasks: Dict[str, UserTask]
+    cfg: str
+    login: str
+
+
+class AdminRunInfo(BaseModel):
+    operationId: Alias.Id
+    taskInfo: TaskInfo
+    cfgId: str
+
+
+class AdminRunsInfo(BaseModel):
+    data: List[AdminRunInfo]
+
+
+class OperationOrNone(BaseModel):
+    operationId: Optional[Alias.Id] = None
+
+
+class AdminStopOperation(BaseModel):
+    operationId: Optional[Alias.Id]
+    withLogs: bool

malevich_coretools/admin/__init__.py

@@ -0,0 +1 @@
+from .utils import *  # noqa: F403

malevich_coretools/admin/utils.py

@@ -0,0 +1,55 @@
+import malevich_coretools.funcs.funcs as f
+from malevich_coretools.abstract import *  # noqa: F403
+
+
+def admin_get_runs(
+    *,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+) -> AdminRunsInfo:
+    """return info about all runs"""
+    return f.get_admin_runs(auth=auth, conn_url=conn_url)
+
+
+def admin_get_run_info(
+    id: Alias.Id,
+    *,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+) -> Alias.Info:
+    """return run info by operation \"id\""""
+    data = OperationOrNone(id)
+    return f.get_admin_runs_info(data, auth=auth, conn_url=conn_url)
+
+
+def admin_get_runs_info(
+    *,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+) -> Alias.Json:
+    """return json: dm id -> info about its runs"""
+    data = OperationOrNone()
+    return f.get_admin_runs_info(data, auth=auth, conn_url=conn_url)
+
+
+def admin_delete_run(
+    id: Alias.Id,
+    withLogs: bool = False,
+    *,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+) -> Alias.Json:
+    """delete run by operation \"id\""""
+    data = AdminStopOperation(operationId=id, withLogs=withLogs)
+    return f.delete_admin_runs(data, auth=auth, conn_url=conn_url)
+
+
+def admin_delete_runs(
+    withLogs: bool = False,
+    *,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+) -> Alias.Json:
+    """delete all runs"""
+    data = AdminStopOperation(operationId=None, withLogs=withLogs)
+    return f.delete_admin_runs(data, auth=auth, conn_url=conn_url)

malevich_coretools/funcs/funcs.py

@@ -414,6 +414,20 @@ def get_run_mainTaskCfg(id: str, *args, **kwargs) -> MainTaskCfg:
 def get_run_operationsIds(task_id: str, cfg_id: Optional[str]=None, *args, **kwargs) -> ResultIds:
     return model_from_json(send_to_core_get(TEMP_RUN_OPERATIONS_IDS(task_id, cfg_id), *args, **kwargs), ResultIds)
 
+# AdminController
+
+
+def get_admin_runs(*args, **kwargs) -> AdminRunsInfo:
+    return model_from_json(send_to_core_get(ADMIN_RUNS, *args, **kwargs), AdminRunsInfo)
+
+
+def get_admin_runs_info(data: OperationOrNone, *args, **kwargs) -> Union[Alias.Json, Alias.Info]:
+    return send_to_core_modify(ADMIN_RUNS_INFO, data, *args, **kwargs)
+
+
+def delete_admin_runs(data: AdminStopOperation, *args, **kwargs) -> Alias.Json:
+    return send_to_core_modify(ADMIN_RUNS, data, is_post=False, *args, **kwargs)
+
 # ManagerController
 
 

malevich_coretools/secondary/const.py

@@ -13,9 +13,9 @@ WAIT_RESULT_TIMEOUT = 60 * 60   # hour
 AIOHTTP_TIMEOUT = aiohttp.ClientTimeout(total=60 * 10) # 10 min
 AIOHTTP_TIMEOUT_MINI = aiohttp.ClientTimeout(total=60 * 5) # 5 min
 POSSIBLE_APPS_PLATFORMS = {"base", "vast"}
-SCHEME_PATTERN = r"\w+"
-# endpoints
+SCHEME_PATTERN = r"[a-zA-Z_]\w+"
 
+# endpoints
 def with_wait(url, wait) -> str:
     return url if wait is None else f"{url}?wait={bool_to_str(wait)}"    # always first
 
@@ -117,6 +117,11 @@ TEMP_RUN_ACTIVE_RUNS = f"{TEMP_RUN_MAIN}/activeRuns"
 TEMP_RUN_MAIN_TASK_CFG = lambda operationId: f"{TEMP_RUN_MAIN}/mainTaskCfg/{operationId}"
 TEMP_RUN_OPERATIONS_IDS = lambda taskId, cfgId: f"{TEMP_RUN_MAIN}/operationsIds/{taskId}" if cfgId is None else f"{TEMP_RUN_MAIN}/operationsIds/{taskId}/{cfgId}"
 
+## AdminController
+ADMIN_MAIN = f"{API_VERSION}/admin"
+ADMIN_RUNS = f"{ADMIN_MAIN}/runs"
+ADMIN_RUNS_INFO = f"{ADMIN_MAIN}/runs/info"
+
 ## ManagerController
 MANAGER_MAIN = f"{API_VERSION}/manager"
 MANAGER_LOGS = f"{MANAGER_MAIN}/logs"

malevich_coretools/utils.py

@@ -797,6 +797,7 @@ def create_app(
     extra_collections_from: Optional[Dict[str, str]] = None,
     wait: bool = True,
     *,
+    use_system_auth: bool = True,
     auth: Optional[AUTH] = None,
     conn_url: Optional[str] = None,
 ) -> Alias.Id:
@@ -808,8 +809,8 @@ def create_app(
         platform in POSSIBLE_APPS_PLATFORMS
     ), f"wrong platform: {platform}, possible platforms: {POSSIBLE_APPS_PLATFORMS}"
     app_cfg_json = None if app_cfg is None else to_json(app_cfg)
-    image_user = image_auth[0] if image_auth is not None else Config.USERNAME
-    image_token = image_auth[1] if image_auth is not None else Config.TOKEN
+    image_user = image_auth[0] if image_auth is not None else Config.USERNAME if use_system_auth else None
+    image_token = image_auth[1] if image_auth is not None else Config.TOKEN if use_system_auth else None
     if Config.WITH_WARNINGS and (image_user is None or image_token is None):
         Config.logger.warning("image_auth not set")
     if image_ref is None:
@@ -847,6 +848,7 @@ def update_app(
     extra_collections_from: Optional[Dict[str, str]] = None,
     wait: bool = True,
     *,
+    use_system_auth: bool = True,
     auth: Optional[AUTH] = None,
     conn_url: Optional[str] = None,
 ) -> Alias.Info:
@@ -857,8 +859,8 @@ def update_app(
         platform in POSSIBLE_APPS_PLATFORMS
     ), f"wrong platform: {platform}, possible platforms: {POSSIBLE_APPS_PLATFORMS}"
     app_cfg_json = None if app_cfg is None else to_json(app_cfg)
-    image_user = image_auth[0] if image_auth is not None else Config.USERNAME
-    image_token = image_auth[1] if image_auth is not None else Config.TOKEN
+    image_user = image_auth[0] if image_auth is not None else Config.USERNAME if use_system_auth else None
+    image_token = image_auth[1] if image_auth is not None else Config.TOKEN if use_system_auth else None
     if Config.WITH_WARNINGS and (image_user is None or image_token is None):
         Config.logger.warning("image_auth not set")
     if image_ref is None:
@@ -1274,12 +1276,13 @@ def get_image_info(
     image_auth: Optional[AUTH] = None,
     parse: bool = False,
     *,
+    use_system_auth: bool = False,
     auth: Optional[AUTH] = None,
     conn_url: Optional[str] = None,
 ) -> Union[Alias.Json, AppFunctionsInfo]:
     """return json with functions image info"""
-    image_user = image_auth[0] if image_auth is not None else Config.USERNAME
-    image_token = image_auth[1] if image_auth is not None else Config.TOKEN
+    image_user = image_auth[0] if image_auth is not None else Config.USERNAME if use_system_auth else None
+    image_token = image_auth[1] if image_auth is not None else Config.TOKEN if use_system_auth else None
     if Config.WITH_WARNINGS and (image_user is None or image_token is None):
         Config.logger.warning("image_auth not set")
     json_image = JsonImage(ref=image_ref, user=image_user, token=image_token)
@@ -1589,7 +1592,7 @@ def task_stop_all(
     auth: Optional[AUTH] = None,
     conn_url: Optional[str] = None,
 ) -> Alias.Json:
-    """stop task by \"operation_id\" """
+    """stop all tasks"""
     task = StopOperationMany(withLogs=with_logs, infoUrl=info_url)
     return f.post_manager_task_stop_all(
         task, with_show=with_show, wait=wait, auth=auth, conn_url=conn_url

{malevich_coretools-0.2.4.dist-info → malevich_coretools-0.2.6.dist-info}/METADATA

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

{malevich_coretools-0.2.4.dist-info → malevich_coretools-0.2.6.dist-info}/RECORD

@@ -1,18 +1,20 @@
 malevich_coretools/__init__.py,sha256=88IRvwNti4YOMJc6RaVRutwurJzP23g30D-rgo04Fgc,82
-malevich_coretools/utils.py,sha256=l26R7blks1KK2T3iX6C0PxKZnCDHFeNL3v-LXayoacs,57677
+malevich_coretools/utils.py,sha256=MTtfRbGHfNcNPOcF1Y55VMtiWsti1ZsMNUGs33b-VV4,57938
 malevich_coretools/abstract/__init__.py,sha256=ZWtP4gFLpNVFXzlMKXEK4iMnUqqMg07pL8yKGSJd6QI,38
-malevich_coretools/abstract/abstract.py,sha256=coe2Lmp9totwEfnQh_l1oEcSa6p7bdVCXdS7O4Gx94A,8221
+malevich_coretools/abstract/abstract.py,sha256=xqZwJ3CjC9IXNcXTrSSNj8J5JJ68IAtnfLcChZLZq8U,8760
+malevich_coretools/admin/__init__.py,sha256=zdIcHs3T_NZ8HYWts-O7OpBEWHIu779QDZMGF5HRCLg,35
+malevich_coretools/admin/utils.py,sha256=P1RmYfc_n6plBayfOhVuwVV33vMxw1yuS11NmKD4Hto,1507
 malevich_coretools/funcs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-malevich_coretools/funcs/funcs.py,sha256=ltgFnCeye1Mc0ErMwDqHX7qOTuJYVCY9QScWiGbPDkg,27291
+malevich_coretools/funcs/funcs.py,sha256=dUmEfZtMeFHZLBdqXr4Oz_2NPD8svvc_0tk752UnofY,27789
 malevich_coretools/funcs/helpers.py,sha256=Y8v6uyawYl2_G0XmhmiVLqGIUzvxnkpKF0ODA9vrB3Y,1276
 malevich_coretools/secondary/__init__.py,sha256=048HqvG36_1WdDVZK_RuECmaf14Iq2fviUysG1inlaE,78
 malevich_coretools/secondary/config.py,sha256=b7RysQTkPKib8FEhfm3uU7TPvz8vgWLlqakvZN5NFs4,391
-malevich_coretools/secondary/const.py,sha256=OrGAD3jItg0d8Zi-Xvqc_dobNASPxYBgfWgVRbSO8ls,7547
+malevich_coretools/secondary/const.py,sha256=b-0WYo13MtoQSzacKWiIJKF6rukBo-5UylrkT9Np14k,7690
 malevich_coretools/secondary/helpers.py,sha256=yQiaG_Q_5sw04RFpZccoSryPBuoA25BpSmvzSyQtwK0,2937
 malevich_coretools/tools/__init__.py,sha256=jDxlCa5Dr6Y43qlI7JwsRAlBkKmFeTHTEnjNUvu-0iw,46
 malevich_coretools/tools/vast.py,sha256=u1cnfylSgq3nYfonXbTy1zwor3OPkhD3vRf2OnqlMZY,12504
-malevich_coretools-0.2.4.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-malevich_coretools-0.2.4.dist-info/METADATA,sha256=8JefiMdIJutbYmkKzPHDhuKYEhlEKQEA3ga_uGg1iB8,236
-malevich_coretools-0.2.4.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-malevich_coretools-0.2.4.dist-info/top_level.txt,sha256=wDX3s1Tso0otBPNrFRfXqyNpm48W4Bp5v6JfbITO2Z8,19
-malevich_coretools-0.2.4.dist-info/RECORD,,
+malevich_coretools-0.2.6.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+malevich_coretools-0.2.6.dist-info/METADATA,sha256=tR9pQOmmVBK_A_IWoMa2j0XQ6h0UhQk5dKVwyWlSdWA,236
+malevich_coretools-0.2.6.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
+malevich_coretools-0.2.6.dist-info/top_level.txt,sha256=wDX3s1Tso0otBPNrFRfXqyNpm48W4Bp5v6JfbITO2Z8,19
+malevich_coretools-0.2.6.dist-info/RECORD,,