medicafe 0.250725.9__tar.gz → 0.250725.10__tar.gz

{medicafe-0.250725.9 → medicafe-0.250725.10}/MediBot/MediBot.py

@@ -1,5 +1,5 @@
 #MediBot.py
-import subprocess, os, tempfile, traceback, re, sys, time, msvcrt, ctypes
+import subprocess, os, tempfile, traceback, re, sys, time
 from collections import OrderedDict
 import MediBot_dataformat_library
 import MediBot_Preprocessor
@@ -12,35 +12,7 @@ sys.path.append(project_dir)
 
 from MediLink import MediLink_ConfigLoader
 
-def flush_console_input_buffer():
-    """
-    Remove any keystrokes already sitting in the console input buffer.
-    Necessary on Windows XP where a stray CR/LF can remain after the
-    script is launched.
-    """
-    if sys.platform != "win32":
-        return                      # no-op on non-Windows
 
-    try:
-        kernel32 = ctypes.WinDLL('kernel32', use_last_error=True)
-        STD_INPUT_HANDLE = -10
-        h_stdin = kernel32.GetStdHandle(STD_INPUT_HANDLE)
-        kernel32.FlushConsoleInputBuffer(h_stdin)
-    except Exception:
-        # Fallback: drain any leading newlines manually
-        while msvcrt.kbhit():
-            msvcrt.getch()
-
-def discard_leading_blank():
-    """
-    Alternative fallback that uses non-blocking msvcrt to drain any available input.
-    """
-    if sys.platform != "win32":
-        return                      # no-op on non-Windows
-        
-    # Use non-blocking msvcrt approach to drain any available input
-    while msvcrt.kbhit():
-        msvcrt.getch()
 
 try:
     from MediBot_Crosswalk_Library import crosswalk_update
@@ -430,9 +402,6 @@ if __name__ == "__main__":
                 sys.stdout.flush()
                 time.sleep(0.2)  # Increased delay for Windows XP
                 
-                # Flush console input buffer to remove any stray CR/LF
-                flush_console_input_buffer()
-                
                 # Use input() for more reliable input on Windows XP
                 proceed = input().lower().strip() in ['yes', 'y']
             else:
@@ -441,9 +410,6 @@ if __name__ == "__main__":
                 sys.stdout.flush()
                 time.sleep(0.2)  # Increased delay for Windows XP
                 
-                # Flush console input buffer to remove any stray CR/LF
-                flush_console_input_buffer()
-                
                 # Use input() for more reliable input on Windows XP
                 proceed = input().lower().strip() in ['yes', 'y']
 

{medicafe-0.250725.9 → medicafe-0.250725.10}/MediBot/MediBot_UI.py

@@ -18,88 +18,26 @@ config, crosswalk = MediLink_ConfigLoader.load_configuration()
 VK_END = int(config.get('VK_END', ""), 16) # Try F12 (7B). Virtual key code for 'End' (23)
 VK_PAUSE = int(config.get('VK_PAUSE', ""), 16) # Try F11 (7A). Virtual-key code for 'Home' (24)
 
-def flush_console_input_buffer():
-    """
-    Remove any keystrokes already sitting in the console input buffer.
-    Necessary on Windows XP where a stray CR/LF can remain after the
-    script is launched.
-    """
-    if sys.platform != "win32":
-        return                      # no-op on non-Windows
 
-    print("DEBUG_FLUSH: Starting flush_console_input_buffer()")
-    
-    # Check what's in the buffer before flushing
-    chars_in_buffer = []
-    while msvcrt.kbhit():
-        ch = msvcrt.getch()
-        chars_in_buffer.append(ch)
-    
-    if chars_in_buffer:
-        print("DEBUG_FLUSH: Found {} chars in buffer before flush: {}".format(len(chars_in_buffer), chars_in_buffer))
-    else:
-        print("DEBUG_FLUSH: No chars found in buffer before flush")
-
-    try:
-        kernel32 = ctypes.WinDLL('kernel32', use_last_error=True)
-        STD_INPUT_HANDLE = -10
-        h_stdin = kernel32.GetStdHandle(STD_INPUT_HANDLE)
-        result = kernel32.FlushConsoleInputBuffer(h_stdin)
-        print("DEBUG_FLUSH: FlushConsoleInputBuffer API call result: {}".format(result))
-    except Exception as e:
-        print("DEBUG_FLUSH: FlushConsoleInputBuffer API failed: {}".format(e))
-        # Fallback: drain any leading newlines manually
-        fallback_chars = []
-        while msvcrt.kbhit():
-            ch = msvcrt.getch()
-            fallback_chars.append(ch)
-        if fallback_chars:
-            print("DEBUG_FLUSH: Fallback removed {} chars: {}".format(len(fallback_chars), fallback_chars))
-        else:
-            print("DEBUG_FLUSH: Fallback found no chars to remove")
-    
-    print("DEBUG_FLUSH: flush_console_input_buffer() completed")
 
 def robust_input(prompt="", max_retries=3):
     """
-    Robust input function that handles Windows XP console timing issues.
-    Automatically retries if the first input returns empty.
+    Simple input function with retry logic for Windows XP console issues.
     """
-    print("DEBUG_ROBUST: Starting robust_input with prompt: '{}'".format(prompt))
-    
     for attempt in range(max_retries):
         if attempt > 0:
-            print("DEBUG_ROBUST: Retry attempt {} for input".format(attempt + 1))
-            flush_console_input_buffer()
-        
-        # Print prompt only on first attempt, or if it's a retry
-        if attempt == 0:
-            print("DEBUG_ROBUST: First attempt - calling input(prompt)")
-            response = input(prompt).strip()
-        else:
-            print("DEBUG_ROBUST: Retry attempt - calling input() without prompt")
-            response = input().strip()
+            # Clear any leftover input on retry
+            while msvcrt.kbhit():
+                msvcrt.getch()
         
-        print("DEBUG_ROBUST: Attempt {} got: '{}' (length: {})".format(attempt + 1, response, len(response)))
+        response = input(prompt if attempt == 0 else "").strip()
         
         if response:
-            print("DEBUG_ROBUST: Success! Returning: '{}'".format(response))
             return response
     
-    # If all attempts failed, return empty string
-    print("DEBUG_ROBUST: All {} attempts failed, returning empty string".format(max_retries))
     return ""
 
-def discard_leading_blank():
-    """
-    Alternative fallback that uses non-blocking msvcrt to drain any available input.
-    """
-    if sys.platform != "win32":
-        return                      # no-op on non-Windows
-        
-    # Use non-blocking msvcrt approach to drain any available input
-    while msvcrt.kbhit():
-        msvcrt.getch()
+
 
 class AppControl:
     def __init__(self):
@@ -235,9 +173,6 @@ def display_patient_selection_menu(csv_data, reverse_mapping, proceed_as_medicar
     sys.stdout.flush()
     time.sleep(0.2)  # Increased delay for Windows XP
     
-    # Flush console input buffer to remove any stray CR/LF
-    flush_console_input_buffer()
-    
     # Use input() for more reliable input on Windows XP
     proceed = input().lower().strip() in ['yes', 'y']
 
@@ -253,9 +188,6 @@ def display_patient_selection_menu(csv_data, reverse_mapping, proceed_as_medicar
                 sys.stdout.flush()
                 time.sleep(0.2)  # Increased delay for Windows XP
                 
-                # Flush console input buffer to remove any stray CR/LF
-                flush_console_input_buffer()
-                
                 # Use input() for more reliable input on Windows XP
                 selection = input().strip()
                 if not selection:
@@ -336,9 +268,6 @@ def handle_user_interaction(interaction_mode, error_message):
         sys.stdout.flush()
         time.sleep(0.2)  # Increased delay for Windows XP
         
-        # Flush console input buffer to remove any stray CR/LF
-        flush_console_input_buffer()
-        
         # Use input() for more reliable input on Windows XP
         choice = input().strip()
         
@@ -369,45 +298,23 @@ def user_interaction(csv_data, interaction_mode, error_message, reverse_mapping)
         
         # Force flush for Windows XP compatibility
         sys.stdout.flush()
-        
-        # Flush console input buffer to remove any stray CR/LF from script launch
-        flush_console_input_buffer()
 
         while True:
             try:
-                print("DEBUG_MAIN: About to call robust_input() - waiting for user...")
-                # Use robust_input() for more reliable input on Windows XP
                 response = robust_input("\nAm I processing Medicare patients? (yes/no): ").lower()
                 
-                print("DEBUG_MAIN: robust_input() returned, response = '{}'".format(response))
-                # Debug: Print what we actually got
-                print("DEBUG_MAIN: Final response: '{}' (length: {})".format(response, len(response)))
-                print("DEBUG_MAIN: Response type: {}, repr: {}".format(type(response), repr(response)))
-                print("DEBUG_MAIN: About to check response validity...")
-                
-                if response:
-                    print("DEBUG_MAIN: Response is not empty, checking if valid...")
-                    if response in ['yes', 'y']:
-                        print("DEBUG_MAIN: Valid response '{}', loading Medicare config".format(response))
-                        app_control.load_paths_from_config(medicare=True)
-                        break
-                    elif response in ['no', 'n']:
-                        print("DEBUG_MAIN: Valid response '{}', loading Private config".format(response))
-                        app_control.load_paths_from_config(medicare=False)
-                        break
-                    else:
-                        print("DEBUG_MAIN: Invalid response '{}', asking again".format(response))
-                        print("Invalid entry. Please enter 'yes' or 'no'.")
+                if response in ['yes', 'y']:
+                    app_control.load_paths_from_config(medicare=True)
+                    break
+                elif response in ['no', 'n']:
+                    app_control.load_paths_from_config(medicare=False)
+                    break
                 else:
-                    print("DEBUG_MAIN: Empty response, asking again")
-                    print("A response is required. Please try again.")
+                    print("Invalid entry. Please enter 'yes' or 'no'.")
             except KeyboardInterrupt:
                 print("\nOperation cancelled by user. Exiting script.")
                 exit()
-            except Exception as e:
-                print("DEBUG_MAIN: Exception occurred: {}".format(e))
-                import traceback
-                traceback.print_exc()
+
 
         fixed_values = config.get('fixed_values', {})  # Get fixed values from config json 
         if response in ['yes', 'y']:

{medicafe-0.250725.9 → medicafe-0.250725.10}/PKG-INFO

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

{medicafe-0.250725.9 → medicafe-0.250725.10}/medicafe.egg-info/PKG-INFO

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

{medicafe-0.250725.9 → medicafe-0.250725.10}/setup.py

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