malevich-coretools 0.3.36__tar.gz → 0.3.38__tar.gz

{malevich_coretools-0.3.36/malevich_coretools.egg-info → malevich_coretools-0.3.38}/PKG-INFO

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

malevich_coretools-0.3.38/VERSION

@@ -0,0 +1 @@
+0.3.38

{malevich_coretools-0.3.36 → malevich_coretools-0.3.38}/malevich_coretools/funcs/funcs.py

@@ -283,6 +283,10 @@ def get_ping(*args, **kwargs) -> Alias.Info:
     return send_to_core_get(PING, *args, **kwargs, is_text=True)
 
 
+async def get_ping_async(*args, **kwargs) -> Alias.Info:
+    return await send_to_core_get_async(PING, *args, **kwargs, is_text=True)
+
+
 # def get_mapping(wait: bool, *args, **kwargs) -> ResultDocMappingsFull:
 #     return model_from_json(send_to_core_get(MAPPING, *args, **kwargs), ResultDocMappingsFull)
 
@@ -666,6 +670,16 @@ def post_manager_task(data: MainTask, with_show: bool, long: bool, long_timeout:
     return AppLogs.model_validate_json(res)
 
 
+async def post_manager_task_async(data: MainTask, with_show: bool, long: bool, long_timeout: int, wait: bool, auth: Optional[AUTH], conn_url: Optional[str]=None, *args, **kwargs) -> Union[Alias.Id, AppLogs]:
+    check_profile_mode(data.profileMode)
+    res = await send_to_core_modify_async(MANAGER_TASK(wait and not long), data, with_show=with_show, show_func=show_logs_func, auth=auth, conn_url=conn_url, *args, **kwargs)
+    if wait and long:
+        res = await __get_result(res, timeout=long_timeout, auth=auth)
+    if not wait:
+        return res
+    return AppLogs.model_validate_json(res)
+
+
 def post_manager_task_run(data: RunTask, with_show: bool, long: bool, long_timeout: int, wait: bool, auth: Optional[AUTH], conn_url: Optional[str]=None, *args, **kwargs) -> Optional[Union[Alias.Id, AppLogs]]:
     check_profile_mode(data.profileMode)
     res = send_to_core_modify(MANAGER_TASK_RUN(wait and not long), data, with_show=with_show, show_func=show_logs_func, auth=auth, conn_url=conn_url, *args, **kwargs)
@@ -677,6 +691,17 @@ def post_manager_task_run(data: RunTask, with_show: bool, long: bool, long_timeo
         return AppLogs.model_validate_json(res)
 
 
+async def post_manager_task_run_async(data: RunTask, with_show: bool, long: bool, long_timeout: int, wait: bool, auth: Optional[AUTH], conn_url: Optional[str]=None, *args, **kwargs) -> Optional[Union[Alias.Id, AppLogs]]:
+    check_profile_mode(data.profileMode)
+    res = await send_to_core_modify_async(MANAGER_TASK_RUN(wait and not long), data, with_show=with_show, show_func=show_logs_func, auth=auth, conn_url=conn_url, *args, **kwargs)
+    if wait and long:
+        res = await __get_result(res, timeout=long_timeout, auth=auth)
+    if data.withLogs or data.schedule is not None:
+        if not wait:
+            return res
+        return AppLogs.model_validate_json(res)
+
+
 def post_manager_pipeline(data: MainPipeline, with_show: bool, long: bool, long_timeout: int, return_response: bool, wait: bool, auth: Optional[AUTH], conn_url: Optional[str]=None, *args, **kwargs) -> Union[Alias.Id, AppLogs]:
     check_profile_mode(data.profileMode)
     res = send_to_core_modify(MANAGER_PIPELINE(wait and not long), data, with_show=with_show, show_func=show_logs_func, return_response=return_response, auth=auth, conn_url=conn_url, *args, **kwargs)
@@ -689,6 +714,18 @@ def post_manager_pipeline(data: MainPipeline, with_show: bool, long: bool, long_
     return AppLogs.model_validate_json(res)
 
 
+async def post_manager_pipeline_async(data: MainPipeline, with_show: bool, long: bool, long_timeout: int, return_response: bool, wait: bool, auth: Optional[AUTH], conn_url: Optional[str]=None, *args, **kwargs) -> Union[Alias.Id, AppLogs]:
+    check_profile_mode(data.profileMode)
+    res = await send_to_core_modify_async(MANAGER_PIPELINE(wait and not long), data, with_show=with_show, show_func=show_logs_func, return_response=return_response, auth=auth, conn_url=conn_url, *args, **kwargs)
+    if return_response:
+        return res
+    if wait and long:
+        res = await __get_result(res, timeout=long_timeout, auth=auth)
+    if not wait:
+        return res
+    return AppLogs.model_validate_json(res)
+
+
 def post_manager_task_unschedule(data: UnscheduleOperation, with_show: bool, wait: bool, *args, **kwargs) -> Alias.Info:
     return send_to_core_modify(MANAGER_TASK_UNSCHEDULE(wait), data, with_show=with_show, *args, **kwargs)
 
@@ -702,10 +739,23 @@ def post_manager_task_stop(data: StopOperation, with_show: bool, wait: bool, *ar
         return AppLogs.model_validate_json(res)
 
 
+async def post_manager_task_stop_async(data: StopOperation, with_show: bool, wait: bool, *args, **kwargs) -> Optional[Union[Alias.Id, AppLogs]]:
+    show_func = show_logs_func if data.withLogs else None
+    res = await send_to_core_modify_async(MANAGER_TASK_STOP(wait), data, with_show=with_show, show_func=show_func, *args, **kwargs)
+    if data.withLogs:
+        if not wait:
+            return res
+        return AppLogs.model_validate_json(res)
+
+
 def post_manager_task_stop_all(data: StopOperationMany, wait: bool, *args, **kwargs) -> Alias.Json: # FIXME show
     return send_to_core_modify(MANAGER_TASK_STOP_ALL(wait), data, *args, **kwargs)
 
 
+async def post_manager_task_stop_all_async(data: StopOperationMany, wait: bool, *args, **kwargs) -> Alias.Json: # FIXME show
+    return await send_to_core_modify_async(MANAGER_TASK_STOP_ALL(wait), data, *args, **kwargs)
+
+
 def post_manager_task_resume(data: Operation, wait: bool, *args, **kwargs) -> Alias.Empty:
     return send_to_core_modify(MANAGER_TASK_RESUME(wait), data, *args, **kwargs)
 
@@ -787,7 +837,8 @@ async def __get_result(id: str, is_text: bool = True, check_time: float = LONG_S
     host = Config.HOST_PORT if conn_url is None else conn_url
     assert host is not None, "host port not set"
     if auth is None:
-        auth = aiohttp.BasicAuth(login=Config.CORE_USERNAME, password=Config.CORE_PASSWORD, encoding='utf-8')
+        auth = (Config.CORE_USERNAME, Config.CORE_PASSWORD)
+    auth = aiohttp.BasicAuth(login=auth[0], password=auth[1], encoding='utf-8')
 
     timeout_deadline = None if timeout is None else datetime.datetime.now() + datetime.timedelta(0, timeout)
     while True:
@@ -811,11 +862,18 @@ async def __get_result(id: str, is_text: bool = True, check_time: float = LONG_S
             pass    # recreate ClientSession
 
 
-async def __async_check_response(response: aiohttp.ClientResponse, show_func: Optional[Callable]=None):  # noqa: ANN202
+async def __async_check_response(response: aiohttp.ClientResponse, show_func: Optional[Callable]=None, path: Optional[str] = None):  # noqa: ANN202
     if not response.ok:
         if show_func is None:
-            Config.logger.error(await response.text())
+            if path is not None:
+                text = await response.text()
+                msg = f"failed: {text}" if len(text) > 0 else "failed"
+                Config.logger.error(f"{path} {msg}")
+            else:
+                Config.logger.error(await response.text())
         else:
+            if path is not None:
+                Config.logger.error(f"{path} failed")
             show_func(await response.text(), err=True)
     response.raise_for_status()
 
@@ -849,6 +907,27 @@ def send_to_core_get(path: str, with_auth=True, show_func: Optional[Callable]=No
         return response.content
 
 
+# FIXME copypaste
+async def send_to_core_get_async(path: str, with_auth=True, show_func: Optional[Callable]=None, is_text=False, auth: Optional[AUTH]=None, conn_url: Optional[str]=None, async_session = None) -> Optional[Union[str, bytes]]:
+    host = Config.HOST_PORT if conn_url is None else conn_url
+    assert host is not None, "host port not set"
+    if auth is None or not with_auth:
+        auth = (Config.CORE_USERNAME, Config.CORE_PASSWORD) if with_auth else None
+    if auth is not None:
+        auth = aiohttp.BasicAuth(login=auth[0], password=auth[1], encoding='utf-8')
+    async with async_session or aiohttp.ClientSession(auth=auth, connector=aiohttp.TCPConnector(verify_ssl=False)) as session:
+        async with session.get(f"{host}{path}", headers=HEADERS) as response:
+            await __async_check_response(response, show_func, f"{host}{path}")
+            if response.status == HTTPStatus.NO_CONTENT:
+                return None
+            if is_text is True:
+                return await response.text()
+            elif is_text is False:
+                return await response.json()
+            else:
+                return await response.read()
+
+
 def send_to_core_modify(path: str, operation: Optional[Any] = None, with_auth: bool=True, with_show: Optional[bool]=None, show_func: Optional[Callable]=None, return_response: bool = False, is_post: bool=True, auth: Optional[AUTH]=None, conn_url: Optional[str]=None) -> str:  # noqa: ANN401
     """modify: post by default, else - delete"""
     host = Config.HOST_PORT if conn_url is None else conn_url
@@ -877,6 +956,38 @@ def send_to_core_modify(path: str, operation: Optional[Any] = None, with_auth: b
     return result
 
 
+async def send_to_core_modify_async(path: str, operation: Optional[Any] = None, with_auth: bool=True, with_show: Optional[bool]=None, show_func: Optional[Callable]=None, return_response: bool = False, is_post: bool=True, auth: Optional[AUTH]=None, conn_url: Optional[str]=None, async_session=None) -> str:  # noqa: ANN401
+    """modify: post by default, else - delete"""
+    host = Config.HOST_PORT if conn_url is None else conn_url
+    assert host is not None, "host port not set"
+    if auth is None:
+        auth = (Config.CORE_USERNAME, Config.CORE_PASSWORD)
+    auth = aiohttp.BasicAuth(login=auth[0], password=auth[1], encoding='utf-8')
+    if operation is not None:
+        operation = json.dumps(operation.model_dump())
+
+    async with async_session or aiohttp.ClientSession(auth=auth if with_auth else None, connector=aiohttp.TCPConnector(verify_ssl=False)) as session:
+        if is_post:
+            response_cm = session.post(f"{host}{path}", data=operation, headers=HEADERS)
+        else:
+            response_cm = session.delete(f"{host}{path}", data=operation, headers=HEADERS)
+        async with response_cm as response:
+            if return_response:
+                return response
+            await __async_check_response(response, show_func, f"{host}{path}")
+            if response.status == HTTPStatus.NO_CONTENT:
+                return ""
+            result = await response.text()
+    if with_show is None:
+        with_show = Config.VERBOSE
+    if with_show:
+        if show_func is None:
+            Config.logger.info(result)
+        else:
+            show_func(result)
+    return result
+
+
 def send_to_core_modify_raw(path: str, data: bytes, with_auth: bool=True, with_show: Optional[bool]=None, show_func: Optional[Callable]=None, is_post: bool=True, auth: Optional[AUTH]=None, conn_url: Optional[str]=None) -> str:  # noqa: ANN401
     """modify: post by default, else - delete"""
     host = Config.HOST_PORT if conn_url is None else conn_url
@@ -901,11 +1012,41 @@ def send_to_core_modify_raw(path: str, data: bytes, with_auth: bool=True, with_s
     return result
 
 
+async def send_to_core_modify_raw_async(path: str, data: bytes, with_auth: bool=True, with_show: Optional[bool]=None, show_func: Optional[Callable]=None, is_post: bool=True, auth: Optional[AUTH]=None, conn_url: Optional[str]=None, async_session=None) -> str:  # noqa: ANN401
+    """modify: post by default, else - delete"""
+    host = Config.HOST_PORT if conn_url is None else conn_url
+    assert host is not None, "host port not set"
+    if auth is None:
+        auth = (Config.CORE_USERNAME, Config.CORE_PASSWORD)
+    auth = aiohttp.BasicAuth(login=auth[0], password=auth[1], encoding='utf-8')
+
+    async with async_session or aiohttp.ClientSession(auth=auth if with_auth else None, connector=aiohttp.TCPConnector(verify_ssl=False)) as session:
+        if is_post:
+            response_cm = session.post(f"{host}{path}", data=data, headers=HEADERS_RAW)
+        else:
+            response_cm = session.delete(f"{host}{path}", data=data, headers=HEADERS_RAW)
+        async with response_cm as response:
+            await __async_check_response(response, show_func, f"{host}{path}")
+            if response.status == HTTPStatus.NO_CONTENT:
+                return ""
+            result = await response.text()
+    if with_show is None:
+        with_show = Config.VERBOSE
+    if with_show:
+        if show_func is None:
+            Config.logger.info(result)
+        else:
+            show_func(result)
+    return result
+
+
 async def send_to_core_post_async(path: str, operation: Optional[str] = None, with_auth=True, with_show=True, show_func: Optional[Callable]=None, auth: Optional[AUTH]=None, conn_url: Optional[str]=None) -> str:
     host = Config.HOST_PORT if conn_url is None else conn_url
     assert host is not None, "host port not set"
     if auth is None or not with_auth:
-        auth = aiohttp.BasicAuth(login=Config.CORE_USERNAME, password=Config.CORE_PASSWORD, encoding='utf-8') if with_auth else None
+        auth = (Config.CORE_USERNAME, Config.CORE_PASSWORD) if with_auth else None
+    if auth is not None:
+        auth = aiohttp.BasicAuth(login=auth[0], password=auth[1], encoding='utf-8') 
     if operation is not None:
         operation = json.dumps(operation.model_dump())
 

{malevich_coretools-0.3.36 → malevich_coretools-0.3.38}/malevich_coretools/utils.py

@@ -165,7 +165,7 @@ def get_doc_by_name(
 
 def create_doc(
     data: Union[Alias.Json, Dict, Type[BaseModel]],
-    name: Optional[str],
+    name: Optional[str] = None,
     wait: bool = True,
     *,
     auth: Optional[AUTH] = None,
@@ -1222,13 +1222,17 @@ def check_auth(
 def ping(
     conn_url: Optional[str] = None,
     batcher: Optional[Batcher] = None,
+    is_async: bool = False,
 ) -> Alias.Info:
     """return `pong` """
     if batcher is None:
         batcher = Config.BATCHER
     if batcher is not None:
         return batcher.add("ping")
-    return f.get_ping(with_auth=False, conn_url=conn_url)
+    if is_async:
+        return f.get_ping_async(with_auth=False, conn_url=conn_url)
+    else:
+        return f.get_ping(with_auth=False, conn_url=conn_url)
 
 # UserShare
 
@@ -2659,6 +2663,7 @@ def task_full(
     auth: Optional[AUTH] = None,
     conn_url: Optional[str] = None,
     batcher: Optional[Batcher] = None,
+    is_async: bool = False,
 ) -> Union[Alias.Id, AppLogs]:
     """prepare, run and stop task by `task_id`, `cfg_id` and other
 
@@ -2711,15 +2716,26 @@ def task_full(
     )
     if batcher is not None:
         return batcher.add("sendTask", data=data, result_model=AppLogs)
-    return f.post_manager_task(
-        data,
-        with_show=with_show,
-        long=long,
-        long_timeout=long_timeout,
-        wait=wait,
-        auth=auth,
-        conn_url=conn_url,
-    )
+    if is_async:
+        return f.post_manager_task_async(
+            data,
+            with_show=with_show,
+            long=long,
+            long_timeout=long_timeout,
+            wait=wait,
+            auth=auth,
+            conn_url=conn_url,
+        )
+    else:
+        return f.post_manager_task(
+            data,
+            with_show=with_show,
+            long=long,
+            long_timeout=long_timeout,
+            wait=wait,
+            auth=auth,
+            conn_url=conn_url,
+        )
 
 
 def task_prepare(
@@ -2748,6 +2764,7 @@ def task_prepare(
     auth: Optional[AUTH] = None,
     conn_url: Optional[str] = None,
     batcher: Optional[Batcher] = None,
+    is_async: bool = False,
 ) -> Union[Alias.Id, AppLogs]:
     """prepare task by `task_id`, `cfg_id` and other, return `operation_id`
 
@@ -2813,15 +2830,26 @@ def task_prepare(
     )
     if batcher is not None:
         return batcher.add("sendTask", data=data, result_model=AppLogs)
-    return f.post_manager_task(
-        data,
-        with_show=with_show,
-        long=long,
-        long_timeout=long_timeout,
-        wait=wait,
-        auth=auth,
-        conn_url=conn_url,
-    )
+    if is_async:
+        return f.post_manager_task_async(
+            data,
+            with_show=with_show,
+            long=long,
+            long_timeout=long_timeout,
+            wait=wait,
+            auth=auth,
+            conn_url=conn_url,
+        )
+    else:
+        return f.post_manager_task(
+            data,
+            with_show=with_show,
+            long=long,
+            long_timeout=long_timeout,
+            wait=wait,
+            auth=auth,
+            conn_url=conn_url,
+        )
 
 
 def task_run(
@@ -2842,6 +2870,7 @@ def task_run(
     auth: Optional[AUTH] = None,
     conn_url: Optional[str] = None,
     batcher: Optional[Batcher] = None,
+    is_async: bool = False,
 ) -> Optional[Union[Alias.Id, AppLogs]]:
     """run prepared task by `operation_id` with `cfg_id` and other overridden parameters
 
@@ -2879,15 +2908,26 @@ def task_run(
     )
     if batcher is not None:
         return batcher.add("sendTaskRun", data=data, result_model=AppLogs if with_logs or schedule is not None else None)
-    return f.post_manager_task_run(
-        data,
-        with_show=with_show,
-        long=long,
-        long_timeout=long_timeout,
-        wait=wait,
-        auth=auth,
-        conn_url=conn_url,
-    )
+    if is_async:
+        return f.post_manager_task_run_async(
+            data,
+            with_show=with_show,
+            long=long,
+            long_timeout=long_timeout,
+            wait=wait,
+            auth=auth,
+            conn_url=conn_url,
+        )
+    else:
+        return f.post_manager_task_run(
+            data,
+            with_show=with_show,
+            long=long,
+            long_timeout=long_timeout,
+            wait=wait,
+            auth=auth,
+            conn_url=conn_url,
+        )
 
 
 def pipeline_full(
@@ -2912,6 +2952,7 @@ def pipeline_full(
     auth: Optional[AUTH] = None,
     conn_url: Optional[str] = None,
     batcher: Optional[Batcher] = None,
+    is_async: bool = False,
 ) -> Union[Alias.Id, AppLogs]:
     if batcher is None:
         batcher = Config.BATCHER
@@ -2946,16 +2987,28 @@ def pipeline_full(
     )
     if batcher is not None:
         return batcher.add("sendPipeline", data=data, result_model=AppLogs)
-    return f.post_manager_pipeline(
-        data,
-        with_show=with_show,
-        long=long,
-        long_timeout=long_timeout,
-        return_response=return_response,
-        wait=wait,
-        auth=auth,
-        conn_url=conn_url,
-    )
+    if is_async:
+        return f.post_manager_pipeline_async(
+            data,
+            with_show=with_show,
+            long=long,
+            long_timeout=long_timeout,
+            return_response=return_response,
+            wait=wait,
+            auth=auth,
+            conn_url=conn_url,
+        )
+    else:
+        return f.post_manager_pipeline(
+            data,
+            with_show=with_show,
+            long=long,
+            long_timeout=long_timeout,
+            return_response=return_response,
+            wait=wait,
+            auth=auth,
+            conn_url=conn_url,
+        )
 
 
 def pipeline_prepare(
@@ -2980,11 +3033,13 @@ def pipeline_prepare(
     with_show: bool = True,
     long: bool = False,
     long_timeout: Optional[int] = WAIT_RESULT_TIMEOUT,
+    return_response: bool = False,
     wait: bool = True,
     *,
     auth: Optional[AUTH] = None,
     conn_url: Optional[str] = None,
     batcher: Optional[Batcher] = None,
+    is_async: bool = False,
 ) -> Union[Alias.Id, AppLogs]:
     if batcher is None:
         batcher = Config.BATCHER
@@ -3019,15 +3074,28 @@ def pipeline_prepare(
     )
     if batcher is not None:
         return batcher.add("sendPipeline", data=data, result_model=AppLogs)
-    return f.post_manager_pipeline(
-        data,
-        with_show=with_show,
-        long=long,
-        long_timeout=long_timeout,
-        wait=wait,
-        auth=auth,
-        conn_url=conn_url,
-    )
+    if is_async:
+        return f.post_manager_pipeline_async(
+            data,
+            with_show=with_show,
+            long=long,
+            long_timeout=long_timeout,
+            return_response=return_response,
+            wait=wait,
+            auth=auth,
+            conn_url=conn_url,
+        )
+    else:
+        return f.post_manager_pipeline(
+            data,
+            with_show=with_show,
+            long=long,
+            long_timeout=long_timeout,
+            return_response=return_response,
+            wait=wait,
+            auth=auth,
+            conn_url=conn_url,
+        )
 
 
 def task_unschedule(
@@ -3060,6 +3128,7 @@ def task_stop(
     auth: Optional[AUTH] = None,
     conn_url: Optional[str] = None,
     batcher: Optional[Batcher] = None,
+    is_async: bool = False,
 ) -> Optional[Union[Alias.Id, AppLogs]]:
     """stop task by `operation_id`
 
@@ -3077,9 +3146,14 @@ def task_stop(
     data = StopOperation(operationId=operation_id, withLogs=with_logs, infoUrl=info_url)
     if batcher is not None:
         return batcher.add("sendTaskStop", data=data, result_model=AppLogs if with_logs else None)
-    return f.post_manager_task_stop(
-        data, with_show=with_show, wait=wait, auth=auth, conn_url=conn_url
-    )
+    if is_async:
+        return f.post_manager_task_stop_async(
+            data, with_show=with_show, wait=wait, auth=auth, conn_url=conn_url
+        )
+    else:
+        return f.post_manager_task_stop(
+            data, with_show=with_show, wait=wait, auth=auth, conn_url=conn_url
+        )
 
 
 def task_stop_all(
@@ -3091,6 +3165,7 @@ def task_stop_all(
     auth: Optional[AUTH] = None,
     conn_url: Optional[str] = None,
     batcher: Optional[Batcher] = None,
+    is_async: bool = False,
 ) -> Alias.Json:
     """stop all tasks"""
     if batcher is None:
@@ -3098,9 +3173,14 @@ def task_stop_all(
     data = StopOperationMany(withLogs=with_logs, infoUrl=info_url)
     if batcher is not None:
         return batcher.add("sendTaskStopAll", data=data, result_model=AppLogs if with_logs else None)
-    return f.post_manager_task_stop_all(
-        data, with_show=with_show, wait=wait, auth=auth, conn_url=conn_url
-    )
+    if is_async:
+        return f.post_manager_task_stop_all_async(
+            data, with_show=with_show, wait=wait, auth=auth, conn_url=conn_url
+        )
+    else:
+        return f.post_manager_task_stop_all(
+            data, with_show=with_show, wait=wait, auth=auth, conn_url=conn_url
+        )
 
 
 def task_resume(

{malevich_coretools-0.3.36 → malevich_coretools-0.3.38/malevich_coretools.egg-info}/PKG-INFO

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

malevich_coretools-0.3.36/VERSION

@@ -1 +0,0 @@
-0.3.36