gridappsd-python 2026.1.1b2__tar.gz → 2026.2.1__tar.gz

{gridappsd_python-2026.1.1b2 → gridappsd_python-2026.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gridappsd-python
-Version: 2026.1.1b2
+Version: 2026.2.1
 Summary: A GridAPPS-D Python Adapter
 Project-URL: Repository, https://github.com/GRIDAPPSD/gridappsd-python
 Project-URL: Homepage, https://gridappsd.readthedocs.io

{gridappsd_python-2026.1.1b2 → gridappsd_python-2026.2.1}/gridappsd/goss.py

@@ -57,6 +57,7 @@ from enum import Enum
 from logging import Logger
 from queue import Queue
 
+import stomp as _stomp_module
 from stomp import Connection12 as Connection
 from stomp.exception import NotConnectedException
 from time import sleep
@@ -65,6 +66,20 @@ from gridappsd import json_extension as json
 
 _log: Logger = logging.getLogger(inspect.getmodulename(__file__))
 
+# stomp.py 8.x changed listener callbacks from (headers, body) to (frame)
+_stomp_major = (
+    int(getattr(_stomp_module, "__version__", (0,))[0])
+    if isinstance(getattr(_stomp_module, "__version__", None), tuple)
+    else 0
+)
+try:
+    from importlib.metadata import version as _pkg_version
+
+    _stomp_major = int(_pkg_version("stomp-py").split(".")[0])
+except Exception:
+    pass
+_STOMP_V8 = _stomp_major >= 8
+
 
 class GRIDAPPSD_ENV_ENUM(Enum):
     GRIDAPPSD_USER = "GRIDAPPSD_USER"
@@ -182,7 +197,12 @@ class GOSS(object):
                 self._topic = topic
                 self.result_format = result_format
 
-            def on_message(self, header, message):
+            def on_message(self, *args):
+                if _STOMP_V8:
+                    frame = args[0]
+                    header, message = frame.headers, frame.body
+                else:
+                    header, message = args[0], args[1]
                 _log.debug("Internal on message is: {} {}".format(header, message))
                 try:
                     if self.result_format == "JSON":
@@ -195,13 +215,15 @@ class GOSS(object):
                 except ValueError:
                     self.response = dict(error="Invalid json returned", header=header, message=message)
 
-            def on_error(self, headers, message):
+            def on_error(self, *args):
+                if _STOMP_V8:
+                    frame = args[0]
+                    headers, message = frame.headers, frame.body
+                else:
+                    headers, message = args[0], args[1]
                 _log.error("ERR: {}".format(headers))
                 _log.error("OUR ERROR: {}".format(message))
 
-            def on_disconnect(self, header, message):
-                _log.debug("Disconnected")
-
         listener = ResponseListener(reply_to, self.result_format)
         self.subscribe(reply_to, listener)
 
@@ -314,18 +336,25 @@ class GOSS(object):
                     def get_token(self):
                         return self.__token
 
-                    def on_message(self, header, message):
+                    def on_message(self, *args):
+                        if _STOMP_V8:
+                            frame = args[0]
+                            header, message = frame.headers, frame.body
+                        else:
+                            header, message = args[0], args[1]
                         _log.debug("Internal on message is: {} {}".format(header, message))
 
                         self.__token = str(message)
 
-                    def on_error(self, headers, message):
+                    def on_error(self, *args):
+                        if _STOMP_V8:
+                            frame = args[0]
+                            headers, message = frame.headers, frame.body
+                        else:
+                            headers, message = args[0], args[1]
                         _log.error("ERR: {}".format(headers))
                         _log.error("OUR ERROR: {}".format(message))
 
-                    def on_disconnect(self, header, message):
-                        _log.debug("Disconnected")
-
                 # receive token and set token variable
                 # set callback
                 listener = TokenResponseListener()
@@ -399,7 +428,12 @@ class CallbackRouter(object):
             except ValueError:
                 pass
 
-    def on_message(self, headers, message):
+    def on_message(self, *args):
+        if _STOMP_V8:
+            frame = args[0]
+            headers, message = frame.headers, frame.body
+        else:
+            headers, message = args[0], args[1]
         destination = headers["destination"]
         # _log.debug("Topic map keys are: {keys}".format(keys=self._topics_callback_map.keys()))
         if destination in self._topics_callback_map:
@@ -407,7 +441,12 @@ class CallbackRouter(object):
         else:
             _log.error("INVALID DESTINATION {destination}".format(destination=destination))
 
-    def on_error(self, header, message):
+    def on_error(self, *args):
+        if _STOMP_V8:
+            frame = args[0]
+            header, message = frame.headers, frame.body
+        else:
+            header, message = args[0], args[1]
         _log.error("Error in callback router")
         _log.error(header)
         _log.error(message)

{gridappsd_python-2026.1.1b2 → gridappsd_python-2026.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "gridappsd-python"
-version = "2026.1.1b2"
+version = "2026.02.1"
 description = "A GridAPPS-D Python Adapter"
 readme = "README.md"
 license = "BSD-3-Clause"

gridappsd_python-2026.2.1/tests/test_simulation.py

@@ -0,0 +1,65 @@
+import json
+import logging
+import os
+import sys
+import time
+import pytest
+from datetime import datetime, timezone
+
+logging.basicConfig(stream=sys.stdout, level=logging.DEBUG)
+
+from gridappsd import GridAPPSD, topics as t
+from gridappsd.simulation import Simulation, PowerSystemConfig, SimulationArgs, SimulationConfig
+
+simulation_is_complete = False
+measurements_received = 0
+
+@pytest.fixture
+def createGadObject():
+   gad_user = os.environ.get('GRIDAPPSD_USER')
+   if gad_user is None:
+       os.environ['GRIDAPPSD_USER'] = 'system'
+   gad_password = os.environ.get('GRIDAPPSD_PASSWORD')
+   if gad_password is None:
+       os.environ['GRIDAPPSD_PASSWORD'] = 'manager'
+   return GridAPPSD()
+
+@pytest.mark.integration
+def test_createSimulations(createGadObject):
+   gadObj = createGadObject
+   response = gadObj.query_model_info()
+   models = response.get("data", {}).get("models", {})
+   start_time = int(datetime(year=2025, month=1, day=1, hour=0, minute=0, second=0, microsecond=0, tzinfo=timezone.utc).timestamp())
+   simulationArgs = SimulationArgs(start_time=f"{start_time}",
+                                   duration="120",
+                                   run_realtime=False,
+                                   pause_after_measurements=False)
+   sim_config = SimulationConfig(simulation_config=simulationArgs)
+   modelsToRun = [
+       "49AD8E07-3BF9-A4E2-CB8F-C3722F837B62", # IEEE 13 Node Test Feeder
+       "C1C3E687-6FFD-C753-582B-632A27E28507"  # IEEE 123 Node Test Feeder
+   ]
+   for m in models:
+       if m.get("modelId") not in modelsToRun:
+           continue
+       line_name = m.get("modelId")
+       subregion_name = m.get("subRegionId")
+       region_name = m.get("regionId")
+       psc = PowerSystemConfig(Line_name=line_name,
+                               SubGeographicalRegion_name=subregion_name,
+                               GeographicalRegion_name=region_name)
+       sim_config.power_system_configs.append(psc)
+   sim_obj = Simulation(gapps=gadObj, run_config=sim_config)
+   def on_measurement(sim, ts, m):
+       global measurements_received
+       measurements_received += 1
+   def on_simulation_complete(sim):
+       global simulation_is_complete
+       simulation_is_complete = True
+   sim_obj.add_onmeasurement_callback(on_measurement)
+   sim_obj.add_oncomplete_callback(on_simulation_complete)
+   sim_obj.start_simulation()
+   while not simulation_is_complete:
+       time.sleep(1)
+   assert measurements_received == 1
+   gadObj.disconnect()

gridappsd_python-2026.1.1b2/tests/test_simulation.py

@@ -1,64 +0,0 @@
-#import json
-#import logging
-#import os
-#import sys
-#import time
-#import pytest
-#from datetime import datetime, timezone
-
-#logging.basicConfig(stream=sys.stdout, level=logging.DEBUG)
-
-#from gridappsd import GridAPPSD, topics as t
-#from gridappsd.simulation import Simulation, PowerSystemConfig, SimulationArgs, SimulationConfig
-
-#simulation_is_complete = False
-#measurements_received = 0
-
-#@pytest.fixture
-#def createGadObject():
-#    gad_user = os.environ.get('GRIDAPPSD_USER')
-#    if gad_user is None:
-#        os.environ['GRIDAPPSD_USER'] = 'system'
-#    gad_password = os.environ.get('GRIDAPPSD_PASSWORD')
-#    if gad_password is None:
-#        os.environ['GRIDAPPSD_PASSWORD'] = 'manager'
-#    return GridAPPSD()
-
-#def test_createSimulations(createGadObject):
-#    gadObj = createGadObject
-#    response = gadObj.query_model_info()
-#    models = response.get("data", {}).get("models", {})
-#    start_time = int(datetime(year=2025, month=1, day=1, hour=0, minute=0, second=0, microsecond=0, tzinfo=timezone.utc).timestamp())
-#    simulationArgs = SimulationArgs(start_time=f"{start_time}",
-#                                    duration="120",
-#                                    run_realtime=False,
-#                                    pause_after_measurements=False)
-#    sim_config = SimulationConfig(simulation_config=simulationArgs)
-#    modelsToRun = [
-#        "49AD8E07-3BF9-A4E2-CB8F-C3722F837B62", # IEEE 13 Node Test Feeder
-#        "C1C3E687-6FFD-C753-582B-632A27E28507"  # IEEE 123 Node Test Feeder
-#    ]
-#    for m in models:
-#        if m.get("modelId") not in modelsToRun:
-#            continue
-#        line_name = m.get("modelId")
-#        subregion_name = m.get("subRegionId")
-#        region_name = m.get("regionId")
-#        psc = PowerSystemConfig(Line_name=line_name,
-#                                SubGeographicalRegion_name=subregion_name,
-#                                GeographicalRegion_name=region_name)
-#        sim_config.power_system_configs.append(psc)
-#    sim_obj = Simulation(gapps=gadObj, run_config=sim_config)
-#    def on_measurement(sim, ts, m):
-#        global measurements_received
-#        measurements_received += 1
-#    def on_simulation_complete(sim):
-#        global simulation_is_complete
-#        simulation_is_complete = True
-#    sim_obj.add_onmeasurement_callback(on_measurement)
-#    sim_obj.add_oncomplete_callback(on_simulation_complete)
-#    sim_obj.start_simulation()
-#    while not simulation_is_complete:
-#        time.sleep(1)
-#    assert measurements_received == 1
-#    gadObj.disconnect()