From a148a541529a6f88882ca73e09ab46dedaf043f7 Mon Sep 17 00:00:00 2001 From: Fletcher Chapin Date: Thu, 18 Dec 2025 15:02:45 -0800 Subject: [PATCH 1/4] Renaming Separator to Separation and StaticMixer to StaticMixing --- docs/json_rep.rst | 2 +- pype_schema/data/desal_sample.json | 2 +- pype_schema/data/wrrf_sample.json | 2 +- pype_schema/node.py | 19 +++++++++++-------- pype_schema/parse_json.py | 14 ++++++++------ .../tests/data/connection_less_than.json | 2 +- pype_schema/tests/data/merged.json | 2 +- pype_schema/tests/data/merged_wwtp.json | 2 +- 8 files changed, 25 insertions(+), 20 deletions(-) diff --git a/docs/json_rep.rst b/docs/json_rep.rst index f72d2334..897eeafe 100644 --- a/docs/json_rep.rst +++ b/docs/json_rep.rst @@ -305,7 +305,7 @@ Below are two tables: first is all the ``Node`` subclasses and the second the at +---------------+--------------------+----------------------+---------------------------------+----------------------------------+-----------------------+-----------------------------+---------------------------+----------------------------+----------------------------+------------------------+----------------------------+----------------------------+----------------+-------------+--------------------------+-------------------------+-------------------------------+--------------------------+------------------+-----------+--------------------------+-----------------+---------+--------------+--------------+-----------------+---------+---------+--------------+-------------+----------------+ | Reactor | |check| | |check| | |check| | |check| | | | |check| | | | |check| | | | | | | | | | | | | | | |check| | | |check| | |check| | | | | | +---------------+--------------------+----------------------+---------------------------------+----------------------------------+-----------------------+-----------------------------+---------------------------+----------------------------+----------------------------+------------------------+----------------------------+----------------------------+----------------+-------------+--------------------------+-------------------------+-------------------------------+--------------------------+------------------+-----------+--------------------------+-----------------+---------+--------------+--------------+-----------------+---------+---------+--------------+-------------+----------------+ - | StaticMixer | |check| | |check| | |check| | |check| | | | | |check| | |check| | | | | | | | | | | | | | | | |check| | | |check| | |check| | | | | | + | StaticMixing | |check| | |check| | |check| | |check| | | | | |check| | |check| | | | | | | | | | | | | | | | |check| | | |check| | |check| | | | | | +---------------+--------------------+----------------------+---------------------------------+----------------------------------+-----------------------+-----------------------------+---------------------------+----------------------------+----------------------------+------------------------+----------------------------+----------------------------+----------------+-------------+--------------------------+-------------------------+-------------------------------+--------------------------+------------------+-----------+--------------------------+-----------------+---------+--------------+--------------+-----------------+---------+---------+--------------+-------------+----------------+ | Reservoir | |check| | |check| | |check| | |check| | | | |check| | | | |check| | | | | | | | | | | | | | | | | | | | | | | +---------------+--------------------+----------------------+---------------------------------+----------------------------------+-----------------------+-----------------------------+---------------------------+----------------------------+----------------------------+------------------------+----------------------------+----------------------------+----------------+-------------+--------------------------+-------------------------+-------------------------------+--------------------------+------------------+-----------+--------------------------+-----------------+---------+--------------+--------------+-----------------+---------+---------+--------------+-------------+----------------+ diff --git a/pype_schema/data/desal_sample.json b/pype_schema/data/desal_sample.json index 3b9a4dc7..24fe3e73 100644 --- a/pype_schema/data/desal_sample.json +++ b/pype_schema/data/desal_sample.json @@ -175,7 +175,7 @@ "tags": {} }, "StaticMixer": { - "type": "StaticMixer", + "type": "StaticMixing", "elevation (meters)": null, "volume (cubic meters)": null, "input_contents": "ChlorinatedSeawater", diff --git a/pype_schema/data/wrrf_sample.json b/pype_schema/data/wrrf_sample.json index bb70c943..87b236f2 100644 --- a/pype_schema/data/wrrf_sample.json +++ b/pype_schema/data/wrrf_sample.json @@ -254,7 +254,7 @@ } }, "OxygenPlant": { - "type": "Separator", + "type": "Separation", "input_contents": "Air", "output_contents": ["Oxygen", "IdealGas"], "num_units": 1, diff --git a/pype_schema/node.py b/pype_schema/node.py index 9bbf9241..23c6e267 100644 --- a/pype_schema/node.py +++ b/pype_schema/node.py @@ -2071,14 +2071,14 @@ def del_dosing_rate(self): dosing_rate = property(get_dosing_rate, set_dosing_rate, del_dosing_rate) -class StaticMixer(Reactor): +class StaticMixing(Reactor): """A tank containing a static mixer, typically used for coagulation in water treatment. Parameters ---------- id : str - StaticMixer ID + Static mixer ID input_contents : ContentsType or list of ContentsType Contents entering the mixer @@ -2116,7 +2116,7 @@ class StaticMixer(Reactor): Attributes ---------- id : str - StaticMixer ID + Static mixer ID input_contents : list of ContentsType Contents entering the mixer @@ -2183,7 +2183,7 @@ def __init__( def __repr__(self): return ( - f" Date: Wed, 20 May 2026 14:46:42 -0700 Subject: [PATCH 2/4] Updating citation file to reflect Alex's contribution --- CITATION.cff | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CITATION.cff b/CITATION.cff index 6ecad8da..7b5f8e20 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -16,6 +16,9 @@ authors: - family-names: "Rao" given-names: "Akshay K." orcid: "https://orcid.org/0000-0002-9054-476X" + - family-names: "Dudchenko" + given-names: "Alexander V." + orcid: "https://orcid.org/0000-0002-4808-6195" - family-names: "Mauter" given-names: "Meagan S." orcid: "https://orcid.org/0000-0002-4932-890X" From 5b93edcf4b39439f59685529336adc8441841ad9 Mon Sep 17 00:00:00 2001 From: Fletcher Chapin Date: Thu, 21 May 2026 16:38:49 -0700 Subject: [PATCH 3/4] Fixed tests so all are passing again --- pype_schema/connection.py | 9 ++++++++- pype_schema/parse_json.py | 4 ++++ .../tests/data/connection_less_than.json | 4 ++++ pype_schema/tests/data/sample.pkl | Bin 12114 -> 12169 bytes pype_schema/tests/test_connection.py | 7 ++++++- pype_schema/units.py | 2 +- 6 files changed, 23 insertions(+), 3 deletions(-) diff --git a/pype_schema/connection.py b/pype_schema/connection.py index 9660a0ca..2cb1d1ff 100644 --- a/pype_schema/connection.py +++ b/pype_schema/connection.py @@ -1097,6 +1097,7 @@ def __init__( contents, source, destination, + frequency=None, tags={}, bidirectional=False, exit_point=None, @@ -1106,6 +1107,7 @@ def __init__( self.contents = contents self.source = source self.destination = destination + self.frequency = frequency self.tags = tags self.bidirectional = bidirectional self.exit_point = exit_point @@ -1122,10 +1124,15 @@ def __repr__(self): else: entry_point_id = self.entry_point.id + if self.frequency is None: + frequency_txt = "None" + else: + frequency_txt = str(self.frequency) + return ( f"\n" ) diff --git a/pype_schema/parse_json.py b/pype_schema/parse_json.py index a4a23b25..a57a7381 100644 --- a/pype_schema/parse_json.py +++ b/pype_schema/parse_json.py @@ -1112,11 +1112,15 @@ def create_connection(self, connection_id, node_obj, verbose=False): entry_point=entry_point, ) elif self.config[connection_id]["type"] == "Delivery": + frequency = self.parse_unit_val_dict( + self.config[connection_id].get("frequency") + ) connection_obj = connection.Delivery( connection_id, contents, source, destination, + frequency=frequency, tags={}, bidirectional=bidirectional, exit_point=exit_point, diff --git a/pype_schema/tests/data/connection_less_than.json b/pype_schema/tests/data/connection_less_than.json index 8b75100d..549dec76 100644 --- a/pype_schema/tests/data/connection_less_than.json +++ b/pype_schema/tests/data/connection_less_than.json @@ -1061,6 +1061,10 @@ "avg": null, "units": "tons / day" }, + "frequency": { + "value": "1", + "units": "day" + }, "tags": {} }, "SolidsDisposal": { diff --git a/pype_schema/tests/data/sample.pkl b/pype_schema/tests/data/sample.pkl index b89c0d970116fa793ca68c8d485cbe6c0871b4ef..cafb664bea455ad4439998cf9d61f5260e256e13 100644 GIT binary patch literal 12169 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 diff --git a/pype_schema/tests/test_connection.py b/pype_schema/tests/test_connection.py index 436b961b..299f7292 100644 --- a/pype_schema/tests/test_connection.py +++ b/pype_schema/tests/test_connection.py @@ -370,7 +370,12 @@ def test_get_fallback_error(json_path, conn_id): ( "../data/desal_sample.json", "AntiscalantDelivery", - "\n", # noqa: E501 + "\n", # noqa: E501 + ), + ( + "data/connection_less_than.json", + "BiosolidsDelivery", + "\n", # noqa: E501 ), ], ) diff --git a/pype_schema/units.py b/pype_schema/units.py index 2bd69a8d..da068456 100644 --- a/pype_schema/units.py +++ b/pype_schema/units.py @@ -133,7 +133,7 @@ # default formatting includes 4 significant digits. # This can be overridden on a per-print basis with # print('{:.3f}'.format(3 * ureg.m / 9)). -u.default_format = ".4g" +u.default_format = ".4" units_path = os.path.join(os.path.dirname(__file__), "data", "unit_definitions.txt") u.load_definitions(units_path) From 774010eaf4e5ea8668e6f6e5beb6c84cdf9892be Mon Sep 17 00:00:00 2001 From: Fletcher Chapin Date: Mon, 25 May 2026 14:24:20 -0700 Subject: [PATCH 4/4] Reformatted with black --- pype_schema/parse_json.py | 2 +- pype_schema/tag.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pype_schema/parse_json.py b/pype_schema/parse_json.py index a57a7381..d28588c0 100644 --- a/pype_schema/parse_json.py +++ b/pype_schema/parse_json.py @@ -447,7 +447,7 @@ def create_node(self, node_id, verbose=False): """ if verbose: print("Creating node:", node_id) - (input_contents, output_contents) = self.parse_contents(node_id) + input_contents, output_contents = self.parse_contents(node_id) elevation = self.parse_unit_val_dict(self.config[node_id].get("elevation")) # strings like `elevation (meters)` and `volume (cubic meters)` # are included for backwards compatability diff --git a/pype_schema/tag.py b/pype_schema/tag.py index 5d7bac3a..46767791 100644 --- a/pype_schema/tag.py +++ b/pype_schema/tag.py @@ -11,7 +11,6 @@ from .logbook import Logbook from .operations import Constant - UNARY_OPS = ["noop", "delta", "<<", ">>", "~", "-"] BINARY_OPS = ["+", "-", "*", "/"]