malevich-coretools 0.3.65__tar.gz → 0.3.67__tar.gz

{malevich_coretools-0.3.65/malevich_coretools.egg-info → malevich_coretools-0.3.67}/PKG-INFO

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

malevich_coretools-0.3.67/VERSION

@@ -0,0 +1 @@
+0.3.67

{malevich_coretools-0.3.65 → malevich_coretools-0.3.67}/malevich_coretools/abstract/abstract.py

@@ -400,6 +400,7 @@ class PipelineRunInfo(BaseModel):
 
 class AppLogs(BaseModel):
     operationId: Alias.Id
+    runId: Optional[Alias.Id] = None
     dagLogs: str = ""
     data: Dict[str, AppLog] = {}
     error: Optional[str] = None

{malevich_coretools-0.3.65 → malevich_coretools-0.3.67}/malevich_coretools/abstract/pipeline.py

@@ -27,6 +27,14 @@ from malevich_coretools.abstract.operations import (
 )
 
 
+def _validation_common(arg: 'BaseArgument', other_k = 0) -> None:
+    k = (arg.id is not None) + (arg.collectionName is not None) + (arg.collectionId is not None) + other_k
+    if k == 0:
+        raise ValueError("argument construction requires exactly one parameter, got none")
+    if k > 1:
+        raise ValueError("argument construction requires exactly one parameter, multiple provided")
+
+
 class PullCollectionPolicy(IntEnum):
     INIT = 0
     IF_NOT_EXIST = 1
@@ -43,7 +51,7 @@ class BaseArgument(BaseModel):
     collectionId: Optional[str] = None                  # hardcode collection with id (or obj path)
 
     def validation(self) -> None:
-        assert (self.id is not None) + (self.collectionName is not None) + (self.collectionId is not None) == 1, "one way of constructing the argument must be chosen"
+        _validation_common(self)
 
 
 class Argument(BaseArgument):
@@ -52,11 +60,11 @@ class Argument(BaseArgument):
 
     def validation(self) -> None:
         if self.group is not None:
-            assert self.id is None and self.collectionName is None and self.collectionId is None, "one way of constructing the argument must be chosen"
+            _validation_common(self, 1)
             for subarg in self.group:
                 subarg.validation()
         else:
-            assert (self.id is not None) + (self.collectionName is not None) + (self.collectionId is not None) == 1, "one way of constructing the argument must be chosen"
+            _validation_common(self)
 
 
 class AlternativeArgument(BaseArgument):
@@ -65,19 +73,19 @@ class AlternativeArgument(BaseArgument):
 
     def validation(self) -> None:
         if self.group is not None:
-            assert self.id is None and self.collectionName is None and self.collectionId is None, "one way of constructing the argument must be chosen"
+            _validation_common(self, 1)
             for subarg in self.group:
                 subarg.validation()
         elif self.alternative is not None:
             for alt_arg in self.alternative:
                 if alt_arg.group is not None:
-                    assert alt_arg.id is None and alt_arg.collectionName is None and alt_arg.collectionId is None, "one way of constructing the argument must be chosen"
+                    _validation_common(self, 1)
                     for subarg in alt_arg.group:
                         subarg.validation()
                 else:
-                    assert (self.id is not None) + (self.collectionName is not None) + (self.collectionId is not None) == 1, "one way of constructing the argument must be chosen"
+                    _validation_common(self)
         else:
-            assert (self.id is not None) + (self.collectionName is not None) + (self.collectionId is not None) == 1, "one way of constructing the argument must be chosen"
+            _validation_common(self)
 
 
 class AppEntity(BaseModel):

{malevich_coretools-0.3.65 → malevich_coretools-0.3.67}/malevich_coretools/funcs/funcs.py

@@ -124,12 +124,18 @@ async def get_collections_groupName_async(name: str, operation_id: str, run_id:
     return model_from_json(await send_to_core_get_async(COLLECTIONS_GROUP_NAME(name, operation_id, run_id), *args, **kwargs), ResultCollections)
 
 
-def get_collections_id(id: str, offset: int, limit: int, *args, **kwargs) -> ResultCollection:
-    return model_from_json(send_to_core_get(COLLECTIONS_ID(id, offset, limit), *args, **kwargs), ResultCollection)
+def get_collections_id(id: str, offset: int, limit: int, raw: bool, *args, **kwargs) -> Union[ResultCollection, Alias.Json]:
+    res = send_to_core_get(COLLECTIONS_ID(id, offset, limit, raw), *args, is_text=raw, **kwargs)
+    if not raw:
+        res = model_from_json(res, ResultCollection)
+    return res
 
 
-async def get_collections_id_async(id: str, offset: int, limit: int, *args, **kwargs) -> ResultCollection:
-    return model_from_json(await send_to_core_get_async(COLLECTIONS_ID(id, offset, limit), *args, **kwargs), ResultCollection)
+async def get_collections_id_async(id: str, offset: int, limit: int, raw: bool, *args, **kwargs) -> Union[ResultCollection, Alias.Json]:
+    res = await send_to_core_get_async(COLLECTIONS_ID(id, offset, limit, raw), *args, is_text=raw, **kwargs)
+    if not raw:
+        res = model_from_json(res, ResultCollection)
+    return res
 
 
 def post_collections(data: DocsCollection, wait: bool, *args, **kwargs) -> Alias.Id:
@@ -1280,26 +1286,24 @@ async def post_manager_task_async(data: MainTask, with_show: bool, long: bool, l
     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]]:
+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) -> 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)
     if wait and long:
         res = asyncio.run(__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)
+    if not wait:
+        return res
+    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]]:
+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) -> 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)
+    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]:

{malevich_coretools-0.3.65 → malevich_coretools-0.3.67}/malevich_coretools/secondary/const.py

@@ -50,7 +50,7 @@ COLLECTIONS_IDS_NAME = lambda name, operation_id, run_id: with_key_values(f"{COL
 COLLECTIONS_NAME = lambda name, operation_id, run_id, offset, limit: with_key_values(f"{COLLECTIONS_MAIN}/name/{urllib.parse.quote(str(name), safe='')}", {"operationId": operation_id, "runId": run_id, "offset": offset, "limit": limit})
 COLLECTIONS_IDS_GROUP_NAME = lambda name, operation_id, run_id: with_key_values(f"{COLLECTIONS_MAIN}/ids/groupName/{urllib.parse.quote(str(name), safe='')}", {"operationId": operation_id, "runId": run_id})
 COLLECTIONS_GROUP_NAME = lambda name, operation_id, run_id: with_key_values(f"{COLLECTIONS_MAIN}/groupName/{urllib.parse.quote(str(name), safe='')}", {"operationId": operation_id, "runId": run_id})
-COLLECTIONS_ID = lambda id, offset, limit: with_key_values(f"{COLLECTIONS_MAIN}/{urllib.parse.quote(str(id), safe='')}", {"offset": offset, "limit": limit})
+COLLECTIONS_ID = lambda id, offset, limit, raw: with_key_values(f"{COLLECTIONS_MAIN}/{urllib.parse.quote(str(id), safe='')}", {"offset": offset, "limit": limit, "raw": raw})
 COLLECTIONS_ID_MODIFY = lambda id, wait: with_wait(f"{COLLECTIONS_MAIN}/{urllib.parse.quote(str(id), safe='')}", wait)
 COLLECTIONS_ID_S3 = lambda id, wait: with_wait(f"{COLLECTIONS_MAIN}/s3/{urllib.parse.quote(str(id), safe='')}", wait)
 COLLECTIONS_ID_ADD = lambda id, wait: with_wait(f"{COLLECTIONS_MAIN}/{urllib.parse.quote(str(id), safe='')}/add", wait)

{malevich_coretools-0.3.65 → malevich_coretools-0.3.67}/malevich_coretools/utils.py

@@ -609,6 +609,7 @@ def get_collection(
     auth: Optional[AUTH] = None,
     conn_url: Optional[str] = None,
     batcher: Optional[Batcher] = None,
+    raw: Literal[False] = False,
     is_async: Literal[False] = False,
 ) -> ResultCollection:
     pass
@@ -623,11 +624,13 @@ def get_collection(
     auth: Optional[AUTH] = None,
     conn_url: Optional[str] = None,
     batcher: Optional[Batcher] = None,
+    raw: Literal[False] = False,
     is_async: Literal[True],
 ) -> Coroutine[Any, Any, ResultCollection]:
     pass
 
 
+@overload
 def get_collection(
     id: str,
     offset: int = 0,
@@ -636,16 +639,47 @@ def get_collection(
     auth: Optional[AUTH] = None,
     conn_url: Optional[str] = None,
     batcher: Optional[Batcher] = None,
+    raw: Literal[True],
+    is_async: Literal[False] = False,
+) -> Alias.Json:
+    pass
+
+
+@overload
+def get_collection(
+    id: str,
+    offset: int = 0,
+    limit: int = -1,
+    *,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+    batcher: Optional[Batcher] = None,
+    raw: Literal[True],
+    is_async: Literal[True],
+) -> Coroutine[Any, Any, Alias.Json]:
+    pass
+
+
+def get_collection(
+    id: str,
+    offset: int = 0,
+    limit: int = -1,
+    *,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+    batcher: Optional[Batcher] = None,
+    raw: bool = False,
     is_async: bool = False,
-) -> Union[ResultCollection, Coroutine[Any, Any, ResultCollection]]:
+) -> Union[ResultCollection, Alias.Json, Coroutine[Any, Any, ResultCollection], Coroutine[Any, Any, Alias.Json]]:
     """return collection by `id`, pagination: unlimited - `limit` < 0"""
     if batcher is None:
         batcher = Config.BATCHER
     if batcher is not None:
-        return batcher.add("getCollectionById", vars={"id": id, "offset": offset, "limit": limit}, result_model=ResultCollection)
+        result_model = None if raw else ResultCollection
+        return batcher.add("getCollectionById", vars={"id": id, "offset": offset, "limit": limit, "raw": raw}, result_model=result_model)
     if is_async:
-        return f.get_collections_id_async(id, offset, limit, auth=auth, conn_url=conn_url)
-    return f.get_collections_id(id, offset, limit, auth=auth, conn_url=conn_url)
+        return f.get_collections_id_async(id, offset, limit, raw, auth=auth, conn_url=conn_url)
+    return f.get_collections_id(id, offset, limit, raw, auth=auth, conn_url=conn_url)
 
 
 @overload
@@ -7161,7 +7195,7 @@ def task_run(
     conn_url: Optional[str] = None,
     batcher: Optional[Batcher] = None,
     is_async: Literal[False] = False,
-) -> Optional[Union[Alias.Id, AppLogs]]:
+) -> Union[Alias.Id, AppLogs]:
     pass
 
 
@@ -7186,7 +7220,7 @@ def task_run(
     conn_url: Optional[str] = None,
     batcher: Optional[Batcher] = None,
     is_async: Literal[True],
-) -> Coroutine[Any, Any, Optional[Union[Alias.Id, AppLogs]]]:
+) -> Coroutine[Any, Any, Union[Alias.Id, AppLogs]]:
     pass
 
 
@@ -7210,7 +7244,7 @@ def task_run(
     conn_url: Optional[str] = None,
     batcher: Optional[Batcher] = None,
     is_async: bool = False,
-) -> Union[Optional[Union[Alias.Id, AppLogs]], Coroutine[Any, Any, Optional[Union[Alias.Id, AppLogs]]]]:
+) -> Union[Union[Alias.Id, AppLogs], Coroutine[Any, Any, Union[Alias.Id, AppLogs]]]:
     """run prepared task by `operation_id` with `cfg_id` and other overridden parameters
 
     Args:

{malevich_coretools-0.3.65 → malevich_coretools-0.3.67/malevich_coretools.egg-info}/PKG-INFO

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

malevich_coretools-0.3.65/VERSION

@@ -1 +0,0 @@
-0.3.65