modal 1.0.1.dev3__tar.gz → 1.0.1.dev5__tar.gz

{modal-1.0.1.dev3 → modal-1.0.1.dev5}/PKG-INFO

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

{modal-1.0.1.dev3 → modal-1.0.1.dev5}/modal/_output.py

@@ -32,6 +32,7 @@ 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
@@ -81,22 +82,27 @@ def download_progress_bar() -> Progress:
     )
 
 
-class LineBufferedOutput(io.StringIO):
+class LineBufferedOutput:
     """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]):
+    def __init__(self, callback: Callable[[str], None], show_timestamps: bool):
         self._callback = callback
         self._buf = ""
+        self._show_timestamps = show_timestamps
 
-    def write(self, data: str):
-        chunks = self.LINE_REGEX.split(self._buf + data)
+    def write(self, log: api_pb2.TaskLogs):
+        chunks = self.LINE_REGEX.split(self._buf + log.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]
 
@@ -136,12 +142,14 @@ 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)
@@ -156,6 +164,7 @@ 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):
@@ -355,9 +364,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))
+            stream = LineBufferedOutput(functools.partial(self._print_log, log.file_descriptor), self._show_timestamps)
             self._line_buffers[log.file_descriptor] = stream
-        stream.write(log.data)
+        stream.write(log)
 
     def flush_lines(self):
         for stream in self._line_buffers.values():

modal-1.0.1.dev5/modal/_utils/time_utils.py

@@ -0,0 +1,15 @@
+# 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

{modal-1.0.1.dev3 → modal-1.0.1.dev5}/modal/cli/app.py

@@ -15,7 +15,8 @@ from modal.client import _Client
 from modal.environments import ensure_env
 from modal_proto import api_pb2
 
-from .utils import ENV_OPTION, display_table, get_app_id_from_name, stream_app_logs, timestamp_to_local
+from .._utils.time_utils import timestamp_to_local
+from .utils import ENV_OPTION, display_table, get_app_id_from_name, stream_app_logs
 
 APP_IDENTIFIER = Argument("", help="App name or ID")
 NAME_OPTION = typer.Option("", "-n", "--name", help="Deprecated: Pass App name as a positional argument")
@@ -84,6 +85,7 @@ 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.
 
@@ -103,7 +105,7 @@ def logs(
 
     """
     app_id = get_app_id(app_identifier, env)
-    stream_app_logs(app_id)
+    stream_app_logs(app_id, show_timestamps=timestamps)
 
 
 @app_cli.command("rollback", no_args_is_help=True, context_settings={"ignore_unknown_options": True})

{modal-1.0.1.dev3 → modal-1.0.1.dev5}/modal/cli/cluster.py

@@ -8,7 +8,8 @@ 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.cli.utils import ENV_OPTION, display_table, is_tty, timestamp_to_local
+from modal._utils.time_utils import timestamp_to_local
+from modal.cli.utils import ENV_OPTION, display_table, is_tty
 from modal.client import _Client
 from modal.config import config
 from modal.container_process import _ContainerProcess

{modal-1.0.1.dev3 → modal-1.0.1.dev5}/modal/cli/container.py

@@ -8,7 +8,8 @@ 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.cli.utils import ENV_OPTION, display_table, is_tty, stream_app_logs, timestamp_to_local
+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.client import _Client
 from modal.config import config
 from modal.container_process import _ContainerProcess

{modal-1.0.1.dev3 → modal-1.0.1.dev5}/modal/cli/dict.py

@@ -8,7 +8,8 @@ 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.cli.utils import ENV_OPTION, YES_OPTION, display_table, timestamp_to_local
+from modal._utils.time_utils import timestamp_to_local
+from modal.cli.utils import ENV_OPTION, YES_OPTION, display_table
 from modal.client import _Client
 from modal.dict import _Dict
 from modal.environments import ensure_env

{modal-1.0.1.dev3 → modal-1.0.1.dev5}/modal/cli/network_file_system.py

@@ -17,8 +17,9 @@ 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, timestamp_to_local
+from modal.cli.utils import ENV_OPTION, YES_OPTION, display_table
 from modal.client import _Client
 from modal.environments import ensure_env
 from modal.network_file_system import _NetworkFileSystem

{modal-1.0.1.dev3 → modal-1.0.1.dev5}/modal/cli/queues.py

@@ -8,7 +8,8 @@ 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.cli.utils import ENV_OPTION, YES_OPTION, display_table, timestamp_to_local
+from modal._utils.time_utils import timestamp_to_local
+from modal.cli.utils import ENV_OPTION, YES_OPTION, display_table
 from modal.client import _Client
 from modal.environments import ensure_env
 from modal.queue import _Queue

{modal-1.0.1.dev3 → modal-1.0.1.dev5}/modal/cli/secret.py

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

{modal-1.0.1.dev3 → modal-1.0.1.dev5}/modal/cli/utils.py

@@ -1,7 +1,6 @@
 # Copyright Modal Labs 2022
 import asyncio
 from collections.abc import Sequence
-from datetime import datetime
 from json import dumps
 from typing import Optional, Union
 
@@ -23,10 +22,13 @@ 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
+    app_id: Optional[str] = None,
+    task_id: Optional[str] = None,
+    app_logs_url: Optional[str] = None,
+    show_timestamps: bool = False,
 ):
     client = await _Client.from_env()
-    output_mgr = OutputManager(status_spinner_text=f"Tailing logs for {app_id}")
+    output_mgr = OutputManager(status_spinner_text=f"Tailing logs for {app_id}", show_timestamps=show_timestamps)
     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)
@@ -61,18 +63,6 @@ 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.dev3 → modal-1.0.1.dev5}/modal/cli/volume.py

@@ -15,8 +15,9 @@ 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, timestamp_to_local
+from modal.cli.utils import ENV_OPTION, YES_OPTION, display_table
 from modal.client import _Client
 from modal.environments import ensure_env
 from modal.volume import _AbstractVolumeUploadContextManager, _Volume
@@ -203,7 +204,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:
@@ -219,7 +220,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.dev3 → modal-1.0.1.dev5}/modal/client.py

@@ -3,6 +3,7 @@ import asyncio
 import os
 import platform
 import sys
+import urllib.parse
 import warnings
 from collections.abc import AsyncGenerator, AsyncIterator, Collection, Mapping
 from typing import (
@@ -50,8 +51,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": platform.node(),
-        "x-modal-platform": platform_str,
+        "x-modal-node": urllib.parse.quote(platform.node()),
+        "x-modal-platform": urllib.parse.quote(platform_str),
     }
     if credentials and client_type == api_pb2.CLIENT_TYPE_CLIENT:
         token_id, token_secret = credentials

{modal-1.0.1.dev3 → modal-1.0.1.dev5}/modal/client.pyi

@@ -31,7 +31,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.0.1.dev3",
+        version: str = "1.0.1.dev5",
     ): ...
     def is_closed(self) -> bool: ...
     @property
@@ -94,7 +94,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.0.1.dev3",
+        version: str = "1.0.1.dev5",
     ): ...
     def is_closed(self) -> bool: ...
     @property

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

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

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

@@ -119,6 +119,7 @@ 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.dev3 → modal-1.0.1.dev5}/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.dev3"
+__version__ = "1.0.1.dev5"