malevich-coretools 0.2.9__tar.gz → 0.2.11__tar.gz

{malevich-coretools-0.2.9/malevich_coretools.egg-info → malevich-coretools-0.2.11}/PKG-INFO

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

malevich-coretools-0.2.11/VERSION

@@ -0,0 +1 @@
+0.2.11

{malevich-coretools-0.2.9 → malevich-coretools-0.2.11}/malevich_coretools/abstract/abstract.py

@@ -211,6 +211,11 @@ class ResultIds(BaseModel):
     ids: List[Alias.Id]
 
 
+class FilesDirs(BaseModel):
+    files: List[str]
+    directories: List[str]
+
+
 class ResultDoc(BaseModel):
     data: Alias.Json
     name: str
@@ -424,5 +429,5 @@ class OperationOrNone(BaseModel):
 
 
 class AdminStopOperation(BaseModel):
-    operationId: Optional[Alias.Id]
+    operationId: Optional[Alias.Id] = None
     withLogs: bool

{malevich-coretools-0.2.9 → malevich-coretools-0.2.11}/malevich_coretools/admin/utils.py

@@ -17,8 +17,8 @@ def admin_get_run_info(
     auth: Optional[AUTH] = None,
     conn_url: Optional[str] = None,
 ) -> Alias.Info:
-    """return run info by operation \"id\""""
-    data = OperationOrNone(id)
+    """return run info by operation `id`"""
+    data = OperationOrNone(operationId=id)
     return f.get_admin_runs_info(data, auth=auth, conn_url=conn_url)
 
 
@@ -39,7 +39,7 @@ def admin_delete_run(
     auth: Optional[AUTH] = None,
     conn_url: Optional[str] = None,
 ) -> Alias.Json:
-    """delete run by operation \"id\""""
+    """delete run by operation `id`"""
     data = AdminStopOperation(operationId=id, withLogs=withLogs)
     return f.delete_admin_runs(data, auth=auth, conn_url=conn_url)
 
@@ -51,5 +51,5 @@ def admin_delete_runs(
     conn_url: Optional[str] = None,
 ) -> Alias.Json:
     """delete all runs"""
-    data = AdminStopOperation(operationId=None, withLogs=withLogs)
+    data = AdminStopOperation(withLogs=withLogs)
     return f.delete_admin_runs(data, auth=auth, conn_url=conn_url)

{malevich-coretools-0.2.9 → malevich-coretools-0.2.11}/malevich_coretools/funcs/funcs.py

@@ -121,6 +121,29 @@ def delete_collections_id_s3(key: str, wait: bool, *args, **kwargs) -> Alias.Inf
 def delete_collections_id_del(id: str, data: DocsCollectionChange, wait: bool, *args, **kwargs) -> Alias.Info:
     return send_to_core_modify(COLLECTIONS_ID_DEL(id, wait), data, *args, **kwargs, is_post=False)
 
+# CollectionObjectsController
+
+
+def get_collection_objects(path: Optional[str], recursive: Optional[str], *args, **kwargs) -> FilesDirs:
+    return model_from_json(send_to_core_get(COLLECTION_OBJECTS_ALL_GET(path, recursive), *args, **kwargs), FilesDirs)
+
+
+def get_collection_object(path: str, *args, **kwargs) -> bytes:
+    return send_to_core_get(COLLECTION_OBJECTS_PATH(path, None), is_text=None, *args, **kwargs)
+
+
+def post_collections_object(path: str, data: bytes, wait: bool, *args, **kwargs) -> Alias.Info:
+    return send_to_core_modify_raw(COLLECTION_OBJECTS_PATH(path, wait), data, *args, **kwargs)
+
+
+def delete_collection_objects(wait: bool, *args, **kwargs) -> Alias.Info:
+    return send_to_core_modify(COLLECTION_OBJECTS_ALL(wait), *args, **kwargs, is_post=False)
+
+
+def delete_collection_object(path: str, wait: bool, *args, **kwargs) -> Alias.Info:
+    return send_to_core_modify(COLLECTION_OBJECTS_PATH(path, wait), *args, **kwargs, is_post=False)
+
+
 # SchemeController
 
 
@@ -599,7 +622,7 @@ def __check_response(path: str, response: Response, show_func: Optional[Callable
     response.raise_for_status()
 
 
-def send_to_core_get(path: str, with_auth=True, show_func: Optional[Callable]=None, is_text=False, auth: Optional[AUTH]=None, conn_url: Optional[str]=None) -> Optional[str]:
+def send_to_core_get(path: str, with_auth=True, show_func: Optional[Callable]=None, is_text=False, auth: Optional[AUTH]=None, conn_url: Optional[str]=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:
@@ -608,10 +631,12 @@ def send_to_core_get(path: str, with_auth=True, show_func: Optional[Callable]=No
     __check_response(f"{host}{path}", response, show_func)
     if response.status_code == HTTPStatus.NO_CONTENT:
         return None
-    if is_text:
+    if is_text is True:
         return response.text
-    else:
+    elif is_text is False:
         return response.json()
+    else:
+        return response.content
 
 
 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, is_post: bool=True, auth: Optional[AUTH]=None, conn_url: Optional[str]=None) -> str:  # noqa: ANN401
@@ -640,6 +665,30 @@ def send_to_core_modify(path: str, operation: Optional[Any] = None, with_auth: b
     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
+    assert host is not None, "host port not set"
+    if auth is None:
+        auth = (Config.CORE_USERNAME, Config.CORE_PASSWORD)
+    if is_post:
+        response = requests.post(f"{host}{path}", data=data, headers=HEADERS_RAW, auth=auth if with_auth else None)
+    else:   # delete
+        response = requests.delete(f"{host}{path}", data=data, headers=HEADERS_RAW, auth=auth if with_auth else None)
+    __check_response(f"{host}{path}", response, show_func=show_func)
+    if response.status_code == HTTPStatus.NO_CONTENT:
+        return ""
+    result = 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"

{malevich-coretools-0.2.9 → malevich-coretools-0.2.11}/malevich_coretools/secondary/const.py

@@ -7,6 +7,7 @@ from malevich_coretools.secondary.helpers import bool_to_str
 # const
 API_VERSION = "api/v1"
 HEADERS = {'Content-type': 'application/json', 'Accept': 'application/json', 'User-Agent': 'malevich user agent'}
+HEADERS_RAW = {'Content-type': 'text/plain; base64', 'Accept': 'application/json', 'User-Agent': 'malevich user agent'}
 SLEEP_TIME = 0.1
 LONG_SLEEP_TIME = 1             # second
 WAIT_RESULT_TIMEOUT = 60 * 60   # hour
@@ -52,6 +53,12 @@ COLLECTIONS_FIX_SCHEME = lambda id, wait: with_wait(f"{COLLECTIONS_MAIN}/{id}/fi
 COLLECTIONS_UNFIX_SCHEME = lambda id, wait: with_wait(f"{COLLECTIONS_MAIN}/{id}/unfixScheme", wait)
 COLLECTIONS_METADATA = lambda id, wait: with_wait(f"{COLLECTIONS_MAIN}/{id}/metadata", wait)
 
+## CollectionObjectsController
+COLLECTION_OBJECTS_MAIN = f"{API_VERSION}/collectionObjects"
+COLLECTION_OBJECTS_ALL_GET = lambda path, recursive: with_key_values(f"{COLLECTION_OBJECTS_MAIN}/all", {"path": path, "recursive": recursive})
+COLLECTION_OBJECTS_ALL = lambda wait: with_wait(f"{COLLECTION_OBJECTS_MAIN}/all", wait)
+COLLECTION_OBJECTS_PATH = lambda path, wait: with_key_values(f"{COLLECTION_OBJECTS_MAIN}/", {"path": path, "wait": None if wait is None else bool_to_str(wait)})
+
 ## SchemeController
 SCHEMES_MAIN = f"{API_VERSION}/schemes"
 SCHEMES = lambda wait: with_wait(f"{SCHEMES_MAIN}/", wait)

{malevich-coretools-0.2.9 → malevich-coretools-0.2.11}/malevich_coretools/secondary/helpers.py

@@ -46,7 +46,7 @@ def __show_logs_result(res: LogsResult):  # noqa: ANN202
         print(res.data)
     for run_id, logs in res.logs.items():
         print(f"------- {run_id}:")
-        userLogs = res.userLogs[run_id]
+        userLogs = res.userLogs.get(run_id, "")
         if len(userLogs) > 0:
             print(userLogs)
             print("-------")

{malevich-coretools-0.2.9 → malevich-coretools-0.2.11}/malevich_coretools/utils.py

@@ -447,6 +447,60 @@ def delete_from_collection(
     )
 
 
+# CollectionObjects
+
+
+def get_collection_objects(
+    path: Optional[str] = None,
+    recursive: Optional[str] = None,
+    *, auth: Optional[AUTH] = None, conn_url: Optional[str] = None
+) -> FilesDirs:
+    """return struct with list of paths: directories and files: walk if `recursive` else ls"""
+    return f.get_collection_objects(path, recursive, auth=auth, conn_url=conn_url)
+
+
+def get_collection_object(
+    path: str,
+    *,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+) -> bytes:
+    """return collection object bytes by `path`"""
+    return f.get_collection_object(
+        path, auth=auth, conn_url=conn_url
+    )
+
+
+def update_collection_object(
+    path: str,
+    data: bytes,
+    wait: bool = True,
+    *,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+) -> Alias.Info:
+    """update collection object with `path` by `data` """
+    return f.post_collections_object(path, data, wait=wait, auth=auth, conn_url=conn_url)
+
+
+def delete_collection_objects(
+    wait: bool = True, *, auth: Optional[AUTH] = None, conn_url: Optional[str] = None
+) -> Alias.Info:
+    """delete all collection objects"""
+    return f.delete_collection_objects(wait=wait, auth=auth, conn_url=conn_url)
+
+
+def delete_collection_object(
+    path: str,
+    wait: bool = True,
+    *,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+) -> Alias.Info:
+    """delete collection object with `path` (or directory with them) """
+    return f.delete_collection_object(path, wait=wait, auth=auth, conn_url=conn_url)
+
+
 # Scheme
 
 

{malevich-coretools-0.2.9 → malevich-coretools-0.2.11/malevich_coretools.egg-info}/PKG-INFO

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

malevich-coretools-0.2.9/VERSION

@@ -1 +0,0 @@
-0.2.9