modAL 1.2.7.dev10__tar.gz → 1.2.7.dev11__tar.gz

{modal-1.2.7.dev10 → modal-1.2.7.dev11}/PKG-INFO

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

{modal-1.2.7.dev10 → modal-1.2.7.dev11}/modal/_grpc_client.py

@@ -38,7 +38,7 @@ _STATUS_TO_EXCEPTION: dict[Status, type[exception._GRPCErrorWrapper]] = {
     Status.UNIMPLEMENTED: exception.UnimplementedError,
     Status.INTERNAL: exception.InternalError,
     Status.UNAVAILABLE: exception.ServiceError,
-    Status.DATA_LOSS: exception.ServiceError,
+    Status.DATA_LOSS: exception.DataLossError,
     Status.UNAUTHENTICATED: exception.AuthError,
 }
 

{modal-1.2.7.dev10 → modal-1.2.7.dev11}/modal/_output.py

@@ -12,7 +12,7 @@ from collections.abc import Generator
 from datetime import timedelta
 from typing import Callable, ClassVar
 
-from grpclib.exceptions import GRPCError, StreamTerminatedError
+from grpclib.exceptions import StreamTerminatedError
 from rich.console import Console, Group, RenderableType
 from rich.live import Live
 from rich.panel import Panel
@@ -34,10 +34,11 @@ from rich.text import Text
 from modal._utils.time_utils import timestamp_to_localized_str
 from modal_proto import api_pb2
 
-from ._utils.grpc_utils import RETRYABLE_GRPC_STATUS_CODES, Retry
+from ._utils.grpc_utils import Retry
 from ._utils.shell_utils import stream_from_stdin, write_to_fd
 from .client import _Client
 from .config import logger
+from .exception import InternalError, ServiceError
 
 if platform.system() == "Windows":
     default_spinner = "line"
@@ -644,13 +645,11 @@ async def get_app_logs_loop(
     while True:
         try:
             await _get_logs()
-        except (GRPCError, StreamTerminatedError, socket.gaierror, AttributeError) as exc:
-            if isinstance(exc, GRPCError):
-                if exc.status in RETRYABLE_GRPC_STATUS_CODES:
-                    # Try again if we had a temporary connection drop,
-                    # for example if computer went to sleep.
-                    logger.debug("Log fetching timed out. Retrying ...")
-                    continue
+        except (ServiceError, InternalError, StreamTerminatedError, socket.gaierror, AttributeError) as exc:
+            if isinstance(exc, (ServiceError, InternalError)):
+                # Try again if we had a temporary connection drop, for example if computer went to sleep.
+                logger.debug("Log fetching timed out. Retrying ...")
+                continue
             elif isinstance(exc, StreamTerminatedError):
                 logger.debug("Stream closed. Retrying ...")
                 continue

{modal-1.2.7.dev10 → modal-1.2.7.dev11}/modal/_utils/function_utils.py

@@ -8,7 +8,6 @@ from enum import Enum
 from pathlib import Path, PurePosixPath
 from typing import Any, Callable, Literal, Optional
 
-from grpclib import GRPCError
 from grpclib.exceptions import StreamTerminatedError
 
 import modal_proto
@@ -29,9 +28,11 @@ from ..exception import (
     DeserializationError,
     ExecutionError,
     FunctionTimeoutError,
+    InternalError,
     InternalFailure,
     InvalidError,
     RemoteError,
+    ServiceError,
 )
 from ..mount import ROOT_DIR, _is_modal_path, _Mount
 from .blob_utils import (
@@ -39,7 +40,6 @@ from .blob_utils import (
     blob_download,
     blob_upload_with_r2_failure_info,
 )
-from .grpc_utils import RETRYABLE_GRPC_STATUS_CODES
 
 if typing.TYPE_CHECKING:
     import modal._functions
@@ -437,15 +437,14 @@ async def _stream_function_call_data(
 
                 last_index = chunk.index
                 yield message
-        except (GRPCError, StreamTerminatedError) as exc:
+        except (ServiceError, InternalError, StreamTerminatedError) as exc:
             if retries_remaining > 0:
                 retries_remaining -= 1
-                if isinstance(exc, GRPCError):
-                    if exc.status in RETRYABLE_GRPC_STATUS_CODES:
-                        logger.debug(f"{variant} stream retrying with delay {delay_ms}ms due to {exc}")
-                        await asyncio.sleep(delay_ms / 1000)
-                        delay_ms = min(1000, delay_ms * 10)
-                        continue
+                if isinstance(exc, (ServiceError, InternalError)):
+                    logger.debug(f"{variant} stream retrying with delay {delay_ms}ms due to {exc}")
+                    await asyncio.sleep(delay_ms / 1000)
+                    delay_ms = min(1000, delay_ms * 10)
+                    continue
                 elif isinstance(exc, StreamTerminatedError):
                     continue
             raise

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

{modal-1.2.7.dev10 → modal-1.2.7.dev11}/modal/dict.py

@@ -5,7 +5,6 @@ from datetime import datetime
 from typing import Any, Optional, Union
 
 from google.protobuf.message import Message
-from grpclib import GRPCError
 from synchronicity import classproperty
 from synchronicity.async_wrap import asynccontextmanager
 
@@ -28,7 +27,14 @@ 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, DeserializationError, InvalidError, NotFoundError, RequestSizeError
+from .exception import (
+    AlreadyExistsError,
+    DeserializationError,
+    Error,
+    InvalidError,
+    NotFoundError,
+    RequestSizeError,
+)
 
 
 class _NoDefaultSentinel:
@@ -502,8 +508,8 @@ class _Dict(_Object, type_prefix="di"):
         req = api_pb2.DictUpdateRequest(dict_id=self.object_id, updates=serialized)
         try:
             await self._client.stub.DictUpdate(req)
-        except GRPCError as exc:
-            if "status = '413'" in exc.message:
+        except Error as exc:
+            if "status = '413'" in str(exc):
                 raise RequestSizeError("Dict.update request is too large") from exc
             else:
                 raise exc
@@ -521,8 +527,8 @@ class _Dict(_Object, type_prefix="di"):
         try:
             resp = await self._client.stub.DictUpdate(req)
             return resp.created
-        except GRPCError as exc:
-            if "status = '413'" in exc.message:
+        except Error as exc:
+            if "status = '413'" in str(exc):
                 raise RequestSizeError("Dict.put request is too large") from exc
             else:
                 raise exc

{modal-1.2.7.dev10 → modal-1.2.7.dev11}/modal/exception.py

@@ -29,7 +29,7 @@ OUT_OF_RANGE -> InvalidError
 UNIMPLEMENTED -> UnimplementedError
 INTERNAL -> InternalError
 UNAVAILABLE -> ServiceError
-DATA_LOSS -> ServiceError
+DATA_LOSS -> DataLossError
 UNAUTHENTICATED -> AuthError
 ```
 
@@ -150,6 +150,10 @@ class ConflictError(InvalidError, _GRPCErrorWrapper):
     """Raised when a resource conflict occurs between the request and current system state."""
 
 
+class DataLossError(Error, _GRPCErrorWrapper):
+    """Raised when data is lost or corrupted."""
+
+
 class NotFoundError(Error, _GRPCErrorWrapper):
     """Raised when a requested resource was not found."""
 

{modal-1.2.7.dev10 → modal-1.2.7.dev11}/modal/file_io.py

@@ -10,7 +10,7 @@ if TYPE_CHECKING:
 
 import json
 
-from grpclib.exceptions import GRPCError, StreamTerminatedError
+from grpclib.exceptions import StreamTerminatedError
 
 from modal._utils.async_utils import TaskContext
 from modal.exception import ClientClosed
@@ -18,9 +18,8 @@ from modal_proto import api_pb2
 
 from ._utils.async_utils import synchronize_api
 from ._utils.deprecation import deprecation_error
-from ._utils.grpc_utils import RETRYABLE_GRPC_STATUS_CODES
 from .client import _Client
-from .exception import FilesystemExecutionError
+from .exception import FilesystemExecutionError, InternalError, ServiceError
 
 WRITE_CHUNK_SIZE = 16 * 1024 * 1024  # 16 MiB
 WRITE_FILE_SIZE_LIMIT = 1024 * 1024 * 1024  # 1 GiB
@@ -166,13 +165,12 @@ class _FileIO(Generic[T]):
                         completed = True
                         break
 
-            except (GRPCError, StreamTerminatedError, ClientClosed) as exc:
+            except (ServiceError, InternalError, StreamTerminatedError, ClientClosed) as exc:
                 if retries_remaining > 0:
                     retries_remaining -= 1
-                    if isinstance(exc, GRPCError):
-                        if exc.status in RETRYABLE_GRPC_STATUS_CODES:
-                            await asyncio.sleep(1.0)
-                            continue
+                    if isinstance(exc, (ServiceError, InternalError)):
+                        await asyncio.sleep(1.0)
+                        continue
                     elif isinstance(exc, StreamTerminatedError):
                         continue
                     elif isinstance(exc, ClientClosed):
@@ -202,13 +200,12 @@ class _FileIO(Generic[T]):
                     if isinstance(data, Exception):
                         raise data
                     output_buffer.write(data)
-            except (GRPCError, StreamTerminatedError) as exc:
+            except (ServiceError, InternalError, StreamTerminatedError) as exc:
                 if retries_remaining > 0:
                     retries_remaining -= 1
-                    if isinstance(exc, GRPCError):
-                        if exc.status in RETRYABLE_GRPC_STATUS_CODES:
-                            await asyncio.sleep(1.0)
-                            continue
+                    if isinstance(exc, (ServiceError, InternalError)):
+                        await asyncio.sleep(1.0)
+                        continue
                     elif isinstance(exc, StreamTerminatedError):
                         continue
                 raise

{modal-1.2.7.dev10 → modal-1.2.7.dev11}/modal/image.py

@@ -22,7 +22,7 @@ from typing import (
 )
 
 from google.protobuf.message import Message
-from grpclib.exceptions import GRPCError, StreamTerminatedError
+from grpclib.exceptions import StreamTerminatedError
 from typing_extensions import Self
 
 from modal._serialization import serialize_data_format
@@ -39,13 +39,20 @@ from ._utils.docker_utils import (
     find_dockerignore_file,
 )
 from ._utils.function_utils import FunctionInfo
-from ._utils.grpc_utils import RETRYABLE_GRPC_STATUS_CODES
 from ._utils.mount_utils import validate_only_modal_volumes
 from .client import _Client
 from .cloud_bucket_mount import _CloudBucketMount
 from .config import config, logger, user_config_path
 from .environments import _get_environment_cached
-from .exception import ExecutionError, InvalidError, NotFoundError, RemoteError, VersionError
+from .exception import (
+    ExecutionError,
+    InternalError,
+    InvalidError,
+    NotFoundError,
+    RemoteError,
+    ServiceError,
+    VersionError,
+)
 from .file_pattern_matcher import NON_PYTHON_FILES, FilePatternMatcher, _ignore_fn
 from .gpu import GPU_T, parse_gpu_config
 from .mount import _Mount, python_standalone_mount_name
@@ -374,9 +381,7 @@ async def _image_await_build_result(image_id: str, client: _Client) -> api_pb2.I
     while result_response is None:
         try:
             await join()
-        except (StreamTerminatedError, GRPCError) as exc:
-            if isinstance(exc, GRPCError) and exc.status not in RETRYABLE_GRPC_STATUS_CODES:
-                raise exc
+        except (ServiceError, InternalError, StreamTerminatedError) as exc:
             retry_count += 1
             if retry_count >= 3:
                 raise exc

{modal-1.2.7.dev10 → modal-1.2.7.dev11}/modal/io_streams.py

@@ -18,17 +18,16 @@ from typing import (
     cast,
 )
 
-from grpclib.exceptions import GRPCError, StreamTerminatedError
+from grpclib.exceptions import StreamTerminatedError
 
 from modal.exception import ClientClosed, ExecTimeoutError, InvalidError
 from modal_proto import api_pb2
 
 from ._utils.async_utils import aclosing, synchronize_api, synchronizer
-from ._utils.grpc_utils import RETRYABLE_GRPC_STATUS_CODES
 from ._utils.task_command_router_client import TaskCommandRouterClient
 from .client import _Client
 from .config import logger
-from .exception import ConflictError
+from .exception import ConflictError, InternalError, ServiceError
 from .stream_type import StreamType
 
 if TYPE_CHECKING:
@@ -193,13 +192,12 @@ class _StreamReaderThroughServer(Generic[T]):
                     else:
                         last_index = batch_index
 
-            except (GRPCError, StreamTerminatedError, ClientClosed) as exc:
+            except (ServiceError, InternalError, StreamTerminatedError, ClientClosed) as exc:
                 if retries_remaining > 0:
                     retries_remaining -= 1
-                    if isinstance(exc, GRPCError):
-                        if exc.status in RETRYABLE_GRPC_STATUS_CODES:
-                            await asyncio.sleep(1.0)
-                            continue
+                    if isinstance(exc, (ServiceError, InternalError)):
+                        await asyncio.sleep(1.0)
+                        continue
                     elif isinstance(exc, StreamTerminatedError):
                         continue
                     elif isinstance(exc, ClientClosed):
@@ -270,13 +268,12 @@ class _StreamReaderThroughServer(Generic[T]):
 
                     yield message
 
-            except (GRPCError, StreamTerminatedError) as exc:
+            except (ServiceError, InternalError, StreamTerminatedError) as exc:
                 if retries_remaining > 0:
                     retries_remaining -= 1
-                    if isinstance(exc, GRPCError):
-                        if exc.status in RETRYABLE_GRPC_STATUS_CODES:
-                            await asyncio.sleep(1.0)
-                            continue
+                    if isinstance(exc, (ServiceError, InternalError)):
+                        await asyncio.sleep(1.0)
+                        continue
                     elif isinstance(exc, StreamTerminatedError):
                         continue
                 raise

{modal-1.2.7.dev10 → modal-1.2.7.dev11}/modal/mount.py

@@ -13,7 +13,6 @@ from pathlib import Path, PurePosixPath
 from typing import Callable, Optional, Sequence, Union
 
 from google.protobuf.message import Message
-from grpclib import GRPCError
 
 import modal.exception
 import modal.file_pattern_matcher
@@ -838,8 +837,8 @@ async def _create_single_client_dependency_mount(
                         client=client,
                     )
                     print(f"✅ Deployed mount {mount_name} to global namespace.")  # noqa: T201
-                except GRPCError as e:
-                    print(f"⚠️ Mount creation failed with {e.status}: {e.message}")  # noqa: T201
+                except modal.exception.Error as e:
+                    print(f"⚠️ Mount creation failed with {type(e).__name__}: {e}")  # noqa: T201
             else:
                 print(f"Dry run - skipping deployment of mount {mount_name}")  # noqa: T201
 

{modal-1.2.7.dev10 → modal-1.2.7.dev11}/modal/queue.py

@@ -30,7 +30,7 @@ from ._utils.grpc_utils import Retry
 from ._utils.name_utils import check_object_name
 from ._utils.time_utils import as_timestamp, timestamp_to_localized_dt
 from .client import _Client
-from .exception import AlreadyExistsError, InvalidError, NotFoundError, RequestSizeError, ResourceExhaustedError
+from .exception import AlreadyExistsError, Error, InvalidError, NotFoundError, RequestSizeError, ResourceExhaustedError
 
 
 @dataclass
@@ -595,11 +595,14 @@ class _Queue(_Object, type_prefix="qu"):
                     total_timeout=timeout,
                 ),
             )
-        except ResourceExhaustedError as exc:
+        except Error as exc:
             if "status = '413'" in str(exc):
                 method = "put_many" if len(vs) > 1 else "put"
                 raise RequestSizeError(f"Queue.{method} request is too large") from exc
-            raise queue.Full(str(exc))
+            elif isinstance(exc, ResourceExhaustedError):
+                raise queue.Full(str(exc))
+            else:
+                raise exc
 
     async def _put_many_nonblocking(self, partition: Optional[str], partition_ttl: int, vs: list[Any]):
         vs_encoded = [serialize(v) for v in vs]
@@ -611,11 +614,14 @@ class _Queue(_Object, type_prefix="qu"):
         )
         try:
             await self._client.stub.QueuePut(request)
-        except ResourceExhaustedError as exc:
+        except Error as exc:
             if "status = '413'" in str(exc):
                 method = "put_many" if len(vs) > 1 else "put"
                 raise RequestSizeError(f"Queue.{method} request is too large") from exc
-            raise queue.Full(str(exc)) from exc
+            elif isinstance(exc, ResourceExhaustedError):
+                raise queue.Full(str(exc))
+            else:
+                raise exc
 
     @live_method
     async def len(self, *, partition: Optional[str] = None, total: bool = False) -> int:

{modal-1.2.7.dev10 → modal-1.2.7.dev11}/modal.egg-info/PKG-INFO

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

{modal-1.2.7.dev10 → modal-1.2.7.dev11}/modal_version/__init__.py

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