v0.8.5

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = tconnectsync
-version = 0.8.4
+version = 0.8.5
 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/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,7 +41,7 @@ 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)
 
@@ -42,7 +50,7 @@ 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 delete response: %s" % r.text)
 
@@ -51,48 +59,72 @@ 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 put response: %s" % 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 response: %s" % 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_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 response: %s" % 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 response: %s" % 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 +132,7 @@ 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()

tconnectsync/secret.py

@@ -40,6 +40,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'):