medicafe 0.240809.0__tar.gz → 0.240925.9__tar.gz

{medicafe-0.240809.0 → medicafe-0.240925.9}/MediBot/MediBot.bat

@@ -1,3 +1,4 @@
+::MediBot.bat
 @echo off
 setlocal enabledelayedexpansion
 
@@ -64,17 +65,17 @@ if not exist "%config_file%" (
 
 :: Check if the file exists and attempt to move it
 :: Implementing a check with copy as a fallback if move fails
-echo Checking for the upgrade script...
-if exist "C:\Python34\Lib\site-packages\MediBot\upgrade_medicafe.py" (
-    echo Found upgrade_medicafe.py. Attempting to move...
-    move "C:\Python34\Lib\site-packages\MediBot\upgrade_medicafe.py" "F:\Medibot\upgrade_medicafe.py" >nul 2>&1
+echo Checking for the update script...
+if exist "C:\Python34\Lib\site-packages\MediBot\update_medicafe.py" (
+    echo Found update_medicafe.py. Attempting to move...
+    move "C:\Python34\Lib\site-packages\MediBot\update_medicafe.py" "F:\Medibot\update_medicafe.py" >nul 2>&1
     if %errorlevel% neq 0 (
         echo Move failed. Attempting copy and delete as fallback...
-        copy "C:\Python34\Lib\site-packages\MediBot\upgrade_medicafe.py" "F:\Medibot\upgrade_medicafe.py" >nul 2>&1
+        copy "C:\Python34\Lib\site-packages\MediBot\update_medicafe.py" "F:\Medibot\update_medicafe.py" >nul 2>&1
         if %errorlevel% neq 0 (
             echo Copy failed. Error Level: %errorlevel%
         ) else (
-            del "C:\Python34\Lib\site-packages\MediBot\upgrade_medicafe.py" >nul 2>&1
+            del "C:\Python34\Lib\site-packages\MediBot\update_medicafe.py" >nul 2>&1
             if %errorlevel% neq 0 (
                 echo Delete failed. Manual cleanup may be required.
             ) else (
@@ -85,26 +86,38 @@ if exist "C:\Python34\Lib\site-packages\MediBot\upgrade_medicafe.py" (
         echo File moved successfully.
     )
 ) else (
-    echo upgrade_medicafe.py not detected. Check path and filename.
+    echo update_medicafe.py not detected. Checking for existing update_medicafe.py in F:\Medibot...
+    if exist "F:\Medibot\update_medicafe.py" (
+        echo update_medicafe.py already exists in F:\Medibot. No action needed.
+    ) else (
+        echo update_medicafe.py not detected in either location. Check path and filename.
+    )
 )
 
 :: Main menu
 :main_menu
 cls
-echo version: %medicafe_version%
+echo Version: %medicafe_version%
 echo --------------------------------------------------------------
 echo                .//*  Welcome to MediCafe  *\\. 
 echo --------------------------------------------------------------
 echo. 
 echo Please select an option:
+echo.
 if "!internet_available!"=="1" (
-    echo 1. Check for MediCafe Package Updates
+    echo 1. Update MediCafe
+    echo.
     echo 2. Download Email de Carol
+    echo.
     echo 3. MediLink Claims
-    echo 4. United Claims Status
-    echo 5. United Deductible
+    echo.
+    echo 4. ^[United^] Claims Status
+    echo.
+    echo 5. ^[United^] Deductible
+    echo.
 )
 echo 6. Run MediBot
+echo.
 echo 7. Exit
 echo.
 set /p choice=Enter your choice:  
@@ -124,11 +137,12 @@ if "!internet_available!"=="0" (
     goto main_menu
 )
 echo Checking for MediCafe package updates. Please wait...
-start cmd /c py "%upgrade_medicafe%" > upgrade_log.txt 2>&1 && (
+start "Medicafe Update" cmd /c py "%upgrade_medicafe%" %package_version% > upgrade_log.txt 2>&1 && (
     echo %DATE% %TIME% Upgrade initiated. >> "%temp_file%"
     echo Exiting batch to complete the upgrade.
 ) || (
     echo %DATE% %TIME% Update failed. Check logs. >> upgrade_log.txt
+    echo Upgrade failed. Check upgrade_log.txt for details.
 )
 exit /b
 
@@ -200,7 +214,7 @@ if errorlevel 1 echo Failed to check United Deductible.
 pause
 goto main_menu
 
-:: Process CSV Files
+:: Process CSV Files and Validate Against Config
 :process_csvs
 for /f "tokens=1-5 delims=/: " %%a in ('echo %time%') do (
     set "hour=%%a"
@@ -220,13 +234,39 @@ for /f "delims=" %%a in ('dir /b /a-d /o-d "%source_folder%\*.csv" 2^>nul') do (
     echo Found New CSV Files...
     goto process_found_csv
 )
-::echo CSV Check Complete.
 goto :eof
 
 :process_found_csv
-echo Processing CSVs...
+echo Validating latest CSV with config file...
+:: Run Python script to get current CSV path from JSON
+for /f "delims=" %%a in ('python "%python_script%" "%config_file%"') do (
+    set "current_csv=%%a"
+)
+
+:: Extract filenames from paths
+for %%f in ("!current_csv!") do set "current_csv_name=%%~nxf"
+for %%f in ("%target_folder%\!latest_csv!") do set "latest_csv_name=%%~nxf"
+
+:: Compare the paths and prompt user if necessary
+if not "!current_csv_name!"=="!latest_csv_name!" (
+    echo ALERT: Config file CSV path differs from the latest CSV. This can happen if a new CSV is downloaded.
+    echo Current CSV: !current_csv_name!
+    echo Latest CSV: !latest_csv_name!
+    set /p update_choice="Do you want to update to the latest CSV? (Y/N): "
+    if /i "!update_choice!"=="Y" (
+        echo Updating config file with latest CSV...
+        py "%python_script%" "%config_file%" "%target_folder%\!latest_csv!"
+        echo Config file updated.
+    ) else (
+        echo Using existing CSV path from config.
+    )
+) else (
+    echo CSV path in config matches the latest CSV.
+)
+
 move "%source_folder%\!latest_csv!" "%target_folder%\SX_CSV_!timestamp!.csv"
 set "new_csv_path=%target_folder%\SX_CSV_!timestamp!.csv"
+echo Processing CSV...
 py "%python_script%" "%config_file%" "!new_csv_path!"
 echo CSV Processor Complete...
 goto :eof
@@ -235,4 +275,4 @@ goto :eof
 :end_script
 echo Exiting MediCafe.
 pause
-exit /b
+exit /b

{medicafe-0.240809.0 → medicafe-0.240925.9}/MediBot/MediBot.py

@@ -1,8 +1,5 @@
-import subprocess
-import os
-import tempfile
-import traceback
-import re  #for addresses
+#MediBot.py
+import subprocess, os, tempfile, traceback, re, sys
 from collections import OrderedDict
 import MediBot_dataformat_library
 import MediBot_Preprocessor
@@ -10,7 +7,6 @@ from MediBot_Preprocessor_lib import initialize, AHK_EXECUTABLE, CSV_FILE_PATH,
 from MediBot_UI import app_control, manage_script_pause, user_interaction
 
 # Add parent directory of the project to the Python path
-import sys
 project_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
 sys.path.append(project_dir)
 
@@ -22,6 +18,18 @@ except ImportError:
     from MediBot import MediBot_Crosswalk_Library
     crosswalk_update = MediBot_Crosswalk_Library.crosswalk_update
 
+try:
+    from MediLink.MediLink_API_v3 import APIClient
+except ImportError as e:
+    raise ImportError("Failed to import APIClient from MediLink.MediLink_API_v3. "
+                        "Ensure the MediLink_API_v3 module is installed and accessible.") from e
+    
+# After successful import
+try:
+    api_client = APIClient()  # Pass necessary arguments if required
+except Exception as e:
+    raise RuntimeError("Failed to instantiate APIClient. Ensure correct initialization parameters.") from e
+
 def identify_field(header, field_mapping):
     for medisoft_field, patterns in field_mapping.items():
         for pattern in patterns:
@@ -34,30 +42,29 @@ def identify_field(header, field_mapping):
 
 # Function to execute an AutoHotkey script
 def run_ahk_script(script_content):
-    temp_script_name = None
+    temp_script_name = None  # Initialize variable to hold the name of the temporary script file
     try:
         # Create a temporary AHK script file
-        with tempfile.NamedTemporaryFile(delete=False, suffix='.ahk') as temp_script:
-            temp_script_name = temp_script.name
-            temp_script.write(script_content.encode('utf-8'))
-            temp_script.flush()
+        with tempfile.NamedTemporaryFile(mode='w', delete=False, suffix='.ahk', encoding='utf-8') as temp_script:
+            temp_script_name = temp_script.name  # Store the name of the temporary script file
+            temp_script.write(script_content)  # Write the script content to the temporary file
+            temp_script.flush()  # Ensure the file is written to disk
         # Attempt to run the AHK script
-        subprocess.check_call([AHK_EXECUTABLE, temp_script_name])
+        subprocess.check_call([AHK_EXECUTABLE, temp_script_name])  # Execute the AHK script using the AutoHotkey executable
     except subprocess.CalledProcessError as e:
-        # This exception will catch any non-zero exit status from the AHK script
-        print("AHK script failed with exit status:", e.returncode)
-        print("Output from AHK script:", e.output)
+        print("AHK script failed with exit status: {}".format(e.returncode))  # Log the exit status of the failed script
+        print("Output from AHK script: {}".format(e.output))  # Log the output from the failed script
     except Exception as e:
-        # This catches any other exceptions that may occur
-        print("An unexpected error occurred while running the AHK script:", e)
-        traceback.print_exc()  # Print the stack trace of the exception
+        print("An unexpected error occurred while running the AHK script: {}".format(e))  # Log any unexpected errors
+        traceback.print_exc()  # Print the full traceback for debugging purposes
     finally:
         # Delete the temporary script file
         if temp_script_name:
             try:
-                os.unlink(temp_script_name)
+                os.unlink(temp_script_name)  # Attempt to delete the temporary script file
             except OSError as e:
-                print("Error deleting temporary script file:", e)
+                print("Error deleting temporary script file: {}".format(e))  # Log any errors encountered while deleting the file
+                # Future Improvement: Implement a cleanup mechanism to handle orphaned temporary files
 
 # Global variable to store the last processed entry
 last_processed_entry = None
@@ -68,23 +75,35 @@ def process_field(medisoft_field, csv_row, parsed_address_components, reverse_ma
     global last_processed_entry
     
     try:
-        value = ''
-        if medisoft_field in parsed_address_components:
-            value = parsed_address_components.get(medisoft_field, '')
-        elif medisoft_field in fixed_values:
-            value = fixed_values[medisoft_field][0]  # Use the fixed value
-        elif medisoft_field in reverse_mapping:
-            if medisoft_field == "Ins1 Insurance ID" or reverse_mapping[medisoft_field] == "Primary Insurance Company":
-                MediLink_ConfigLoader.log("Detected {} or {}: {}".format(medisoft_field, reverse_mapping[medisoft_field], value))
+        # Attempt to retrieve the value for the current medisoft_field from parsed_address_components
+        value = parsed_address_components.get(medisoft_field, '') if medisoft_field in parsed_address_components else ''
+        
+        # If no value is found, check if there is a fixed value available for this field
+        if not value:
+            if medisoft_field in fixed_values:
+                value = fixed_values[medisoft_field][0]  # Use the fixed value if available
+        
+        # If still no value, check if the field is present in the reverse mapping
+        if not value and medisoft_field in reverse_mapping:
+            # Retrieve the corresponding CSV header from the reverse mapping
             csv_header = reverse_mapping[medisoft_field]
-            value = csv_row.get(csv_header, '')
+            value = csv_row.get(csv_header, '')  # Get the value from the CSV row using the header
+            
+            # Log the detected field and its value after assignment
+            MediLink_ConfigLoader.log("Detected {}: {}".format(medisoft_field, value), level="DEBUG")
 
-        formatted_value = MediBot_dataformat_library.format_data(medisoft_field, value, csv_data, reverse_mapping, parsed_address_components) if value else 'Send, {Enter}'
+        # Format the value for the AutoHotkey script, or default to sending an Enter key if no value is found
+        formatted_value = (MediBot_dataformat_library.format_data(medisoft_field, value, csv_data, reverse_mapping, parsed_address_components)
+                           if value else 'Send, {Enter}')
+        
+        # Execute the AutoHotkey script with the formatted value
         run_ahk_script(formatted_value)
 
+        # Update the last processed entry with the current field and its value
         last_processed_entry = (medisoft_field, value)
-        return 'continue', last_processed_entry
+        return 'continue', last_processed_entry  # Indicate to continue processing
     except Exception as e:
+        # Handle any exceptions that occur during processing
         return handle_error(e, medisoft_field, last_processed_entry, csv_data)
 
 def handle_error(error, medisoft_field, last_processed_entry, csv_data):
@@ -176,23 +195,38 @@ class ExecutionState:
     def __init__(self, config_path, crosswalk_path) -> None:
         try:
             config, crosswalk = MediLink_ConfigLoader.load_configuration(config_path, crosswalk_path)
+            MediLink_ConfigLoader.log("Loaded configuration: {}".format(config), level="DEBUG")
+            MediLink_ConfigLoader.log("Loaded crosswalk: {}".format(crosswalk), level="DEBUG")
             self.verify_config_type(config)
             self.crosswalk = crosswalk
             self.config = config
             MediLink_ConfigLoader.log("Config loaded successfully...")
+
+            # Instantiate APIClient
+            self.api_client = APIClient()  # Pass required arguments if any
+
+            # Simplified isinstance check
+            if not isinstance(self.api_client, APIClient):
+                raise TypeError("MediBot Error: api_client must be an instance of APIClient.")
             
-            crosswalk_update(config, crosswalk)
-            MediLink_ConfigLoader.log("Crosswalk update complete...")
-            
-            initialize(config)
-            MediLink_ConfigLoader.log("Constants initialized...")
-            
+            # Log before calling crosswalk_update
+            MediLink_ConfigLoader.log("Updating crosswalk with client and config...", level="INFO")
+            update_successful = crosswalk_update(self.api_client, config, crosswalk)  # Ensure crosswalk_update uses the instance. TODO We need an internet-disabled version of this.
+            if update_successful:
+                MediLink_ConfigLoader.log("Crosswalk update completed successfully.", level="INFO")
+                print("Crosswalk update completed successfully.")
+            else:
+                MediLink_ConfigLoader.log("Crosswalk update failed.", level="ERROR")
+                print("Crosswalk update failed.")
+
         except Exception as e:
+            MediLink_ConfigLoader.log("MediBot: Failed to load or update configuration: {}".format(e), level="ERROR")
             print("MediBot: Failed to load or update configuration: {}".format(e))
-            raise # Re-throwing the exception or using a more sophisticated error handling mechanism might be needed
+            raise  # Re-throwing the exception or using a more sophisticated error handling mechanism might be needed
             # Handle the exception somehow (e.g., retry, halt, log)??
         
     def verify_config_type(self, config):
+        MediLink_ConfigLoader.log("Verifying configuration type: {}".format(type(config)), level="DEBUG")
         if not isinstance(config, (dict, OrderedDict)):
             raise TypeError("Error: Configuration must be a dictionary or an OrderedDict. Check unpacking.")
 
@@ -201,19 +235,13 @@ if __name__ == "__main__":
     e_state = None
     try:
         print("Please wait...")
-        # Default paths
+        # Default paths for configuration and crosswalk files
         default_config_path = os.path.join(os.path.dirname(__file__), '..', 'json', 'config.json')
         default_crosswalk_path = os.path.join(os.path.dirname(__file__), '..', 'json', 'crosswalk.json')
 
-        # Check if command-line arguments are provided
-        if len(sys.argv) > 1:
-            # If arguments are provided, use them
-            config_path = sys.argv[1]
-            crosswalk_path = sys.argv[2] if len(sys.argv) > 2 else default_crosswalk_path
-        else:
-            # If no arguments are provided, use default paths
-            config_path = default_config_path
-            crosswalk_path = default_crosswalk_path
+        # Determine paths based on command-line arguments or use defaults
+        config_path = sys.argv[1] if len(sys.argv) > 1 else default_config_path
+        crosswalk_path = sys.argv[2] if len(sys.argv) > 2 else default_crosswalk_path
         
         e_state = ExecutionState(config_path, crosswalk_path)
         
@@ -221,37 +249,34 @@ if __name__ == "__main__":
         MediLink_ConfigLoader.log("Loading CSV Data...", level="INFO")
         csv_data = load_csv_data(CSV_FILE_PATH)
         
-        # Pre-process CSV data to add combined fields & crosswalk values.
+        # Pre-process CSV data to add combined fields & crosswalk values
         print("Pre-Processing CSV...")
         MediLink_ConfigLoader.log("Pre-processing CSV Data...", level="INFO")
         MediBot_Preprocessor.preprocess_csv_data(csv_data, e_state.crosswalk)  
-        headers = csv_data[0].keys() # Make sure all the headers are in place
-        # Patient charges should be added prior to the intake_scan.
+        headers = csv_data[0].keys()  # Ensure all headers are in place
         
         print("Performing Intake Scan...")
         MediLink_ConfigLoader.log("Performing Intake Scan...", level="INFO")
-        # identified_fields is an OrderedDict
         identified_fields = MediBot_Preprocessor.intake_scan(headers, field_mapping)
         
         # Reverse the identified_fields mapping for lookup
         reverse_mapping = {v: k for k, v in identified_fields.items()}
-        # MediLink_ConfigLoader.log("Reverse Mapping: {}".format(reverse_mapping))
-
+        
         # CSV Patient Triage
         interaction_mode = 'triage'  # Start in triage mode
         error_message = ""  # This will be filled if an error has occurred
-        #print("Debug - Identified fields mapping (main): {}".format(identified_fields)) # Debug Line
         
         print("Load Complete...")
+        MediLink_ConfigLoader.log("Load Complete event triggered. Clearing console. Displaying Menu...", level="INFO")
         _ = os.system('cls')
         
         proceed, selected_patient_ids, selected_indices, fixed_values = user_interaction(csv_data, interaction_mode, error_message, reverse_mapping)
 
         if proceed:
-            # Filter csv_data for selected patients from Triage mode.
+            # Filter csv_data for selected patients from Triage mode
             csv_data = [row for index, row in enumerate(csv_data) if index in selected_indices]
             
-            # Check if MAPAT_MED_PATH is missing or blank
+            # Check if MAPAT_MED_PATH is missing or invalid
             if not app_control.get_mapat_med_path() or not os.path.exists(app_control.get_mapat_med_path()):
                 print("Warning: MAPAT.MED PATH is missing or invalid. Please check the path configuration.")
 
@@ -260,9 +285,8 @@ if __name__ == "__main__":
             
             if existing_patients:
                 print("\nNOTE: The following patient(s) already EXIST in the system and \n      will be excluded from processing:")
-                # TODO ... not excluded anymore, because charges may need to be added. 
-                # So at this point in the processing, we should have already processed the surgery schedules and enriched the data with Charges.
-                # Find the corresponding rows in csv_data to get the surgery dates and store them along with patient info
+                
+                # Collect surgery dates and patient info for existing patients
                 patient_info = []
                 for patient_id, patient_name in existing_patients:
                     surgery_date = next((row.get('Surgery Date', 'Unknown Date') for row in csv_data if row.get(reverse_mapping['Patient ID #2']) == patient_id), 'Unknown Date')
@@ -273,37 +297,25 @@ if __name__ == "__main__":
 
                 # Print the sorted patient info
                 for index, (surgery_date, patient_name, patient_id) in enumerate(patient_info):
-                    print("{0:03d}: {3:%m-%d} (ID: {2}) {1} ".format(index + 1, patient_name, patient_id, surgery_date))
+                    print("{:03d}: {} (ID: {}) {}".format(index + 1, surgery_date.strftime('%m-%d'), patient_id, patient_name))
 
                 # Update csv_data to exclude existing patients
-                # TODO This now has to be updated to handle patients that exist but need new charges added.
+                # TODO: Update this logic to handle patients that exist but need new charges added.
                 csv_data = [row for row in csv_data if row[reverse_mapping['Patient ID #2']] in patients_to_process]
             else:
                 print("\nSelected patient(s) are NEW patients and will be processed.")
 
+            # Check if there are patients left to process
             if len(patients_to_process) == 0:
                 proceed = input("\nAll patients have been processed. Continue anyway?: ").lower().strip() in ['yes', 'y']
             else:
                 proceed = input("\nDo you want to proceed with the {} remaining patient(s)? (yes/no): ".format(len(patients_to_process))).lower().strip() in ['yes', 'y']
 
-            # TODO Here is where we need to add the step where we move to MediBot_Charges. 
-            # The return is an enriched dataset to be picked up by medibot which means we need to return: 
+            # TODO: Here is where we need to add the step where we move to MediBot_Charges. 
+            # The return is an enriched dataset to be picked up by MediBot which means we need to return: 
             # csv_data, field_mapping, reverse_mapping, and fixed_values.
 
             if proceed:
-            
-            #    Would be nice to have some kind of self-test here.
-            #    print("\nDebug - Starting AHK script. Reload AHK if failed...")
-            #    try:
-            #        subprocess.call([AHK_EXECUTABLE, r"G:\My Drive\CocoWave\XP typing bot\notepad_test.ahk"])
-            #        run_ahk_script('MsgBox, Test AHK Script Execution')
-            #    except subprocess.CalledProcessError as e:
-            #        print("Error running AHK script. Please reload AHK and try again. Error: {}".format(e))
-            #        exit(1)
-            #    except Exception as e:
-            #        print("An unexpected error occurred while running the AHK script: {}".format(e))
-            #        exit(1)
-
                 print("\nRemember, when in Medisoft:")
                 print("  Press 'F8'  to create a New Patient.")
                 print("  Press 'F12' to begin data entry.")
@@ -321,9 +333,8 @@ if __name__ == "__main__":
         if e_state:
             interaction_mode = 'error'  # Switch to error mode
             error_message = str(e)  # Capture the error message
-        print("An error occurred while running MediBot: {0}".format(e))
+        print("An error occurred while running MediBot: {}".format(e))
         # Handle the error by calling user interaction with the error information
-        # Ensure that identified_fields is defined before using it in user interaction
         if 'identified_fields' in locals():
             _ = user_interaction(csv_data, interaction_mode, error_message, reverse_mapping)
         else: