medicafe 0.250318.0__tar.gz → 0.250410.0__tar.gz

{medicafe-0.250318.0 → medicafe-0.250410.0}/MediBot/MediBot_Preprocessor.py

@@ -84,6 +84,11 @@ def preprocess_csv_data(csv_data, crosswalk):
         # Enrich the procedure code column based on the diagnosis code for each patient. 
         # MediLink_ConfigLoader.log("CSV Pre-processor: Populating 'Procedure Code' based on Crosswalk...", level="INFO")
         # MediBot_Preprocessor_lib.update_procedure_codes(csv_data, crosswalk)
+        
+        # Convert all text fields to uppercase
+        MediLink_ConfigLoader.log("CSV Pre-processor: Converting all text fields to uppercase...", level="INFO")
+        print("Converting all text fields to uppercase...")
+        MediBot_Preprocessor_lib.capitalize_all_fields(csv_data)
     
     except Exception as e:
         message = "An error occurred while pre-processing CSV data. Please repair the CSV directly and try again: {}".format(e)

{medicafe-0.250318.0 → medicafe-0.250410.0}/MediBot/MediBot_Preprocessor_lib.py

@@ -714,4 +714,25 @@ def load_historical_payer_to_patient_mappings(config):
     if not payer_to_patient_ids:
         print("No historical mappings were generated.")
     
-    return dict(payer_to_patient_ids)
+    return dict(payer_to_patient_ids)
+
+def capitalize_all_fields(csv_data):
+    """
+    Converts all text fields in the CSV data to uppercase.
+    
+    Parameters:
+    csv_data (list of dict): The CSV data where each row is represented as a dictionary.
+    
+    Returns:
+    None: The function modifies the csv_data in place.
+    """
+    for row in csv_data:
+        for key, value in row.items():
+            if isinstance(value, str):
+                row[key] = value.upper()
+            elif isinstance(value, datetime):
+                # Keep datetime objects as they are
+                pass
+            elif value is not None:
+                # Convert any other non-None values to string and then uppercase
+                row[key] = str(value).upper()

{medicafe-0.250318.0 → medicafe-0.250410.0}/MediLink/MediLink_837p_encoder_library.py

@@ -289,7 +289,7 @@ def resolve_payer_name(payer_id, config, primary_endpoint, insurance_name, parse
                     MediLink_ConfigLoader.log("API Resolved to standard insurance name: {} for corrected payer ID: {}".format(resolved_name, corrected_payer_id), config, level="INFO")
     
                     # Step 7: Ask for user confirmation using the helper
-                    confirmation_prompt = "Is the standard insurance name '{}' correct? (yes/no): ".format(resolved_name)
+                    confirmation_prompt = "Proceed with updating the Payer ID for '{}'? (yes/no): ".format(resolved_name)
                     if get_user_confirmation(confirmation_prompt):
                         # Step 8: Load crosswalk
                         try:
@@ -310,7 +310,31 @@ def resolve_payer_name(payer_id, config, primary_endpoint, insurance_name, parse
                         # Step 10: Handle rejection
                         print("User did not confirm the standard insurance name. Manual intervention is required.")
                         MediLink_ConfigLoader.log("User did not confirm the standard insurance name. Manual intervention is required.", config, level="CRITICAL")
-                        exit(1)  # Consider handling differently.
+                        
+                        # TODO: CRITICAL ISSUE - Current rejection handling is incorrect
+                        # The current implementation exits the program when a user rejects the standard insurance name,
+                        # which is an overly aggressive approach. Instead, we should:
+                        # 1. Prompt the user to manually enter the correct insurance name
+                        # 2. Use that manually entered name to proceed with the claim processing
+                        # 3. Update the crosswalk with the corrected payer name (requires a new function to be implemented)
+                        # 4. Log the correction for future reference
+                        #
+                        # The insurance name confirmation is primarily a sanity check to verify the API recognizes the payer ID,
+                        # not a critical validation for claim processing. The payer name is not used in the crosswalk or in the
+                        # actual claims once they are built. The current implementation unnecessarily halts the entire process
+                        # when this check fails, rather than providing a recovery path.
+                        #
+                        # When revisiting this code, the entire flow of interdependent functions should be reconsidered to
+                        # ensure proper error handling and recovery mechanisms are in place throughout the process.
+                        
+                        # Placeholder for future implementation:
+                        # corrected_name = input("Please enter the correct insurance name: ")
+                        # MediLink_ConfigLoader.log(f"User provided corrected insurance name: {corrected_name}", config, level="INFO")
+                        # print(f"Using manually entered insurance name: {corrected_name}")
+                        # TODO: Implement update_crosswalk_with_corrected_payer_name(corrected_name, payer_id, config, crosswalk)
+                        # return corrected_name
+    
+                        exit(1)  
                 except Exception as e:
                     # Step 11: Handle exceptions during resolution
                     print("Failed to resolve corrected payer ID to standard insurance name: {}".format(e))

{medicafe-0.250318.0 → medicafe-0.250410.0}/MediLink/MediLink_API_v3.py

@@ -160,21 +160,35 @@ class APIClient(BaseAPIClient):
         url = base_url + url_extension
 
         try:
-            # Make the API call based on call_type
-            if call_type == 'GET':
-                response = requests.get(url, headers=headers, params=params)
-            elif call_type == 'POST':
-                headers['Content-Type'] = 'application/json'
-                response = requests.post(url, headers=headers, json=data)
-            elif call_type == 'DELETE':
-                response = requests.delete(url, headers=headers)
-            else:
-                raise ValueError("Unsupported call type: {}".format(call_type))
-
             masked_headers = headers.copy()
             if 'Authorization' in masked_headers:
                 masked_headers['Authorization'] = 'Bearer ***'
 
+            def make_request():
+                if call_type == 'GET':
+                    return requests.get(url, headers=headers, params=params)
+                elif call_type == 'POST':
+                    headers['Content-Type'] = 'application/json'
+                    return requests.post(url, headers=headers, json=data)
+                elif call_type == 'DELETE':
+                    return requests.delete(url, headers=headers)
+                else:
+                    raise ValueError("Unsupported call type: {}".format(call_type))
+
+            # Make initial request
+            response = make_request()
+
+            # If we get a 5xx error, wait and retry once
+            if 500 <= response.status_code < 600:
+                MediLink_ConfigLoader.log(
+                    "Received {} error from server for {} request to {}. Waiting 1 second before retry...".format(
+                        response.status_code, call_type, url
+                    ),
+                    level="WARNING"
+                )
+                time.sleep(1)
+                response = make_request()
+
             # Raise an HTTPError if the response was unsuccessful
             response.raise_for_status()
 
@@ -305,6 +319,17 @@ def fetch_payer_name_from_api(client, payer_id, config, primary_endpoint='AVAILI
         endpoints = config['MediLink_Config']['endpoints']  # Re-attempt to access endpoints
         MediLink_ConfigLoader.log("Re-loaded configuration successfully.", level="INFO")
     
+    # Sanitize and validate payer_id
+    if not isinstance(payer_id, str):
+        payer_id = str(payer_id)
+    
+    payer_id = ''.join(char for char in payer_id if char.isalnum())
+    
+    if not payer_id:
+        error_message = "Invalid payer_id in API v3: {}. Must contain a string of alphanumeric characters.".format(payer_id)
+        MediLink_ConfigLoader.log(error_message, level="ERROR")
+        print(error_message)
+    
     # Define endpoint rotation logic
     endpoint_order = ([primary_endpoint] + 
                       [endpoint for endpoint in endpoints if endpoint != primary_endpoint]

{medicafe-0.250318.0/medicafe.egg-info → medicafe-0.250410.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: medicafe
-Version: 0.250318.0
+Version: 0.250410.0
 Summary: MediCafe
 Home-page: https://github.com/katanada2
 Author: Daniel Vidaud

{medicafe-0.250318.0 → medicafe-0.250410.0/medicafe.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: medicafe
-Version: 0.250318.0
+Version: 0.250410.0
 Summary: MediCafe
 Home-page: https://github.com/katanada2
 Author: Daniel Vidaud

{medicafe-0.250318.0 → medicafe-0.250410.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='medicafe',
-    version="0.250318.0",
+    version="0.250410.0",
     description='MediCafe',
     long_description="""
     # Project Overview: MediCafe