v2.0.4

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = tconnectsync
-version = 2.0.3
+version = 2.0.4
 author = James Woglom
 author_email = j@wogloms.net
 description = Syncs Tandem t:connect pump data to Nightscout for the t:slim X2

tconnectsync/sync/tandemsource/autoupdate.py

@@ -43,8 +43,8 @@ class TandemSourceAutoupdate:
             tconnectDevice = ChooseDevice(self.secret, tconnect).choose()
 
             event_id = None
-            cur_max_date_with_events = arrow.get(tconnectDevice['maxDateWithEvents'])
-            if not self.last_max_date_with_events or cur_max_date_with_events > self.cur_max_date_with_events:
+            cur_max_date_with_events = arrow.get(tconnectDevice['maxDateWithEvents']).float_timestamp
+            if not self.last_max_date_with_events or cur_max_date_with_events > self.last_max_date_with_events:
                 logger.info('New reported tandemsource data. (cur_max_date: %s last_max_date: %s)' % (cur_max_date_with_events, self.last_max_date_with_events))
 
                 if pretend:
@@ -52,6 +52,7 @@ class TandemSourceAutoupdate:
                 else:
                     added, event_id = ProcessTimeRange(tconnect, nightscout, tconnectDevice, pretend, features=features).process(time_start, time_end)
                     logger.info('Added %d items from ProcessTimeRange' % added)
+                    self.last_successful_process_time_range = now
 
                 # Track the time it took to find a new event between runs,
                 # but skip this calculation the first process cycle (since

tconnectsync/sync/tandemsource/process_alarm.py

@@ -35,9 +35,9 @@ class ProcessAlarm:
 
         ns_entries = []
         for event in sorted(events, key=lambda x: x.eventTimestamp):
-            if last_upload_time and arrow.get(event.eventTimestamp) < last_upload_time:
+            if last_upload_time and arrow.get(event.eventTimestamp) <= last_upload_time:
                 if self.pretend:
-                    logger.info("Skipping Alarm event before last upload time: %s (time range: %s - %s)" % (event, time_start, time_end))
+                    logger.info("Skipping Alarm event not after last upload time: %s (time range: %s - %s)" % (event, time_start, time_end))
                 continue
 
             ns_entries.append(self.alarm_to_nsentry(event))

tconnectsync/sync/tandemsource/process_basal.py

@@ -36,13 +36,17 @@ class ProcessBasal:
 
         with_duration = []
         for event in sorted(events, key=lambda x: x.eventTimestamp):
-            if last_upload_time and arrow.get(event.eventTimestamp) < last_upload_time:
+            if last_upload_time and arrow.get(event.eventTimestamp) <= last_upload_time:
                 if self.pretend:
-                    logger.info("Skipping basal event before last upload time: %s (time range: %s - %s)" % (event, time_start, time_end))
+                    logger.info("Skipping basal event not after last upload time: %s (time range: %s - %s)" % (event, time_start, time_end))
                 continue
 
             with_duration.append([event.eventTimestamp, None, event])
 
+        if not with_duration:
+            logger.info("No basal events found to process")
+            return []
+
         for i in range(len(with_duration)-1):
             with_duration[i][1] = with_duration[i+1][0] - with_duration[i][0]
 

tconnectsync/sync/tandemsource/process_basal_resume.py

@@ -35,9 +35,9 @@ class ProcessBasalResume:
 
         ns_entries = []
         for event in sorted(events, key=lambda x: x.eventTimestamp):
-            if last_upload_time and arrow.get(event.eventTimestamp) < last_upload_time:
+            if last_upload_time and arrow.get(event.eventTimestamp) <= last_upload_time:
                 if self.pretend:
-                    logger.info("Skipping BasalResume event before last upload time: %s (time range: %s - %s)" % (event, time_start, time_end))
+                    logger.info("Skipping BasalResume event not after last upload time: %s (time range: %s - %s)" % (event, time_start, time_end))
                 continue
 
             ns_entries.append(self.resume_to_nsentry(event))

tconnectsync/sync/tandemsource/process_basal_suspension.py

@@ -35,9 +35,9 @@ class ProcessBasalSuspension:
 
         ns_entries = []
         for event in sorted(events, key=lambda x: x.eventTimestamp):
-            if last_upload_time and arrow.get(event.eventTimestamp) < last_upload_time:
+            if last_upload_time and arrow.get(event.eventTimestamp) <= last_upload_time:
                 if self.pretend:
-                    logger.info("Skipping basalsuspension event before last upload time: %s (time range: %s - %s)" % (event, time_start, time_end))
+                    logger.info("Skipping basalsuspension event not after last upload time: %s (time range: %s - %s)" % (event, time_start, time_end))
                 continue
 
             ns_entries.append(self.suspension_to_nsentry(event))

tconnectsync/sync/tandemsource/process_bolus.py

@@ -44,7 +44,7 @@ class ProcessBolus:
             bolusEventsForId[event.bolusid][type(event)] = event
 
             if type(event) == eventtypes.LidBolusCompleted:
-                if last_upload_time and arrow.get(event.eventTimestamp) < last_upload_time:
+                if last_upload_time and arrow.get(event.eventTimestamp) <= last_upload_time:
                     if self.pretend:
                         logger.info("Skipping bolusCompletedEvent before last upload time: %s (time range: %s - %s)" % (event, time_start, time_end))
                     continue

tconnectsync/sync/tandemsource/process_cartridge.py

@@ -37,9 +37,9 @@ class ProcessCartridge:
         cannulaFilledEvents = []
         tubingFilledEvents = []
         for event in sorted(events, key=lambda x: x.eventTimestamp):
-            if last_upload_time and arrow.get(event.eventTimestamp) < last_upload_time:
+            if last_upload_time and arrow.get(event.eventTimestamp) <= last_upload_time:
                 if self.pretend:
-                    logger.info("Skipping %s before last upload time: %s (time range: %s - %s)" % (type(event), event, time_start, time_end))
+                    logger.info("Skipping %s not after last upload time: %s (time range: %s - %s)" % (type(event), event, time_start, time_end))
                 continue
 
             if type(event) == eventtypes.LidCartridgeFilled:

tconnectsync/sync/tandemsource/process_cgm_alert.py

@@ -35,9 +35,9 @@ class ProcessCGMAlert:
 
         alertEvents = []
         for event in sorted(events, key=lambda x: x.eventTimestamp):
-            if last_upload_time and arrow.get(event.eventTimestamp) < last_upload_time:
+            if last_upload_time and arrow.get(event.eventTimestamp) <= last_upload_time:
                 if self.pretend:
-                    logger.info("Skipping %s before last upload time: %s (time range: %s - %s)" % (type(event), event, time_start, time_end))
+                    logger.info("Skipping %s not after last upload time: %s (time range: %s - %s)" % (type(event), event, time_start, time_end))
                 continue
 
             alertEvents.append(event)

tconnectsync/sync/tandemsource/process_cgm_reading.py

@@ -38,9 +38,9 @@ class ProcessCGMReading:
 
         readings = []
         for event in sorted(events, key=lambda x: self.timestamp_for(x)):
-            if last_upload_time and self.timestamp_for(event) < last_upload_time:
+            if last_upload_time and self.timestamp_for(event) <= last_upload_time:
                 if self.pretend:
-                    logger.info("ProcessCGMReading: Skipping %s before last upload time: %s (time range: %s - %s)" % (type(event), event, time_start, time_end))
+                    logger.info("ProcessCGMReading: Skipping %s not after last upload time: %s (time range: %s - %s)" % (type(event), event, time_start, time_end))
                 continue
 
             readings.append(event)

tconnectsync/sync/tandemsource/process_cgm_start_join_stop.py

@@ -48,9 +48,9 @@ class ProcessCGMStartJoinStop:
 
         allEvents = []
         for event in sorted(events, key=lambda x: x.eventTimestamp):
-            if last_upload_time and arrow.get(event.eventTimestamp) < last_upload_time:
+            if last_upload_time and arrow.get(event.eventTimestamp) <= last_upload_time:
                 if self.pretend:
-                    logger.info("ProcessCGMStartJoinStop: Skipping %s before last upload time: %s (time range: %s - %s)" % (type(event), event, time_start, time_end))
+                    logger.info("ProcessCGMStartJoinStop: Skipping %s not after last upload time: %s (time range: %s - %s)" % (type(event), event, time_start, time_end))
                 continue
 
             allEvents.append(event)

tconnectsync/sync/tandemsource/process_user_mode.py

@@ -72,9 +72,9 @@ class ProcessUserMode:
         start_sleep = None
         start_exercise = None
         for event in sorted(events, key=lambda x: x.eventTimestamp):
-            if last_upload_time and arrow.get(event.eventTimestamp) < last_upload_time:
+            if last_upload_time and arrow.get(event.eventTimestamp) <= last_upload_time:
                 if self.pretend:
-                    logger.info("ProcessUserMode: Skipping usermode event before last upload time: %s (time range: %s - %s)" % (event, time_start, time_end))
+                    logger.info("ProcessUserMode: Skipping usermode event not after last upload time: %s (time range: %s - %s)" % (event, time_start, time_end))
                 continue
 
             if self.is_start_sleep(event):