Merge pull request #410 from alexhsamuel/fix/skip-dup-jso

Fix/skip dup jso

Author: alexhsamuel

python/apsis/cond/skip_duplicate.py

@@ -2,8 +2,8 @@
 
 from   apsis.lib import py
 from   apsis.lib.json import check_schema
-from   apsis.runs import Instance, Run
-from   apsis.states import to_state
+from   apsis.runs import Instance
+from   apsis.states import to_state, to_states
 from   .base import Condition, NonmonotonicRunStoreCondition
 
 log = logging.getLogger(__name__)
@@ -48,6 +48,16 @@ def __str__(self):
         return f"transition to {target} if another run is {states}"
 
 
+    @property
+    def check_states(self):
+        return frozenset(self.__check_states)
+
+
+    @property
+    def target_state(self):
+        return self.__target_state
+
+
     def to_jso(self):
         return {
             **super().to_jso(),
@@ -100,6 +110,26 @@ def __str__(self):
         return f"transition to {target} if another {self.__inst} is {states}"
 
 
+    @property
+    def check_states(self):
+        return frozenset(self.__check_states)
+
+
+    @property
+    def target_state(self):
+        return self.__target_state
+
+
+    @property
+    def inst(self):
+        return self.__inst
+
+
+    @property
+    def run_id(self):
+        return self.__run_id
+
+
     def to_jso(self):
         return {
             **super().to_jso(),
@@ -114,9 +144,10 @@ def to_jso(self):
     def from_jso(cls, jso):
         with check_schema(jso) as pop:
             return cls(
-                check_states    =pop("check_states"),
-                target_state    =pop("target_state"),
+                check_states    =pop("check_states", to_states),
+                target_state    =pop("target_state", to_state),
                 inst            =pop("instance", Instance.from_jso),
+                run_id          =pop("run_id", str),
             )
 
 

python/apsis/states.py

@@ -31,6 +31,19 @@ def to_state(state):
     raise ValueError(f"not a state: {state!r}")
 
 
+def to_states(states):
+    """
+    Convers `states` to an iterator of States instances.
+
+      >>> tuple(to_states("running"))
+      (<State.running: 5>,)
+      >>> tuple(to_states(["failure", State.error]))
+      (<State.failure: 7>, <State.error: 8>)
+
+    """
+    return ( to_state(s) for s in py.iterize(states) )
+
+
 # State model.  Allowed transitions _to_ each state.
 TRANSITIONS = {
     State.new       : set(),

test/unit/test_cond.py

@@ -1,6 +1,9 @@
+from   apsis.cond import Condition
+from   apsis.cond.dependency import Dependency
+from   apsis.cond.skip_duplicate import SkipDuplicate
 from   apsis.jobs import Job
 from   apsis.runs import Run, Instance
-from   apsis.cond.dependency import Dependency
+from   apsis.states import State
 
 #-------------------------------------------------------------------------------
 
@@ -53,3 +56,26 @@ def test_bind3():
     assert bound.states == dep.states
 
 
+def test_skip_duplicate_jso():
+    cond = SkipDuplicate()
+    cond = Condition.from_jso(cond.to_jso())
+    assert cond.check_states == {State.waiting, State.starting, State.running}
+    assert cond.target_state == State.skipped
+
+    cond = SkipDuplicate(check_states="running", target_state="error")
+    cond = Condition.from_jso(cond.to_jso())
+    assert cond.check_states == {State.running}
+    assert cond.target_state == State.error
+
+    run = Run(Instance("my job", {"foo": "orange"}))
+    run.run_id = "r12345"
+    cond = cond.bind(run, jobs=None)  # jobs not used
+
+    cond = Condition.from_jso(cond.to_jso())
+    assert cond.check_states == {State.running}
+    assert cond.target_state == State.error
+    assert cond.inst.job_id == "my job"
+    assert cond.inst.args == {"foo": "orange"}
+    assert cond.run_id == "r12345"
+
+