diff --git a/pyproject.toml b/pyproject.toml index f16925b..77b2b0a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,8 +24,8 @@ classifiers = [ ] requires-python = ">=3.8" dependencies = [ - "pathsim>=0.8.2", - "pathsim-chem", + "pathsim>=0.8.2,<0.14.0", + "pathsim-chem<0.1.1", "matplotlib>=3.7.0", "numpy>=1.24.0", "plotly>=6.0", diff --git a/src/python/templates/block_macros.py b/src/python/templates/block_macros.py index 2e2b3da..523daa9 100644 --- a/src/python/templates/block_macros.py +++ b/src/python/templates/block_macros.py @@ -25,8 +25,8 @@ {{ create_block(node) }} {%- if node["data"].get("replacement_times") %} -events_{{ node["var_name"] }} = {{ node["var_name"] }}.create_reset_events() -events += events_{{ node["var_name"] }} +{{ node["var_name"] }}._create_reset_events() +events += {{ node["var_name"] }}.events {%- endif %} {%- endmacro -%} diff --git a/test/test_convert_python.py b/test/test_convert_python.py index ee186a2..9c7bf23 100644 --- a/test/test_convert_python.py +++ b/test/test_convert_python.py @@ -164,7 +164,7 @@ def test_bubbler_has_reset_times(): } code = convert_graph_to_python(sample_data) print(code) - assert "bubbler_1.create_reset_events()" in code + assert "bubbler_1._create_reset_events()" in code if __name__ == "__main__": diff --git a/test/test_files/bubbler.json b/test/test_files/bubbler.json index f336d89..97cf713 100644 --- a/test/test_files/bubbler.json +++ b/test/test_files/bubbler.json @@ -10,7 +10,7 @@ "data": { "label": "bubbler 1", "conversion_efficiency": "", - "replacement_times": "", + "replacement_times": "[1]", "vial_efficiency": "" }, "measured": {