modal 1.2.6.dev3__tar.gz → 1.2.7.dev0__tar.gz

{modal-1.2.6.dev3 → modal-1.2.7.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.2.6.dev3
+Version: 1.2.7.dev0
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
 License: Apache-2.0

{modal-1.2.6.dev3 → modal-1.2.7.dev0}/modal/_utils/task_command_router_client.py

@@ -403,7 +403,10 @@ class TaskCommandRouterClient:
                 )
                 return
 
+            logger.debug(f"Refreshing JWT for exec with task ID {self._task_id}")
             resp = await fetch_command_router_access(self._server_client, self._task_id)
+            logger.debug(f"Finished refreshing JWT for exec with task ID {self._task_id}")
+
             # Ensure the server URL remains stable for the lifetime of this client.
             assert resp.url == self._server_url, "Task router URL changed during session"
             self._jwt = resp.jwt
@@ -434,7 +437,9 @@ class TaskCommandRouterClient:
         delay_secs = self.stream_stdio_retry_delay_secs
         delay_factor = self.stream_stdio_retry_delay_factor
         num_retries_remaining = self.stream_stdio_max_retries
-        num_auth_retries = 0
+        # Flag to prevent infinite auth retries in the event that the JWT
+        # refresh yields an invalid JWT somehow or that the JWT is otherwise invalid.
+        did_auth_retry = False
 
         async def sleep_and_update_delay_and_num_retries_remaining(e: Exception):
             nonlocal delay_secs, num_retries_remaining
@@ -458,25 +463,28 @@ class TaskCommandRouterClient:
                         file_descriptor=file_descriptor,
                     )
 
-                    # Scope auth retry strictly to the initial send (where headers/auth are sent).
+                    # Auth retry is scoped to a single refresh per streaming attempt. While auth metadata is
+                    # sent on request start, UNAUTHENTICATED may sometimes surface during iteration,
+                    # so we handle it at both send and receive boundaries.
                     try:
                         await s.send_message(req, end=True)
+                        async for item in s:
+                            # We successfully authenticated after a JWT refresh, reset the auth retry flag.
+                            if did_auth_retry:
+                                did_auth_retry = False
+                            # Reset retry backoff after any successful chunk.
+                            delay_secs = self.stream_stdio_retry_delay_secs
+                            offset += len(item.data)
+                            yield item
                     except GRPCError as exc:
-                        if exc.status == Status.UNAUTHENTICATED and num_auth_retries < 1:
+                        if exc.status == Status.UNAUTHENTICATED and not did_auth_retry:
                             await self._refresh_jwt()
-                            num_auth_retries += 1
+                            # Mark that we've retried authentication for this streaming attempt, to
+                            # prevent subsequent retries.
+                            did_auth_retry = True
                             continue
                         raise
 
-                    # We successfully authenticated, reset the auth retry count.
-                    num_auth_retries = 0
-
-                    async for item in s:
-                        # Reset retry backoff after any successful chunk.
-                        delay_secs = self.stream_stdio_retry_delay_secs
-                        offset += len(item.data)
-                        yield item
-
                 # We successfully streamed all output.
                 return
             except GRPCError as e:

{modal-1.2.6.dev3 → modal-1.2.7.dev0}/modal/cli/launch.py

@@ -3,8 +3,6 @@ import asyncio
 import inspect
 import json
 import os
-import subprocess
-import tempfile
 from pathlib import Path
 from typing import Any, Optional
 
@@ -120,75 +118,3 @@ def vscode(
         "volume": volume,
     }
     _launch_program("vscode", "vscode.py", detach, args)
-
-
-@launch_cli.command(name="machine", help="Start an instance on Modal, with direct SSH access.", hidden=True)
-def machine(
-    name: str,  # Name of the machine App.
-    cpu: int = 8,  # Reservation of CPU cores (can burst above this value).
-    memory: int = 32768,  # Reservation of memory in MiB (can burst above this value).
-    gpu: Optional[str] = None,  # GPU type and count, e.g. "t4" or "h100:2".
-    image: Optional[str] = None,  # Image tag to use from registry. Defaults to the notebook base image.
-    timeout: int = 3600 * 24,  # Timeout in seconds for the instance.
-    volume: str = "machine-vol",  # Attach a persisted `modal.Volume` at /workspace (created if missing).
-):
-    tempdir = Path(tempfile.gettempdir())
-    key_path = tempdir / "modal-machine-keyfile.pem"
-    # Generate a new SSH key pair for this machine instance.
-    if not key_path.exists():
-        subprocess.run(
-            ["ssh-keygen", "-t", "ed25519", "-f", str(key_path), "-N", ""],
-            check=True,
-            stdout=subprocess.DEVNULL,
-        )
-    # Add the key with expiry 1d to ssh agent.
-    subprocess.run(
-        ["ssh-add", "-t", "1d", str(key_path)],
-        check=True,
-        stdout=subprocess.DEVNULL,
-        stderr=subprocess.DEVNULL,
-    )
-
-    os.environ["SSH_PUBLIC_KEY"] = Path(str(key_path) + ".pub").read_text()
-    os.environ["MODAL_LOGS_TIMEOUT"] = "0"  # hack to work with --detach
-
-    args = {
-        "cpu": cpu,
-        "memory": memory,
-        "gpu": gpu,
-        "image": image,
-        "timeout": timeout,
-        "volume": volume,
-    }
-    _launch_program(
-        "machine",
-        "launch_instance_ssh.py",
-        True,
-        args,
-        description=name,
-    )
-
-
-@launch_cli.command(name="marimo", help="Start a remote Marimo notebook on Modal.", hidden=True)
-def marimo(
-    cpu: int = 8,
-    memory: int = 32768,
-    gpu: Optional[str] = None,
-    image: str = "debian:12",
-    timeout: int = 3600,
-    add_python: Optional[str] = "3.12",
-    mount: Optional[str] = None,  # Create a `modal.Mount` from a local directory.
-    volume: Optional[str] = None,  # Attach a persisted `modal.Volume` by name (creating if missing).
-    detach: bool = False,  # Run the app in "detached" mode to persist after local client disconnects
-):
-    args = {
-        "cpu": cpu,
-        "memory": memory,
-        "gpu": gpu,
-        "timeout": timeout,
-        "image": image,
-        "add_python": add_python,
-        "mount": mount,
-        "volume": volume,
-    }
-    _launch_program("marimo", "run_marimo.py", detach, args)

{modal-1.2.6.dev3 → modal-1.2.7.dev0}/modal/client.pyi

@@ -32,7 +32,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.2.6.dev3",
+        version: str = "1.2.7.dev0",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -163,7 +163,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.2.6.dev3",
+        version: str = "1.2.7.dev0",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.2.6.dev3 → modal-1.2.7.dev0}/modal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.2.6.dev3
+Version: 1.2.7.dev0
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
 License: Apache-2.0

{modal-1.2.6.dev3 → modal-1.2.7.dev0}/modal.egg-info/SOURCES.txt

@@ -161,9 +161,7 @@ modal/cli/token.py
 modal/cli/utils.py
 modal/cli/volume.py
 modal/cli/programs/__init__.py
-modal/cli/programs/launch_instance_ssh.py
 modal/cli/programs/run_jupyter.py
-modal/cli/programs/run_marimo.py
 modal/cli/programs/vscode.py
 modal/experimental/__init__.py
 modal/experimental/flash.py

{modal-1.2.6.dev3 → modal-1.2.7.dev0}/modal_version/__init__.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2025
 """Supplies the current version of the modal client library."""
 
-__version__ = "1.2.6.dev3"
+__version__ = "1.2.7.dev0"

modal-1.2.6.dev3/modal/cli/programs/launch_instance_ssh.py

@@ -1,94 +0,0 @@
-# Copyright Modal Labs 2023
-# type: ignore
-import json
-import os
-import sys
-from typing import Any
-
-import rich
-import rich.panel
-import rich.rule
-
-import modal
-import modal.experimental
-
-# Passed by `modal launch` locally via CLI.
-args: dict[str, Any] = json.loads(os.environ.get("MODAL_LAUNCH_ARGS", "{}"))
-
-app = modal.App()
-
-image: modal.Image
-if args.get("image"):
-    image = modal.Image.from_registry(args.get("image"))
-else:
-    # Must be set to the same image builder version as the notebook base image.
-    os.environ["MODAL_IMAGE_BUILDER_VERSION"] = "2024.10"
-    image = modal.experimental.notebook_base_image(python_version="3.12")
-
-volume = (
-    modal.Volume.from_name(
-        args.get("volume"),
-        create_if_missing=True,
-    )
-    if args.get("volume")
-    else None
-)
-volumes = {"/workspace": volume} if volume else {}
-
-
-startup_script = """
-set -eu
-mkdir -p /run/sshd
-
-# Check if sshd is installed, install if not
-test -x /usr/sbin/sshd || (apt-get update && apt-get install -y openssh-server)
-
-# Change default working directory to /workspace
-echo "cd /workspace" >> /root/.profile
-
-mkdir -p /root/.ssh
-echo "$SSH_PUBLIC_KEY" >> /root/.ssh/authorized_keys
-/usr/sbin/sshd -D -e
-"""
-
-
-@app.local_entrypoint()
-def main():
-    if not os.environ.get("SSH_PUBLIC_KEY"):
-        raise ValueError("SSH_PUBLIC_KEY environment variable is not set")
-
-    sb = modal.Sandbox.create(
-        *("sh", "-c", startup_script),
-        app=app,
-        image=image,
-        cpu=args.get("cpu"),
-        memory=args.get("memory"),
-        gpu=args.get("gpu"),
-        timeout=args.get("timeout"),
-        volumes=volumes,
-        unencrypted_ports=[22],  # Forward SSH port
-        secrets=[modal.Secret.from_dict({"SSH_PUBLIC_KEY": os.environ.get("SSH_PUBLIC_KEY")})],
-    )
-    hostname, port = sb.tunnels()[22].tcp_socket
-    connection_cmd = f"ssh -A -p {port} root@{hostname}"
-
-    rich.print(
-        rich.rule.Rule(style="yellow"),
-        rich.panel.Panel(
-            f"""Your instance is ready! You can SSH into it using the following command:
-
-  [dim gray]>[/dim gray] [bold cyan]{connection_cmd}[/bold cyan]
-
-[italic]Details:[/italic]
-  • Name:    [magenta]{app.description}[/magenta]
-  • CPU:     [yellow]{args.get("cpu")} cores[/yellow]
-  • Memory:  [yellow]{args.get("memory")} MiB[/yellow]
-  • Timeout: [yellow]{args.get("timeout")} seconds[/yellow]
-  • GPU:     [green]{(args.get("gpu") or "N/A").upper()}[/green]""",
-            title="SSH Connection",
-            expand=False,
-        ),
-        rich.rule.Rule(style="yellow"),
-    )
-
-    sys.exit(0)  # Exit immediately to prevent "Timed out waiting for final apps log."

modal-1.2.6.dev3/modal/cli/programs/run_marimo.py

@@ -1,95 +0,0 @@
-# Copyright Modal Labs 2025
-# type: ignore
-import json
-import os
-import secrets
-import socket
-import subprocess
-import threading
-import time
-import webbrowser
-from typing import Any
-
-from modal import App, Image, Queue, Secret, Volume, forward
-
-# Args injected by `modal launch` CLI.
-args: dict[str, Any] = json.loads(os.environ.get("MODAL_LAUNCH_ARGS", "{}"))
-
-app = App()
-
-image = Image.from_registry(args.get("image"), add_python=args.get("add_python")).uv_pip_install("marimo")
-
-# Optional host-filesystem mount (read-only snapshot of your project, useful for editing)
-if args.get("mount"):
-    image = image.add_local_dir(args["mount"], remote_path="/root/marimo/mount")
-
-# Optional persistent Modal volume
-volume = Volume.from_name(args["volume"], create_if_missing=True) if args.get("volume") else None
-volumes = {"/root/marimo/volume": volume} if volume else {}
-
-
-def _wait_for_port(url: str, q: Queue) -> None:
-    start = time.monotonic()
-    while True:
-        try:
-            with socket.create_connection(("localhost", 8888), timeout=30):
-                break
-        except OSError as exc:
-            if time.monotonic() - start > 30:
-                raise TimeoutError("marimo server did not start within 30 s") from exc
-            time.sleep(0.05)
-    q.put(url)
-
-
-@app.function(
-    image=image,
-    cpu=args.get("cpu"),
-    memory=args.get("memory"),
-    gpu=args.get("gpu"),
-    timeout=args.get("timeout", 3600),
-    secrets=[Secret.from_dict({"MODAL_LAUNCH_ARGS": json.dumps(args)})],
-    volumes=volumes,
-    max_containers=1 if volume else None,
-)
-def run_marimo(q: Queue):
-    os.makedirs("/root/marimo", exist_ok=True)
-
-    # marimo supports token-based auth; generate one so only you can connect
-    token = secrets.token_urlsafe(12)
-
-    with forward(8888) as tunnel:
-        url = f"{tunnel.url}/?access_token={token}"
-        threading.Thread(target=_wait_for_port, args=(url, q), daemon=True).start()
-
-        print("\nmarimo on Modal, opening in browser …")
-        print(f"   -> {url}\n")
-
-        # Launch the headless edit server
-        subprocess.run(
-            [
-                "marimo",
-                "edit",
-                "--headless",  # don't open browser in container
-                "--host",
-                "0.0.0.0",  # bind all interfaces
-                "--port",
-                "8888",
-                "--token-password",
-                token,  # enable session-based auth
-                "--skip-update-check",
-                "/root/marimo",  # workspace directory
-            ],
-            env={**os.environ, "SHELL": "/bin/bash"},
-        )
-
-    q.put("done")
-
-
-@app.local_entrypoint()
-def main():
-    with Queue.ephemeral() as q:
-        run_marimo.spawn(q)
-        url = q.get()  # first message = connect URL
-        time.sleep(1)  # give server a heartbeat
-        webbrowser.open(url)
-        assert q.get() == "done"