Add Ldot client classs

Author: “Carmel

__pycache__/app.cpython-311.pyc

@@ -3,15 +3,19 @@
 from flask import Flask, json, render_template, request, jsonify
 import requests
 import yaml
+import json
 
+from new_ldot_workflows.ldot_client import LdotClient
 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
+from new_ldot_workflows.logging_utils import QualtricsAPIError
 
 app = Flask(__name__)
 
+
 CONFIG_PATH = Path(__file__).resolve().with_name("study_configs.yaml")
 STUDIES = yaml.safe_load(CONFIG_PATH.read_text(encoding="utf-8"))
 
@@ -22,6 +26,21 @@ def get_study_settings(study_key: str):
 
     return study, study.get("ldot_variables", {}), study.get("qualtrics_variables", {})
 
+
+with open("new_ldot_workflows/ldot_config.json") as f:
+    config = json.load(f)
+LDOT_TOKEN_URL = config["LDOT_TOKEN_URL"]
+LDOT_API_URL = config["LDOT_API_URL"]
+CLIENT_ID = config["client_id"]
+CLIENT_SECRET = config["client_secret"]
+
+ldot_client = LdotClient(
+    token_url=LDOT_TOKEN_URL,
+    api_url=LDOT_API_URL,
+    client_id=CLIENT_ID,
+    client_secret=CLIENT_SECRET
+)
+
 @app.route("/")
 def index():
     return render_template("index.html", studies=STUDIES)
@@ -33,7 +52,6 @@ def button1():
 
     data = request.json
     study_id = data.get("study_id")
-    print(f"Received study_id: {study_id}")
 
     study, ldot_vars, qualtrics_vars = get_study_settings(study_id)
     if not study:
@@ -44,11 +62,13 @@ def button1():
     link_completed_eaid = ldot_vars.get("eaid_qualtrics_survey_link_creation_completed")
 
     try:
-        new_subjects_ids = get_new_subjects(ldot_study_id, link_creation_eaid, link_completed_eaid)
+        new_subjects_ids = get_new_subjects(ldot_client, ldot_study_id, link_creation_eaid, link_completed_eaid)
+    except QualtricsAPIError as e:
+        return jsonify({"success": False, "message": str(e)}), 502
     except requests.RequestException as e:
-        return jsonify({"success": False, "message": f"Failed to fetch new subjects from LDOT: {e}"}), 502
+        return jsonify({"success": False, "message": f"Failed to fetch new subjects from Ldot: {e}"}), 502
     except (KeyError, ValueError, TypeError) as e:
-        return jsonify({"success": False, "message": f"Unexpected LDOT response while fetching new subjects: {e}"}), 502
+        return jsonify({"success": False, "message": f"Unexpected Ldot response while fetching new subjects: {e}"}), 502
     except Exception as e:
         return jsonify({"success": False, "message": f"Unexpected error in button1: {e}"}), 500
 
@@ -59,7 +79,7 @@ def button1():
 
 @app.route("/api/button2", methods=["POST"])
 def button2():
-    """Uses subjectIDs from button 1 to add them to Qualtrics and send the links back to LDOT"""
+    """Uses subjectIDs from button 1 to add them to Qualtrics and send the links back to Ldot"""
     data = request.json
     study_id = data.get("study_id")
     new_subject_ids = data.get("new_subject_ids") or data.get("subject_ids")
@@ -101,8 +121,13 @@ def button2():
         "distribution_id": distribution_id
     }
 
-    subject_id_to_link_dict = add_individuals_to_survey(new_subject_ids, ldot_study_id, id_deelnemer_entity, embedded_data_field, distribution_id, qualtrics_survey_id, mailing_list_id, directory_id)
-    send_links_to_ldot(ldot_study_id, id_deelnemer_entity, id_location, custom_var_qualtrics_link, link_completed_eaid, subject_id_to_link_dict)
+    try:
+        subject_id_to_link_dict = add_individuals_to_survey(ldot_client, new_subject_ids, ldot_study_id, id_deelnemer_entity, embedded_data_field, distribution_id, qualtrics_survey_id, mailing_list_id, directory_id)
+        send_links_to_ldot(ldot_client, ldot_study_id, id_deelnemer_entity, id_location, custom_var_qualtrics_link, link_completed_eaid, subject_id_to_link_dict)
+    except QualtricsAPIError as e:
+        return jsonify({"success": False, "message": str(e), "debug_inputs": debug_inputs}), 502
+    except Exception as e:
+        return jsonify({"success": False, "message": f"Unexpected error in button2: {e}", "debug_inputs": debug_inputs}), 500
 
     return jsonify({
         "success": True,
@@ -127,12 +152,13 @@ def button3():
     eaid_survey_progress_completed = ldot_vars.get("eaid_survey_progress_completed")
 
     try:
-        subjects_not_completed_survey = get_incomplete_subjects(ldot_study_id, eaid_survey_invitation_completed, eaid_survey_progress_completed)
-        print("Subjects not completed survey:", subjects_not_completed_survey)
+        subjects_not_completed_survey = get_incomplete_subjects(ldot_client, ldot_study_id, eaid_survey_invitation_completed, eaid_survey_progress_completed)
         message = f"Found {len(subjects_not_completed_survey)} subjects who have not completed the survey"
         return jsonify({"success": True, "message": message, "subject_ids": subjects_not_completed_survey})
+    except QualtricsAPIError as e:
+        return jsonify({"success": False, "message": str(e)}), 502
     except Exception as e:
-        return jsonify({"success": False, "message": str(e)})
+        return jsonify({"success": False, "message": str(e)}), 500
 
 
 @app.route("/api/button4", methods=["POST"])
@@ -153,18 +179,23 @@ def button4():
     qualtrics_survey_id = qualtrics_vars.get("qualtrics_survey_id")
     embedded_data_field = qualtrics_vars.get("embedded_data_field")
 
-    participant_to_progress_dict = get_individual_progress(ldot_study_id, id_deelnemer_entity, id_location, subject_ids, embedded_data_field, qualtrics_survey_id)
-
+    try:
+        participant_to_progress_dict = get_individual_progress(ldot_client, ldot_study_id, id_deelnemer_entity, id_location, subject_ids, embedded_data_field, qualtrics_survey_id)
+    except QualtricsAPIError as e:
+        return jsonify({"success": False, "message": str(e)}), 502
+    except Exception as e:
+        return jsonify({"success": False, "message": f"Unexpected error in button4: {e}"}), 500
 
-    # return jsonify({
-    #     "success": True,
-    #     "message": f"Retrieved progress for {len(participant_to_progress_dict)} subjects",
-    #     "study_id": study_id,
-    #     "qualtrics_survey_id": qualtrics_survey_id,
-    #     "embedded_data_field": embedded_data_field,
-    #     "progress_results": participant_to_progress_dict,
-    # })
+    return jsonify({
+        "success": True,
+        "message": f"Retrieved progress for {len(participant_to_progress_dict)} subjects",
+        "study_id": study_id,
+        "qualtrics_survey_id": qualtrics_survey_id,
+        "embedded_data_field": embedded_data_field,
+        "progress_results": participant_to_progress_dict,
+    })
 
+    # Here need to add the last step to send the progress back to Ldot, but that will be done in a separate function or workflow.
 
 if __name__ == "__main__":
     app.run(debug=True)

app.py

@@ -64,3 +64,15 @@
 2026-07-10 13:15:57,283 | INFO | get_incomplete_subjects | Ldot GET response | url=https://accware.memic.maastrichtuniversity.nl/memic_ldot_api/api/v1.1/5c9c6a47-c8d7-8142-a8c8-ccdcb8a8044b/Action/337ecba2-3dd3-1141-8c38-6cffdcfbd7eb | status=200 | body={"Status": "succes", "Message": "Success", "Data": {"StudyEventActions": []}}
 2026-07-10 13:15:57,285 | INFO | get_incomplete_subjects | Ldot GET request | url=https://accware.memic.maastrichtuniversity.nl/memic_ldot_api/api/v1.1/5c9c6a47-c8d7-8142-a8c8-ccdcb8a8044b/Action/120d298d-9aa9-084b-abc6-432148db0e10 | params=null | json=null | data=null | stream=False
 2026-07-10 13:15:57,722 | INFO | get_incomplete_subjects | Ldot GET response | url=https://accware.memic.maastrichtuniversity.nl/memic_ldot_api/api/v1.1/5c9c6a47-c8d7-8142-a8c8-ccdcb8a8044b/Action/120d298d-9aa9-084b-abc6-432148db0e10 | status=200 | body={"Status": "succes", "Message": "Success", "Data": {"StudyEventActions": []}}
+2026-07-10 14:16:07,454 | INFO | get_new_subjects | Ldot POST request | url=https://accware.memic.maastrichtuniversity.nl/ldot_identity_server/connect/token | params=null | json=null | data={"grant_type": "client_credentials", "client_id": "piama_api_qualtrics", "client_secret": "<redacted>"} | stream=False
+2026-07-10 14:16:07,976 | INFO | get_new_subjects | Ldot POST response | url=https://accware.memic.maastrichtuniversity.nl/ldot_identity_server/connect/token | status=200 | body={"access_token": "<redacted>", "expires_in": 3600, "token_type": "Bearer", "scope": "subject.POST"}
+2026-07-10 14:16:07,976 | INFO | get_new_subjects | Ldot GET request | url=https://accware.memic.maastrichtuniversity.nl/memic_ldot_api/api/v1.1/5c9c6a47-c8d7-8142-a8c8-ccdcb8a8044b/Action/5d31129c-d814-5d4b-a96f-048cadc150ce | params=null | json=null | data=null | stream=False
+2026-07-10 14:16:08,780 | INFO | get_new_subjects | Ldot GET response | url=https://accware.memic.maastrichtuniversity.nl/memic_ldot_api/api/v1.1/5c9c6a47-c8d7-8142-a8c8-ccdcb8a8044b/Action/5d31129c-d814-5d4b-a96f-048cadc150ce | status=200 | body={"Status": "succes", "Message": "Success", "Data": {"StudyEventActions": []}}
+2026-07-10 14:16:08,782 | INFO | get_new_subjects | Ldot GET request | url=https://accware.memic.maastrichtuniversity.nl/memic_ldot_api/api/v1.1/5c9c6a47-c8d7-8142-a8c8-ccdcb8a8044b/Action/31599192-8e9b-4341-b7f4-8b8967dd846a | params=null | json=null | data=null | stream=False
+2026-07-10 14:16:09,367 | INFO | get_new_subjects | Ldot GET response | url=https://accware.memic.maastrichtuniversity.nl/memic_ldot_api/api/v1.1/5c9c6a47-c8d7-8142-a8c8-ccdcb8a8044b/Action/31599192-8e9b-4341-b7f4-8b8967dd846a | status=200 | body={"Status": "succes", "Message": "Success", "Data": {"StudyEventActions": []}}
+2026-07-10 14:16:11,621 | INFO | get_incomplete_subjects | Ldot POST request | url=https://accware.memic.maastrichtuniversity.nl/ldot_identity_server/connect/token | params=null | json=null | data={"grant_type": "client_credentials", "client_id": "piama_api_qualtrics", "client_secret": "<redacted>"} | stream=False
+2026-07-10 14:16:11,928 | INFO | get_incomplete_subjects | Ldot POST response | url=https://accware.memic.maastrichtuniversity.nl/ldot_identity_server/connect/token | status=200 | body={"access_token": "<redacted>", "expires_in": 3600, "token_type": "Bearer", "scope": "subject.POST"}
+2026-07-10 14:16:11,928 | INFO | get_incomplete_subjects | Ldot GET request | url=https://accware.memic.maastrichtuniversity.nl/memic_ldot_api/api/v1.1/5c9c6a47-c8d7-8142-a8c8-ccdcb8a8044b/Action/337ecba2-3dd3-1141-8c38-6cffdcfbd7eb | params=null | json=null | data=null | stream=False
+2026-07-10 14:16:12,401 | INFO | get_incomplete_subjects | Ldot GET response | url=https://accware.memic.maastrichtuniversity.nl/memic_ldot_api/api/v1.1/5c9c6a47-c8d7-8142-a8c8-ccdcb8a8044b/Action/337ecba2-3dd3-1141-8c38-6cffdcfbd7eb | status=200 | body={"Status": "succes", "Message": "Success", "Data": {"StudyEventActions": []}}
+2026-07-10 14:16:12,401 | INFO | get_incomplete_subjects | Ldot GET request | url=https://accware.memic.maastrichtuniversity.nl/memic_ldot_api/api/v1.1/5c9c6a47-c8d7-8142-a8c8-ccdcb8a8044b/Action/120d298d-9aa9-084b-abc6-432148db0e10 | params=null | json=null | data=null | stream=False
+2026-07-10 14:16:12,899 | INFO | get_incomplete_subjects | Ldot GET response | url=https://accware.memic.maastrichtuniversity.nl/memic_ldot_api/api/v1.1/5c9c6a47-c8d7-8142-a8c8-ccdcb8a8044b/Action/120d298d-9aa9-084b-abc6-432148db0e10 | status=200 | body={"Status": "succes", "Message": "Success", "Data": {"StudyEventActions": []}}