modal 1.2.5.dev10__tar.gz → 1.2.5.dev12__tar.gz

{modal-1.2.5.dev10 → modal-1.2.5.dev12}/PKG-INFO

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

{modal-1.2.5.dev10 → modal-1.2.5.dev12}/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.dev10",
+        version: str = "1.2.5.dev12",
     ):
         """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.dev10",
+        version: str = "1.2.5.dev12",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.2.5.dev10 → modal-1.2.5.dev12}/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-1.2.5.dev10 → modal-1.2.5.dev12}/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-1.2.5.dev10 → modal-1.2.5.dev12}/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-1.2.5.dev10 → modal-1.2.5.dev12}/modal.egg-info/PKG-INFO

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

{modal-1.2.5.dev10 → modal-1.2.5.dev12}/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.dev10"
+__version__ = "1.2.5.dev12"