From d8ac5d87897c6699b66f448721b5982f2417b595 Mon Sep 17 00:00:00 2001 From: Jacob Bieker Date: Tue, 13 Sep 2022 14:34:50 +0100 Subject: [PATCH 1/2] Update things --- examples/get_all_rss_systems.py | 0 pvoutput/pvoutput.py | 9 +++++---- 2 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 examples/get_all_rss_systems.py diff --git a/examples/get_all_rss_systems.py b/examples/get_all_rss_systems.py new file mode 100644 index 0000000..e69de29 diff --git a/pvoutput/pvoutput.py b/pvoutput/pvoutput.py index dd657fa..3a91e0c 100644 --- a/pvoutput/pvoutput.py +++ b/pvoutput/pvoutput.py @@ -51,8 +51,8 @@ class PVOutput: def __init__( self, - api_key: str = os.getenv("API_KEY"), - system_id: str = os.getenv("SYSTEM_ID"), + api_key: str = None, + system_id: str = None, config_filename: Optional[str] = CONFIG_FILENAME, data_service_url: Optional[str] = os.getenv("DATA_SERVICE_URL"), ): @@ -1119,9 +1119,10 @@ def wait_for_rate_limit_reset(self, do_sleeping: bool = True) -> int: retry_time_utc = utc_now + timedelta_to_wait # good to have the retry time in local so that user see 'their' time - retry_time_local = retry_time_utc.tz_convert(tz=datetime.now(tzlocal()).tzname()) + #retry_time_local = retry_time_utc.tz_convert(tz=datetime.now(tzlocal()).tzname()) + retry_time_local = retry_time_utc _print_and_log( - "Waiting {:.0f} seconds. Will retry at {}".format(secs_to_wait, retry_time_local) + "Waiting {:.0f} seconds. Will retry at {} UTC".format(secs_to_wait, retry_time_local) ) if do_sleeping: time.sleep(secs_to_wait) From 8009724ab203cc3fd5912a018a176ea8c059728e Mon Sep 17 00:00:00 2001 From: Jacob Bieker Date: Tue, 13 Sep 2022 14:35:56 +0100 Subject: [PATCH 2/2] Undo change --- pvoutput/pvoutput.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pvoutput/pvoutput.py b/pvoutput/pvoutput.py index 3a91e0c..fa8de5f 100644 --- a/pvoutput/pvoutput.py +++ b/pvoutput/pvoutput.py @@ -51,8 +51,8 @@ class PVOutput: def __init__( self, - api_key: str = None, - system_id: str = None, + api_key: str = os.getenv("API_KEY"), + system_id: str = os.getenv("SYSTEM_ID"), config_filename: Optional[str] = CONFIG_FILENAME, data_service_url: Optional[str] = os.getenv("DATA_SERVICE_URL"), ):