tests setup and minor fixes (#20)

* have minimal tests up-to-date adn working

* version bump

* version true bump and missing dep

* fix output handling to be conceptually correct

pipeline/objects/decorators.py

@@ -35,7 +35,7 @@ def execute_func(*args, **kwargs):
                     )
 
             node_output = Variable(type_class=function.__annotations__["return"])
-            # Pipeline.add_variable(node_output)
+            Pipeline.add_variable(node_output)
             Pipeline.add_function(function.__pipeline_function__)
             new_node = GraphNode(
                 function=function.__pipeline_function__,

pipeline/objects/graph_node.py

@@ -9,8 +9,8 @@
 class GraphNode:
     local_id: str
     function: Function
-    inputs = []  #: List[Variable]
-    outputs = []  #: List[Variable]
+    inputs: List[Variable] = []
+    outputs: List[Variable] = []
 
     def __init__(self, function, inputs, outputs, *, local_id=None):
         self.function = function

pipeline/objects/pipeline.py

@@ -64,6 +64,11 @@ def add_variable(variable: Variable) -> None:
         else:
             raise Exception("Cant add a variable when not defining a pipeline!")
 
+    @staticmethod
+    def add_variables(*variables: Variable) -> None:
+        for v in variables:
+            Pipeline.add_variable(v)
+
     @staticmethod
     def add_function(function: Function) -> None:
         if Pipeline._pipeline_context_active:

pipeline/objects/variable.py

@@ -1,11 +1,8 @@
 from typing import Any
 
-# from pipeline.objects.pipeline import Pipeline
 from pipeline.schemas.pipeline import PipelineVariableGet
 from pipeline.util import generate_id, hex_to_python_object
 
-# from pipeline.objects import Pipeline
-
 
 class Variable:
 
@@ -37,9 +34,6 @@ def __init__(
 
         self.local_id = generate_id(10) if not local_id else local_id
 
-        # if Pipeline._pipeline_context_active:
-        #    Pipeline.add_variable(self)
-
     @classmethod
     def from_schema(cls, schema: PipelineVariableGet):
         return cls(

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pipeline-ai"
-version = "0.0.12"
+version = "0.0.20"
 description = "Yay ml pipelines"
 authors = ["Paul Hetherington <paul@getneuro.ai>"]
 packages = [
@@ -23,6 +23,7 @@ setuptools = "^59.2.0"
 humps = "^0.2.2"
 pyhumps = "^3.0.2"
 requests-toolbelt = "^0.9.1"
+tqdm = "^4.62.3"
 
 [tool.poetry.dev-dependencies]
 setuptools = "^59.2.0"

tests/test_model.py

@@ -19,6 +19,8 @@ def load(self, path: str) -> None:
 
     with Pipeline("test") as my_pipeline:
         in_1 = Variable(str, is_input=True)
+        my_pipeline.add_variable(in_1)
+
         my_model = CustomModel()
         str_1 = my_model.predict(in_1)
 

tests/test_pipeline_main.py

@@ -16,7 +16,7 @@ def test_with_decorator_name():
 # Test exit
 def test_with_exit():
     with Pipeline("test"):
-        Variable(is_input=True, is_output=True)
+        Variable(str, is_input=True, is_output=True)
     assert Pipeline.get_pipeline("test").name == "test"
 
 
@@ -34,13 +34,13 @@ def square(f_1: float) -> float:
         in_1 = Variable(float, is_input=True)
         in_2 = Variable(float, is_input=True)
 
+        my_pipeline.add_variables(in_1, in_2)
+
         add_1 = add(in_1, in_2)
         sq_1 = square(add_1)
 
         my_pipeline.output(sq_1, add_1)
 
-    graph = Pipeline.get_pipeline("test")
-
-    output = graph.run(2.0, 3.0)
+    output = Pipeline.run_local("test", 2.0, 3.0)
     assert output == [25.0, 5.0]
     assert Pipeline._current_pipeline is None