malevich-coretools 0.3.20__tar.gz → 0.3.24__tar.gz

{malevich_coretools-0.3.20/malevich_coretools.egg-info → malevich_coretools-0.3.24}/PKG-INFO

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

malevich_coretools-0.3.24/VERSION

@@ -0,0 +1 @@
+0.3.24

{malevich_coretools-0.3.20 → malevich_coretools-0.3.24}/malevich_coretools/abstract/abstract.py

@@ -422,6 +422,11 @@ class ProcessorFunctionInfo(FunctionInfo):
     contextClass: Optional[Dict[str, Any]] = None   # model_json_schema
 
 
+class ConditionFunctionInfo(FunctionInfo):
+    # contextClass: Optional[Dict[str, Any]] = None   # model_json_schema
+    ...
+
+
 class OutputFunctionInfo(FunctionInfo):
     collectionOutNames: Optional[List[str]] = None
 
@@ -438,6 +443,7 @@ class InitInfo(BaseModel):
 class AppFunctionsInfo(BaseModel):
     inputs: Dict[Alias.Id, InputFunctionInfo] = dict()
     processors: Dict[Alias.Id, ProcessorFunctionInfo] = dict()
+    conditions: Dict[Alias.Id, ConditionFunctionInfo] = dict()
     outputs: Dict[Alias.Id, OutputFunctionInfo] = dict()
     schemes: Dict[Alias.Id, str] = dict()
     inits: Dict[Alias.Id, InitInfo] = dict()

{malevich_coretools-0.3.20 → malevich_coretools-0.3.24}/malevich_coretools/funcs/funcs.py

@@ -30,6 +30,10 @@ def get_docs_id(id: str, *args, **kwargs) -> ResultDoc:
     return model_from_json(send_to_core_get(DOCS_ID(id, None), *args, **kwargs), ResultDoc)
 
 
+def get_docs_name(name: str, *args, **kwargs) -> ResultDoc:
+    return model_from_json(send_to_core_get(DOCS_NAME(name, None), *args, **kwargs), ResultDoc)
+
+
 def post_docs(data: DocWithName, wait: bool, *args, **kwargs) -> Alias.Id:
     return send_to_core_modify(DOCS(wait), data, *args, **kwargs)
 

{malevich_coretools-0.3.20 → malevich_coretools-0.3.24}/malevich_coretools/funcs/helpers.py

@@ -34,7 +34,10 @@ def create_collection_from_file_df(
     *args,
     **kwargs
 ) -> Alias.Id:
-    data = pd.read_csv(file)
+    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)
@@ -63,7 +66,10 @@ def raw_collection_from_file(
     name: Optional[str] = None,
     metadata: Optional[Union[Dict[str, Any], str]] = None,
 ) -> DocsDataCollection:
-    data = pd.read_csv(file)
+    try:
+        data = pd.read_csv(file)
+    except pd.errors.EmptyDataError:
+        data = pd.DataFrame()
     return raw_collection_from_df(data, name, metadata)
 
 

{malevich_coretools-0.3.20 → malevich_coretools-0.3.24}/malevich_coretools/secondary/const.py

@@ -39,6 +39,7 @@ def with_key_values(url: str, key_values: Dict[str, Optional[str]]) -> str:
 DOCS_MAIN = f"{API_VERSION}/docs"
 DOCS = lambda wait: with_wait(f"{DOCS_MAIN}/", wait)
 DOCS_ID = lambda id, wait: with_wait(f"{DOCS_MAIN}/{id}", wait)
+DOCS_NAME = lambda name, wait: with_wait(f"{DOCS_MAIN}/name/{name}", wait)
 
 ## CollectionsController
 COLLECTIONS_MAIN = f"{API_VERSION}/collections"

{malevich_coretools-0.3.20 → malevich_coretools-0.3.24}/malevich_coretools/utils.py

@@ -2,7 +2,7 @@ import json
 import os
 import re
 import subprocess
-from typing import Union
+from typing import Type, Union
 
 import pandas as pd
 
@@ -148,8 +148,23 @@ def get_doc(
     return f.get_docs_id(id, auth=auth, conn_url=conn_url)
 
 
+def get_doc_by_name(
+    name: str,
+    *,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+    batcher: Optional[Batcher] = None,
+) -> ResultDoc:
+    """return doc by `name` """
+    if batcher is None:
+        batcher = Config.BATCHER
+    if batcher is not None:
+        return batcher.add("getDocByName", vars={"name": name}, result_model=ResultDoc)
+    return f.get_docs_name(name, auth=auth, conn_url=conn_url)
+
+
 def create_doc(
-    data: Alias.Json,
+    data: Union[Alias.Json, Dict, Type[BaseModel]],
     name: Optional[str],
     wait: bool = True,
     *,
@@ -160,6 +175,10 @@ def create_doc(
     """save doc with `data` and `name`, return `id` """
     if batcher is None:
         batcher = Config.BATCHER
+    if isinstance(data, Dict):
+        data = json.dumps(data)
+    elif issubclass(data.__class__, BaseModel):
+        data = data.model_dump_json()
     data = DocWithName(data=data, name=name)
     if batcher is not None:
         return batcher.add("postDoc", data=data)
@@ -3267,6 +3286,23 @@ def get_collection_by_name_to_df(
     return pd.DataFrame.from_records(records)
 
 
+def create_doc_from_file(
+    filename: str,
+    name: Optional[str] = None,
+    *,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+    batcher: Optional[Batcher] = None,
+) -> Alias.Id:
+    """create doc\n
+    return doc id"""
+    with open(filename) as f:
+        data = json.load(f)
+    return create_doc(
+        data, name, auth=auth, conn_url=conn_url, batcher=batcher
+    )
+
+
 def create_schemes_by_path(
     path: str,
     wait: bool = True,

{malevich_coretools-0.3.20 → malevich_coretools-0.3.24/malevich_coretools.egg-info}/PKG-INFO

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

malevich_coretools-0.3.20/VERSION

@@ -1 +0,0 @@
-0.3.20