Skip to content

Fix PVOutput 10-minute gaps by using clock-aligned upload intervals #241

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
rianbk wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −8
Open

Fix PVOutput 10-minute gaps by using clock-aligned upload intervals #241

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
15 changes: 7 additions & 8 deletions SunGather/exports/pvoutput.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@ def configure(self, config, inverter):
self.collected_data = {}
self.batch_data = []
self.batch_count = 0
self.last_run = 0
self.last_publish = 0
self.last_uploaded_interval = 0

for parameter in config.get('parameters'):
if not inverter.validateRegister(parameter['register']):
Expand Down Expand Up @@ -151,8 +150,9 @@ 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)):
# Process data points every status_interval (clock-aligned)
current_interval = int(time.time() // (self.status_interval * 60))
if current_interval > self.last_uploaded_interval:
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,13 @@ 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.last_uploaded_interval = current_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_interval_time = (self.last_uploaded_interval + 1) * self.status_interval * 60
logging.info(f"PVOutput: Data logged, next upload in {int(next_interval_time - time.time())} secs")