Updated Snakemake, run_tests.sh, raw sensor data & feature data filenames, and participant files' structure in the tests directory to make them consistent with the recent updates to RAPIDS

tests/Snakefile

@@ -36,9 +36,9 @@ for provider in config["PHONE_MESSAGES"]["PROVIDERS"].keys():
 
 for provider in config["PHONE_CALLS"]["PROVIDERS"].keys():
     if config["PHONE_CALLS"]["PROVIDERS"][provider]["COMPUTE"]:
-        files_to_compute.extend(expand("data/raw/{pid}/phone_calls_raw.csv", pid=config["PIDS"], sensor=config["PHONE_CALLS"]["DB_TABLE"]))
-        files_to_compute.extend(expand("data/raw/{pid}/phone_calls_with_datetime.csv", pid=config["PIDS"], sensor=config["PHONE_CALLS"]["DB_TABLE"]))
-        files_to_compute.extend(expand("data/raw/{pid}/phone_calls_with_datetime_unified.csv", pid=config["PIDS"], sensor=config["PHONE_CALLS"]["DB_TABLE"]))
+        files_to_compute.extend(expand("data/raw/{pid}/phone_calls_raw.csv", pid=config["PIDS"]))
+        files_to_compute.extend(expand("data/raw/{pid}/phone_calls_with_datetime.csv", pid=config["PIDS"]))
+        files_to_compute.extend(expand("data/raw/{pid}/phone_calls_with_datetime_unified.csv", pid=config["PIDS"]))
         files_to_compute.extend(expand("data/interim/{pid}/phone_calls_features/phone_calls_{language}_{provider_key}.csv", pid=config["PIDS"], language=config["PHONE_CALLS"]["PROVIDERS"][provider]["SRC_LANGUAGE"].lower(), provider_key=provider.lower()))
         files_to_compute.extend(expand("data/processed/features/{pid}/phone_calls.csv", pid=config["PIDS"]))
 
@@ -122,23 +122,6 @@ for provider in config["PHONE_WIFI_CONNECTED"]["PROVIDERS"].keys():
         files_to_compute.extend(expand("data/interim/{pid}/phone_wifi_connected_features/phone_wifi_connected_{language}_{provider_key}.csv", pid=config["PIDS"], language=config["PHONE_WIFI_CONNECTED"]["PROVIDERS"][provider]["SRC_LANGUAGE"].lower(), provider_key=provider.lower()))
         files_to_compute.extend(expand("data/processed/features/{pid}/phone_wifi_connected.csv", pid=config["PIDS"]))
 
-if config["HEARTRATE"]["COMPUTE"]:
-    files_to_compute.extend(expand("data/raw/{pid}/{sensor}_raw.csv", pid=config["PIDS"], sensor=config["HEARTRATE"]["DB_TABLE"]))
-    files_to_compute.extend(expand("data/raw/{pid}/fitbit_heartrate_{fitbit_data_type}_with_datetime.csv", pid=config["PIDS"], fitbit_data_type=["summary", "intraday"]))
-    files_to_compute.extend(expand("data/processed/{pid}/fitbit_heartrate_{day_segment}.csv", pid = config["PIDS"], day_segment = config["HEARTRATE"]["DAY_SEGMENTS"]))
-
-if config["STEP"]["COMPUTE"]:
-    if config["STEP"]["EXCLUDE_SLEEP"]["EXCLUDE"] == True and config["STEP"]["EXCLUDE_SLEEP"]["TYPE"] == "FITBIT_BASED":
-        files_to_compute.extend(expand("data/raw/{pid}/fitbit_sleep_{fitbit_data_type}_with_datetime.csv", pid=config["PIDS"], fitbit_data_type=["summary"]))
-    files_to_compute.extend(expand("data/raw/{pid}/{sensor}_raw.csv", pid=config["PIDS"], sensor=config["STEP"]["DB_TABLE"]))
-    files_to_compute.extend(expand("data/raw/{pid}/fitbit_step_{fitbit_data_type}_with_datetime.csv", pid=config["PIDS"], fitbit_data_type=["intraday"]))
-    files_to_compute.extend(expand("data/processed/{pid}/fitbit_step_{day_segment}.csv", pid = config["PIDS"], day_segment = config["STEP"]["DAY_SEGMENTS"]))
-
-if config["SLEEP"]["COMPUTE"]:
-    files_to_compute.extend(expand("data/raw/{pid}/{sensor}_raw.csv", pid=config["PIDS"], sensor=config["SLEEP"]["DB_TABLE"]))
-    files_to_compute.extend(expand("data/raw/{pid}/fitbit_sleep_{fitbit_data_type}_with_datetime.csv", pid=config["PIDS"], fitbit_data_type=["intraday", "summary"]))
-    files_to_compute.extend(expand("data/processed/{pid}/fitbit_sleep_{day_segment}.csv", pid = config["PIDS"], day_segment = config["SLEEP"]["DAY_SEGMENTS"]))
-
 for provider in config["PHONE_CONVERSATION"]["PROVIDERS"].keys():    
     if config["PHONE_CONVERSATION"]["PROVIDERS"][provider]["COMPUTE"]:
         files_to_compute.extend(expand("data/raw/{pid}/phone_conversation_raw.csv", pid=config["PIDS"]))
@@ -150,10 +133,10 @@ for provider in config["PHONE_CONVERSATION"]["PROVIDERS"].keys():
 for provider in config["PHONE_LOCATIONS"]["PROVIDERS"].keys():
     if config["PHONE_LOCATIONS"]["PROVIDERS"][provider]["COMPUTE"]:
         if config["PHONE_LOCATIONS"]["LOCATIONS_TO_USE"] == "RESAMPLE_FUSED":
-            if config["PHONE_LOCATIONS"]["DB_TABLE"] in config["PHONE_VALID_SENSED_BINS"]["DB_TABLES"]:
+            if "PHONE_LOCATIONS" in config["PHONE_VALID_SENSED_BINS"]["PHONE_SENSORS"]:
                 files_to_compute.extend(expand("data/interim/{pid}/phone_sensed_bins.csv", pid=config["PIDS"]))
             else:
-                raise ValueError("Error: Add your locations table (and as many sensor tables as you have) to [PHONE_VALID_SENSED_BINS][DB_TABLES] in config.yaml. This is necessary to compute phone_sensed_bins (bins of time when the smartphone was sensing data) which is used to resample fused location data (RESAMPLED_FUSED)")
+                raise ValueError("Error: Add PHONE_LOCATIONS (and as many PHONE_SENSORS as you have) to [PHONE_VALID_SENSED_BINS][PHONE_SENSORS] in config.yaml. This is necessary to compute phone_sensed_bins (bins of time when the smartphone was sensing data) which is used to resample fused location data (RESAMPLED_FUSED)")
 
         files_to_compute.extend(expand("data/raw/{pid}/phone_locations_raw.csv", pid=config["PIDS"]))
         files_to_compute.extend(expand("data/interim/{pid}/phone_locations_processed.csv", pid=config["PIDS"]))
@@ -161,6 +144,30 @@ for provider in config["PHONE_LOCATIONS"]["PROVIDERS"].keys():
         files_to_compute.extend(expand("data/interim/{pid}/phone_locations_features/phone_locations_{language}_{provider_key}.csv", pid=config["PIDS"], language=config["PHONE_LOCATIONS"]["PROVIDERS"][provider]["SRC_LANGUAGE"].lower(), provider_key=provider.lower()))
         files_to_compute.extend(expand("data/processed/features/{pid}/phone_locations.csv", pid=config["PIDS"]))
 
+
+for provider in config["FITBIT_HEARTRATE"]["PROVIDERS"].keys():
+    if config["FITBIT_HEARTRATE"]["PROVIDERS"][provider]["COMPUTE"]:
+        files_to_compute.extend(expand("data/raw/{pid}/fitbit_heartrate_raw.csv", pid=config["PIDS"]))
+    # files_to_compute.extend(expand("data/raw/{pid}/fitbit_heartrate_{fitbit_data_type}_with_datetime.csv", pid=config["PIDS"], fitbit_data_type=["summary", "intraday"]))
+    # files_to_compute.extend(expand("data/processed/{pid}/fitbit_heartrate_{day_segment}.csv", pid = config["PIDS"], day_segment = config["HEARTRATE"]["DAY_SEGMENTS"]))
+
+for provider in config["FITBIT_STEPS"]["PROVIDERS"].keys():
+    if config["FITBIT_STEPS"]["PROVIDERS"][provider]["COMPUTE"]:
+        files_to_compute.extend(expand("data/raw/{pid}/fitbit_steps_raw.csv", pid=config["PIDS"]))
+# if config["STEP"]["COMPUTE"]:
+#     if config["STEP"]["EXCLUDE_SLEEP"]["EXCLUDE"] == True and config["STEP"]["EXCLUDE_SLEEP"]["TYPE"] == "FITBIT_BASED":
+#         files_to_compute.extend(expand("data/raw/{pid}/fitbit_sleep_{fitbit_data_type}_with_datetime.csv", pid=config["PIDS"], fitbit_data_type=["summary"]))
+#     files_to_compute.extend(expand("data/raw/{pid}/{sensor}_raw.csv", pid=config["PIDS"], sensor=config["STEP"]["TABLE"]))
+#     files_to_compute.extend(expand("data/raw/{pid}/fitbit_step_{fitbit_data_type}_with_datetime.csv", pid=config["PIDS"], fitbit_data_type=["intraday"]))
+#     files_to_compute.extend(expand("data/processed/{pid}/fitbit_step_{day_segment}.csv", pid = config["PIDS"], day_segment = config["STEP"]["DAY_SEGMENTS"]))
+
+for provider in config["FITBIT_SLEEP"]["PROVIDERS"].keys():
+    if config["FITBIT_SLEEP"]["PROVIDERS"][provider]["COMPUTE"]:
+        files_to_compute.extend(expand("data/raw/{pid}/fitbit_sleep_raw.csv", pid=config["PIDS"]))
+#     files_to_compute.extend(expand("data/raw/{pid}/fitbit_sleep_{fitbit_data_type}_with_datetime.csv", pid=config["PIDS"], fitbit_data_type=["intraday", "summary"]))
+#     files_to_compute.extend(expand("data/processed/{pid}/fitbit_sleep_{day_segment}.csv", pid = config["PIDS"], day_segment = config["SLEEP"]["DAY_SEGMENTS"]))
+
+
 # visualization for data exploration
 if config["HEATMAP_FEATURES_CORRELATIONS"]["PLOT"]:
     files_to_compute.extend(expand("reports/data_exploration/{min_valid_hours_per_day}hours_{min_valid_bins_per_hour}bins/heatmap_features_correlations.html", min_valid_hours_per_day=config["HEATMAP_FEATURES_CORRELATIONS"]["MIN_VALID_HOURS_PER_DAY"], min_valid_bins_per_hour=config["PHONE_VALID_SENSED_DAYS"]["MIN_VALID_BINS_PER_HOUR"]))

tests/data/external/participant_files/test01.yaml

@@ -0,0 +1,11 @@
+PHONE:
+  DEVICE_IDS: [wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun]
+  PLATFORMS: [android]
+  LABEL: test01 android
+  START_DATE: 2020/01/01
+  END_DATE: 2020/06/01 
+FITBIT:
+  DEVICE_IDS: [wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun]
+  LABEL: test01 android
+  START_DATE: 2020/01/01
+  END_DATE: 2020/06/01 

tests/data/external/participant_files/test02.yaml

@@ -0,0 +1,11 @@
+PHONE:
+  DEVICE_IDS: [7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w]
+  PLATFORMS: [ios]
+  LABEL: test02 ios
+  START_DATE: 2020/01/01
+  END_DATE: 2020/06/01 
+FITBIT:
+  DEVICE_IDS: [7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w]
+  LABEL: test02 ios
+  START_DATE: 2020/01/01
+  END_DATE: 2020/06/01 

tests/data/external/participant_files/test03.yaml

@@ -0,0 +1,11 @@
+PHONE:
+  DEVICE_IDS: [bU6WEnGU-bjBN-HhUh-7XNT-ZnrLJnOTW9Or]
+  PLATFORMS: [android]
+  LABEL: test03 android
+  START_DATE: 2020/01/01
+  END_DATE: 2020/06/01 
+FITBIT:
+  DEVICE_IDS: [bU6WEnGU-bjBN-HhUh-7XNT-ZnrLJnOTW9Or]
+  LABEL: test03 android
+  START_DATE: 2020/01/01
+  END_DATE: 2020/06/01 

tests/data/external/participant_files/test04.yaml

@@ -0,0 +1,11 @@
+PHONE:
+  DEVICE_IDS: [dGhYuH4N-8D8J-mL6l-9uQA-ArIzHIjBiJxU]
+  PLATFORMS: [ios]
+  LABEL: test04 ios
+  START_DATE: 2020/01/01
+  END_DATE: 2020/06/01
+FITBIT:
+  DEVICE_IDS: [dGhYuH4N-8D8J-mL6l-9uQA-ArIzHIjBiJxU]
+  LABEL: test04 ios
+  START_DATE: 2020/01/01
+  END_DATE: 2020/06/01

tests/data/external/participant_files/test05.yaml

@@ -0,0 +1,11 @@
+PHONE:
+  DEVICE_IDS: [tOmCKs02-4GfR-G5I6-7iKL-wYESbVwIMBun]
+  PLATFORMS: [android]
+  LABEL: test05 android
+  START_DATE: 2020/01/01
+  END_DATE: 2020/06/01 
+FITBIT:
+  DEVICE_IDS: [tOmCKs02-4GfR-G5I6-7iKL-wYESbVwIMBun]
+  LABEL: test05 android
+  START_DATE: 2020/01/01
+  END_DATE: 2020/06/01 

tests/data/external/participant_files/test06.yaml

@@ -0,0 +1,11 @@
+PHONE:
+  DEVICE_IDS: [3jAbRIXO-xKTC-0bhC-PZXC-7yKzcQm4sf5w]
+  PLATFORMS: [ios]
+  LABEL: test06 ios
+  START_DATE: 2020/01/01
+  END_DATE: 2020/06/01 
+FITBIT:
+  DEVICE_IDS: [3jAbRIXO-xKTC-0bhC-PZXC-7yKzcQm4sf5w]
+  LABEL: test06 ios
+  START_DATE: 2020/01/01
+  END_DATE: 2020/06/01 

tests/scripts/run_tests.sh

@@ -61,7 +61,7 @@ display_usage() {
 
 echo Copying files... 
 cp -r tests/data/raw/* data/raw
-cp tests/data/external/* data/external
+cp -r tests/data/external/* data/external
 
 echo Disabling downloading of dataset...
 sed -e '27,39 s/^/#/' -e  's/rules.download_dataset.output/"data\/raw\/\{pid\}\/\{sensor\}_raw\.csv"/' rules/preprocessing.smk > tmp

tests/settings/frequency/testing_config.yaml

@@ -8,33 +8,46 @@ DAY_SEGMENTS: &day_segments
   FILE: "data/external/daysegments_frequency.csv"
   INCLUDE_PAST_PERIODIC_SEGMENTS: FALSE # Only relevant if TYPE=PERIODIC, if set to TRUE we consider day segments back enough in the past as to include the first day of data
 
-# Global timezone
-# Use codes from https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
-# Double check your code, for example EST is not US Eastern Time.
+# Use tz codes from https://en.wikipedia.org/wiki/List_of_tz_database_time_zones. Double check your code, for example EST is not US Eastern Time.
 TIMEZONE: &timezone
   America/New_York
 
 DATABASE_GROUP: &database_group
   MY_GROUP
 
-DOWNLOAD_PARTICIPANTS:
-  IGNORED_DEVICE_IDS: [] # for example "5a1dd68c-6cd1-48fe-ae1e-14344ac5215f"
-  GROUP: *database_group
+PARTICIPANT_FILES: # run snakemake -j1 -R parse_participant_files
+  PHONE_SECTION:
+    INCLUDE: TRUE
+    PARSED_FROM: AWARE_DEVICE_TABLE #AWARE_DEVICE_TABLE or CSV_FILE
+    PARSED_SOURCE: *database_group # DB credentials group or CSV file path. If CSV file, it should have: device_id, pid (optional), label (optional), start_date (optional), end_date (optional)
+    IGNORED_DEVICE_IDS: []
+  FITBIT_SECTION:
+    INCLUDE: FALSE
+    SAME_AS_PHONE: FALSE # If TRUE, all config below is ignored
+    PARSED_FROM: CSV_FILE
+    PARSED_SOURCE: "external/my_fitbit_participants.csv" # CSV file should have: device_id, pid (optional), label (optional), start_date (optional), end_date (optional)
 
-# Download data config
-DOWNLOAD_DATASET:
-  GROUP: *database_group
-
-# Readable datetime config
-READABLE_DATETIME:
-  FIXED_TIMEZONE: *timezone
+SENSOR_DATA:
+  PHONE:
+    SOURCE: 
+      TYPE: DATABASE
+      DATABASE_GROUP: *database_group
+      DEVICE_ID_COLUMN: device_id # column name
+    TIMEZONE: 
+      TYPE: SINGLE # SINGLE or MULTIPLE
+      VALUE: *timezone # IF TYPE=SINGLE, timezone code (e.g. America/New_York, see attribute TIMEZONE above). If TYPE=MULTIPLE, a table in your database with two columns (timestamp, timezone) where timestamp is a unix timestamp and timezone is one of https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+  FITBIT:
+    SOURCE: 
+      TYPE: DATABASE # DATABASE or CSV_FILES (set each FITBIT_SENSOR TABLE attribute accordingly)
+      DATABASE_GROUP: *database_group
+      DEVICE_ID_COLUMN: device_id # column name
 
 PHONE_VALID_SENSED_BINS:
   COMPUTE: False # This flag is automatically ignored (set to True) if you are extracting PHONE_VALID_SENSED_DAYS or screen or Barnett's location features
   BIN_SIZE: &bin_size 5 # (in minutes)
   # Add as many PHONE sensors as you have, they all improve the computation of PHONE_VALID_SENSED_BINS and PHONE_VALID_SENSED_DAYS. 
   # If you are extracting screen or Barnett/Doryab location features, PHONE_SCREEN and PHONE_LOCATIONS tables are mandatory.
-  # You can choose any of the keys shown below, just make sure its DB_TABLE exists in your database!
+  # You can choose any of the keys shown below, just make sure its TABLE exists in your database!
   # PHONE_MESSAGES, PHONE_CALLS, PHONE_LOCATIONS, PHONE_BLUETOOTH, PHONE_ACTIVITY_RECOGNITION, PHONE_BATTERY, PHONE_SCREEN, PHONE_LIGHT,
   # PHONE_ACCELEROMETER, PHONE_APPLICATIONS_FOREGROUND, PHONE_WIFI_VISIBLE, PHONE_WIFI_CONNECTED, PHONE_CONVERSATION
   PHONE_SENSORS: []
@@ -46,7 +59,7 @@ PHONE_VALID_SENSED_DAYS:
 
 # Communication SMS features config, TYPES and FEATURES keys need to match
 PHONE_MESSAGES:
-  DB_TABLE: messages
+  TABLE: messages
   PROVIDERS:
     RAPIDS:
       COMPUTE: True
@@ -59,7 +72,7 @@ PHONE_MESSAGES:
 
 # Communication call features config, TYPES and FEATURES keys need to match
 PHONE_CALLS:
-  DB_TABLE: calls
+  TABLE: calls
   PROVIDERS:
     RAPIDS:
       COMPUTE: True
@@ -72,7 +85,7 @@ PHONE_CALLS:
       SRC_FOLDER: "rapids" # inside src/features/phone_calls
 
 PHONE_LOCATIONS:
-  DB_TABLE: locations
+  TABLE: locations
   LOCATIONS_TO_USE: FUSED_RESAMPLED # ALL, GPS OR FUSED_RESAMPLED  
   FUSED_RESAMPLED_CONSECUTIVE_THRESHOLD: 30 # minutes, only replicate location samples to the next sensed bin if the phone did not stop collecting data for more than this threshold
   FUSED_RESAMPLED_TIME_SINCE_VALID_LOCATION: 720 # minutes, only replicate location samples to consecutive sensed bins if they were logged within this threshold after a valid location row
@@ -99,7 +112,7 @@ PHONE_LOCATIONS:
       SRC_LANGUAGE: "r"
 
 PHONE_BLUETOOTH:
-  DB_TABLE: bluetooth
+  TABLE: bluetooth
   PROVIDERS:
     RAPIDS:
       COMPUTE: True
@@ -109,7 +122,7 @@ PHONE_BLUETOOTH:
 
 
 PHONE_ACTIVITY_RECOGNITION:
-  DB_TABLE: 
+  TABLE: 
     ANDROID: plugin_google_activity_recognition
     IOS: plugin_ios_activity_recognition
   PROVIDERS:
@@ -124,7 +137,7 @@ PHONE_ACTIVITY_RECOGNITION:
       SRC_LANGUAGE: "python"
 
 PHONE_BATTERY:
-  DB_TABLE: battery
+  TABLE: battery
   PROVIDERS:
     RAPIDS:
       COMPUTE: False
@@ -133,7 +146,7 @@ PHONE_BATTERY:
       SRC_LANGUAGE: "python"
 
 PHONE_SCREEN:
-  DB_TABLE: screen
+  TABLE: screen
   PROVIDERS:
     RAPIDS:
       COMPUTE: False
@@ -146,7 +159,7 @@ PHONE_SCREEN:
       SRC_LANGUAGE: "python"
 
 PHONE_LIGHT:
-  DB_TABLE: light
+  TABLE: light
   PROVIDERS:
     RAPIDS:
       COMPUTE: True
@@ -155,7 +168,7 @@ PHONE_LIGHT:
       SRC_LANGUAGE: "python"
 
 PHONE_ACCELEROMETER:
-  DB_TABLE: accelerometer
+  TABLE: accelerometer
   PROVIDERS:
     RAPIDS:
       COMPUTE: False
@@ -173,7 +186,7 @@ PHONE_ACCELEROMETER:
       SRC_LANGUAGE: "python"
 
 PHONE_APPLICATIONS_FOREGROUND:
-  DB_TABLE: applications_foreground
+  TABLE: applications_foreground
   APPLICATION_CATEGORIES:
     CATALOGUE_SOURCE: FILE # FILE (genres are read from CATALOGUE_FILE) or GOOGLE (genres are scrapped from the Play Store)
     CATALOGUE_FILE: "data/external/stachl_application_genre_catalogue.csv"
@@ -190,11 +203,11 @@ PHONE_APPLICATIONS_FOREGROUND:
       EXCLUDED_CATEGORIES: ["systemapp", "tvvideoapps"]
       EXCLUDED_APPS: ["com.fitbit.FitbitMobile", "com.aware.plugin.upmc.cancer"]
       FEATURES: ["count", "timeoffirstuse", "timeoflastuse", "frequencyentropy"]
-      SRC_FOLDER: "rapids" # inside src/features/phone_applications_foreground
+      SRC_FOLDER: "rapids" # inside src/features/applications_foreground
       SRC_LANGUAGE: "python"
 
 PHONE_WIFI_VISIBLE:
-  DB_TABLE: "wifi"
+  TABLE: "wifi"
   PROVIDERS:
     RAPIDS:
       COMPUTE: True
@@ -203,7 +216,7 @@ PHONE_WIFI_VISIBLE:
       SRC_LANGUAGE: "r"
 
 PHONE_WIFI_CONNECTED:
-  DB_TABLE: "sensor_wifi"
+  TABLE: "sensor_wifi"
   PROVIDERS:
     RAPIDS:
       COMPUTE: True
@@ -212,7 +225,7 @@ PHONE_WIFI_CONNECTED:
       SRC_LANGUAGE: "r"
 
 PHONE_CONVERSATION:
-  DB_TABLE: 
+  TABLE: 
     ANDROID: plugin_studentlife_audio_android
     IOS: plugin_studentlife_audio
   PROVIDERS:
@@ -229,23 +242,27 @@ PHONE_CONVERSATION:
       SRC_LANGUAGE: "python"
 
 
-HEARTRATE:
+FITBIT_HEARTRATE:
+  TABLE: "fitbit_data"
+  PARSE_JSON: TRUE
+  PROVIDERS:
+    RAPIDS:
       COMPUTE: False
-  DB_TABLE: fitbit_data
-  DAY_SEGMENTS: *day_segments
-  SUMMARY_FEATURES: ["restinghr"] # calories features' accuracy depend on the accuracy of the participants fitbit profile (e.g. heigh, weight) use with care: ["caloriesoutofrange", "caloriesfatburn", "caloriescardio", "caloriespeak"] 
+      SUMMARY_FEATURES: ["restinghr"] # calories features' accuracy depend on the accuracy of the participants fitbit profile (e.g. height, weight) use these with care: ["caloriesoutofrange", "caloriesfatburn", "caloriescardio", "caloriespeak"] 
       INTRADAY_FEATURES: ["maxhr", "minhr", "avghr", "medianhr", "modehr", "stdhr", "diffmaxmodehr", "diffminmodehr", "entropyhr", "minutesonoutofrangezone", "minutesonfatburnzone", "minutesoncardiozone", "minutesonpeakzone"]
 
-STEP:
-  COMPUTE: False
-  DB_TABLE: fitbit_data
-  DAY_SEGMENTS: *day_segments
+FITBIT_STEPS:
+  TABLE: fitbit_data
+  PARSE_JSON: TRUE
   EXCLUDE_SLEEP:
     EXCLUDE: False
-    TYPE: FIXED # FIXED OR FITBIT_BASED (CONFIGURE FITBIT's SLEEP DB_TABLE)
+    TYPE: FIXED # FIXED OR FITBIT_BASED (configure FITBIT_SLEEP section)
     FIXED:
       START: "23:00"
       END: "07:00"
+  PROVIDERS:
+    RAPIDS:
+      COMPUTE: TRUE
       FEATURES:
         ALL_STEPS: ["sumallsteps", "maxallsteps", "minallsteps", "avgallsteps", "stdallsteps"]
         SEDENTARY_BOUT: ["countepisode", "sumduration", "maxduration", "minduration", "avgduration", "stdduration"]
@@ -253,10 +270,12 @@ STEP:
       THRESHOLD_ACTIVE_BOUT: 10 # steps
       INCLUDE_ZERO_STEP_ROWS: False
 
-SLEEP:
-  COMPUTE: False
-  DB_TABLE: fitbit_data
-  DAY_SEGMENTS: *day_segments
+FITBIT_SLEEP:
+  TABLE: fitbit_data
+  PARSE_JSON: TRUE
+  PROVIDERS:
+    RAPIDS:
+      COMPUTE: TRUE
       SLEEP_TYPES: ["main", "nap", "all"]
       SUMMARY_FEATURES: ["sumdurationafterwakeup", "sumdurationasleep", "sumdurationawake", "sumdurationtofallasleep", "sumdurationinbed", "avgefficiency", "countepisode"]
 

tests/settings/periodic/testing_config.yaml

@@ -8,33 +8,46 @@ DAY_SEGMENTS: &day_segments
   FILE: "data/external/daysegments_periodic.csv"
   INCLUDE_PAST_PERIODIC_SEGMENTS: FALSE # Only relevant if TYPE=PERIODIC, if set to TRUE we consider day segments back enough in the past as to include the first day of data
 
-# Global timezone
-# Use codes from https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
-# Double check your code, for example EST is not US Eastern Time.
+# Use tz codes from https://en.wikipedia.org/wiki/List_of_tz_database_time_zones. Double check your code, for example EST is not US Eastern Time.
 TIMEZONE: &timezone
   America/New_York
 
 DATABASE_GROUP: &database_group
   MY_GROUP
 
-DOWNLOAD_PARTICIPANTS:
-  IGNORED_DEVICE_IDS: [] # for example "5a1dd68c-6cd1-48fe-ae1e-14344ac5215f"
-  GROUP: *database_group
+PARTICIPANT_FILES: # run snakemake -j1 -R parse_participant_files
+  PHONE_SECTION:
+    INCLUDE: TRUE
+    PARSED_FROM: AWARE_DEVICE_TABLE #AWARE_DEVICE_TABLE or CSV_FILE
+    PARSED_SOURCE: *database_group # DB credentials group or CSV file path. If CSV file, it should have: device_id, pid (optional), label (optional), start_date (optional), end_date (optional)
+    IGNORED_DEVICE_IDS: []
+  FITBIT_SECTION:
+    INCLUDE: FALSE
+    SAME_AS_PHONE: FALSE # If TRUE, all config below is ignored
+    PARSED_FROM: CSV_FILE
+    PARSED_SOURCE: "external/my_fitbit_participants.csv" # CSV file should have: device_id, pid (optional), label (optional), start_date (optional), end_date (optional)
 
-# Download data config
-DOWNLOAD_DATASET:
-  GROUP: *database_group
-
-# Readable datetime config
-READABLE_DATETIME:
-  FIXED_TIMEZONE: *timezone
+SENSOR_DATA:
+  PHONE:
+    SOURCE: 
+      TYPE: DATABASE
+      DATABASE_GROUP: *database_group
+      DEVICE_ID_COLUMN: device_id # column name
+    TIMEZONE: 
+      TYPE: SINGLE # SINGLE or MULTIPLE
+      VALUE: *timezone # IF TYPE=SINGLE, timezone code (e.g. America/New_York, see attribute TIMEZONE above). If TYPE=MULTIPLE, a table in your database with two columns (timestamp, timezone) where timestamp is a unix timestamp and timezone is one of https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+  FITBIT:
+    SOURCE: 
+      TYPE: DATABASE # DATABASE or CSV_FILES (set each FITBIT_SENSOR TABLE attribute accordingly)
+      DATABASE_GROUP: *database_group
+      DEVICE_ID_COLUMN: device_id # column name
 
 PHONE_VALID_SENSED_BINS:
   COMPUTE: False # This flag is automatically ignored (set to True) if you are extracting PHONE_VALID_SENSED_DAYS or screen or Barnett's location features
   BIN_SIZE: &bin_size 5 # (in minutes)
   # Add as many PHONE sensors as you have, they all improve the computation of PHONE_VALID_SENSED_BINS and PHONE_VALID_SENSED_DAYS. 
   # If you are extracting screen or Barnett/Doryab location features, PHONE_SCREEN and PHONE_LOCATIONS tables are mandatory.
-  # You can choose any of the keys shown below, just make sure its DB_TABLE exists in your database!
+  # You can choose any of the keys shown below, just make sure its TABLE exists in your database!
   # PHONE_MESSAGES, PHONE_CALLS, PHONE_LOCATIONS, PHONE_BLUETOOTH, PHONE_ACTIVITY_RECOGNITION, PHONE_BATTERY, PHONE_SCREEN, PHONE_LIGHT,
   # PHONE_ACCELEROMETER, PHONE_APPLICATIONS_FOREGROUND, PHONE_WIFI_VISIBLE, PHONE_WIFI_CONNECTED, PHONE_CONVERSATION
   PHONE_SENSORS: []
@@ -46,7 +59,7 @@ PHONE_VALID_SENSED_DAYS:
 
 # Communication SMS features config, TYPES and FEATURES keys need to match
 PHONE_MESSAGES:
-  DB_TABLE: messages
+  TABLE: messages
   PROVIDERS:
     RAPIDS:
       COMPUTE: True
@@ -59,7 +72,7 @@ PHONE_MESSAGES:
 
 # Communication call features config, TYPES and FEATURES keys need to match
 PHONE_CALLS:
-  DB_TABLE: calls
+  TABLE: calls
   PROVIDERS:
     RAPIDS:
       COMPUTE: True
@@ -72,7 +85,7 @@ PHONE_CALLS:
       SRC_FOLDER: "rapids" # inside src/features/phone_calls
 
 PHONE_LOCATIONS:
-  DB_TABLE: locations
+  TABLE: locations
   LOCATIONS_TO_USE: FUSED_RESAMPLED # ALL, GPS OR FUSED_RESAMPLED  
   FUSED_RESAMPLED_CONSECUTIVE_THRESHOLD: 30 # minutes, only replicate location samples to the next sensed bin if the phone did not stop collecting data for more than this threshold
   FUSED_RESAMPLED_TIME_SINCE_VALID_LOCATION: 720 # minutes, only replicate location samples to consecutive sensed bins if they were logged within this threshold after a valid location row
@@ -99,7 +112,7 @@ PHONE_LOCATIONS:
       SRC_LANGUAGE: "r"
 
 PHONE_BLUETOOTH:
-  DB_TABLE: bluetooth
+  TABLE: bluetooth
   PROVIDERS:
     RAPIDS:
       COMPUTE: True
@@ -109,7 +122,7 @@ PHONE_BLUETOOTH:
 
 
 PHONE_ACTIVITY_RECOGNITION:
-  DB_TABLE: 
+  TABLE: 
     ANDROID: plugin_google_activity_recognition
     IOS: plugin_ios_activity_recognition
   PROVIDERS:
@@ -124,7 +137,7 @@ PHONE_ACTIVITY_RECOGNITION:
       SRC_LANGUAGE: "python"
 
 PHONE_BATTERY:
-  DB_TABLE: battery
+  TABLE: battery
   PROVIDERS:
     RAPIDS:
       COMPUTE: False
@@ -133,7 +146,7 @@ PHONE_BATTERY:
       SRC_LANGUAGE: "python"
 
 PHONE_SCREEN:
-  DB_TABLE: screen
+  TABLE: screen
   PROVIDERS:
     RAPIDS:
       COMPUTE: False
@@ -146,7 +159,7 @@ PHONE_SCREEN:
       SRC_LANGUAGE: "python"
 
 PHONE_LIGHT:
-  DB_TABLE: light
+  TABLE: light
   PROVIDERS:
     RAPIDS:
       COMPUTE: True
@@ -155,7 +168,7 @@ PHONE_LIGHT:
       SRC_LANGUAGE: "python"
 
 PHONE_ACCELEROMETER:
-  DB_TABLE: accelerometer
+  TABLE: accelerometer
   PROVIDERS:
     RAPIDS:
       COMPUTE: False
@@ -173,7 +186,7 @@ PHONE_ACCELEROMETER:
       SRC_LANGUAGE: "python"
 
 PHONE_APPLICATIONS_FOREGROUND:
-  DB_TABLE: applications_foreground
+  TABLE: applications_foreground
   APPLICATION_CATEGORIES:
     CATALOGUE_SOURCE: FILE # FILE (genres are read from CATALOGUE_FILE) or GOOGLE (genres are scrapped from the Play Store)
     CATALOGUE_FILE: "data/external/stachl_application_genre_catalogue.csv"
@@ -190,11 +203,11 @@ PHONE_APPLICATIONS_FOREGROUND:
       EXCLUDED_CATEGORIES: ["systemapp", "tvvideoapps"]
       EXCLUDED_APPS: ["com.fitbit.FitbitMobile", "com.aware.plugin.upmc.cancer"]
       FEATURES: ["count", "timeoffirstuse", "timeoflastuse", "frequencyentropy"]
-      SRC_FOLDER: "rapids" # inside src/features/phone_applications_foreground
+      SRC_FOLDER: "rapids" # inside src/features/applications_foreground
       SRC_LANGUAGE: "python"
 
 PHONE_WIFI_VISIBLE:
-  DB_TABLE: "wifi"
+  TABLE: "wifi"
   PROVIDERS:
     RAPIDS:
       COMPUTE: True
@@ -203,7 +216,7 @@ PHONE_WIFI_VISIBLE:
       SRC_LANGUAGE: "r"
 
 PHONE_WIFI_CONNECTED:
-  DB_TABLE: "sensor_wifi"
+  TABLE: "sensor_wifi"
   PROVIDERS:
     RAPIDS:
       COMPUTE: True
@@ -212,7 +225,7 @@ PHONE_WIFI_CONNECTED:
       SRC_LANGUAGE: "r"
 
 PHONE_CONVERSATION:
-  DB_TABLE: 
+  TABLE: 
     ANDROID: plugin_studentlife_audio_android
     IOS: plugin_studentlife_audio
   PROVIDERS:
@@ -229,23 +242,27 @@ PHONE_CONVERSATION:
       SRC_LANGUAGE: "python"
 
 
-HEARTRATE:
+FITBIT_HEARTRATE:
+  TABLE: "fitbit_data"
+  PARSE_JSON: TRUE
+  PROVIDERS:
+    RAPIDS:
       COMPUTE: False
-  DB_TABLE: fitbit_data
-  DAY_SEGMENTS: *day_segments
-  SUMMARY_FEATURES: ["restinghr"] # calories features' accuracy depend on the accuracy of the participants fitbit profile (e.g. heigh, weight) use with care: ["caloriesoutofrange", "caloriesfatburn", "caloriescardio", "caloriespeak"] 
+      SUMMARY_FEATURES: ["restinghr"] # calories features' accuracy depend on the accuracy of the participants fitbit profile (e.g. height, weight) use these with care: ["caloriesoutofrange", "caloriesfatburn", "caloriescardio", "caloriespeak"] 
       INTRADAY_FEATURES: ["maxhr", "minhr", "avghr", "medianhr", "modehr", "stdhr", "diffmaxmodehr", "diffminmodehr", "entropyhr", "minutesonoutofrangezone", "minutesonfatburnzone", "minutesoncardiozone", "minutesonpeakzone"]
 
-STEP:
-  COMPUTE: False
-  DB_TABLE: fitbit_data
-  DAY_SEGMENTS: *day_segments
+FITBIT_STEPS:
+  TABLE: fitbit_data
+  PARSE_JSON: TRUE
   EXCLUDE_SLEEP:
     EXCLUDE: False
-    TYPE: FIXED # FIXED OR FITBIT_BASED (CONFIGURE FITBIT's SLEEP DB_TABLE)
+    TYPE: FIXED # FIXED OR FITBIT_BASED (configure FITBIT_SLEEP section)
     FIXED:
       START: "23:00"
       END: "07:00"
+  PROVIDERS:
+    RAPIDS:
+      COMPUTE: TRUE
       FEATURES:
         ALL_STEPS: ["sumallsteps", "maxallsteps", "minallsteps", "avgallsteps", "stdallsteps"]
         SEDENTARY_BOUT: ["countepisode", "sumduration", "maxduration", "minduration", "avgduration", "stdduration"]
@@ -253,10 +270,12 @@ STEP:
       THRESHOLD_ACTIVE_BOUT: 10 # steps
       INCLUDE_ZERO_STEP_ROWS: False
 
-SLEEP:
-  COMPUTE: False
-  DB_TABLE: fitbit_data
-  DAY_SEGMENTS: *day_segments
+FITBIT_SLEEP:
+  TABLE: fitbit_data
+  PARSE_JSON: TRUE
+  PROVIDERS:
+    RAPIDS:
+      COMPUTE: TRUE
       SLEEP_TYPES: ["main", "nap", "all"]
       SUMMARY_FEATURES: ["sumdurationafterwakeup", "sumdurationasleep", "sumdurationawake", "sumdurationtofallasleep", "sumdurationinbed", "avgefficiency", "countepisode"]