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

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: grid-data-models
-Version: 2.3.7
+Version: 2.4.0
 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
@@ -10,12 +10,13 @@ License-File: LICENSE.txt
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.11
 Requires-Dist: geopandas
 Requires-Dist: importlib-metadata
-Requires-Dist: infrasys~=1.2
+Requires-Dist: infrasys==1.2.1
 Requires-Dist: networkx
-Requires-Dist: pandas~=3.0.3
+Requires-Dist: pandas~=3.0.6
 Requires-Dist: plotly
 Requires-Dist: pydantic
 Requires-Dist: semver
@@ -30,23 +31,30 @@ 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.6; extra == 'doc'
+Requires-Dist: jupyter-book<3,>=2.1.7; 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.1; extra == 'mcp'
+Requires-Dist: mcp>=2.2.0; extra == 'mcp'
 Description-Content-Type: text/markdown
 
 
 
-[![Upload to PyPi](https://github.com/NLR-Distribution-Suite/grid-data-models/actions/workflows/publish_to_pypi.yml/badge.svg)](https://github.com/NLR-Distribution-Suite/grid-data-models/actions/workflows/publish_to_pypi.yml) •  [![Pytest](https://github.com/NLR-Distribution-Suite/grid-data-models/actions/workflows/pull_request_tests.yml/badge.svg)](https://github.com/NLR-Distribution-Suite/grid-data-models/actions/workflows/pull_request_tests.yml) •  [![deploy-book](https://github.com/NLR-Distribution-Suite/grid-data-models/actions/workflows/deploy.yml/badge.svg)](https://github.com/NLR-Distribution-Suite/grid-data-models/actions/workflows/deploy.yml) • ![PyPI - Downloads](https://img.shields.io/pypi/dm/grid-data-models) •  [![codecov](https://codecov.io/github/NLR-Distribution-Suite/grid-data-models/branch/main/graph/badge.svg?token=K0X11EXOX8)](https://codecov.io/github/NLR-Distribution-Suite/grid-data-models) •  [![CodeFactor](https://www.codefactor.io/repository/github/nlr-distribution-suite/grid-data-models/badge)](https://www.codefactor.io/repository/github/nlr-distribution-suite/grid-data-models) • ![MCP Server](https://img.shields.io/badge/MCP_Server-enabled-brightgreen) • ![MCP Tools](https://img.shields.io/badge/MCP_Tools-20-blue) • [![GitHub issues](https://img.shields.io/github/issues/NLR-Distribution-Suite/grid-data-models)](https://github.com/NLR-Distribution-Suite/grid-data-models/issues) • [![License](https://img.shields.io/github/license/NLR-Distribution-Suite/grid-data-models)](https://github.com/NLR-Distribution-Suite/grid-data-models/blob/main/LICENSE.txt) •  [![PyPI Downloads](https://static.pepy.tech/personalized-badge/grid-data-models?period=total&units=INTERNATIONAL_SYSTEM&left_color=BLACK&right_color=GREEN&left_text=downloads)](https://pepy.tech/projects/grid-data-models) • [![Generate LinkedIn Post Draft](https://github.com/NLR-Distribution-Suite/grid-data-models/actions/workflows/linkedin_draft.yml/badge.svg)](https://github.com/NLR-Distribution-Suite/grid-data-models/actions/workflows/linkedin_draft.yml)
+[![Upload to PyPi](https://github.com/NLR-Distribution-Suite/grid-data-models/actions/workflows/publish_to_pypi.yml/badge.svg)](https://github.com/NLR-Distribution-Suite/grid-data-models/actions/workflows/publish_to_pypi.yml) •  [![Pytest](https://github.com/NLR-Distribution-Suite/grid-data-models/actions/workflows/pull_request_tests.yml/badge.svg)](https://github.com/NLR-Distribution-Suite/grid-data-models/actions/workflows/pull_request_tests.yml) •  [![deploy-book](https://github.com/NLR-Distribution-Suite/grid-data-models/actions/workflows/deploy.yml/badge.svg?branch=main)](https://github.com/NLR-Distribution-Suite/grid-data-models/actions/workflows/deploy.yml) • ![PyPI - Downloads](https://img.shields.io/pypi/dm/grid-data-models) •  [![codecov](https://codecov.io/github/NLR-Distribution-Suite/grid-data-models/branch/main/graph/badge.svg?token=K0X11EXOX8)](https://codecov.io/github/NLR-Distribution-Suite/grid-data-models) •  [![CodeFactor](https://www.codefactor.io/repository/github/nlr-distribution-suite/grid-data-models/badge)](https://www.codefactor.io/repository/github/nlr-distribution-suite/grid-data-models) • ![MCP Server](https://img.shields.io/badge/MCP_Server-enabled-brightgreen) • ![MCP Tools](https://img.shields.io/badge/MCP_Tools-20-blue) • [![GitHub issues](https://img.shields.io/github/issues/NLR-Distribution-Suite/grid-data-models)](https://github.com/NLR-Distribution-Suite/grid-data-models/issues) • [![License](https://img.shields.io/github/license/NLR-Distribution-Suite/grid-data-models)](https://github.com/NLR-Distribution-Suite/grid-data-models/blob/main/LICENSE.txt) •  [![PyPI Downloads](https://static.pepy.tech/personalized-badge/grid-data-models?period=total&units=INTERNATIONAL_SYSTEM&left_color=BLACK&right_color=GREEN&left_text=downloads)](https://pepy.tech/projects/grid-data-models) • [![Generate LinkedIn Post Draft](https://github.com/NLR-Distribution-Suite/grid-data-models/actions/workflows/linkedin_draft.yml/badge.svg)](https://github.com/NLR-Distribution-Suite/grid-data-models/actions/workflows/linkedin_draft.yml)
 
 # Grid Data Models (GDM)
 
 GDM is a python package containing data models for power system assets and datasets. This package is actively being developed at [National Renewable Energy Laboratory (NREL)](https://www.nrel.gov/).
 
+GDM models distribution networks and utility substations as complementary
+systems. `DistributionSystem` represents feeder and network connectivity;
+`SubstationSystem` represents station topology, primary equipment, protection,
+metering, and automation. They can remain separate or be joined at explicit
+feeder boundaries. See the [system model guide](docs/systems/index.md) and the
+[guide to connecting systems](docs/systems/connecting-systems.md).
+
 ## Installation
 
 You can install the latest version of `grid-data-models` from PyPi.

{grid_data_models-2.3.7 → grid_data_models-2.4.0}/README.md

@@ -1,11 +1,18 @@
 
 
-[![Upload to PyPi](https://github.com/NLR-Distribution-Suite/grid-data-models/actions/workflows/publish_to_pypi.yml/badge.svg)](https://github.com/NLR-Distribution-Suite/grid-data-models/actions/workflows/publish_to_pypi.yml) •  [![Pytest](https://github.com/NLR-Distribution-Suite/grid-data-models/actions/workflows/pull_request_tests.yml/badge.svg)](https://github.com/NLR-Distribution-Suite/grid-data-models/actions/workflows/pull_request_tests.yml) •  [![deploy-book](https://github.com/NLR-Distribution-Suite/grid-data-models/actions/workflows/deploy.yml/badge.svg)](https://github.com/NLR-Distribution-Suite/grid-data-models/actions/workflows/deploy.yml) • ![PyPI - Downloads](https://img.shields.io/pypi/dm/grid-data-models) •  [![codecov](https://codecov.io/github/NLR-Distribution-Suite/grid-data-models/branch/main/graph/badge.svg?token=K0X11EXOX8)](https://codecov.io/github/NLR-Distribution-Suite/grid-data-models) •  [![CodeFactor](https://www.codefactor.io/repository/github/nlr-distribution-suite/grid-data-models/badge)](https://www.codefactor.io/repository/github/nlr-distribution-suite/grid-data-models) • ![MCP Server](https://img.shields.io/badge/MCP_Server-enabled-brightgreen) • ![MCP Tools](https://img.shields.io/badge/MCP_Tools-20-blue) • [![GitHub issues](https://img.shields.io/github/issues/NLR-Distribution-Suite/grid-data-models)](https://github.com/NLR-Distribution-Suite/grid-data-models/issues) • [![License](https://img.shields.io/github/license/NLR-Distribution-Suite/grid-data-models)](https://github.com/NLR-Distribution-Suite/grid-data-models/blob/main/LICENSE.txt) •  [![PyPI Downloads](https://static.pepy.tech/personalized-badge/grid-data-models?period=total&units=INTERNATIONAL_SYSTEM&left_color=BLACK&right_color=GREEN&left_text=downloads)](https://pepy.tech/projects/grid-data-models) • [![Generate LinkedIn Post Draft](https://github.com/NLR-Distribution-Suite/grid-data-models/actions/workflows/linkedin_draft.yml/badge.svg)](https://github.com/NLR-Distribution-Suite/grid-data-models/actions/workflows/linkedin_draft.yml)
+[![Upload to PyPi](https://github.com/NLR-Distribution-Suite/grid-data-models/actions/workflows/publish_to_pypi.yml/badge.svg)](https://github.com/NLR-Distribution-Suite/grid-data-models/actions/workflows/publish_to_pypi.yml) •  [![Pytest](https://github.com/NLR-Distribution-Suite/grid-data-models/actions/workflows/pull_request_tests.yml/badge.svg)](https://github.com/NLR-Distribution-Suite/grid-data-models/actions/workflows/pull_request_tests.yml) •  [![deploy-book](https://github.com/NLR-Distribution-Suite/grid-data-models/actions/workflows/deploy.yml/badge.svg?branch=main)](https://github.com/NLR-Distribution-Suite/grid-data-models/actions/workflows/deploy.yml) • ![PyPI - Downloads](https://img.shields.io/pypi/dm/grid-data-models) •  [![codecov](https://codecov.io/github/NLR-Distribution-Suite/grid-data-models/branch/main/graph/badge.svg?token=K0X11EXOX8)](https://codecov.io/github/NLR-Distribution-Suite/grid-data-models) •  [![CodeFactor](https://www.codefactor.io/repository/github/nlr-distribution-suite/grid-data-models/badge)](https://www.codefactor.io/repository/github/nlr-distribution-suite/grid-data-models) • ![MCP Server](https://img.shields.io/badge/MCP_Server-enabled-brightgreen) • ![MCP Tools](https://img.shields.io/badge/MCP_Tools-20-blue) • [![GitHub issues](https://img.shields.io/github/issues/NLR-Distribution-Suite/grid-data-models)](https://github.com/NLR-Distribution-Suite/grid-data-models/issues) • [![License](https://img.shields.io/github/license/NLR-Distribution-Suite/grid-data-models)](https://github.com/NLR-Distribution-Suite/grid-data-models/blob/main/LICENSE.txt) •  [![PyPI Downloads](https://static.pepy.tech/personalized-badge/grid-data-models?period=total&units=INTERNATIONAL_SYSTEM&left_color=BLACK&right_color=GREEN&left_text=downloads)](https://pepy.tech/projects/grid-data-models) • [![Generate LinkedIn Post Draft](https://github.com/NLR-Distribution-Suite/grid-data-models/actions/workflows/linkedin_draft.yml/badge.svg)](https://github.com/NLR-Distribution-Suite/grid-data-models/actions/workflows/linkedin_draft.yml)
 
 # Grid Data Models (GDM)
 
 GDM is a python package containing data models for power system assets and datasets. This package is actively being developed at [National Renewable Energy Laboratory (NREL)](https://www.nrel.gov/).
 
+GDM models distribution networks and utility substations as complementary
+systems. `DistributionSystem` represents feeder and network connectivity;
+`SubstationSystem` represents station topology, primary equipment, protection,
+metering, and automation. They can remain separate or be joined at explicit
+feeder boundaries. See the [system model guide](docs/systems/index.md) and the
+[guide to connecting systems](docs/systems/connecting-systems.md).
+
 ## Installation
 
 You can install the latest version of `grid-data-models` from PyPi.

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

@@ -17,6 +17,7 @@ authors = [
 ]
 classifiers = [
   "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
   "License :: OSI Approved :: BSD License",
   "Operating System :: OS Independent",
 ]
@@ -24,19 +25,19 @@ dependencies = [
   "semver",
   "networkx", 
   "pydantic",
-  "infrasys~=1.2", 
+  "infrasys==1.2.1", 
   "importlib_metadata",
   "typer",
-  "pandas~=3.0.3",
+  "pandas~=3.0.6",
   "geopandas",
   "plotly",
 ]
 
 [project.optional-dependencies]
-mcp = ["mcp>=1.28.1"]
+mcp = ["mcp>=2.2.0"]
 dev = ["pre-commit", "pytest", "pytest-cov", "pytest-doctestplus", "pytest-asyncio", "ruff", "docutils"]
 doc = [
-  "jupyter-book>=2.1.6,<3",
+  "jupyter-book>=2.1.7,<3",
   "sphinx",
   "pydata-sphinx-theme",
   "myst-parser",

{grid_data_models-2.3.7 → grid_data_models-2.4.0}/src/gdm/cli/reducer.py

@@ -5,8 +5,8 @@ from typing import Annotated
 
 import typer
 
-from gdm.distribution.model_reduction.reducer import reduce_to_three_phase_system
-from gdm.distribution.distribution_system import DistributionSystem
+from gdm.systems.distribution.model_reduction.reducer import reduce_to_three_phase_system
+from gdm.systems.distribution.distribution_system import DistributionSystem
 from gdm.exceptions import FolderAlreadyExistsError
 
 

grid_data_models-2.4.0/src/gdm/distribution/__init__.py

@@ -0,0 +1,44 @@
+"""Compatibility namespace for the former ``gdm.distribution`` package.
+
+The implementation now lives under :mod:`gdm.systems.distribution`. Legacy imports and
+serialized component module paths are mapped to the canonical modules so
+classes are not duplicated during a migration.
+"""
+
+from __future__ import annotations
+
+import importlib
+import pkgutil
+import sys
+import warnings
+
+
+_CANONICAL_PACKAGE = "gdm.systems.distribution"
+warnings.warn(
+    "gdm.distribution is deprecated and will be removed in a future release; "
+    "use gdm.systems.distribution instead.",
+    DeprecationWarning,
+    stacklevel=2,
+)
+_canonical_package = importlib.import_module(_CANONICAL_PACKAGE)
+
+for name, value in vars(_canonical_package).items():
+    if not name.startswith("__") or name in {"__version__"}:
+        globals()[name] = value
+
+_module_names = [
+    module_info.name
+    for module_info in pkgutil.walk_packages(
+        _canonical_package.__path__, prefix=f"{_CANONICAL_PACKAGE}."
+    )
+]
+
+for canonical_name in sorted(_module_names, key=lambda name: (name.count("."), name)):
+    legacy_name = f"{__name__}{canonical_name[len(_CANONICAL_PACKAGE) :]}"
+    module = importlib.import_module(canonical_name)
+    sys.modules[legacy_name] = module
+
+    parent_name, child_name = legacy_name.rsplit(".", 1)
+    parent = sys.modules.get(parent_name)
+    if parent is not None:
+        setattr(parent, child_name, module)

{grid_data_models-2.3.7 → grid_data_models-2.4.0}/src/gdm/mcp/inspection/inspector.py

@@ -4,7 +4,7 @@ import contextlib
 from collections import defaultdict
 from uuid import UUID
 
-from gdm.distribution import DistributionSystem
+from gdm.systems.distribution import DistributionSystem
 
 from gdm.mcp.exceptions import ComponentNotFoundError
 from gdm.mcp.schemas import (

{grid_data_models-2.3.7 → grid_data_models-2.4.0}/src/gdm/mcp/inspection/relationships.py

@@ -3,7 +3,7 @@
 import contextlib
 from uuid import UUID
 
-from gdm.distribution import DistributionSystem
+from gdm.systems.distribution import DistributionSystem
 
 from gdm.mcp.schemas import ComponentInfo
 

{grid_data_models-2.3.7 → grid_data_models-2.4.0}/src/gdm/mcp/inspection/topology.py

@@ -3,7 +3,7 @@
 from typing import Optional
 
 import networkx as nx
-from gdm.distribution import DistributionSystem
+from gdm.systems.distribution import DistributionSystem
 from gdm.exceptions import MultipleOrEmptyVsourceFound
 
 from gdm.mcp.exceptions import TopologyError

{grid_data_models-2.3.7 → grid_data_models-2.4.0}/src/gdm/mcp/knowledge/documentation.py

@@ -6,7 +6,7 @@ from pathlib import Path
 from typing import List, Optional, Dict, Any
 import inspect
 
-from gdm.distribution.components import (
+from gdm.systems.distribution.components import (
     DistributionBus,
     DistributionSubstation,
     DistributionFeeder,
@@ -56,11 +56,10 @@ def find_gdm_repo() -> Optional[Path]:
     possible_paths = [
         Path.cwd().parent / "grid-data-models",  # Sibling directory
         Path.cwd() / ".." / "grid-data-models",  # Relative sibling
-        Path(__file__).parent.parent.parent.parent.parent / "grid-data-models",  # From this file
+        Path(__file__).resolve().parents[4],  # This checkout's repository root
         Path.home() / "Documents" / "GitHub" / "grid-data-models",
         Path.home() / "Documents" / "grid-data-models",
         Path.home() / "grid-data-models",
-        Path("/Users/alatif/Documents/GitHub/grid-data-models"),  # Known location
     ]
 
     # Also check GDM_REPO_PATH environment variable

{grid_data_models-2.3.7 → grid_data_models-2.4.0}/src/gdm/mcp/operations/merger.py

@@ -3,7 +3,7 @@
 from collections import defaultdict
 from uuid import UUID
 
-from gdm.distribution import DistributionSystem
+from gdm.systems.distribution import DistributionSystem
 
 from gdm.mcp.exceptions import MergeConflictError
 from gdm.mcp.schemas import MergeConflict, MergeReport

{grid_data_models-2.3.7 → grid_data_models-2.4.0}/src/gdm/mcp/operations/splitter.py

@@ -3,8 +3,8 @@
 from collections import defaultdict
 from typing import Optional
 
-from gdm.distribution import DistributionSystem
-from gdm.distribution.components import DistributionBus
+from gdm.systems.distribution import DistributionSystem
+from gdm.systems.distribution.components import DistributionBus
 
 from gdm.mcp.schemas import SplitReport
 

{grid_data_models-2.3.7 → grid_data_models-2.4.0}/src/gdm/mcp/server.py

@@ -12,10 +12,10 @@ import sqlite3
 from typing import Annotated, Any
 
 import typer
-from gdm.distribution import DistributionSystem
-from mcp.server import Server
+from gdm.systems.distribution import DistributionSystem
+from mcp.server import Server, ServerRequestContext
 from mcp.server.stdio import stdio_server
-from mcp.types import TextContent, Tool
+from mcp.types import CallToolResult, ListToolsResult, TextContent, Tool
 
 from gdm.mcp import __version__
 from gdm.mcp.exceptions import GDMMCPException
@@ -42,7 +42,7 @@ from gdm.mcp.knowledge.documentation import (
     list_available_components as list_components_doc,
     get_component_fields as get_fields_doc,
 )
-from gdm.distribution.model_reduction.reducer import (
+from gdm.systems.distribution.model_reduction.reducer import (
     reduce_to_primary_system,
     reduce_to_three_phase_system,
 )
@@ -51,9 +51,6 @@ from gdm.distribution.model_reduction.reducer import (
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger("gdm_mcp")
 
-# Create MCP server instance
-app = Server("grid-data-models-mcp")
-
 # Runtime toggle for serving tool calls. Control tools remain available.
 _TOOL_CALLS_ENABLED = True
 _CONTROL_TOOLS = {"set_tool_calls_enabled", "get_tool_calls_enabled"}
@@ -185,10 +182,9 @@ def _split_tool_input_schema() -> dict[str, Any]:
     }
 
 
-@app.list_tools()
-async def list_tools() -> list[Tool]:
+async def list_tools(ctx: ServerRequestContext, params=None) -> ListToolsResult:
     """List all available MCP tools."""
-    return [
+    tools = [
         # Validation tools
         Tool(
             name="diagnose_system",
@@ -686,6 +682,7 @@ async def list_tools() -> list[Tool]:
             },
         ),
     ]
+    return ListToolsResult(tools=tools)
 
 
 # Tool dispatch map
@@ -717,27 +714,30 @@ _TOOL_HANDLERS: dict[str, Any] = {
 }
 
 
-@app.call_tool()
-async def call_tool(name: str, arguments: Any) -> list[TextContent]:
+async def call_tool(ctx: ServerRequestContext, params: Any) -> CallToolResult:
     """Handle tool calls from MCP clients."""
+    name = params.name
+    arguments = params.arguments or {}
     try:
         logger.info(f"Tool called: {name} with arguments: {arguments}")
 
         if not _TOOL_CALLS_ENABLED and name not in _CONTROL_TOOLS:
-            return [
-                TextContent(
-                    type="text",
-                    text=json.dumps(
-                        {
-                            "error": (
-                                "Tool calls are currently disabled. "
-                                "Use set_tool_calls_enabled to re-enable."
-                            )
-                        },
-                        indent=2,
-                    ),
-                )
-            ]
+            return CallToolResult(
+                content=[
+                    TextContent(
+                        type="text",
+                        text=json.dumps(
+                            {
+                                "error": (
+                                    "Tool calls are currently disabled. "
+                                    "Use set_tool_calls_enabled to re-enable."
+                                )
+                            },
+                            indent=2,
+                        ),
+                    )
+                ]
+            )
 
         handler = _TOOL_HANDLERS.get(name)
         if handler is not None:
@@ -745,18 +745,27 @@ async def call_tool(name: str, arguments: Any) -> list[TextContent]:
         else:
             result = {"error": f"Unknown tool: {name}"}
 
-        return [TextContent(type="text", text=json.dumps(result, indent=2, default=str))]
+        return CallToolResult(
+            content=[TextContent(type="text", text=json.dumps(result, indent=2, default=str))]
+        )
 
     except GDMMCPException as e:
         logger.error(f"GDM MCP error in {name}: {str(e)}")
-        return [TextContent(type="text", text=json.dumps({"error": str(e)}, indent=2))]
+        return CallToolResult(
+            content=[TextContent(type="text", text=json.dumps({"error": str(e)}, indent=2))],
+            is_error=True,
+        )
     except Exception as e:
         logger.error(f"Unexpected error in {name}: {str(e)}", exc_info=True)
-        return [
-            TextContent(
-                type="text", text=json.dumps({"error": f"Unexpected error: {str(e)}"}, indent=2)
-            )
-        ]
+        return CallToolResult(
+            content=[
+                TextContent(
+                    type="text",
+                    text=json.dumps({"error": f"Unexpected error: {str(e)}"}, indent=2),
+                )
+            ],
+            is_error=True,
+        )
 
 
 # Tool implementations
@@ -1079,6 +1088,13 @@ def _run_server(
     # Run the server
     import asyncio
 
+    app = Server(
+        "grid-data-models-mcp",
+        version=__version__,
+        on_list_tools=list_tools,
+        on_call_tool=call_tool,
+    )
+
     async def run():
         async with stdio_server() as (read_stream, write_stream):
             await app.run(read_stream, write_stream, app.create_initialization_options())

{grid_data_models-2.3.7 → grid_data_models-2.4.0}/src/gdm/mcp/utilities/subsystem.py

@@ -1,7 +1,7 @@
 """Subsystem extraction utilities."""
 
-from gdm.distribution import DistributionSystem
-from gdm.distribution.components import DistributionBus
+from gdm.systems.distribution import DistributionSystem
+from gdm.systems.distribution.components import DistributionBus
 from infrasys import SingleTimeSeries
 
 

{grid_data_models-2.3.7 → grid_data_models-2.4.0}/src/gdm/mcp/utilities/timeseries.py

@@ -4,7 +4,7 @@ from collections import defaultdict
 from typing import Optional
 from uuid import UUID
 
-from gdm.distribution import DistributionSystem
+from gdm.systems.distribution import DistributionSystem
 
 from gdm.mcp.schemas import TimeSeriesInfo
 

{grid_data_models-2.3.7 → grid_data_models-2.4.0}/src/gdm/mcp/validation/auto_fixer.py

@@ -4,7 +4,7 @@ import copy
 from datetime import datetime
 from typing import Any
 
-from gdm.distribution import DistributionSystem
+from gdm.systems.distribution import DistributionSystem
 
 from gdm.mcp.schemas import (
     ChangeLogEntry,

{grid_data_models-2.3.7 → grid_data_models-2.4.0}/src/gdm/mcp/validation/diagnostics.py

@@ -5,7 +5,7 @@ import traceback
 from typing import Any
 from uuid import UUID
 
-from gdm.distribution import DistributionSystem
+from gdm.systems.distribution import DistributionSystem
 from pydantic import ValidationError as PydanticValidationError
 
 from gdm.mcp.schemas import (

{grid_data_models-2.3.7 → grid_data_models-2.4.0}/src/gdm/quantities.py

@@ -84,3 +84,9 @@ class Irradiance(BaseQuantity):
     """Quantity representing irradiance in kilowatt per meter**2"""
 
     __base_unit__ = "kilowatt/meter**2"
+
+
+class Frequency(BaseQuantity):
+    """Quantity representing frequency."""
+
+    __base_unit__ = "hertz"

grid_data_models-2.4.0/src/gdm/systems/__init__.py

@@ -0,0 +1 @@
+"""System model namespaces."""

grid_data_models-2.4.0/src/gdm/systems/distribution/__init__.py

@@ -0,0 +1,13 @@
+from gdm.version import VERSION
+
+__version__ = VERSION
+
+# from gdm.tracked_changes import apply_tracked_changes, apply_update_scenario, get_distribution_system_on_date
+from gdm.systems.distribution.model_reduction.reducer import (
+    reduce_to_primary_system,
+    reduce_to_radial_network,
+    reduce_to_three_phase_system,
+)
+from gdm.systems.distribution.distribution_graph import build_graph_from_system
+from gdm.systems.distribution.distribution_system import DistributionSystem
+from gdm.systems.distribution.catalog_system import CatalogSystem

grid_data_models-2.4.0/src/gdm/systems/distribution/common/__init__.py

@@ -0,0 +1,4 @@
+from gdm.systems.distribution.common.limitset import ThermalLimitSet, VoltageLimitSet
+from gdm.systems.distribution.common.curve import Curve, TimeCurrentCurve
+from gdm.systems.distribution.common.sequence_pair import SequencePair
+from infrasys import Location

{grid_data_models-2.3.7/src/gdm → grid_data_models-2.4.0/src/gdm/systems}/distribution/common/limitset.py

@@ -5,7 +5,7 @@ from infrasys import Component
 from pydantic import Field
 
 from gdm.quantities import Current, Voltage
-from gdm.distribution.enums import LimitType
+from gdm.systems.distribution.enums import LimitType
 from gdm.constants import PINT_SCHEMA
 
 

grid_data_models-2.4.0/src/gdm/systems/distribution/components/__init__.py

@@ -0,0 +1,31 @@
+from gdm.systems.distribution.components.distribution_battery import DistributionBattery
+from gdm.systems.distribution.components.distribution_bus import DistributionBus
+from gdm.systems.distribution.components.distribution_capacitor import DistributionCapacitor
+from gdm.systems.distribution.components.distribution_load import DistributionLoad
+from gdm.systems.distribution.components.distribution_regulator import DistributionRegulator
+from gdm.systems.distribution.components.distribution_solar import DistributionSolar
+from gdm.systems.distribution.components.distribution_transformer import DistributionTransformer
+from gdm.systems.distribution.components.distribution_vsource import DistributionVoltageSource
+from gdm.systems.distribution.components.geometry_branch import GeometryBranch
+from gdm.systems.distribution.components.geometry_switch import GeometrySwitch
+from gdm.systems.distribution.components.matrix_impedance_branch import MatrixImpedanceBranch
+from gdm.systems.distribution.components.matrix_impedance_fuse import MatrixImpedanceFuse
+from gdm.systems.distribution.components.matrix_impedance_recloser import MatrixImpedanceRecloser
+from gdm.systems.distribution.components.matrix_impedance_switch import MatrixImpedanceSwitch
+from gdm.systems.distribution.components.sequence_impedance_branch import SequenceImpedanceBranch
+from gdm.systems.distribution.components.distribution_reactor import DistributionReactor
+from gdm.systems.distribution.components.distribution_feeder import DistributionFeeder
+
+from gdm.systems.distribution.components.base.distribution_branch_base import (
+    DistributionBranchBase,
+)
+from gdm.systems.distribution.components.base.distribution_component_base import (
+    DistributionComponentBase,
+)
+from gdm.systems.distribution.components.base.distribution_switch_base import (
+    DistributionSwitchBase,
+)
+from gdm.systems.distribution.components.base.distribution_transformer_base import (
+    DistributionTransformerBase,
+)
+from gdm.systems.distribution.components.distribution_substation import DistributionSubstation

{grid_data_models-2.3.7/src/gdm → grid_data_models-2.4.0/src/gdm/systems}/distribution/components/base/distribution_branch_base.py

@@ -7,9 +7,9 @@ import math
 
 from pydantic import model_validator, Field
 
-from gdm.distribution.components.distribution_bus import DistributionBus
-from gdm.distribution.enums import Phase
-from gdm.distribution.components.base.distribution_component_base import (
+from gdm.systems.distribution.components.distribution_bus import DistributionBus
+from gdm.systems.distribution.enums import Phase, VoltageTypes
+from gdm.systems.distribution.components.base.distribution_component_base import (
     InServiceDistributionComponentBase,
 )
 from gdm.quantities import Distance
@@ -48,14 +48,25 @@ class DistributionBranchBase(InServiceDistributionComponentBase, ABC):
             )
             raise ValueError(msg)
 
+        rated_voltage_LN_from = (
+            self.buses[0].rated_voltage
+            if self.buses[0].voltage_type == VoltageTypes.LINE_TO_GROUND
+            else self.buses[0].rated_voltage / math.sqrt(3)
+        )
+        rated_voltage_LN_to = (
+            self.buses[1].rated_voltage
+            if self.buses[1].voltage_type == VoltageTypes.LINE_TO_GROUND
+            else self.buses[1].rated_voltage / math.sqrt(3)
+        )
+
         if not math.isclose(
-            self.buses[0].rated_voltage.magnitude,
-            self.buses[1].rated_voltage.magnitude,
+            rated_voltage_LN_from.magnitude,
+            rated_voltage_LN_to.magnitude,
             rel_tol=0.001,  # 10^-3
         ):
             msg = (
-                f"From bus {self.buses[0].rated_voltage=}"
-                f"and to bus voltage {self.buses[1].rated_voltage=} rating should be same."
+                f"From bus line to ground voltage {rated_voltage_LN_from=}"
+                f"and to bus line to ground voltage {rated_voltage_LN_to=} rating should be same."
             )
             raise ValueError(msg)
 

{grid_data_models-2.3.7/src/gdm → grid_data_models-2.4.0/src/gdm/systems}/distribution/components/base/distribution_component_base.py

@@ -7,8 +7,8 @@ from abc import ABC
 from pydantic import Field
 from infrasys import Component
 
-from gdm.distribution.components.distribution_feeder import DistributionFeeder
-from gdm.distribution.components.distribution_substation import DistributionSubstation
+from gdm.systems.distribution.components.distribution_feeder import DistributionFeeder
+from gdm.systems.distribution.components.distribution_substation import DistributionSubstation
 
 
 class DistributionComponentBase(Component, ABC):

{grid_data_models-2.3.7/src/gdm → grid_data_models-2.4.0/src/gdm/systems}/distribution/components/base/distribution_switch_base.py

@@ -3,7 +3,9 @@ from abc import ABC
 
 from pydantic import model_validator, Field
 
-from gdm.distribution.components.base.distribution_branch_base import DistributionBranchBase
+from gdm.systems.distribution.components.base.distribution_branch_base import (
+    DistributionBranchBase,
+)
 
 
 class DistributionSwitchBase(DistributionBranchBase, ABC):

{grid_data_models-2.3.7/src/gdm → grid_data_models-2.4.0/src/gdm/systems}/distribution/components/base/distribution_transformer_base.py

@@ -7,12 +7,12 @@ from abc import ABC
 from infrasys.quantities import Voltage
 from pydantic import Field, model_validator
 
-from gdm.distribution.enums import Phase, VoltageTypes
-from gdm.distribution.components.distribution_bus import DistributionBus
-from gdm.distribution.components.base.distribution_component_base import (
+from gdm.systems.distribution.enums import Phase, VoltageTypes
+from gdm.systems.distribution.components.distribution_bus import DistributionBus
+from gdm.systems.distribution.components.base.distribution_component_base import (
     InServiceDistributionComponentBase,
 )
-from gdm.distribution.equipment.distribution_transformer_equipment import (
+from gdm.systems.distribution.equipment.distribution_transformer_equipment import (
     DistributionTransformerEquipment,
 )