medicafe 0.250725.4__tar.gz → 0.250725.6__tar.gz

{medicafe-0.250725.4 → medicafe-0.250725.6}/MediBot/MediBot.py

@@ -33,25 +33,14 @@ def flush_console_input_buffer():
 
 def discard_leading_blank():
     """
-    Alternative fallback that reads from stdin and discards leading newlines,
-    then puts back the first non-newline character for the real input() call.
+    Alternative fallback that uses non-blocking msvcrt to drain any available input.
     """
     if sys.platform != "win32":
         return                      # no-op on non-Windows
         
-    try:
-        while True:
-            ch = sys.stdin.read(1)
-            if ch not in ('\r', '\n'):
-                # put it back for the real input() call
-                msvcrt.ungetch(ch.encode())
-                break
-            elif not ch:  # EOF
-                break
-    except Exception:
-        # If stdin.read fails, fall back to msvcrt approach
-        while msvcrt.kbhit():
-            msvcrt.getch()
+    # Use non-blocking msvcrt approach to drain any available input
+    while msvcrt.kbhit():
+        msvcrt.getch()
 
 try:
     from MediBot_Crosswalk_Library import crosswalk_update
@@ -443,10 +432,9 @@ if __name__ == "__main__":
                 
                 # Flush console input buffer to remove any stray CR/LF
                 flush_console_input_buffer()
-                discard_leading_blank()
                 
-                # Use sys.stdin.readline() for more reliable input on Windows XP
-                proceed = sys.stdin.readline().lower().strip() in ['yes', 'y']
+                # Use input() for more reliable input on Windows XP
+                proceed = input().lower().strip() in ['yes', 'y']
             else:
                 print("\nDo you want to proceed with the {} remaining patient(s)? (yes/no): ".format(len(patients_to_process)), end='', flush=True)
                 # Force flush and wait for Windows XP console buffer synchronization
@@ -455,10 +443,9 @@ if __name__ == "__main__":
                 
                 # Flush console input buffer to remove any stray CR/LF
                 flush_console_input_buffer()
-                discard_leading_blank()
                 
-                # Use sys.stdin.readline() for more reliable input on Windows XP
-                proceed = sys.stdin.readline().lower().strip() in ['yes', 'y']
+                # Use input() for more reliable input on Windows XP
+                proceed = input().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: 

{medicafe-0.250725.4 → medicafe-0.250725.6}/MediBot/MediBot_UI.py

@@ -39,25 +39,14 @@ def flush_console_input_buffer():
 
 def discard_leading_blank():
     """
-    Alternative fallback that reads from stdin and discards leading newlines,
-    then puts back the first non-newline character for the real input() call.
+    Alternative fallback that uses non-blocking msvcrt to drain any available input.
     """
     if sys.platform != "win32":
         return                      # no-op on non-Windows
         
-    try:
-        while True:
-            ch = sys.stdin.read(1)
-            if ch not in ('\r', '\n'):
-                # put it back for the real input() call
-                msvcrt.ungetch(ch.encode())
-                break
-            elif not ch:  # EOF
-                break
-    except Exception:
-        # If stdin.read fails, fall back to msvcrt approach
-        while msvcrt.kbhit():
-            msvcrt.getch()
+    # Use non-blocking msvcrt approach to drain any available input
+    while msvcrt.kbhit():
+        msvcrt.getch()
 
 class AppControl:
     def __init__(self):
@@ -195,10 +184,9 @@ def display_patient_selection_menu(csv_data, reverse_mapping, proceed_as_medicar
     
     # Flush console input buffer to remove any stray CR/LF
     flush_console_input_buffer()
-    discard_leading_blank()
     
-    # Use sys.stdin.readline() for more reliable input on Windows XP
-    proceed = sys.stdin.readline().lower().strip() in ['yes', 'y']
+    # Use input() for more reliable input on Windows XP
+    proceed = input().lower().strip() in ['yes', 'y']
 
     if not proceed:
         display_menu_header("Patient Selection for Today's Data Entry")
@@ -214,10 +202,9 @@ def display_patient_selection_menu(csv_data, reverse_mapping, proceed_as_medicar
                 
                 # Flush console input buffer to remove any stray CR/LF
                 flush_console_input_buffer()
-                discard_leading_blank()
                 
-                # Use sys.stdin.readline() for more reliable input on Windows XP
-                selection = sys.stdin.readline().strip()
+                # Use input() for more reliable input on Windows XP
+                selection = input().strip()
                 if not selection:
                     print("Invalid entry. Please provide at least one number.")
                     continue
@@ -298,10 +285,9 @@ def handle_user_interaction(interaction_mode, error_message):
         
         # Flush console input buffer to remove any stray CR/LF
         flush_console_input_buffer()
-        discard_leading_blank()
         
-        # Use sys.stdin.readline() for more reliable input on Windows XP
-        choice = sys.stdin.readline().strip()
+        # Use input() for more reliable input on Windows XP
+        choice = input().strip()
         
         if choice == '1':
             print("Selected: 'Retry last entry'. Please press 'F12' to continue.")
@@ -333,7 +319,6 @@ def user_interaction(csv_data, interaction_mode, error_message, reverse_mapping)
         
         # Flush console input buffer to remove any stray CR/LF from script launch
         flush_console_input_buffer()
-        discard_leading_blank()
 
         while True:
             try:
@@ -343,8 +328,11 @@ def user_interaction(csv_data, interaction_mode, error_message, reverse_mapping)
                 sys.stdout.flush()
                 time.sleep(0.2)  # Increased delay for Windows XP
                 
-                # Use sys.stdin.readline() for more reliable input on Windows XP
-                response = sys.stdin.readline().lower().strip()
+                # Use input() for more reliable input on Windows XP
+                response = input().lower().strip()
+                
+                # Debug: Print what we actually got
+                print("DEBUG: Got response: '{}' (length: {})".format(response, len(response)))
                 
                 if response:
                     if response in ['yes', 'y']:

{medicafe-0.250725.4 → medicafe-0.250725.6}/PKG-INFO

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

{medicafe-0.250725.4 → medicafe-0.250725.6}/medicafe.egg-info/PKG-INFO

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

{medicafe-0.250725.4 → medicafe-0.250725.6}/setup.py

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