Moved gridappsd.field_interface to gridappsd_field_bus.field_interface #164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

poorva1209 merged 6 commits into GRIDAPPSD:develop from craig8:move_gridappsd_field_bus

Feb 3, 2025

.github/workflows/run-pytest.yml

This file was deleted.

.pre-commit-config.yaml

-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,7 @@ repos: @@
       - id: trailing-whitespace
       - id: check-merge-conflict
       - id: no-commit-to-branch  # blocks main commits.  To bypass do git commit --allow-empty
-      - id: pretty-format-json
+    #  - id: pretty-format-json
     #- repo: https://github.com/pre-commit/mirrors-autopep8
@@ Expand Down @@

gridappsd-field-bus-lib/gridappsd/__no_init__here

Empty file.

gridappsd-field-bus-lib/gridappsd/field_interface/__init__.py

This file was deleted.

gridappsd-field-bus-lib/gridappsd_field_bus/__init__.py

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		from gridappsd_field_bus.field_interface.interfaces import FieldMessageBus
		from gridappsd_field_bus.field_interface.interfaces import MessageBusDefinition

gridappsd-field-bus-lib/gridappsd_field_bus/field_interface/__init__.py

-Original file line number
+Diff line change
@@ -0,0 +1,8 @@
+    from typing import List
+    from gridappsd_field_bus.field_interface import interfaces
+    from gridappsd_field_bus.field_interface.context import LocalContext
+    from gridappsd_field_bus.field_interface.interfaces import MessageBusDefinition
+    from gridappsd_field_bus.field_interface import context_managers
+    __all__: List[str] = ["LocalContext", "MessageBusDefinition", "context_managers", "interfaces"]

...dappsd/field_interface/agents/__init__.py → ...ld_bus/field_interface/agents/__init__.py

-Original file line number
+Diff line change
@@ -1,6 +1,6 @@
     from typing import List
-    from gridappsd.field_interface.agents.agents import (FeederAgent, DistributedAgent,
+    from gridappsd_field_bus.field_interface.agents.agents import (FeederAgent, DistributedAgent,
                                                          CoordinatingAgent, SwitchAreaAgent,
                                                          SecondaryAreaAgent, SubstationAgent)
@@ Expand Down @@

...ridappsd/field_interface/agents/agents.py → ...ield_bus/field_interface/agents/agents.py

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -13,9 +13,9 @@
  
    from gridappsd import DifferenceBuilder

    import gridappsd.topics as t

    from gridappsd.field_interface.context import LocalContext

    from gridappsd.field_interface.gridappsd_field_bus import GridAPPSDMessageBus

    from gridappsd.field_interface.interfaces import (FieldMessageBus, MessageBusDefinition)

    from gridappsd_field_bus.field_interface.context import LocalContext

    from gridappsd_field_bus.field_interface.gridappsd_field_bus import GridAPPSDMessageBus

    from gridappsd_field_bus.field_interface.interfaces import (FieldMessageBus, MessageBusDefinition)

    CIM_PROFILE = None

    IEC61970_301 = None

...-lib/gridappsd/field_interface/context.py → ...ppsd_field_bus/field_interface/context.py

-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
     from gridappsd import DifferenceBuilder
-    from gridappsd.field_interface.interfaces import FieldMessageBus
+    from gridappsd_field_bus.field_interface.interfaces import FieldMessageBus
     import dataclasses
     import gridappsd.topics as t
     import json
@@ Expand Down @@

...ld_interface/context_managers/__init__.py → ...ld_interface/context_managers/__init__.py

-Original file line number
+Diff line change
@@ -1,6 +1,6 @@
     from typing import List
-    from gridappsd.field_interface.context_managers.context_manager_agents import (SubstationAreaContextManager,
+    from gridappsd_field_bus.field_interface.context_managers.context_manager_agents import (SubstationAreaContextManager,
                                                                     FeederAreaContextManager,
                                                                     SwitchAreaContextManager,
                                                                     SecondaryAreaContextManager)
@@ Expand Down @@

..._managers/centralized_context_managers.py → ..._managers/centralized_context_managers.py

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -9,9 +9,9 @@
  
    from cimgraph.data_profile import CIM_PROFILE

    from gridappsd import GridAPPSD

    import gridappsd.topics as t

    import gridappsd.field_interface.agents.agents as agents_mod

    from gridappsd.field_interface.context_managers.utils import REQUEST_FIELD, get_MessageBusDefinition

    from gridappsd.field_interface.context_managers.context_manager_agents import FeederAreaContextManager, SwitchAreaContextManager, SecondaryAreaContextManager

    import gridappsd_field_bus.field_interface.agents.agents as agents_mod

    from gridappsd_field_bus.field_interface.context_managers.utils import REQUEST_FIELD, get_MessageBusDefinition

    from gridappsd_field_bus.field_interface.context_managers.context_manager_agents import FeederAreaContextManager, SwitchAreaContextManager, SecondaryAreaContextManager

    cim_profile = CIM_PROFILE.CIMHUB_2023.value

    agents_mod.set_cim_profile(cim_profile=cim_profile, iec61970_301=7)

...ontext_managers/context_manager_agents.py → ...ontext_managers/context_manager_agents.py

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -4,9 +4,9 @@
  
    import gridappsd.topics as t

    from gridappsd import GridAPPSD

    from gridappsd.field_interface.agents import (SubstationAgent, FeederAgent, SecondaryAreaAgent, SwitchAreaAgent)

    from gridappsd.field_interface.interfaces import MessageBusDefinition

    from gridappsd.field_interface.context_managers.utils import REQUEST_FIELD

    from gridappsd_field_bus.field_interface.agents import (SubstationAgent, FeederAgent, SecondaryAreaAgent, SwitchAreaAgent)

    from gridappsd_field_bus.field_interface.interfaces import MessageBusDefinition

    from gridappsd_field_bus.field_interface.context_managers.utils import REQUEST_FIELD

    logging.basicConfig(level=logging.DEBUG)

    logging.getLogger('goss').setLevel(logging.ERROR)

..._interface/context_managers/substation.py → ..._interface/context_managers/substation.py

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -5,9 +5,9 @@
  
    from cimgraph.data_profile import CIM_PROFILE

    import gridappsd.field_interface.agents.agents as agents_mod

    from gridappsd.field_interface.interfaces import MessageBusDefinition

    from gridappsd.field_interface.context_managers.context_manager_agents import SubstationAreaContextManager

    import gridappsd_field_bus.field_interface.agents.agents as agents_mod

    from gridappsd_field_bus.field_interface.interfaces import MessageBusDefinition

    from gridappsd_field_bus.field_interface.context_managers.context_manager_agents import SubstationAreaContextManager

    cim_profile = "cimhub_2023"

...field_interface/context_managers/utils.py → ...field_interface/context_managers/utils.py

-Original file line number
+Diff line change
@@ -1,7 +1,7 @@
     import os
     import gridappsd.topics as t
-    from gridappsd.field_interface.interfaces import MessageBusDefinition
+    from gridappsd_field_bus.field_interface.interfaces import MessageBusDefinition
     #FieldBusManager's request topics. To be used only by context manager user role only.
     REQUEST_FIELD = ".".join((t.PROCESS_PREFIX, "request.field"))
@@ Expand Down @@

0 .../field_interface/field_proxy_forwarder.py → .../field_interface/field_proxy_forwarder.py

File renamed without changes.

...sd/field_interface/gridappsd_field_bus.py → ...us/field_interface/gridappsd_field_bus.py

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,6 +1,6 @@
  
    from gridappsd import GridAPPSD

    from gridappsd.field_interface.interfaces import FieldMessageBus

    from gridappsd.field_interface.interfaces import MessageBusDefinition

    from gridappsd_field_bus.field_interface.interfaces import FieldMessageBus

    from gridappsd_field_bus.field_interface.interfaces import MessageBusDefinition

    from typing import Any

0 ...b/gridappsd/field_interface/interfaces.py → ...d_field_bus/field_interface/interfaces.py

File renamed without changes.

gridappsd-field-bus-lib/pyproject.toml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,6 +1,6 @@
  
    [tool.poetry]

    name = "gridappsd-field-bus"

    version = "2024.8.1a1"

    version = "2024.12.0.a1"

    description = "GridAPPS-D Field Bus Implementation"

    authors = [

        "C. Allwardt <3979063+craig8@users.noreply.github.com>",

    @@ -12,13 +12,13 @@ license = "BSD-3-Clause"
  
    repository = "https://github.com/GRIDAPPSD/gridappsd-python"

    homepage = "https://gridappsd.readthedocs.io"

    keywords = ["gridappsd", "grid", "activmq", "powergrid", "simulation", "library"]

    keywords = ["gridappsd", "grid", "activemq", "powergrid", "simulation", "library"]

    readme = "README.md"

    packages = [

        { include = 'gridappsd'}

        { include = 'gridappsd_field_bus'}

    ]

    [tool.poetry.scripts]

    @@ -27,16 +27,17 @@ packages = [
  
    context_manager = 'gridappsd.field_interface.context_manager:_main'

    [tool.poetry.dependencies]

    python = ">=3.8.1,<4.0"

    python = ">=3.10,<4.0"

    gridappsd-python = { path="../gridappsd-python-lib", develop = true}

    cim-graph = ">=0.1.1a0"

    [tool.poetry.group.dev.dependencies]

    pytest = "^6.2.2"

    pytest = "^8.3.4"

    pytest-html = "^3.1.1"

    mock = "^4.0.3"

    docker = "^4.4.4"

    yapf = "^0.32.0"

    pre-commit = "^4.1.0"

    [build-system]

    requires = ["poetry-core>=1.2.0"]

gridappsd-field-bus-lib/tests/test_import_field_deprecated_from_gridappsd.py

-Original file line number
+Diff line change
@@ -0,0 +1,28 @@
+    def test_modules_are_the_same():
+        import sys
+        # Note these are dynamically loaded please use gridappsd_field_bus packages instead.
+        from gridappsd.field_interface import interfaces
+        from gridappsd.field_interface import context
+        from gridappsd.field_interface import context_managers
+        from gridappsd.field_interface import agents
+        from gridappsd.field_interface import gridappsd_field_bus
+        from gridappsd_field_bus.field_interface import interfaces as field_bus_interfaces
+        from gridappsd_field_bus.field_interface import context as field_context
+        from gridappsd_field_bus.field_interface import context_managers as field_context_managers
+        from gridappsd_field_bus.field_interface import agents as field_agents
+        from gridappsd_field_bus.field_interface import gridappsd_field_bus as field_gridappsd_field_bus
+        from gridappsd.field_interface.interfaces import FieldMessageBus
+        from gridappsd_field_bus.field_interface.interfaces import FieldMessageBus as field_FieldMessageBus
+        assert interfaces == field_bus_interfaces
+        assert context_managers == field_context_managers
+        assert context == field_context
+        assert agents == field_agents
+        assert gridappsd_field_bus == field_gridappsd_field_bus
+        assert FieldMessageBus == field_FieldMessageBus

gridappsd-python-lib/gridappsd/field_interface/__init__.py

-Original file line number
+Diff line change
@@ -0,0 +1,32 @@
+    import logging
+    import sys
+    _log = logging.getLogger(__name__)
+    try:
+        import warnings
+        import gridappsd_field_bus.field_interface.context as _context
+        import gridappsd_field_bus.field_interface.context_managers as _context_managers
+        import gridappsd_field_bus.field_interface as _field_interface
+        import gridappsd_field_bus.field_interface.agents as _agents
+        import gridappsd_field_bus.field_interface.field_proxy_forwarder as _field_proxy_forwarder
+        import gridappsd_field_bus.field_interface.gridappsd_field_bus as _gridappsd_field_bus
+        import gridappsd_field_bus.field_interface.interfaces as _interfaces
+        sys.modules['gridappsd.field_interface'] = _field_interface
+        sys.modules['gridappsd.field_interface.interfaces'] = _interfaces
+        sys.modules['gridappsd.field_interface.context_managers'] = _context_managers
+        sys.modules['gridappsd_.context_managers'] = _context_managers
+        sys.modules['gridappsd.field_interface.agents'] = _agents
+        sys.modules['gridappsd.field_interface.field_proxy_forwarder'] = _field_proxy_forwarder
+        sys.modules['gridappsd.field_interface.gridappsd_field_bus'] = _gridappsd_field_bus
+        warnings.warn(message="gridappsd.field_interface is deprecated and will be removed in a future release. Use gridappsd_field_bus.field_interface instead.",
+                      category=DeprecationWarning)
+    except ImportError:
+        _log.error("Could not import field_interface install gridappsd-field-bus to get those functions.")

gridappsd-python-lib/pyproject.toml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,6 +1,6 @@
  
    [tool.poetry]

    name = "gridappsd-python"

    version = "2024.8.1a1"

    version = "2024.12.0.a1"

    description = "A GridAPPS-D Python Adapter"

    authors = [

        "C. Allwardt <3979063+craig8@users.noreply.github.com>",

    @@ -12,7 +12,7 @@ license = "BSD-3-Clause"
  
    repository = "https://github.com/GRIDAPPSD/gridappsd-python"

    homepage = "https://gridappsd.readthedocs.io"

    keywords = ["gridappsd", "grid", "activmq", "powergrid", "simulation", "library"]

    keywords = ["gridappsd", "grid", "activemq", "powergrid", "simulation", "library"]

    readme = "README.md"

    @@ -29,21 +29,22 @@ gridappsd-cli = 'gridappsd.cli:_main'
  
    [tool.poetry.dependencies]

    python = ">=3.7.9,<4.0"

    python = ">=3.10,<4.0"

    PyYAML = "^6.0"

    pytz = "^2022.7"

    dateutils = "^0.6.7"

    stomp-py = "6.0.0"

    requests = "2.28.2"

    [tool.poetry.group.dev.dependencies]

    pytest = "^6.2.2"

    pytest = "^8.3.4"

    pytest-html = "^3.1.1"

    mock = "^4.0.3"

    yapf = "^0.32.0"

    mypy = "^1.3.0"

    python-on-whales = "^0.60.1"

    gitpython = "^3.1.31"

    pre-commit = "^4.1.0"

    [build-system]

    requires = ["poetry-core>=1.2.0"]

pyproject.toml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,25 +1,25 @@
  
    [tool.poetry]

    name = "gridappsd-python-workspace"

    version = "2024.8.1a0"

    version = "2024.12.0.a1"

    description = "A GridAPPS-D Python Adapter"

    authors = [

        "C. Allwardt <3979063+craig8@users.noreply.github.com>",

        "P. Sharma <poorva.sharma@pnnl.gov",

        "A. Fisher <andrew.fisher@pnnl.gov"

    ]

    license = "BSD-3-Clause"

    package-mode = false

    repository = "https://github.com/GRIDAPPSD/gridappsd-python"

    homepage = "https://gridappsd.readthedocs.io"

    keywords = ["gridappsd", "grid", "activmq", "powergrid", "simulation", "library"]

    keywords = ["gridappsd", "grid", "activemq", "powergrid", "simulation", "library"]

    readme = "README.md"

    [tool.poetry.dependencies]

    python = ">=3.7.9,<4.0"

    python = ">=3.10,<4.0"

    [build-system]

    requires = ["poetry-core>=1.2.0"]

    requires = ["poetry-core>=2.0.0"]

    build-backend = "poetry.core.masonry.api"

scripts/poetry_install.sh

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,7 +1,7 @@
  
    #!/bin/sh

    # This script reflects the latest changes of pyproject.toml

    #  into both the poetry.lock file and the virtualenv.

    #  by running `poetry lock --no-update && poetry install --sync`

    #  by running `poetry lock && poetry sync`

    # It first configures poetry to use the right python for creation of the virtual env

    set -x

    set -u

    @@ -17,5 +17,5 @@ for p in $_projects
  
    do

      cd "${DIR}/../${p}" || exit

      poetry env use $(which python3) || poetry env use 3.8

      poetry lock --no-update && poetry install --sync

      poetry lock && poetry sync

    done

scripts/poetry_update.sh

-Original file line number
+Diff line change
@@ -1,7 +1,7 @@
     #!/bin/sh
     # This script reflects the latest changes of pyproject.toml
     #  into both the poetry.lock file and the virtualenv.
-    #  by running `poetry update && poetry install --sync`
+    #  by running `poetry update && poetry install sync`
     # It first configures poetry to use the right python for creation of the virtual env
     set -x
     set -u
@@ Expand All / @@ -17,5 +17,5 @@ for p in $_projects @@
     do
       cd "${DIR}/../${p}" || exit
       poetry env use $(which python3) || poetry env use 3.8
-      poetry update && poetry install --sync
+      poetry update && poetry install sync
     done

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Moved gridappsd.field_interface to gridappsd_field_bus.field_interface #164

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!