grid-data-models 2.3.6__tar.gz → 2.3.7__tar.gz

{grid_data_models-2.3.6 → grid_data_models-2.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: grid-data-models
-Version: 2.3.6
+Version: 2.3.7
 Project-URL: Documentation, https://github.com/NREL-Distribution-Suites/grid-data-models#readme
 Project-URL: Issues, https://github.com/NREL-Distribution-Suites/grid-data-models/issues
 Project-URL: Source, https://github.com/NREL-Distribution-Suites/grid-data-models
@@ -30,13 +30,13 @@ Requires-Dist: pytest-doctestplus; extra == 'dev'
 Requires-Dist: ruff; extra == 'dev'
 Provides-Extra: doc
 Requires-Dist: autodoc-pydantic[erdantic]; extra == 'doc'
-Requires-Dist: jupyter-book<3,>=2.1.5; extra == 'doc'
+Requires-Dist: jupyter-book<3,>=2.1.6; extra == 'doc'
 Requires-Dist: myst-parser; extra == 'doc'
 Requires-Dist: pydata-sphinx-theme; extra == 'doc'
 Requires-Dist: sphinx; extra == 'doc'
 Requires-Dist: sphinxcontrib-mermaid; extra == 'doc'
 Provides-Extra: mcp
-Requires-Dist: mcp>=1.28.0; extra == 'mcp'
+Requires-Dist: mcp>=1.28.1; extra == 'mcp'
 Description-Content-Type: text/markdown
 
 

{grid_data_models-2.3.6 → grid_data_models-2.3.7}/pyproject.toml

@@ -33,10 +33,10 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-mcp = ["mcp>=1.28.0"]
+mcp = ["mcp>=1.28.1"]
 dev = ["pre-commit", "pytest", "pytest-cov", "pytest-doctestplus", "pytest-asyncio", "ruff", "docutils"]
 doc = [
-  "jupyter-book>=2.1.5,<3",
+  "jupyter-book>=2.1.6,<3",
   "sphinx",
   "pydata-sphinx-theme",
   "myst-parser",

{grid_data_models-2.3.6 → grid_data_models-2.3.7}/src/gdm/distribution/distribution_system.py

@@ -213,6 +213,9 @@ class DistributionSystem(System):
                 "type": edge.__class__,
                 "is_closed": True,
                 "in_service": edge.in_service,
+                "phases": [phase.value for phase in edge.winding_phases[0]]
+                if isinstance(edge, DistributionTransformerBase)
+                else [phase.value for phase in edge.phases],
             }
             if isinstance(edge, DistributionSwitchBase):
                 data["is_closed"] = True if len(edge.is_closed) == sum(edge.is_closed) else False
@@ -952,7 +955,9 @@ class DistributionSystem(System):
         logger.info("Converting models from GeometryBranch to MatrixImpedanceBranch...")
         auto_add = self.auto_add_composed_components
         self.auto_add_composed_components = True
-        branches = list(self.get_components(GeometryBranch)) + list(self.get_components(GeometrySwitch))
+        branches = list(self.get_components(GeometryBranch)) + list(
+            self.get_components(GeometrySwitch)
+        )
         for branch in branches:
             impedence_branch = branch.to_matrix_representation(
                 frequency_hz, soil_resistivity_ohm_m

grid_data_models-2.3.7/src/gdm/distribution/upgrade_handler/from__2_3_6__to__2_3_7.py

@@ -0,0 +1,15 @@
+from loguru import logger
+from infrasys.migrations.metadata_migration import migrate_component_metadata
+
+
+def from__2_3_6__to__2_3_7(data: dict, from_version: str, to_version: str) -> dict:
+    logger.info(f"Upgrading DistributionSystem from verion {from_version} to {to_version}")
+    data["data_format_version"] = str(to_version)
+    number_of_components_before = len(data["components"])
+    data["components"] = migrate_component_metadata(data["components"])
+    number_of_components_after = len(data["components"])
+    assert (
+        number_of_components_before == number_of_components_after
+    ), "Number of components should be the same before and after model upgrade"
+
+    return data

{grid_data_models-2.3.6 → grid_data_models-2.3.7}/src/gdm/distribution/upgrade_handler/upgrade_handler.py

@@ -24,6 +24,7 @@ from gdm.distribution.upgrade_handler.from__2_3_2__to__2_3_3 import from__2_3_2_
 from gdm.distribution.upgrade_handler.from__2_3_3__to__2_3_4 import from__2_3_3__to__2_3_4
 from gdm.distribution.upgrade_handler.from__2_3_4__to__2_3_5 import from__2_3_4__to__2_3_5
 from gdm.distribution.upgrade_handler.from__2_3_5__to__2_3_6 import from__2_3_5__to__2_3_6
+from gdm.distribution.upgrade_handler.from__2_3_6__to__2_3_7 import from__2_3_6__to__2_3_7
 
 
 def fix_version(version):
@@ -136,6 +137,11 @@ class UpgradeHandler(BaseModel):
             from_version="2.3.5",
             to_version="2.3.6",
         ),
+        UpgradeSchema(
+            method=from__2_3_6__to__2_3_7,
+            from_version="2.3.6",
+            to_version="2.3.7",
+        ),
     ]
 
     @model_validator(mode="after")

{grid_data_models-2.3.6 → grid_data_models-2.3.7}/src/gdm/distribution/utils/aggregate_components.py

@@ -139,8 +139,9 @@ def aggregate_single_phase_transformers(
     - Single-phase (all windings have num_phases == 1)
     - Connected to the same set of buses
 
-    Groups of 3 such components are merged into one three-phase component.
-    The original single-phase components are removed and the merged component is added.
+    Groups of 2 (open-wye / open-delta) or 3 such components are merged into one
+    multi-phase equivalent.  The original single-phase components are removed and
+    the merged component is added.
 
     Parameters
     ----------
@@ -159,9 +160,9 @@ def aggregate_single_phase_transformers(
             if _is_single_phase(comp):
                 groups[_bus_key(comp)].append(comp)
 
-        # Merge groups of exactly 3 parallel single-phase components
+        # Merge groups of 2 (open-wye/open-delta) or 3 parallel single-phase components
         for key, group in groups.items():
-            if len(group) != 3:
+            if len(group) < 2 or len(group) > 3:
                 continue
 
             merged = _merge_group(group)

{grid_data_models-2.3.6 → grid_data_models-2.3.7}/src/gdm/version.py

@@ -3,7 +3,7 @@ import subprocess
 import platform
 import sys
 
-VERSION = "2.3.6"
+VERSION = "2.3.7"
 SUPPORTED_VERSIONS = [VERSION]