Added combined values and dates functions

Author: miriamkw

README.md

@@ -121,13 +121,13 @@ To do:
   - build to python folder
   - add readme
 - [X] write python functions api 
-- [ ] write tests with example files
+- [X] write tests with example files
 - [ ] create pypi package
 - [ ] add a build script 
   - automatically run tests on push 
   - automatically build new dlib on push
 - [X] clean up code swift
-- [ ] clean up code python
+- [X] clean up code python
 - [ ] update readme with new changes
   - explanation, separating between python and swift code
   - example usage of the api (with signal handlers), and example inputs (refer to test files)

loop_to_python_api/api.py

@@ -5,7 +5,6 @@
 from loop_to_python_api.helpers import get_bytes_from_json
 
 import ctypes
-import json
 import os
 
 
@@ -53,7 +52,10 @@ def get_prediction_dates(json_file):
     return date_list
 
 
-# TODO: Add combined predictions and dates, with assertequals to check whether they are of same length
+def get_prediction_values_and_dates(json_file):
+    dates = get_prediction_dates(json_file)
+    values = generate_prediction(json_file, len(dates))
+    return values, dates
 
 
 # "Glucose effect velocity" is equivalent to insulin counteraction effect (ICE)
@@ -80,6 +82,14 @@ def get_glucose_effect_velocity_dates(json_file):
     return date_list
 
 
+def get_glucose_velocity_values_and_dates(json_file):
+    # TODO: Add validation of json dates here to be more flexible?
+
+    dates = get_glucose_effect_velocity_dates(json_file)
+    values = get_glucose_effect_velocity(json_file, len(dates))
+    return values, dates
+
+
 def get_active_carbs(json_file):
     json_bytes = get_bytes_from_json(json_file)
 

python_tests/tests.py

@@ -4,8 +4,10 @@
     initialize_exception_handlers,
     generate_prediction,
     get_prediction_dates,
+    get_prediction_values_and_dates,
     get_glucose_effect_velocity,
     get_glucose_effect_velocity_dates,
+    get_glucose_velocity_values_and_dates,
     get_active_carbs,
     get_active_insulin,
     percent_absorption_at_percent_time,
@@ -47,6 +49,17 @@ def test_get_prediction_dates():
     assert isinstance(prediction_dates, list)  # Replace with the expected type or value
 
 
+def test_get_prediction_values_and_dates():
+    prediction_input = get_generate_prediction_input()
+    values, dates = get_prediction_values_and_dates(prediction_input)
+
+    # Assertions to check the types
+    assert isinstance(values, list), "The prediction values should be a list."
+    assert isinstance(dates, list), "The prediction dates should be a list."
+    assert all(isinstance(value, (int, float)) for value in values), "All prediction values should be integers or floats."
+    assert all(isinstance(date, str) for date in dates), "All prediction dates should be strings."
+
+
 def test_get_glucose_effect_velocity():
     prediction_input = get_generate_prediction_input()
     glucose_effect_velocity = get_glucose_effect_velocity(prediction_input)
@@ -59,6 +72,17 @@ def test_get_glucose_effect_velocity_dates():
     assert isinstance(glucose_effect_velocity_dates, list)  # Replace with the expected type or value
 
 
+def test_get_glucose_effect_velocity_values_and_dates():
+    prediction_input = get_generate_prediction_input()
+    values, dates = get_glucose_velocity_values_and_dates(prediction_input)
+
+    # Assertions to check the types
+    assert isinstance(values, list), "The prediction values should be a list."
+    assert isinstance(dates, list), "The prediction dates should be a list."
+    assert all(isinstance(value, (int, float)) for value in values), "All prediction values should be integers or floats."
+    assert all(isinstance(date, str) for date in dates), "All prediction dates should be strings."
+
+
 def test_get_active_carbs():
     loop_algorithm_input = get_loop_aglgorithm_input()
     active_carbs = get_active_carbs(loop_algorithm_input)