more-compute 0.2.6__py3-none-any.whl → 0.3.1__py3-none-any.whl

morecompute/execution/worker.py

@@ -10,6 +10,91 @@ import matplotlib
 matplotlib.use('Agg')
 import matplotlib.pyplot as plt
 import re
+import subprocess
+import shlex
+import platform
+
+# Import shared shell command utilities
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+from utils.shell_utils import prepare_shell_command, prepare_shell_environment
+
+def _preprocess_shell_commands(code: str) -> str:
+    """
+    Preprocess code to transform IPython-style shell commands (!cmd) into Python function calls.
+    Returns transformed code with shell commands converted to _run_shell_command() calls.
+    """
+    lines = code.split('\n')
+    transformed_lines = []
+
+    for line in lines:
+        # Match shell commands: "    !pip install pandas"
+        shell_match = re.match(r'^(\s*)!(.+)$', line)
+
+        if shell_match:
+            indent = shell_match.group(1)
+            shell_cmd = shell_match.group(2).strip()
+            # Use repr() for proper escaping
+            shell_cmd_repr = repr(shell_cmd)
+            # Transform to function call
+            transformed = f"{indent}_run_shell_command({shell_cmd_repr})"
+            transformed_lines.append(transformed)
+        else:
+            transformed_lines.append(line)
+
+    return '\n'.join(transformed_lines)
+
+def _inject_shell_command_function(globals_dict: dict):
+    """Inject the _run_shell_command function into globals if not present."""
+    if '_run_shell_command' not in globals_dict:
+        def _run_shell_command(cmd: str):
+            """Execute a shell command synchronously with streaming output"""
+            # Prepare command and environment (using shared utilities)
+            shell_cmd = prepare_shell_command(cmd)
+            env = prepare_shell_environment(cmd)
+
+            # Use Popen for real-time streaming
+            process = subprocess.Popen(
+                shell_cmd,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                text=True,
+                bufsize=1,  # Line buffered
+                env=env
+            )
+
+            # Stream output line by line
+            import threading
+
+            def read_stream(stream, output_type):
+                try:
+                    for line in iter(stream.readline, ''):
+                        if not line:
+                            break
+                        if output_type == 'stdout':
+                            print(line, end='')
+                            sys.stdout.flush()
+                        else:
+                            print(line, end='', file=sys.stderr)
+                            sys.stderr.flush()
+                except Exception:
+                    pass
+                finally:
+                    stream.close()
+
+            stdout_thread = threading.Thread(target=read_stream, args=(process.stdout, 'stdout'))
+            stderr_thread = threading.Thread(target=read_stream, args=(process.stderr, 'stderr'))
+            stdout_thread.daemon = True
+            stderr_thread.daemon = True
+            stdout_thread.start()
+            stderr_thread.start()
+
+            return_code = process.wait()
+            stdout_thread.join()
+            stderr_thread.join()
+
+            return return_code
+
+        globals_dict['_run_shell_command'] = _run_shell_command
 
 def _setup_signals():
     def _handler(signum, frame):
@@ -232,7 +317,14 @@ def worker_main():
             error_payload = None
             start = time.time()
             try:
-                compiled = compile(code, '<cell>', 'exec')
+                # Preprocess shell commands (!cmd) to Python function calls
+                # This allows code like "import os; !pip install pandas" to work
+                preprocessed_code = _preprocess_shell_commands(code)
+
+                # Inject shell command function into globals if needed
+                _inject_shell_command_function(g)
+
+                compiled = compile(preprocessed_code, '<cell>', 'exec')
                 exec(compiled, g, l)
 
                 # Try to evaluate last expression for display (like Jupyter)

morecompute/server.py

@@ -119,6 +119,10 @@ async def list_installed_packages(force_refresh: bool = False):
     global pod_manager
     cache_key = "packages_list"
 
+    # Clear cache if force refresh is requested
+    if force_refresh and cache_key in packages_cache:
+        del packages_cache[cache_key]
+
     # Check cache first unless force refresh is requested
     if not force_refresh and cache_key in packages_cache:
         return packages_cache[cache_key]