modAL 1.4.3.dev4__py3-none-any.whl → 1.4.3.dev6__py3-none-any.whl

modal/client.pyi

@@ -35,7 +35,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.4.3.dev4",
+        version: str = "1.4.3.dev6",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -175,7 +175,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.4.3.dev4",
+        version: str = "1.4.3.dev6",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

modal/exception.py

@@ -90,7 +90,7 @@ class _GRPCErrorWrapper(grpclib.GRPCError):
     def __repr__(self) -> str:
         return f"{type(self).__name__}({self._message!r})"
 
-    def _warn_on_grpc_error_attribute_access(self) -> None:
+    def _attribute_warning(self) -> None:
         from ._utils.deprecation import deprecation_warning  # Avoid circular import
 
         exc_type = type(self).__name__
@@ -104,7 +104,7 @@ class _GRPCErrorWrapper(grpclib.GRPCError):
 
     @property
     def message(self) -> str:
-        self._warn_on_grpc_error_attribute_access()
+        self._attribute_warning()
         return self._grpc_message
 
     @message.setter
@@ -113,7 +113,7 @@ class _GRPCErrorWrapper(grpclib.GRPCError):
 
     @property
     def status(self) -> grpclib.Status:
-        self._warn_on_grpc_error_attribute_access()
+        self._attribute_warning()
         return self._grpc_status
 
     @status.setter
@@ -122,7 +122,7 @@ class _GRPCErrorWrapper(grpclib.GRPCError):
 
     @property
     def details(self) -> Any:
-        self._warn_on_grpc_error_attribute_access()
+        self._attribute_warning()
         return self._grpc_details
 
     @details.setter

modal/sandbox.py

@@ -268,22 +268,28 @@ class _Sandbox(_Object, type_prefix="sb"):
         if pty:
             pty_info = _Sandbox._default_pty_info()
 
-        def _deps() -> list[_Object]:
-            deps: list[_Object] = [image] + list(mounts) + list(secrets)
+        async def _load(
+            self: _Sandbox, resolver: Resolver, load_context: LoadContext, _existing_object_id: Optional[str]
+        ):
+            # An already-hydrated image (e.g. one returned by
+            # `Sandbox.snapshot_directory`) is skipped — there's nothing to load.
+            dep_tasks: list = []
+            if not image._is_hydrated:
+                dep_tasks.append(resolver.load(image, load_context))
+            for dep in list(mounts) + list(secrets):
+                dep_tasks.append(resolver.load(dep, load_context))
             for _, vol in validated_network_file_systems:
-                deps.append(vol)
+                dep_tasks.append(resolver.load(vol, load_context))
             for _, vol in validated_volumes:
-                deps.append(vol)
+                dep_tasks.append(resolver.load(vol, load_context))
             for _, cloud_bucket_mount in cloud_bucket_mounts:
                 if cloud_bucket_mount.secret:
-                    deps.append(cloud_bucket_mount.secret)
+                    dep_tasks.append(resolver.load(cloud_bucket_mount.secret, load_context))
             if proxy:
-                deps.append(proxy)
-            return deps
+                dep_tasks.append(resolver.load(proxy, load_context))
+            if dep_tasks:
+                await asyncio.gather(*dep_tasks)
 
-        async def _load(
-            self: _Sandbox, resolver: Resolver, load_context: LoadContext, _existing_object_id: Optional[str]
-        ):
             # Validate that the same volume (by object_id) isn't mounted at multiple paths
             validate_volumes_by_object_id(validated_volumes)
 
@@ -363,7 +369,7 @@ class _Sandbox(_Object, type_prefix="sb"):
             sandbox_id = create_resp.sandbox_id
             self._hydrate(sandbox_id, load_context.client, None)
 
-        return _Sandbox._from_loader(_load, "Sandbox()", deps=_deps, load_context_overrides=LoadContext.empty())
+        return _Sandbox._from_loader(_load, "Sandbox()", load_context_overrides=LoadContext.empty())
 
     @staticmethod
     async def create(
@@ -689,12 +695,17 @@ class _Sandbox(_Object, type_prefix="sb"):
                 allowed_cidrs=cidr_allowlist,
             )
 
-        def _deps() -> list[_Object]:
-            return [image] + list(secrets)
-
         async def _load(
             self: _Sandbox, resolver: Resolver, load_context: LoadContext, _existing_object_id: Optional[str]
         ):
+            dep_tasks: list = []
+            if not image._is_hydrated:
+                dep_tasks.append(resolver.load(image, load_context))
+            for secret in secrets:
+                dep_tasks.append(resolver.load(secret, load_context))
+            if dep_tasks:
+                await asyncio.gather(*dep_tasks)
+
             definition = api_pb2.Sandbox(
                 entrypoint_args=args,
                 image_id=image.object_id,
@@ -732,7 +743,7 @@ class _Sandbox(_Object, type_prefix="sb"):
                 for t in create_resp.tunnels
             }
 
-        obj = _Sandbox._from_loader(_load, "Sandbox()", deps=_deps, load_context_overrides=LoadContext.empty())
+        obj = _Sandbox._from_loader(_load, "Sandbox()", load_context_overrides=LoadContext.empty())
 
         app_id: Optional[str] = None
         app_client: Optional[_Client] = None
@@ -906,19 +917,7 @@ class _Sandbox(_Object, type_prefix="sb"):
         if resp.result.status != api_pb2.GenericResult.GENERIC_STATUS_SUCCESS:
             raise ExecutionError(resp.result.exception)
 
-        image_id = resp.image_id
-        metadata = resp.image_metadata
-
-        async def _load(self: _Image, resolver: Resolver, load_context: LoadContext, existing_object_id: Optional[str]):
-            # no need to hydrate again since we do it eagerly below
-            pass
-
-        rep = "Image()"
-        # TODO: use ._new_hydrated instead
-        image = _Image._from_loader(_load, rep, hydrate_lazily=True, load_context_overrides=LoadContext.empty())
-        image._hydrate(image_id, self._client, metadata)  # hydrating eagerly since we have all of the data
-
-        return image
+        return _Image._new_hydrated(resp.image_id, self._client, resp.image_metadata)
 
     async def mount_image(self, path: Union[PurePosixPath, str], image: _Image):
         """Mount an Image at a specified path in a running Sandbox.
@@ -1032,7 +1031,8 @@ class _Sandbox(_Object, type_prefix="sb"):
             raise InvalidError(f"Snapshot path must be absolute; got: {posix_path}")
         path_bytes = posix_path.as_posix().encode("utf8")
 
-        req = sr_pb2.TaskSnapshotDirectoryRequest(task_id=task_id, path=path_bytes)
+        snapshot_id = str(uuid.uuid4())
+        req = sr_pb2.TaskSnapshotDirectoryRequest(task_id=task_id, path=path_bytes, snapshot_id=snapshot_id)
         res = await command_router_client.snapshot_directory(req)
         return _Image._new_hydrated(res.image_id, self._client, None)
 

{modal-1.4.3.dev4.dist-info → modal-1.4.3.dev6.dist-info}/METADATA

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

{modal-1.4.3.dev4.dist-info → modal-1.4.3.dev6.dist-info}/RECORD

@@ -26,7 +26,7 @@ modal/app.pyi,sha256=mysbOCD6OjZi938NeMY40RpdpQbnI43Bb4s5P79x5OQ,53773
 modal/billing.py,sha256=B2zXa7KeMnpqi2AQINycEk-KSXVYaLTTTAQTtuf2Gfs,257
 modal/call_graph.py,sha256=1g2DGcMIJvRy-xKicuf63IVE98gJSnQsr8R_NVMptNc,2581
 modal/client.py,sha256=jjT4eLFHGcvIF6Xw4kPptIx-VmExtphRN8XJ1JA7fWI,15502
-modal/client.pyi,sha256=A7qsAY2_5l2qqMZh9KCnN0cOcfl13ORT53PgufFLzAE,15701
+modal/client.pyi,sha256=JmocfYAxcjZxGxINMhP8lx7BvYFLXWVXJbnr8Ibqqw8,15701
 modal/cloud_bucket_mount.py,sha256=KkaJVy5vpO_u2NtDYtv1JM-M3y4J0UtWBapTDKpQRcA,6034
 modal/cloud_bucket_mount.pyi,sha256=mGDeEd1XvxGpCE6O5jRBSfIvMXvZ5AtIybea5k-0w9w,7560
 modal/cls.py,sha256=Yrl5b_tQhZMhc5avInM-i5UlGuqeog6Gs4rX2d9lLjI,40390
@@ -38,7 +38,7 @@ modal/dict.py,sha256=3d7TD9zAAU_vZGFRYIsClBFAHSgJ6i0Z7JJykBjNvO0,23224
 modal/dict.pyi,sha256=3FgUEzuUDdIw16MlTKpE9GG8CoeBmZ1jnFiIFZunSaU,33803
 modal/environments.py,sha256=wMiMNpPkvIl_BdxRb81CY9Djzhczp_y4GEYKWp0JyBc,6135
 modal/environments.pyi,sha256=bMIxvwahckgaolGD3-hP2iovRHDXewvgbVs_nx4ze0o,3808
-modal/exception.py,sha256=S96LpZo7-s4er-h6YRgcYhPgCj23CFbMvBEjcXhOv5Q,11749
+modal/exception.py,sha256=LMNcb5gAtIzosJvOxkr8O4RSMtuwRYue-xJI7Cxq1CA,11677
 modal/file_io.py,sha256=3HcVEXindYuprBIuOPaOlLDMBQtuoaHKjKIYIqh53y0,22256
 modal/file_io.pyi,sha256=DPaq0BhySaiCX3g56QHhyIMdU1izbfWsjpSp30JoJUU,15745
 modal/file_pattern_matcher.py,sha256=A_Kdkej6q7YQyhM_2-BvpFmPqJ0oHb54B6yf9VqvPVE,8116
@@ -68,7 +68,7 @@ modal/retries.py,sha256=vPWWKP-FRolJwTBuLPXdWqHV7aJfSQFgEW7vhlBBXRQ,5067
 modal/runner.py,sha256=yIB1PE5EGdvLWPPymyT4P0KYliREnFf-MAtULl3tVN0,30062
 modal/runner.pyi,sha256=ySefjmlMQ5FsvJgJkCWiUZKvcPNfEqdB5hwxI1fGtDo,9445
 modal/running_app.py,sha256=v61mapYNV1-O-Uaho5EfJlryMLvIT9We0amUOSvSGx8,1188
-modal/sandbox.py,sha256=Oz2KjJYQzthyu7fQs93UYMgDMFiJ5r-6CHkWxXLSDfI,83117
+modal/sandbox.py,sha256=bp8W6xPBUpTIY3h-Y91nbxu_YBzJoRLSyMtvvj3xOhA,83377
 modal/sandbox.pyi,sha256=p1XMD7EjpLI8FCqyDjEaZHvbTKd6_DycwVq86WJPCZw,86306
 modal/sandbox_fs.py,sha256=1IN-bn9Ah67AqjUhvPBCJkYdaiTLueUBaj0E3h4tzBY,16757
 modal/sandbox_fs.pyi,sha256=0rQacbDOgHKQBKIAmVJwrJ6pBsP1BR3WL4QbTJRafhw,27604
@@ -176,7 +176,7 @@ modal/experimental/__init__.py,sha256=Wb1YoAKAnNxH_0c2wA0T12I7bSu9PSO2nS_LuLska7
 modal/experimental/flash.py,sha256=ATGhVO8AleJ-TOe2PGolI5T7zfCEtj0kl_ivMPp7Rqg,33362
 modal/experimental/flash.pyi,sha256=R4h2nQl7-oiwqq_twCp0YqID_LnPjPGqxywXvxbiLIk,17011
 modal/experimental/ipython.py,sha256=TrCfmol9LGsRZMeDoeMPx3Hv3BFqQhYnmD_iH0pqdhk,2904
-modal-1.4.3.dev4.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-1.4.3.dev6.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
 modal_docs/__init__.py,sha256=svYKtV8HDwDCN86zbdWqyq5T8sMdGDj0PVlzc2tIxDM,28
 modal_docs/gen_cli_docs.py,sha256=bfUSLscHfoQoKkKjIqJvQMe3fURzqcQK7gF1h9WQLtM,3742
 modal_docs/gen_cli_docs_main.py,sha256=UPGr7O1DYTIRLwfINe2rbdh89J3cPVTU1OWL-SjxnOQ,198
@@ -187,21 +187,21 @@ modal_docs/mdmd/mdmd.py,sha256=z9T3lMktTq3N4r6T6MSSyw8lebbqKc3Igw8l9EdMJNM,9998
 modal_docs/mdmd/signatures.py,sha256=XJaZrK7Mdepk5fdX51A8uENiLFNil85Ud0d4MH8H5f0,3218
 modal_proto/__init__.py,sha256=MIEP8jhXUeGq_eCjYFcqN5b1bxBM4fdk0VESpjWR0fc,28
 modal_proto/api_grpc.py,sha256=H4Z21x81592KlGzgDIcgltk5WixY5vs5EyOH8Q89wvA,153140
-modal_proto/api_pb2.py,sha256=6beIxoMkmSpW9BR__3G4tA7vtp1w7VhW0tUcU6WAroo,423763
-modal_proto/api_pb2.pyi,sha256=v9IV9qfYwXSf3JVck3K2JK7ACMEhb8lqnlGsx1D3DEU,593027
+modal_proto/api_pb2.py,sha256=P09tScxAvEid1BbXBAxC_N_IZJ7EpjfpFIub-RMgOHU,424105
+modal_proto/api_pb2.pyi,sha256=9G3_MdFKOu-eE44LyV3Kt0c4wWCcTZUKwWoSWs-hlzY,593733
 modal_proto/api_pb2_grpc.py,sha256=dWnojBtfuaqHvBos1FL-JMNEB7LsNHM1UGUpKXO5IFY,329867
 modal_proto/api_pb2_grpc.pyi,sha256=qDqqKIs18olWaoBjLOJ8Z6Gn8_GjpNn3Z1Pw1yG_M4I,77024
 modal_proto/modal_api_grpc.py,sha256=bBPhTehvCriGANMHxXNxKa58ew_2QbSvO88zhKCr4CE,24177
 modal_proto/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 modal_proto/task_command_router_grpc.py,sha256=wbRjiCyx9MlvkmPKM_6UVU1KmJaynUO4Eyt6tDKtmRk,12572
-modal_proto/task_command_router_pb2.py,sha256=Kadayms1M02hoAtV4hom00t143GAHxUNvohOxTIRaCg,24322
-modal_proto/task_command_router_pb2.pyi,sha256=nnMXJQ81eSbgeA0SkBOcUHXiD5hRknYi5MK7wVkPlU0,27068
+modal_proto/task_command_router_pb2.py,sha256=ZrDKDK9Kw2Ks4l9-gWXjUG8nW50pyDY5G-DOwTGfF1U,24363
+modal_proto/task_command_router_pb2.pyi,sha256=qDvQBePeIQZcLmpYgEEiT5-7LnkpWTP9h-Lkzan5LXE,27289
 modal_proto/task_command_router_pb2_grpc.py,sha256=CW52Dj00YLRRAc2-KIz_aimGe7RuKvx0cROMs2No-b0,25002
 modal_proto/task_command_router_pb2_grpc.pyi,sha256=j4-VU3QFp8nUyx5_6F04T4IIU28KWHpAFMnY8Eg521g,8018
-modal_version/__init__.py,sha256=LrmWEF63LHXk_vLCXJqAVDla1_ZBciOXvSuNVIm3dzE,120
+modal_version/__init__.py,sha256=DR5iSrR--sukzxn73D3siOvgejMcbtx7vHZNHZD4No4,120
 modal_version/__main__.py,sha256=nLUbubxKx7GXNzJIkTB7M7_u8080LyLM0IS0rzFkC_c,119
-modal-1.4.3.dev4.dist-info/METADATA,sha256=tUF2FJz9harPBNYPtksUtI0JwLNX-PF_GntHGa8RKc4,2338
-modal-1.4.3.dev4.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-modal-1.4.3.dev4.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-1.4.3.dev4.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
-modal-1.4.3.dev4.dist-info/RECORD,,
+modal-1.4.3.dev6.dist-info/METADATA,sha256=ikqFD2Asfy5v_rrqoy0oXBc30X4ivuZTAXTTjvnvHqo,2338
+modal-1.4.3.dev6.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+modal-1.4.3.dev6.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-1.4.3.dev6.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
+modal-1.4.3.dev6.dist-info/RECORD,,