modAL 1.3.1.dev18__tar.gz → 1.3.1.dev20__tar.gz

{modal-1.3.1.dev18 → modal-1.3.1.dev20}/PKG-INFO

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

{modal-1.3.1.dev18 → modal-1.3.1.dev20}/modal/_output.py

@@ -169,9 +169,9 @@ class OutputManager:
 
     @classmethod
     @contextlib.contextmanager
-    def enable_output(cls, show_progress: bool = True) -> Generator[None]:
+    def enable_output(cls, show_progress: bool = True, show_timestamps: bool = False) -> Generator[None]:
         if show_progress:
-            cls._instance = OutputManager()
+            cls._instance = OutputManager(show_timestamps=show_timestamps)
         try:
             yield
         finally:

{modal-1.3.1.dev18 → modal-1.3.1.dev20}/modal/cli/run.py

@@ -185,7 +185,8 @@ def _make_click_function(app, signature: CliRunnableSignature, inner: Callable[[
         _validate_interactive_quiet_params(ctx)
 
         show_progress: bool = ctx.obj["show_progress"]
-        with enable_output(show_progress):
+        show_timestamps: bool = ctx.obj["show_timestamps"]
+        with enable_output(show_progress, show_timestamps=show_timestamps):
             with run_app(
                 app,
                 detach=ctx.obj["detach"],
@@ -314,7 +315,8 @@ def _get_click_command_for_local_entrypoint(app: App, entrypoint: LocalEntrypoin
         _validate_interactive_quiet_params(ctx)
 
         show_progress: bool = ctx.obj["show_progress"]
-        with enable_output(show_progress):
+        show_timestamps: bool = ctx.obj["show_timestamps"]
+        with enable_output(show_progress, show_timestamps=show_timestamps):
             with run_app(
                 app,
                 detach=ctx.obj["detach"],
@@ -404,8 +406,9 @@ class RunGroup(click.Group):
 @click.option("-i", "--interactive", is_flag=True, help="Run the app in interactive mode.")
 @click.option("-e", "--env", help=ENV_OPTION_HELP, default=None)
 @click.option("-m", is_flag=True, help="Interpret argument as a Python module path instead of a file/script path")
+@click.option("--timestamps", is_flag=True, help="Show timestamps for each log line.")
 @click.pass_context
-def run(ctx, write_result, detach, quiet, interactive, env, m):
+def run(ctx, write_result, detach, quiet, interactive, env, m, timestamps):
     """Run a Modal function or local entrypoint.
 
     `FUNC_REF` should be of the format `{file or module}::{function name}`.
@@ -442,6 +445,7 @@ def run(ctx, write_result, detach, quiet, interactive, env, m):
     ctx.obj["detach"] = detach  # if subcommand would be a click command...
     ctx.obj["show_progress"] = False if quiet else True
     ctx.obj["interactive"] = interactive
+    ctx.obj["show_timestamps"] = timestamps
 
 
 def deploy(
@@ -453,6 +457,7 @@ def deploy(
     use_module_mode: bool = typer.Option(
         False, "-m", help="Interpret argument as a Python module path instead of a file/script path"
     ),
+    timestamps: bool = typer.Option(False, "--timestamps", help="Show timestamps for each log line."),
 ):
     """Deploy a Modal application.
 
@@ -477,11 +482,11 @@ def deploy(
             "modal deploy ... --name=some-name"
         )
 
-    with enable_output():
+    with enable_output(show_timestamps=timestamps):
         res = deploy_app(app, name=name, environment_name=env or "", tag=tag)
 
     if stream_logs:
-        stream_app_logs(app_id=res.app_id, app_logs_url=res.app_logs_url)
+        stream_app_logs(app_id=res.app_id, app_logs_url=res.app_logs_url, show_timestamps=timestamps)
 
 
 def serve(
@@ -491,6 +496,7 @@ def serve(
     use_module_mode: bool = typer.Option(
         False, "-m", help="Interpret argument as a Python module path instead of a file/script path"
     ),
+    timestamps: bool = typer.Option(False, "--timestamps", help="Show timestamps for each log line."),
 ):
     """Run a web endpoint(s) associated with a Modal app and hot-reload code.
 
@@ -512,7 +518,7 @@ def serve(
     if app.description is None:
         app.set_description(_get_clean_app_description(app_ref))
 
-    with enable_output():
+    with enable_output(show_timestamps=timestamps):
         with serve_app(app, import_ref, environment_name=env):
             if timeout is None:
                 timeout = config["serve_timeout"]

{modal-1.3.1.dev18 → modal-1.3.1.dev20}/modal/client.pyi

@@ -33,7 +33,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.3.1.dev18",
+        version: str = "1.3.1.dev20",
     ):
         """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.3.1.dev18",
+        version: str = "1.3.1.dev20",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.3.1.dev18 → modal-1.3.1.dev20}/modal/functions.pyi

@@ -407,7 +407,7 @@ class Function(
 
     _call_generator: ___call_generator_spec
 
-    class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
+    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> ReturnType_INNER:
             """Calls the function remotely, executing it with the given arguments and returning the execution's result."""
             ...
@@ -416,7 +416,7 @@ class Function(
             """Calls the function remotely, executing it with the given arguments and returning the execution's result."""
             ...
 
-    remote: __remote_spec[modal._functions.P, modal._functions.ReturnType]
+    remote: __remote_spec[modal._functions.ReturnType, modal._functions.P]
 
     class __remote_gen_spec(typing_extensions.Protocol):
         def __call__(self, /, *args, **kwargs) -> typing.Generator[typing.Any, None, None]:
@@ -443,7 +443,7 @@ class Function(
         """
         ...
 
-    class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
+    class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]:
             """[Experimental] Calls the function with the given arguments, without waiting for the results.
 
@@ -466,7 +466,7 @@ class Function(
             """
             ...
 
-    _experimental_spawn: ___experimental_spawn_spec[modal._functions.P, modal._functions.ReturnType]
+    _experimental_spawn: ___experimental_spawn_spec[modal._functions.ReturnType, modal._functions.P]
 
     class ___spawn_map_inner_spec(typing_extensions.Protocol[P_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> None: ...
@@ -474,7 +474,7 @@ class Function(
 
     _spawn_map_inner: ___spawn_map_inner_spec[modal._functions.P]
 
-    class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
+    class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]:
             """Calls the function with the given arguments, without waiting for the results.
 
@@ -495,7 +495,7 @@ class Function(
             """
             ...
 
-    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType]
+    spawn: __spawn_spec[modal._functions.ReturnType, modal._functions.P]
 
     def get_raw_f(self) -> collections.abc.Callable[..., typing.Any]:
         """Return the inner Python object wrapped by this Modal Function."""

{modal-1.3.1.dev18 → modal-1.3.1.dev20}/modal/output.py

@@ -19,7 +19,7 @@ OUTPUT_ENABLED = False
 
 
 @contextlib.contextmanager
-def enable_output(show_progress: bool = True) -> Generator[None, None, None]:
+def enable_output(show_progress: bool = True, show_timestamps: bool = False) -> Generator[None, None, None]:
     """Context manager that enable output when using the Python SDK.
 
     This will print to stdout and stderr things such as
@@ -47,7 +47,7 @@ def enable_output(show_progress: bool = True) -> Generator[None, None, None]:
     global OUTPUT_ENABLED
 
     try:
-        with OutputManager.enable_output(show_progress):
+        with OutputManager.enable_output(show_progress, show_timestamps=show_timestamps):
             OUTPUT_ENABLED = True
             yield
     finally:

{modal-1.3.1.dev18 → modal-1.3.1.dev20}/modal.egg-info/PKG-INFO

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

{modal-1.3.1.dev18 → modal-1.3.1.dev20}/modal_version/__init__.py

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