medicafe 0.250816.0__tar.gz → 0.250818.0__tar.gz

{medicafe-0.250816.0 → medicafe-0.250818.0}/MediBot/MediBot.py

@@ -735,7 +735,7 @@ if __name__ == "__main__":
                         print(msg)
                 print("-" * 60)
         
-        proceed, selected_patient_ids, selected_indices, fixed_values = user_interaction(csv_data, interaction_mode, error_message, reverse_mapping)
+        proceed, selected_patient_ids, selected_indices, fixed_values, is_medicare = user_interaction(csv_data, interaction_mode, error_message, reverse_mapping)
 
         if proceed:
             # Filter csv_data for selected patients from Triage mode
@@ -767,9 +767,10 @@ if __name__ == "__main__":
                         patient_info.append(('Unknown Date', patient_name, patient_id, 'N/A', None))  # Append with 'Unknown Date' if there's an error
 
                 # Display existing patients table using the enhanced display function
+                patient_type = "MEDICARE" if is_medicare else "PRIVATE"
                 MediBot_UI.display_enhanced_patient_table(
                     patient_info, 
-                    "NOTE: The following patient(s) already EXIST in the system but may have new dates of service.\n      Their diagnosis codes may need to be updated manually by the user to the following list:",
+                    "{} PATIENTS - EXISTING: The following patient(s) already EXIST in the system but may have new dates of service.\n      Their diagnosis codes may need to be updated manually by the user to the following list:".format(patient_type),
                     show_line_numbers=False
                 )
 
@@ -787,9 +788,10 @@ if __name__ == "__main__":
                     new_patient_info.extend(patient_entries)
 
                 # Display new patients table using the enhanced display function
+                patient_type = "MEDICARE" if is_medicare else "PRIVATE"
                 MediBot_UI.display_enhanced_patient_table(
                     new_patient_info, 
-                    "NOTE: The following NEW patient(s) will be automatically entered into Medisoft:",
+                    "{} PATIENTS - NEW: The following patient(s) will be automatically entered into Medisoft:".format(patient_type),
                     show_line_numbers=True
                 )
 

{medicafe-0.250816.0 → medicafe-0.250818.0}/MediBot/MediBot_Preprocessor_lib.py

@@ -1378,6 +1378,35 @@ def map_payer_ids_to_insurance_ids(patient_id_to_insurance_id, payer_id_to_patie
             }
     return payer_id_to_details
 
+def _display_mains_file_error(mains_path):
+    """
+    Helper function to display the critical MAINS file error message.
+    
+    Args:
+        mains_path (str): The path where the MAINS file was expected to be found.
+    """
+    error_msg = "CRITICAL: MAINS file not found at: {}. This file is required for insurance name to Medisoft ID mapping.".format(mains_path)
+    if hasattr(MediLink_ConfigLoader, 'log'):
+        MediLink_ConfigLoader.log(error_msg, level="CRITICAL")
+    print("\n" + "="*80)
+    print("CRITICAL ERROR: MAINS FILE MISSING")
+    print("="*80)
+    print("\nThe MAINS file is required for the following critical functions:")
+    print("* Mapping insurance company names to Medisoft IDs")
+    print("* Converting insurance names to payer IDs for claim submission")
+    print("* Creating properly formatted 837p claim files")
+    print("\nWithout this file, claim submission will fail because:")
+    print("* Insurance names cannot be converted to payer IDs")
+    print("* 837p claim files cannot be generated")
+    print("* Claims cannot be submitted to insurance companies")
+    print("\nTO FIX THIS:")
+    print("1. Ensure the MAINS file exists at: {}".format(mains_path))
+    print("2. If the file is missing, llamar a Dani")
+    print("3. The file should contain insurance company data from your Medisoft system")
+    print("="*80)
+    time.sleep(3)  # 3 second pause to allow user to read critical error message
+
+
 def load_insurance_data_from_mains(config):
     """
     Loads insurance data from MAINS and creates a mapping from insurance names to their respective IDs.
@@ -1421,25 +1450,7 @@ def load_insurance_data_from_mains(config):
     try:
         # Check if MAINS file exists before attempting to read
         if not os.path.exists(mains_path):
-            error_msg = "CRITICAL: MAINS file not found at: {}. This file is required for insurance name to Medisoft ID mapping.".format(mains_path)
-            if hasattr(MediLink_ConfigLoader, 'log'):
-                MediLink_ConfigLoader.log(error_msg, level="CRITICAL")
-            print("\n" + "="*80)
-            print("CRITICAL ERROR: MAINS FILE MISSING")
-            print("="*80)
-            print("\nThe MAINS file is required for the following critical functions:")
-            print("* Mapping insurance company names to Medisoft IDs")
-            print("* Converting insurance names to payer IDs for claim submission")
-            print("* Creating properly formatted 837p claim files")
-            print("\nWithout this file, claim submission will fail because:")
-            print("* Insurance names cannot be converted to payer IDs")
-            print("* 837p claim files cannot be generated")
-            print("* Claims cannot be submitted to insurance companies")
-            print("\nTO FIX THIS:")
-            print("1. Ensure the MAINS file exists at: {}".format(mains_path))
-            print("2. If the file is missing, llamar a Dani")
-            print("3. The file should contain insurance company data from your Medisoft system")
-            print("="*80)
+            _display_mains_file_error(mains_path)
             return insurance_to_id
         
         # XP Compatibility: Check if MediLink_DataMgmt has the required function
@@ -1459,25 +1470,7 @@ def load_insurance_data_from_mains(config):
             print("Successfully loaded {} insurance records from MAINS".format(len(insurance_to_id)))
         
     except FileNotFoundError:
-        error_msg = "CRITICAL: MAINS file not found: {}. This file is required for insurance name to Medisoft ID mapping.".format(mains_path)
-        if hasattr(MediLink_ConfigLoader, 'log'):
-            MediLink_ConfigLoader.log(error_msg, level="CRITICAL")
-        print("\n" + "="*80)
-        print("CRITICAL ERROR: MAINS FILE MISSING")
-        print("="*80)
-        print("\nThe MAINS file is required for the following critical functions:")
-        print("* Mapping insurance company names to Medisoft IDs")
-        print("* Converting insurance names to payer IDs for claim submission")
-        print("* Creating properly formatted 837p claim files")
-        print("\nWithout this file, claim submission will fail because:")
-        print("* Insurance names cannot be converted to payer IDs")
-        print("* 837p claim files cannot be generated")
-        print("* Claims cannot be submitted to insurance companies")
-        print("\nTO FIX THIS:")
-        print("1. Ensure the MAINS file exists at: {}".format(mains_path))
-        print("2. If the file is missing, llamar a Dani")
-        print("3. The file should contain insurance company data from your Medisoft system")
-        print("="*80)
+        _display_mains_file_error(mains_path)
     except Exception as e:
         error_msg = "Error loading MAINS data: {}. Continuing without MAINS data.".format(str(e))
         if hasattr(MediLink_ConfigLoader, 'log'):

{medicafe-0.250816.0 → medicafe-0.250818.0}/MediBot/MediBot_UI.py

@@ -316,6 +316,10 @@ def display_patient_selection_menu(csv_data, reverse_mapping, proceed_as_medicar
     selected_patient_ids = []
     selected_indices = []
 
+    # TODO: Future enhancement - make this configurable via config file
+    # Example: config.get('silent_initial_selection', True)
+    SILENT_INITIAL_SELECTION = True  # Set to False to restore original interactive behavior
+
     def display_menu_header(title):
         print("\n" + "-" * 60)
         print(title)
@@ -348,7 +352,10 @@ def display_patient_selection_menu(csv_data, reverse_mapping, proceed_as_medicar
                 formatted_date = surgery_date.strftime('%m-%d')
             except Exception:
                 formatted_date = str(surgery_date)
-            print("{0:03d}: {3} (ID: {2}) {1} ".format(index+1, patient_name, patient_id, formatted_date))
+            
+            # Only display if not in silent mode
+            if not SILENT_INITIAL_SELECTION:
+                print("{0:03d}: {3} (ID: {2}) {1} ".format(index+1, patient_name, patient_id, formatted_date))
 
             displayed_indices.append(index)
             displayed_patient_ids.append(patient_id)
@@ -356,23 +363,44 @@ def display_patient_selection_menu(csv_data, reverse_mapping, proceed_as_medicar
         return displayed_indices, displayed_patient_ids
 
     if proceed_as_medicare:
-        display_menu_header("MEDICARE Patient Selection for Today's Data Entry")
+        if not SILENT_INITIAL_SELECTION:
+            display_menu_header("MEDICARE Patient Selection for Today's Data Entry")
         selected_indices, selected_patient_ids = display_patient_list(csv_data, reverse_mapping, medicare_filter=True)
     else:
-        display_menu_header("PRIVATE Patient Selection for Today's Data Entry")
+        if not SILENT_INITIAL_SELECTION:
+            display_menu_header("PRIVATE Patient Selection for Today's Data Entry")
         selected_indices, selected_patient_ids = display_patient_list(csv_data, reverse_mapping, exclude_medicare=True)
 
-    print("-" * 60)
-    proceed = input("\nDo you want to proceed with the selected patients? (yes/no): ").lower().strip() in ['yes', 'y']
+    if not SILENT_INITIAL_SELECTION:
+        print("-" * 60)
+        proceed = input("\nDo you want to proceed with the selected patients? (yes/no): ").lower().strip() in ['yes', 'y']
+    else:
+        # Auto-confirm in silent mode
+        proceed = True
 
     if not proceed:
-        display_menu_header("Patient Selection for Today's Data Entry")
-        selected_indices, selected_patient_ids = display_patient_list(csv_data, reverse_mapping)
-        print("-" * 60)
-        
-        while True:
+        if not SILENT_INITIAL_SELECTION:
+            display_menu_header("Patient Selection for Today's Data Entry")
+            selected_indices, selected_patient_ids = display_patient_list(csv_data, reverse_mapping)
+            print("-" * 60)
+            
             while True:
-                selection = input("\nEnter the number(s) of the patients you wish to proceed with\n(e.g., 1, 3, 5): ").strip()
+                while True:
+                    selection = input("\nEnter the number(s) of the patients you wish to proceed with\n(e.g., 1, 3, 5): ").strip()
+                    if not selection:
+                        print("Invalid entry. Please provide at least one number.")
+                        continue
+                    
+                    selection = selection.replace('.', ',')  # Replace '.' with ',' in the user input just in case
+                    selected_indices = [int(x.strip()) - 1 for x in selection.split(',') if x.strip().isdigit()]  
+                    
+                    if not selected_indices:
+                        print("Invalid entry. Please provide at least one integer.")
+                        continue
+                    
+                    proceed = True
+                    break
+                
                 if not selection:
                     print("Invalid entry. Please provide at least one number.")
                     continue
@@ -386,20 +414,6 @@ def display_patient_selection_menu(csv_data, reverse_mapping, proceed_as_medicar
                 
                 proceed = True
                 break
-            
-            if not selection:
-                print("Invalid entry. Please provide at least one number.")
-                continue
-            
-            selection = selection.replace('.', ',')  # Replace '.' with ',' in the user input just in case
-            selected_indices = [int(x.strip()) - 1 for x in selection.split(',') if x.strip().isdigit()]  
-            
-            if not selected_indices:
-                print("Invalid entry. Please provide at least one integer.")
-                continue
-            
-            proceed = True
-            break
 
     patient_id_header = reverse_mapping['Patient ID #2']
     selected_patient_ids = [csv_data[i][patient_id_header] for i in selected_indices if i < len(csv_data)]
@@ -498,6 +512,15 @@ def user_interaction(csv_data, interaction_mode, error_message, reverse_mapping)
             fixed_values.update(medicare_added_fixed_values)  # Add any medicare-specific fixed values from config
         
         proceed, selected_patient_ids, selected_indices = display_patient_selection_menu(csv_data, reverse_mapping, response in ['yes', 'y'])
-        return proceed, selected_patient_ids, selected_indices, fixed_values
-
-    return handle_user_interaction(interaction_mode, error_message)
+        is_medicare = response in ['yes', 'y']
+        return proceed, selected_patient_ids, selected_indices, fixed_values, is_medicare
+
+    # For non-triage modes (error, normal), return a compatible structure
+    # The is_medicare value is not relevant in these modes, so we'll use a default
+    result = handle_user_interaction(interaction_mode, error_message)
+    if isinstance(result, int):
+        # This is a control value (-1, 1, -2), return with default values
+        return False, [], [], {}, False  # proceed=False, empty lists, empty dict, is_medicare=False
+    else:
+        # Unexpected return type, handle gracefully
+        return False, [], [], {}, False

{medicafe-0.250816.0 → medicafe-0.250818.0}/MediBot/__init__.py

@@ -19,7 +19,7 @@ Smart Import Integration:
         medibot_main = get_components('medibot_main')
 """
 
-__version__ = "0.250816.0"
+__version__ = "0.250818.0"
 __author__ = "Daniel Vidaud"
 __email__ = "daniel@personalizedtransformation.com"
 

medicafe-0.250818.0/MediBot/update_medicafe.py

@@ -0,0 +1,245 @@
+#!/usr/bin/env python
+# update_medicafe.py
+# Script Version: 2.0.0 (clean 3-try updater)
+# Target environment: Windows XP SP3 + Python 3.4.4 (ASCII-only)
+
+import sys, os, time, subprocess, platform
+
+try:
+    import requests
+except Exception:
+    requests = None
+
+try:
+    import pkg_resources
+except Exception:
+    pkg_resources = None
+
+
+SCRIPT_NAME = "update_medicafe.py"
+SCRIPT_VERSION = "2.0.0"
+PACKAGE_NAME = "medicafe"
+
+
+# ---------- UI helpers (ASCII-only) ----------
+def _line(char, width):
+    try:
+        return char * width
+    except Exception:
+        return char * 60
+
+
+def print_banner(title):
+    width = 60
+    print(_line("=", width))
+    print(title)
+    print(_line("=", width))
+
+
+def print_section(title):
+    width = 60
+    print("\n" + _line("-", width))
+    print(title)
+    print(_line("-", width))
+
+
+def print_status(kind, message):
+    label = "[{}]".format(kind)
+    print("{} {}".format(label, message))
+
+
+# ---------- Version utilities ----------
+def compare_versions(version1, version2):
+    try:
+        v1_parts = list(map(int, version1.split(".")))
+        v2_parts = list(map(int, version2.split(".")))
+        return (v1_parts > v2_parts) - (v1_parts < v2_parts)
+    except Exception:
+        # Fall back to string compare if unexpected formats
+        return (version1 > version2) - (version1 < version2)
+
+
+def get_installed_version(package):
+    try:
+        proc = subprocess.Popen([sys.executable, '-m', 'pip', 'show', package],
+                                stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        out, err = proc.communicate()
+        if proc.returncode == 0:
+            for line in out.decode().splitlines():
+                if line.startswith("Version:"):
+                    return line.split(":", 1)[1].strip()
+    except Exception:
+        pass
+
+    if pkg_resources:
+        try:
+            return pkg_resources.get_distribution(package).version
+        except Exception:
+            return None
+    return None
+
+
+def get_latest_version(package, retries):
+    if not requests:
+        return None
+
+    headers = {
+        'Cache-Control': 'no-cache, no-store, must-revalidate',
+        'Pragma': 'no-cache',
+        'Expires': '0',
+        'User-Agent': 'MediCafe-Updater/2.0.0'
+    }
+
+    last = None
+    for attempt in range(1, retries + 1):
+        try:
+            url = "https://pypi.org/pypi/{}/json?t={}".format(package, int(time.time()))
+            resp = requests.get(url, headers=headers, timeout=10)
+            resp.raise_for_status()
+            data = resp.json()
+            latest = data.get('info', {}).get('version')
+            if not latest:
+                raise Exception("Malformed PyPI response")
+
+            # Pragmatic double-fetch-if-equal to mitigate CDN staleness
+            if last and latest == last:
+                return latest
+            last = latest
+            if attempt == retries:
+                return latest
+            # If we just fetched same as before and it's equal to current installed, refetch once more quickly
+            time.sleep(1)
+        except Exception:
+            if attempt == retries:
+                return None
+            time.sleep(1)
+
+    return last
+
+
+def check_internet_connection():
+    if not requests:
+        return False
+    try:
+        requests.get("http://www.google.com", timeout=5)
+        return True
+    except Exception:
+        return False
+
+
+# ---------- Upgrade logic (3 attempts, minimal delays) ----------
+def run_pip_install(args):
+    proc = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    out, err = proc.communicate()
+    return proc.returncode, out.decode(), err.decode()
+
+
+def verify_post_install(package, expected_version):
+    # Try quick reads with minimal backoff to avoid unnecessary slowness
+    for _ in range(3):
+        installed = get_installed_version(package)
+        if installed:
+            # Re-fetch latest once to avoid stale latest
+            latest_again = get_latest_version(package, retries=1) or expected_version
+            if compare_versions(installed, latest_again) >= 0:
+                return True, installed
+        time.sleep(1)
+    return False, get_installed_version(package)
+
+
+def upgrade_package(package):
+    strategies = [
+        ['install', '--upgrade', package, '--no-cache-dir', '--disable-pip-version-check'],
+        ['install', '--upgrade', '--force-reinstall', package, '--no-cache-dir', '--disable-pip-version-check'],
+        ['install', '--upgrade', '--force-reinstall', '--ignore-installed', '--user', package, '--no-cache-dir', '--disable-pip-version-check']
+    ]
+
+    latest_before = get_latest_version(package, retries=2)
+    if not latest_before:
+        print_status('ERROR', 'Unable to determine latest version from PyPI')
+        return False
+
+    for idx, parts in enumerate(strategies):
+        attempt = idx + 1
+        print_section("Attempt {}/3".format(attempt))
+        cmd = [sys.executable, '-m', 'pip'] + parts
+        print_status('INFO', 'Running: {} -m pip {}'.format(sys.executable, ' '.join(parts)))
+        code, out, err = run_pip_install(cmd)
+        if code == 0:
+            ok, installed = verify_post_install(package, latest_before)
+            if ok:
+                print_status('SUCCESS', 'Installed version: {}'.format(installed))
+                return True
+            else:
+                print_status('WARNING', 'Install returned success but version not updated yet{}'.format(
+                    '' if not installed else ' (detected {})'.format(installed)))
+        else:
+            # Show error output concisely
+            if err:
+                print(err.strip())
+            print_status('WARNING', 'pip returned non-zero exit code ({})'.format(code))
+
+    return False
+
+
+# ---------- Main ----------
+def main():
+    print_banner("MediCafe Updater ({} v{})".format(SCRIPT_NAME, SCRIPT_VERSION))
+    print_status('INFO', 'Python: {}'.format(sys.version.split(" ")[0]))
+    print_status('INFO', 'Platform: {}'.format(platform.platform()))
+
+    if not check_internet_connection():
+        print_section('Network check')
+        print_status('ERROR', 'No internet connection detected')
+        sys.exit(1)
+
+    print_section('Environment')
+    current = get_installed_version(PACKAGE_NAME)
+    if current:
+        print_status('INFO', 'Installed {}: {}'.format(PACKAGE_NAME, current))
+    else:
+        print_status('WARNING', '{} is not currently installed'.format(PACKAGE_NAME))
+
+    latest = get_latest_version(PACKAGE_NAME, retries=3)
+    if not latest:
+        print_status('ERROR', 'Could not fetch latest version information from PyPI')
+        sys.exit(1)
+    print_status('INFO', 'Latest {} on PyPI: {}'.format(PACKAGE_NAME, latest))
+
+    if current and compare_versions(latest, current) <= 0:
+        print_section('Status')
+        print_status('SUCCESS', 'Already up to date')
+        sys.exit(0)
+
+    print_section('Upgrade')
+    print_status('INFO', 'Upgrading {} to {} (up to 3 attempts)'.format(PACKAGE_NAME, latest))
+    success = upgrade_package(PACKAGE_NAME)
+
+    print_section('Result')
+    final_version = get_installed_version(PACKAGE_NAME)
+    if success:
+        print_status('SUCCESS', 'Update completed. {} is now at {}'.format(PACKAGE_NAME, final_version or '(unknown)'))
+        print_status('INFO', 'This updater script: v{}'.format(SCRIPT_VERSION))
+        sys.exit(0)
+    else:
+        print_status('ERROR', 'Update failed.')
+        if final_version and current and compare_versions(final_version, current) > 0:
+            print_status('WARNING', 'Partial success: detected {} after failures'.format(final_version))
+        print_status('INFO', 'This updater script: v{}'.format(SCRIPT_VERSION))
+        sys.exit(1)
+
+
+if __name__ == '__main__':
+    # Optional quick mode: --check-only prints machine-friendly status
+    if len(sys.argv) > 1 and sys.argv[1] == '--check-only':
+        if not check_internet_connection():
+            print('ERROR')
+            sys.exit(1)
+        cur = get_installed_version(PACKAGE_NAME)
+        lat = get_latest_version(PACKAGE_NAME, retries=2)
+        if not cur or not lat:
+            print('ERROR')
+            sys.exit(1)
+        print('UPDATE_AVAILABLE:' + lat if compare_versions(lat, cur) > 0 else 'UP_TO_DATE')
+        sys.exit(0)
+    main()

{medicafe-0.250816.0 → medicafe-0.250818.0}/MediCafe/__init__.py

@@ -27,7 +27,7 @@ Smart Import System:
         api_suite = get_api_access()
 """
 
-__version__ = "0.250816.0"
+__version__ = "0.250818.0"
 __author__ = "Daniel Vidaud"
 __email__ = "daniel@personalizedtransformation.com"
 

{medicafe-0.250816.0 → medicafe-0.250818.0}/MediLink/__init__.py

@@ -22,7 +22,7 @@ Smart Import Integration:
         datamgmt = get_components('medilink_datamgmt')
 """
 
-__version__ = "0.250816.0"
+__version__ = "0.250818.0"
 __author__ = "Daniel Vidaud"
 __email__ = "daniel@personalizedtransformation.com"
 

{medicafe-0.250816.0 → medicafe-0.250818.0}/PKG-INFO

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

{medicafe-0.250816.0 → medicafe-0.250818.0}/medicafe.egg-info/PKG-INFO

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

{medicafe-0.250816.0 → medicafe-0.250818.0}/setup.py

@@ -54,7 +54,7 @@ if long_description_text is None:
 
 setup(
     name='medicafe',
-    version="0.250816.0",
+    version="0.250818.0",
     description='MediCafe',
     long_description=long_description_text,
     long_description_content_type='text/markdown',