fix generation parameters

app.py

@@ -64,15 +64,20 @@ def one_click():
         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, patient_id, first_name, last_name
+            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)
+                                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, 
@@ -80,10 +85,119 @@ def one_click():
         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)
+                            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)
+
+
+
+# # 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)

utils/oneclick.py

@@ -4,21 +4,12 @@ from .meldrx import MeldRxAPI
 from .responseparser import PatientDataExtractor
 from .pdfutils import PDFGenerator
 import logging
-from huggingface_hub import InferenceClient
-import os
 
 logger = logging.getLogger(__name__)
 
-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"
-
-def generate_ai_discharge_summary(patient_dict: Dict[str, str]) -> Optional[str]:
+def generate_ai_discharge_summary(patient_dict: Dict[str, str], client) -> Optional[str]:
     """Generate a discharge summary using AI based on extracted patient data."""
     try:
-        # Use the formatted summary as input
         formatted_summary = format_discharge_summary(patient_dict)
         
         logger.info("Generating AI discharge summary with patient info: %s", formatted_summary)
@@ -35,7 +26,7 @@ def generate_ai_discharge_summary(patient_dict: Dict[str, str]) -> Optional[str]
         ]
 
         stream = client.chat.completions.create(
-            model=MODEL_NAME,
+            model="grok-3",
             messages=messages,
             temperature=0.4,
             max_tokens=3584,
@@ -58,6 +49,7 @@ def generate_ai_discharge_summary(patient_dict: Dict[str, str]) -> Optional[str]
 
 def generate_discharge_paper_one_click(
     api: MeldRxAPI,
+    client,
     patient_id: str = "",
     first_name: str = "",
     last_name: str = ""
@@ -71,36 +63,58 @@ def generate_discharge_paper_one_click(
     try:
         patients_data = api.get_patients()
         if not patients_data or "entry" not in patients_data:
+            logger.error("No patient data received from MeldRx API")
             return None, "Failed to fetch patient data from MeldRx API", None, None
 
+        logger.debug(f"Raw patient data from API: {patients_data}")
+        
         extractor = PatientDataExtractor(patients_data, "json")
         
         if not extractor.patients:
+            logger.error("No patients found in the parsed data")
             return None, "No patients found in the data", None, None
 
+        logger.info(f"Found {len(extractor.patients)} patients in the data")
+        
         matching_patients = []
         for i in range(len(extractor.patients)):
             extractor.set_patient_by_index(i)
             patient_data = extractor.get_patient_dict()
             
-            patient_data.setdefault('id', 'unknown')
-            patient_data.setdefault('first_name', '')
-            patient_data.setdefault('last_name', '')
+            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_input = patient_id.strip().lower()
+            first_name_input = first_name.strip().lower()
+            last_name_input = 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}")
             
-            if (not patient_id or patient_data.get("id", "") == patient_id) and \
-               (not first_name or patient_data.get("first_name", "").lower() == first_name.lower()) and \
-               (not last_name or patient_data.get("last_name", "").lower() == last_name.lower()):
+            matches = True
+            if patient_id_input and patient_id_from_data != patient_id_input:
+                matches = False
+            if first_name_input and first_name_from_data != first_name_input:
+                matches = False
+            if last_name_input and last_name_from_data != last_name_input:
+                matches = False
+                
+            if matches:
                 matching_patients.append(patient_data)
+                logger.info(f"Found matching patient: {patient_data.get('id', 'unknown')}")
 
         if not matching_patients:
-            return None, "No matching patients found with the provided criteria", None, None
+            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
         
         patient_data = matching_patients[0]
-        extractor.set_patient_by_index(0)
+        logger.info(f"Selected patient data: {patient_data}")
         
-        # Generate both basic and AI summaries
         basic_summary = format_discharge_summary(patient_data)
-        ai_summary = generate_ai_discharge_summary(patient_data)
+        ai_summary = generate_ai_discharge_summary(patient_data, client)
         
         if not ai_summary:
             return None, "Failed to generate AI summary", basic_summary, None