malevich-coretools 0.3.50__tar.gz → 0.3.53__tar.gz

{malevich_coretools-0.3.50/malevich_coretools.egg-info → malevich_coretools-0.3.53}/PKG-INFO

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

malevich_coretools-0.3.53/VERSION

@@ -0,0 +1 @@
+0.3.53

{malevich_coretools-0.3.50 → malevich_coretools-0.3.53}/malevich_coretools/funcs/funcs.py

@@ -7,6 +7,7 @@ from typing import Any, Callable, Optional
 
 import aiohttp
 import requests
+from aiohttp.client_exceptions import ClientResponseError
 from requests.models import Response
 
 from malevich_coretools.abstract.abstract import *  # noqa: F403
@@ -1630,29 +1631,35 @@ async def __get_result(id: str, is_text: bool = True, check_time: float = LONG_S
 
 async def __async_check_response(response: aiohttp.ClientResponse, show_func: Optional[Callable]=None, path: Optional[str] = None):  # noqa: ANN202
     if not response.ok:
+        text = await response.text()
         if show_func is None:
             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())
+                Config.logger.error(text)
         else:
             if path is not None:
                 Config.logger.error(f"{path} failed")
-            show_func(await response.text(), err=True)
+            show_func(text, err=True)
+
+        if response.reason is not None and len(response.reason) == 0:
+            response.reason = text
     response.raise_for_status()
 
 
 def __check_response(path: str, response: Response, show_func: Optional[Callable]=None):  # noqa: ANN202
     if response.status_code >= 400:
+        text = response.text
         if show_func is None:
-            text = response.text
             msg = f"failed: {text}" if len(text) > 0 else "failed"
             Config.logger.error(f"{path} {msg}")
         else:
             Config.logger.error(f"{path} failed")
-            show_func(response.text, err=True)
+            show_func(text, err=True)
+
+        if response.reason is not None and len(response.reason) == 0:
+            response.reason = text
     response.raise_for_status()
 
 

{malevich_coretools-0.3.50 → malevich_coretools-0.3.53}/malevich_coretools/funcs/helpers.py

@@ -1,5 +1,5 @@
 import json
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, Coroutine, Dict, List, Literal, Optional, Union, overload
 from uuid import uuid4
 
 import pandas as pd
@@ -32,37 +32,89 @@ from malevich_coretools.secondary import Config, to_json
 __all__ = ["create_collection_from_file_df", "update_collection_from_file_df", "raw_collection_from_df", "raw_collection_from_file", "create_collection_from_df", "update_collection_from_df", "create_app_settings", "create_user_config", "create_task_component", "create_task_policy", "create_restrictions", "create_run_settings", "create_endpoint_override", "create_cfg_struct"]
 
 
+@overload
 def create_collection_from_file_df(
     file: str,
     name: Optional[str],
     metadata: Optional[Union[Dict[str, Any], str]],
     *args,
+    is_async: Literal[False] = False,
     **kwargs
 ) -> Alias.Id:
+    pass
+
+
+@overload
+def create_collection_from_file_df(
+    file: str,
+    name: Optional[str],
+    metadata: Optional[Union[Dict[str, Any], str]],
+    *args,
+    is_async: Literal[True],
+    **kwargs
+) -> Coroutine[Any, Any, Alias.Id]:
+    pass
+
+
+def create_collection_from_file_df(
+    file: str,
+    name: Optional[str],
+    metadata: Optional[Union[Dict[str, Any], str]],
+    *args,
+    is_async: bool = False,
+    **kwargs
+) -> Union[Alias.Id, Coroutine[Any, Any, Alias.Id]]:
     try:
         data = pd.read_csv(file)
     except pd.errors.EmptyDataError:
         data = pd.DataFrame()
     if name is None:
         name = file
-    return create_collection_from_df(data, name=file, metadata=metadata, *args, **kwargs)
+    return create_collection_from_df(data, name=file, metadata=metadata, *args, is_async=is_async, **kwargs)
 
 
+@overload
 def update_collection_from_file_df(
     id: str,
     file: str,
     name: Optional[str],
     metadata: Optional[Union[Dict[str, Any], str]],
     *args,
+    is_async: Literal[False] = False,
     **kwargs
 ) -> Alias.Id:
+    pass
+
+
+@overload
+def update_collection_from_file_df(
+    id: str,
+    file: str,
+    name: Optional[str],
+    metadata: Optional[Union[Dict[str, Any], str]],
+    *args,
+    is_async: Literal[True],
+    **kwargs
+) -> Coroutine[Any, Any, Alias.Id]:
+    pass
+
+
+def update_collection_from_file_df(
+    id: str,
+    file: str,
+    name: Optional[str],
+    metadata: Optional[Union[Dict[str, Any], str]],
+    *args,
+    is_async: bool = False,
+    **kwargs
+) -> Union[Alias.Id, Coroutine[Any, Any, Alias.Id]]:
     try:
         data = pd.read_csv(file)
     except pd.errors.EmptyDataError:
         data = pd.DataFrame()
     if name is None:
         name = file
-    return update_collection_from_df(id, data, name=file, metadata=metadata, *args, **kwargs)
+    return update_collection_from_df(id, data, name=file, metadata=metadata, *args, is_async=is_async, **kwargs)
 
 
 def raw_collection_from_df(
@@ -95,15 +147,41 @@ def raw_collection_from_file(
     return raw_collection_from_df(data, name, metadata)
 
 
+@overload
 def create_collection_from_df(
     data: pd.DataFrame,
     name: Optional[str],
     metadata: Optional[Union[Dict[str, Any], str]],
     batcher: Optional[Batcher] = None,
-    is_async: bool = False,
     *args,
+    is_async: Literal[False] = False,
     **kwargs
 ) -> Alias.Id:
+    pass
+
+
+@overload
+def create_collection_from_df(
+    data: pd.DataFrame,
+    name: Optional[str],
+    metadata: Optional[Union[Dict[str, Any], str]],
+    batcher: Optional[Batcher] = None,
+    *args,
+    is_async: Literal[True],
+    **kwargs
+) -> Coroutine[Any, Any, Alias.Id]:
+    pass
+
+
+def create_collection_from_df(
+    data: pd.DataFrame,
+    name: Optional[str],
+    metadata: Optional[Union[Dict[str, Any], str]],
+    batcher: Optional[Batcher] = None,
+    *args,
+    is_async: bool = False,
+    **kwargs
+) -> Union[Alias.Id, Coroutine[Any, Any, Alias.Id]]:
     if batcher is None:
         batcher = Config.BATCHER
     data = raw_collection_from_df(data, name, metadata)
@@ -114,16 +192,44 @@ def create_collection_from_df(
     return post_collections_data(data, *args, **kwargs)
 
 
+@overload
 def update_collection_from_df(
     id: str,
     data: pd.DataFrame,
     name: Optional[str],
     metadata: Optional[Union[Dict[str, Any], str]],
     batcher: Optional[Batcher] = None,
-    is_async: bool = False,
     *args,
+    is_async: Literal[False] = False,
     **kwargs
 ) -> Alias.Id:
+    pass
+
+
+@overload
+def update_collection_from_df(
+    id: str,
+    data: pd.DataFrame,
+    name: Optional[str],
+    metadata: Optional[Union[Dict[str, Any], str]],
+    batcher: Optional[Batcher] = None,
+    *args,
+    is_async: Literal[True],
+    **kwargs
+) -> Coroutine[Any, Any, Alias.Id]:
+    pass
+
+
+def update_collection_from_df(
+    id: str,
+    data: pd.DataFrame,
+    name: Optional[str],
+    metadata: Optional[Union[Dict[str, Any], str]],
+    batcher: Optional[Batcher] = None,
+    *args,
+    is_async: bool = False,
+    **kwargs
+) -> Union[Alias.Id, Coroutine[Any, Any, Alias.Id]]:
     if batcher is None:
         batcher = Config.BATCHER
     data = raw_collection_from_df(data, name, metadata)