Skip to content

Updated to use simulation time and gridappsd-python command #2

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.

Sign up for GitHub

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

Open
Jeffrey-Simpson wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Updated to use simulation time and gridappsd-python command #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ae0dcc
Updated to use simulation time and gridappsd-python command
Aug 5, 2021
900ffe2
Removed 'message' from glm = REGEX_2.sub('', REGEX_1.sub('', response))
Oct 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pyvvo/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,11 +221,11 @@ def main(sim_id: str, sim_request: dict):
cap_cmd = cap_mgr.build_equipment_commands(cap_forward)

# Send 'em!
reg_msg = platform.send_command(sim_id=sim_id, **reg_cmd)
reg_msg = platform.send_command(sim_id=sim_id, sim_epoch=router.sim_epoch, **reg_cmd)
if reg_msg is not None:
LOG.info('Regulator commands sent in.')

cap_msg = platform.send_command(sim_id=sim_id, **cap_cmd)
cap_msg = platform.send_command(sim_id=sim_id, sim_epoch=router.sim_epoch, **cap_cmd)
if cap_msg is not None:
LOG.info('Capacitor commands sent in.')

Expand Down
20 changes: 15 additions & 5 deletions pyvvo/gridappsd_platform.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ def get_gad_object(**kwargs):

# TODO: handle connection failures?
# TODO: flexibility for different username/password?
gad = GridAPPSD(address=address, username=gad_utils.get_gridappsd_user(),
password=gad_utils.get_gridappsd_pass(), **kwargs)
gad = GridAPPSD(address=address, username="system",
password='manager', **kwargs)

LOG.debug('GridAPPSD object created and connected to the platform.')
return gad
Expand Down Expand Up @@ -155,6 +155,13 @@ def __init__(self, platform_manager, sim_id, fn_mrid_list):
self.platform.gad.subscribe(topic=self.output_topic,
callback=self._on_message)

# Simulation time
self._sim_epoch = 0

@property
def sim_epoch(self):
return self._sim_epoch

@utils.wait_for_lock
def add_funcs_and_mrids(self, fn_mrid_list):
"""Helper to add functions and MRIDs to the router.
Expand Down Expand Up @@ -213,6 +220,7 @@ def _on_message(self, header, message):

# Log simulation time.
sim_dt = simulation_dt(int(message['message']['timestamp']))
self._sim_epoch = message['message']['timestamp']

self.log.debug(
'Simulation timestamp: {}'.format(sim_dt.strftime(DATE_FORMAT)))
Expand Down Expand Up @@ -297,7 +305,7 @@ def __init__(self, timeout=60, stomp_log_level=logging.WARNING,
self.last_sim_config = None

def send_command(self, object_ids, attributes, forward_values,
reverse_values, sim_id=None):
reverse_values, sim_id=None, sim_epoch=0):
"""Function for sending a command into a running simulation.
This is partly a wrapper to DifferenceBuilder, but also sends
the command into the simulation.
Expand All @@ -315,6 +323,7 @@ def send_command(self, object_ids, attributes, forward_values,
:param sim_id: Simulation ID. If None, will attempt to use
self.sim.simulation_id. If that is also None, ValueError
will be raised.
:param sim_epoch: Simulation epoch time. Default 0.

:returns: Dictionary representing the message that gets sent in.
If no message will be sent (if input lists are empty),
Expand Down Expand Up @@ -366,7 +375,7 @@ def send_command(self, object_ids, attributes, forward_values,
reverse_value=reverse_values[k])

# Get the message and log it.
msg = diff_builder.get_message()
msg = diff_builder.get_message(epoch=sim_epoch)
msg_str = json.dumps(msg)
self.log.info('Preparing to send following command: {}'
.format(msg_str))
Expand All @@ -390,7 +399,8 @@ def get_glm(self, model_id):

# Fix bad json return.
# TODO: remove when platform is fixed.
glm = REGEX_2.sub('', REGEX_1.sub('', response['message']))
# glm = REGEX_2.sub('', REGEX_1.sub('', response['message']))
glm = REGEX_2.sub('', REGEX_1.sub('', response))
return glm

def _query_weather(self, start_time, end_time):
Expand Down