Update chainable function registration

Author: hermansje

pythonwhat/sct_syntax.py

@@ -1,9 +1,4 @@
-from protowhat.sct_syntax import (
-    Chain,
-    EagerChain,
-    LazyChain,
-    state_dec_gen,
-)
+from protowhat.sct_syntax import EagerChain, ExGen, LazyChainStart, state_dec_gen
 from pythonwhat.checks.check_wrappers import scts
 from pythonwhat.State import State
 from pythonwhat.probe import Node, Probe, TEST_NAMES
@@ -32,13 +27,22 @@ def wrapper(*args, **kwargs):
     return wrapper
 
 
-state_dec = state_dec_gen(State)
+state_dec = state_dec_gen(sct_dict)
 
-assert LazyChain  # todo: __all__?
+# todo: __all__?
+assert ExGen
+assert LazyChainStart
 
 
 def Ex(state=None):
-    return EagerChain(state=state or State.root_state)
+    return EagerChain(state=state or State.root_state, chainable_functions=sct_dict)
+
+
+def get_chains():
+    return {
+        "Ex": ExGen(sct_dict, State.root_state),
+        "F": LazyChainStart(sct_dict),
+    }
 
 
 if include_v1():
@@ -58,7 +62,5 @@ def Ex(state=None):
     for k in ["test_or", "test_correct"]:
         sct_dict[k] = multi_dec(getattr(test_funcs, k))
 
-Chain.register_functions(sct_dict)
-
 # Prepare check_funcs to be used alone (e.g. test = check_with().check_body())
 v2_check_functions = {k: state_dec(v) for k, v in scts.items()}

pythonwhat/test_exercise.py

@@ -1,6 +1,6 @@
 from pythonwhat.State import State
 from pythonwhat.local import run_exercise
-from pythonwhat.sct_syntax import Ex
+from pythonwhat.sct_syntax import Ex, get_chains
 from pythonwhat.utils import check_str, check_process
 from protowhat.Reporter import Reporter
 from protowhat.failure import TestFail, InstructorError
@@ -37,7 +37,6 @@ def test_exercise(
     """
 
     reporter = Reporter(errors=[error] if error else [])
-    tree, sct_cntxt = prep_context()
 
     try:
         state = State(
@@ -52,6 +51,7 @@ def test_exercise(
         )
 
         State.root_state = state
+        tree, sct_cntxt = prep_context()
 
         # Actually execute SCTs
         exec(sct, sct_cntxt)
@@ -94,7 +94,6 @@ def prep_context():
         "from inspect import Parameter as param",
         "from pythonwhat.signatures import sig_from_params, sig_from_obj",
         "from pythonwhat.State import set_converter",
-        "from pythonwhat.sct_syntax import LazyChain as F, Ex",
     ]
     [exec(line, None, cntxt) for line in imports]
 
@@ -106,6 +105,7 @@ def prep_context():
         tree = None
 
     cntxt.update(v2_check_functions)
+    cntxt.update(get_chains())
     return tree, cntxt
 
 

tests/test_check_files.py

@@ -67,9 +67,10 @@ def test_file_existence_syntax(temp_py_file):
     file_chain = chain.check_file(temp_py_file.name)
     assert expected_content in file_chain._state.student_code
 
-    LazyChain.register_functions({"check_file": cf.check_file})
     with helper.verify_sct(True):
-        file_chain = chain >> LazyChain().check_file(temp_py_file.name)
+        file_chain = chain >> LazyChain(
+            chainable_functions={"check_file": cf.check_file}
+        ).check_file(temp_py_file.name)
         assert expected_content in file_chain._state.student_code
 
 

tests/test_spec.py

@@ -289,8 +289,8 @@ def test_override(k, code):
 
 # Test SCT Ex syntax (copied from sqlwhat)  -----------------------------------
 
-from protowhat.sct_syntax import ChainExtender, ChainedCall
-from pythonwhat.sct_syntax import Ex, EagerChain, LazyChain, state_dec
+from protowhat.sct_syntax import ChainExtender, ChainedCall, LazyChain
+from pythonwhat.sct_syntax import Ex, EagerChain, state_dec
 
 
 @pytest.fixture

tests/test_v2_only.py

@@ -5,7 +5,6 @@
 
 def relooooad():
     import pythonwhat.sct_syntax
-    pythonwhat.sct_syntax.Chain.registered_functions = {}
     importlib.reload(pythonwhat.sct_syntax)