more-compute 0.3.2__tar.gz → 0.3.3__tar.gz

{more_compute-0.3.2/more_compute.egg-info → more_compute-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: more-compute
-Version: 0.3.2
+Version: 0.3.3
 Summary: An interactive notebook environment for local and GPU computing
 Home-page: https://github.com/DannyMang/MORECOMPUTE
 Author: MoreCompute Team
@@ -46,6 +46,14 @@ Dynamic: requires-python
 
 An interactive notebook environment, similar to Marimo and Google Colab, that runs locally. It works with standard `.ipynb` files, similar to Jupyter Lab but more awesome.
 
+
+
+
+https://github.com/user-attachments/assets/8c7ec716-dade-4de2-ad37-71d328129c97
+
+
+
+
 ## Installation
 
 **Prerequisites:** [Node.js](https://nodejs.org/) >= 20.10.0 required for web interface

{more_compute-0.3.2 → more_compute-0.3.3}/README.md

@@ -6,6 +6,14 @@
 
 An interactive notebook environment, similar to Marimo and Google Colab, that runs locally. It works with standard `.ipynb` files, similar to Jupyter Lab but more awesome.
 
+
+
+
+https://github.com/user-attachments/assets/8c7ec716-dade-4de2-ad37-71d328129c97
+
+
+
+
 ## Installation
 
 **Prerequisites:** [Node.js](https://nodejs.org/) >= 20.10.0 required for web interface

{more_compute-0.3.2 → more_compute-0.3.3}/frontend/app/globals.css

@@ -111,6 +111,7 @@ body {
     display: flex;
     align-items: center;
     gap: 6px;
+    pointer-events: none; /* Allow clicks to pass through */
 }
 
 .connection-banner.provisioning {

{more_compute-0.3.2 → more_compute-0.3.3}/kernel_run.py

@@ -25,6 +25,7 @@ class NotebookLauncher:
         self.notebook_path = notebook_path
         self.is_windows = platform.system() == "Windows"
         self.cleaning_up = False  # Flag to prevent multiple cleanup calls
+        self.frontend_port = int(os.getenv("MORECOMPUTE_FRONTEND_PORT", "2718"))
         root_dir = notebook_path.parent if notebook_path.parent != Path('') else Path.cwd()
         os.environ["MORECOMPUTE_ROOT"] = str(root_dir.resolve())
         os.environ["MORECOMPUTE_NOTEBOOK_PATH"] = str(self.notebook_path)
@@ -244,9 +245,14 @@ class NotebookLauncher:
             fe_stdout = None if self.debug else subprocess.DEVNULL
             fe_stderr = None if self.debug else subprocess.DEVNULL
 
+            # Set PORT environment variable for Next.js
+            frontend_env = os.environ.copy()
+            frontend_env["PORT"] = str(self.frontend_port)
+
             self.frontend_process = subprocess.Popen(
                 [npm_cmd, "run", "dev"],
                 cwd=frontend_dir,
+                env=frontend_env,
                 stdout=fe_stdout,
                 stderr=fe_stderr,
                 shell=self.is_windows,  # CRITICAL for Windows
@@ -256,7 +262,7 @@ class NotebookLauncher:
 
             # Wait a bit then open browser
             time.sleep(3)
-            webbrowser.open("http://localhost:3000")
+            webbrowser.open(f"http://localhost:{self.frontend_port}")
 
         except Exception as e:
             print(f"Failed to start frontend: {e}")
@@ -316,7 +322,7 @@ class NotebookLauncher:
     def run(self):
         """Main run method"""
         print("\n        Edit notebook in your browser!\n")
-        print("        ➜  URL: http://localhost:3000\n")
+        print(f"        ➜  URL: http://localhost:{self.frontend_port}\n")
 
         # Track Ctrl+C presses
         interrupt_count = [0]  # Use list to allow modification in nested function
@@ -366,7 +372,11 @@ class NotebookLauncher:
 
 
 def build_parser() -> argparse.ArgumentParser:
-    parser = argparse.ArgumentParser(description="Launch the MoreCompute notebook")
+    parser = argparse.ArgumentParser(
+        prog="more-compute",
+        description="MoreCompute - Jupyter notebooks with GPU compute",
+        add_help=False,
+    )
     parser.add_argument(
         "--version",
         "-v",
@@ -383,7 +393,13 @@ def build_parser() -> argparse.ArgumentParser:
         "-debug",
         "--debug",
         action="store_true",
-        help="Show backend/frontend logs (hidden by default)",
+        help="Show backend/frontend logs",
+    )
+    parser.add_argument(
+        "-h",
+        "--help",
+        action="store_true",
+        help="Show this help message",
     )
     return parser
 
@@ -413,9 +429,37 @@ def ensure_notebook_exists(notebook_path: Path):
     notebook.save_to_file(str(notebook_path))
 
 
+def print_help():
+    """Print concise help message"""
+    print(f"""Usage: more-compute [OPTIONS] [NOTEBOOK]
+
+MoreCompute - Jupyter notebooks with GPU compute
+
+Getting started:
+
+  * more-compute new              create a new notebook with timestamp
+  * more-compute notebook.ipynb   open or create notebook.ipynb
+
+Options:
+  --version, -v                   Show version and exit
+  --debug                         Show backend/frontend logs
+  --help, -h                      Show this message and exit
+
+Environment variables:
+  MORECOMPUTE_PORT                Backend port (default: 8000)
+  MORECOMPUTE_FRONTEND_PORT       Frontend port (default: 2718)
+  MORECOMPUTE_NOTEBOOK_PATH       Default notebook path
+""")
+
 def main(argv=None):
     parser = build_parser()
     args = parser.parse_args(argv)
+
+    # Show help if requested or no arguments provided
+    if args.help or (args.notebook_path is None and os.getenv("MORECOMPUTE_NOTEBOOK_PATH") is None):
+        print_help()
+        sys.exit(0)
+
     raw_notebook_path = args.notebook_path
 
     if raw_notebook_path == "new":
@@ -429,7 +473,8 @@ def main(argv=None):
         raw_notebook_path = notebook_path_env
 
     if raw_notebook_path is None:
-        raw_notebook_path = DEFAULT_NOTEBOOK_NAME
+        print_help()
+        sys.exit(0)
 
     notebook_path = Path(raw_notebook_path).expanduser().resolve()
     ensure_notebook_exists(notebook_path)

{more_compute-0.3.2 → more_compute-0.3.3/more_compute.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: more-compute
-Version: 0.3.2
+Version: 0.3.3
 Summary: An interactive notebook environment for local and GPU computing
 Home-page: https://github.com/DannyMang/MORECOMPUTE
 Author: MoreCompute Team
@@ -46,6 +46,14 @@ Dynamic: requires-python
 
 An interactive notebook environment, similar to Marimo and Google Colab, that runs locally. It works with standard `.ipynb` files, similar to Jupyter Lab but more awesome.
 
+
+
+
+https://github.com/user-attachments/assets/8c7ec716-dade-4de2-ad37-71d328129c97
+
+
+
+
 ## Installation
 
 **Prerequisites:** [Node.js](https://nodejs.org/) >= 20.10.0 required for web interface

more_compute-0.3.3/morecompute/__version__.py

@@ -0,0 +1 @@
+__version__ = "0.3.3"

{more_compute-0.3.2 → more_compute-0.3.3}/morecompute/execution/executor.py

@@ -86,6 +86,7 @@ class NextZmqExecutor:
             self.worker_proc = subprocess.Popen(
                 [sys.executable, '-m', 'morecompute.execution.worker'],
                 env=env,
+                stdin=subprocess.DEVNULL,  # Explicitly close stdin to prevent fd issues
                 stdout=subprocess.DEVNULL,
                 stderr=None  # Show errors in terminal
             )

{more_compute-0.3.2 → more_compute-0.3.3}/morecompute/server.py

@@ -18,7 +18,7 @@ from .utils.system_environment_util import DeviceMetrics
 from .utils.error_utils import ErrorUtils
 from .utils.cache_util import make_cache_key
 from .utils.notebook_util import coerce_cell_source
-from .utils.config_util import load_api_key_from_env, save_api_key_to_env
+from .utils.config_util import load_api_key, save_api_key
 from .utils.zmq_util import reconnect_zmq_sockets, reset_to_local_zmq
 from .services.prime_intellect import PrimeIntellectService
 from .services.pod_manager import PodKernelManager
@@ -67,7 +67,7 @@ else:
 error_utils = ErrorUtils()
 executor = NextZmqExecutor(error_utils=error_utils)
 metrics = DeviceMetrics()
-prime_api_key = load_api_key_from_env("PRIME_INTELLECT_API_KEY", BASE_DIR / ".env")
+prime_api_key = load_api_key("PRIME_INTELLECT_API_KEY")
 prime_intellect = PrimeIntellectService(api_key=prime_api_key) if prime_api_key else None
 pod_manager: PodKernelManager | None = None
 data_manager = DataManager(prime_intellect=prime_intellect)
@@ -654,14 +654,14 @@ async def get_gpu_config() -> ConfigStatusResponse:
 
 @app.post("/api/gpu/config", response_model=ApiKeyResponse)
 async def set_gpu_config(request: ApiKeyRequest) -> ApiKeyResponse:
-    """Save Prime Intellect API key to .env file and reinitialize service."""
+    """Save Prime Intellect API key to user config (~/.morecompute/config.json) and reinitialize service."""
     global prime_intellect, pod_monitor
 
     if not request.api_key.strip():
         raise HTTPException(status_code=400, detail="API key is required")
 
     try:
-        save_api_key_to_env("PRIME_INTELLECT_API_KEY", request.api_key, BASE_DIR / ".env")
+        save_api_key("PRIME_INTELLECT_API_KEY", request.api_key)
         prime_intellect = PrimeIntellectService(api_key=request.api_key)
         if prime_intellect:
             pod_monitor = PodMonitor(

{more_compute-0.3.2 → more_compute-0.3.3}/morecompute/services/pod_manager.py

@@ -408,8 +408,8 @@ class PodKernelManager:
                     f"'cd /tmp && "
                     f"MC_ZMQ_CMD_ADDR=tcp://0.0.0.0:{self.remote_cmd_port} "
                     f"MC_ZMQ_PUB_ADDR=tcp://0.0.0.0:{self.remote_pub_port} "
-                    f"nohup python3 /tmp/morecompute/execution/worker.py "
-                    f">/tmp/worker.log 2>&1 </dev/null & "
+                    f"setsid python3 -u /tmp/morecompute/execution/worker.py "
+                    f"</dev/null >/tmp/worker.log 2>&1 & "
                     f"echo $!'"
                 )
             ])

more_compute-0.3.3/morecompute/utils/config_util.py

@@ -0,0 +1,75 @@
+"""Configuration utilities for managing API keys and environment variables."""
+
+from pathlib import Path
+from typing import Optional
+import os
+import json
+
+
+# Global config directory in user's home
+CONFIG_DIR = Path.home() / ".morecompute"
+CONFIG_FILE = CONFIG_DIR / "config.json"
+
+
+def _ensure_config_dir() -> None:
+    """Ensure the config directory exists."""
+    CONFIG_DIR.mkdir(parents=True, exist_ok=True)
+
+
+def _load_config() -> dict:
+    """Load config from JSON file."""
+    if not CONFIG_FILE.exists():
+        return {}
+    try:
+        with CONFIG_FILE.open("r", encoding="utf-8") as f:
+            return json.load(f)
+    except (json.JSONDecodeError, IOError):
+        return {}
+
+
+def _save_config(config: dict) -> None:
+    """Save config to JSON file."""
+    _ensure_config_dir()
+    with CONFIG_FILE.open("w", encoding="utf-8") as f:
+        json.dump(config, f, indent=2)
+
+
+def load_api_key(key_name: str) -> Optional[str]:
+    """
+    Load API key from user config directory (~/.morecompute/config.json).
+    Falls back to environment variable if not found in config.
+
+    Args:
+        key_name: Key name (e.g., "PRIME_INTELLECT_API_KEY")
+
+    Returns:
+        API key string or None if not found
+    """
+    # Check environment variable first
+    env_key = os.getenv(key_name)
+    if env_key:
+        return env_key
+
+    # Check config file
+    config = _load_config()
+    return config.get(key_name)
+
+
+def save_api_key(key_name: str, api_key: str) -> None:
+    """
+    Save API key to user config directory (~/.morecompute/config.json).
+
+    Args:
+        key_name: Key name (e.g., "PRIME_INTELLECT_API_KEY")
+        api_key: API key value to save
+
+    Raises:
+        ValueError: If API key is empty
+        IOError: If file cannot be written
+    """
+    if not api_key.strip():
+        raise ValueError("API key cannot be empty")
+
+    config = _load_config()
+    config[key_name] = api_key
+    _save_config(config)

more_compute-0.3.2/morecompute/__version__.py

@@ -1 +0,0 @@
-__version__ = "0.3.2"

more_compute-0.3.2/morecompute/utils/config_util.py

@@ -1,59 +0,0 @@
-"""Configuration utilities for managing API keys and environment variables."""
-
-from pathlib import Path
-import os
-
-
-def load_api_key_from_env(env_var: str, env_file_path: Path | None = None) -> str | None:
-    """
-    Load API key from environment variable or .env file.
-
-    Args:
-        env_var: Environment variable name to check
-        env_file_path: Path to .env file (optional)
-
-    Returns:
-        API key string or None if not found
-    """
-    api_key = os.getenv(env_var)
-    if api_key:
-        return api_key
-
-    if env_file_path and env_file_path.exists():
-        try:
-            with env_file_path.open("r", encoding="utf-8") as f:
-                for line in f:
-                    line = line.strip()
-                    if line.startswith(f"{env_var}="):
-                        return line.split("=", 1)[1].strip().strip('"').strip("'")
-        except Exception:
-            pass
-
-    return None
-
-
-def save_api_key_to_env(env_var: str, api_key: str, env_file_path: Path) -> None:
-    """
-    Save API key to .env file, replacing existing value if present.
-
-    Args:
-        env_var: Environment variable name
-        api_key: API key value to save
-        env_file_path: Path to .env file
-
-    Raises:
-        ValueError: If API key is empty
-        IOError: If file cannot be written
-    """
-    if not api_key.strip():
-        raise ValueError("API key cannot be empty")
-
-    existing_lines = []
-    if env_file_path.exists():
-        with env_file_path.open("r", encoding="utf-8") as f:
-            existing_lines = f.readlines()
-
-    new_lines = [line for line in existing_lines if not line.strip().startswith(f"{env_var}=")]
-    new_lines.append(f"{env_var}={api_key}\n")
-    with env_file_path.open("w", encoding="utf-8") as f:
-        f.writelines(new_lines)