medicafe 0.250812.5__tar.gz → 0.250812.6__tar.gz

{medicafe-0.250812.5 → medicafe-0.250812.6}/MediBot/MediBot.bat

@@ -405,8 +405,6 @@ echo 6. Run MediBot
 echo.
 echo 7. Troubleshooting
 echo.
-echo 9. Toggle Performance Logging (session)
-echo.
 echo 8. Exit
 echo.
 set /p choice=Enter your choice:  
@@ -420,7 +418,6 @@ if "!choice!"=="4" goto united_claims_status
 if "!choice!"=="3" goto medilink_flow
 if "!choice!"=="2" goto download_emails
 if "!choice!"=="1" goto check_updates
-if "!choice!"=="9" goto toggle_perf_logging
 if "!choice!"=="0" goto end_script
 
 echo Invalid choice. Please try again.
@@ -572,7 +569,7 @@ if not exist "%_UPD_RUNNER%" (
 echo.
 echo Launching updater and closing this window...
 start "MediCafe Update" "%_UPD_RUNNER%"
-exit /b 0
+exit 0
 
 :: Download Carol's Emails
 :download_emails
@@ -636,7 +633,7 @@ if /I "%MEDICAFE_PERFORMANCE_LOGGING%"=="1" (
 echo.
 echo Note: This affects current session only. To persist, set in config.json.
 pause
-goto main_menu
+goto troubleshooting_menu
 
 :: United Claims Status
 :united_claims_status
@@ -715,14 +712,16 @@ echo Troubleshooting Options:
 echo.
 echo 1. Open Latest Log File
 echo 2. Clear Python Cache
-echo 3. Forced MediCafe version rollback - no dependencies
-echo 4. Back to Main Menu
+echo 3. Toggle Performance Logging ^(session^)
+echo 4. Forced MediCafe version rollback
+echo 5. Back to Main Menu
 echo.
 set /p tchoice=Enter your choice: 
 if "%tchoice%"=="1" goto open_latest_log
 if "%tchoice%"=="2" goto clear_cache_menu
-if "%tchoice%"=="3" goto forced_version_rollback
-if "%tchoice%"=="4" goto main_menu
+if "%tchoice%"=="3" goto toggle_perf_logging
+if "%tchoice%"=="4" goto forced_version_rollback
+if "%tchoice%"=="5" goto main_menu
 echo Invalid choice. Please try again.
 pause
 goto troubleshooting_menu
@@ -743,7 +742,7 @@ goto troubleshooting_menu
 :: End Script
 :end_script
 echo Exiting MediBot
-exit /b 0
+exit 0
 
 :: Full Debug Mode moved to external script full_debug_suite.bat
 

{medicafe-0.250812.5 → medicafe-0.250812.6}/MediBot/MediBot_Crosswalk_Library.py

@@ -376,6 +376,8 @@ def crosswalk_update(client, config, crosswalk): # Upstream of this is only Medi
                     'medisoft_medicare_id': []  # PERFORMANCE FIX: Use list instead of set to avoid conversions
                 }
                 MediLink_ConfigLoader.log("Initialized payer ID {} in crosswalk with endpoint '{}'.".format(payer_id, selected_endpoint), config, level="DEBUG")
+                # TODO (MEDICARE ENDPOINTS): If payer_id is Medicare (e.g., in config['MediLink_Config']['cob_settings']['medicare_payer_ids']),
+                # set endpoint to 'MEDICARE_PRIMARY' and optionally store 'crossover_endpoint' for later automation.
 
             # Add the insurance ID to the payer ID entry (PERFORMANCE FIX: Use list operations)
             insurance_id_str = str(insurance_id)  # Ensure ID is string

{medicafe-0.250812.5 → medicafe-0.250812.6}/MediBot/MediBot_Crosswalk_Utils.py

@@ -370,10 +370,12 @@ def save_crosswalk(client, config, crosswalk, skip_api_operations=False, api_cac
                     crosswalk['payer_id'][payer_id]['endpoint'] = select_endpoint(config)  # Use the helper function to set the endpoint
                     MediLink_ConfigLoader.log("Initialized 'endpoint' for payer ID {}.".format(payer_id), config, level="DEBUG")
 
-            # Initialize medisoft_id and medisoft_medicare_id as empty lists if they do not exist
-            crosswalk['payer_id'][payer_id].setdefault('medisoft_id', [])
-            crosswalk['payer_id'][payer_id].setdefault('medisoft_medicare_id', []) # does this work in 3.4.4?
-            MediLink_ConfigLoader.log("Ensured 'medisoft_id' and 'medisoft_medicare_id' for payer ID {} are initialized.".format(payer_id), config, level="DEBUG")
+        # Initialize medisoft_id and medisoft_medicare_id as empty lists if they do not exist
+        crosswalk['payer_id'][payer_id].setdefault('medisoft_id', [])
+        crosswalk['payer_id'][payer_id].setdefault('medisoft_medicare_id', []) # does this work in 3.4.4?
+        MediLink_ConfigLoader.log("Ensured 'medisoft_id' and 'medisoft_medicare_id' for payer ID {} are initialized.".format(payer_id), config, level="DEBUG")
+        # TODO (CROSSWALK VALIDATION): Enforce distinctness between 'medisoft_id' and 'medisoft_medicare_id' and support optional
+        # 'crossover_endpoint' per payer. Use config['MediLink_Config']['cob_settings']['medicare_payer_ids'] to detect Medicare payers.
         
         # Convert sets to sorted lists for JSON serialization
         for payer_id, details in crosswalk.get('payer_id', {}).items():

{medicafe-0.250812.5 → medicafe-0.250812.6}/MediBot/MediBot_Preprocessor_lib.py

@@ -816,6 +816,11 @@ def update_insurance_ids(csv_data, config, crosswalk):
         
         # Assign the resolved insurance ID to the row
         row['Ins1 Insurance ID'] = insurance_id
+        # TODO (SECONDARY QUEUE): When building a secondary-claims queue after Medicare crossover,
+        # set claim_type='secondary' and attach prior payer fields here from the Medicare primary outcome:
+        # - row['prior_payer_name'] = 'MEDICARE'
+        # - row['prior_payer_id'] = best Medicare ID from config/crosswalk
+        # - optionally row['primary_paid_amount'], row['cas_adjustments'] extracted from 835
         processed_count += 1
         # LOGGING STRATEGY: Remove success logging - DEBUG is typically silent anyway
         # if processed_count <= 10 or processed_count % 100 == 0:  # Log first 10 and every 100th

{medicafe-0.250812.5 → medicafe-0.250812.6}/MediBot/update_medicafe.py

@@ -1,5 +1,5 @@
 #update_medicafe.py
-import subprocess, sys, time, platform, os, shutil
+import subprocess, sys, time, platform, os, shutil, random
 
 # Safe import for pkg_resources with fallback
 try:
@@ -162,6 +162,8 @@ def get_latest_version(package, retries=3, delay=1):
                 time.sleep(delay)
     return None
 
+ 
+
 def check_internet_connection():
     try:
         requests.get("http://www.google.com", timeout=5)
@@ -288,7 +290,7 @@ def compare_versions(version1, version2):
     v2_parts = list(map(int, version2.split(".")))
     return (v1_parts > v2_parts) - (v1_parts < v2_parts)
 
-def upgrade_package(package, retries=3, delay=2):  # Updated retries to 3
+def upgrade_package(package, retries=4, delay=2, target_version=None):  # Updated retries to 4
     """
     Attempts to upgrade the package multiple times with delays in between.
     """
@@ -296,23 +298,33 @@ def upgrade_package(package, retries=3, delay=2):  # Updated retries to 3
         print_status("No internet connection detected. Please check your internet connection and try again.", "ERROR")
         print_final_result(False, "No internet connection available")
     
+    # Light verbosity: show pinned target once
+    if target_version:
+        print("Pinned target version: {}".format(target_version))
+
     for attempt in range(1, retries + 1):
-        print("Attempt {} to upgrade {}...".format(attempt, package))
+        print("Attempt {}/{} to upgrade {}...".format(attempt, retries, package))
         
         # Use a more compatible approach for Python 3.4
         # Try with --no-deps first to avoid dependency resolution issues
+        pkg_spec = package
+        if target_version:
+            pkg_spec = "{}=={}".format(package, target_version)
+
         cmd = [
             sys.executable, '-m', 'pip', 'install', '--upgrade',
-            '--no-deps', '--no-cache-dir', '--disable-pip-version-check', '-q', package
+            '--no-deps', '--no-cache-dir', '--disable-pip-version-check', '-q', pkg_spec
         ]
         
+        print("Using pip upgrade with --no-deps and --no-cache-dir")
         process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         stdout, stderr = process.communicate()
         
         if process.returncode == 0:
             print(stdout.decode().strip())
             new_version = get_installed_version(package)  # Get new version after upgrade
-            if compare_versions(new_version, get_latest_version(package)) >= 0:  # Compare versions
+            expected_version = target_version or get_latest_version(package)
+            if expected_version and compare_versions(new_version, expected_version) >= 0:  # Compare versions
                 if attempt == 1:
                     print_status("Upgrade succeeded!", "SUCCESS")
                 else:
@@ -320,20 +332,27 @@ def upgrade_package(package, retries=3, delay=2):  # Updated retries to 3
                 time.sleep(delay)
                 return True
             else:
-                print_status("Upgrade failed. Current version remains: {}".format(new_version), "WARNING")
+                print_status("Upgrade incomplete. Current version: {} Expected at least: {}".format(new_version, expected_version), "WARNING")
                 if attempt < retries:
                     print("Retrying in {} seconds...".format(delay))
-                    time.sleep(delay)
+                    try:
+                        time.sleep(delay + (random.random() * 0.5))
+                    except Exception:
+                        time.sleep(delay)
         else:
             print(stderr.decode().strip())
             print_status("Attempt {}: Upgrade failed with --no-deps.".format(attempt), "WARNING")
             
             # If --no-deps failed, try with --force-reinstall to bypass dependency issues
             if attempt < retries:
-                print("Retrying with --force-reinstall...")
+                print("Fallback this attempt: retrying with --force-reinstall...")
+                pkg_spec = package
+                if target_version:
+                    pkg_spec = "{}=={}".format(package, target_version)
+
                 cmd = [
                     sys.executable, '-m', 'pip', 'install', '--upgrade',
-                    '--force-reinstall', '--no-cache-dir', '--disable-pip-version-check', '-q', package
+                    '--force-reinstall', '--no-cache-dir', '--disable-pip-version-check', '-q', pkg_spec
                 ]
                 
                 process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -342,19 +361,23 @@ def upgrade_package(package, retries=3, delay=2):  # Updated retries to 3
                 if process.returncode == 0:
                     print(stdout.decode().strip())
                     new_version = get_installed_version(package)
-                    if compare_versions(new_version, get_latest_version(package)) >= 0:
+                    expected_version = target_version or get_latest_version(package)
+                    if expected_version and compare_versions(new_version, expected_version) >= 0:
                         print_status("Attempt {}: Upgrade succeeded with --force-reinstall!".format(attempt), "SUCCESS")
                         time.sleep(delay)
                         return True
                     else:
-                        print_status("Upgrade failed. Current version remains: {}".format(new_version), "WARNING")
+                        print_status("Upgrade incomplete. Current version: {} Expected at least: {}".format(new_version, expected_version), "WARNING")
                 else:
                     print(stderr.decode().strip())
                     print_status("Attempt {}: Upgrade failed with --force-reinstall.".format(attempt), "WARNING")
                 
                 if attempt < retries:
                     print("Retrying in {} seconds...".format(delay))
-                    time.sleep(delay)
+                    try:
+                        time.sleep(delay + (random.random() * 0.5))
+                    except Exception:
+                        time.sleep(delay)
     
     print_status("All upgrade attempts failed.", "ERROR")
     return False
@@ -566,7 +589,7 @@ def main():
         print("Current version: {}".format(current_version))
         print("Target version: {}".format(latest_version))
 
-        if upgrade_package(package):
+        if upgrade_package(package, target_version=latest_version):
             # STEP 8: Verify upgrade
             debug_step(8, "Upgrade Verification")
             new_version = get_installed_version(package)

{medicafe-0.250812.5 → medicafe-0.250812.6}/MediLink/MediLink_837p_cob_library.py

@@ -101,6 +101,10 @@ def create_2320_other_subscriber_segments(patient_data, config, crosswalk):
     is_secondary = patient_data.get('claim_type', 'primary') == 'secondary'
     
     if is_secondary:
+        # TODO (DATA CONTRACT): If 835-derived fields are present on patient_data, prefer them:
+        # - total_paid -> AMT*D
+        # - cas_adjustments -> CAS
+        # Otherwise accept 'primary_paid_amount' and 'cas_adjustments' provided by upstream workflow.
         # SBR segment for secondary payer
         responsibility_code = "S"  # Secondary
         insurance_type = determine_medicare_payer_type(patient_data, config)
@@ -111,7 +115,9 @@ def create_2320_other_subscriber_segments(patient_data, config, crosswalk):
         segments.append(sbr_segment)
         
         # AMT*D segment for total amount paid by primary
-        total_paid = patient_data.get('primary_paid_amount', '0.00')
+        # TODO (STRICT MODE): When config['MediLink_Config']['cob_settings']['validation_level'] >= 2,
+        # require presence of a numeric total (from 'total_paid' or 'primary_paid_amount').
+        total_paid = patient_data.get('total_paid', patient_data.get('primary_paid_amount', '0.00'))
         amt_segment = "AMT*D*{}~".format(total_paid)
         segments.append(amt_segment)
         
@@ -152,6 +158,7 @@ def create_2330B_prior_payer_segments(patient_data, config, crosswalk):
     segments = []
     
     # Get prior payer information
+    # TODO (CONFIG): Resolve Medicare payer ID from config['MediLink_Config']['cob_settings']['medicare_payer_ids'] if prior_payer_id not provided.
     prior_payer_name = patient_data.get('prior_payer_name', 'MEDICARE')
     prior_payer_id = patient_data.get('prior_payer_id', '00850')
     

{medicafe-0.250812.5 → medicafe-0.250812.6}/MediLink/MediLink_837p_encoder.py

@@ -613,6 +613,12 @@ def process_claim(config, endpoint, patient_data_list, crosswalk, client, suffix
     document_segments = []
 
     for patient_data in patient_data_list:
+        # TODO (SECONDARY PREP): Upstream should mark secondary claims and provide Medicare prior payer info when applicable.
+        # Expected minimal keys for Medicare-secondary:
+        # - claim_type='secondary'
+        # - prior_payer_name='MEDICARE'
+        # - prior_payer_id from config cob_settings.medicare_payer_ids (default '00850')
+        # - optional: primary_paid_amount, cas_adjustments
         # Validate each patient's data before processing
         is_valid, validation_errors = validate_claim_data(patient_data, medi)
         if is_valid:

{medicafe-0.250812.5 → medicafe-0.250812.6}/MediLink/MediLink_837p_encoder_library.py

@@ -980,6 +980,43 @@ def create_clm_and_related_segments(parsed_data, config, crosswalk):
     # - create_2330B_prior_payer_segments() for Medicare prior payer
     # - create_2430_service_line_cob_segments() for service-level adjudication
     # - create_2330C_other_subscriber_name_segments() when patient != subscriber
+    #
+    # Minimal, safe integration (guarded by feature flag):
+    if COB is not None:
+        cob_enabled = False
+        try:
+            # Read feature flag from configuration (expects medi['cob_settings']['enabled'])
+            from MediCafe.core_utils import extract_medilink_config
+            medi_cfg = extract_medilink_config(config)
+            cob_enabled = bool(medi_cfg.get('cob_settings', {}).get('enabled', False))
+        except Exception:
+            cob_enabled = False
+        
+        # Only add COB loops when explicitly enabled and claim is secondary
+        # TODO (COB VALIDATION): When COB is enabled and claim is secondary, validate required fields:
+        # - prior_payer_id/prior_payer_name present
+        # - primary_paid_amount present when sending AMT*D (or skip AMT if not available)
+        # - cas_adjustments schema if provided (list of {group, reason, amount})
+        # If critical fields are missing, log and proceed with best-effort unless config enforces strict mode.
+        if cob_enabled and validated_data.get('claim_type') == 'secondary':
+            try:
+                # 2320 - Other Subscriber Information (OI, AMT, CAS, etc.)
+                segments.extend(COB.create_2320_other_subscriber_segments(validated_data, config, crosswalk))
+            except Exception as _e1:
+                try:
+                    MediLink_ConfigLoader.log("COB 2320 insertion failed: {}".format(str(_e1)), config, level="WARNING")
+                except Exception:
+                    pass
+            
+            try:
+                # 2330B - Prior Payer (Medicare prior payer info, e.g., 00850)
+                segments.extend(COB.create_2330B_prior_payer_segments(validated_data, config, crosswalk))
+            except Exception as _e2:
+                try:
+                    MediLink_ConfigLoader.log("COB 2330B insertion failed: {}".format(str(_e2)), config, level="WARNING")
+                except Exception:
+                    pass
+    
     # TODO (COB ENHANCEMENT): Optional attachment references (PWK) for non-electronic EOB handling
     # See MediLink_837p_cob_library.create_pwk_attachment_segment() for implementation
     # Example: PWK*EB*FX*123456~ for attachment control number
@@ -1002,6 +1039,7 @@ def create_clm_and_related_segments(parsed_data, config, crosswalk):
     segments.append("DTP*472*D8*{}~".format(convert_date_format(validated_data['DATE'])))
     
     # Is there REF - Line Item Control Number missing here? Private insurance doesn't need it, but Medicare does?
+    # TODO (MEDICARE REF): Add conditional REF*6R (line item control number) when payer is Medicare or when crosswalk/config requires it.
     # segments.append("REF*6R*1~") # REF01, Reference Identification Qualifier; REF02, Line Item Control Number.
     # 6R - Provider Control Number (Number assigned by information provider company for tracking and billing purposes)
     # 1 - Reference information as defined for a particular Transaction Set or as specified by the Reference Identification Qualifier

{medicafe-0.250812.5 → medicafe-0.250812.6}/MediLink/MediLink_UI.py

@@ -201,6 +201,8 @@ def select_and_adjust_files(detailed_patient_data, config, crosswalk):
                 )
                 if updated_crosswalk:
                     crosswalk = updated_crosswalk
+                # TODO (MEDICARE ROUTING): If original primary was Medicare and crossover failed, prompt to create secondary claim
+                # and set claim_type='secondary' with prior_payer fields for the selected patient.
             else:
                 print("Invalid selection. Keeping the current endpoint.")
                 data['confirmed_endpoint'] = current_effective_endpoint

{medicafe-0.250812.5/medicafe.egg-info → medicafe-0.250812.6}/PKG-INFO

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

{medicafe-0.250812.5 → medicafe-0.250812.6/medicafe.egg-info}/PKG-INFO

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

{medicafe-0.250812.5 → medicafe-0.250812.6}/setup.py

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