modAL 1.2.5.dev9__py3-none-any.whl → 1.2.5.dev11__py3-none-any.whl

modal/client.pyi

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

modal/dict.py

@@ -28,7 +28,7 @@ from ._utils.name_utils import check_object_name
 from ._utils.time_utils import as_timestamp, timestamp_to_localized_dt
 from .client import _Client
 from .config import logger
-from .exception import AlreadyExistsError, InvalidError, NotFoundError, RequestSizeError
+from .exception import AlreadyExistsError, DeserializationError, InvalidError, NotFoundError, RequestSizeError
 
 
 class _NoDefaultSentinel:
@@ -43,6 +43,25 @@ def _serialize_dict(data):
     return [api_pb2.DictEntry(key=serialize(k), value=serialize(v)) for k, v in data.items()]
 
 
+def _deserialize_dict_key(dict: "_Dict", data: bytes) -> Any:
+    try:
+        return deserialize(data, dict._client)
+    except DeserializationError as exc:
+        dict_identifier = f"Dict '{dict.name}'" if dict.name else f"ephemeral Dict {dict.object_id}"
+        raise DeserializationError(f"Failed to deserialize a key from {dict_identifier}: {exc}") from exc
+
+
+def _deserialize_dict_value(dict: "_Dict", data: bytes, key: Any = _NO_DEFAULT) -> Any:
+    try:
+        return deserialize(data, dict._client)
+    except DeserializationError as exc:
+        key_identifier = "" if key is _NO_DEFAULT else f" for key {key!r}"
+        dict_identifier = f"Dict '{dict.name}'" if dict.name else f"ephemeral Dict {dict.object_id}"
+        raise DeserializationError(
+            f"Failed to deserialize value{key_identifier} from {dict_identifier}: {exc}"
+        ) from exc
+
+
 @dataclass
 class DictInfo:
     """Information about a Dict object."""
@@ -439,7 +458,7 @@ class _Dict(_Object, type_prefix="di"):
         resp = await self._client.stub.DictGet(req)
         if not resp.found:
             return default
-        return deserialize(resp.value, self._client)
+        return _deserialize_dict_value(self, resp.value, key)
 
     @live_method
     async def contains(self, key: Any) -> bool:
@@ -530,7 +549,7 @@ class _Dict(_Object, type_prefix="di"):
             if default is not _NO_DEFAULT:
                 return default
             raise KeyError(f"{key} not in dict {self.object_id}")
-        return deserialize(resp.value, self._client)
+        return _deserialize_dict_value(self, resp.value, key)
 
     @live_method
     async def __delitem__(self, key: Any) -> Any:
@@ -557,7 +576,7 @@ class _Dict(_Object, type_prefix="di"):
         """
         req = api_pb2.DictContentsRequest(dict_id=self.object_id, keys=True)
         async for resp in self._client.stub.DictContents.unary_stream(req):
-            yield deserialize(resp.key, self._client)
+            yield _deserialize_dict_key(self, resp.key)
 
     @live_method_gen
     async def values(self) -> AsyncIterator[Any]:
@@ -568,7 +587,11 @@ class _Dict(_Object, type_prefix="di"):
         """
         req = api_pb2.DictContentsRequest(dict_id=self.object_id, values=True)
         async for resp in self._client.stub.DictContents.unary_stream(req):
-            yield deserialize(resp.value, self._client)
+            try:
+                key_deser = _deserialize_dict_key(self, resp.key)
+            except DeserializationError:
+                key_deser = _NO_DEFAULT
+            yield _deserialize_dict_value(self, resp.value, key_deser)
 
     @live_method_gen
     async def items(self) -> AsyncIterator[tuple[Any, Any]]:
@@ -579,7 +602,9 @@ class _Dict(_Object, type_prefix="di"):
         """
         req = api_pb2.DictContentsRequest(dict_id=self.object_id, keys=True, values=True)
         async for resp in self._client.stub.DictContents.unary_stream(req):
-            yield (deserialize(resp.key, self._client), deserialize(resp.value, self._client))
+            key_deser = _deserialize_dict_key(self, resp.key)
+            value_deser = _deserialize_dict_value(self, resp.value, key_deser)
+            yield (key_deser, value_deser)
 
 
 Dict = synchronize_api(_Dict)

modal/dict.pyi

@@ -18,6 +18,8 @@ class _NoDefaultSentinel:
 _NO_DEFAULT: _NoDefaultSentinel
 
 def _serialize_dict(data): ...
+def _deserialize_dict_key(dict: _Dict, data: bytes) -> typing.Any: ...
+def _deserialize_dict_value(dict: _Dict, data: bytes, key: typing.Any = ...) -> typing.Any: ...
 
 class DictInfo:
     """Information about a Dict object."""

modal/functions.pyi

@@ -409,7 +409,7 @@ class Function(
 
     _call_generator: ___call_generator_spec[typing_extensions.Self]
 
-    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
+    class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
         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."""
             ...
@@ -418,7 +418,7 @@ class Function(
             """Calls the function remotely, executing it with the given arguments and returning the execution's result."""
             ...
 
-    remote: __remote_spec[modal._functions.ReturnType, modal._functions.P, typing_extensions.Self]
+    remote: __remote_spec[modal._functions.P, modal._functions.ReturnType, typing_extensions.Self]
 
     class __remote_gen_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, /, *args, **kwargs) -> typing.Generator[typing.Any, None, None]:
@@ -445,7 +445,7 @@ class Function(
         """
         ...
 
-    class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
+    class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
         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.
 
@@ -469,7 +469,7 @@ class Function(
             ...
 
     _experimental_spawn: ___experimental_spawn_spec[
-        modal._functions.ReturnType, modal._functions.P, typing_extensions.Self
+        modal._functions.P, modal._functions.ReturnType, typing_extensions.Self
     ]
 
     class ___spawn_map_inner_spec(typing_extensions.Protocol[P_INNER, SUPERSELF]):
@@ -478,7 +478,7 @@ class Function(
 
     _spawn_map_inner: ___spawn_map_inner_spec[modal._functions.P, typing_extensions.Self]
 
-    class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
+    class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
         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.
 
@@ -499,7 +499,7 @@ class Function(
             """
             ...
 
-    spawn: __spawn_spec[modal._functions.ReturnType, modal._functions.P, typing_extensions.Self]
+    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType, typing_extensions.Self]
 
     def get_raw_f(self) -> collections.abc.Callable[..., typing.Any]:
         """Return the inner Python object wrapped by this Modal Function."""

modal/runner.py

@@ -628,7 +628,7 @@ async def _interactive_shell(
         try:
             if pty:
                 container_process = await sandbox._exec(
-                    *sandbox_cmds, pty_info=get_pty_info(shell=True) if pty else None
+                    *sandbox_cmds, pty_info=get_pty_info(shell=True) if pty else None, text=False
                 )
                 await container_process.attach()
             else:

{modal-1.2.5.dev9.dist-info → modal-1.2.5.dev11.dist-info}/METADATA

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

{modal-1.2.5.dev9.dist-info → modal-1.2.5.dev11.dist-info}/RECORD

@@ -26,7 +26,7 @@ modal/app.pyi,sha256=nI_Tibj-rI5I7dJFJnczbHvcmVzCvvCih0tMzoQlr_Y,50835
 modal/billing.py,sha256=zmQ3bcCJlwa4KD1IA_QgdWpm1pn13c-7qfy79iEauYI,195
 modal/call_graph.py,sha256=1g2DGcMIJvRy-xKicuf63IVE98gJSnQsr8R_NVMptNc,2581
 modal/client.py,sha256=k1CqQ_0t4-vHylkqYZgYCnClg-FT0QrTPAKivL01A_k,14354
-modal/client.pyi,sha256=OL1m-Si0RVah2542uxu2xkKZbk9IS0l1MZF-16_chfg,13146
+modal/client.pyi,sha256=g7qbToFmtD6iVG1MPHSTopmDDAs9_FxVPO5_4kpfqyA,13148
 modal/cloud_bucket_mount.py,sha256=cvVj5Rt4nDHoQbTneoJPTaAcnl_Ab_mrsjnnzd0v9OI,6013
 modal/cloud_bucket_mount.pyi,sha256=vXusGMOUk9HjCs4lhxteuCK4xLQclPfugGWKo7LECEA,7539
 modal/cls.py,sha256=4T__mtYlQUnkatif1Wnr8Ld9DN_ySydHj2UwhRg89ok,41984
@@ -34,8 +34,8 @@ modal/cls.pyi,sha256=p8Unbfr0yUdAzYYnD7erSRO7dH-87HkAg4oAn6srBzA,27424
 modal/config.py,sha256=byOUVfUibX9Ixrhbz5z4HDcgn-8S5OFicD6xGUErqZs,13415
 modal/container_process.py,sha256=KG2ZkFOWe2KN1b8dFSBLBoW5pWoRxBzJ20MLhDTicJs,16749
 modal/container_process.pyi,sha256=xMKr-VbQsydS8AbhAys9UTpHHnH2QRyINpPtPG7NwmI,8373
-modal/dict.py,sha256=Omfmj3fUyg7ijTI33Z97geyK7MW8T31LRm-N7pZqSwU,21582
-modal/dict.pyi,sha256=wemd-RTH3__HUsF2zfcVojb2ixE0-Xm0RVKOh5ZSDYE,31835
+modal/dict.py,sha256=fI2-NbERnu8I8KuxOp2av2IV2cx_XO-v-JE8m8NAYnE,22765
+modal/dict.pyi,sha256=yQHHZe98M6gB2ahzrmqlq8KUXvqFy6vamsijI2H0RdE,32002
 modal/environments.py,sha256=wMiMNpPkvIl_BdxRb81CY9Djzhczp_y4GEYKWp0JyBc,6135
 modal/environments.pyi,sha256=bMIxvwahckgaolGD3-hP2iovRHDXewvgbVs_nx4ze0o,3808
 modal/exception.py,sha256=HrvKRJO4EMwkoqa77PBeZyrGIgEZ-yqLIA10cqZndqI,5768
@@ -43,7 +43,7 @@ modal/file_io.py,sha256=Whs3QSl3pQbSoLzSRIIWfK4XyP-kwgyZmWgx3bhJ9u0,20933
 modal/file_io.pyi,sha256=xtO6Glf_BFwDE7QiQQo24QqcMf_Vv-iz7WojcGVlLBU,15932
 modal/file_pattern_matcher.py,sha256=A_Kdkej6q7YQyhM_2-BvpFmPqJ0oHb54B6yf9VqvPVE,8116
 modal/functions.py,sha256=kcNHvqeGBxPI7Cgd57NIBBghkfbeFJzXO44WW0jSmao,325
-modal/functions.pyi,sha256=Gyb8fhedU4BlEXIlgSBdDpQKNL-QIYvRxuf50WrN04k,38111
+modal/functions.pyi,sha256=iaFyXiAZEdzd2e7vwB5sLzoLB1kSWCQrIiqmTaczFgQ,38111
 modal/gpu.py,sha256=Fe5ORvVPDIstSq1xjmM6OoNgLYFWvogP9r5BgmD3hYg,6769
 modal/image.py,sha256=Pi1tpi41rklU-7PvXyJxPBYKdG3FcW-H_2pWjjeLYzs,108165
 modal/image.pyi,sha256=grkqK9BfyKDXmJYNme-lGa0O3u7pOU5GifyLOAhG3sc,78202
@@ -66,7 +66,7 @@ modal/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 modal/queue.py,sha256=ABXb1eaGBfl5lKh-O60B0wNi0rT7lZ8gCntMOA4piLQ,25801
 modal/queue.pyi,sha256=XD-VwX9m-lH8Rc4KZXmvuaNZ8f5Sip1clQSTJPdUBZo,37445
 modal/retries.py,sha256=IvNLDM0f_GLUDD5VgEDoN09C88yoxSrCquinAuxT1Sc,5205
-modal/runner.py,sha256=EkEAzZNJyYQa2TNHwCEP0-y_almtOfrfiUoYWv27JGg,25813
+modal/runner.py,sha256=uLpQpIE4lxTKAfmcdFR_OkDUFqdGorbWB4ehxS_Ps7o,25825
 modal/runner.pyi,sha256=HYBi04nUrZN9-L-cTlvDDHFiJS-N6M3usKk1_QzGnpc,8736
 modal/running_app.py,sha256=v61mapYNV1-O-Uaho5EfJlryMLvIT9We0amUOSvSGx8,1188
 modal/sandbox.py,sha256=9XO3d_UV3-FB-KLxak-3jS4YMFZ9mMoi7XMVzayy4dU,49594
@@ -160,7 +160,7 @@ modal/experimental/__init__.py,sha256=ls4ScjJOdCXW0HagDOrNTTnkP4_N7y93HUl10jNDrD
 modal/experimental/flash.py,sha256=vIZ9qO5-Hb-QViVOAFsY1nfr3vh2yOZQwn-4vTQrOY4,29645
 modal/experimental/flash.pyi,sha256=26YB9wCeAkjykwFJ4ppmWzVF0L8MJw5VW68w-Wi1-as,16105
 modal/experimental/ipython.py,sha256=TrCfmol9LGsRZMeDoeMPx3Hv3BFqQhYnmD_iH0pqdhk,2904
-modal-1.2.5.dev9.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-1.2.5.dev11.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
 modal_docs/__init__.py,sha256=svYKtV8HDwDCN86zbdWqyq5T8sMdGDj0PVlzc2tIxDM,28
 modal_docs/gen_cli_docs.py,sha256=c1yfBS_x--gL5bs0N4ihMwqwX8l3IBWSkBAKNNIi6bQ,3801
 modal_docs/gen_reference_docs.py,sha256=d_CQUGQ0rfw28u75I2mov9AlS773z9rG40-yq5o7g2U,6359
@@ -188,10 +188,10 @@ modal_proto/task_command_router_pb2.py,sha256=_pD2ZpU0bNzhwBdzmLoLyLtAtftI_Agxwn
 modal_proto/task_command_router_pb2.pyi,sha256=EyDgXPLr7alqjXYERV8w_MPuO404x0uCppmSkrfE9IE,14589
 modal_proto/task_command_router_pb2_grpc.py,sha256=uEQ0HdrCp8v-9bB5yIic9muA8spCShLHY6Bz9cCgOUE,10114
 modal_proto/task_command_router_pb2_grpc.pyi,sha256=s3Yxsrawdj4nr8vqQqsAxyX6ilWaGbdECy425KKbLIA,3301
-modal_version/__init__.py,sha256=ZHyLamwsFXMP7SmvR_XWby5lrQVBaC1K7vYxyG1PxJQ,120
+modal_version/__init__.py,sha256=uyjfSYfYbDG3cRcp_kAxYg8H3JRpRNsPW1avUQEEXBg,121
 modal_version/__main__.py,sha256=2FO0yYQQwDTh6udt1h-cBnGd1c4ZyHnHSI4BksxzVac,105
-modal-1.2.5.dev9.dist-info/METADATA,sha256=FcKbMmq0Arln3ySDv6O130fU8g9HOhDNd-hE0qqKFiA,2489
-modal-1.2.5.dev9.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-modal-1.2.5.dev9.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-1.2.5.dev9.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
-modal-1.2.5.dev9.dist-info/RECORD,,
+modal-1.2.5.dev11.dist-info/METADATA,sha256=Ll0B1CorfTJRy7-lxcXL1Lb6eWcZ84lBQPmvQKyUPos,2490
+modal-1.2.5.dev11.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+modal-1.2.5.dev11.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-1.2.5.dev11.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
+modal-1.2.5.dev11.dist-info/RECORD,,

modal_version/__init__.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2025
 """Supplies the current version of the modal client library."""
 
-__version__ = "1.2.5.dev9"
+__version__ = "1.2.5.dev11"