malevich-coretools 0.3.42__py3-none-any.whl → 0.3.44__py3-none-any.whl

malevich_coretools/funcs/helpers.py

@@ -23,7 +23,9 @@ from malevich_coretools.batch import Batcher
 from malevich_coretools.funcs.checks import check_profile_mode
 from malevich_coretools.funcs.funcs import (
     post_collections_data,
+    post_collections_data_async,
     post_collections_data_id,
+    post_collections_data_id_async,
 )
 from malevich_coretools.secondary import Config, to_json
 
@@ -98,6 +100,7 @@ def create_collection_from_df(
     name: Optional[str],
     metadata: Optional[Union[Dict[str, Any], str]],
     batcher: Optional[Batcher] = None,
+    is_async: bool = False,
     *args,
     **kwargs
 ) -> Alias.Id:
@@ -106,6 +109,8 @@ def create_collection_from_df(
     data = raw_collection_from_df(data, name, metadata)
     if batcher is not None:
         return batcher.add("postCollectionByDocs", data=data)
+    if is_async:
+        return post_collections_data_async(data, *args, **kwargs)
     return post_collections_data(data, *args, **kwargs)
 
 
@@ -115,6 +120,7 @@ def update_collection_from_df(
     name: Optional[str],
     metadata: Optional[Union[Dict[str, Any], str]],
     batcher: Optional[Batcher] = None,
+    is_async: bool = False,
     *args,
     **kwargs
 ) -> Alias.Id:
@@ -123,6 +129,8 @@ def update_collection_from_df(
     data = raw_collection_from_df(data, name, metadata)
     if batcher is not None:
         return batcher.add("postCollectionByDocsAndId", data=data, vars={"id": id})
+    if is_async:
+        return post_collections_data_id_async(id, data, *args, **kwargs)
     return post_collections_data_id(id, data, *args, **kwargs)
 
 

malevich_coretools/secondary/const.py

@@ -30,6 +30,8 @@ def with_key_values(url: str, key_values: Dict[str, Optional[str]]) -> str:
                 value = urllib.parse.quote(str(value), safe='')
             elif isinstance(value, str):
                 value = urllib.parse.quote(value, safe='')
+            elif isinstance(value, bool):
+                value = bool_to_str(value)
             url = f"{url}{sep}{key}={value}"
             if sep == "?":
                 sep = "&"
@@ -216,6 +218,13 @@ WS_APPS = lambda only_active, full: with_key_values(f"{WS_APPS_MAIN}/", {"onlyAc
 WS_APPS_ = lambda only_not_active, wait: with_key_values(f"{WS_APPS_MAIN}/", {"onlyNotActive": only_not_active, "wait": wait})
 WS_APPS_ID = lambda id, wait: with_wait(f"{WS_APPS_MAIN}/{id}", wait)
 
+## McpToolController
+MCP_TOOLS_MAIN = f"{API_VERSION}/tools"
+MCP_TOOLS = lambda id, name, wait: with_key_values(f"{MCP_TOOLS_MAIN}/", {"id": id, "name": name, "wait": wait})
+MCP_TOOLS_ALL = lambda wait: with_wait(f"{MCP_TOOLS_MAIN}/all", wait)
+MCP_TOOLS_LIST = f"{MCP_TOOLS_MAIN}/list"
+MCP_TOOLS_CALL = f"{MCP_TOOLS_MAIN}/call"
+
 ### Kafka
 KAFKA_SEND = f"{MANAGER_MAIN}/kafkaMsg"
 

malevich_coretools/secondary/helpers.py

@@ -35,11 +35,17 @@ def to_json(data: Union[Dict[str, Any], Alias.Json], condition_and_msg: Tuple[Ca
     return res
 
 
-def model_from_json(data: Union[Dict[str, Any], Alias.Json], model: BaseModel):  # noqa: ANN201
+def model_from_json(data: Union[Dict[str, Any], Alias.Json], model: BaseModel, is_list: Optional[bool] = False):  # noqa: ANN201
     if isinstance(data, Alias.Json):
         data = json.loads(data)
-    assert isinstance(data, dict), data
-    return model.parse_obj(data)
+    if is_list is None:
+        is_list = isinstance(data, list)
+    if is_list:
+        assert isinstance(data, list), data
+        return [model.model_validate(item) for item in data]
+    else:
+        assert isinstance(data, dict), data
+        return model.model_validate(data)
 
 
 def rand_str(size: int = 10, chars=string.ascii_letters) -> str: