modAL 1.0.2__tar.gz → 1.0.2.dev1__tar.gz

{modal-1.0.2 → modal-1.0.2.dev1}/PKG-INFO

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

{modal-1.0.2 → modal-1.0.2.dev1}/modal/_functions.py

@@ -815,11 +815,6 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
                 if app and app.name:
                     app_name = app.name
 
-                # on builder > 2024.10 we mount client dependencies at runtime
-                mount_client_dependencies = False
-                if image._metadata is not None:
-                    mount_client_dependencies = image._metadata.image_builder_version > "2024.10"
-
                 # Relies on dicts being ordered (true as of Python 3.6).
                 volume_mounts = [
                     api_pb2.VolumeMount(
@@ -889,7 +884,6 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
                     schedule=schedule.proto_message if schedule is not None else None,
                     snapshot_debug=config.get("snapshot_debug"),
                     experimental_options=experimental_options or {},
-                    mount_client_dependencies=mount_client_dependencies,
                     # ---
                     _experimental_group_size=cluster_size or 0,  # Experimental: Clustered functions
                     _experimental_concurrent_cancellations=True,

{modal-1.0.2 → modal-1.0.2.dev1}/modal/_utils/bytes_io_segment_payload.py

@@ -8,14 +8,14 @@ from typing import BinaryIO, Callable, Optional
 # Note: this module needs to import aiohttp in global scope
 # This takes about 50ms and isn't needed in many cases for Modal execution
 # To avoid this, we import it in local scope when needed (blob_utils.py)
-from aiohttp import Payload
+from aiohttp import BytesIOPayload
 from aiohttp.abc import AbstractStreamWriter
 
 # read ~16MiB chunks by default
 DEFAULT_SEGMENT_CHUNK_SIZE = 2**24
 
 
-class BytesIOSegmentPayload(Payload):
+class BytesIOSegmentPayload(BytesIOPayload):
     """Modified bytes payload for concurrent sends of chunks from the same file.
 
     Adds:
@@ -26,8 +26,6 @@ class BytesIOSegmentPayload(Payload):
     Feels like this should be in some standard lib...
     """
 
-    _value: BinaryIO
-
     def __init__(
         self,
         bytes_io: BinaryIO,  # should *not* be shared as IO position modification is not locked
@@ -38,7 +36,6 @@ class BytesIOSegmentPayload(Payload):
     ):
         # not thread safe constructor!
         super().__init__(bytes_io)
-        self._size = segment_length
         self.initial_seek_pos = bytes_io.tell()
         self.segment_start = segment_start
         self.segment_length = segment_length
@@ -49,26 +46,18 @@ class BytesIOSegmentPayload(Payload):
         self.progress_report_cb = progress_report_cb or (lambda *_, **__: None)
         self.reset_state()
 
-    def decode(self, encoding: str = "utf-8", errors: str = "strict") -> str:
-        self._value.seek(self.initial_seek_pos)
-        return self._value.read().decode(encoding, errors)
-
     def reset_state(self):
         self._md5_checksum = hashlib.md5()
         self.num_bytes_read = 0
         self._value.seek(self.initial_seek_pos)
 
     @contextmanager
-    def reset_on_error(self, subtract_progress: bool = False):
+    def reset_on_error(self):
         try:
             yield
         except Exception as exc:
             try:
-                if subtract_progress:
-                    negative_progress = -self.num_bytes_read
-                    self.progress_report_cb(advance=negative_progress)
-                else:
-                    self.progress_report_cb(reset=True)
+                self.progress_report_cb(reset=True)
             except Exception as cb_exc:
                 raise cb_exc from exc
             raise exc
@@ -83,21 +72,14 @@ class BytesIOSegmentPayload(Payload):
         return self._md5_checksum
 
     async def write(self, writer: "AbstractStreamWriter"):
-        # On aiohttp < 3.12.0 - this is the method that's being called on a custom payload,
-        # but on aiohttp 3.12+ `write_with_length` is called directly.
-        await self.write_with_length(writer, None)
-
-    async def write_with_length(self, writer: AbstractStreamWriter, content_length: Optional[int]):
         loop = asyncio.get_event_loop()
 
         async def safe_read():
             read_start = self.initial_seek_pos + self.segment_start + self.num_bytes_read
             self._value.seek(read_start)
             num_bytes = min(self.chunk_size, self.remaining_bytes())
-            if content_length is not None:
-                num_bytes = min(num_bytes, content_length)
-
             chunk = await loop.run_in_executor(None, self._value.read, num_bytes)
+
             await loop.run_in_executor(None, self._md5_checksum.update, chunk)
             self.num_bytes_read += len(chunk)
             return chunk

{modal-1.0.2 → modal-1.0.2.dev1}/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.2"
+        self,
+        server_url: str,
+        client_type: int,
+        credentials: typing.Optional[tuple[str, str]],
+        version: str = "1.0.2.dev1",
     ): ...
     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.2"
+        self,
+        server_url: str,
+        client_type: int,
+        credentials: typing.Optional[tuple[str, str]],
+        version: str = "1.0.2.dev1",
     ): ...
     def is_closed(self) -> bool: ...
     @property

{modal-1.0.2 → modal-1.0.2.dev1}/modal/exception.py

@@ -161,8 +161,6 @@ def simulate_preemption(wait_seconds: int, jitter_seconds: int = 0):
     See https://modal.com/docs/guide/preemption for more details on preemption
     handling.
     """
-    if wait_seconds <= 0:
-        raise ValueError("Time to wait must be greater than 0")
     signal.signal(signal.SIGALRM, _simulate_preemption_interrupt)
     jitter = random.randrange(0, jitter_seconds) if jitter_seconds else 0
     signal.alarm(wait_seconds + jitter)

{modal-1.0.2 → modal-1.0.2.dev1}/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.2 → modal-1.0.2.dev1}/modal/image.py

@@ -1442,9 +1442,7 @@ class _Image(_Object, type_prefix="im"):
             if version > "2024.10":
                 # for convenience when launching in a sandbox: sleep for 48h
                 commands.append(f'CMD ["sleep", "{48 * 3600}"]')
-            context_files = {}
-            if version <= "2024.10":
-                context_files = {CONTAINER_REQUIREMENTS_PATH: _get_modal_requirements_path(version, python_version)}
+            context_files = {CONTAINER_REQUIREMENTS_PATH: _get_modal_requirements_path(version, python_version)}
             return DockerfileSpec(commands=commands, context_files=context_files)
 
         return _Image._from_args(
@@ -1519,15 +1517,12 @@ class _Image(_Object, type_prefix="im"):
 
         # Note: this change is because we install dependencies with uv in 2024.10+
         requirements_prefix = "python -m " if builder_version < "2024.10" else ""
-        modal_requirements_commands = []
-        if builder_version <= "2024.10":
-            # past 2024.10, client dependencies are mounted at runtime
-            modal_requirements_commands.extend([
-                f"COPY {CONTAINER_REQUIREMENTS_PATH} {CONTAINER_REQUIREMENTS_PATH}",
-                f"RUN python -m pip install --upgrade {_base_image_config('package_tools', builder_version)}",
-                f"RUN {requirements_prefix}{_get_modal_requirements_command(builder_version)}",
-            ])
-        if  "2024.10" >= builder_version > "2023.12":
+        modal_requirements_commands = [
+            f"COPY {CONTAINER_REQUIREMENTS_PATH} {CONTAINER_REQUIREMENTS_PATH}",
+            f"RUN python -m pip install --upgrade {_base_image_config('package_tools', builder_version)}",
+            f"RUN {requirements_prefix}{_get_modal_requirements_command(builder_version)}",
+        ]
+        if builder_version > "2023.12":
             modal_requirements_commands.append(f"RUN rm {CONTAINER_REQUIREMENTS_PATH}")
 
         return [
@@ -1590,9 +1585,7 @@ class _Image(_Object, type_prefix="im"):
 
         def build_dockerfile(version: ImageBuilderVersion) -> DockerfileSpec:
             commands = _Image._registry_setup_commands(tag, version, setup_dockerfile_commands, add_python)
-            context_files = {}
-            if version <= "2024.10":
-                context_files = {CONTAINER_REQUIREMENTS_PATH: _get_modal_requirements_path(version, add_python)}
+            context_files = {CONTAINER_REQUIREMENTS_PATH: _get_modal_requirements_path(version, add_python)}
             return DockerfileSpec(commands=commands, context_files=context_files)
 
         return _Image._from_args(
@@ -1799,10 +1792,8 @@ class _Image(_Object, type_prefix="im"):
 
         def build_dockerfile_python(version: ImageBuilderVersion) -> DockerfileSpec:
             commands = _Image._registry_setup_commands("base", version, [], add_python)
-            context_files = {}
-            if version <= "2024.10":
-                requirements_path = _get_modal_requirements_path(version, add_python)
-                context_files = {CONTAINER_REQUIREMENTS_PATH: requirements_path}
+            requirements_path = _get_modal_requirements_path(version, add_python)
+            context_files = {CONTAINER_REQUIREMENTS_PATH: requirements_path}
             return DockerfileSpec(commands=commands, context_files=context_files)
 
         return _Image._from_args(
@@ -1819,35 +1810,22 @@ class _Image(_Object, type_prefix="im"):
             raise TypeError("The `python_version` argument should be a string, not a float.")
 
         def build_dockerfile(version: ImageBuilderVersion) -> DockerfileSpec:
-            context_files = {}
-            if version <= "2024.10":
-                requirements_path = _get_modal_requirements_path(version, python_version)
-                context_files = {CONTAINER_REQUIREMENTS_PATH: requirements_path}
+            requirements_path = _get_modal_requirements_path(version, python_version)
+            context_files = {CONTAINER_REQUIREMENTS_PATH: requirements_path}
             full_python_version = _dockerhub_python_version(version, python_version)
             debian_codename = _base_image_config("debian", version)
 
             commands = [
                 f"FROM python:{full_python_version}-slim-{debian_codename}",
-            ]
-            if version <= "2024.10":
-                commands.extend([
-                    f"COPY {CONTAINER_REQUIREMENTS_PATH} {CONTAINER_REQUIREMENTS_PATH}",
-                ])
-            commands.extend([
+                f"COPY {CONTAINER_REQUIREMENTS_PATH} {CONTAINER_REQUIREMENTS_PATH}",
                 "RUN apt-get update",
                 "RUN apt-get install -y gcc gfortran build-essential",
                 f"RUN pip install --upgrade {_base_image_config('package_tools', version)}",
-            ])
-            if version <= "2024.10":
-                # after 2024.10, modal requirements are mounted at runtime
-                commands.extend([
-                    f"RUN {_get_modal_requirements_command(version)}",
-                ])
-            commands.extend([
+                f"RUN {_get_modal_requirements_command(version)}",
                 # Set debian front-end to non-interactive to avoid users getting stuck with input prompts.
                 "RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections",
-            ])
-            if "2024.10" >= version > "2023.12":
+            ]
+            if version > "2023.12":
                 commands.append(f"RUN rm {CONTAINER_REQUIREMENTS_PATH}")
             if version > "2024.10":
                 # for convenience when launching in a sandbox: sleep for 48h

{modal-1.0.2 → modal-1.0.2.dev1}/modal/sandbox.py

@@ -252,8 +252,7 @@ class _Sandbox(_Object, type_prefix="sb"):
         client: Optional[_Client] = None,
     ) -> "_Sandbox":
         """
-        Create a new Sandbox to run untrusted, arbitrary code. The Sandbox's corresponding container
-        will be created asynchronously.
+        Create a new Sandbox to run untrusted, arbitrary code.
 
         **Usage**
 

{modal-1.0.2 → modal-1.0.2.dev1}/modal/volume.py

@@ -38,7 +38,6 @@ from ._utils.async_utils import (
     async_map,
     async_map_ordered,
     asyncnullcontext,
-    retry,
     synchronize_api,
 )
 from ._utils.blob_utils import (
@@ -376,16 +375,10 @@ class _Volume(_Object, type_prefix="vo"):
                 "Please remove the glob `*` suffix."
             )
 
-        if self._is_v1:
-            req = api_pb2.VolumeListFilesRequest(volume_id=self.object_id, path=path, recursive=recursive)
-            async for batch in self._client.stub.VolumeListFiles.unary_stream(req):
-                for entry in batch.entries:
-                    yield FileEntry._from_proto(entry)
-        else:
-            req = api_pb2.VolumeListFiles2Request(volume_id=self.object_id, path=path, recursive=recursive)
-            async for batch in self._client.stub.VolumeListFiles2.unary_stream(req):
-                for entry in batch.entries:
-                    yield FileEntry._from_proto(entry)
+        req = api_pb2.VolumeListFilesRequest(volume_id=self.object_id, path=path, recursive=recursive)
+        async for batch in self._client.stub.VolumeListFiles.unary_stream(req):
+            for entry in batch.entries:
+                yield FileEntry._from_proto(entry)
 
     @live_method
     async def listdir(self, path: str, *, recursive: bool = False) -> list[FileEntry]:
@@ -506,7 +499,7 @@ class _Volume(_Object, type_prefix="vo"):
             num_bytes_written = 0
 
             async with download_semaphore, ClientSessionRegistry.get_session().get(url) as get_response:
-                async for chunk in get_response.content.iter_any():
+                async for chunk in get_response.content:
                     num_chunk_bytes_written = 0
 
                     while num_chunk_bytes_written < len(chunk):
@@ -533,12 +526,8 @@ class _Volume(_Object, type_prefix="vo"):
     @live_method
     async def remove_file(self, path: str, recursive: bool = False) -> None:
         """Remove a file or directory from a volume."""
-        if self._is_v1:
-            req = api_pb2.VolumeRemoveFileRequest(volume_id=self.object_id, path=path, recursive=recursive)
-            await retry_transient_errors(self._client.stub.VolumeRemoveFile, req)
-        else:
-            req = api_pb2.VolumeRemoveFile2Request(volume_id=self.object_id, path=path, recursive=recursive)
-            await retry_transient_errors(self._client.stub.VolumeRemoveFile2, req)
+        req = api_pb2.VolumeRemoveFileRequest(volume_id=self.object_id, path=path, recursive=recursive)
+        await retry_transient_errors(self._client.stub.VolumeRemoveFile, req)
 
     @live_method
     async def copy_files(self, src_paths: Sequence[str], dst_path: str) -> None:
@@ -836,7 +825,7 @@ class _VolumeUploadContextManager2(_AbstractVolumeUploadContextManager):
         progress_cb: Optional[Callable[..., Any]] = None,
         force: bool = False,
         hash_concurrency: int = multiprocessing.cpu_count(),
-        put_concurrency: int = 128,
+        put_concurrency: int = multiprocessing.cpu_count(),
     ):
         """mdmd:hidden"""
         self._volume_id = volume_id
@@ -1021,16 +1010,6 @@ async def _put_missing_blocks(
         file_progress.pending_blocks.add(missing_block.block_index)
         task_progress_cb = functools.partial(progress_cb, task_id=file_progress.task_id)
 
-        @retry(n_attempts=5, base_delay=0.5, timeout=None)
-        async def put_missing_block_attempt(payload: BytesIOSegmentPayload) -> bytes:
-            with payload.reset_on_error(subtract_progress=True):
-                async with ClientSessionRegistry.get_session().put(
-                    missing_block.put_url,
-                    data=payload,
-                ) as response:
-                    response.raise_for_status()
-                    return await response.content.read()
-
         async with put_semaphore:
             with file_spec.source() as source_fp:
                 payload = BytesIOSegmentPayload(
@@ -1041,7 +1020,13 @@ async def _put_missing_blocks(
                     chunk_size=256 * 1024,
                     progress_report_cb=task_progress_cb,
                 )
-                resp_data = await put_missing_block_attempt(payload)
+
+                async with ClientSessionRegistry.get_session().put(
+                    missing_block.put_url,
+                    data=payload,
+                ) as response:
+                    response.raise_for_status()
+                    resp_data = await response.content.read()
 
         file_progress.pending_blocks.remove(missing_block.block_index)
 

{modal-1.0.2 → modal-1.0.2.dev1}/modal/volume.pyi

@@ -494,7 +494,7 @@ class _VolumeUploadContextManager2(_AbstractVolumeUploadContextManager):
         progress_cb: typing.Optional[collections.abc.Callable[..., typing.Any]] = None,
         force: bool = False,
         hash_concurrency: int = 4,
-        put_concurrency: int = 128,
+        put_concurrency: int = 4,
     ): ...
     async def __aenter__(self): ...
     async def __aexit__(self, exc_type, exc_val, exc_tb): ...
@@ -534,7 +534,7 @@ class VolumeUploadContextManager2(AbstractVolumeUploadContextManager):
         progress_cb: typing.Optional[collections.abc.Callable[..., typing.Any]] = None,
         force: bool = False,
         hash_concurrency: int = 4,
-        put_concurrency: int = 128,
+        put_concurrency: int = 4,
     ): ...
     def __enter__(self): ...
     async def __aenter__(self): ...

{modal-1.0.2 → modal-1.0.2.dev1}/modal.egg-info/PKG-INFO

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

{modal-1.0.2 → modal-1.0.2.dev1}/modal_proto/api.proto

@@ -2153,7 +2153,6 @@ message PTYInfo {
 message PortSpec {
   uint32 port = 1;
   bool unencrypted = 2;
-  optional string tunnel_type = 3;
 }
 
 message PortSpecs {
@@ -2587,7 +2586,6 @@ message SandboxWaitResponse {
 message Schedule {
   message Cron {
     string cron_string = 1;
-    string timezone = 2;
   }
   message Period {
     int32 years = 1;
@@ -2878,7 +2876,6 @@ message TunnelData {
 message TunnelStartRequest {
   uint32 port = 1;
   bool unencrypted = 2;
-  optional string tunnel_type = 3;
 }
 
 message TunnelStartResponse {