bump version to 0.9.0

.codecov.yml

@@ -1,3 +1,4 @@
+coverage:
   status:
     patch: no
     changes: no
@@ -5,7 +6,9 @@
       default: false
       tconnectsync:
         paths: "tconnectsync/"
-        target: 75%
+        target: '75%'
+        threshold: '5%'
       tests:
         paths: "tests/"
-        target: 95%
+        target: '95%'
+        threshold: '5%'

.github/workflows/python-package.yml

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

Pipfile.lock

@@ -16,18 +16,18 @@
     "default": {
         "arrow": {
             "hashes": [
-                "sha256:05caf1fd3d9a11a1135b2b6f09887421153b94558e5ef4d090b567b47173ac2b",
-                "sha256:d622c46ca681b5b3e3574fcb60a04e5cc81b9625112d5fb2b44220c36c892177"
+                "sha256:3934b30ca1b9f292376d9db15b19446088d12ec58629bc3f0da28fd55fb633a1",
+                "sha256:5a49ab92e3b7b71d96cd6bfcc4df14efefc9dfa96ea19045815914a6ab6b1fe2"
             ],
             "index": "pypi",
-            "version": "==1.2.2"
+            "version": "==1.2.3"
         },
         "beautifulsoup4": {
             "hashes": [
                 "sha256:58d5c3d29f5a36ffeb94f02f0d786cd53014cf9b3b3951d42e0080d8a9498d30",
                 "sha256:ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693"
             ],
-            "markers": "python_full_version >= '3.6.0'",
+            "markers": "python_version >= '3.6'",
             "version": "==4.11.1"
         },
         "bs4": {
@@ -39,27 +39,27 @@
         },
         "certifi": {
             "hashes": [
-                "sha256:84c85a9078b11105f04f3036a9482ae10e4621616db313fe045dd24743a0820d",
-                "sha256:fe86415d55e84719d75f8b69414f6438ac3547d2078ab91b67e779ef69378412"
+                "sha256:0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14",
+                "sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382"
             ],
-            "markers": "python_full_version >= '3.6.0'",
-            "version": "==2022.6.15"
+            "markers": "python_version >= '3.6'",
+            "version": "==2022.9.24"
         },
         "charset-normalizer": {
             "hashes": [
-                "sha256:5189b6f22b01957427f35b6a08d9a0bc45b46d3788ef5a92e978433c7a35f8a5",
-                "sha256:575e708016ff3a5e3681541cb9d79312c416835686d054a23accb873b254f413"
+                "sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845",
+                "sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f"
             ],
-            "markers": "python_full_version >= '3.6.0'",
-            "version": "==2.1.0"
+            "markers": "python_version >= '3.6'",
+            "version": "==2.1.1"
         },
         "idna": {
             "hashes": [
-                "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff",
-                "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"
+                "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4",
+                "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"
             ],
             "markers": "python_version >= '3.5'",
-            "version": "==3.3"
+            "version": "==3.4"
         },
         "lxml": {
             "hashes": [
@@ -156,11 +156,11 @@
         },
         "python-dotenv": {
             "hashes": [
-                "sha256:b7e3b04a59693c42c36f9ab1cc2acc46fa5df8c78e178fc33a8d4cd05c8d498f",
-                "sha256:d92a187be61fe482e4fd675b6d52200e7be63a12b724abbf931a40ce4fa92938"
+                "sha256:1684eb44636dd462b66c3ee016599815514527ad99965de77f43e0944634a7e5",
+                "sha256:b77d08274639e3d34145dfa6c7008e66df0f04b7be7a75fd0d5292c191d79045"
             ],
             "index": "pypi",
-            "version": "==0.20.0"
+            "version": "==0.21.0"
         },
         "requests": {
             "hashes": [
@@ -172,11 +172,11 @@
         },
         "requests-mock": {
             "hashes": [
-                "sha256:0a2d38a117c08bb78939ec163522976ad59a6b7fdd82b709e23bb98004a44970",
-                "sha256:8d72abe54546c1fc9696fa1516672f1031d72a55a1d66c85184f972a24ba0eba"
+                "sha256:2fdbb637ad17ee15c06f33d31169e71bf9fe2bdb7bc9da26185be0dd8d842699",
+                "sha256:59c9c32419a9fb1ae83ec242d98e889c45bd7d7a65d48375cc243ec08441658b"
             ],
             "index": "pypi",
-            "version": "==1.9.3"
+            "version": "==1.10.0"
         },
         "six": {
             "hashes": [
@@ -191,20 +191,20 @@
                 "sha256:3b2503d3c7084a42b1ebd08116e5f81aadfaea95863628c80a3b774a11b7c759",
                 "sha256:fc53893b3da2c33de295667a0e19f078c14bf86544af307354de5fcf12a3f30d"
             ],
-            "markers": "python_full_version >= '3.6.0'",
+            "markers": "python_version >= '3.6'",
             "version": "==2.3.2.post1"
         },
         "tconnectsync": {
             "path": ".",
-            "version": "==0.7.1"
+            "version": "==0.8.6"
         },
         "urllib3": {
             "hashes": [
-                "sha256:8298d6d56d39be0e3bc13c1c97d133f9b45d797169a0e11cdd0e0489d786f7ec",
-                "sha256:879ba4d1e89654d9769ce13121e0f94310ea32e8d2f8cf587b77c08bbcdb30d6"
+                "sha256:47cc05d99aaa09c9e72ed5809b60e7ba354e64b59c9c173ac3018642d8bb41fc",
+                "sha256:c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' and python_version < '4'",
-            "version": "==1.26.10"
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'",
+            "version": "==1.26.13"
         }
     },
     "develop": {
@@ -217,11 +217,11 @@
         },
         "jedi": {
             "hashes": [
-                "sha256:637c9635fcf47945ceb91cd7f320234a7be540ded6f3e99a50cb6febdfd1ba8d",
-                "sha256:74137626a64a99c8eb6ae5832d99b3bdd7d29a3850fe2aa80a4126b2a7d949ab"
+                "sha256:203c1fd9d969ab8f2119ec0a3342e0b49910045abe6af0a3ae83a5764d54639e",
+                "sha256:bae794c30d07f6d910d32a7048af09b5a39ed740918da923c6b780790ebac612"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==0.18.1"
+            "version": "==0.18.2"
         },
         "parso": {
             "hashes": [
@@ -233,27 +233,27 @@
         },
         "prompt-toolkit": {
             "hashes": [
-                "sha256:859b283c50bde45f5f97829f77a4674d1c1fcd88539364f1b28a37805cfd89c0",
-                "sha256:d8916d3f62a7b67ab353a952ce4ced6a1d2587dfe9ef8ebc30dd7c386751f289"
+                "sha256:535c29c31216c77302877d5120aef6c94ff573748a5b5ca5b1b1f76f5e700c73",
+                "sha256:ced598b222f6f4029c0800cefaa6a17373fb580cd093223003475ce32805c35b"
             ],
             "markers": "python_full_version >= '3.6.2'",
-            "version": "==3.0.30"
+            "version": "==3.0.33"
         },
         "ptpython": {
             "hashes": [
-                "sha256:99636899ab0e4d026e2ecc9368269114f387b4bb5411e57f072b0bde724d9f99",
-                "sha256:eafd4ced27ca5dc370881d4358d1ab5041b32d88d31af8e3c24167fe4af64ed6"
+                "sha256:1ec28ba37959e8e6c4880fcf4748ad5c61341d4c1bfd24a38a4d5b97af1f475a",
+                "sha256:a57b9952eac4a12540a4dfb4ccd4a243403eceb27b0d13245b5e4144c8731d32"
             ],
             "index": "pypi",
-            "version": "==3.0.20"
+            "version": "==3.0.21"
         },
         "pygments": {
             "hashes": [
-                "sha256:5eb116118f9612ff1ee89ac96437bb6b49e8f04d8a13b514ba26f620208e26eb",
-                "sha256:dc9c10fb40944260f6ed4c688ece0cd2048414940f1cea51b8b226318411c519"
+                "sha256:56a8508ae95f98e2b9bdf93a6be5ae3f7d8af858b43e02c5a2ff083726be40c1",
+                "sha256:f643f331ab57ba3c9d89212ee4a2dabc6e94f117cf4eefde99a0574720d14c42"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==2.12.0"
+            "version": "==2.13.0"
         },
         "wcwidth": {
             "hashes": [

README.md

@@ -37,6 +37,7 @@ Here are a few examples of reasons why you might want to adjust the enabled sync
 
 * If you currently input boluses into Nightscout manually with comments, then you may wish to _disable the `BOLUS` synchronization feature_ so that there are no duplicated boluses in Nightscout.
 * If you want to see Sleep and Exercise Mode data appear in Nightscout, then you may with to _enable the `PUMP_EVENTS` synchronization feature_.
+* If you want to automatically update your Nightscout insulin profile settings from your pump, then you may want to _enable the `PROFILES` synchronization feature_.
 
 These synchronization features are enabled by default:
 
@@ -45,6 +46,7 @@ These synchronization features are enabled by default:
 
 The following synchronization features can be optionally enabled:
 
+* `PROFILES`: Insulin profile information, including segments, basal rates, correction factors, carb ratios, and the profile which is active.
 * `PUMP_EVENTS`: Events reported by the pump. Includes support for the following:
   * Site/Cartridge Change (occurs for both a site change and a cartridge change)
   * Empty Cartridge/Pump Shutdown (from my investigation, occurs either when the cartridge runs out of insulin OR you hard-shut off the pump)
@@ -60,7 +62,7 @@ The following synchronization features are under development, [**but are not yet
 To specify custom synchronization features, pass the names of the desired features to the `--features` flag, e.g.:
 
 ```bash
-$ tconnectsync --features BASAL BOLUS PUMP_EVENTS
+$ tconnectsync --features BASAL BOLUS PUMP_EVENTS PROFILES
 ```
 
 If you're using tconnectsync-heroku, see [this section in its README](https://github.com/jwoglom/tconnectsync-heroku#Updating-synchronization-features).

setup.cfg

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

tconnectsync/__init__.py

@@ -17,7 +17,8 @@ try:
         TCONNECT_EMAIL,
         TCONNECT_PASSWORD,
         NS_URL,
-        NS_SECRET
+        NS_SECRET,
+        NS_SKIP_TLS_VERIFY
     )
     from . import secret
 except Exception:
@@ -74,7 +75,7 @@ def main(*args, **kwargs):
 
     tconnect = TConnectApi(TCONNECT_EMAIL, TCONNECT_PASSWORD)
 
-    nightscout = NightscoutApi(NS_URL, NS_SECRET)
+    nightscout = NightscoutApi(NS_URL, NS_SECRET, NS_SKIP_TLS_VERIFY)
 
     if args.check_login:
         return check_login(tconnect, time_start, time_end)

tconnectsync/api/controliq.py

@@ -55,10 +55,16 @@ class ControlIQApi:
             self.tconnect_software_ver = version
             logger.info("Reported tconnect software version: %s" % version)
             if version != self.LAST_CONFIRMED_SOFTWARE_VERSION:
-                logger.warn("Newer API version than last confirmed working. Saw %s and expected %s" % (version, self.LAST_CONFIRMED_SOFTWARE_VERSION))
-                logger.warn("If you experience any issues, please report them to https://github.com/jwoglom/tconnectsync")
+                logger.warning("Newer API version than last confirmed working. Saw %s and expected %s" % (version, self.LAST_CONFIRMED_SOFTWARE_VERSION))
+                logger.warning("If you experience any issues, please report them to https://github.com/jwoglom/tconnectsync")
         except Exception:
-            logger.warn("Unable to find tconnect software version")
+            logger.warning("Unable to find tconnect software version.")
+            contents = "<unknown>"
+            if soup:
+                contents = "%s" % soup.encode_contents()
+                if len(contents) > 1000:
+                    contents = "%s[SNIP]%s" % (contents[:500], contents[-500:])
+            logger.info("BeautifulSoup parsed contents: %s" % contents)
             pass
         return {
             "__LASTFOCUS": "",

tconnectsync/api/webui.py

@@ -1,4 +1,4 @@
-from typing import List
+from typing import Dict, List, Tuple
 import requests
 import urllib
 import datetime
@@ -8,7 +8,7 @@ import logging
 
 from bs4 import BeautifulSoup
 
-from tconnectsync.domain.device_settings import Device, Profile, ProfileSegment
+from tconnectsync.domain.device_settings import Device, Profile, ProfileSegment, DeviceSettings
 from tconnectsync.util import removesuffix, removeprefix
 from tconnectsync.util.constants import MMOLL_TO_MGDL
 
@@ -70,7 +70,7 @@ class WebUIScraper:
     Returns a mapping between pump/device IDs and information about that device,
     including the GUID used for obtaining pump settings.
     """
-    def my_devices(self):
+    def my_devices(self) -> Dict[str, DeviceSettings]:
         devices = {}
         r = self.get('myaccount/my_devices.aspx')
         soup = BeautifulSoup(r.content, features='lxml')
@@ -108,9 +108,9 @@ class WebUIScraper:
     """
     Returns a parsed representation of a pump's settings.
     Note that pump_guid is NOT the serial number of the pump, and
-    should be obtained from my_devices()[str(serial_number)]['guid']
+    should be obtained from my_devices()[str(serial_number)].guid
     """
-    def device_settings_from_guid(self, pump_guid: str) -> List[Profile]:
+    def device_settings_from_guid(self, pump_guid: str) -> Tuple[List[Profile], DeviceSettings]:
         profiles = []
         settings = {}
         r = self.get('myaccount/DeviceSettings.aspx?guid=%s' % pump_guid)
@@ -126,7 +126,15 @@ class WebUIScraper:
             else:
                 settings.update(self._parse_settings_tbl(tbl))
         
-        return profiles, settings
+        low_bg_threshold, high_bg_threshold = self._extract_bg_thresholds(settings)
+
+        dev_settings = DeviceSettings(
+            low_bg_threshold=low_bg_threshold,
+            high_bg_threshold=high_bg_threshold,
+            raw_settings=settings
+        )
+        
+        return profiles, dev_settings
     
     def _parse_profile_tbl(self, tbl) -> Profile:
         profile = {}
@@ -246,11 +254,27 @@ class WebUIScraper:
 
         return settings
     
+    def _extract_bg_thresholds(self, settings):
+        # Nightscout needs default values
+        low_bg_threshold = 70
+        high_bg_threshold = 180
+        if 'CGM Alerts' in settings:
+            if 'Low Alert' in settings['CGM Alerts']:
+                low = settings['CGM Alerts']['Low Alert']
+                if low['value']:
+                    low_bg_threshold = int(low['text'].split(' mg/dL')[0])
+            if 'High Alert' in settings['CGM Alerts']:
+                high = settings['CGM Alerts']['High Alert']
+                if high['value']:
+                    high_bg_threshold = int(high['text'].split(' mg/dL')[0])
+        
+        return low_bg_threshold, high_bg_threshold
+    
     """
     Wraps a call to my_devices to identify the device GUID from the
     given pump serial, and then returns device_settings_from_guid.
     """
-    def device_settings(self, pump_serial):
+    def device_settings(self, pump_serial: str) -> Tuple[List[Profile], DeviceSettings]:
         devices = self.my_devices()
         if str(pump_serial) in devices.keys():
             dev = devices[str(pump_serial)]

tconnectsync/autoupdate.py

@@ -76,7 +76,7 @@ class Autoupdate:
                                     logger.error("Exiting with error code due to AUTOUPDATE_RESTART_ON_FAILURE")
                                     return 1
                             else:
-                                logger.warn(AutoupdateFailureWarning(("%s: An event index change was recorded, but no new data was found via the API. " % datetime.datetime.now()) +
+                                logger.warning(AutoupdateFailureWarning(("%s: An event index change was recorded, but no new data was found via the API. " % datetime.datetime.now()) +
                                             "The %s was %d minutes ago. Resetting TConnectApi to attempt to solve this problem." % 
                                             ("last processed event" if self.last_successful_process_time_range else "start of autoupdate", (now - last_action_or_start)//60)))
                                 
@@ -143,7 +143,7 @@ class Autoupdate:
                 # uploaded, so 
                 if len(self.time_diffs_between_attempts) >= 3:
                     # The pump hasn't sent us data that, based on previous cadence, we were expecting
-                    logger.warn(AutoupdateNoIndexChangeWarning("Sleeping %d seconds after unexpected no index change based on previous cadence. (New data might be delayed.)" % 
+                    logger.warning(AutoupdateNoIndexChangeWarning("Sleeping %d seconds after unexpected no index change based on previous cadence. (New data might be delayed.)" % 
                         int(self.secret.AUTOUPDATE_UNEXPECTED_NO_INDEX_SLEEP_SECONDS)))
                     
                     logger.debug("Last event time: %s, time diffs between attempts: %s" % (self.last_event_time, self.time_diffs_between_attempts))
@@ -204,4 +204,4 @@ class AutoupdateNoNewDataDetectedError(AutoupdateError):
     pass
 
 class AutoupdateNoIndexChangeWarning(AutoupdateWarning):
-    pass
+    pass

tconnectsync/check.py

@@ -2,9 +2,10 @@ import sys
 import time
 import arrow
 import logging
+import traceback
 import pkg_resources
 from datetime import datetime
-from pprint import pformat
+from pprint import pformat as pformat_base
 
 from .nightscout import NightscoutApi
 from .parser.nightscout import BASAL_EVENTTYPE, BOLUS_EVENTTYPE
@@ -29,6 +30,13 @@ def check_login(tconnect, time_start, time_end, verbose=False, sanitize=True):
         print(*args)
         loglines.append(" ".join([str(i) for i in args]) + "\n")
 
+    def log_err(e):
+        try:
+            out = ''.join(list(traceback.TracebackException.from_exception(e).format()))
+            log(out)
+        except Exception:
+            log("could not log exception traceback: {}".format(e))
+
     def debug(*args):
         if verbose:
             print(*args)
@@ -46,7 +54,7 @@ def check_login(tconnect, time_start, time_end, verbose=False, sanitize=True):
         from .secret import TCONNECT_EMAIL, TCONNECT_PASSWORD, PUMP_SERIAL_NUMBER, NS_URL, NS_SECRET, TIMEZONE_NAME
     except ImportError as e:
         log("Error: Unable to load config file. Please check your .env file or environment variables")
-        log(e)
+        log_err(e)
     
     if not TCONNECT_EMAIL or TCONNECT_EMAIL == 'email@email.com':
         log("Error: You have not specified a TCONNECT_EMAIL")
@@ -79,7 +87,9 @@ def check_login(tconnect, time_start, time_end, verbose=False, sanitize=True):
         log("tconnect_software_ver: %s" % tconnect.controliq.tconnect_software_ver)
     except Exception as e:
         log("Error occurred querying ControlIQ API for dashboard_summary:")
-        log(e)
+        log_err(e)
+        if e and "HTTP 404" in str(e):
+            log("<!> The API returns a 404 error if there is no data for the provided dates (currently %s - %s). Try re-running with an earlier start date using --start-date and --end-date arguments." % (time_start, time_end))
         errors += 1
     
     log("Querying ControlIQ therapy_timeline...")
@@ -97,7 +107,7 @@ def check_login(tconnect, time_start, time_end, verbose=False, sanitize=True):
                 lastBasalDuration = processed_tt[-1]['duration_mins']
     except Exception as e:
         log("Error occurred querying ControlIQ therapy_timeline:")
-        log(e)
+        log_err(e)
         errors += 1
     
     log("Querying ControlIQ therapy_events...")
@@ -106,7 +116,7 @@ def check_login(tconnect, time_start, time_end, verbose=False, sanitize=True):
         debug("controliq therapy_events: \n%s" % pformat(androidevents))
     except Exception as e:
         log("Error occurred querying ControlIQ therapy_events:")
-        log(e)
+        log_err(e)
         errors += 1
     
     log("-----")
@@ -119,7 +129,7 @@ def check_login(tconnect, time_start, time_end, verbose=False, sanitize=True):
         ws2_loggedin = True
     except Exception as e:
         log("Error occurred querying WS2 API. This is okay so long as you are not using the PUMP_EVENTS or IOB sync features.")
-        log(e)
+        log_err(e)
         errors += 1
     
     lastReadingTime = None
@@ -133,7 +143,7 @@ def check_login(tconnect, time_start, time_end, verbose=False, sanitize=True):
                 lastReadingTime = TConnectEntry._datetime_parse(ttcsv["readingData"][-1]['EventDateTime'])
         except Exception as e:
             log("Error occurred querying WS2 therapy_timeline_csv. This is okay so long as you are not using the PUMP_EVENTS or IOB sync features.")
-            log(e)
+            log_err(e)
             errors += 1
     else:
         log("Not able to log in to WS2 API, so skipping therapy_timeline_csv")
@@ -150,7 +160,7 @@ def check_login(tconnect, time_start, time_end, verbose=False, sanitize=True):
         debug("Android last uploaded event: \n%s" % pformat(event))
     except Exception as e:
         log("Error occurred querying Android API:")
-        log(e)
+        log_err(e)
         errors += 1
     
     log("-----")
@@ -168,7 +178,7 @@ def check_login(tconnect, time_start, time_end, verbose=False, sanitize=True):
         debug("Nightscout last uploaded bolus: \n%s" % pformat(last_upload_bolus))
     except Exception as e:
         log("Error occurred querying Nightscout API:")
-        log(e)
+        log_err(e)
         errors += 1
 
     log("-----")
@@ -222,4 +232,8 @@ def run_sanitize(s, sanitizedData):
     for k, v in sanitizedData.items():
         if v and len(str(v)) > 0:
             ret = ret.replace(str(v), '[%s]' % k)
-    return ret
+    return ret
+
+def pformat(*args, **kwargs):
+    kwargs['width'] = 160
+    return pformat_base(*args, **kwargs)

tconnectsync/domain/device_settings.py

@@ -1,4 +1,4 @@
-from dataclasses import dataclass
+from dataclasses import dataclass, replace
 from typing import List, Optional
 
 @dataclass
@@ -25,3 +25,20 @@ class Profile:
     calculated_total_daily_basal: float # in units
     insulin_duration_min: int
     carbs_enabled: bool
+
+    def activeProfile(self):
+        p = self.copy()
+        p.active = True
+        return p
+
+    def copy(self):
+        p = replace(self)
+        p.segments = [replace(s) for s in p.segments]
+        return p
+
+# Settings stored globally in the pump that are stored per-profile in Nightscout
+@dataclass
+class DeviceSettings:
+    low_bg_threshold: int
+    high_bg_threshold: int
+    raw_settings: dict

tconnectsync/domain/therapy_event.py

@@ -429,3 +429,52 @@ class BolusTherapyEvent(TherapyEvent):
         'type': 'BG',
         'uploadId': 0}
     """
+
+class BasalTherapyEvent(TherapyEvent):
+    """
+    {
+        'basalRate': {
+            'duration': 0, 
+            'percent': 0, 
+            'value': 0.0
+        }, 
+        'displayInHistory': 0, 
+        'eventDateTime': '2022-12-02T00:00:00', 
+        'note': {
+            'id': 0, 
+            'indexId': '16403', 
+            'eventTypeId': 90, 
+            'sourceRecordId': 0, 
+            'eventId': 0, 
+            'active': False
+        }, 
+        'noteDate': {}, 
+        'requestDateTime': '0001-01-01T00:00:00', 
+        'type': 'Basal', 
+        'description': 'NDE', 
+        'sourceRecId': xxx, 
+        'eventTypeId': 0, 
+        'indexId': 0, 
+        'uploadId': 0, 
+        'interactive': 1, 
+        'tempRateId': 0, 
+        'tempRateCompleted': 0, 
+        'tempRateActivated': 0
+    }
+    """
+    basalRateValue = None
+    basalRatePercent = None
+    basalRateDuration = None
+    eventTime = None
+
+
+    @classmethod
+    def parse(_, json):
+        self = CGMTherapyEvent()
+        TherapyEvent.parse(self, json)
+        if 'basalRate' in json:
+            self.basalRateValue = json['basalRate']['value']
+            self.basalRatePercent = json['basalRate']['percent']
+            self.basalRateDuration = json['basalRate']['duration']
+        self.eventTime = json['eventDateTime']
+        return self

tconnectsync/features.py

@@ -7,6 +7,7 @@ IOB = "IOB"
 BOLUS_BG = "BOLUS_BG"
 CGM = "CGM"
 PUMP_EVENTS = "PUMP_EVENTS"
+PROFILES = "PROFILES"
 
 DEFAULT_FEATURES = [
     BASAL,
@@ -17,7 +18,8 @@ ALL_FEATURES = [
     BASAL,
     BOLUS,
     IOB,
-    PUMP_EVENTS
+    PUMP_EVENTS,
+    PROFILES
 ]
 
 

tconnectsync/nightscout.py

@@ -4,6 +4,7 @@ import hashlib
 import time
 import urllib.parse
 import arrow
+import logging
 
 from urllib.parse import urljoin
 
@@ -11,21 +12,28 @@ from .api.common import ApiException
 from .parser.nightscout import ENTERED_BY
 
 def format_datetime(date):
-        return arrow.get(date).isoformat()
+	return arrow.get(date).isoformat()
 
-def time_range(field_name, start_time, end_time):
+def time_range(field_name, start_time, end_time, t_to_space=False):
+	def fmt(date):
+		ret = format_datetime(date)
+		if t_to_space:
+			return ret.replace('T', ' ')
+		return ret
 	arg = ''
 	if start_time:
-		arg += '&find[%s][$gte]=%s' % (field_name, format_datetime(start_time))
+		arg += '&find[%s][$gte]=%s' % (field_name, fmt(start_time))
 	if end_time:
-		arg += '&find[%s][$lte]=%s' % (field_name, format_datetime(end_time))
+		arg += '&find[%s][$lte]=%s' % (field_name, fmt(end_time))
 	return arg
 
 
+logger = logging.getLogger(__name__)
 class NightscoutApi:
-	def __init__(self, url, secret):
+	def __init__(self, url, secret, skip_verify=False):
 		self.url = url
 		self.secret = secret
+		self.verify = False if skip_verify else None
 
 
 	def upload_entry(self, ns_format, entity='treatments'):
@@ -33,66 +41,99 @@ class NightscoutApi:
 			'Accept': 'application/json',
 			'Content-Type': 'application/json',
 			'api-secret': hashlib.sha1(self.secret.encode()).hexdigest()
-		})
+		}, verify=self.verify)
 		if r.status_code != 200:
-			raise ApiException(r.status_code, "Nightscout upload response: %s" % r.text)
+			raise ApiException(r.status_code, "Nightscout upload %s response: %s" % (r.status_code, r.text))
 
 	def delete_entry(self, entity):
 		r = requests.delete(urljoin(self.url, 'api/v1/' + entity + '?api_secret=' + self.secret), json={}, headers={
 			'Accept': 'application/json',
 			'Content-Type': 'application/json',
 			'api-secret': hashlib.sha1(self.secret.encode()).hexdigest()
-		})
+		}, verify=self.verify)
 		if r.status_code != 200:
-			raise ApiException(r.status_code, "Nightscout delete response: %s" % r.text)
+			raise ApiException(r.status_code, "Nightscout delete %s response: %s" % (r.status_code, r.text))
 
 	def put_entry(self, ns_format, entity):
 		r = requests.put(urljoin(self.url, 'api/v1/' + entity + '?api_secret=' + self.secret), json=ns_format, headers={
 			'Accept': 'application/json',
 			'Content-Type': 'application/json',
 			'api-secret': hashlib.sha1(self.secret.encode()).hexdigest()
-		})
+		}, verify=self.verify)
 		if r.status_code != 200:
-			raise ApiException(r.status_code, "Nightscout put response: %s" % r.text)
+			raise ApiException(r.status_code, "Nightscout put %s response: %s" % (r.status_code, r.text))
 
 	def last_uploaded_entry(self, eventType, time_start=None, time_end=None):
-		dateFilter = time_range('created_at', time_start, time_end)
-		latest = requests.get(urljoin(self.url, 'api/v1/treatments?count=1&find[enteredBy]=' + urllib.parse.quote(ENTERED_BY) + '&find[eventType]=' + urllib.parse.quote(eventType) + dateFilter + '&ts=' + str(time.time())), headers={
-			'api-secret': hashlib.sha1(self.secret.encode()).hexdigest()
-		})
-		if latest.status_code != 200:
-			raise ApiException(latest.status_code, "Nightscout last_uploaded_entry response: %s" % latest.text)
+		def internal(t_to_space):
+			dateFilter = time_range('created_at', time_start, time_end, t_to_space=t_to_space)
+			latest = requests.get(urljoin(self.url, 'api/v1/treatments?count=1&find[enteredBy]=' + urllib.parse.quote(ENTERED_BY) + '&find[eventType]=' + urllib.parse.quote(eventType) + dateFilter + '&ts=' + str(time.time())), headers={
+				'api-secret': hashlib.sha1(self.secret.encode()).hexdigest()
+			}, verify=self.verify)
+			if latest.status_code != 200:
+				raise ApiException(latest.status_code, "Nightscout last_uploaded_entry %s response: %s" % (latest.status_code, latest.text))
 
-		j = latest.json()
-		if j and len(j) > 0:
-			return j[0]
-		return None
+			j = latest.json()
+			if j and len(j) > 0:
+				return j[0]
+			return None
+		
+		ret = None
+		try:
+			ret = internal(False)
+		except ApiException as e:
+			logger.warning("last_uploaded_entry with no t_to_space: %s", e)
+			ret = None
+		if ret is None and (time_start or time_end):
+			try:
+				ret = internal(True)
+			except ApiException as e:
+				logger.warning("last_uploaded_entry with t_to_space: %s", e)
+				ret = None
+			if ret is not None:
+				logger.warning("last_uploaded_entry with eventType=%s time_start=%s time_end=%s only returned data when timestamps contained a space" % (eventType, time_start, time_end))
+		return ret
 	
 	def last_uploaded_bg_entry(self, time_start=None, time_end=None):
-		dateFilter = time_range('dateString', time_start, time_end)
-		latest = requests.get(urljoin(self.url, 'api/v1/entries.json?count=1&find[device]=' + urllib.parse.quote(ENTERED_BY) + dateFilter + '&ts=' + str(time.time())), headers={
-			'api-secret': hashlib.sha1(self.secret.encode()).hexdigest()
-		})
-		if latest.status_code != 200:
-			raise ApiException(latest.status_code, "Nightscout last_uploaded_bg_entry response: %s" % latest.text)
+		def internal(t_to_space):
+			dateFilter = time_range('dateString', time_start, time_end, t_to_space=t_to_space)
+			latest = requests.get(urljoin(self.url, 'api/v1/entries.json?count=1&find[device]=' + urllib.parse.quote(ENTERED_BY) + dateFilter + '&ts=' + str(time.time())), headers={
+				'api-secret': hashlib.sha1(self.secret.encode()).hexdigest()
+			}, verify=self.verify)
+			if latest.status_code != 200:
+				raise ApiException(latest.status_code, "Nightscout last_uploaded_bg_entry %s response: %s" % (latest.status_code, latest.text))
 
-		j = latest.json()
-		if j and len(j) > 0:
-			return j[0]
-		return None
+			j = latest.json()
+			if j and len(j) > 0:
+				return j[0]
+			return None
+		
+		ret = internal(False)
+		if ret is None and (time_start or time_end):
+			ret = internal(True)
+			if ret is not None:
+				logger.warning("last_uploaded_bg_entry with time_start=%s time_end=%s only returned data when timestamps contained a space" % (time_start, time_end))
+		return ret
 
 	def last_uploaded_activity(self, activityType, time_start=None, time_end=None):
-		dateFilter = time_range('created_at', time_start, time_end)
-		latest = requests.get(urljoin(self.url, 'api/v1/activity?find[enteredBy]=' + urllib.parse.quote(ENTERED_BY) + '&find[activityType]=' + urllib.parse.quote(activityType) + dateFilter + '&ts=' + str(time.time())), headers={
-			'api-secret': hashlib.sha1(self.secret.encode()).hexdigest()
-		})
-		if latest.status_code != 200:
-			raise ApiException(latest.status_code, "Nightscout activity response: %s" % latest.text)
+		def internal(t_to_space):
+			dateFilter = time_range('created_at', time_start, time_end, t_to_space=t_to_space)
+			latest = requests.get(urljoin(self.url, 'api/v1/activity?find[enteredBy]=' + urllib.parse.quote(ENTERED_BY) + '&find[activityType]=' + urllib.parse.quote(activityType) + dateFilter + '&ts=' + str(time.time())), headers={
+				'api-secret': hashlib.sha1(self.secret.encode()).hexdigest()
+			}, verify=self.verify)
+			if latest.status_code != 200:
+				raise ApiException(latest.status_code, "Nightscout activity %s response: %s" % (latest.status_code, latest.text))
 
-		j = latest.json()
-		if j and len(j) > 0:
-			return j[0]
-		return None
+			j = latest.json()
+			if j and len(j) > 0:
+				return j[0]
+			return None
+		
+		ret = internal(False)
+		if ret is None and (time_start or time_end):
+			ret = internal(True)
+			if ret is not None:
+				logger.warning("last_uploaded_activity with activityType=%s time_start=%s time_end=%s only returned data when timestamps contained a space" % (activityType, time_start, time_end))
+		return ret
 
 	"""
 	Returns general status information about the Nightscout server.
@@ -100,7 +141,21 @@ class NightscoutApi:
 	def api_status(self):
 		status = requests.get(urljoin(self.url, 'api/v1/status.json'), headers={
 			'api-secret': hashlib.sha1(self.secret.encode()).hexdigest()
-		})
+		}, verify=self.verify)
 		if status.status_code != 200:
 			raise Exception('HTTP error status code (%d) from Nightscout: %s' % (status.status_code, status.text))
-		return status.json()
+		return status.json()
+	
+	"""
+	Returns information on the currently configured Nightscout profile data store
+	(contains all profiles in Nightscout under one mongo object).
+	"""
+	def current_profile(self, time_start=None, time_end=None):
+		r = requests.get(urljoin(self.url, 'api/v1/profile/current?api_secret=' + self.secret), json={}, headers={
+			'Accept': 'application/json',
+			'Content-Type': 'application/json',
+			'api-secret': hashlib.sha1(self.secret.encode()).hexdigest()
+		}, verify=self.verify)
+		if r.status_code != 200:
+			raise ApiException(r.status_code, "Nightscout current_profile %s response: %s" % (r.status_code, r.text))
+		return r.json()

tconnectsync/parser/ciq_therapy_events.py

@@ -1,4 +1,4 @@
-from tconnectsync.domain.therapy_event import BolusTherapyEvent, CGMTherapyEvent, BGTherapyEvent
+from tconnectsync.domain.therapy_event import BolusTherapyEvent, CGMTherapyEvent, BGTherapyEvent, BasalTherapyEvent
 from tconnectsync.parser.tconnect import TConnectEntry
 
 import logging
@@ -9,6 +9,7 @@ def split_therapy_events(ciqTherapyEvents):
     bolusEvents = []
     cgmEvents = []
     bgEvents = []
+    basalEvents = []
     for e in ciqTherapyEvents['event']:
         event = TConnectEntry.parse_therapy_event(e)
         if isinstance(event, BolusTherapyEvent):
@@ -17,7 +18,10 @@ def split_therapy_events(ciqTherapyEvents):
             cgmEvents.append(event)
         elif isinstance(event, BGTherapyEvent):
             bgEvents.append(event)
+        elif isinstance(event, BasalTherapyEvent):
+            basalEvents.append(event)
+
         
-    logger.debug("split_therapy_events: %d bolus, %d CGM, %d BG" % (len(bolusEvents), len(cgmEvents), len(bgEvents)))
+    logger.debug("split_therapy_events: %d bolus, %d CGM, %d BG, %d basal" % (len(bolusEvents), len(cgmEvents), len(bgEvents), len(basalEvents)))
     # TODO: BG events (CGM Calibration) values are not currently returned from ciq_therapy_events.py
     return bolusEvents, cgmEvents

tconnectsync/parser/nightscout.py

@@ -1,5 +1,8 @@
 import arrow
 
+from ..domain.device_settings import Profile, DeviceSettings
+from ..secret import TIMEZONE_NAME, NIGHTSCOUT_PROFILE_CARBS_HR_VALUE, NIGHTSCOUT_PROFILE_DELAY_VALUE
+
 ENTERED_BY = "Pump (tconnectsync)"
 
 BASAL_EVENTTYPE = "Temp Basal"
@@ -106,6 +109,76 @@ class NightscoutEntry:
             "created_at": created_at,
             "enteredBy": ENTERED_BY
         }
+    
+    # Tandem-scraped profile to Nightscout profile store entry
+    @staticmethod
+    def profile_store(profile: Profile, device_settings: DeviceSettings) -> dict:
+        return {
+            # insulin duration in hours
+            "dia": (profile.insulin_duration_min / 60),
+            "carbratio": [
+                {
+                    "time": tandem_to_ns_time(segment.time),
+                    "timeAsSeconds": tandem_to_ns_time_seconds(segment.time),
+                    "value": segment.carb_ratio
+                } for segment in profile.segments
+            ],
+
+            "carbs_hr": NIGHTSCOUT_PROFILE_CARBS_HR_VALUE,
+            "delay": NIGHTSCOUT_PROFILE_DELAY_VALUE,
+            "sens": [ # Correction factor
+                {
+                    "time": tandem_to_ns_time(segment.time),
+                    "timeAsSeconds": tandem_to_ns_time_seconds(segment.time),
+                    "value": segment.correction_factor
+                } for segment in profile.segments
+            ],
+            "basal": [
+                {
+                    "time": tandem_to_ns_time(segment.time),
+                    "timeAsSeconds": tandem_to_ns_time_seconds(segment.time),
+                    "value": segment.basal_rate
+                } for segment in profile.segments
+            ],
+            "target_low": [
+                {
+                    "time": "00:00",
+                    "timeAsSeconds": 0,
+                    "value": device_settings.low_bg_threshold
+                }
+            ],
+            "target_high": [
+                {
+                    "time": "00:00",
+                    "timeAsSeconds": 0,
+                    "value": device_settings.high_bg_threshold
+                }
+            ],
+            "timezone": TIMEZONE_NAME, # tconnectsync settings timezone
+            "startDate": "1970-01-01T00:00:00.000Z",
+            "units": "mg/dl"
+        }
+        
+def tandem_to_ns_time(tandem_time: str) -> str:
+    numbers, ampm = tandem_time.split(' ')
+    hr, min = numbers.split(':')
+    if ampm.lower().strip() == 'am':
+        return "%02d:%02d" % (int(hr) % 12, int(min))
+    elif ampm.lower().strip() == 'pm':
+        return "%02d:%02d" % (12 + (int(hr) % 12), int(min))
+    raise InvalidTimeException(tandem_time)
+
+def tandem_to_ns_time_seconds(tandem_time: str) -> int:
+    numbers, ampm = tandem_time.split(' ')
+    hr, min = numbers.split(':')
+    if ampm.lower().strip() == 'am':
+        return 60 * (60 * (int(hr) % 12) + int(min))
+    elif ampm.lower().strip() == 'pm':
+        return 60 * (60 * (12 + (int(hr) % 12)) + int(min))
+    raise InvalidTimeException(tandem_time)
 
 class InvalidBolusTypeException(RuntimeError):
+    pass
+
+class InvalidTimeException(RuntimeError):
     pass

tconnectsync/parser/tconnect.py

@@ -3,7 +3,7 @@ import sys
 import arrow
 from tconnectsync.domain.bolus import Bolus
 
-from tconnectsync.domain.therapy_event import BolusTherapyEvent, CGMTherapyEvent, BGTherapyEvent
+from tconnectsync.domain.therapy_event import BolusTherapyEvent, CGMTherapyEvent, BGTherapyEvent, BasalTherapyEvent
 
 try:
     from ..secret import TIMEZONE_NAME
@@ -202,6 +202,8 @@ class TConnectEntry:
             return CGMTherapyEvent.parse(data)
         elif data["type"] == "BG":
             return BGTherapyEvent.parse(data)
+        elif data["type"] == "Basal":
+            return BasalTherapyEvent.parse(data)
         
         raise UnknownTherapyEventException(data)
 

tconnectsync/process.py

@@ -29,8 +29,9 @@ from .sync.pump_events import (
     process_basalsuspension_events,
     ns_write_pump_events
 )
+from .sync.profile import process_profiles
 from .parser.tconnect import TConnectEntry
-from .features import BASAL, BOLUS, IOB, BOLUS_BG, CGM, DEFAULT_FEATURES, PUMP_EVENTS
+from .features import BASAL, BOLUS, IOB, BOLUS_BG, CGM, DEFAULT_FEATURES, PUMP_EVENTS, PROFILES
 from tconnectsync.sync import basal
 
 logger = logging.getLogger(__name__)
@@ -41,18 +42,21 @@ cycle of synchronizing data within the time range.
 If pretend is true, then doesn't actually write data to Nightscout.
 """
 def process_time_range(tconnect, nightscout, time_start, time_end, pretend, features=DEFAULT_FEATURES):
-    logger.info("Downloading t:connect ControlIQ data")
-    try:
-        ciqTherapyTimelineData = tconnect.controliq.therapy_timeline(time_start, time_end)
-    except ApiException as e:
-        # The ControlIQ API returns a 404 if the user did not have a ControlIQ enabled
-        # device in the time range which is queried. Since it launched in early 2020,
-        # ignore 404's before February.
-        if e.status_code == 404 and time_start.date() < datetime.date(2020, 2, 1):
-            logger.warning("Ignoring HTTP 404 for ControlIQ API request before Feb 2020")
-            ciqTherapyTimelineData = None
-        else:
-            raise e
+    ciqTherapyTimelineData = None
+    if BASAL in features or PUMP_EVENTS in features:
+        logger.info("Downloading t:connect ControlIQ data")
+
+        try:
+            ciqTherapyTimelineData = tconnect.controliq.therapy_timeline(time_start, time_end)
+        except ApiException as e:
+            # The ControlIQ API returns a 404 if the user did not have a ControlIQ enabled
+            # device in the time range which is queried. Since it launched in early 2020,
+            # ignore 404's before February.
+            if e.status_code == 404 and time_start.date() < datetime.date(2020, 2, 1):
+                logger.warning("Ignoring HTTP 404 for ControlIQ API request before Feb 2020")
+                ciqTherapyTimelineData = None
+            else:
+                raise e
     
     csvReadingData = None
     csvIobData = None
@@ -86,19 +90,19 @@ def process_time_range(tconnect, nightscout, time_start, time_end, pretend, feat
        ciqFallingBack or \
        BOLUS_BG in features or \
        IOB in features:
-        logger.warn("Downloading t:connect CSV data")
+        logger.warning("Downloading t:connect CSV data")
         if bolusFallingBack:
-            logger.warn("Falling back on WS2 CSV data source because BOLUS is an enabled feature and CIQ bolus data was empty!!")
+            logger.warning("Falling back on WS2 CSV data source because BOLUS is an enabled feature and CIQ bolus data was empty!!")
         if ciqFallingBack:
-            logger.warn("Falling back on WS2 CSV data source because CGM is an enabled feature and CIQ cgm data was empty!!")
+            logger.warning("Falling back on WS2 CSV data source because CGM is an enabled feature and CIQ cgm data was empty!!")
         if BOLUS_BG in features:
-            logger.warn("Falling back on WS2 CSV data source because BOLUS_BG is an enabled feature. " +
+            logger.warning("Falling back on WS2 CSV data source because BOLUS_BG is an enabled feature. " +
                         "Please consider disabling this feature to improve synchronization reliability.")
         if IOB in features:
-            logger.warn("Falling back on WS2 CSV data source because IOB is an enabled feature. " +
+            logger.warning("Falling back on WS2 CSV data source because IOB is an enabled feature. " +
                         "Please consider disabling this feature to improve synchronization reliability.")
         
-        logger.warn("<!!> The WS2 data source is unreliable and may prevent timely synchronization")
+        logger.warning("<!!> The WS2 data source is unreliable and may prevent timely synchronization")
         csvdata = tconnect.ws2.therapy_timeline_csv(time_start, time_end)
 
         csvReadingData = csvdata["readingData"]
@@ -147,8 +151,8 @@ def process_time_range(tconnect, nightscout, time_start, time_end, pretend, feat
         pumpEvents = process_ciq_activity_events(ciqTherapyTimelineData)
         logger.debug("CIQ activity events: %s" % pumpEvents)
 
-        logger.warn("Using WS2 data source for basalsuspension because PUMP_EVENTS is an enabled feature")
-        logger.warn("<!!> The WS2 data source is unreliable and may prevent timely synchronization")
+        logger.warning("Using WS2 data source for basalsuspension because PUMP_EVENTS is an enabled feature")
+        logger.warning("<!!> The WS2 data source is unreliable and may prevent timely synchronization")
         ws2BasalSuspension = tconnect.ws2.basalsuspension(time_start, time_end)
 
         bsPumpEvents = process_basalsuspension_events(ws2BasalSuspension)
@@ -167,7 +171,7 @@ def process_time_range(tconnect, nightscout, time_start, time_end, pretend, feat
             bolusEvents = process_bolus_events(ciqBolusData, source="ciq")
 
         if csvBolusData and not bolusEvents:
-            logger.warn("Falling back on non-CIQ csvBolusData")
+            logger.warning("Falling back on non-CIQ csvBolusData")
             bolusEvents = process_bolus_events(csvBolusData, source="csv")
             logger.debug("ciq bolusEvents: %s" % bolusEvents)
         
@@ -182,6 +186,11 @@ def process_time_range(tconnect, nightscout, time_start, time_end, pretend, feat
             logger.debug("Writing iob events")
             added += ns_write_iob_events(nightscout, iobEvents, pretend=pretend)
             logger.debug("Finished writing iob events")
+    
+    if PROFILES in features:
+        logger.debug("Running profiles feature")
+        if process_profiles(tconnect, nightscout, pretend=pretend):
+            added += 1
 
     logger.info("Wrote %d events to Nightscout this process cycle" % added)
-    return added
+    return added

tconnectsync/secret.py

@@ -16,6 +16,14 @@ else:
 def get(val, default=None):
     return os.environ.get(val, values.get(val, default))
 
+def get_one_of(name, default=None, options=[]):
+    val = get(name, default)
+    if val not in options:
+        print("Error: %s must be one of: %s" % (name, options))
+        print("Current value: %s" % val)
+        sys.exit(1)
+    return val
+
 def get_number(name, default):
     val = get(name, default)
     try:
@@ -40,6 +48,8 @@ if not get('NS_SECRET') and get('API_SECRET'):
     print('API_SECRET environment variable is set, overriding NS_SECRET')
     NS_SECRET = get('API_SECRET')
 
+NS_SKIP_TLS_VERIFY = get_bool('NS_SKIP_TLS_VERIFY', 'false')
+
 TIMEZONE_NAME = get('TIMEZONE_NAME', 'America/New_York')
 
 if not get('TIMEZONE_NAME') and get('TZ'):
@@ -57,6 +67,12 @@ AUTOUPDATE_FAILURE_MINUTES = get_number('AUTOUPDATE_FAILURE_MINUTES', '15') # 15
 AUTOUPDATE_RESTART_ON_FAILURE = get_bool('AUTOUPDATE_RESTART_ON_FAILURE', 'true')
 AUTOUPDATE_MAX_LOOP_INVOCATIONS = get_number('AUTOUPDATE_MAX_LOOP_INVOCATIONS', '-1')
 
+NIGHTSCOUT_PROFILE_UPLOAD_MODE = get_one_of('NIGHTSCOUT_PROFILE_UPLOAD_MODE', 'add', ['add', 'replace'])
+
+# Default Nightscout profile segment fields which aren't stored by Tandem
+NIGHTSCOUT_PROFILE_CARBS_HR_VALUE = get('NIGHTSCOUT_PROFILE_CARBS_HR_VALUE', '20')
+NIGHTSCOUT_PROFILE_DELAY_VALUE = get('NIGHTSCOUT_PROFILE_DELAY_VALUE', '20')
+
 ENABLE_TESTING_MODES = get_bool('ENABLE_TESTING_MODES', 'false')
 SKIP_NS_LAST_UPLOADED_CHECK = get_bool('SKIP_NS_LAST_UPLOADED_CHECK', 'false')
 REQUESTS_PROXY = get('REQUESTS_PROXY', '')

tconnectsync/sync/bolus.py

@@ -34,6 +34,12 @@ def process_bolus_events(bolusdata, cgmEvents=None, source=""):
             else:
                 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 parsed.bg and cgmEvents:
             requested_at = parsed.request_time if not parsed.extended_bolus else parsed.bolex_start_time

tconnectsync/sync/profile.py

@@ -0,0 +1,196 @@
+from typing import List, Tuple
+import logging
+import json
+import copy
+import arrow
+
+from ..api import TConnectApi
+from ..domain.device_settings import Profile, DeviceSettings
+from ..parser.nightscout import NightscoutEntry
+from ..nightscout import NightscoutApi
+from ..secret import PUMP_SERIAL_NUMBER, NIGHTSCOUT_PROFILE_UPLOAD_MODE
+
+logger = logging.getLogger(__name__)
+
+def _get_default_serial_number():
+    return PUMP_SERIAL_NUMBER
+
+def _get_default_upload_mode():
+    return NIGHTSCOUT_PROFILE_UPLOAD_MODE
+
+def get_pump_profiles(tconnect: TConnectApi, serial_number: int = None) -> Tuple[List[Profile], DeviceSettings]:
+    all_devices = tconnect.webui.my_devices()
+    if serial_number is None:
+        serial_number = _get_default_serial_number()
+
+    if str(serial_number) not in all_devices:
+        logger.warn("Could not find entry for provided pump serial number in t:connect device list: %s, received: %s", serial_number, all_devices)
+        return [], None
+    
+    device = all_devices[str(serial_number)]
+
+    logger.info("Getting profile settings for %s", device)
+    device_profiles, device_settings = tconnect.webui.device_settings_from_guid(device.guid)
+    logger.debug("device_profiles: %s", device_profiles)
+    logger.debug("device_settings: %s", device_settings)
+
+    logger.info("Found pump profiles: %s", ["%s%s" % (profile.title, " (active)" if profile.active else "") for profile in device_profiles])
+
+    return device_profiles, device_settings
+
+
+"""
+Compare pump device and Nightscout profiles, and return a final dictionary of
+Nightscout profile objects, with the pump profile settings overriding what is
+currently in Nightscout.
+
+ns_profile_obj is the output from NightscoutApi.current_profile() and should be the most
+recent profile object in mongo.
+
+Returns the new Nightscout profile and whether it was changed.
+"""
+def compare_profiles(device_profiles: List[Profile], device_settings: DeviceSettings, ns_profile_obj: dict) -> Tuple[bool, dict]:
+    device = {profile.title: profile for profile in device_profiles}
+    ns = ns_profile_obj.get('store', {})
+
+    logger.info("compare_profiles profile names: device: %s ns: %s", device.keys(), ns.keys())
+
+    new_ns_profile = copy.deepcopy(ns_profile_obj)
+    updated_ns_profile = False
+
+    missing_profiles_in_ns = set(device.keys()) - set(ns.keys())
+    for profile_name in missing_profiles_in_ns:
+        logger.info("Missing %s profile in Nightscout: %s", profile_name, device.get(profile_name))
+        pump_configured_profile = device[profile_name]
+        ns_translated_profile = NightscoutEntry.profile_store(pump_configured_profile, device_settings)
+        logger.info("Will add %s profile to Nightscout: %s", profile_name, ns_translated_profile)
+        new_ns_profile['store'][profile_name] = ns_translated_profile
+        updated_ns_profile = True
+
+    existent_profiles_in_ns = set(device.keys()) & set(ns.keys())
+    for profile_name in existent_profiles_in_ns:
+        logger.debug("Checking for differences for %s profile between pump and nightscout", profile_name)
+        pump_configured_profile = device[profile_name]
+        ns_translated_profile = NightscoutEntry.profile_store(pump_configured_profile, device_settings)
+        ns_configured_profile = ns[profile_name]
+
+        logger.debug("Comparing %s profile from pump: %s to nightscout: %s", profile_name, ns_translated_profile, ns_configured_profile)
+        if nightscout_profiles_identical(ns_configured_profile, ns_translated_profile):
+            logger.info("Profile %s identical between pump and nightscout", profile_name)
+            continue
+
+        logger.info("Profile %s needs update in nightscout: %s", profile_name, ns_translated_profile)
+        new_ns_profile['store'][profile_name] = ns_translated_profile
+        updated_ns_profile = True
+
+    current_pump_profile = None
+    for profile in device_profiles:
+        if profile.active:
+            current_pump_profile = profile.title
+
+    current_ns_profile = ns_profile_obj.get('defaultProfile')
+    if current_pump_profile != current_ns_profile:
+        logger.info("Current profile changed: pump: %s nightscout: %s", current_pump_profile, current_ns_profile)
+        new_ns_profile['defaultProfile'] = current_pump_profile
+        updated_ns_profile = True
+
+    if not updated_ns_profile:
+        logger.info("No Nightscout profile changes")
+        return False, ns_profile_obj
+
+    logger.info("New Nightscout profile object: %s", new_ns_profile)
+    return True, new_ns_profile
+
+def nightscout_profiles_identical(configured: dict, translated: dict) -> bool:
+    if configured == translated:
+        logger.debug("direct dicts equal")
+        return True
+
+    if json.dumps(configured, sort_keys=True, indent=None) == json.dumps(translated, sort_keys=True, indent=None):
+        logger.debug("initial JSON dump identical")
+        return True
+
+    # convert all JSON values into strings
+    def map_nested_dicts_modify(ob, func):
+        for k, v in ob.items():
+            if isinstance(v, dict):
+                map_nested_dicts_modify(v, func)
+            elif isinstance(v, list):
+                map_nested_lists_modify(v, func)
+            else:
+                ob[k] = func(v)
+
+    def map_nested_lists_modify(ob, func):
+        for i in range(len(ob)):
+            v = ob[i]
+            if isinstance(v, dict):
+                map_nested_dicts_modify(v, func)
+            elif isinstance(v, list):
+                map_nested_lists_modify(v, func)
+            else:
+                ob[i] = func(v)
+
+    def to_numeric(x):
+        if type(x) in [int, float]:
+            return '%f' % x
+        try:
+            return '%f' % float(x)
+        except (ValueError, TypeError):
+            return x
+
+
+    convert_func = lambda x: to_numeric(x)
+
+    configured_str = json.loads(json.dumps(configured))
+    map_nested_dicts_modify(configured_str, convert_func)
+    translated_str = json.loads(json.dumps(translated))
+    map_nested_dicts_modify(translated_str, convert_func)
+
+    if json.dumps(configured_str, sort_keys=True, indent=None) == json.dumps(translated_str, sort_keys=True, indent=None):
+        logger.debug("map_nested_dicts JSON dump identical")
+        return True
+
+    logger.debug("profiles not identical")
+    return False
+
+def setup_new_profile(ns_profile: dict) -> dict:
+    if '_id' in ns_profile:
+        del ns_profile['_id']
+    
+    now = arrow.now().isoformat()
+    ns_profile['startDate'] = now
+    ns_profile['created_at'] = now
+
+    return ns_profile
+
+def process_profiles(tconnect: TConnectApi, nightscout: NightscoutApi, pretend: bool = False, upload_mode: str = None) -> bool:
+    if not upload_mode:
+        upload_mode = _get_default_upload_mode()
+
+    logger.debug("Checking for differences between pump and nightscout profiles: %s mode", upload_mode)
+    
+    ns_profile_obj = nightscout.current_profile()
+    pump_profiles, pump_settings = get_pump_profiles(tconnect)
+    diff, ns_profile_new = compare_profiles(pump_profiles, pump_settings, ns_profile_obj)
+
+    if not diff:
+        logger.info("Pump and Nightscout profiles up to date")
+        return False
+    
+    if upload_mode == 'add':
+        profile_to_upload = setup_new_profile(ns_profile_new)
+        logger.info("Adding new Nightscout profiles object: %s", profile_to_upload)
+
+        if not pretend:
+            nightscout.upload_entry(profile_to_upload, entity='profile')
+        return True
+
+    elif upload_mode == 'replace':
+        logger.info("Replacing new Nightscout profiles object: %s", ns_profile_new)
+
+        if not pretend:
+            nightscout.put_entry(ns_profile_new, entity='profile')
+        return True
+
+    else:
+        raise RuntimeError('invalid upload_mode: %s' % upload_mode)

tests/api/fake.py

@@ -44,6 +44,12 @@ class WebUIScraper(tconnectsync.api.webui.WebUIScraper):
     def __init__(self, controliq):
         self.controliq = controliq
 
+    def my_devices(self):
+        raise NotImplementedError
+    
+    def device_settings(self, pump_guid):
+        raise NotImplementedError
+
 class TConnectApi(tconnectsync.api.TConnectApi):
     def __init__(self, email=None, password=None):
         if email is not None and password is not None:
@@ -54,3 +60,4 @@ class TConnectApi(tconnectsync.api.TConnectApi):
     _ciq = ControlIQApi()
     _ws2 = WS2Api()
     _android = AndroidApi()
+    _webui = WebUIScraper(_ciq)

tests/api/test_webui.py

@@ -953,7 +953,6 @@ class TestWebUIScraper(unittest.TestCase):
         with requests_mock.Mocker() as m:
             m.get('https://tconnect.tandemdiabetes.com/myaccount/DeviceSettings.aspx?guid=00000000-0000-0000-0000-000000000001',
                 request_headers=base_headers(),
-
                 text=self.PUMP_SETTINGS_HTML)
 
             profiles, settings = webui.device_settings_from_guid('00000000-0000-0000-0000-000000000001')
@@ -994,7 +993,7 @@ class TestWebUIScraper(unittest.TestCase):
                 'carbs_enabled': True
             })])
 
-            self.assertDictEqual(settings, {
+            self.assertDictEqual(settings.raw_settings, {
                 'Alerts': {
                     'Alert: Auto-Off': {'text': '18 hrs', 'value': True},
                     'Alert: Low Insulin': {'text': '35 u'}
@@ -1043,6 +1042,8 @@ class TestWebUIScraper(unittest.TestCase):
                 },
                 'upload_date': 'Jan 09, 2022'
             })
+            self.assertEqual(settings.low_bg_threshold, 80)
+            self.assertEqual(settings.high_bg_threshold, 200)
 
 
 

tests/parser/test_nightscout.py

@@ -1,9 +1,12 @@
 #!/usr/bin/env python3
 
 import unittest
-from tconnectsync.parser.nightscout import NightscoutEntry, InvalidBolusTypeException
+from tconnectsync.parser.nightscout import NightscoutEntry, InvalidBolusTypeException, tandem_to_ns_time, tandem_to_ns_time_seconds
+from tconnectsync.domain.device_settings import Profile, ProfileSegment, DeviceSettings
 
+from ..sync.test_profile import DEVICE_PROFILE_A, DEVICE_SETTINGS, NS_PROFILE_A
 class TestNightscoutEntry(unittest.TestCase):
+    maxDiff = None
     def test_basal(self):
         self.assertEqual(
             NightscoutEntry.basal(
@@ -191,6 +194,39 @@ class TestNightscoutEntry(unittest.TestCase):
             }
         )
 
+    
+    def test_profile_store(self):
+        self.assertEqual(
+            NightscoutEntry.profile_store(
+                profile=DEVICE_PROFILE_A,
+                device_settings=DEVICE_SETTINGS
+            ),
+            NS_PROFILE_A
+        )
+
+
+class TestTandemNightscoutTime(unittest.TestCase):
+    def test_tandem_to_ns_time(self):
+        self.assertEqual(tandem_to_ns_time('12:00 AM'), '00:00')
+        self.assertEqual(tandem_to_ns_time('12:30 AM'), '00:30')
+        self.assertEqual(tandem_to_ns_time('6:00 AM'), '06:00')
+        self.assertEqual(tandem_to_ns_time('6:30 AM'), '06:30')
+        self.assertEqual(tandem_to_ns_time('11:30 AM'), '11:30')
+        self.assertEqual(tandem_to_ns_time('12:00 PM'), '12:00')
+        self.assertEqual(tandem_to_ns_time('12:30 PM'), '12:30')
+        self.assertEqual(tandem_to_ns_time('06:30 PM'), '18:30')
+        self.assertEqual(tandem_to_ns_time('11:30 PM'), '23:30')
+
+    def test_tandem_to_ns_time_seconds(self):
+        self.assertEqual(tandem_to_ns_time_seconds('12:00 AM'), 0)
+        self.assertEqual(tandem_to_ns_time_seconds('12:30 AM'), 30*60)
+        self.assertEqual(tandem_to_ns_time_seconds('6:00 AM'), 6*60*60)
+        self.assertEqual(tandem_to_ns_time_seconds('6:30 AM'), 6*60*60 + 30*60)
+        self.assertEqual(tandem_to_ns_time_seconds('11:30 AM'), 11*60*60 + 30*60)
+        self.assertEqual(tandem_to_ns_time_seconds('12:00 PM'), 12*60*60)
+        self.assertEqual(tandem_to_ns_time_seconds('12:30 PM'), 12*60*60 + 30*60)
+        self.assertEqual(tandem_to_ns_time_seconds('06:30 PM'), 12*60*60 + 6*60*60 + 30*60)
+        self.assertEqual(tandem_to_ns_time_seconds('11:30 PM'), 12*60*60 + 11*60*60 + 30*60)
 
 if __name__ == '__main__':
     unittest.main()

tests/sync/test_profile.py

@@ -0,0 +1,524 @@
+#!/usr/bin/env python3
+
+import json
+import unittest
+from typing import Dict
+import copy
+
+from tconnectsync.sync.profile import get_pump_profiles, compare_profiles, nightscout_profiles_identical
+from tconnectsync.domain.device_settings import Profile, ProfileSegment, DeviceSettings
+from tconnectsync.secret import NIGHTSCOUT_PROFILE_CARBS_HR_VALUE, NIGHTSCOUT_PROFILE_DELAY_VALUE, TIMEZONE_NAME
+
+from ..parser.test_tconnect import TestTConnectEntryReading
+
+DEVICE_PROFILE_A = Profile(
+    title='A', 
+    active=False, 
+    segments=[
+        ProfileSegment(
+            display_time='Midnight', 
+            time='12:00 AM', 
+            basal_rate=0.8, 
+            correction_factor=30.0, 
+            carb_ratio=6.0, 
+            target_bg_mgdl=110.0), 
+        ProfileSegment(
+            display_time='6:00 AM', 
+            time='6:00 AM', 
+            basal_rate=1.25, 
+            correction_factor=30.0, 
+            carb_ratio=6.0, 
+            target_bg_mgdl=110.0), 
+        ProfileSegment(
+            display_time='11:00 AM', 
+            time='11:00 AM', 
+            basal_rate=1.0, 
+            correction_factor=30.0, 
+            carb_ratio=6.0, 
+            target_bg_mgdl=110.0), 
+        ProfileSegment(
+            display_time='Noon', 
+            time='12:00 PM', 
+            basal_rate=0.8, 
+            correction_factor=30.0, 
+            carb_ratio=6.0, 
+            target_bg_mgdl=110.0)
+    ],
+    calculated_total_daily_basal=21.65, 
+    insulin_duration_min=300, 
+    carbs_enabled=True
+)
+
+DEVICE_PROFILE_B = Profile(
+    title='B', 
+    active=False, 
+    segments=[
+        ProfileSegment(
+            display_time='Midnight', 
+            time='12:00 AM', 
+            basal_rate=0.8, 
+            correction_factor=30.0, 
+            carb_ratio=12.0, 
+            target_bg_mgdl=110.0), 
+        ProfileSegment(
+            display_time='6:00 AM', 
+            time='6:00 AM', 
+            basal_rate=1.25, 
+            correction_factor=30.0, 
+            carb_ratio=12.0, 
+            target_bg_mgdl=110.0), 
+        ProfileSegment(
+            display_time='11:00 AM', 
+            time='11:00 AM', 
+            basal_rate=1.0, 
+            correction_factor=30.0, 
+            carb_ratio=12.0, 
+            target_bg_mgdl=110.0), 
+        ProfileSegment(
+            display_time='Noon', 
+            time='12:00 PM', 
+            basal_rate=0.9, 
+            correction_factor=30.0, 
+            carb_ratio=12.0, 
+            target_bg_mgdl=110.0)
+    ],
+    calculated_total_daily_basal=22.85, 
+    insulin_duration_min=300, 
+    carbs_enabled=True
+)
+
+DEVICE_SETTINGS = DeviceSettings(
+    low_bg_threshold=80,
+    high_bg_threshold=200,
+    raw_settings={}
+)
+
+NS_PROFILE_A = {
+    "dia": 5.0,
+    "carbratio": [
+        {
+            "time": "00:00",
+            "timeAsSeconds": 0,
+            "value": 6.0
+        },
+        {
+            "time": "06:00",
+            "timeAsSeconds": 6*60*60,
+            "value": 6.0
+        },
+        {
+            "time": "11:00",
+            "timeAsSeconds": 11*60*60,
+            "value": 6.0
+        },
+        {
+            "time": "12:00",
+            "timeAsSeconds": 12*60*60,
+            "value": 6.0
+        }
+    ],
+
+    "carbs_hr": NIGHTSCOUT_PROFILE_CARBS_HR_VALUE,
+    "delay": NIGHTSCOUT_PROFILE_DELAY_VALUE,
+    "sens": [
+        {
+            "time": "00:00",
+            "timeAsSeconds": 0,
+            "value": 30.0
+        },
+        {
+            "time": "06:00",
+            "timeAsSeconds": 6*60*60,
+            "value": 30.0
+        },
+        {
+            "time": "11:00",
+            "timeAsSeconds": 11*60*60,
+            "value": 30.0
+        },
+        {
+            "time": "12:00",
+            "timeAsSeconds": 12*60*60,
+            "value": 30.0
+        }
+    ],
+    "basal": [
+        {
+            "time": "00:00",
+            "timeAsSeconds": 0,
+            "value": 0.8
+        },
+        {
+            "time": "06:00",
+            "timeAsSeconds": 6*60*60,
+            "value": 1.25
+        },
+        {
+            "time": "11:00",
+            "timeAsSeconds": 11*60*60,
+            "value": 1.0
+        },
+        {
+            "time": "12:00",
+            "timeAsSeconds": 12*60*60,
+            "value": 0.8
+        }
+    ],
+    "target_low": [
+        {
+            "time": "00:00",
+            "timeAsSeconds": 0,
+            "value": 80
+        }
+    ],
+    "target_high": [
+        {
+            "time": "00:00",
+            "timeAsSeconds": 0,
+            "value": 200
+        }
+    ],
+    "timezone": TIMEZONE_NAME,
+    "startDate": "1970-01-01T00:00:00.000Z",
+    "units": "mg/dl"
+}
+
+NS_PROFILE_B = {
+    "dia": 5.0,
+    "carbratio": [
+        {
+            "time": "00:00",
+            "timeAsSeconds": 0,
+            "value": 12.0
+        },
+        {
+            "time": "06:00",
+            "timeAsSeconds": 6*60*60,
+            "value": 12.0
+        },
+        {
+            "time": "11:00",
+            "timeAsSeconds": 11*60*60,
+            "value": 12.0
+        },
+        {
+            "time": "12:00",
+            "timeAsSeconds": 12*60*60,
+            "value": 12.0
+        }
+    ],
+
+    "carbs_hr": NIGHTSCOUT_PROFILE_CARBS_HR_VALUE,
+    "delay": NIGHTSCOUT_PROFILE_DELAY_VALUE,
+    "sens": [
+        {
+            "time": "00:00",
+            "timeAsSeconds": 0,
+            "value": 30.0
+        },
+        {
+            "time": "06:00",
+            "timeAsSeconds": 6*60*60,
+            "value": 30.0
+        },
+        {
+            "time": "11:00",
+            "timeAsSeconds": 11*60*60,
+            "value": 30.0
+        },
+        {
+            "time": "12:00",
+            "timeAsSeconds": 12*60*60,
+            "value": 30.0
+        }
+    ],
+    "basal": [
+        {
+            "time": "00:00",
+            "timeAsSeconds": 0,
+            "value": 0.8
+        },
+        {
+            "time": "06:00",
+            "timeAsSeconds": 6*60*60,
+            "value": 1.25
+        },
+        {
+            "time": "11:00",
+            "timeAsSeconds": 11*60*60,
+            "value": 1.0
+        },
+        {
+            "time": "12:00",
+            "timeAsSeconds": 12*60*60,
+            "value": 0.9
+        }
+    ],
+    "target_low": [
+        {
+            "time": "00:00",
+            "timeAsSeconds": 0,
+            "value": 80
+        }
+    ],
+    "target_high": [
+        {
+            "time": "00:00",
+            "timeAsSeconds": 0,
+            "value": 200
+        }
+    ],
+    "timezone": TIMEZONE_NAME,
+    "startDate": "1970-01-01T00:00:00.000Z",
+    "units": "mg/dl"
+}
+
+NS_PROFILE_STORE = {
+    'A': NS_PROFILE_A,
+    'B': NS_PROFILE_B
+}
+
+def build_ns_profile(profiles: Dict[str, dict], current_profile: str) -> dict:
+    return copy.deepcopy({
+        "store": profiles,
+        "defaultProfile": current_profile,
+        "startDate": "1970-01-01T00:00:00.000Z",
+        "mills": 0,
+        "units": "mg/dl",
+    })
+
+class TestCompareProfiles(unittest.TestCase):
+    maxDiff = None
+    def test_compare_profiles_identical_a(self):
+        pump_profiles = [DEVICE_PROFILE_A.activeProfile()]
+        ns_profile_obj = build_ns_profile({'A': NS_PROFILE_A}, 'A')
+
+        changed, new_profiles = compare_profiles(
+            pump_profiles,
+            DEVICE_SETTINGS,
+            ns_profile_obj
+        )
+
+        self.assertFalse(changed)
+        self.assertDictEqual(ns_profile_obj, new_profiles)
+
+        self.ensure_stabilized(pump_profiles, new_profiles)
+
+    def test_compare_profiles_identical_b(self):
+        pump_profiles = [DEVICE_PROFILE_B.activeProfile()]
+        ns_profile_obj = build_ns_profile({'B': NS_PROFILE_B}, 'B')
+
+        changed, new_profiles = compare_profiles(
+            pump_profiles,
+            DEVICE_SETTINGS,
+            ns_profile_obj
+        )
+
+        self.assertFalse(changed)
+        self.assertDictEqual(ns_profile_obj, new_profiles)
+
+        self.ensure_stabilized(pump_profiles, new_profiles)
+
+    def test_compare_profiles_extra_profile_in_nightscout_ignored(self):
+        pump_profiles = [DEVICE_PROFILE_A.activeProfile()]
+        ns_profile_obj = build_ns_profile({'A': NS_PROFILE_A, 'B': NS_PROFILE_B}, 'A')
+
+        changed, new_profiles = compare_profiles(
+            pump_profiles,
+            DEVICE_SETTINGS,
+            ns_profile_obj
+        )
+
+        self.assertFalse(changed)
+        self.assertDictEqual(ns_profile_obj, new_profiles)
+
+        self.ensure_stabilized(pump_profiles, new_profiles)
+
+    def test_compare_profiles_current_nightscout_profile_changed(self):
+        pump_profiles = [DEVICE_PROFILE_A.activeProfile()]
+        ns_profile_obj = build_ns_profile({'A': NS_PROFILE_A, 'B': NS_PROFILE_B}, 'B')
+
+        changed, new_profiles = compare_profiles(
+            pump_profiles,
+            DEVICE_SETTINGS,
+            ns_profile_obj
+        )
+
+        self.assertTrue(changed)
+        self.assertNotEqual(ns_profile_obj, new_profiles)
+
+        ns_profile_obj['defaultProfile'] = 'A'
+        self.assertDictEqual(ns_profile_obj, new_profiles)
+        
+        self.ensure_stabilized(pump_profiles, new_profiles)
+
+    def test_compare_profiles_new_pump_profile_added(self):
+        pump_profiles = [DEVICE_PROFILE_A.activeProfile(), DEVICE_PROFILE_B]
+        ns_profile_obj = build_ns_profile({'A': NS_PROFILE_A}, 'A')
+
+        changed, new_profiles = compare_profiles(
+            pump_profiles,
+            DEVICE_SETTINGS,
+            ns_profile_obj
+        )
+        
+        self.assertTrue(changed)
+        self.assertNotEqual(ns_profile_obj, new_profiles)
+        
+        ns_profile_obj['store']['B'] = new_profiles['store']['B']
+        self.assertDictEqual(ns_profile_obj, new_profiles)
+
+        self.ensure_stabilized(pump_profiles, new_profiles)
+
+    def test_compare_profiles_new_pump_profile_added_and_active(self):
+        pump_profiles = [DEVICE_PROFILE_A, DEVICE_PROFILE_B.activeProfile()]
+        ns_profile_obj = build_ns_profile({'A': NS_PROFILE_A}, 'A')
+
+        changed, new_profiles = compare_profiles(
+            pump_profiles,
+            DEVICE_SETTINGS,
+            ns_profile_obj
+        )
+        
+        self.assertTrue(changed)
+        self.assertNotEqual(ns_profile_obj, new_profiles)
+        
+        ns_profile_obj['store']['B'] = new_profiles['store']['B']
+        ns_profile_obj['defaultProfile'] = 'B'
+        self.assertDictEqual(ns_profile_obj, new_profiles)
+        
+        self.ensure_stabilized(pump_profiles, new_profiles)
+
+    def test_compare_profiles_existing_profile_edited_basal(self):
+        pump_profiles = [DEVICE_PROFILE_A.activeProfile()]
+        pump_profiles[0].segments[0].basal_rate = 0.1
+
+        ns_profile_obj = build_ns_profile({'A': NS_PROFILE_A}, 'A')
+
+        changed, new_profiles = compare_profiles(
+            pump_profiles,
+            DEVICE_SETTINGS,
+            ns_profile_obj
+        )
+        
+        self.assertTrue(changed)
+        self.assertNotEqual(ns_profile_obj, new_profiles)
+        
+        ns_profile_obj['store']['A']['basal'][0]['value'] = 0.1
+        self.assertDictEqual(ns_profile_obj, new_profiles)
+        
+        self.ensure_stabilized(pump_profiles, new_profiles)
+
+    def test_compare_profiles_existing_profile_edited_new_chunk(self):
+        pump_profiles = [DEVICE_PROFILE_A.activeProfile()]
+        pump_profiles[0].segments.append(ProfileSegment(
+            display_time='06:00 PM', 
+            time='06:00 PM', 
+            basal_rate=0.7, 
+            correction_factor=30.0, 
+            carb_ratio=6.0,
+            target_bg_mgdl=110.0)
+        )
+
+        ns_profile_obj = build_ns_profile({'A': NS_PROFILE_A}, 'A')
+
+        changed, new_profiles = compare_profiles(
+            pump_profiles,
+            DEVICE_SETTINGS,
+            ns_profile_obj
+        )
+        
+        self.assertTrue(changed)
+        self.assertNotEqual(ns_profile_obj, new_profiles)
+        
+        ns_profile_obj['store']['A']['basal'].append({'time': '18:00', 'timeAsSeconds': 18*60*60, 'value': 0.7})
+        ns_profile_obj['store']['A']['carbratio'].append({'time': '18:00', 'timeAsSeconds': 18*60*60, 'value': 6})
+        ns_profile_obj['store']['A']['sens'].append({'time': '18:00', 'timeAsSeconds': 18*60*60, 'value': 30})
+        self.assertDictEqual(ns_profile_obj, new_profiles)
+        
+        self.ensure_stabilized(pump_profiles, new_profiles)
+
+    def test_compare_profiles_existing_profile_edited_removed_chunk(self):
+        pump_profiles = [DEVICE_PROFILE_A.activeProfile()]
+        pump_profiles[0].segments.pop()
+
+        ns_profile_obj = build_ns_profile({'A': NS_PROFILE_A}, 'A')
+
+        changed, new_profiles = compare_profiles(
+            pump_profiles,
+            DEVICE_SETTINGS,
+            ns_profile_obj
+        )
+        
+        self.assertTrue(changed)
+        self.assertNotEqual(ns_profile_obj, new_profiles)
+        
+        ns_profile_obj['store']['A']['basal'].pop()
+        ns_profile_obj['store']['A']['carbratio'].pop()
+        ns_profile_obj['store']['A']['sens'].pop()
+        self.assertDictEqual(ns_profile_obj, new_profiles)
+        
+        self.ensure_stabilized(pump_profiles, new_profiles)
+    
+    def ensure_stabilized(self, pump_profiles, new_profiles):
+        changed, _ = compare_profiles(
+            pump_profiles,
+            DEVICE_SETTINGS,
+            new_profiles
+        )
+        self.assertFalse(changed, 'did not stabilize')
+
+class TestNightscoutProfilesIdentical(unittest.TestCase):
+    def test_same_dict(self):
+        self.assertTrue(nightscout_profiles_identical(NS_PROFILE_A, NS_PROFILE_A))
+
+    def test_different_dict(self):
+        self.assertFalse(nightscout_profiles_identical(NS_PROFILE_A, NS_PROFILE_B))
+
+    def test_same_re_jsoned(self):
+        self.assertTrue(nightscout_profiles_identical(NS_PROFILE_A, json.loads(json.dumps(NS_PROFILE_A))))
+
+    def test_same_different_number_types(self):
+        a = b = json.loads(json.dumps(NS_PROFILE_A))
+        a['dia'] = 5
+        b = json.loads(json.dumps(NS_PROFILE_A))
+        b['dia'] = 5.0
+        self.assertTrue(nightscout_profiles_identical(a, b))
+
+    def test_same_different_number_strings_1(self):
+        a = b = json.loads(json.dumps(NS_PROFILE_A))
+        a['dia'] = 5
+        b = json.loads(json.dumps(NS_PROFILE_A))
+        b['dia'] = '5.0'
+        self.assertTrue(nightscout_profiles_identical(a, b))
+
+    def test_same_different_number_strings_2(self):
+        a = b = json.loads(json.dumps(NS_PROFILE_A))
+        a['dia'] = '5'
+        b = json.loads(json.dumps(NS_PROFILE_A))
+        b['dia'] = 5.0
+        self.assertTrue(nightscout_profiles_identical(a, b))
+
+    def test_same_different_number_strings_3(self):
+        a = b = json.loads(json.dumps(NS_PROFILE_A))
+        a['dia'] = '5'
+        b = json.loads(json.dumps(NS_PROFILE_A))
+        b['dia'] = '5.000'
+        self.assertTrue(nightscout_profiles_identical(a, b))
+
+    def test_different_numbers(self):
+        a = b = json.loads(json.dumps(NS_PROFILE_A))
+        a['dia'] = 5
+        b = json.loads(json.dumps(NS_PROFILE_A))
+        b['dia'] = 5.1
+        self.assertFalse(nightscout_profiles_identical(a, b))
+
+    def test_different_numbers_strings(self):
+        a = b = json.loads(json.dumps(NS_PROFILE_A))
+        a['dia'] = '5'
+        b = json.loads(json.dumps(NS_PROFILE_A))
+        b['dia'] = '5.01'
+        self.assertFalse(nightscout_profiles_identical(a, b))
+
+if __name__ == '__main__':
+    unittest.main()

tests/test_autoupdate.py

@@ -24,9 +24,9 @@ def build_mock_logger():
         logger.error(*args, **kwargs)
     
     def fake_warn(*args, **kwargs):
-        logger.warn(*args, **kwargs)
+        logger.warning(*args, **kwargs)
         
-    with patch("tconnectsync.autoupdate.logger.error") as mock_error, patch("tconnectsync.autoupdate.logger.warn") as mock_warn:
+    with patch("tconnectsync.autoupdate.logger.error") as mock_error, patch("tconnectsync.autoupdate.logger.warning") as mock_warn:
         mock_error.side_effect = fake_error
         mock_warn.side_effect = fake_warn
         yield (mock_error, mock_warn)

tests/test_process.py

@@ -4,17 +4,22 @@ import unittest
 import datetime
 import pprint
 import copy
+from unittest.mock import patch
 
 from tconnectsync.process import process_time_range
 from tconnectsync.parser.nightscout import EXERCISE_EVENTTYPE, IOB_ACTIVITYTYPE, SLEEP_EVENTTYPE, NightscoutEntry
-from tconnectsync.features import BASAL, BOLUS, IOB, PUMP_EVENTS
-from tests.domain.test_therapy_event import BOLUS_FULL_EXAMPLES, TestCGMTherapyEvent
+from tconnectsync.features import BASAL, BOLUS, IOB, PROFILES, PUMP_EVENTS
+from tconnectsync.domain.device_settings import Device
+from tests.secrets import build_secrets
+from tests.sync.test_profile import DEVICE_PROFILE_A, DEVICE_PROFILE_B, DEVICE_SETTINGS, NS_PROFILE_A, NS_PROFILE_B, build_ns_profile
+
 
 from .api.fake import TConnectApi
 from .nightscout_fake import NightscoutApi
 from .sync.test_basal import TestBasalSync
 from .sync.test_bolus import TestBolusSync
 from .sync.test_iob import TestIOBSync
+from .domain.test_therapy_event import BOLUS_FULL_EXAMPLES, TestCGMTherapyEvent
 
 class TestProcessTimeRange(unittest.TestCase):
     maxDiff = None
@@ -67,7 +72,7 @@ class TestProcessTimeRange(unittest.TestCase):
         nightscout.last_uploaded_entry = self.stub_last_uploaded_entry
         nightscout.last_uploaded_activity = self.stub_last_uploaded_activity
 
-        process_time_range(tconnect, nightscout, start, end, pretend=False, features=[BOLUS, BASAL])
+        count = process_time_range(tconnect, nightscout, start, end, pretend=False, features=[BOLUS, BASAL])
 
         self.assertEqual(len(nightscout.uploaded_entries["treatments"]), 4)
         self.assertDictEqual(dict(nightscout.uploaded_entries), {
@@ -79,6 +84,7 @@ class TestProcessTimeRange(unittest.TestCase):
         ]})
         self.assertDictEqual(nightscout.put_entries, {})
         self.assertListEqual(nightscout.deleted_entries, [])
+        self.assertEqual(count, 4)
 
     """No data in Nightscout. Nothing should be updated in Nightscout without the BASAL feature."""
     def test_basal_data_not_updated_without_feature(self):
@@ -103,11 +109,12 @@ class TestProcessTimeRange(unittest.TestCase):
         nightscout.last_uploaded_entry = self.stub_last_uploaded_entry
         nightscout.last_uploaded_activity = self.stub_last_uploaded_activity
 
-        process_time_range(tconnect, nightscout, start, end, pretend=False, features=[BOLUS, IOB])
+        count = process_time_range(tconnect, nightscout, start, end, pretend=False, features=[BOLUS, IOB])
 
         self.assertEqual(len(nightscout.uploaded_entries["treatments"]), 0)
         self.assertDictEqual(nightscout.put_entries, {})
         self.assertListEqual(nightscout.deleted_entries, [])
+        self.assertEqual(count, 0)
 
     """Two basal entries in Nightscout. Two new basal entries in tconnect."""
     def test_partial_ciq_basal_data(self):
@@ -139,7 +146,7 @@ class TestProcessTimeRange(unittest.TestCase):
         nightscout.last_uploaded_entry = fake_last_uploaded_entry
         nightscout.last_uploaded_activity = self.stub_last_uploaded_activity
 
-        process_time_range(tconnect, nightscout, start, end, pretend=False, features=[BOLUS, BASAL])
+        count = process_time_range(tconnect, nightscout, start, end, pretend=False, features=[BOLUS, BASAL])
 
         self.assertEqual(len(nightscout.uploaded_entries["treatments"]), 2)
         self.assertDictEqual(dict(nightscout.uploaded_entries), {
@@ -149,6 +156,7 @@ class TestProcessTimeRange(unittest.TestCase):
         ]})
         self.assertDictEqual(nightscout.put_entries, {})
         self.assertListEqual(nightscout.deleted_entries, [])
+        self.assertEqual(count, 2)
 
 
     """
@@ -184,7 +192,7 @@ class TestProcessTimeRange(unittest.TestCase):
         nightscout.last_uploaded_entry = fake_last_uploaded_entry
         nightscout.last_uploaded_activity = self.stub_last_uploaded_activity
 
-        process_time_range(tconnect, nightscout, start, end, pretend=False, features=[BOLUS, BASAL])
+        count = process_time_range(tconnect, nightscout, start, end, pretend=False, features=[BOLUS, BASAL])
 
         self.assertEqual(len(nightscout.uploaded_entries["treatments"]), 2)
         self.assertDictEqual(nightscout.uploaded_entries, {
@@ -202,6 +210,7 @@ class TestProcessTimeRange(unittest.TestCase):
             ]
         })
         self.assertListEqual(nightscout.deleted_entries, [])
+        self.assertEqual(count, 3)
 
     """No data in Nightscout. Uploads all bolus data from tconnect via the WS2 API."""
     def test_new_ciq_bolus_data_from_ws2(self):
@@ -228,7 +237,7 @@ class TestProcessTimeRange(unittest.TestCase):
         nightscout.last_uploaded_entry = self.stub_last_uploaded_entry
         nightscout.last_uploaded_activity = self.stub_last_uploaded_activity
 
-        process_time_range(tconnect, nightscout, start, end, pretend=False, features=[BOLUS, BASAL])
+        count = process_time_range(tconnect, nightscout, start, end, pretend=False, features=[BOLUS, BASAL])
 
         pprint.pprint(nightscout.uploaded_entries)
         self.assertEqual(len(nightscout.uploaded_entries["treatments"]), len(bolusData))
@@ -241,6 +250,7 @@ class TestProcessTimeRange(unittest.TestCase):
         ]})
         self.assertDictEqual(nightscout.put_entries, {})
         self.assertListEqual(nightscout.deleted_entries, [])
+        self.assertEqual(count, 4)
 
     """No data in Nightscout. Uploads all bolus data from tconnect via CIQ therapy_events."""
     def test_new_ciq_bolus_data_from_ciq_therapy_events(self):
@@ -265,7 +275,7 @@ class TestProcessTimeRange(unittest.TestCase):
         nightscout.last_uploaded_entry = self.stub_last_uploaded_entry
         nightscout.last_uploaded_activity = self.stub_last_uploaded_activity
 
-        process_time_range(tconnect, nightscout, start, end, pretend=False, features=[BOLUS, BASAL])
+        count = process_time_range(tconnect, nightscout, start, end, pretend=False, features=[BOLUS, BASAL])
 
         pprint.pprint(nightscout.uploaded_entries)
         self.assertEqual(len(nightscout.uploaded_entries["treatments"]), len(BOLUS_FULL_EXAMPLES))
@@ -281,6 +291,7 @@ class TestProcessTimeRange(unittest.TestCase):
         ]})
         self.assertDictEqual(nightscout.put_entries, {})
         self.assertListEqual(nightscout.deleted_entries, [])
+        self.assertEqual(count, 3)
 
     """No data in Nightscout. Nothing should be updated in Nightscout without the BOLUS feature."""
     def test_bolus_data_not_updated_without_feature(self):
@@ -306,12 +317,13 @@ class TestProcessTimeRange(unittest.TestCase):
         nightscout.last_uploaded_entry = self.stub_last_uploaded_entry
         nightscout.last_uploaded_activity = self.stub_last_uploaded_activity
 
-        process_time_range(tconnect, nightscout, start, end, pretend=False, features=[BASAL, IOB])
+        count = process_time_range(tconnect, nightscout, start, end, pretend=False, features=[BASAL, IOB])
 
         pprint.pprint(nightscout.uploaded_entries)
         self.assertEqual(len(nightscout.uploaded_entries["treatments"]), 0)
         self.assertDictEqual(nightscout.put_entries, {})
         self.assertListEqual(nightscout.deleted_entries, [])
+        self.assertEqual(count, 0)
 
     """No data in Nightscout. Uploads new iob reading from tconnect."""
     def test_new_ciq_iob_data(self):
@@ -338,7 +350,7 @@ class TestProcessTimeRange(unittest.TestCase):
         nightscout.last_uploaded_entry = self.stub_last_uploaded_entry
         nightscout.last_uploaded_activity = self.stub_last_uploaded_activity
 
-        process_time_range(tconnect, nightscout, start, end, pretend=False, features=[BOLUS, BASAL, IOB])
+        count = process_time_range(tconnect, nightscout, start, end, pretend=False, features=[BOLUS, BASAL, IOB])
 
         pprint.pprint(nightscout.uploaded_entries)
         self.assertEqual(len(nightscout.uploaded_entries["activity"]), 1)
@@ -349,6 +361,7 @@ class TestProcessTimeRange(unittest.TestCase):
         ]})
         self.assertDictEqual(nightscout.put_entries, {})
         self.assertListEqual(nightscout.deleted_entries, [])
+        self.assertEqual(count, 1)
 
     """No data in Nightscout. Nothing should be updated in Nightscout without the IOB feature."""
     def test_iob_data_not_updated_without_feature(self):
@@ -375,11 +388,12 @@ class TestProcessTimeRange(unittest.TestCase):
         nightscout.last_uploaded_entry = self.stub_last_uploaded_entry
         nightscout.last_uploaded_activity = self.stub_last_uploaded_activity
 
-        process_time_range(tconnect, nightscout, start, end, pretend=False, features=[BASAL, BOLUS])
+        count = process_time_range(tconnect, nightscout, start, end, pretend=False, features=[BASAL, BOLUS])
 
         self.assertEqual(len(nightscout.uploaded_entries["activity"]), 0)
         self.assertDictEqual(nightscout.put_entries, {})
         self.assertListEqual(nightscout.deleted_entries, [])
+        self.assertEqual(count, 0)
     
     """Existing IOB in Nightscout. Uploads new iob reading and deletes old IOB."""
     def test_updates_ciq_iob_data(self):
@@ -414,7 +428,7 @@ class TestProcessTimeRange(unittest.TestCase):
 
         nightscout.last_uploaded_activity = fake_last_uploaded_activity
 
-        process_time_range(tconnect, nightscout, start, end, pretend=False, features=[IOB])
+        count = process_time_range(tconnect, nightscout, start, end, pretend=False, features=[IOB])
 
         pprint.pprint(nightscout.uploaded_entries)
         self.assertEqual(len(nightscout.uploaded_entries["activity"]), 1)
@@ -427,6 +441,7 @@ class TestProcessTimeRange(unittest.TestCase):
         self.assertListEqual(nightscout.deleted_entries, [
             "activity/sentinel_existing_iob_id"
         ])
+        self.assertEqual(count, 1)
     
     """No pump activity events in Nightscout. New CIQ activity events."""
     def test_new_ciq_activity_events(self):
@@ -466,7 +481,7 @@ class TestProcessTimeRange(unittest.TestCase):
         nightscout.last_uploaded_entry = self.stub_last_uploaded_entry
         nightscout.last_uploaded_activity = self.stub_last_uploaded_activity
 
-        process_time_range(tconnect, nightscout, start, end, pretend=False, features=[PUMP_EVENTS])
+        count = process_time_range(tconnect, nightscout, start, end, pretend=False, features=[PUMP_EVENTS])
 
         self.assertEqual(len(nightscout.uploaded_entries["treatments"]), 2)
         self.assertDictEqual(dict(nightscout.uploaded_entries), {
@@ -476,6 +491,7 @@ class TestProcessTimeRange(unittest.TestCase):
         ]})
         self.assertDictEqual(nightscout.put_entries, {})
         self.assertListEqual(nightscout.deleted_entries, [])
+        self.assertEqual(count, 2)
 
     """No pump activity events in Nightscout. New CIQ activity events, but feature is disabled."""
     def test_no_ciq_activity_events_without_feature(self):
@@ -516,11 +532,12 @@ class TestProcessTimeRange(unittest.TestCase):
         nightscout.last_uploaded_entry = self.stub_last_uploaded_entry
         nightscout.last_uploaded_activity = self.stub_last_uploaded_activity
 
-        process_time_range(tconnect, nightscout, start, end, pretend=False, features=[BOLUS, BASAL, IOB])
+        count = process_time_range(tconnect, nightscout, start, end, pretend=False, features=[BOLUS, BASAL, IOB])
 
         self.assertEqual(len(nightscout.uploaded_entries["treatments"]), 0)
         self.assertDictEqual(nightscout.put_entries, {})
         self.assertListEqual(nightscout.deleted_entries, [])
+        self.assertEqual(count, 0)
 
     
     """
@@ -578,7 +595,7 @@ class TestProcessTimeRange(unittest.TestCase):
         nightscout.last_uploaded_entry = fake_last_uploaded_entry
         nightscout.last_uploaded_activity = self.stub_last_uploaded_activity
 
-        process_time_range(tconnect, nightscout, start, end, pretend=False, features=[PUMP_EVENTS])
+        count = process_time_range(tconnect, nightscout, start, end, pretend=False, features=[PUMP_EVENTS])
 
         self.assertEqual(len(nightscout.uploaded_entries["treatments"]), 1)
         self.assertDictEqual(dict(nightscout.uploaded_entries), {
@@ -593,6 +610,7 @@ class TestProcessTimeRange(unittest.TestCase):
         self.assertListEqual(nightscout.deleted_entries, [
             "treatments/old_sleep"
         ])
+        self.assertEqual(count, 1)
 
     """No pump activity events in Nightscout. New WS2 activity events."""
     def test_new_ws2_activity_events(self):
@@ -631,7 +649,7 @@ class TestProcessTimeRange(unittest.TestCase):
         nightscout.last_uploaded_entry = self.stub_last_uploaded_entry
         nightscout.last_uploaded_activity = self.stub_last_uploaded_activity
 
-        process_time_range(tconnect, nightscout, start, end, pretend=False, features=[PUMP_EVENTS])
+        count = process_time_range(tconnect, nightscout, start, end, pretend=False, features=[PUMP_EVENTS])
 
         self.assertEqual(len(nightscout.uploaded_entries["treatments"]), 3)
         self.assertDictEqual(dict(nightscout.uploaded_entries), {
@@ -642,6 +660,7 @@ class TestProcessTimeRange(unittest.TestCase):
         ]})
         self.assertDictEqual(nightscout.put_entries, {})
         self.assertListEqual(nightscout.deleted_entries, [])
+        self.assertEqual(count, 3)
 
     """Existing pump activity events in Nightscout. New WS2 activity events. Only adds new events."""
     def test_existing_ws2_activity_events(self):
@@ -696,7 +715,7 @@ class TestProcessTimeRange(unittest.TestCase):
         nightscout.last_uploaded_entry = fake_last_uploaded_entry
         nightscout.last_uploaded_activity = self.stub_last_uploaded_activity
 
-        process_time_range(tconnect, nightscout, start, end, pretend=False, features=[PUMP_EVENTS])
+        count = process_time_range(tconnect, nightscout, start, end, pretend=False, features=[PUMP_EVENTS])
 
         self.assertEqual(len(nightscout.uploaded_entries["treatments"]), 1)
         self.assertDictEqual(dict(nightscout.uploaded_entries), {
@@ -705,6 +724,7 @@ class TestProcessTimeRange(unittest.TestCase):
         ]})
         self.assertDictEqual(nightscout.put_entries, {})
         self.assertListEqual(nightscout.deleted_entries, [])
+        self.assertEqual(count, 1)
 
     """No pump activity events in nightscout. New WS2 activity events, but only of skipped types. None should be added."""
     def test_skipped_ws2_activity_events(self):
@@ -744,11 +764,214 @@ class TestProcessTimeRange(unittest.TestCase):
         nightscout.last_uploaded_entry = self.stub_last_uploaded_entry
         nightscout.last_uploaded_activity = self.stub_last_uploaded_activity
 
-        process_time_range(tconnect, nightscout, start, end, pretend=False, features=[PUMP_EVENTS])
+        count = process_time_range(tconnect, nightscout, start, end, pretend=False, features=[PUMP_EVENTS])
 
         self.assertEqual(len(nightscout.uploaded_entries["treatments"]), 0)
         self.assertDictEqual(nightscout.put_entries, {})
         self.assertListEqual(nightscout.deleted_entries, [])
+        self.assertEqual(count, 0)
+
+    """Profile present on pump and not in Nightscout with PROFILES feature enabled, adds profile."""
+    def test_pump_profile_added(self):
+        tconnect = TConnectApi()
+
+        # datetimes are unused by the API fake
+        start = datetime.datetime(2021, 5, 1, 0, 0)
+        end = datetime.datetime(2021, 5, 3, 0, 0)
+
+        pump_guid = '00000000-0000-0000-0000-000000000001'
+        serial_number = '12345'
+        
+        def fake_my_devices():
+            return {
+                serial_number: Device(
+                    name='test',
+                    model_number=serial_number,
+                    status='OK',
+                    guid=pump_guid)
+            }
+        tconnect.webui.my_devices = fake_my_devices
+
+        def fake_device_settings_from_guid(guid):
+            if guid != pump_guid:
+                raise RuntimeError('invalid guid')
+            return [DEVICE_PROFILE_A.activeProfile()], DEVICE_SETTINGS
+
+        tconnect.webui.device_settings_from_guid = fake_device_settings_from_guid
+
+        nightscout = NightscoutApi()
+
+        def fake_current_profile(time_start=None, time_end=None):
+            return build_ns_profile({}, '')
+
+        nightscout.current_profile = fake_current_profile
+
+        count = None
+        with patch("tconnectsync.sync.profile._get_default_upload_mode") as mock_upload_mode, \
+             patch("tconnectsync.sync.profile._get_default_serial_number") as mock_serial_number:
+            mock_upload_mode.return_value = 'add'
+            mock_serial_number.return_value = serial_number
+
+            count = process_time_range(tconnect, nightscout, start, end, pretend=False, features=[PROFILES])
+
+        self.assertEqual(len(nightscout.uploaded_entries["profile"]), 1)
+        self.assertDictEqual(nightscout.uploaded_entries["profile"][0]['store']['A'], NS_PROFILE_A)
+        self.assertDictEqual(nightscout.put_entries, {})
+        self.assertListEqual(nightscout.deleted_entries, [])
+        self.assertEqual(count, 1)
+
+    """Profile present on pump and in Nightscout with PROFILES feature enabled, does not add profile."""
+    def test_pump_profile_not_updated(self):
+        tconnect = TConnectApi()
+
+        # datetimes are unused by the API fake
+        start = datetime.datetime(2021, 5, 1, 0, 0)
+        end = datetime.datetime(2021, 5, 3, 0, 0)
+
+        pump_guid = '00000000-0000-0000-0000-000000000001'
+        serial_number = '12345'
+        
+        def fake_my_devices():
+            return {
+                serial_number: Device(
+                    name='test',
+                    model_number=serial_number,
+                    status='OK',
+                    guid=pump_guid)
+            }
+        tconnect.webui.my_devices = fake_my_devices
+
+        def fake_device_settings_from_guid(guid):
+            if guid != pump_guid:
+                raise RuntimeError('invalid guid')
+            return [DEVICE_PROFILE_A.activeProfile()], DEVICE_SETTINGS
+
+        tconnect.webui.device_settings_from_guid = fake_device_settings_from_guid
+
+        nightscout = NightscoutApi()
+
+        def fake_current_profile(time_start=None, time_end=None):
+            return build_ns_profile({'A': NS_PROFILE_A}, 'A')
+
+        nightscout.current_profile = fake_current_profile
+
+        count = None
+        with patch("tconnectsync.sync.profile._get_default_upload_mode") as mock_upload_mode, \
+             patch("tconnectsync.sync.profile._get_default_serial_number") as mock_serial_number:
+            mock_upload_mode.return_value = 'add'
+            mock_serial_number.return_value = serial_number
+
+            count = process_time_range(tconnect, nightscout, start, end, pretend=False, features=[PROFILES])
+
+        self.assertEqual(len(nightscout.uploaded_entries["profile"]), 0)
+        self.assertDictEqual(nightscout.put_entries, {})
+        self.assertListEqual(nightscout.deleted_entries, [])
+        self.assertEqual(count, 0)
+
+    """Profile present on pump and in Nightscout with PROFILES feature enabled, with changes on pump, adds new profile object."""
+    def test_pump_profile_new_entry_added(self):
+        tconnect = TConnectApi()
+
+        # datetimes are unused by the API fake
+        start = datetime.datetime(2021, 5, 1, 0, 0)
+        end = datetime.datetime(2021, 5, 3, 0, 0)
+
+        pump_guid = '00000000-0000-0000-0000-000000000001'
+        serial_number = '12345'
+        
+        def fake_my_devices():
+            return {
+                serial_number: Device(
+                    name='test',
+                    model_number=serial_number,
+                    status='OK',
+                    guid=pump_guid)
+            }
+        tconnect.webui.my_devices = fake_my_devices
+
+        def fake_device_settings_from_guid(guid):
+            if guid != pump_guid:
+                raise RuntimeError('invalid guid')
+            return [DEVICE_PROFILE_A, DEVICE_PROFILE_B.activeProfile()], DEVICE_SETTINGS
+
+        tconnect.webui.device_settings_from_guid = fake_device_settings_from_guid
+
+        nightscout = NightscoutApi()
+
+        def fake_current_profile(time_start=None, time_end=None):
+            return build_ns_profile({'A': NS_PROFILE_A}, 'A')
+
+        nightscout.current_profile = fake_current_profile
+
+        count = None
+        with patch("tconnectsync.sync.profile._get_default_upload_mode") as mock_upload_mode, \
+             patch("tconnectsync.sync.profile._get_default_serial_number") as mock_serial_number:
+            mock_upload_mode.return_value = 'add'
+            mock_serial_number.return_value = serial_number
+
+            count = process_time_range(tconnect, nightscout, start, end, pretend=False, features=[PROFILES])
+
+        self.assertEqual(len(nightscout.uploaded_entries["profile"]), 1)
+        self.assertEqual(len(nightscout.uploaded_entries["profile"][0]['store']), 2)
+        self.assertDictEqual(nightscout.uploaded_entries["profile"][0]['store']['A'], NS_PROFILE_A)
+        self.assertDictEqual(nightscout.uploaded_entries["profile"][0]['store']['B'], NS_PROFILE_B)
+        self.assertDictEqual(nightscout.put_entries, {})
+        self.assertListEqual(nightscout.deleted_entries, [])
+        self.assertEqual(count, 1)
+
+    """
+    Profile present on pump and in Nightscout with PROFILES feature enabled, with changes on pump,
+    replaces existing profile object with NIGHTSCOUT_PROFILE_UPLOAD_MODE=replace.
+    """
+    def test_pump_profile_new_entry_replaced(self):
+        tconnect = TConnectApi()
+
+        # datetimes are unused by the API fake
+        start = datetime.datetime(2021, 5, 1, 0, 0)
+        end = datetime.datetime(2021, 5, 3, 0, 0)
+
+        pump_guid = '00000000-0000-0000-0000-000000000001'
+        serial_number = '12345'
+        
+        def fake_my_devices():
+            return {
+                serial_number: Device(
+                    name='test',
+                    model_number=serial_number,
+                    status='OK',
+                    guid=pump_guid)
+            }
+        tconnect.webui.my_devices = fake_my_devices
+
+        def fake_device_settings_from_guid(guid):
+            if guid != pump_guid:
+                raise RuntimeError('invalid guid')
+            return [DEVICE_PROFILE_A, DEVICE_PROFILE_B.activeProfile()], DEVICE_SETTINGS
+
+        tconnect.webui.device_settings_from_guid = fake_device_settings_from_guid
+
+        nightscout = NightscoutApi()
+
+        def fake_current_profile(time_start=None, time_end=None):
+            return build_ns_profile({'A': NS_PROFILE_A}, 'A')
+
+        nightscout.current_profile = fake_current_profile
+
+        count = None
+        with patch("tconnectsync.sync.profile._get_default_upload_mode") as mock_upload_mode, \
+             patch("tconnectsync.sync.profile._get_default_serial_number") as mock_serial_number:
+            mock_upload_mode.return_value = 'replace'
+            mock_serial_number.return_value = serial_number
+
+            count = process_time_range(tconnect, nightscout, start, end, pretend=False, features=[PROFILES])
+
+        self.assertDictEqual(nightscout.uploaded_entries, {})
+        self.assertEqual(len(nightscout.put_entries["profile"]), 1)
+        self.assertEqual(len(nightscout.put_entries["profile"][0]['store']), 2)
+        self.assertDictEqual(nightscout.put_entries["profile"][0]['store']['A'], NS_PROFILE_A)
+        self.assertDictEqual(nightscout.put_entries["profile"][0]['store']['B'], NS_PROFILE_B)
+        self.assertListEqual(nightscout.deleted_entries, [])
+        self.assertEqual(count, 1)
 
 
 if __name__ == '__main__':