medicafe 0.250813.2__tar.gz → 0.250814.3__tar.gz

medicafe-0.250814.3/MANIFEST.in

@@ -0,0 +1,24 @@
+include MediBot/MediBot.bat
+include MediLink/openssl.cnf
+include MediLink/*.html
+include MediCafe/*.py
+
+# Exclude CSV files and other data files that slow down the build
+exclude *.csv
+exclude *.log
+exclude *.tmp
+exclude *.bak
+exclude __pycache__/*
+exclude *.pyc
+exclude *.pyo
+exclude .git/*
+exclude .gitignore
+exclude .DS_Store
+exclude Thumbs.db
+exclude archive/*
+exclude ERA_TEST_DUMP/*
+exclude input/*
+exclude tmpdl/*
+exclude json/*
+exclude docs/reports/*
+exclude Installers/*

{medicafe-0.250813.2 → medicafe-0.250814.3}/MediBot/MediBot.bat

@@ -772,7 +772,7 @@ if "!internet_available!"=="0" (
     pause >nul
     goto troubleshooting_menu
 )
-set "rollback_version=0.250529.2"
+set "rollback_version=0.250813.1"
 echo Forcing reinstall of %medicafe_package%==%rollback_version% with no dependencies...
 python -m pip install --no-deps --force-reinstall %medicafe_package%==%rollback_version%
 if errorlevel 1 (

{medicafe-0.250813.2 → medicafe-0.250814.3}/MediBot/MediBot.py

@@ -633,7 +633,7 @@ if __name__ == "__main__":
                 # Display existing patients table using the enhanced display function
                 MediBot_UI.display_enhanced_patient_table(
                     patient_info, 
-                    "NOTE: The following patient(s) already EXIST in the system but have new dates of service.\n      Their diagnosis codes will need to be updated manually by the user to the following list:",
+                    "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:",
                     show_line_numbers=False
                 )
 

{medicafe-0.250813.2 → medicafe-0.250814.3}/MediBot/MediBot_Preprocessor_lib.py

@@ -547,7 +547,18 @@ def sort_and_deduplicate(csv_data):
 
     # Store the surgery dates information in the first row of each patient for later access
     for patient_id, row in unique_patients.items():
-        row['_all_surgery_dates'] = sorted(patient_surgery_dates[patient_id])
+        # Convert surgery dates to strings for consistent storage
+        surgery_date_strings = []
+        for date in patient_surgery_dates[patient_id]:
+            if isinstance(date, datetime):
+                if date == datetime.min:
+                    surgery_date_strings.append('MISSING')
+                else:
+                    surgery_date_strings.append(date.strftime('%m-%d-%Y'))
+            else:
+                surgery_date_strings.append(str(date) if date else 'MISSING')
+        
+        row['_all_surgery_dates'] = sorted(surgery_date_strings)
         row['_primary_surgery_date'] = row['Surgery Date']  # Keep track of which date has the demographics
 
     # Convert the unique_patients dictionary back to a list and sort it
@@ -565,7 +576,7 @@ def combine_fields(csv_data):
                 if surgery_date == datetime.min:
                     row['Surgery Date'] = 'MISSING'
                 else:
-                    row['Surgery Date'] = surgery_date.strftime('%m/%d/%Y')
+                    row['Surgery Date'] = surgery_date.strftime('%m-%d-%Y')
             elif surgery_date:
                 # Already a non-empty string
                 row['Surgery Date'] = str(surgery_date)
@@ -1162,17 +1173,22 @@ def update_diagnosis_codes(csv_data):
                                 diagnosis_code, medisoft_shorthand), level="WARNING")
                         MediLink_ConfigLoader.log("Converted diagnosis code to Medisoft shorthand: {}".format(medisoft_shorthand), level="DEBUG")
                         
-                        surgery_date_to_diagnosis[surgery_date] = medisoft_shorthand
+                        surgery_date_to_diagnosis[surgery_date_str] = medisoft_shorthand
                     else:
                         MediLink_ConfigLoader.log("No matching surgery date found for Patient ID: {} on date {}.".format(patient_id, surgery_date_str), level="INFO")
-                        surgery_date_to_diagnosis[surgery_date] = 'N/A'
+                        surgery_date_to_diagnosis[surgery_date_str] = 'N/A'
                 
                 # Store the diagnosis mapping for all surgery dates
                 row['_surgery_date_to_diagnosis'] = surgery_date_to_diagnosis
                 
                 # Set the primary diagnosis code (for the main surgery date)
                 primary_surgery_date = row.get('Surgery Date')
-                primary_diagnosis = surgery_date_to_diagnosis.get(primary_surgery_date, 'N/A')
+                # Convert primary surgery date to string for lookup
+                if isinstance(primary_surgery_date, datetime):
+                    primary_surgery_date_str = primary_surgery_date.strftime('%m-%d-%Y')
+                else:
+                    primary_surgery_date_str = str(primary_surgery_date)
+                primary_diagnosis = surgery_date_to_diagnosis.get(primary_surgery_date_str, 'N/A')
                 row['Default Diagnosis #1'] = primary_diagnosis
                 
                 updated_count += 1

{medicafe-0.250813.2 → medicafe-0.250814.3}/MediBot/MediBot_UI.py

@@ -2,6 +2,7 @@
 import ctypes, time, re
 from ctypes import wintypes
 from sys import exit
+from datetime import datetime
 
 # Set up paths using core utilities
 
@@ -62,7 +63,18 @@ def display_enhanced_patient_table(patient_info, title, show_line_numbers=True):
     for surgery_date, patient_name, patient_id, diagnosis_code, patient_row in patient_info:
         # Format surgery_date safely whether it's a datetime/date or a string
         try:
-            formatted_date = surgery_date.strftime('%m-%d')
+            if isinstance(surgery_date, datetime):
+                formatted_date = surgery_date.strftime('%m-%d')
+            else:
+                # Handle string dates - this should be the Surgery Date Display field
+                formatted_date = str(surgery_date)
+                # If it's a date string like "12-25-2023", format it as "12-25"
+                if '-' in formatted_date and len(formatted_date.split('-')) == 3:
+                    try:
+                        parts = formatted_date.split('-')
+                        formatted_date = "{}-{}".format(parts[0], parts[1])
+                    except:
+                        pass  # Use original string if parsing fails
         except Exception:
             formatted_date = str(surgery_date)
         

{medicafe-0.250813.2 → medicafe-0.250814.3}/MediBot/__init__.py

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

{medicafe-0.250813.2 → medicafe-0.250814.3}/MediBot/update_medicafe.py

@@ -1,4 +1,5 @@
 #update_medicafe.py
+# Version: 1.0.0
 import subprocess, sys, time, platform, os, shutil, random
 
 # Safe import for pkg_resources with fallback
@@ -305,6 +306,7 @@ def upgrade_package(package, retries=4, delay=2, target_version=None):  # Update
     def get_installed_version_fresh(package):
         """Get installed version using a fresh subprocess to avoid pkg_resources cache issues."""
         try:
+            # First try pip show
             process = subprocess.Popen(
                 [sys.executable, '-m', 'pip', 'show', package],
                 stdout=subprocess.PIPE,
@@ -315,6 +317,21 @@ def upgrade_package(package, retries=4, delay=2, target_version=None):  # Update
                 for line in stdout.decode().splitlines():
                     if line.startswith("Version:"):
                         return line.split(":", 1)[1].strip()
+            
+            # If pip show fails, try pkg_resources in a fresh subprocess
+            try:
+                import subprocess
+                process = subprocess.Popen(
+                    [sys.executable, '-c', 'import pkg_resources; print(pkg_resources.get_distribution("{}").version)'.format(package)],
+                    stdout=subprocess.PIPE,
+                    stderr=subprocess.PIPE
+                )
+                stdout, stderr = process.communicate()
+                if process.returncode == 0:
+                    return stdout.decode().strip()
+            except Exception:
+                pass
+                
             return None
         except Exception as e:
             print("Warning: Could not get fresh version: {}".format(e))
@@ -335,17 +352,40 @@ def upgrade_package(package, retries=4, delay=2, target_version=None):  # Update
         
         if process.returncode == 0:
             print(stdout.decode().strip())
-            # Add delay to allow file system to settle
-            time.sleep(1)
-            new_version = get_installed_version_fresh(package)
+            # Add longer delay to allow file system and package metadata to settle
+            print("Waiting for package metadata to update...")
+            time.sleep(3)
+            
+            # Try multiple times to get the new version with increasing delays
+            new_version = None
+            for retry in range(3):
+                # Clear pkg_resources cache before each attempt
+                if pkg_resources:
+                    try:
+                        pkg_resources.working_set = pkg_resources.WorkingSet()
+                    except Exception:
+                        pass
+                
+                new_version = get_installed_version_fresh(package)
+                if new_version:
+                    print("Detected new version: {}".format(new_version))
+                    break
+                print("Version detection attempt {} failed, retrying...".format(retry + 1))
+                time.sleep(2)
+            
             expected_version = target_version or get_latest_version(package)
             
             if expected_version and new_version and compare_versions(new_version, expected_version) >= 0:
                 print_status("Attempt {}: Upgrade succeeded with {}!".format(attempt, strategy_name), "SUCCESS")
                 return True
+            elif new_version:
+                print_status("Upgrade may have succeeded but version mismatch. Current: {} Expected: {}".format(
+                    new_version, expected_version), "WARNING")
+                # If we got a new version but it doesn't match expected, still consider it a success
+                # as the package was updated
+                return True
             else:
-                print_status("Upgrade incomplete. Current version: {} Expected at least: {}".format(
-                    new_version or "unknown", expected_version), "WARNING")
+                print_status("Upgrade incomplete. Could not detect new version.", "WARNING")
                 return False
         else:
             print(stderr.decode().strip())
@@ -604,10 +644,19 @@ def main():
         if upgrade_package(package, target_version=latest_version):
             # STEP 8: Verify upgrade
             debug_step(8, "Upgrade Verification")
+            
+            # Clear cache and wait for package metadata to settle
+            if pkg_resources:
+                try:
+                    pkg_resources.working_set = pkg_resources.WorkingSet()
+                except Exception:
+                    pass
+            
+            time.sleep(2)
             new_version = get_installed_version(package)
             print("New installed version: {}".format(new_version))
 
-            if compare_versions(new_version, latest_version) >= 0:
+            if new_version and compare_versions(new_version, latest_version) >= 0:
                 print_status("Upgrade successful. New version: {}".format(new_version), "SUCCESS")
 
                 # DEBUG STEP 9: Clear cache
@@ -619,8 +668,21 @@ def main():
                     print_status("Cache clearing failed, but update was successful.", "WARNING")
 
                 print_final_result(True, "Successfully upgraded to version {}".format(new_version))
+            elif new_version:
+                print_status("Upgrade completed but version verification unclear. New version: {}".format(new_version), "WARNING")
+                print_status("The package was updated, but version comparison failed. This may be due to caching issues.", "WARNING")
+                
+                # Still clear cache and exit successfully
+                debug_step(9, "Cache Clearing")
+                print_status("Clearing Python cache to prevent import issues...", "INFO")
+                if clear_python_cache():
+                    print_status("Cache cleared successfully. Update complete.", "SUCCESS")
+                else:
+                    print_status("Cache clearing failed, but update was successful.", "WARNING")
+
+                print_final_result(True, "Package updated (version verification unclear)")
             else:
-                print_status("Upgrade failed. Current version remains: {}".format(new_version), "ERROR")
+                print_status("Upgrade verification failed. Could not detect new version.", "ERROR")
                 print_final_result(False, "Upgrade verification failed")
         else:
             print_final_result(False, "Upgrade process failed")

{medicafe-0.250813.2 → medicafe-0.250814.3}/MediCafe/__init__.py

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

{medicafe-0.250813.2 → medicafe-0.250814.3}/MediLink/__init__.py

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

{medicafe-0.250813.2/medicafe.egg-info → medicafe-0.250814.3}/PKG-INFO

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

{medicafe-0.250813.2 → medicafe-0.250814.3/medicafe.egg-info}/PKG-INFO

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

{medicafe-0.250813.2 → medicafe-0.250814.3}/setup.py

@@ -54,7 +54,7 @@ if long_description_text is None:
 
 setup(
     name='medicafe',
-    version="0.250813.2",
+    version="0.250814.3",
     description='MediCafe',
     long_description=long_description_text,
     long_description_content_type='text/markdown',
@@ -74,7 +74,7 @@ setup(
         'Operating System :: OS Independent',
     ],
     packages=find_packages(include=['MediCafe', 'MediCafe.*', 'MediBot', 'MediBot.*', 'MediLink', 'MediLink.*']),
-    include_package_data=True,
+    include_package_data=False,  # Disable automatic inclusion to prevent CSV files from being included
     package_data={
         'MediBot': ['MediBot.bat'],
         'MediLink': ['openssl.cnf', '*.html']

medicafe-0.250813.2/MANIFEST.in

@@ -1,4 +0,0 @@
-include MediBot/MediBot.bat
-include MediLink/openssl.cnf
-include MediLink/*.html
-include MediCafe/*.py