Merge branch 'labels' into run_test_participant

Snakefile

@@ -164,6 +164,10 @@ for provider in config["PHONE_CONVERSATION"]["PROVIDERS"].keys():
         files_to_compute.extend(expand("data/processed/features/{pid}/all_sensor_features.csv", pid=config["PIDS"]))
         files_to_compute.append("data/processed/features/all_participants/all_sensor_features.csv")
 
+for provider in config["PHONE_ESM"]["PROVIDERS"].keys():
+    if config["PHONE_ESM"]["PROVIDERS"][provider]["COMPUTE"]:
+        files_to_compute.extend(expand("data/raw/{pid}/phone_esm_raw.csv",pid=config["PIDS"]))
+
 # We can delete these if's as soon as we add feature PROVIDERS to any of these sensors
 if isinstance(config["PHONE_APPLICATIONS_CRASHES"]["PROVIDERS"], dict):
     for provider in config["PHONE_APPLICATIONS_CRASHES"]["PROVIDERS"].keys():

config.yaml

@@ -237,10 +237,10 @@ PHONE_DATA_YIELD:
 PHONE_ESM:
   CONTAINER: esm
   PROVIDERS:
-    RAPIDS:
+    STRAW:
-      COMPUTE: False
+      COMPUTE: True
       FEATURES:
-      SRC_SCRIPT: src/features/phone_keyboard/rapids/main.py
+      SRC_SCRIPT: src/features/phone_esm/rapids/main.py
 
 # See https://www.rapids.science/latest/features/phone-keyboard/
 PHONE_KEYBOARD:

src/data/streams/aware_postgresql/format.yaml

@@ -186,17 +186,14 @@ PHONE_CONVERSATION:
 PHONE_ESM:
   ANDROID:
     RAPIDS_COLUMN_MAPPINGS:
-      TIMESTAMP: timestamp
+      TIMESTAMP: double_esm_user_answer_timestamp
       DEVICE_ID: device_id
       ESM_STATUS: esm_status
       ESM_USER_ANSWER: esm_user_answer
-      ESM_NOTIFICATION_TIMEOUT: esm_notification_timeout
       ESM_JSON: esm_json
-      DOUBLE_ESM_USER_ANSWER_TIMESTAMP: double_esm_user_answer_timestamp
       ESM_TRIGGER: esm_trigger
       ESM_SESSION: esm_session
       ESM_NOTIFICATION_ID: esm_notification_id
-      ESM_EXPIRATION_THRESHOLD: esm_expiration_threshold
     MUTATION:
       COLUMN_MAPPINGS:
       SCRIPTS:

src/data/streams/rapids_columns.yaml

@@ -67,6 +67,16 @@ PHONE_CONVERSATION:
   - DOUBLE_CONVO_START
   - DOUBLE_CONVO_END
 
+PHONE_ESM:
+  - TIMESTAMP
+  - DEVICE_ID
+  - ESM_STATUS
+  - ESM_USER_ANSWER
+  - ESM_JSON
+  - ESM_TRIGGER
+  - ESM_SESSION
+  - ESM_NOTIFICATION_ID
+
 PHONE_KEYBOARD:
   - TIMESTAMP
   - DEVICE_ID