modal 1.0.0.dev4__tar.gz → 1.0.0.dev7__tar.gz

{modal-1.0.0.dev4 → modal-1.0.0.dev7}/PKG-INFO

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

{modal-1.0.0.dev4 → modal-1.0.0.dev7}/modal/app.py

@@ -30,7 +30,6 @@ from ._partial_function import (
 )
 from ._utils.async_utils import synchronize_api
 from ._utils.deprecation import (
-    deprecation_error,
     deprecation_warning,
     warn_on_renamed_autoscaler_settings,
 )
@@ -328,7 +327,6 @@ class _App:
         self,
         *,
         client: Optional[_Client] = None,
-        show_progress: Optional[bool] = None,
         detach: bool = False,
         interactive: bool = False,
         environment_name: Optional[str] = None,
@@ -374,16 +372,6 @@ class _App:
         """
         from .runner import _run_app  # Defer import of runner.py, which imports a lot from Rich
 
-        # See Github discussion here: https://github.com/modal-labs/modal-client/pull/2030#issuecomment-2237266186
-
-        if show_progress is True:
-            deprecation_error(
-                (2024, 11, 20),
-                "`show_progress=True` is no longer supported. Use `with modal.enable_output():` instead.",
-            )
-        elif show_progress is False:
-            deprecation_warning((2024, 11, 20), "`show_progress=False` is deprecated (and has no effect)")
-
         async with _run_app(
             self, client=client, detach=detach, interactive=interactive, environment_name=environment_name
         ):
@@ -1037,44 +1025,6 @@ class _App:
 
         return wrapper
 
-    async def spawn_sandbox(
-        self,
-        *entrypoint_args: str,
-        image: Optional[_Image] = None,  # The image to run as the container for the sandbox.
-        mounts: Sequence[_Mount] = (),  # Mounts to attach to the sandbox.
-        secrets: Sequence[_Secret] = (),  # Environment variables to inject into the sandbox.
-        network_file_systems: dict[Union[str, PurePosixPath], _NetworkFileSystem] = {},
-        timeout: Optional[int] = None,  # Maximum execution time of the sandbox in seconds.
-        workdir: Optional[str] = None,  # Working directory of the sandbox.
-        gpu: GPU_T = None,
-        cloud: Optional[str] = None,
-        region: Optional[Union[str, Sequence[str]]] = None,  # Region or regions to run the sandbox on.
-        # Specify, in fractional CPU cores, how many CPU cores to request.
-        # Or, pass (request, limit) to additionally specify a hard limit in fractional CPU cores.
-        # CPU throttling will prevent a container from exceeding its specified limit.
-        cpu: Optional[Union[float, tuple[float, float]]] = None,
-        # Specify, in MiB, a memory request which is the minimum memory required.
-        # Or, pass (request, limit) to additionally specify a hard limit in MiB.
-        memory: Optional[Union[int, tuple[int, int]]] = None,
-        block_network: bool = False,  # Whether to block network access
-        volumes: dict[
-            Union[str, PurePosixPath], Union[_Volume, _CloudBucketMount]
-        ] = {},  # Mount points for Modal Volumes and CloudBucketMounts
-        pty_info: Optional[api_pb2.PTYInfo] = None,
-        _experimental_scheduler_placement: Optional[
-            SchedulerPlacement
-        ] = None,  # Experimental controls over fine-grained scheduling (alpha).
-    ) -> None:
-        """mdmd:hidden"""
-        arglist = ", ".join(repr(s) for s in entrypoint_args)
-        message = (
-            "`App.spawn_sandbox` is deprecated.\n\n"
-            "Sandboxes can be created using the `Sandbox` object:\n\n"
-            f"```\nsb = Sandbox.create({arglist}, app=app)\n```\n\n"
-            "See https://modal.com/docs/guide/sandbox for more info on working with sandboxes."
-        )
-        deprecation_error((2024, 7, 5), message)
-
     def include(self, /, other_app: "_App") -> typing_extensions.Self:
         """Include another App's objects in this one.
 

{modal-1.0.0.dev4 → modal-1.0.0.dev7}/modal/app.pyi

@@ -20,7 +20,6 @@ import modal.schedule
 import modal.scheduler_placement
 import modal.secret
 import modal.volume
-import modal_proto.api_pb2
 import pathlib
 import synchronicity.combined_types
 import typing
@@ -134,7 +133,6 @@ class _App:
         self,
         *,
         client: typing.Optional[modal.client._Client] = None,
-        show_progress: typing.Optional[bool] = None,
         detach: bool = False,
         interactive: bool = False,
         environment_name: typing.Optional[str] = None,
@@ -263,30 +261,6 @@ class _App:
         _experimental_buffer_containers: typing.Optional[int] = None,
         allow_cross_region_volumes: typing.Optional[bool] = None,
     ) -> collections.abc.Callable[[typing.Union[CLS_T, modal._partial_function._PartialFunction]], CLS_T]: ...
-    async def spawn_sandbox(
-        self,
-        *entrypoint_args: str,
-        image: typing.Optional[modal.image._Image] = None,
-        mounts: collections.abc.Sequence[modal.mount._Mount] = (),
-        secrets: collections.abc.Sequence[modal.secret._Secret] = (),
-        network_file_systems: dict[
-            typing.Union[str, pathlib.PurePosixPath], modal.network_file_system._NetworkFileSystem
-        ] = {},
-        timeout: typing.Optional[int] = None,
-        workdir: typing.Optional[str] = None,
-        gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
-        cloud: typing.Optional[str] = None,
-        region: typing.Union[str, collections.abc.Sequence[str], None] = None,
-        cpu: typing.Union[float, tuple[float, float], None] = None,
-        memory: typing.Union[int, tuple[int, int], None] = None,
-        block_network: bool = False,
-        volumes: dict[
-            typing.Union[str, pathlib.PurePosixPath],
-            typing.Union[modal.volume._Volume, modal.cloud_bucket_mount._CloudBucketMount],
-        ] = {},
-        pty_info: typing.Optional[modal_proto.api_pb2.PTYInfo] = None,
-        _experimental_scheduler_placement: typing.Optional[modal.scheduler_placement.SchedulerPlacement] = None,
-    ) -> None: ...
     def include(self, /, other_app: _App) -> typing_extensions.Self: ...
     def _logs(
         self, client: typing.Optional[modal.client._Client] = None
@@ -381,7 +355,6 @@ class App:
             /,
             *,
             client: typing.Optional[modal.client.Client] = None,
-            show_progress: typing.Optional[bool] = None,
             detach: bool = False,
             interactive: bool = False,
             environment_name: typing.Optional[str] = None,
@@ -391,7 +364,6 @@ class App:
             /,
             *,
             client: typing.Optional[modal.client.Client] = None,
-            show_progress: typing.Optional[bool] = None,
             detach: bool = False,
             interactive: bool = False,
             environment_name: typing.Optional[str] = None,
@@ -537,61 +509,6 @@ class App:
         _experimental_buffer_containers: typing.Optional[int] = None,
         allow_cross_region_volumes: typing.Optional[bool] = None,
     ) -> collections.abc.Callable[[typing.Union[CLS_T, modal.partial_function.PartialFunction]], CLS_T]: ...
-
-    class __spawn_sandbox_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(
-            self,
-            /,
-            *entrypoint_args: str,
-            image: typing.Optional[modal.image.Image] = None,
-            mounts: collections.abc.Sequence[modal.mount.Mount] = (),
-            secrets: collections.abc.Sequence[modal.secret.Secret] = (),
-            network_file_systems: dict[
-                typing.Union[str, pathlib.PurePosixPath], modal.network_file_system.NetworkFileSystem
-            ] = {},
-            timeout: typing.Optional[int] = None,
-            workdir: typing.Optional[str] = None,
-            gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
-            cloud: typing.Optional[str] = None,
-            region: typing.Union[str, collections.abc.Sequence[str], None] = None,
-            cpu: typing.Union[float, tuple[float, float], None] = None,
-            memory: typing.Union[int, tuple[int, int], None] = None,
-            block_network: bool = False,
-            volumes: dict[
-                typing.Union[str, pathlib.PurePosixPath],
-                typing.Union[modal.volume.Volume, modal.cloud_bucket_mount.CloudBucketMount],
-            ] = {},
-            pty_info: typing.Optional[modal_proto.api_pb2.PTYInfo] = None,
-            _experimental_scheduler_placement: typing.Optional[modal.scheduler_placement.SchedulerPlacement] = None,
-        ) -> None: ...
-        async def aio(
-            self,
-            /,
-            *entrypoint_args: str,
-            image: typing.Optional[modal.image.Image] = None,
-            mounts: collections.abc.Sequence[modal.mount.Mount] = (),
-            secrets: collections.abc.Sequence[modal.secret.Secret] = (),
-            network_file_systems: dict[
-                typing.Union[str, pathlib.PurePosixPath], modal.network_file_system.NetworkFileSystem
-            ] = {},
-            timeout: typing.Optional[int] = None,
-            workdir: typing.Optional[str] = None,
-            gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
-            cloud: typing.Optional[str] = None,
-            region: typing.Union[str, collections.abc.Sequence[str], None] = None,
-            cpu: typing.Union[float, tuple[float, float], None] = None,
-            memory: typing.Union[int, tuple[int, int], None] = None,
-            block_network: bool = False,
-            volumes: dict[
-                typing.Union[str, pathlib.PurePosixPath],
-                typing.Union[modal.volume.Volume, modal.cloud_bucket_mount.CloudBucketMount],
-            ] = {},
-            pty_info: typing.Optional[modal_proto.api_pb2.PTYInfo] = None,
-            _experimental_scheduler_placement: typing.Optional[modal.scheduler_placement.SchedulerPlacement] = None,
-        ) -> None: ...
-
-    spawn_sandbox: __spawn_sandbox_spec[typing_extensions.Self]
-
     def include(self, /, other_app: App) -> typing_extensions.Self: ...
 
     class ___logs_spec(typing_extensions.Protocol[SUPERSELF]):

{modal-1.0.0.dev4 → modal-1.0.0.dev7}/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.0.dev4",
+        version: str = "1.0.0.dev7",
     ): ...
     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.0.dev4",
+        version: str = "1.0.0.dev7",
     ): ...
     def is_closed(self) -> bool: ...
     @property

{modal-1.0.0.dev4 → modal-1.0.0.dev7}/modal/container_process.py

@@ -6,7 +6,6 @@ from typing import Generic, Optional, TypeVar
 from modal_proto import api_pb2
 
 from ._utils.async_utils import TaskContext, synchronize_api
-from ._utils.deprecation import deprecation_error
 from ._utils.grpc_utils import retry_transient_errors
 from ._utils.shell_utils import stream_from_stdin, write_to_fd
 from .client import _Client
@@ -118,18 +117,11 @@ class _ContainerProcess(Generic[T]):
                 self._returncode = resp.exit_code
                 return self._returncode
 
-    async def attach(self, *, pty: Optional[bool] = None):
+    async def attach(self):
         if platform.system() == "Windows":
             print("interactive exec is not currently supported on Windows.")
             return
 
-        if pty is not None:
-            deprecation_error(
-                (2024, 12, 9),
-                "The `pty` argument to `modal.container_process.attach(pty=...)` is deprecated, "
-                "as only PTY mode is supported. Please remove the argument.",
-            )
-
         from rich.console import Console
 
         console = Console()

{modal-1.0.0.dev4 → modal-1.0.0.dev7}/modal/container_process.pyi

@@ -35,7 +35,7 @@ class _ContainerProcess(typing.Generic[T]):
     def returncode(self) -> int: ...
     async def poll(self) -> typing.Optional[int]: ...
     async def wait(self) -> int: ...
-    async def attach(self, *, pty: typing.Optional[bool] = None): ...
+    async def attach(self): ...
 
 SUPERSELF = typing.TypeVar("SUPERSELF", covariant=True)
 
@@ -80,7 +80,7 @@ class ContainerProcess(typing.Generic[T]):
     wait: __wait_spec[typing_extensions.Self]
 
     class __attach_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self, /, *, pty: typing.Optional[bool] = None): ...
-        async def aio(self, /, *, pty: typing.Optional[bool] = None): ...
+        def __call__(self, /): ...
+        async def aio(self, /): ...
 
     attach: __attach_spec[typing_extensions.Self]

{modal-1.0.0.dev4 → modal-1.0.0.dev7}/modal/runner.py

@@ -27,7 +27,6 @@ from ._pty import get_pty_info
 from ._resolver import Resolver
 from ._traceback import print_server_warnings, traceback_contains_remote_call
 from ._utils.async_utils import TaskContext, gather_cancel_on_exc, synchronize_api
-from ._utils.deprecation import deprecation_error
 from ._utils.git_utils import get_git_commit_info
 from ._utils.grpc_utils import retry_transient_errors
 from ._utils.name_utils import check_object_name, is_valid_tag
@@ -632,24 +631,7 @@ async def _interactive_shell(
                 raise
 
 
-def _run_stub(*args: Any, **kwargs: Any):
-    """mdmd:hidden
-    `run_stub` has been renamed to `run_app` and is deprecated. Please update your code.
-    """
-    deprecation_error(
-        (2024, 5, 1), "`run_stub` has been renamed to `run_app` and is deprecated. Please update your code."
-    )
-
-
-def _deploy_stub(*args: Any, **kwargs: Any):
-    """mdmd:hidden"""
-    message = "`deploy_stub` has been renamed to `deploy_app`. Please update your code."
-    deprecation_error((2024, 5, 1), message)
-
-
 run_app = synchronize_api(_run_app)
 serve_update = synchronize_api(_serve_update)
 deploy_app = synchronize_api(_deploy_app)
 interactive_shell = synchronize_api(_interactive_shell)
-run_stub = synchronize_api(_run_stub)
-deploy_stub = synchronize_api(_deploy_stub)

{modal-1.0.0.dev4 → modal-1.0.0.dev7}/modal/runner.pyi

@@ -83,8 +83,6 @@ async def _deploy_app(
 async def _interactive_shell(
     _app: _App, cmds: list[str], environment_name: str = "", pty: bool = True, **kwargs: typing.Any
 ) -> None: ...
-def _run_stub(*args: typing.Any, **kwargs: typing.Any): ...
-def _deploy_stub(*args: typing.Any, **kwargs: typing.Any): ...
 
 class __run_app_spec(typing_extensions.Protocol):
     def __call__(
@@ -153,6 +151,3 @@ class __interactive_shell_spec(typing_extensions.Protocol):
     ) -> None: ...
 
 interactive_shell: __interactive_shell_spec
-
-def run_stub(*args: typing.Any, **kwargs: typing.Any): ...
-def deploy_stub(*args: typing.Any, **kwargs: typing.Any): ...

{modal-1.0.0.dev4 → modal-1.0.0.dev7}/modal/sandbox.py

@@ -762,23 +762,3 @@ class _Sandbox(_Object, type_prefix="sb"):
 
 
 Sandbox = synchronize_api(_Sandbox)
-
-
-def __getattr__(name):
-    if name == "LogsReader":
-        deprecation_error(
-            (2024, 8, 12),
-            "`modal.sandbox.LogsReader` is deprecated. Please import `modal.io_streams.StreamReader` instead.",
-        )
-        from .io_streams import StreamReader
-
-        return StreamReader
-    elif name == "StreamWriter":
-        deprecation_error(
-            (2024, 8, 12),
-            "`modal.sandbox.StreamWriter` is deprecated. Please import `modal.io_streams.StreamWriter` instead.",
-        )
-        from .io_streams import StreamWriter
-
-        return StreamWriter
-    raise AttributeError(f"module {__name__} has no attribute {name}")

{modal-1.0.0.dev4 → modal-1.0.0.dev7}/modal/sandbox.pyi

@@ -484,6 +484,4 @@ class Sandbox(modal.object.Object):
 
     list: __list_spec
 
-def __getattr__(name): ...
-
 _default_image: modal.image._Image

{modal-1.0.0.dev4 → modal-1.0.0.dev7}/modal/serving.py

@@ -11,7 +11,6 @@ from synchronicity.async_wrap import asynccontextmanager
 from modal._output import OutputManager
 
 from ._utils.async_utils import TaskContext, asyncify, synchronize_api, synchronizer
-from ._utils.deprecation import deprecation_error
 from ._utils.logger import logger
 from ._watcher import watch
 from .cli.import_refs import ImportRef, import_app_from_ref
@@ -122,9 +121,4 @@ async def _serve_app(
             yield app
 
 
-def _serve_stub(*args, **kwargs):
-    deprecation_error((2024, 5, 1), "`serve_stub` is deprecated. Please use `serve_app` instead.")
-
-
 serve_app = synchronize_api(_serve_app)
-serve_stub = synchronize_api(_serve_stub)

{modal-1.0.0.dev4 → modal-1.0.0.dev7}/modal/serving.pyi

@@ -33,7 +33,6 @@ def _serve_app(
     _watcher: typing.Optional[collections.abc.AsyncGenerator[set[str], None]] = None,
     environment_name: typing.Optional[str] = None,
 ) -> typing.AsyncContextManager[_App]: ...
-def _serve_stub(*args, **kwargs): ...
 
 class __serve_app_spec(typing_extensions.Protocol):
     def __call__(
@@ -56,5 +55,3 @@ class __serve_app_spec(typing_extensions.Protocol):
     ) -> typing.AsyncContextManager[_App]: ...
 
 serve_app: __serve_app_spec
-
-def serve_stub(*args, **kwargs): ...

{modal-1.0.0.dev4 → modal-1.0.0.dev7}/modal/volume.py

@@ -27,7 +27,7 @@ from grpclib import GRPCError, Status
 from synchronicity.async_wrap import asynccontextmanager
 
 import modal_proto.api_pb2
-from modal.exception import VolumeUploadTimeoutError
+from modal.exception import InvalidError, VolumeUploadTimeoutError
 from modal_proto import api_pb2
 
 from ._object import EPHEMERAL_OBJECT_HEARTBEAT_SLEEP, _get_environment_name, _Object, live_method, live_method_gen
@@ -49,7 +49,7 @@ from ._utils.blob_utils import (
     get_file_upload_spec_from_fileobj,
     get_file_upload_spec_from_path,
 )
-from ._utils.deprecation import deprecation_error, deprecation_warning
+from ._utils.deprecation import deprecation_warning
 from ._utils.grpc_utils import retry_transient_errors
 from ._utils.http_utils import ClientSessionRegistry
 from ._utils.name_utils import check_object_name
@@ -364,21 +364,14 @@ class _Volume(_Object, type_prefix="vo"):
         recursively.
         """
         if path.endswith("**"):
-            msg = (
+            raise InvalidError(
                 "Glob patterns in `volume get` and `Volume.listdir()` are deprecated. "
                 "Please pass recursive=True instead. For the CLI, just remove the glob suffix."
             )
-            deprecation_error(
-                (2024, 4, 23),
-                msg,
-            )
         elif path.endswith("*"):
-            deprecation_error(
-                (2024, 4, 23),
-                (
-                    "Glob patterns in `volume get` and `Volume.listdir()` are deprecated. "
-                    "Please remove the glob `*` suffix."
-                ),
+            raise InvalidError(
+                "Glob patterns in `volume get` and `Volume.listdir()` are deprecated. "
+                "Please remove the glob `*` suffix."
             )
 
         req = api_pb2.VolumeListFilesRequest(volume_id=self.object_id, path=path, recursive=recursive)

{modal-1.0.0.dev4 → modal-1.0.0.dev7}/modal.egg-info/PKG-INFO

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

{modal-1.0.0.dev4 → modal-1.0.0.dev7}/modal_proto/api.proto

@@ -2786,7 +2786,7 @@ message TaskLogs {
   TaskProgress task_progress = 9;
   string function_call_id = 10;
   string input_id = 11;
-  string id = 12;
+  uint64 timestamp_ns = 12;
 }
 
 message TaskLogsBatch {