support modelrun and run in Dag

Author: AvitalFineRedis

redisai/dag.py

@@ -5,6 +5,7 @@
 
 from redisai import command_builder as builder
 from redisai.postprocessor import Processor
+from deprecated import deprecated
 
 processor = Processor()
 
@@ -13,6 +14,11 @@ class Dag:
     def __init__(self, load, persist, keys, timeout, executor, readonly=False, postprocess=True):
         self.result_processors = []
         self.enable_postprocess = True
+        if load is None and persist is None and keys is None:
+            raise RuntimeError(
+                "AI.DAGEXECUTE and AI.DAGEXECUTE_RO commands must contain" 
+                "at least one out of KEYS, LOAD, PERSIST parameters"
+            )
         if readonly:
             if persist:
                 raise RuntimeError(
@@ -42,6 +48,7 @@ def __init__(self, load, persist, keys, timeout, executor, readonly=False, postp
 
         self.commands.append("|>")
         self.executor = executor
+        self.readonly = readonly
 
     def tensorset(
         self,
@@ -76,6 +83,15 @@ def tensorget(
         )
         return self
 
+    @deprecated(version="1.2.0", reason="Use modelexecute instead")
+    def modelrun(
+            self,
+            key: AnyStr,
+            inputs: Union[AnyStr, List[AnyStr]],
+            outputs: Union[AnyStr, List[AnyStr]],
+    ) -> Any:
+        return self.modelexecute(key, inputs, outputs)
+
     def modelexecute(
         self,
         key: AnyStr,
@@ -88,6 +104,10 @@ def modelexecute(
         self.result_processors.append(bytes.decode)
         return self
 
+    @deprecated(version="1.2.0", reason="Use execute instead")
+    def run(self):
+        return self.execute()
+
     def execute(self):
         commands = self.commands[:-1]  # removing the last "|>"
         results = self.executor(*commands)

test/test.py

@@ -500,6 +500,21 @@ def setUp(self):
         ptmodel = load_model(model_path)
         con.modelstore("pt_model", "torch", "cpu", ptmodel, tag="v7.0")
 
+    def test_deprecated_dugrun(self):
+        con = self.get_client()
+        con.tensorset("a", [2, 3, 2, 3], shape=(2, 2), dtype="float")
+        con.tensorset("b", [2, 3, 2, 3], shape=(2, 2), dtype="float")
+        dag = con.dag(load=["a", "b"], persist="output")
+        dag.modelrun("pt_model", ["a", "b"], ["output"])
+        dag.tensorget("output")
+        result = dag.run()
+        expected = ["OK", np.array([[4.0, 6.0], [4.0, 6.0]], dtype=np.float32)]
+        result_outside_dag = con.tensorget("output")
+        self.assertTrue(np.allclose(expected.pop(), result.pop()))
+        result = dag.run()
+        self.assertTrue(np.allclose(result_outside_dag, result.pop()))
+        self.assertEqual(expected, result)
+
     def test_dagrun_with_load(self):
         con = self.get_client()
         con.tensorset("a", [2, 3, 2, 3], shape=(2, 2), dtype="float")
@@ -549,6 +564,8 @@ def test_dagrun_calling_on_return(self):
 
     def test_dagrun_without_load_and_persist(self):
         con = self.get_client()
+        with self.assertRaises(RuntimeError):
+            con.dag()
 
         dag = con.dag(load="wrongkey")
         with self.assertRaises(ResponseError):