rgwfuncs 0.0.82__py3-none-any.whl → 0.0.84__py3-none-any.whl

rgwfuncs/interactive_shell_lib.py

@@ -19,20 +19,19 @@ RESET = "\033[0m"
 class BlueStdout:
     """
     A wrapper for sys.stdout that automatically prepends blue
-    color codes on output, unless the output appears to be a prompt.
+    color codes on output.
     """
     def __init__(self, wrapped):
         self.wrapped = wrapped
         self.at_line_start = True
 
     def write(self, s):
-        # If the written text exactly matches one of our prompt strings,
-        # assume it should be displayed as-is.
+        # Do not interfere with prompt strings.
         if s == sys.ps1 or s == sys.ps2:
             self.wrapped.write(s)
             return
 
-        # Process text, coloring new lines with blue.
+        # Process text line by line so that new lines are colored.
         lines = s.split('\n')
         for i, line in enumerate(lines):
             if self.at_line_start and line:
@@ -44,17 +43,35 @@ class BlueStdout:
                 self.at_line_start = True
             else:
                 self.at_line_start = (line == "")
-    
+
     def flush(self):
         self.wrapped.flush()
 
     def isatty(self):
         return self.wrapped.isatty()
 
+    def fileno(self):
+        return self.wrapped.fileno()
+
     def __getattr__(self, attr):
-        # Delegate attribute access to the wrapped object.
+        # Delegate attribute access to the original stdout.
         return getattr(self.wrapped, attr)
 
+class ColorInteractiveConsole(code.InteractiveConsole):
+    """Subclass InteractiveConsole to temporarily restore the real stdout when reading input."""
+    def raw_input(self, prompt=""):
+        # Before calling input(), restore the original stdout so that readline works properly.
+        saved_stdout = sys.stdout
+        sys.stdout = sys.__stdout__
+        try:
+            line = input(prompt)
+        except EOFError:
+            raise
+        finally:
+            # Restore our blue-printing stdout.
+            sys.stdout = saved_stdout
+        return line
+
 def interactive_shell(local_vars: Dict[str, Any]) -> None:
     """
     Launches an interactive prompt for inspecting and modifying local variables,
@@ -79,23 +96,22 @@ def interactive_shell(local_vars: Dict[str, Any]) -> None:
     if not isinstance(local_vars, dict):
         raise TypeError("local_vars must be a dictionary")
 
-    # Set up readline history and completion.
+    # Set up readline.
     setup_readline()
 
     # Make imported functions available in the REPL.
     local_vars.update(globals())
 
-    # Set up custom prompts (displayed in white).
-    sys.ps1 = WHITE + ">>> " + RESET
-    sys.ps2 = WHITE + "... " + RESET
+    # Note: Wrap ANSI codes in markers that readline understands so that they don’t count in prompt length.
+    sys.ps1 = "\001" + WHITE + "\002" + ">>> " + "\001" + RESET + "\002"
+    sys.ps2 = "\001" + WHITE + "\002" + "... " + "\001" + RESET + "\002"
 
-    # Wrap sys.stdout to emit blue-colored output.
-    sys.stdout = BlueStdout(sys.stdout)
+    # Wrap sys.stdout for colored output.
+    sys.stdout = BlueStdout(sys.__stdout__)  # Wrap the original stdout.
 
-    # Create an interactive console with the provided locals.
-    console = code.InteractiveConsole(locals=local_vars)
+    # Use our custom interactive console.
+    console = ColorInteractiveConsole(locals=local_vars)
 
-    # Custom banner and exit message.
     banner = ("Welcome to the rgwfuncs interactive shell.\n"
               "Use up/down arrows for command history.\n"
               "Type 'exit()' or Ctrl+D to quit.")

{rgwfuncs-0.0.82.dist-info → rgwfuncs-0.0.84.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: rgwfuncs
-Version: 0.0.82
+Version: 0.0.84
 Summary: A functional programming paradigm for mathematical modelling and data science
 Home-page: https://github.com/ryangerardwilson/rgwfunc
 Author: Ryan Gerard Wilson

{rgwfuncs-0.0.82.dist-info → rgwfuncs-0.0.84.dist-info}/RECORD

@@ -2,11 +2,11 @@ rgwfuncs/__init__.py,sha256=LSn54Tlyskcb6Wab_wUpPLB6UGMe5LdrB3GU88mDEbU,1712
 rgwfuncs/algebra_lib.py,sha256=rKFITfpWfgdBswnbMUuS41XgndEt-jUVz2ObO_ik7eM,42234
 rgwfuncs/df_lib.py,sha256=r6T-MwyDq9NAPW1Xf6NzSy7ZFicIKdemR-UKu6TZt5g,71111
 rgwfuncs/docs_lib.py,sha256=y3wSAOPO3qsA4HZ7xAtW8HimM8w-c8hjcEzMRLJ96ao,1960
-rgwfuncs/interactive_shell_lib.py,sha256=fbZJvN2HmRxNCW-8nfmpLBhVkgJ-TMtrrczKwLIUykI,3492
+rgwfuncs/interactive_shell_lib.py,sha256=fbm9FSGmyT0d2K-5DUmuPMbJxrBLzJvZq9UimS5fhck,4090
 rgwfuncs/str_lib.py,sha256=rtAdRlnSJIu3JhI-tA_A0wCiPK2m-zn5RoGpBxv_g-4,2228
-rgwfuncs-0.0.82.dist-info/LICENSE,sha256=jLvt20gcUZYB8UOvyBvyKQ1qhYYhD__qP7ZDx2lPFkU,1062
-rgwfuncs-0.0.82.dist-info/METADATA,sha256=miNL402pXn_kxoj-XvU1CaVyygcpQnvjcEQ5RiguoG8,60288
-rgwfuncs-0.0.82.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-rgwfuncs-0.0.82.dist-info/entry_points.txt,sha256=j-c5IOPIQ0252EaOV6j6STio56sbXl2C4ym_fQ0lXx0,43
-rgwfuncs-0.0.82.dist-info/top_level.txt,sha256=aGuVIzWsKiV1f2gCb6mynx0zx5ma0B1EwPGFKVEMTi4,9
-rgwfuncs-0.0.82.dist-info/RECORD,,
+rgwfuncs-0.0.84.dist-info/LICENSE,sha256=jLvt20gcUZYB8UOvyBvyKQ1qhYYhD__qP7ZDx2lPFkU,1062
+rgwfuncs-0.0.84.dist-info/METADATA,sha256=BGBOO2F9AXPg4l5_3fRD40q_zDg5i0sKJxr7dZ4RKts,60288
+rgwfuncs-0.0.84.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+rgwfuncs-0.0.84.dist-info/entry_points.txt,sha256=j-c5IOPIQ0252EaOV6j6STio56sbXl2C4ym_fQ0lXx0,43
+rgwfuncs-0.0.84.dist-info/top_level.txt,sha256=aGuVIzWsKiV1f2gCb6mynx0zx5ma0B1EwPGFKVEMTi4,9
+rgwfuncs-0.0.84.dist-info/RECORD,,