From 981e53a55670c6da335cbd0535e24fa6521191e7 Mon Sep 17 00:00:00 2001 From: poorva1209 Date: Tue, 20 Feb 2024 10:49:27 -0800 Subject: [PATCH 1/3] added time out except --- .../gridappsd/field_interface/context.py | 27 ++++++++++++++++--- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/gridappsd-field-bus-lib/gridappsd/field_interface/context.py b/gridappsd-field-bus-lib/gridappsd/field_interface/context.py index d29737f..3ebf1c0 100644 --- a/gridappsd-field-bus-lib/gridappsd/field_interface/context.py +++ b/gridappsd-field-bus-lib/gridappsd/field_interface/context.py @@ -3,8 +3,13 @@ import dataclasses import gridappsd.topics as t import json +import logging +from gridappsd.goss import TimeoutError +import time +_log = logging.getLogger(__name__) + class LocalContext: @@ -14,10 +19,16 @@ def get_context_by_feeder(cls, downstream_message_bus: FieldMessageBus, feeder_m request = {'request_type' : 'get_context', 'modelId': feeder_mrid, 'areaId': area_id} - print(t.context_request_queue(downstream_message_bus.id)) - response = downstream_message_bus.get_response(t.context_request_queue(downstream_message_bus.id), request, timeout=10) - return response + response = None + while response is None: + try: + response = downstream_message_bus.get_response(t.context_request_queue(downstream_message_bus.id), request, timeout=10) + except TimeoutError: + _log.info("Context request timed out. Trying again...") + time.sleep(5) + return response + @classmethod def get_context_by_message_bus(cls, downstream_message_bus: FieldMessageBus): """ @@ -27,7 +38,15 @@ def get_context_by_message_bus(cls, downstream_message_bus: FieldMessageBus): request = {'request_type' : 'get_context', 'areaId': downstream_message_bus.id } - return downstream_message_bus.get_response(t.context_request_queue(downstream_message_bus.id), request, timeout=10) + response = None + while response is None: + try: + response = downstream_message_bus.get_response(t.context_request_queue(downstream_message_bus.id), request, timeout=10) + except TimeoutError: + _log.info("Context request timed out. Trying again...") + time.sleep(5) + + return response @classmethod def register_agent(cls, downstream_message_bus: FieldMessageBus, upstream_message_bus: FieldMessageBus, agent): From 36c948206bd311305d36824b69e97f05782209ff Mon Sep 17 00:00:00 2001 From: poorva1209 Date: Thu, 29 Feb 2024 14:39:28 -0800 Subject: [PATCH 2/3] Update context.py --- gridappsd-field-bus-lib/gridappsd/field_interface/context.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gridappsd-field-bus-lib/gridappsd/field_interface/context.py b/gridappsd-field-bus-lib/gridappsd/field_interface/context.py index 3ebf1c0..ffa931a 100644 --- a/gridappsd-field-bus-lib/gridappsd/field_interface/context.py +++ b/gridappsd-field-bus-lib/gridappsd/field_interface/context.py @@ -24,7 +24,7 @@ def get_context_by_feeder(cls, downstream_message_bus: FieldMessageBus, feeder_m try: response = downstream_message_bus.get_response(t.context_request_queue(downstream_message_bus.id), request, timeout=10) except TimeoutError: - _log.info("Context request timed out. Trying again...") + _log.warn("Context request timed out. Trying again...") time.sleep(5) return response @@ -43,7 +43,7 @@ def get_context_by_message_bus(cls, downstream_message_bus: FieldMessageBus): try: response = downstream_message_bus.get_response(t.context_request_queue(downstream_message_bus.id), request, timeout=10) except TimeoutError: - _log.info("Context request timed out. Trying again...") + _log.warn("Context request timed out. Trying again...") time.sleep(5) return response From 657b16b7a495f6ebbaa01eeba9dd30b0d5742d97 Mon Sep 17 00:00:00 2001 From: poorva1209 Date: Thu, 29 Feb 2024 14:40:03 -0800 Subject: [PATCH 3/3] Update context.py --- gridappsd-field-bus-lib/gridappsd/field_interface/context.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gridappsd-field-bus-lib/gridappsd/field_interface/context.py b/gridappsd-field-bus-lib/gridappsd/field_interface/context.py index ffa931a..a0c2603 100644 --- a/gridappsd-field-bus-lib/gridappsd/field_interface/context.py +++ b/gridappsd-field-bus-lib/gridappsd/field_interface/context.py @@ -24,7 +24,7 @@ def get_context_by_feeder(cls, downstream_message_bus: FieldMessageBus, feeder_m try: response = downstream_message_bus.get_response(t.context_request_queue(downstream_message_bus.id), request, timeout=10) except TimeoutError: - _log.warn("Context request timed out. Trying again...") + _log.warning("Context request timed out. Trying again...") time.sleep(5) return response @@ -43,7 +43,7 @@ def get_context_by_message_bus(cls, downstream_message_bus: FieldMessageBus): try: response = downstream_message_bus.get_response(t.context_request_queue(downstream_message_bus.id), request, timeout=10) except TimeoutError: - _log.warn("Context request timed out. Trying again...") + _log.warning("Context request timed out. Trying again...") time.sleep(5) return response