rgwfuncs 0.0.80__py3-none-any.whl → 0.0.81__py3-none-any.whl

rgwfuncs/interactive_shell_lib.py

@@ -1,46 +1,69 @@
-import os
-import atexit
+#!/usr/bin/env python3
 import code
-import readline  # Assuming this is imported elsewhere
+import readline
+import rlcompleter  # noqa: F401
 import sys
+import os
+import atexit
 from typing import Dict, Any
 from .df_lib import *  # noqa: F401, F403, E402
 from .algebra_lib import *  # noqa: F401, F403, E402
 from .str_lib import *  # noqa: F401, F403, E402
 from .docs_lib import *  # noqa: F401, F403, E402
 
-class CustomConsole(code.InteractiveConsole):
-    """Custom console to make user input white while keeping prompts and output blue."""
-    def raw_input(self, prompt=""):
-        sys.stdout.write("\033[94m" + prompt)  # Blue prompt
-        sys.stdout.write("\033[97m")  # White for input
-        sys.stdout.flush()
-        try:
-            line = input()  # User types in white
-        except EOFError:
-            raise
-        finally:
-            sys.stdout.write("\033[94m")  # Back to blue
-            sys.stdout.flush()
-        return line
-
-    def write(self, data):
-        sys.stdout.write("\033[94m" + data)  # Blue output
-        sys.stdout.flush()
-
-def interactive_shell(local_vars: Dict[str, Any], shell_color: str = '\033[94m') -> None:
+# ANSI color escape codes
+BLUE = "\033[34m"
+WHITE = "\033[37m"
+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.
     """
-    Launches an interactive prompt for inspecting and modifying local variables, making all methods
-    in the rgwfuncs library available by default. Persists command history across sessions.
-    User input is displayed in white; other text (prompt, banner, output) is blue.
+    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 (the prompt will be white).
+        if s == sys.ps1 or s == sys.ps2:
+            self.wrapped.write(s)
+            return
+
+        # Process the text line by line so that each new line gets the blue color.
+        # (We only want to color “output”, not the prompt.)
+        lines = s.split('\n')
+        for i, line in enumerate(lines):
+            # Only prepend blue if we are at a new line.
+            if self.at_line_start and line:
+                self.wrapped.write(BLUE + line)
+            else:
+                self.wrapped.write(line)
+            # If this is not the last line, then the newline was in the string.
+            if i < len(lines) - 1:
+                self.wrapped.write('\n' + RESET)  # reset after newline
+                self.at_line_start = True
+            else:
+                # If the last chunk is non-empty, we are in the middle of a line.
+                self.at_line_start = (line == "")
+        # Note: Do not flush automatically here.
+
+    def flush(self):
+        self.wrapped.flush()
+
+def interactive_shell(local_vars: Dict[str, Any]) -> None:
+    """
+    Launches an interactive prompt for inspecting and modifying local variables,
+    making all methods in the rgwfuncs library available by default.
+    Persists command history across sessions.
 
     Parameters:
         local_vars (dict): Dictionary of local variables to be available in the interactive shell.
-        shell_color (str): ANSI color code for shell output (default: blue '\033[94m').
     """
-
-    def setup_readline(shell_color: str = '\033[94m') -> None:
-        """Set up readline for history persistence with a given shell color."""
+    def setup_readline() -> None:
+        """Set up readline for history persistence."""
         HISTORY_FILE = os.path.expanduser("~/.rgwfuncs_shell_history")
         readline.set_history_length(1000)
         readline.parse_and_bind("tab: complete")
@@ -48,37 +71,37 @@ def interactive_shell(local_vars: Dict[str, Any], shell_color: str = '\033[94m')
             try:
                 readline.read_history_file(HISTORY_FILE)
             except Exception as e:
-                print(f"{shell_color}Warning: Could not load history file: {e}\033[94m")
+                print(f"Warning: Could not load history file: {e}")
         atexit.register(readline.write_history_file, HISTORY_FILE)
 
     if not isinstance(local_vars, dict):
         raise TypeError("local_vars must be a dictionary")
 
-    # Test colors explicitly
-    sys.stdout.write("\033[94mBLUE TEST\033[0m\n")
-    sys.stdout.write("\033[97mWHITE TEST\033[0m\n")
-    sys.stdout.flush()
-
-    # Set initial color to blue
-    sys.stdout.write("\033[94m")
-    sys.stdout.flush()
-
-    # Set up readline
+    # Set up readline history and completion
     setup_readline()
 
     # Make imported functions available in the REPL
     local_vars.update(globals())
 
-    # Set prompt (color handled by raw_input)
-    sys.ps1 = ">>> "
+    # Set up custom prompts.
+    # The prompt text itself is printed in white.
+    sys.ps1 = WHITE + ">>> " + RESET
+    sys.ps2 = WHITE + "... " + RESET
+
+    # Wrap sys.stdout to emit blue-colored output.
+    sys.stdout = BlueStdout(sys.stdout)
 
-    # Create custom console
-    console = CustomConsole(locals=local_vars)
+    # Create an interactive console with the provided locals.
+    console = code.InteractiveConsole(locals=local_vars)
 
-    # Banner and exit message in blue
-    banner = f"{shell_color}Welcome to the rgwfuncs interactive shell.\nUse up/down arrows for command history.\nType 'exit()' or Ctrl+D to quit.\033[94m"
-    exitmsg = f"{shell_color}Goodbye.\033[94m"
+    # 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.")
+    exitmsg = "Goodbye."
 
-    # Run the interactive session
-    console.interact(banner=banner, exitmsg=exitmsg)
+    try:
+        console.interact(banner=banner)
+    finally:
+        print(exitmsg)
 

{rgwfuncs-0.0.80.dist-info → rgwfuncs-0.0.81.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: rgwfuncs
-Version: 0.0.80
+Version: 0.0.81
 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.80.dist-info → rgwfuncs-0.0.81.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=j2whOZEcGOQA7PWYA1ZItzELDQh-PDdpmF-W1zH3220,3140
+rgwfuncs/interactive_shell_lib.py,sha256=0XW9QY88z2_hNOwY49K8KinqSCvCTtuOeryCTysLcEM,3729
 rgwfuncs/str_lib.py,sha256=rtAdRlnSJIu3JhI-tA_A0wCiPK2m-zn5RoGpBxv_g-4,2228
-rgwfuncs-0.0.80.dist-info/LICENSE,sha256=jLvt20gcUZYB8UOvyBvyKQ1qhYYhD__qP7ZDx2lPFkU,1062
-rgwfuncs-0.0.80.dist-info/METADATA,sha256=wnQPQypnkNsi7RWzrBecvpQGeU-9RXXO7vUSqzOfNP4,60288
-rgwfuncs-0.0.80.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-rgwfuncs-0.0.80.dist-info/entry_points.txt,sha256=j-c5IOPIQ0252EaOV6j6STio56sbXl2C4ym_fQ0lXx0,43
-rgwfuncs-0.0.80.dist-info/top_level.txt,sha256=aGuVIzWsKiV1f2gCb6mynx0zx5ma0B1EwPGFKVEMTi4,9
-rgwfuncs-0.0.80.dist-info/RECORD,,
+rgwfuncs-0.0.81.dist-info/LICENSE,sha256=jLvt20gcUZYB8UOvyBvyKQ1qhYYhD__qP7ZDx2lPFkU,1062
+rgwfuncs-0.0.81.dist-info/METADATA,sha256=avh7CV9-GnXlR1nK0jK1g1akypILcus-vx5UU0hibm8,60288
+rgwfuncs-0.0.81.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+rgwfuncs-0.0.81.dist-info/entry_points.txt,sha256=j-c5IOPIQ0252EaOV6j6STio56sbXl2C4ym_fQ0lXx0,43
+rgwfuncs-0.0.81.dist-info/top_level.txt,sha256=aGuVIzWsKiV1f2gCb6mynx0zx5ma0B1EwPGFKVEMTi4,9
+rgwfuncs-0.0.81.dist-info/RECORD,,