rgwfuncs 0.0.70__py3-none-any.whl → 0.0.71__py3-none-any.whl

rgwfuncs/interactive_shell_lib.py

@@ -34,11 +34,11 @@ def interactive_shell(local_vars: Dict[str, Any], shell_color: str = '\033[37m')
         atexit.register(readline.write_history_file, HISTORY_FILE)
 
     def colorize_output(text: str, shell_color: str) -> str:
-        """Apply shell color to text only if it doesn’t already contain ANSI codes, preserving existing codes."""
-        # Check if the text contains any ANSI escape sequences
-        if '\033[' not in text and '\x1b[' not in text:
+        """Apply shell color only to text without ANSI codes, preserving existing codes."""
+        # Split text into segments around ANSI escape sequences
+        if '\x1b[' not in text and '\033[' not in text:
             return f"{shell_color}{text}\033[0m"
-        return text  # Return unchanged if it already has ANSI codes
+        return text  # Return unchanged if it contains ANSI codes
 
     if not isinstance(local_vars, dict):
         raise TypeError("local_vars must be a dictionary")
@@ -59,9 +59,9 @@ def interactive_shell(local_vars: Dict[str, Any], shell_color: str = '\033[37m')
     # Save original stdout write function
     original_write = sys.stdout.write
 
-    # Define a pure function to wrap stdout.write
+    # Define a custom write function that respects existing ANSI codes
     def colored_write(text: str) -> None:
-        # Pass text through colorize_output to handle coloring
+        # Write the text as-is if it contains ANSI codes, otherwise apply shell_color
         colored_text = colorize_output(text, shell_color)
         original_write(colored_text)
 
@@ -69,7 +69,9 @@ def interactive_shell(local_vars: Dict[str, Any], shell_color: str = '\033[37m')
     sys.stdout.write = colored_write
 
     # Start the interactive session
-    console.interact(banner=banner, exitmsg=exitmsg)
+    try:
+        console.interact(banner=banner, exitmsg=exitmsg)
+    finally:
+        # Ensure original stdout.write is restored even on exceptions
+        sys.stdout.write = original_write
 
-    # Restore original stdout.write after exiting
-    sys.stdout.write = original_write

{rgwfuncs-0.0.70.dist-info → rgwfuncs-0.0.71.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: rgwfuncs
-Version: 0.0.70
+Version: 0.0.71
 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.70.dist-info → rgwfuncs-0.0.71.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=HqYtC-x9J42661d7a-wEOUuEUy0fRZjU3fn-EO6cf7E,3191
+rgwfuncs/interactive_shell_lib.py,sha256=SsStlBx3vW6NE88m_reLCqhB7gVVi_fWilOkYKKxgEo,3259
 rgwfuncs/str_lib.py,sha256=rtAdRlnSJIu3JhI-tA_A0wCiPK2m-zn5RoGpBxv_g-4,2228
-rgwfuncs-0.0.70.dist-info/LICENSE,sha256=jLvt20gcUZYB8UOvyBvyKQ1qhYYhD__qP7ZDx2lPFkU,1062
-rgwfuncs-0.0.70.dist-info/METADATA,sha256=Ftf_xo3s8-m4kAzqxb2wTYOFMgnoXSlmSyKzXtJdVOg,60288
-rgwfuncs-0.0.70.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-rgwfuncs-0.0.70.dist-info/entry_points.txt,sha256=j-c5IOPIQ0252EaOV6j6STio56sbXl2C4ym_fQ0lXx0,43
-rgwfuncs-0.0.70.dist-info/top_level.txt,sha256=aGuVIzWsKiV1f2gCb6mynx0zx5ma0B1EwPGFKVEMTi4,9
-rgwfuncs-0.0.70.dist-info/RECORD,,
+rgwfuncs-0.0.71.dist-info/LICENSE,sha256=jLvt20gcUZYB8UOvyBvyKQ1qhYYhD__qP7ZDx2lPFkU,1062
+rgwfuncs-0.0.71.dist-info/METADATA,sha256=sVSS56mX9nGBL0lQVm6-RD0Zmo_aZqH1uBN6itkgfRc,60288
+rgwfuncs-0.0.71.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+rgwfuncs-0.0.71.dist-info/entry_points.txt,sha256=j-c5IOPIQ0252EaOV6j6STio56sbXl2C4ym_fQ0lXx0,43
+rgwfuncs-0.0.71.dist-info/top_level.txt,sha256=aGuVIzWsKiV1f2gCb6mynx0zx5ma0B1EwPGFKVEMTi4,9
+rgwfuncs-0.0.71.dist-info/RECORD,,