removed create_scope

Author: RemDelaporteMathurin

src/pathsim_utils.py

@@ -109,18 +109,6 @@ def make_labels_for_scope(node: dict, edges: list, nodes: list) -> list[str]:
     return labels, connections_order
 
 
-def create_scope(node: dict, edges, nodes) -> Scope:
-    block = auto_block_construction(node, eval_namespace=globals())
-
-    # override labels + add connections order
-    # TODO this should be done in "make connections"
-    labels, connections_order = make_labels_for_scope(node, edges, nodes)
-    block._connections_order = connections_order
-    block.labels = labels
-
-    return block
-
-
 def make_global_variables(global_vars):
     # Validate and exec global variables so that they are usable later in this script.
     # Return a namespace dictionary containing the global variables
@@ -259,15 +247,15 @@ def make_blocks(
     blocks, events = [], []
 
     for node in nodes:
-        block_type = node["type"]
-
-        # TODO scope should be handled in the same way as other blocks
-        if block_type == "scope":
-            block = create_scope(node, edges, nodes)
-        else:
-            block = auto_block_construction(node, eval_namespace)
-            if hasattr(block, "create_reset_events"):
-                events.extend(block.create_reset_events())
+        block = auto_block_construction(node, eval_namespace)
+        if hasattr(block, "create_reset_events"):
+            events.extend(block.create_reset_events())
+
+        if isinstance(block, Scope):
+            if block.labels == []:
+                block.labels, block._connections_order = make_labels_for_scope(
+                    node, edges, nodes
+                )
 
         block.id = node["id"]
         block.label = node["data"]["label"]

test/test_backend.py

@@ -1,7 +1,4 @@
-from src.pathsim_utils import (
-    auto_block_construction,
-    create_scope,
-)
+from src.pathsim_utils import auto_block_construction
 from src.custom_pathsim_blocks import Process, Splitter2, Splitter3, Bubbler, Integrator
 
 import pathsim.blocks
@@ -64,7 +61,7 @@
     },
     "scope": {
         "type": "scope",
-        "data": {"label": "Scope", "sampling_rate": "", "labels": ""},
+        "data": {"label": "scope 7", "sampling_rate": "", "labels": "", "t_wait": ""},
     },
     "white_noise": {
         "type": "white_noise",
@@ -136,6 +133,7 @@ def _create_node(block_type: str, id: str = "1", data_overrides: dict = None):
         ("pink_noise", pathsim.blocks.noise.PinkNoise),
         ("bubbler", Bubbler),
         ("integrator", Integrator),
+        ("scope", pathsim.blocks.Scope),
     ],
 )
 def test_auto_block_construction(node_factory, block_type, expected_class):
@@ -175,15 +173,3 @@ def test_auto_block_construction_with_var(node_factory, block_type, expected_cla
             break
     block = auto_block_construction(node, eval_namespace={"var1": 5.5})
     assert isinstance(block, expected_class)
-
-
-def test_make_scope():
-    node = {
-        "id": "7",
-        "type": "scope",
-        "data": {"label": "scope 7", "sampling_rate": "", "labels": "", "t_wait": ""},
-    }
-    block = create_scope(node, edges=[], nodes=[node])
-    assert isinstance(block, pathsim.blocks.Scope)
-    assert block.labels == []
-    assert block.sampling_rate is None