diff --git a/config/Endobest_Dashboard_Config-new.xlsx b/config/Endobest_Dashboard_Config-new.xlsx new file mode 100644 index 0000000..8a2f457 Binary files /dev/null and b/config/Endobest_Dashboard_Config-new.xlsx differ diff --git a/config/Endobest_Dashboard_Config-sav-260130-1615.xlsx b/config/Endobest_Dashboard_Config-sav-260130-1615.xlsx deleted file mode 100644 index c7ec03a..0000000 Binary files a/config/Endobest_Dashboard_Config-sav-260130-1615.xlsx and /dev/null differ diff --git a/config/Endobest_Dashboard_Config.xlsx b/config/Endobest_Dashboard_Config.xlsx index 8a2f457..c7ec03a 100644 Binary files a/config/Endobest_Dashboard_Config.xlsx and b/config/Endobest_Dashboard_Config.xlsx differ diff --git a/config/eb_dashboard_extended_template-new.xlsx b/config/eb_dashboard_extended_template-new.xlsx new file mode 100644 index 0000000..e5451ec Binary files /dev/null and b/config/eb_dashboard_extended_template-new.xlsx differ diff --git a/config/eb_dashboard_extended_template-sav-260130-1615.xlsx b/config/eb_dashboard_extended_template-sav-260130-1615.xlsx deleted file mode 100644 index 8274c39..0000000 Binary files a/config/eb_dashboard_extended_template-sav-260130-1615.xlsx and /dev/null differ diff --git a/config/eb_dashboard_extended_template.xlsx b/config/eb_dashboard_extended_template.xlsx index e5451ec..8274c39 100644 Binary files a/config/eb_dashboard_extended_template.xlsx and b/config/eb_dashboard_extended_template.xlsx differ diff --git a/dashboard.log b/dashboard.log index e69de29..8bed0f8 100644 --- a/dashboard.log +++ b/dashboard.log @@ -0,0 +1,65 @@ +2026-02-09 16:46:14,476 - WARNING - No '6_month_visit' data source found for Patient aff9a40e-67e9-4d51-9dc3-b2c076e1a496 / ENDOBEST-018-1574-DL (Field: Suivi à 6 mois - Taux de complétude) +2026-02-09 16:46:23,458 - WARNING - No '6_month_visit' data source found for Patient a3d3c834-cd80-4f15-9b4e-6e73a2bb4e78 / ENDOBEST-013-3010-RL (Field: Suivi à 6 mois - Taux de complétude) +2026-02-09 16:46:30,902 - WARNING - No '6_month_visit' data source found for Patient 76dd9c81-bc12-40f1-a44f-056230a0f9b8 / ENDOBEST-015-2903-CJ (Field: Suivi à 6 mois - Taux de complétude) +2026-02-09 16:48:24,120 - WARNING - No '6_month_visit' data source found for Patient 14d9e825-06c9-436d-ab73-45dd6f034af4 / ENDOBEST-013-2748-FO (Field: Suivi à 6 mois - Taux de complétude) +2026-02-09 16:48:44,757 - WARNING - No '6_month_visit' data source found for Patient b203960b-5af7-40c6-8459-d083ed57d517 / ENDOBEST-013-2739-MA (Field: Suivi à 6 mois - Taux de complétude) +2026-02-09 16:50:24,886 - WARNING - Error in get_all_questionnaires_by_patient (Attempt 1/10): [WinError 10054] Une connexion existante a dû être fermée par l’hôte distant +2026-02-09 16:50:24,886 - WARNING - Error in get_organization_inclusions (Attempt 1/10): [WinError 10054] Une connexion existante a dû être fermée par l’hôte distant +2026-02-09 16:50:24,886 - WARNING - Error in get_visit_by_id (Attempt 1/10): [WinError 10054] Une connexion existante a dû être fermée par l’hôte distant +2026-02-09 16:50:24,888 - WARNING - Error in get_all_questionnaires_by_patient (Attempt 1/10): [WinError 10054] Une connexion existante a dû être fermée par l’hôte distant +2026-02-09 16:50:24,889 - WARNING - Error in get_record_by_patient_id (Attempt 1/10): [WinError 10054] Une connexion existante a dû être fermée par l’hôte distant +2026-02-09 16:50:24,890 - WARNING - Error in get_record_by_patient_id (Attempt 1/10): [WinError 10054] Une connexion existante a dû être fermée par l’hôte distant +2026-02-09 16:50:24,892 - WARNING - Error in get_all_questionnaires_by_patient (Attempt 1/10): [WinError 10054] Une connexion existante a dû être fermée par l’hôte distant +2026-02-09 16:50:24,891 - WARNING - Error in get_all_questionnaires_by_patient (Attempt 1/10): [WinError 10054] Une connexion existante a dû être fermée par l’hôte distant +2026-02-09 16:50:24,892 - WARNING - Error in get_all_questionnaires_by_patient (Attempt 1/10): [WinError 10054] Une connexion existante a dû être fermée par l’hôte distant +2026-02-09 16:50:24,892 - WARNING - Error in get_record_by_patient_id (Attempt 1/10): [WinError 10054] Une connexion existante a dû être fermée par l’hôte distant +2026-02-09 16:50:24,891 - WARNING - Error in get_all_questionnaires_by_patient (Attempt 1/10): [WinError 10054] Une connexion existante a dû être fermée par l’hôte distant +2026-02-09 16:50:24,893 - WARNING - Error in get_all_questionnaires_by_patient (Attempt 1/10): [WinError 10054] Une connexion existante a dû être fermée par l’hôte distant +2026-02-09 16:50:46,447 - WARNING - No '6_month_visit' data source found for Patient b8ddd741-3b56-48ea-92e7-6a2605613d7a / ENDOBEST-013-2459-AG (Field: Suivi à 6 mois - Taux de complétude) +2026-02-09 16:51:13,051 - WARNING - No '6_month_visit' data source found for Patient f6f083a4-0138-48b8-9473-d011e228ad7f / ENDOBEST-004-1776-GM (Field: Suivi à 6 mois - Taux de complétude) +2026-02-09 16:52:34,709 - WARNING - Error in get_request_by_tube_id (Attempt 1/10): [WinError 10054] Une connexion existante a dû être fermée par l’hôte distant +2026-02-09 16:52:34,723 - WARNING - Error in get_request_by_tube_id (Attempt 1/10): [WinError 10054] Une connexion existante a dû être fermée par l’hôte distant +2026-02-09 16:52:34,723 - WARNING - Error in get_all_questionnaires_by_patient (Attempt 1/10): [WinError 10054] Une connexion existante a dû être fermée par l’hôte distant +2026-02-09 16:52:34,724 - WARNING - Error in get_record_by_patient_id (Attempt 1/10): [WinError 10054] Une connexion existante a dû être fermée par l’hôte distant +2026-02-09 16:52:34,725 - WARNING - Error in get_record_by_patient_id (Attempt 1/10): [WinError 10054] Une connexion existante a dû être fermée par l’hôte distant +2026-02-09 16:52:34,724 - WARNING - Error in get_all_questionnaires_by_patient (Attempt 1/10): [WinError 10054] Une connexion existante a dû être fermée par l’hôte distant +2026-02-09 16:52:34,724 - WARNING - Error in get_record_by_patient_id (Attempt 1/10): [WinError 10054] Une connexion existante a dû être fermée par l’hôte distant +2026-02-09 16:52:34,726 - WARNING - Error in get_record_by_patient_id (Attempt 1/10): [WinError 10054] Une connexion existante a dû être fermée par l’hôte distant +2026-02-09 16:52:34,726 - WARNING - Error in get_all_questionnaires_by_patient (Attempt 1/10): [WinError 10054] Une connexion existante a dû être fermée par l’hôte distant +2026-02-09 16:52:34,727 - WARNING - Error in get_record_by_patient_id (Attempt 1/10): [WinError 10054] Une connexion existante a dû être fermée par l’hôte distant +2026-02-09 16:52:34,727 - WARNING - Error in get_record_by_patient_id (Attempt 1/10): [WinError 10054] Une connexion existante a dû être fermée par l’hôte distant +2026-02-09 16:52:34,727 - WARNING - Error in get_all_questionnaires_by_patient (Attempt 1/10): [WinError 10054] Une connexion existante a dû être fermée par l’hôte distant +2026-02-09 16:52:34,727 - WARNING - Error in get_all_questionnaires_by_patient (Attempt 1/10): [WinError 10054] Une connexion existante a dû être fermée par l’hôte distant +2026-02-09 16:52:34,728 - WARNING - Error in get_all_questionnaires_by_patient (Attempt 1/10): [WinError 10054] Une connexion existante a dû être fermée par l’hôte distant +2026-02-09 16:52:47,260 - WARNING - Error in get_request_by_tube_id (Attempt 2/10): [Errno 11001] getaddrinfo failed +2026-02-09 16:52:47,261 - WARNING - Error in get_request_by_tube_id (Attempt 2/10): [Errno 11001] getaddrinfo failed +2026-02-09 16:52:47,276 - WARNING - Error in get_all_questionnaires_by_patient (Attempt 2/10): [Errno 11001] getaddrinfo failed +2026-02-09 16:52:47,277 - WARNING - Error in get_record_by_patient_id (Attempt 2/10): [Errno 11001] getaddrinfo failed +2026-02-09 16:52:47,277 - WARNING - Error in get_record_by_patient_id (Attempt 2/10): [Errno 11001] getaddrinfo failed +2026-02-09 16:52:47,277 - WARNING - Error in get_all_questionnaires_by_patient (Attempt 2/10): [Errno 11001] getaddrinfo failed +2026-02-09 16:52:47,278 - WARNING - Error in get_record_by_patient_id (Attempt 2/10): [Errno 11001] getaddrinfo failed +2026-02-09 16:52:47,278 - WARNING - Error in get_all_questionnaires_by_patient (Attempt 2/10): [Errno 11001] getaddrinfo failed +2026-02-09 16:52:47,278 - WARNING - Error in get_all_questionnaires_by_patient (Attempt 2/10): [Errno 11001] getaddrinfo failed +2026-02-09 16:52:47,278 - WARNING - Error in get_all_questionnaires_by_patient (Attempt 2/10): [Errno 11001] getaddrinfo failed +2026-02-09 16:52:47,277 - WARNING - Error in get_record_by_patient_id (Attempt 2/10): [Errno 11001] getaddrinfo failed +2026-02-09 16:52:47,278 - WARNING - Error in get_all_questionnaires_by_patient (Attempt 2/10): [Errno 11001] getaddrinfo failed +2026-02-09 16:52:47,278 - WARNING - Error in get_record_by_patient_id (Attempt 2/10): [Errno 11001] getaddrinfo failed +2026-02-09 16:52:47,279 - WARNING - Error in get_record_by_patient_id (Attempt 2/10): [Errno 11001] getaddrinfo failed +2026-02-09 16:55:36,377 - WARNING - No '6_month_visit' data source found for Patient 85d0c065-7e3b-4a79-9e11-f22d5169f63c / ENDOBEST-017-1800-SY (Field: Suivi à 6 mois - Taux de complétude) +2026-02-09 16:58:49,430 - WARNING - Error in get_record_by_patient_id (Attempt 1/10): Client error '401 Unauthorized' for url 'https://api-hcp.ziwig-connect.com/api/records/byPatient' +For more information check: https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/401 +2026-02-09 16:58:49,691 - WARNING - Error in get_all_questionnaires_by_patient (Attempt 1/10): Client error '401 Unauthorized' for url 'https://api-hcp.ziwig-connect.com/api/surveys/filter/with-answers' +For more information check: https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/401 +2026-02-09 16:58:49,691 - WARNING - Error in get_request_by_tube_id (Attempt 1/10): Client error '401 Unauthorized' for url 'https://api-lab.ziwig-connect.com/api/requests/by-tube-id/55241110004143?isAdmin=true&organization=undefined' +For more information check: https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/401 +2026-02-09 16:58:49,928 - WARNING - Error in get_all_questionnaires_by_patient (Attempt 1/10): Client error '401 Unauthorized' for url 'https://api-hcp.ziwig-connect.com/api/surveys/filter/with-answers' +For more information check: https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/401 +2026-02-09 16:58:49,928 - WARNING - Error in get_request_by_tube_id (Attempt 1/10): Client error '401 Unauthorized' for url 'https://api-lab.ziwig-connect.com/api/requests/by-tube-id/55241110002912?isAdmin=true&organization=undefined' +For more information check: https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/401 +2026-02-09 16:58:50,905 - WARNING - Error in get_visit_by_id (Attempt 1/10): Client error '401 Unauthorized' for url 'https://api-hcp.ziwig-connect.com/api/visits/visit/0f048bc1-6218-43d5-988b-0271509f2275' +For more information check: https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/401 +2026-02-09 16:58:50,912 - WARNING - Error in get_visit_by_id (Attempt 1/10): Client error '401 Unauthorized' for url 'https://api-hcp.ziwig-connect.com/api/visits/visit/7abe3945-d121-496b-be88-f6fedff35e07' +For more information check: https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/401 +2026-02-09 16:58:51,839 - WARNING - Error in get_organization_inclusions (Attempt 1/10): Client error '401 Unauthorized' for url 'https://api-hcp.ziwig-connect.com/api/inclusions/search?limit=1000&page=1' +For more information check: https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/401 +2026-02-09 16:59:27,115 - WARNING - No '6_month_visit' data source found for Patient 6aebffc9-bdf7-48e6-af19-38fc5be3cecf / ENDOBEST-013-1472-MM (Field: Suivi à 6 mois - Taux de complétude) diff --git a/eb_dashboard.py b/eb_dashboard.py index fea6fd4..4edd696 100644 --- a/eb_dashboard.py +++ b/eb_dashboard.py @@ -1135,9 +1135,8 @@ def _process_inclusion_data(inclusion, organization): output_inclusion = {} # --- Prepare all data sources --- - # 1. Launch Visit Search asynchronously (it's slow, ~5s) - # We use run_with_context to pass the patient identity to the new thread - visit_future = subtasks_thread_pool.submit(run_with_context, search_visit_by_pseudo_and_order, ctx, pseudo, 2) + # 1. 6-month visit loading disabled on this branch (No-6-Month-Visit) + # visit_future = subtasks_thread_pool.submit(run_with_context, search_visit_by_pseudo_and_order, ctx, pseudo, 2) # 2. Prepare inclusion_data: enrich inclusion with organization info inclusion_data = dict(inclusion) @@ -1161,11 +1160,8 @@ def _process_inclusion_data(inclusion, organization): logging.error(f"Error fetching request data for patient {patient_id}: {e}") request_data = None - try: - six_month_visit_data = visit_future.result() - except Exception as e: - logging.error(f"Error searching 6-month visit for patient {pseudo}: {e}") - six_month_visit_data = None + # 6-month visit loading disabled on this branch (No-6-Month-Visit) + six_month_visit_data = None # --- Process all fields from configuration --- process_inclusions_mapping(output_inclusion, inclusion_data, record_data, request_data, all_questionnaires, six_month_visit_data)