gridappsd-python 2.8.20230413192559a0__tar.gz → 2023.5.1a1__tar.gz

{gridappsd_python-2.8.20230413192559a0 → gridappsd_python-2023.5.1a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gridappsd-python
-Version: 2.8.20230413192559a0
+Version: 2023.5.1a1
 Summary: A GridAPPS-D Python Adapter
 Home-page: https://gridappsd.readthedocs.io
 License: BSD-3-Clause
@@ -348,7 +348,6 @@ def test_gridappsd_status(gridappsd_client):
     gappsd.set_service_status("Foo")
     assert gappsd.get_service_status() == ProcessStatusEnum.COMPLETE.value
     assert gappsd.get_application_status() == ProcessStatusEnum.COMPLETE.value
-
 ```
 
 

{gridappsd_python-2.8.20230413192559a0 → gridappsd_python-2023.5.1a1}/README.md

@@ -324,6 +324,5 @@ def test_gridappsd_status(gridappsd_client):
     gappsd.set_service_status("Foo")
     assert gappsd.get_service_status() == ProcessStatusEnum.COMPLETE.value
     assert gappsd.get_application_status() == ProcessStatusEnum.COMPLETE.value
-
 ```
 

{gridappsd_python-2.8.20230413192559a0 → gridappsd_python-2023.5.1a1}/gridappsd/field_interface/agents/agents.py

@@ -89,11 +89,6 @@ class DistributedAgent:
 
     def connect(self):
 
-        if self.agent_area_dict is None:
-            context = LocalContext.get_context_by_message_bus(
-                self.downstream_message_bus)
-            self.agent_area_dict = context['data']
-
         if self.upstream_message_bus is not None:
             self.upstream_message_bus.connect()
         if self.downstream_message_bus is not None:
@@ -101,6 +96,11 @@ class DistributedAgent:
         if self.downstream_message_bus is None and self.upstream_message_bus is None:
             raise ValueError(
                 "Either upstream or downstream bus must be specified!")
+            
+        if self.agent_area_dict is None:
+            context = LocalContext.get_context_by_message_bus(
+                self.downstream_message_bus)
+            self.agent_area_dict = context['data']
 
         self.subscribe_to_measurement()
         self.subscribe_to_messages()
@@ -230,11 +230,11 @@ class FeederAgent(DistributedAgent):
                              downstream_message_bus_def, agent_config,
                              feeder_dict, simulation_id)
 
-        if feeder_dict is not None:
+        if self.agent_area_dict is not None:
             feeder = cim.Feeder(mRID=downstream_message_bus_def.id)
             self.feeder_area = DistributedModel(connection=self.connection,
                                                 feeder=feeder,
-                                                topology=feeder_dict)
+                                                topology=self.agent_area_dict)
 
 
 class SwitchAreaAgent(DistributedAgent):
@@ -249,10 +249,10 @@ class SwitchAreaAgent(DistributedAgent):
         super().__init__(upstream_message_bus_def, downstream_message_bus_def,
                          agent_config, switch_area_dict, simulation_id)
 
-        if switch_area_dict is not None:
+        if self.agent_area_dict is not None:
             self.switch_area = SwitchArea(downstream_message_bus_def.id,
                                           self.connection)
-            self.switch_area.initialize_switch_area(switch_area_dict)
+            self.switch_area.initialize_switch_area(self.agent_area_dict)
 
 
 class SecondaryAreaAgent(DistributedAgent):
@@ -267,10 +267,10 @@ class SecondaryAreaAgent(DistributedAgent):
         super().__init__(upstream_message_bus_def, downstream_message_bus_def,
                          agent_config, secondary_area_dict, simulation_id)
 
-        if secondary_area_dict is not None:
+        if self.agent_area_dict is not None:
             self.secondary_area = SecondaryArea(downstream_message_bus_def.id,
                                                 self.connection)
-            self.secondary_area.initialize_secondary_area(secondary_area_dict)
+            self.secondary_area.initialize_secondary_area(self.agent_area_dict)
 
 
 class CoordinatingAgent:

{gridappsd_python-2.8.20230413192559a0 → gridappsd_python-2023.5.1a1}/gridappsd/field_interface/context.py

@@ -23,9 +23,8 @@ class LocalContext:
 
         """
         request = {'request_type' : 'get_context',
-                   'downstream_message_bus_id': downstream_message_bus.id,
-                   'agents': True,
-                   'devices': True}
+                   'downstream_message_bus_id': downstream_message_bus.id
+                   }
         return downstream_message_bus.get_response(t.context_request_queue(downstream_message_bus.id), request)
     
     @classmethod

{gridappsd_python-2.8.20230413192559a0 → gridappsd_python-2023.5.1a1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "gridappsd-python"
-version = "2.8.20230413192559a0"
+version = "2023.5.1a1"
 description = "A GridAPPS-D Python Adapter"
 authors = [
     "C. Allwardt <3979063+craig8@users.noreply.github.com>",