Skip to content
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

Make pvoutput reports align with status interval wall clock time #212

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make pvoutput reports align with status interval wall clock time #212

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 25 additions & 6 deletions SunGather/exports/pvoutput.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ def configure(self, config, inverter):
self.batch_data = []
self.batch_count = 0
self.last_run = 0
self.last_publish = 0

for parameter in config.get('parameters'):
if not inverter.validateRegister(parameter['register']):
Expand Down Expand Up @@ -110,6 +109,7 @@ def configure(self, config, inverter):
pass

logging.info(f"PVOutput: Configured export to {invertername} every {self.status_interval} minutes")
self.next_publish = datetime.datetime.now()
return True

def collect_data(self, inverter):
Expand Down Expand Up @@ -152,7 +152,7 @@ def collect_data(self, inverter):
def publish(self, inverter):
if self.collect_data(inverter):
# Process data points every status_interval
if((time.time() - self.last_publish) >= (self.status_interval * 60)):
if self.next_publish <= datetime.datetime.now():
any_data = False
if inverter.validateLatestScrape('timestamp'):
now = datetime.datetime.strptime(inverter.getRegisterValue('timestamp'), "%Y-%m-%d %H:%M:%S")
Expand Down Expand Up @@ -213,14 +213,33 @@ def publish(self, inverter):
logging.error("PVOutput: Request; " + self.url_addbatchstatus + ", " + str(self.headers) + " : " + str(payload))
else:
self.batch_data = []
self.last_publish = time.time()
self.next_publish = self.get_next_target_time(self.status_interval)
logging.info("PVOutput: Data uploaded")
except Exception as err:
logging.error(f"PVOutput: Failed to Upload")
logging.debug(f"{err}")
else:
logging.info("PVOutput: Data added to next batch upload")
else:
logging.info(f"PVOutput: Data logged, next upload in {int(((self.status_interval) * 60) - (time.time() - self.last_publish))} secs")

self.last_run = time.time()
next_upload_delta = self.next_publish - datetime.datetime.now()
logging.info("PVOutput: Data logged, next upload in %s secs", int(next_upload_delta.total_seconds()))

self.last_run = time.time()

def get_next_target_time(self, interval, delay=0):
"""Calculate the next time that we should send an update to pvoutput.

:param interval: (int) The time, in minutes, between updates. Must match
the setting on pvoutput for the system to which you're posting data.
:param delay: (int) The desired post-target delay, in seconds (for avoiding
updates at the same time as other systems that report data).

:return: A datetime.
"""
now = datetime.datetime.now()
wait_minutes = interval - (now.minute % interval) - 1
wait_seconds = 60 - now.second
target_delta = datetime.timedelta(minutes=wait_minutes, seconds=wait_seconds)
target_time = now + target_delta
target_time += datetime.timedelta(seconds=delay)
return target_time