bump to v0.9.3

.github/workflows/python-package.yml

@@ -30,8 +30,10 @@ jobs:
         pipenv install --system
     - name: Run pipenv check
       run: |
+       # DDoS attacks in wheel and setuptools packages, not relevant
         pipenv check \
-          --ignore 51499 # DDoS attack in wheel package, which is unsupported in python 3.7
+          --ignore 51499 \
+          --ignore 52495 
     - name: Lint with flake8
       run: |
         # stop the build if there are Python syntax errors or undefined names

setup.cfg

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

tconnectsync/autoupdate.py

@@ -125,7 +125,7 @@ class Autoupdate:
                 # above no indexes warning.
                 elif self.last_successful_process_time_range and (now - self.last_successful_process_time_range) >= 60 * self.secret.AUTOUPDATE_FAILURE_MINUTES:
                     logger.error(AutoupdateNoNewDataDetectedError(
-                        "%s: No new data has been detected via the API for %d minutes. " % (datetime.datetime.now(), now - self.last_successful_process_time_range)//60 +
+                        "%s: No new data has been detected via the API for %d minutes. " % (datetime.datetime.now(), (now - self.last_successful_process_time_range)//60) +
                         "tconnectsync might not be functioning properly."))
 
                     if self.secret.AUTOUPDATE_RESTART_ON_FAILURE:

tconnectsync/domain/therapy_event.py

@@ -19,6 +19,9 @@ class TherapyEvent:
         self.eventDateTime = json['eventDateTime']
         self.sourceRecId = json['sourceRecId']
         self.rawJson = json
+    
+    def __str__(self):
+        return "%s(%s)" % (self.type, self.rawJson)
 
 class CGMTherapyEvent(TherapyEvent):
     eventID = None

tconnectsync/sync/bolus.py

@@ -35,11 +35,14 @@ def process_bolus_events(bolusdata, cgmEvents=None, source=""):
                 logger.warning("Skipping non-completed %s bolus data (was a bolus in progress?): %s parsed: %s" % (source, b, parsed))
                 continue
             if parsed.is_extended_bolus:
-                if not parsed.bolex_start_time and not parsed.start_time:
-                    logger.warning("Skipping non-completed %s extended bolus data with no start time: %s parsed: %s" % (source, b, parsed))
-                elif not parsed.bolex_start_time and parsed.start_time:
-                    logger.warning("Setting bolex_start_time to start_time for non-completed %s extended bolus: %s parsed: %s" % (source, b, parsed))
-                    parsed.bolex_start_time = parsed.start_time
+                if not parsed.bolex_start_time and not parsed.request_time:
+                    logger.warning("Skipping non-completed %s extended bolus data with no request_time: %s parsed: %s" % (source, b, parsed))
+                elif not parsed.bolex_start_time and parsed.request_time:
+                    logger.warning("Setting bolex_start_time to request_time for non-completed %s extended bolus: %s parsed: %s" % (source, b, parsed))
+                    parsed.bolex_start_time = parsed.request_time
+            logger.debug("process_bolus_events for incomplete bolus: %s parsed: %s" % (b, parsed))
+        elif parsed.is_extended_bolus:
+            logger.debug("process_bolus_events for complete extended bolus: %s parsed: %s" % (b, parsed))
 
         if parsed.bg and cgmEvents:
             requested_at = parsed.request_time if not parsed.extended_bolus else parsed.bolex_start_time

tests/parser/test_tconnect.py

@@ -442,6 +442,71 @@ class TestTConnectEntryBolus(unittest.TestCase):
                 "bolex_start_time": None
             }))
 
+
+    entryExtendedComplete = {
+        "Type": "Bolus",
+        "Description": "Extended 50.00%/0.00",
+        "BG": "131",
+        "IOB": "5.87",
+        "BolusRequestID": "3636.000",
+        "BolusCompletionID": "3636.000",
+        "CompletionDateTime": "2022-08-09T23:20:04",
+        "InsulinDelivered": "0.20",
+        "FoodDelivered": "0.00",
+        "CorrectionDelivered": "0.00",
+        "CompletionStatusID": "3",
+        "CompletionStatusDesc": "Completed",
+        "BolusIsComplete": "1",
+        "BolexCompletionID": "16757133",
+        "BolexSize": "0.20",
+        "BolexStartDateTime": "2022-08-09T23:20:04",
+        "BolexCompletionDateTime": "2022-08-09T23:35:03",
+        "BolexInsulinDelivered": "0.20",
+        "BolexIOB": "5.7",
+        "BolexCompletionStatusID": "3.00",
+        "BolexCompletionStatusDesc": "Completed",
+        "ExtendedBolusIsComplete": "1",
+        "EventDateTime": "2022-08-09T23:19:15",
+        "RequestDateTime": "2022-08-09T23:19:15",
+        "BolusType": "Carb",
+        "BolusRequestOptions": "Extended",
+        "StandardPercent": "50.00",
+        "Duration": "15",
+        "CarbSize": "0",
+        "UserOverride": "1",
+        "TargetBG": "110",
+        "CorrectionFactor": "30.00",
+        "FoodBolusSize": "0.00",
+        "CorrectionBolusSize": "0.00",
+        "ActualTotalBolusRequested": "0.40",
+        "IsQuickBolus": "0",
+        "EventHistoryReportEventDesc": "0",
+        "EventHistoryReportDetails": "Food Bolus: 50% Extended 15 mins",
+        "NoteID": "CF 1:30 - Carb Ratio 1:6 - Target BG 110 | Override: Pump calculated Bolus = 0.0 units",
+        "IndexID": "0",
+        "Note": "631597"
+    }
+    def test_parse_bolus_entry_extended_complete(self):
+        self.assertEqual(
+            TConnectEntry.parse_bolus_entry(self.entryExtendedComplete),
+            Bolus(**{
+                "description": "Extended 50.00%/0.00",
+                "complete": "1",
+                "completion": "Completed",
+                "request_time": None,
+                "completion_time": None,
+                "insulin": "0.20",
+                "requested_insulin": "0.40",
+                "carbs": "0",
+                "bg": "131",
+                "user_override": "1",
+                "extended_bolus": "1",
+                "bolex_completion_time": "2022-08-09 23:35:03-04:00",
+                "bolex_start_time": "2022-08-09 23:20:04-04:00"
+            }))
+
+
+
 class TestTConnectEntryReading(unittest.TestCase):
     entry1 = {
         "DeviceType": "t:slim X2 Insulin Pump",

tests/sync/test_bolus.py

@@ -172,5 +172,23 @@ class TestBolusSync(unittest.TestCase):
         for d in zeroData:
             self.assertNotIn(TConnectEntry.parse_bolus_entry(d), bolusEvents)
 
+    def test_process_bolus_events_ciq_extended_bolus(self):
+        stdData = [
+            TestTConnectEntryBolus.entryExtendedComplete,
+        ]
+        zeroData = [
+        ]
+        bolusData = stdData + zeroData
+
+        bolusEvents = process_bolus_events(bolusData)
+        self.assertEqual(len(bolusEvents), len(stdData))
+
+        self.assertListEqual(bolusEvents, [
+            TConnectEntry.parse_bolus_entry(d) for d in stdData
+        ])
+
+        for d in zeroData:
+            self.assertNotIn(TConnectEntry.parse_bolus_entry(d), bolusEvents)
+
 if __name__ == '__main__':
     unittest.main()