Start set up of buttons 2, 3, change json to yaml config

Author: “Carmel

__pycache__/app.cpython-311.pyc

@@ -1,14 +1,26 @@
+from pathlib import Path
+
 from flask import Flask, json, render_template, request, jsonify
 import requests
+import yaml
 
 from new_ldot_workflows.b_1_get_new_subjects import get_new_subjects
 from new_ldot_workflows.b_2_get_qualtrics_links import add_individuals_to_survey
 from new_ldot_workflows.b_2_send_links_to_ldot import send_links_to_ldot
+from new_ldot_workflows.b_3_get_incomplete_subjects import get_incomplete_subjects
 from new_ldot_workflows.b_4_get_individual_progress import get_individual_progress
 
 app = Flask(__name__)
 
-STUDIES = json.load(open("ldot_study_configs.json"))
+CONFIG_PATH = Path(__file__).resolve().with_name("study_configs.yaml")
+STUDIES = yaml.safe_load(CONFIG_PATH.read_text(encoding="utf-8"))
+
+def get_study_settings(study_key: str):
+    study = STUDIES.get(study_key)
+    if not study:
+        return None, None, None
+
+    return study, study.get("ldot_variables", {}), study.get("qualtrics_variables", {})
 
 @app.route("/")
 def index():
@@ -17,12 +29,19 @@ def index():
 
 @app.route("/api/button1", methods=["POST"])
 def button1():
-    """First API call"""
+    """Get the participants who have not yet been added to Qualtrics"""
     data = request.json
     study_id = data.get("study_id")
+    print(f"Received study_id: {study_id}")
 
-    # TODO: Replace this with your actual API call that returns subject IDs
-    subject_ids = get_new_subjects(study_id)
+    study, ldot_vars, qualtrics_vars = get_study_settings(study_id)
+    if not study:
+        return jsonify({"success": False, "message": f"Unknown study_id: {study_id}"}), 400
+
+    ldot_study_id = ldot_vars.get("ldot_study_id")
+    link_creation_eaid = ldot_vars.get("link_creation_eaid") or ldot_vars.get("survey_progress_wait_for_entry_eaid")
+
+    subject_ids = get_new_subjects(ldot_study_id, link_creation_eaid)
 
     message = f"Found {len(subject_ids)} subject IDs for study {study_id}" if study_id else f"Found {len(subject_ids)} subject IDs"
     return jsonify({"success": True, "message": message, "subject_ids": subject_ids})
@@ -43,18 +62,24 @@ def button2():
         return jsonify({"success": False, "message": "Missing subject_ids in request"}), 400
 
     # Lookup study variables from STUDIES config
-    study = STUDIES.get(study_id)
+    study, ldot_vars, qualtrics_vars = get_study_settings(study_id)
     if not study:
         return jsonify({"success": False, "message": f"Unknown study_id: {study_id}"}), 400
 
-    vars = study.get("variables", {})
-    survey_id = vars.get("survey_id")
-    mailing_list_id = vars.get("mailing_list_id")
-    embedded_data_field = vars.get("embedded_data_field")
-    directory_id = vars.get("directory_id")
-    distribution_id = vars.get("distribution_id")
+    ldot_study_id = ldot_vars.get("ldot_study_id")
+    survey_id = qualtrics_vars.get("survey_id")
+    mailing_list_id = qualtrics_vars.get("mailing_list_id")
+    embedded_data_field = qualtrics_vars.get("embedded_data_field")
+    directory_id = qualtrics_vars.get("directory_id")
+    distribution_id = qualtrics_vars.get("distribution_id")
+    link_creation_eaid = ldot_vars.get("link_creation_eaid") or ldot_vars.get("survey_progress_wait_for_entry_eaid")
+    
+    if not ldot_study_id:
+        return jsonify({"success": False, "message": f"Missing ldot_study_id for study_id: {study_id}"}), 400
+
     debug_inputs = {
         "study_id": study_id,
+        "ldot_study_id": ldot_study_id,
         "subject_ids": subject_ids,
         "survey_id": survey_id,
         "mailing_list_id": mailing_list_id,
@@ -64,29 +89,38 @@ def button2():
     }
 
     participant_to_link_dict = add_individuals_to_survey(subject_ids, embedded_data_field, distribution_id, survey_id, mailing_list_id, directory_id)
-    send_links_to_ldot(participant_to_link_dict)
-
+    send_links_to_ldot(ldot_study_id, link_creation_eaid)
 
-    # return jsonify({
-    #     "success": True,
-    #     "message": "Button 2 inputs resolved successfully",
-    #     "debug_inputs": debug_inputs,
-    #     "participant_to_link_dict": participant_to_link_dict
-    # })
+    return jsonify({
+        "success": True,
+        "message": f"Processed {len(subject_ids)} subject IDs for study {study_id}",
+        "debug_inputs": debug_inputs,
+        "participant_to_link_dict": participant_to_link_dict,
+    })
 
 
 @app.route("/api/button3", methods=["POST"])
 def button3():
     """Third API call - returns list of subjectIDs"""
     data = request.json
     study_id = data.get("study_id")
+    study, ldot_vars, qualtrics_vars = get_study_settings(study_id)
+
+    if not study:
+        return jsonify({"success": False, "message": f"Unknown study_id: {study_id}"}), 400
 
-    # TODO: Add your API call logic here - should return a list of subjectIDs
+    ldot_study_id = ldot_vars.get("ldot_study_id")
+    survey_progress_wait_for_entry_eaid = ldot_vars.get("survey_progress_wait_for_entry_eaid")
+    survey_progress_completed_eaid = ldot_vars.get("survey_progress_completed_eaid")
+
+    if not ldot_study_id:
+        return jsonify({"success": False, "message": f"Missing ldot_study_id for study_id: {study_id}"}), 400
+
     try:
         result = f"Button 3 executed for study {study_id}"
         # Return both message and subject_ids list
-        subject_ids = []  # TODO: Fill this with actual subjectIDs from your API call
-        return jsonify({"success": True, "message": result, "subject_ids": subject_ids})
+        incomplete_subjects = get_incomplete_subjects(ldot_study_id, survey_progress_wait_for_entry_eaid, survey_progress_completed_eaid)
+        return jsonify({"success": True, "message": result, "subject_ids": incomplete_subjects})
     except Exception as e:
         return jsonify({"success": False, "message": str(e)})
 
@@ -104,11 +138,10 @@ def button4():
     if not subject_ids:
         return jsonify({"success": False, "message": "Missing subject_ids in request"}), 400
 
-    study = STUDIES.get(study_id)
+    study, vars = get_study_settings(study_id)
     if not study:
         return jsonify({"success": False, "message": f"Unknown study_id: {study_id}"}), 400
 
-    vars = study.get("variables", {})
     survey_id = vars.get("survey_id")
     embedded_data_field = vars.get("embedded_data_field")
 

app.py

@@ -1,4 +1,51 @@
-def send_links_to_ldot(participant_to_link_dict):
-    # {'11111TEST11111': 'https://survey.uu.nl/jfe/form/SV_efCMOg6wHU0T8ii?Q_CHL=gl&Q_DL=EMD_7AEa416lRwFhrkF_efCMOg6wHU0T8ii_CGC_CJK3jAlcohFgRMS&_g_=g', '22222TEST22222': 'https://survey.uu.nl/jfe/form/SV_efCMOg6wHU0T8ii?Q_CHL=gl&Q_DL=EMD_7AEa416lRwFhrkF_efCMOg6wHU0T8ii_CGC_M6crsA37s6sSOeE&_g_=g'}
-    send_links_to_ldot
 
+# {'11111TEST11111': 'https://survey.uu.nl/jfe/form/SV_efCMOg6wHU0T8ii?Q_CHL=gl&Q_DL=EMD_7AEa416lRwFhrkF_efCMOg6wHU0T8ii_CGC_CJK3jAlcohFgRMS&_g_=g', '22222TEST22222': 'https://survey.uu.nl/jfe/form/SV_efCMOg6wHU0T8ii?Q_CHL=gl&Q_DL=EMD_7AEa416lRwFhrkF_efCMOg6wHU0T8ii_CGC_M6crsA37s6sSOeE&_g_=g'}
+
+import json
+import requests
+
+with open("new_ldot_workflows/ldot_config.json") as f:
+    config = json.load(f)
+CLIENT_ID = config["client_id"]
+CLIENT_SECRET = config["client_secret"]
+LDOT_API_URL = config["LDOT_API_URL"]
+
+
+#### I then need to flip it to the next status
+
+def send_links_to_ldot(study_id: str, link_creation_eaid: str) -> list:
+    """Get subjects that have not yet been added to Qualtrics by checking their event actions"""
+
+    response = requests.post(
+        "https://accware.memic.maastrichtuniversity.nl/ldot_identity_server/connect/token",
+        data={
+            "grant_type": "client_credentials",
+            "client_id": CLIENT_ID,
+            "client_secret": CLIENT_SECRET
+        }
+    )
+
+    token = response.json()["access_token"]
+
+    headers={"accept": "application/json",
+            "Authorization": f"Bearer {token}"
+            }
+
+    subject_alias = "a5335cfd-b96a-4c08-b860-700cc4867ec3"
+    response = requests.post(
+        f"https://accware.memic.maastrichtuniversity.nl/memic_ldot_api/api/v1.1/{study_id}/Subject/VerifySubject",
+        headers=headers
+    )
+
+    response.raise_for_status()
+    payload = response.json()
+    print(payload)
+    # study_event_actions = payload.get("Data", {}).get("StudyEventActions", [])
+    # return [
+    #     action["SubjectGuid"]
+    #     for action in study_event_actions
+    #     if action.get("SubjectGuid")
+    # ]
+
+if __name__ == "__main__":
+    print(send_links_to_ldot("5c9c6a47-c8d7-8142-a8c8-ccdcb8a8044b", "5d31129c-d814-5d4b-a96f-048cadc150ce"))

ldot_study_configs.json

@@ -1 +1,78 @@
-# Get the subject IDs that have not yet received a survey link, so we can check on their progress.
+import json
+import requests
+
+with open("new_ldot_workflows/ldot_config.json") as f:
+    config = json.load(f)
+CLIENT_ID = config["client_id"]
+CLIENT_SECRET = config["client_secret"]
+LDOT_API_URL = config["LDOT_API_URL"]
+
+
+def get_incomplete_subjects(study_id: str, survey_progress_wait_for_entry_eaid: str = None, survey_progress_completed_eaid: str = None) -> list:
+    """Get subjects that have not yet been added to Qualtrics by checking their event actions"""
+
+    response = requests.post(
+        "https://accware.memic.maastrichtuniversity.nl/ldot_identity_server/connect/token",
+        data={
+            "grant_type": "client_credentials",
+            "client_id": CLIENT_ID,
+            "client_secret": CLIENT_SECRET
+        }
+    )
+    token = response.json()["access_token"]
+
+    headers={"accept": "application/json",
+            "Authorization": f"Bearer {token}"
+            }
+
+
+    # FIrst lets get all EventAction GUIDs
+    
+    actions = requests.get(
+        f"https://accware.memic.maastrichtuniversity.nl/memic_ldot_api/api/v1.1/{study_id}/Action",
+        headers=headers
+    )
+
+    actions.raise_for_status()
+    payload = actions.json()
+    # print(payload)
+    action_guids = []
+    for action in payload.get("Data", {}).get("StudyEventActions", []):
+        action_guids.append((action["EventActionGuid"], action["Description"]))
+
+    # for guid, description in action_guids:
+    #     people_with_this_action = requests.get(
+    #         f"https://accware.memic.maastrichtuniversity.nl/memic_ldot_api/api/v1.1/{study_id}/Action/{guid}",
+    #         headers=headers
+    #     )
+    #     people_with_this_action.raise_for_status()
+    #     if "Data" in people_with_this_action.json():
+    #         print (people_with_this_action.json()["Data"]["StudyEventActions"])
+
+
+    # # Get SubjectIDs where survey invitation has been completed but survey progress has not been completed
+    result = requests.get(
+        f"https://accware.memic.maastrichtuniversity.nl/memic_ldot_api/api/v1.1/{study_id}/Action/{survey_progress_wait_for_entry_eaid}",
+        headers=headers
+    )
+    result.raise_for_status()
+
+    subjects_with_survey_progress_wait_for_entry = set()
+    for action in result.json().get("Data", {}).get("StudyEventActions", []):
+        subjects_with_survey_progress_wait_for_entry.add(action["SubjectGuid"])
+
+    result = requests.get(
+        f"https://accware.memic.maastrichtuniversity.nl/memic_ldot_api/api/v1.1/{study_id}/Action/{survey_progress_completed_eaid}",
+        headers=headers
+    )
+    result.raise_for_status()
+
+    subjecst_with_survey_progress_completed = set()
+    for action in result.json().get("Data", {}).get("StudyEventActions", []):
+        subjecst_with_survey_progress_completed.add(action["SubjectGuid"])
+
+    incomplete_subjects = subjects_with_survey_progress_wait_for_entry - subjecst_with_survey_progress_completed
+    return list(incomplete_subjects)
+
+if __name__ == "__main__":
+    print(get_incomplete_subjects("5c9c6a47-c8d7-8142-a8c8-ccdcb8a8044b", "9f09f2cf-32cc-844d-9a41-7a44accd3dfd", '120d298d-9aa9-084b-abc6-432148db0e10'))

new_ldot_workflows/__pycache__/b_1_get_new_subjects.cpython-311.pyc

@@ -0,0 +1,44 @@
+import json
+from urllib import response
+import requests
+
+with open("new_ldot_workflows/ldot_config.json") as f:
+    config = json.load(f)
+CLIENT_ID = config["client_id"]
+CLIENT_SECRET = config["client_secret"]
+LDOT_API_URL = config["LDOT_API_URL"]
+
+def get_new_subjects(study_id: str, link_creation_eaid: str) -> list:
+    """Get subjects that have not yet been added to Qualtrics by checking their event actions"""
+
+    response = requests.post(
+        "https://accware.memic.maastrichtuniversity.nl/ldot_identity_server/connect/token",
+        data={
+            "grant_type": "client_credentials",
+            "client_id": CLIENT_ID,
+            "client_secret": CLIENT_SECRET
+        }
+    )
+
+    token = response.json()["access_token"]
+
+    headers={"accept": "application/json",
+            "Authorization": f"Bearer {token}"
+            }
+
+    response = requests.post(
+        f"https://accware.memic.maastrichtuniversity.nl/memic_ldot_api/api/v1.1/{study_id}/Subject/VerifySubject",
+        json={"alias": "", "regID": "DEE5"},
+        headers=headers
+    )
+
+    response.raise_for_status()
+    payload = response.json()
+
+    print(response.status_code)
+    print(response.text)
+    print(payload)
+
+
+if __name__ == "__main__":
+    print(get_new_subjects("5c9c6a47-c8d7-8142-a8c8-ccdcb8a8044b", "5d31129c-d814-5d4b-a96f-048cadc150ce"))