malevich-coretools 0.3.20__py3-none-any.whl → 0.3.24__py3-none-any.whl

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/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/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/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/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.dist-info → malevich_coretools-0.3.24.dist-info}/METADATA

@@ -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.dist-info → malevich_coretools-0.3.24.dist-info}/RECORD

@@ -1,7 +1,7 @@
 malevich_coretools/__init__.py,sha256=DJtPESxkCZD2SbTZTrR_x0TKDQ4MJpmBqGw5YpKYidM,134
-malevich_coretools/utils.py,sha256=B43dLGRjEH-dtJJ6Vgjgb8uZEYhQG6VzdZWrxQPRzsU,105355
+malevich_coretools/utils.py,sha256=1r6RlXHeTQhMsKt7Wc_vwxBKBib-8svw0Ells4RLsrQ,106380
 malevich_coretools/abstract/__init__.py,sha256=8AC5ZukRGkTtN-XP14DY5z2HrJqN5LLlnmcMqvWwtWU,76
-malevich_coretools/abstract/abstract.py,sha256=bnlFn-EbSRQa4QxqGE5Z-XKjqkJg8OXd1b0U6RTNZzQ,14100
+malevich_coretools/abstract/abstract.py,sha256=6or8FPWQsycKDtK70vR4jKLIqLgg4c8GacdkQ533ZgI,14290
 malevich_coretools/abstract/pipeline.py,sha256=AdHQIpOMZMNJt6f17MK_s2k6FM2Kc_ImAn4LJuDbZAM,3279
 malevich_coretools/abstract/statuses.py,sha256=9ISSw_evsylBshLXoU44TCoFOrZm4bXIxyAFFDqdUWc,333
 malevich_coretools/admin/__init__.py,sha256=zdIcHs3T_NZ8HYWts-O7OpBEWHIu779QDZMGF5HRCLg,35
@@ -10,18 +10,18 @@ malevich_coretools/batch/__init__.py,sha256=taxyZl8YOZd2EBd3leN6slzMkejUtjQ64Na3
 malevich_coretools/batch/utils.py,sha256=cqX34sfh85dCwLv7qprxatzhYxxj7LqZwjhlmk_3GXQ,7705
 malevich_coretools/funcs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 malevich_coretools/funcs/checks.py,sha256=Q5pRtRevQrGv_-SMbn2GgYnulhclDLBXdRtbw2QOYKU,223
-malevich_coretools/funcs/funcs.py,sha256=VVw2gKy8LEdb4_dU9W1Orb6imZk_LYWJMu7OZFbnMwA,36506
-malevich_coretools/funcs/helpers.py,sha256=CZYza0uQ68ywcfeUE9rP7q0VjsfnLtBp4z0qQZbIkjY,9843
+malevich_coretools/funcs/funcs.py,sha256=mYKcDOgmt4CVQ24EbhGxJXDMqQx4kFeSBziwGhTMz9Q,36664
+malevich_coretools/funcs/helpers.py,sha256=-JU17yt19CS8IadZ0r5vN4hmXBrTjLUyRB07kBDhZL4,10003
 malevich_coretools/secondary/__init__.py,sha256=048HqvG36_1WdDVZK_RuECmaf14Iq2fviUysG1inlaE,78
 malevich_coretools/secondary/config.py,sha256=hRlSJuPQnhKyt1wmOAJX_XmcliaO0fPGbW94AE_Mazs,463
-malevich_coretools/secondary/const.py,sha256=W6GVTpPYsQgllmOUk5US7yzjq1GxyR_vEQog2KMv14w,12601
+malevich_coretools/secondary/const.py,sha256=PlDlCbZ-AIOF88fEsT4lVQ1IxgUthUhleJLMkYLGsvU,12676
 malevich_coretools/secondary/helpers.py,sha256=t-W9g9t0O1EaAX8UOb1wxXFAMawbtDotDH47t0GdjG4,6142
 malevich_coretools/secondary/kafka_utils.py,sha256=SIUnBFyfwsquN6MAUrEkKCw-1l7979Znl7OTQSX2UKo,989
 malevich_coretools/tools/__init__.py,sha256=jDxlCa5Dr6Y43qlI7JwsRAlBkKmFeTHTEnjNUvu-0iw,46
 malevich_coretools/tools/abstract.py,sha256=B1RW1FeNHrQ6r1k-cQZ4k4noCRXkIGt-JUwVoXEDkAg,4466
 malevich_coretools/tools/vast.py,sha256=63tvy70qQV9vnK0eWytlgjBGSnfA7l3kSIDgACBbMMs,12893
-malevich_coretools-0.3.20.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-malevich_coretools-0.3.20.dist-info/METADATA,sha256=2wNFKOTyLSII7sAxJQQGrH-1pMtAckGvLnZ49p11pow,265
-malevich_coretools-0.3.20.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-malevich_coretools-0.3.20.dist-info/top_level.txt,sha256=wDX3s1Tso0otBPNrFRfXqyNpm48W4Bp5v6JfbITO2Z8,19
-malevich_coretools-0.3.20.dist-info/RECORD,,
+malevich_coretools-0.3.24.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+malevich_coretools-0.3.24.dist-info/METADATA,sha256=0DpEbTBuQ78b7em65HrBdknWxJyuMYcigXlbg4YMptY,265
+malevich_coretools-0.3.24.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+malevich_coretools-0.3.24.dist-info/top_level.txt,sha256=wDX3s1Tso0otBPNrFRfXqyNpm48W4Bp5v6JfbITO2Z8,19
+malevich_coretools-0.3.24.dist-info/RECORD,,

{malevich_coretools-0.3.20.dist-info → malevich_coretools-0.3.24.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (70.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any