modAL 1.0.1__tar.gz → 1.0.1.dev0__tar.gz

{modal-1.0.1 → modal-1.0.1.dev0}/PKG-INFO

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

{modal-1.0.1 → modal-1.0.1.dev0}/modal/_output.py

@@ -32,7 +32,6 @@ from rich.progress import (
 from rich.spinner import Spinner
 from rich.text import Text
 
-from modal._utils.time_utils import timestamp_to_local
 from modal_proto import api_pb2
 
 from ._utils.grpc_utils import RETRYABLE_GRPC_STATUS_CODES, retry_transient_errors
@@ -82,27 +81,22 @@ def download_progress_bar() -> Progress:
     )
 
 
-class LineBufferedOutput:
+class LineBufferedOutput(io.StringIO):
     """Output stream that buffers lines and passes them to a callback."""
 
     LINE_REGEX = re.compile("(\r\n|\r|\n)")
 
-    def __init__(self, callback: Callable[[str], None], show_timestamps: bool):
+    def __init__(self, callback: Callable[[str], None]):
         self._callback = callback
         self._buf = ""
-        self._show_timestamps = show_timestamps
 
-    def write(self, log: api_pb2.TaskLogs):
-        chunks = self.LINE_REGEX.split(self._buf + log.data)
+    def write(self, data: str):
+        chunks = self.LINE_REGEX.split(self._buf + data)
 
         # re.split("(<exp>)") returns the matched groups, and also the separators.
         # e.g. re.split("(+)", "a+b") returns ["a", "+", "b"].
         # This means that chunks is guaranteed to be odd in length.
 
-        if self._show_timestamps:
-            for i in range(0, len(chunks) - 1, 2):
-                chunks[i] = f"{timestamp_to_local(log.timestamp)} {chunks[i]}"
-
         completed_lines = "".join(chunks[:-1])
         remainder = chunks[-1]
 
@@ -142,14 +136,12 @@ class OutputManager:
     _app_page_url: str | None
     _show_image_logs: bool
     _status_spinner_live: Live | None
-    _show_timestamps: bool
 
     def __init__(
         self,
         *,
         stdout: io.TextIOWrapper | None = None,
         status_spinner_text: str = "Running app...",
-        show_timestamps: bool = False,
     ):
         self._stdout = stdout or sys.stdout
         self._console = Console(file=stdout, highlight=False)
@@ -164,7 +156,6 @@ class OutputManager:
         self._app_page_url = None
         self._show_image_logs = False
         self._status_spinner_live = None
-        self._show_timestamps = show_timestamps
 
     @classmethod
     def disable(cls):
@@ -364,9 +355,9 @@ class OutputManager:
     async def put_log_content(self, log: api_pb2.TaskLogs):
         stream = self._line_buffers.get(log.file_descriptor)
         if stream is None:
-            stream = LineBufferedOutput(functools.partial(self._print_log, log.file_descriptor), self._show_timestamps)
+            stream = LineBufferedOutput(functools.partial(self._print_log, log.file_descriptor))
             self._line_buffers[log.file_descriptor] = stream
-        stream.write(log)
+        stream.write(log.data)
 
     def flush_lines(self):
         for stream in self._line_buffers.values():

{modal-1.0.1 → modal-1.0.1.dev0}/modal/cli/app.py

@@ -15,8 +15,7 @@ from modal.client import _Client
 from modal.environments import ensure_env
 from modal_proto import api_pb2
 
-from .._utils.time_utils import timestamp_to_local
-from .utils import ENV_OPTION, display_table, get_app_id_from_name, stream_app_logs
+from .utils import ENV_OPTION, display_table, get_app_id_from_name, stream_app_logs, timestamp_to_local
 
 APP_IDENTIFIER = Argument("", help="App name or ID")
 NAME_OPTION = typer.Option("", "-n", "--name", help="Deprecated: Pass App name as a positional argument")
@@ -85,7 +84,6 @@ def logs(
     app_identifier: str = APP_IDENTIFIER,
     *,
     env: Optional[str] = ENV_OPTION,
-    timestamps: bool = typer.Option(False, "--timestamps", help="Show timestamps for each log line"),
 ):
     """Show App logs, streaming while active.
 
@@ -105,7 +103,7 @@ def logs(
 
     """
     app_id = get_app_id(app_identifier, env)
-    stream_app_logs(app_id, show_timestamps=timestamps)
+    stream_app_logs(app_id)
 
 
 @app_cli.command("rollback", no_args_is_help=True, context_settings={"ignore_unknown_options": True})

{modal-1.0.1 → modal-1.0.1.dev0}/modal/cli/cluster.py

@@ -8,8 +8,7 @@ from rich.text import Text
 from modal._object import _get_environment_name
 from modal._pty import get_pty_info
 from modal._utils.async_utils import synchronizer
-from modal._utils.time_utils import timestamp_to_local
-from modal.cli.utils import ENV_OPTION, display_table, is_tty
+from modal.cli.utils import ENV_OPTION, display_table, is_tty, timestamp_to_local
 from modal.client import _Client
 from modal.config import config
 from modal.container_process import _ContainerProcess

{modal-1.0.1 → modal-1.0.1.dev0}/modal/cli/container.py

@@ -8,8 +8,7 @@ from modal._object import _get_environment_name
 from modal._pty import get_pty_info
 from modal._utils.async_utils import synchronizer
 from modal._utils.grpc_utils import retry_transient_errors
-from modal._utils.time_utils import timestamp_to_local
-from modal.cli.utils import ENV_OPTION, display_table, is_tty, stream_app_logs
+from modal.cli.utils import ENV_OPTION, display_table, is_tty, stream_app_logs, timestamp_to_local
 from modal.client import _Client
 from modal.config import config
 from modal.container_process import _ContainerProcess

{modal-1.0.1 → modal-1.0.1.dev0}/modal/cli/dict.py

@@ -8,8 +8,7 @@ from typer import Argument, Option, Typer
 from modal._resolver import Resolver
 from modal._utils.async_utils import synchronizer
 from modal._utils.grpc_utils import retry_transient_errors
-from modal._utils.time_utils import timestamp_to_local
-from modal.cli.utils import ENV_OPTION, YES_OPTION, display_table
+from modal.cli.utils import ENV_OPTION, YES_OPTION, display_table, timestamp_to_local
 from modal.client import _Client
 from modal.dict import _Dict
 from modal.environments import ensure_env

{modal-1.0.1 → modal-1.0.1.dev0}/modal/cli/network_file_system.py

@@ -17,9 +17,8 @@ from modal._location import display_location
 from modal._output import OutputManager, ProgressHandler
 from modal._utils.async_utils import synchronizer
 from modal._utils.grpc_utils import retry_transient_errors
-from modal._utils.time_utils import timestamp_to_local
 from modal.cli._download import _volume_download
-from modal.cli.utils import ENV_OPTION, YES_OPTION, display_table
+from modal.cli.utils import ENV_OPTION, YES_OPTION, display_table, timestamp_to_local
 from modal.client import _Client
 from modal.environments import ensure_env
 from modal.network_file_system import _NetworkFileSystem

{modal-1.0.1 → modal-1.0.1.dev0}/modal/cli/queues.py

@@ -8,8 +8,7 @@ from typer import Argument, Option, Typer
 from modal._resolver import Resolver
 from modal._utils.async_utils import synchronizer
 from modal._utils.grpc_utils import retry_transient_errors
-from modal._utils.time_utils import timestamp_to_local
-from modal.cli.utils import ENV_OPTION, YES_OPTION, display_table
+from modal.cli.utils import ENV_OPTION, YES_OPTION, display_table, timestamp_to_local
 from modal.client import _Client
 from modal.environments import ensure_env
 from modal.queue import _Queue

{modal-1.0.1 → modal-1.0.1.dev0}/modal/cli/secret.py

@@ -13,8 +13,7 @@ from typer import Argument
 
 from modal._utils.async_utils import synchronizer
 from modal._utils.grpc_utils import retry_transient_errors
-from modal._utils.time_utils import timestamp_to_local
-from modal.cli.utils import ENV_OPTION, YES_OPTION, display_table
+from modal.cli.utils import ENV_OPTION, YES_OPTION, display_table, timestamp_to_local
 from modal.client import _Client
 from modal.environments import ensure_env
 from modal.secret import _Secret

{modal-1.0.1 → modal-1.0.1.dev0}/modal/cli/utils.py

@@ -1,6 +1,7 @@
 # Copyright Modal Labs 2022
 import asyncio
 from collections.abc import Sequence
+from datetime import datetime
 from json import dumps
 from typing import Optional, Union
 
@@ -22,13 +23,10 @@ from ..exception import NotFoundError
 
 @synchronizer.create_blocking
 async def stream_app_logs(
-    app_id: Optional[str] = None,
-    task_id: Optional[str] = None,
-    app_logs_url: Optional[str] = None,
-    show_timestamps: bool = False,
+    app_id: Optional[str] = None, task_id: Optional[str] = None, app_logs_url: Optional[str] = None
 ):
     client = await _Client.from_env()
-    output_mgr = OutputManager(status_spinner_text=f"Tailing logs for {app_id}", show_timestamps=show_timestamps)
+    output_mgr = OutputManager(status_spinner_text=f"Tailing logs for {app_id}")
     try:
         with output_mgr.show_status_spinner():
             await get_app_logs_loop(client, output_mgr, app_id=app_id, task_id=task_id, app_logs_url=app_logs_url)
@@ -63,6 +61,18 @@ async def get_app_id_from_name(name: str, env: Optional[str], client: Optional[_
     return resp.app_id
 
 
+def timestamp_to_local(ts: float, isotz: bool = True) -> str:
+    if ts > 0:
+        locale_tz = datetime.now().astimezone().tzinfo
+        dt = datetime.fromtimestamp(ts, tz=locale_tz)
+        if isotz:
+            return dt.isoformat(sep=" ", timespec="seconds")
+        else:
+            return f"{datetime.strftime(dt, '%Y-%m-%d %H:%M')} {locale_tz.tzname(dt)}"
+    else:
+        return None
+
+
 def _plain(text: Union[Text, str]) -> str:
     return text.plain if isinstance(text, Text) else text
 

{modal-1.0.1 → modal-1.0.1.dev0}/modal/cli/volume.py

@@ -15,9 +15,8 @@ import modal
 from modal._output import OutputManager, ProgressHandler
 from modal._utils.async_utils import synchronizer
 from modal._utils.grpc_utils import retry_transient_errors
-from modal._utils.time_utils import timestamp_to_local
 from modal.cli._download import _volume_download
-from modal.cli.utils import ENV_OPTION, YES_OPTION, display_table
+from modal.cli.utils import ENV_OPTION, YES_OPTION, display_table, timestamp_to_local
 from modal.client import _Client
 from modal.environments import ensure_env
 from modal.volume import _AbstractVolumeUploadContextManager, _Volume
@@ -204,7 +203,7 @@ async def put(
                     vol.object_id,
                     vol._client,
                     progress_cb=progress_handler.progress,
-                    force=force,
+                    force=force
                 ) as batch:
                     batch.put_directory(local_path, remote_path)
             except FileExistsError as exc:
@@ -220,7 +219,7 @@ async def put(
                     vol.object_id,
                     vol._client,
                     progress_cb=progress_handler.progress,
-                    force=force,
+                    force=force
                 ) as batch:
                     batch.put_file(local_path, remote_path)
 

{modal-1.0.1 → modal-1.0.1.dev0}/modal/client.py

@@ -3,7 +3,6 @@ import asyncio
 import os
 import platform
 import sys
-import urllib.parse
 import warnings
 from collections.abc import AsyncGenerator, AsyncIterator, Collection, Mapping
 from typing import (
@@ -51,8 +50,8 @@ def _get_metadata(client_type: int, credentials: Optional[tuple[str, str]], vers
         "x-modal-client-version": version,
         "x-modal-client-type": str(client_type),
         "x-modal-python-version": python_version,
-        "x-modal-node": urllib.parse.quote(platform.node()),
-        "x-modal-platform": urllib.parse.quote(platform_str),
+        "x-modal-node": platform.node(),
+        "x-modal-platform": platform_str,
     }
     if credentials and client_type == api_pb2.CLIENT_TYPE_CLIENT:
         token_id, token_secret = credentials

{modal-1.0.1 → modal-1.0.1.dev0}/modal/client.pyi

@@ -27,7 +27,11 @@ class _Client:
     _snapshotted: bool
 
     def __init__(
-        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "1.0.1"
+        self,
+        server_url: str,
+        client_type: int,
+        credentials: typing.Optional[tuple[str, str]],
+        version: str = "1.0.1.dev0",
     ): ...
     def is_closed(self) -> bool: ...
     @property
@@ -86,7 +90,11 @@ class Client:
     _snapshotted: bool
 
     def __init__(
-        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "1.0.1"
+        self,
+        server_url: str,
+        client_type: int,
+        credentials: typing.Optional[tuple[str, str]],
+        version: str = "1.0.1.dev0",
     ): ...
     def is_closed(self) -> bool: ...
     @property

{modal-1.0.1 → modal-1.0.1.dev0}/modal/functions.pyi

@@ -227,11 +227,11 @@ class Function(
 
     _call_generator: ___call_generator_spec[typing_extensions.Self]
 
-    class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
+    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> ReturnType_INNER: ...
         async def aio(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> ReturnType_INNER: ...
 
-    remote: __remote_spec[modal._functions.P, modal._functions.ReturnType, typing_extensions.Self]
+    remote: __remote_spec[modal._functions.ReturnType, modal._functions.P, typing_extensions.Self]
 
     class __remote_gen_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, /, *args, **kwargs) -> typing.Generator[typing.Any, None, None]: ...
@@ -246,12 +246,12 @@ class Function(
         self, *args: modal._functions.P.args, **kwargs: modal._functions.P.kwargs
     ) -> modal._functions.OriginalReturnType: ...
 
-    class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
+    class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]: ...
         async def aio(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]: ...
 
     _experimental_spawn: ___experimental_spawn_spec[
-        modal._functions.P, modal._functions.ReturnType, typing_extensions.Self
+        modal._functions.ReturnType, modal._functions.P, typing_extensions.Self
     ]
 
     class ___spawn_map_inner_spec(typing_extensions.Protocol[P_INNER, SUPERSELF]):
@@ -260,11 +260,11 @@ class Function(
 
     _spawn_map_inner: ___spawn_map_inner_spec[modal._functions.P, typing_extensions.Self]
 
-    class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
+    class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]: ...
         async def aio(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]: ...
 
-    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType, typing_extensions.Self]
+    spawn: __spawn_spec[modal._functions.ReturnType, modal._functions.P, typing_extensions.Self]
 
     def get_raw_f(self) -> collections.abc.Callable[..., typing.Any]: ...
 

{modal-1.0.1 → modal-1.0.1.dev0}/modal/image.py

@@ -423,9 +423,6 @@ class _Image(_Object, type_prefix="im"):
         self._deferred_mounts = other._deferred_mounts
         self._added_python_source_set = other._added_python_source_set
 
-    def _get_metadata(self) -> Optional[Message]:
-        return self._metadata
-
     def _hydrate_metadata(self, metadata: Optional[Message]):
         env_image_id = config.get("image_id")  # set as an env var in containers
         if env_image_id == self.object_id:

{modal-1.0.1 → modal-1.0.1.dev0}/modal/image.pyi

@@ -96,7 +96,6 @@ class _Image(modal._object._Object):
 
     def _initialize_from_empty(self): ...
     def _initialize_from_other(self, other: _Image): ...
-    def _get_metadata(self) -> typing.Optional[google.protobuf.message.Message]: ...
     def _hydrate_metadata(self, metadata: typing.Optional[google.protobuf.message.Message]): ...
     def _add_mount_layer_or_copy(self, mount: modal.mount._Mount, copy: bool = False): ...
     @property
@@ -353,7 +352,6 @@ class Image(modal.object.Object):
     def __init__(self, *args, **kwargs): ...
     def _initialize_from_empty(self): ...
     def _initialize_from_other(self, other: Image): ...
-    def _get_metadata(self) -> typing.Optional[google.protobuf.message.Message]: ...
     def _hydrate_metadata(self, metadata: typing.Optional[google.protobuf.message.Message]): ...
     def _add_mount_layer_or_copy(self, mount: modal.mount.Mount, copy: bool = False): ...
     @property

{modal-1.0.1 → modal-1.0.1.dev0}/modal/sandbox.py

@@ -738,7 +738,10 @@ class _Sandbox(_Object, type_prefix="sb"):
         recursive: Optional[bool] = None,
         timeout: Optional[int] = None,
     ) -> AsyncIterator[FileWatchEvent]:
-        """Watch a file or directory in the Sandbox for changes."""
+        """Watch a file or directory in the Sandbox for changes.
+
+        See the [guide](/docs/guide/sandbox-files#file-watching) for usage information.
+        """
         task_id = await self._get_task_id()
         async for event in _FileIO.watch(path, self._client, task_id, filter, recursive, timeout):
             yield event

{modal-1.0.1 → modal-1.0.1.dev0}/modal/snapshot.py

@@ -11,19 +11,13 @@ from .client import _Client
 
 
 class _SandboxSnapshot(_Object, type_prefix="sn"):
-    """
-    > Sandbox memory snapshots are in **early preview**.
-
-    A `SandboxSnapshot` object lets you interact with a stored Sandbox snapshot that was created by calling
-    `._experimental_snapshot()` on a Sandbox instance. This includes both the filesystem and memory state of
-    the original Sandbox at the time the snapshot was taken.
+    """A `SandboxSnapshot` object lets you interact with a stored Sandbox snapshot that was created by calling
+    .snapshot() on a Sandbox instance. This includes both the filesystem and memory state of the original Sandbox at the
+    time the snapshot was taken.
     """
 
     @staticmethod
     async def from_id(sandbox_snapshot_id: str, client: Optional[_Client] = None):
-        """
-        Construct a `SandboxSnapshot` object from a sandbox snapshot ID.
-        """
         if client is None:
             client = await _Client.from_env()
 

{modal-1.0.1 → modal-1.0.1.dev0}/modal.egg-info/PKG-INFO

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

{modal-1.0.1 → modal-1.0.1.dev0}/modal.egg-info/SOURCES.txt

@@ -119,7 +119,6 @@ modal/_utils/package_utils.py
 modal/_utils/pattern_utils.py
 modal/_utils/rand_pb_testing.py
 modal/_utils/shell_utils.py
-modal/_utils/time_utils.py
 modal/_vendor/__init__.py
 modal/_vendor/a2wsgi_wsgi.py
 modal/_vendor/cloudpickle.py

{modal-1.0.1 → modal-1.0.1.dev0}/modal_version/__init__.py

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

modal-1.0.1/modal/_utils/time_utils.py

@@ -1,15 +0,0 @@
-# Copyright Modal Labs 2025
-from datetime import datetime
-from typing import Optional
-
-
-def timestamp_to_local(ts: float, isotz: bool = True) -> Optional[str]:
-    if ts > 0:
-        locale_tz = datetime.now().astimezone().tzinfo
-        dt = datetime.fromtimestamp(ts, tz=locale_tz)
-        if isotz:
-            return dt.isoformat(sep=" ", timespec="seconds")
-        else:
-            return f"{datetime.strftime(dt, '%Y-%m-%d %H:%M')} {locale_tz.tzname(dt)}"
-    else:
-        return None