refactor matching algo

app.py

@@ -4,9 +4,9 @@ import os
 import logging
 from utils.meldrx import MeldRxAPI
 from utils.oneclick import generate_discharge_paper_one_click
-from huggingface_hub import InferenceClient
+from xai import Grok  # Adjust import based on actual xAI SDK
 
-logging.basicConfig(level=logging.INFO)
+logging.basicConfig(level=logging.DEBUG)
 logger = logging.getLogger(__name__)
 
 app = Flask(__name__)
@@ -24,12 +24,7 @@ meldrx_api = MeldRxAPI(
     redirect_uri=REDIRECT_URI
 )
 
-
-HF_TOKEN = os.getenv("HF_TOKEN")
-if not HF_TOKEN:
-    raise ValueError("HF_TOKEN environment variable not set.")
-client = InferenceClient(api_key=HF_TOKEN)
-MODEL_NAME = "meta-llama/Llama-3.3-70B-Instruct"
+grok_client = Grok()  # Adjust initialization as needed
 
 @app.route('/')
 def index():
@@ -57,8 +52,10 @@ def dashboard():
         return redirect(url_for('auth'))
     patients_data = meldrx_api.get_patients()
     if not patients_data or "entry" not in patients_data:
+        logger.error("Failed to fetch patient data for dashboard")
         return render_template('dashboard.html', error="Failed to fetch patient data")
     patients = [entry['resource'] for entry in patients_data.get('entry', [])]
+    logger.debug(f"Patients for dashboard: {patients}")
     return render_template('dashboard.html', patients=patients, authenticated=True)
 
 @app.route('/oneclick', methods=['GET', 'POST'])
@@ -75,7 +72,7 @@ def one_click():
         logger.info(f"One-click request - ID: {patient_id}, First: {first_name}, Last: {last_name}, Action: {action}")
 
         pdf_path, status, basic_summary, ai_summary = generate_discharge_paper_one_click(
-            meldrx_api, client, patient_id, first_name, last_name
+            meldrx_api, grok_client, patient_id, first_name, last_name
         )
 
         if action == "Display Summary":
@@ -102,110 +99,4 @@ def one_click():
 
 if __name__ == '__main__':
     port = int(os.getenv("PORT", 7860))
-    app.run(debug=False, host='0.0.0.0', port=port)
-
-
-
-# # app.py
-# from flask import Flask, render_template, request, send_file, redirect, url_for
-# import os
-# import logging
-# from utils.meldrx import MeldRxAPI
-# from utils.oneclick import generate_discharge_paper_one_click
-# from xai import Grok  # Adjust import based on actual xAI SDK
-
-# logging.basicConfig(level=logging.DEBUG)  # Changed to DEBUG for more detailed logs
-# logger = logging.getLogger(__name__)
-
-# app = Flask(__name__)
-
-# CLIENT_ID = os.getenv("MELDRX_CLIENT_ID", "04bdc9f9a23d488a868b93d594ee5a4a")
-# CLIENT_SECRET = os.getenv("MELDRX_CLIENT_SECRET", None)
-# WORKSPACE_ID = os.getenv("MELDRX_WORKSPACE_ID", "09ed4f76-b5ac-42bf-92d5-496933203dbe")
-# SPACE_URL = os.getenv("SPACE_URL", "https://multitransformer-tonic-discharge-guard.hf.space")
-# REDIRECT_URI = f"{SPACE_URL}/auth/callback"
-
-# meldrx_api = MeldRxAPI(
-#     client_id=CLIENT_ID,
-#     client_secret=CLIENT_SECRET,
-#     workspace_id=WORKSPACE_ID,
-#     redirect_uri=REDIRECT_URI
-# )
-
-# # Initialize xAI client
-# grok_client = Grok()  # Adjust initialization as needed
-
-# @app.route('/')
-# def index():
-#     return render_template('index.html')
-
-# @app.route('/auth', methods=['GET', 'POST'])
-# def auth():
-#     if request.method == 'POST':
-#         auth_code = request.form.get('auth_code')
-#         if auth_code and meldrx_api.authenticate_with_code(auth_code):
-#             return redirect(url_for('dashboard'))
-#         return render_template('auth.html', auth_url=meldrx_api.get_authorization_url(), auth_result="Authentication failed")
-#     return render_template('auth.html', auth_url=meldrx_api.get_authorization_url())
-
-# @app.route('/auth/callback', methods=['GET'])
-# def auth_callback():
-#     auth_code = request.args.get('code')
-#     if auth_code and meldrx_api.authenticate_with_code(auth_code):
-#         return redirect(url_for('dashboard'))
-#     return render_template('auth.html', auth_url=meldrx_api.get_authorization_url(), auth_result="Callback failed")
-
-# @app.route('/dashboard', methods=['GET'])
-# def dashboard():
-#     if not meldrx_api.access_token:
-#         return redirect(url_for('auth'))
-#     patients_data = meldrx_api.get_patients()
-#     if not patients_data or "entry" not in patients_data:
-#         logger.error("Failed to fetch patient data for dashboard")
-#         return render_template('dashboard.html', error="Failed to fetch patient data")
-#     patients = [entry['resource'] for entry in patients_data.get('entry', [])]
-#     logger.debug(f"Patients for dashboard: {patients}")
-#     return render_template('dashboard.html', patients=patients, authenticated=True)
-
-# @app.route('/oneclick', methods=['GET', 'POST'])
-# def one_click():
-#     if not meldrx_api.access_token:
-#         return redirect(url_for('auth'))
-    
-#     if request.method == 'POST':
-#         patient_id = request.form.get('patient_id', '').strip()
-#         first_name = request.form.get('first_name', '').strip()
-#         last_name = request.form.get('last_name', '').strip()
-#         action = request.form.get('action', '')
-
-#         logger.info(f"One-click request - ID: {patient_id}, First: {first_name}, Last: {last_name}, Action: {action}")
-
-#         pdf_path, status, basic_summary, ai_summary = generate_discharge_paper_one_click(
-#             meldrx_api, grok_client, patient_id, first_name, last_name
-#         )
-
-#         if action == "Display Summary":
-#             return render_template('oneclick.html', 
-#                                 status=status,
-#                                 basic_summary=basic_summary.replace('\n', '<br>') if basic_summary else None,
-#                                 ai_summary=ai_summary.replace('\n', '<br>') if ai_summary else None,
-#                                 patient_id=patient_id,
-#                                 first_name=first_name,
-#                                 last_name=last_name)
-#         elif action == "Generate PDF" and pdf_path:
-#             return send_file(pdf_path, 
-#                            as_attachment=True, 
-#                            download_name=f"discharge_summary_{patient_id or 'patient'}.pdf")
-#         return render_template('oneclick.html', 
-#                             status=status,
-#                             basic_summary=basic_summary.replace('\n', '<br>') if basic_summary else None,
-#                             ai_summary=ai_summary.replace('\n', '<br>') if ai_summary else None,
-#                             patient_id=patient_id,
-#                             first_name=first_name,
-#                             last_name=last_name)
-
-#     return render_template('oneclick.html')
-
-# if __name__ == '__main__':
-#     port = int(os.getenv("PORT", 7860))
-#     app.run(debug=False, host='0.0.0.0', port=port)
+    app.run(debug=False, host='0.0.0.0', port=port)

utils/oneclick.py

@@ -77,38 +77,48 @@ def generate_discharge_paper_one_click(
         logger.info(f"Found {len(extractor.patients)} patients in the data")
         
         matching_patients = []
+        all_patient_ids = []
+        all_patient_names = []
+        
         for i in range(len(extractor.patients)):
             extractor.set_patient_by_index(i)
             patient_data = extractor.get_patient_dict()
             
-            patient_id_from_data = patient_data.get('id', '').strip().lower()
-            first_name_from_data = patient_data.get('first_name', '').strip().lower()
-            last_name_from_data = patient_data.get('last_name', '').strip().lower()
+            patient_id_from_data = str(patient_data.get('id', '')).strip().lower()
+            first_name_from_data = str(patient_data.get('first_name', '')).strip().lower()
+            last_name_from_data = str(patient_data.get('last_name', '')).strip().lower()
+            
+            all_patient_ids.append(patient_id_from_data)
+            all_patient_names.append(f"{first_name_from_data} {last_name_from_data}")
             
-            patient_id_input = patient_id.strip().lower()
-            first_name_input = first_name.strip().lower()
-            last_name_input = last_name.strip().lower()
+            patient_id_input = str(patient_id).strip().lower()
+            first_name_input = str(first_name).strip().lower()
+            last_name_input = str(last_name).strip().lower()
             
-            logger.debug(f"Comparing - ID: {patient_id_input} vs {patient_id_from_data}, "
-                        f"First: {first_name_input} vs {first_name_from_data}, "
-                        f"Last: {last_name_input} vs {last_name_from_data}")
+            logger.debug(f"Patient {i}: ID={patient_id_from_data}, Name={first_name_from_data} {last_name_from_data}")
+            logger.debug(f"Comparing - Input: ID={patient_id_input}, First={first_name_input}, Last={last_name_input}")
             
             matches = True
-            if patient_id_input and patient_id_from_data != patient_id_input:
+            if patient_id_input and patient_id_input != patient_id_from_data:
                 matches = False
-            if first_name_input and first_name_from_data != first_name_input:
+            if first_name_input and first_name_input not in first_name_from_data:
                 matches = False
-            if last_name_input and last_name_from_data != last_name_input:
+            if last_name_input and last_name_input not in last_name_from_data:
                 matches = False
                 
             if matches:
                 matching_patients.append(patient_data)
-                logger.info(f"Found matching patient: {patient_data.get('id', 'unknown')}")
+                logger.info(f"Found matching patient: ID={patient_id_from_data}, "
+                           f"Name={first_name_from_data} {last_name_from_data}")
 
         if not matching_patients:
             search_criteria = f"ID: {patient_id or 'N/A'}, First: {first_name or 'N/A'}, Last: {last_name or 'N/A'}"
             logger.warning(f"No patients matched criteria: {search_criteria}")
-            return None, f"No patients found matching criteria: {search_criteria}", None, None
+            logger.info(f"Available patient IDs: {all_patient_ids}")
+            logger.info(f"Available patient names: {all_patient_names}")
+            return None, (f"No patients found matching criteria: {search_criteria}\n"
+                         f"Available IDs: {', '.join(all_patient_ids)}\n"
+                         f"Available Names: {', '.join(all_patient_names)}"), None, None
         
         patient_data = matching_patients[0]
         logger.info(f"Selected patient data: {patient_data}")