malevich-coretools 0.3.33__tar.gz → 0.3.34__tar.gz

{malevich_coretools-0.3.33/malevich_coretools.egg-info → malevich_coretools-0.3.34}/PKG-INFO

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

malevich_coretools-0.3.34/VERSION

@@ -0,0 +1 @@
+0.3.34

{malevich_coretools-0.3.33 → malevich_coretools-0.3.34}/malevich_coretools/abstract/__init__.py

@@ -1,2 +1,3 @@
 from .abstract import *  # noqa: F403
+from .operations import And, BoolOp, Not, Or, Value  # noqa: F401
 from .pipeline import *  # noqa: F403

{malevich_coretools-0.3.33 → malevich_coretools-0.3.34}/malevich_coretools/abstract/abstract.py

@@ -456,6 +456,7 @@ class AppFunctionsInfo(BaseModel):
     schemes: Dict[Alias.Id, str] = dict()
     inits: Dict[Alias.Id, InitInfo] = dict()
     logs: Optional[str] = None
+    version: Optional[str] = None
     instanceInfo: Optional[str] = None  # json with info about instance
 
 

malevich_coretools-0.3.34/malevich_coretools/abstract/operations.py

@@ -0,0 +1,110 @@
+from abc import ABC, abstractmethod
+from typing import Optional, Union
+
+from pydantic import BaseModel
+
+
+class InternalBoolOp(ABC, BaseModel):
+    pass
+
+    @abstractmethod
+    def simplify(self) -> 'BoolOp':
+        pass
+
+
+class BoolOp(ABC, BaseModel):
+    pass
+
+    @abstractmethod
+    def internal(self) -> InternalBoolOp:
+        pass
+
+
+class Value(BaseModel):
+    bindId: str
+    result: bool
+
+
+class BoolOpOrValue(BaseModel):
+    # set only one of them
+    op: Optional[Union['InternalNot', 'InternalAnd', 'InternalOr']] = None
+    value: Optional[Value] = None
+
+
+class InternalNot(InternalBoolOp):
+    notOp: BoolOpOrValue
+
+    def simplify(self) -> 'BoolOp':
+        return Not(op=value if (value := self.notOp.value) is not None else self.notOp.op.simplify())
+
+
+class Not(BoolOp):
+    op: Union[BoolOp, Value]
+
+    def internal(self) -> InternalBoolOp:
+        if isinstance(self.op, BoolOp):
+            internal_op = BoolOpOrValue(op=self.op.internal())
+        else:
+            internal_op = BoolOpOrValue(value=self.op)
+        return InternalNot(notOp=internal_op)
+
+
+class InternalAnd(InternalBoolOp):
+    andOp: BoolOpOrValue
+    andOp2: BoolOpOrValue
+
+    def simplify(self) -> 'BoolOp':
+        return And(
+            op=value if (value := self.andOp.value) is not None else self.andOp.op.simplify(),
+            op2=value if (value := self.andOp2.value) is not None else self.andOp2.op.simplify()
+        )
+
+
+class And(BoolOp):
+    op: Union[BoolOp, Value]
+    op2: Union[BoolOp, Value]
+
+    def internal(self) -> InternalBoolOp:
+        if isinstance(self.op, BoolOp):
+            internal_op = BoolOpOrValue(op=self.op.internal())
+        else:
+            internal_op = BoolOpOrValue(value=self.op)
+
+        if isinstance(self.op2, BoolOp):
+            internal_op2 = BoolOpOrValue(op=self.op2.internal())
+        else:
+            internal_op2 = BoolOpOrValue(value=self.op2)
+        return InternalAnd(andOp=internal_op, andOp2=internal_op2)
+
+
+class InternalOr(InternalBoolOp):
+    orOp: BoolOpOrValue
+    orOp2: BoolOpOrValue
+
+    def simplify(self) -> 'BoolOp':
+        return Or(
+            op=value if (value := self.orOp.value) is not None else self.orOp.op.simplify(),
+            op2=value if (value := self.orOp2.value) is not None else self.orOp2.op.simplify()
+        )
+
+
+class Or(BoolOp):
+    op: Union[BoolOp, Value]
+    op2: Union[BoolOp, Value]
+
+    def internal(self) -> InternalBoolOp:
+        if isinstance(self.op, BoolOp):
+            internal_op = BoolOpOrValue(op=self.op.internal())
+        else:
+            internal_op = BoolOpOrValue(value=self.op)
+
+        if isinstance(self.op2, BoolOp):
+            internal_op2 = BoolOpOrValue(op=self.op2.internal())
+        else:
+            internal_op2 = BoolOpOrValue(value=self.op2)
+        return InternalOr(orOp=internal_op, orOp2=internal_op2)
+
+
+def operations_test() -> None:
+    op = And(op=Or(op=Not(op=Value(bindId="cond", result=True)), op2=Value(bindId="cond2", result=False)), op2=Value(bindId="proc"))
+    assert op == op.internal().simplify(), "fail: operations"

{malevich_coretools-0.3.33 → malevich_coretools-0.3.34}/malevich_coretools/abstract/pipeline.py

@@ -1,5 +1,5 @@
 from enum import IntEnum
-from typing import Dict, List, Optional
+from typing import Dict, List, Optional, Union
 
 from pydantic import BaseModel
 
@@ -13,6 +13,17 @@ from malevich_coretools.abstract.abstract import (  # noqa: F401
     TaskComponent,
     TaskPolicy,
 )
+from malevich_coretools.abstract.operations import (
+    And,
+    BoolOp,
+    InternalAnd,
+    InternalBoolOp,
+    InternalNot,
+    InternalOr,
+    Not,
+    Or,
+    Value,
+)
 
 
 class PullCollectionPolicy(IntEnum):
@@ -71,15 +82,36 @@ class AlternativeArgument(BaseArgument):
 class AppEntity(BaseModel):
     cfg: Optional[str] = None                           # local cfg for processor/condition
     arguments: Dict[str, AlternativeArgument] = {}      # TODO or List[Argument]?
-    conditions: Optional[Dict[str, bool]] = None        # condition bindId to it result
+    conditions: Optional[Union[Dict[str, bool], List[Dict[str, bool]]]] = None          # condition bindId to it result (list - any variant of them)
+    conditionsStructure: Optional[Union[Not, And, Or, InternalNot, InternalAnd, InternalOr, Value]] = None  # set BoolOp, it transform to internal before send
 
     loopArguments: Optional[Dict[str, AlternativeArgument]] = None  # other calls, TODO or List[Argument]?, problems
-    loopConditions: Optional[Dict[str, bool]] = None    # condition bindId to it result for loop
+    loopConditions: Optional[Union[Dict[str, bool], List[Dict[str, bool]]]] = None          # condition bindId to it result for loop (list - any variant of them)
+    loopConditionsStructure: Optional[Union[Not, And, Or, InternalNot, InternalAnd, InternalOr, Value]] = None  # set BoolOp, it transform to internal before send
 
     image: JsonImage
     platform: str = "base"
     platformSettings: Optional[str] = None
 
+    def internal(self) -> None:
+        assert self.conditions is None or self.conditionsStructure is None, "should be set not more, than one of (conditions, conditionsStructure)"
+        assert self.loopConditions is None or self.loopConditionsStructure is None, "should be set not more, than one of (loopConditions, loopConditionsStructure)"
+
+        if isinstance(self.conditions, Dict):
+            self.conditions = [self.conditions]
+        if isinstance(self.conditionsStructure, BoolOp):
+            self.conditionsStructure = self.conditionsStructure.internal()
+        if isinstance(self.loopConditions, Dict):
+            self.loopConditions = [self.loopConditions]
+        if isinstance(self.loopConditionsStructure, BoolOp):
+            self.loopConditionsStructure = self.loopConditionsStructure.internal()
+
+    def simplify(self) -> None:
+        if isinstance(self.conditionsStructure, InternalBoolOp):
+            self.conditionsStructure = self.conditionsStructure.simplify()
+        if isinstance(self.loopConditionsStructure, InternalBoolOp):
+            self.loopConditionsStructure = self.loopConditionsStructure.simplify()
+
 
 class Processor(AppEntity):
     processorId: str
@@ -102,6 +134,20 @@ class Pipeline(BaseModel):
     results: Dict[str, List[Result]] = {}               # bindProcessorId to results
     pullCollectionPolicy: PullCollectionPolicy = PullCollectionPolicy.IF_NOT_EXIST
 
+    def internal(self) -> 'Pipeline':
+        for proc in self.processors.values():
+            proc.internal()
+        for cond in self.conditions.values():
+            cond.internal()
+        return self
+
+    def simplify(self) -> 'Pipeline':
+        for proc in self.processors.values():
+            proc.simplify()
+        for cond in self.conditions.values():
+            cond.simplify()
+        return self
+
 
 class MainPipelineCfg(BaseModel):
     operationId: Alias.Id

{malevich_coretools-0.3.33 → malevich_coretools-0.3.34}/malevich_coretools/funcs/funcs.py

@@ -483,11 +483,11 @@ def get_userPipelines_mapId(id: str, *args, **kwargs) -> Alias.Id:
 
 
 def get_userPipelines_id(id: str, *args, **kwargs) -> Pipeline:
-    return model_from_json(send_to_core_get(USER_PIPELINES_ID(id, None), *args, **kwargs), Pipeline)
+    return model_from_json(send_to_core_get(USER_PIPELINES_ID(id, None), *args, **kwargs), Pipeline).simplify()
 
 
 def get_userPipelines_realId(id: str, *args, **kwargs) -> Pipeline:
-    return model_from_json(send_to_core_get(USER_PIPELINES_REAL_ID(id), *args, **kwargs), Pipeline)
+    return model_from_json(send_to_core_get(USER_PIPELINES_REAL_ID(id), *args, **kwargs), Pipeline).simplify()
 
 
 def post_userPipelines(data: UserTask, wait: bool, *args, **kwargs) -> Alias.Id:

{malevich_coretools-0.3.33 → malevich_coretools-0.3.34}/malevich_coretools/utils.py

@@ -2057,7 +2057,7 @@ def create_pipeline(
         conditions=conditions,
         results=results,
         pullCollectionPolicy=pull_collection_policy,
-    )
+    ).internal()
     if batcher is not None:
         return batcher.add("postPipeline", data=data)
     return f.post_userPipelines(data, wait=wait, auth=auth, conn_url=conn_url)
@@ -2091,7 +2091,7 @@ def update_pipeline(
         conditions=conditions,
         results=results,
         pullCollectionPolicy=pull_collection_policy,
-    )
+    ).internal()
     if batcher is not None:
         return batcher.add("postPipelineById", data=data, vars={"id": id})
     return f.post_userPipelines_id(id, data, wait=wait, auth=auth, conn_url=conn_url)

{malevich_coretools-0.3.33 → malevich_coretools-0.3.34/malevich_coretools.egg-info}/PKG-INFO

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

{malevich_coretools-0.3.33 → malevich_coretools-0.3.34}/malevich_coretools.egg-info/SOURCES.txt

@@ -14,6 +14,7 @@ malevich_coretools.egg-info/requires.txt
 malevich_coretools.egg-info/top_level.txt
 malevich_coretools/abstract/__init__.py
 malevich_coretools/abstract/abstract.py
+malevich_coretools/abstract/operations.py
 malevich_coretools/abstract/pipeline.py
 malevich_coretools/abstract/statuses.py
 malevich_coretools/admin/__init__.py

malevich_coretools-0.3.33/VERSION

@@ -1 +0,0 @@
-0.3.33