modal 1.3.1.dev7__tar.gz → 1.3.1.dev9__tar.gz

{modal-1.3.1.dev7 → modal-1.3.1.dev9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.3.1.dev7
+Version: 1.3.1.dev9
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
 License: Apache-2.0
@@ -20,7 +20,8 @@ Requires-Dist: aiohttp
 Requires-Dist: cbor2
 Requires-Dist: certifi
 Requires-Dist: click~=8.1
-Requires-Dist: grpclib<0.4.10,>=0.4.7
+Requires-Dist: grpclib<0.4.10,>=0.4.7; python_version < "3.14"
+Requires-Dist: grpclib<0.4.10,>=0.4.9; python_version >= "3.14"
 Requires-Dist: protobuf!=4.24.0,<7.0,>=3.19
 Requires-Dist: rich>=12.0.0
 Requires-Dist: synchronicity~=0.11.1

{modal-1.3.1.dev7 → modal-1.3.1.dev9}/modal/_grpc_client.py

@@ -6,7 +6,7 @@ from google.protobuf.message import Message
 from grpclib import GRPCError, Status
 
 from . import exception
-from ._traceback import suppress_tb_frames
+from ._traceback import suppress_tb_frame
 from ._utils.grpc_utils import Retry, _retry_transient_errors
 from .config import config, logger
 
@@ -50,7 +50,7 @@ class grpc_error_converter:
     def __exit__(self, exc_type, exc, traceback) -> Literal[False]:
         # skip all internal frames from grpclib
         use_full_traceback = config.get("traceback")
-        with suppress_tb_frames(1):
+        with suppress_tb_frame():
             if isinstance(exc, GRPCError):
                 modal_exc = _STATUS_TO_EXCEPTION[exc.status](exc.message)
                 modal_exc._grpc_message = exc.message
@@ -115,7 +115,7 @@ class UnaryUnaryWrapper(Generic[RequestType, ResponseType]):
         timeout: Optional[float] = None,
         metadata: Optional[list[tuple[str, str]]] = None,
     ) -> ResponseType:
-        with suppress_tb_frames(1):
+        with suppress_tb_frame():
             if timeout is not None and retry is not None:
                 raise exception.InvalidError("Retry must be None when timeout is set")
 

{modal-1.3.1.dev7 → modal-1.3.1.dev9}/modal/_object.py

@@ -9,7 +9,7 @@ from typing import Callable, ClassVar, Optional
 from google.protobuf.message import Message
 from typing_extensions import Self
 
-from modal._traceback import suppress_tb_frames
+from modal._traceback import suppress_tb_frame
 
 from ._load_context import LoadContext
 from ._resolver import Resolver
@@ -328,7 +328,7 @@ class _Object:
             # Set the client on LoadContext before loading
             root_load_context = LoadContext(client=client)
             resolver = Resolver()
-            with suppress_tb_frames(1):  # skip this frame by default
+            with suppress_tb_frame():  # skip this frame by default
                 await resolver.load(self, root_load_context)
         return self
 

{modal-1.3.1.dev7 → modal-1.3.1.dev9}/modal/_resolver.py

@@ -9,7 +9,7 @@ from collections.abc import Hashable
 from typing import TYPE_CHECKING, Optional
 
 import modal._object
-from modal._traceback import suppress_tb_frames
+from modal._traceback import suppress_tb_frame
 from modal_proto import api_pb2
 
 from ._load_context import LoadContext
@@ -120,37 +120,38 @@ class Resolver:
         if not cached_future:
             # don't run any awaits within this if-block to prevent race conditions
             async def loader():
-                load_context = await obj._load_context_overrides.merged_with(parent_load_context).apply_defaults()
+                with suppress_tb_frame():
+                    load_context = await obj._load_context_overrides.merged_with(parent_load_context).apply_defaults()
 
-                # TODO(erikbern): do we need existing_object_id for those?
-                await TaskContext.gather(*[self.load(dep, load_context) for dep in obj.deps()])
+                    # TODO(erikbern): do we need existing_object_id for those?
+                    await TaskContext.gather(*[self.load(dep, load_context) for dep in obj.deps()])
 
-                # Load the object itself
-                if not obj._load:
-                    raise Exception(f"Object {obj} has no loader function")
+                    # Load the object itself
+                    if not obj._load:
+                        raise Exception(f"Object {obj} has no loader function")
 
-                await obj._load(obj, self, load_context, existing_object_id)
+                    await obj._load(obj, self, load_context, existing_object_id)
 
-                # Check that the id of functions didn't change
-                # Persisted refs are ignored because their life cycle is managed independently.
-                if (
-                    not obj._is_another_app
-                    and existing_object_id is not None
-                    and existing_object_id.startswith("fu-")
-                    and obj.object_id != existing_object_id
-                ):
-                    raise Exception(
-                        f"Tried creating an object using existing id {existing_object_id} but it has id {obj.object_id}"
-                    )
+                    # Check that the id of functions didn't change
+                    # Persisted refs are ignored because their life cycle is managed independently.
+                    if (
+                        not obj._is_another_app
+                        and existing_object_id is not None
+                        and existing_object_id.startswith("fu-")
+                        and obj.object_id != existing_object_id
+                    ):
+                        raise Exception(
+                            f"Tried creating an object using existing id {existing_object_id} "
+                            f"but it has id {obj.object_id}"
+                        )
 
-                return obj
+                    return obj
 
             cached_future = asyncio.create_task(loader())
             self._local_uuid_to_future[obj.local_uuid] = cached_future
             if deduplication_key is not None:
                 self._deduplication_cache[deduplication_key] = cached_future
-        with suppress_tb_frames(2):
-            # skip current frame + `loader()` closure frame from above
+        with suppress_tb_frame():
             return await cached_future
 
     def objects(self) -> list["modal._object._Object"]:

{modal-1.3.1.dev7 → modal-1.3.1.dev9}/modal/_traceback.py

@@ -13,7 +13,7 @@ import warnings
 from types import TracebackType
 from typing import Any, Iterable, Optional
 
-from modal.config import config, logger
+from modal.config import config
 from modal_proto import api_pb2
 
 from ._vendor.tblib import Traceback as TBLibTraceback
@@ -137,10 +137,7 @@ traceback_suppression_note = (
 )
 
 
-class suppress_tb_frames:
-    def __init__(self, n: int):
-        self.n = n
-
+class suppress_tb_frame:
     def __enter__(self):
         pass
 
@@ -154,15 +151,7 @@ class suppress_tb_frames:
             return False
 
         # modify traceback on exception object
-        try:
-            removed = 0
-            final_tb = tb
-            while final_tb is not None and removed < self.n:
-                final_tb = final_tb.tb_next
-                removed += 1
-        except AttributeError:
-            logger.debug(f"Failed to suppress {self.n} traceback frames from {str(exc_type)} {str(exc)}")
-            raise
+        final_tb = tb.tb_next if tb is not None else tb
 
         exc.with_traceback(final_tb)
         notes = getattr(exc, "__notes__", [])

{modal-1.3.1.dev7 → modal-1.3.1.dev9}/modal/_utils/grpc_utils.py

@@ -27,7 +27,7 @@ from modal.exception import ConnectionError
 from modal_proto import api_pb2
 from modal_version import __version__
 
-from .._traceback import suppress_tb_frames
+from .._traceback import suppress_tb_frame
 from ..config import config
 from .async_utils import retry
 from .logger import logger
@@ -273,7 +273,7 @@ def process_exception_before_retry(
     idempotency_key: str,
 ):
     """Process exception before retry, used by `_retry_transient_errors`."""
-    with suppress_tb_frames(1):
+    with suppress_tb_frame():
         if final_attempt:
             logger.debug(
                 f"Final attempt failed with {repr(exc)} {n_retries=} {delay=} for {fn_name} ({idempotency_key[:8]})"
@@ -357,7 +357,7 @@ async def _retry_transient_errors(
             timeout = None
 
         try:
-            with suppress_tb_frames(1):
+            with suppress_tb_frame():
                 return await fn_callable(req, metadata=attempt_metadata, timeout=timeout)
         except (StreamTerminatedError, GRPCError, OSError, asyncio.TimeoutError, AttributeError) as exc:
             # Note that we only catch AttributeError to handle a specific case that works around a bug
@@ -384,7 +384,7 @@ async def _retry_transient_errors(
                 )
                 final_attempt = total_timeout_will_be_reached or max_throttle_will_be_reached
 
-                with suppress_tb_frames(1):
+                with suppress_tb_frame():
                     process_exception_before_retry(
                         exc, final_attempt, fn.name, n_retries, server_delay, idempotency_key
                     )
@@ -414,7 +414,7 @@ async def _retry_transient_errors(
             else:
                 final_attempt = False
 
-            with suppress_tb_frames(1):
+            with suppress_tb_frame():
                 process_exception_before_retry(exc, final_attempt, fn.name, n_retries, delay, idempotency_key)
 
             n_retries += 1

{modal-1.3.1.dev7 → modal-1.3.1.dev9}/modal/client.pyi

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

{modal-1.3.1.dev7 → modal-1.3.1.dev9}/modal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.3.1.dev7
+Version: 1.3.1.dev9
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
 License: Apache-2.0
@@ -20,7 +20,8 @@ Requires-Dist: aiohttp
 Requires-Dist: cbor2
 Requires-Dist: certifi
 Requires-Dist: click~=8.1
-Requires-Dist: grpclib<0.4.10,>=0.4.7
+Requires-Dist: grpclib<0.4.10,>=0.4.7; python_version < "3.14"
+Requires-Dist: grpclib<0.4.10,>=0.4.9; python_version >= "3.14"
 Requires-Dist: protobuf!=4.24.0,<7.0,>=3.19
 Requires-Dist: rich>=12.0.0
 Requires-Dist: synchronicity~=0.11.1

{modal-1.3.1.dev7 → modal-1.3.1.dev9}/modal.egg-info/requires.txt

@@ -2,7 +2,6 @@ aiohttp
 cbor2
 certifi
 click~=8.1
-grpclib<0.4.10,>=0.4.7
 protobuf!=4.24.0,<7.0,>=3.19
 rich>=12.0.0
 synchronicity~=0.11.1
@@ -12,3 +11,9 @@ types-certifi
 types-toml
 watchfiles
 typing_extensions~=4.6
+
+[:python_version < "3.14"]
+grpclib<0.4.10,>=0.4.7
+
+[:python_version >= "3.14"]
+grpclib<0.4.10,>=0.4.9

{modal-1.3.1.dev7 → modal-1.3.1.dev9}/modal_proto/api.proto

@@ -2679,6 +2679,19 @@ message RateLimit {
   RateLimitInterval interval = 2;
 }
 
+message ResourceInfo {
+    message ResourceValue {
+      uint32 value = 1;
+      bool is_default = 2;
+    }
+    ResourceValue memory_mb = 1; // MiB
+    ResourceValue milli_cpu = 2; // milli CPU cores
+    string gpu_type = 3;
+    uint32 memory_mb_max = 4  ; // MiB
+    uint32 ephemeral_disk_mb = 5;  // MiB
+    uint32 milli_cpu_max = 6; // milli CPU cores
+}
+
 message Resources {
   uint32 memory_mb = 2; // MiB
   uint32 milli_cpu = 3; // milli CPU cores
@@ -2887,9 +2900,12 @@ message SandboxInfo {
   repeated SandboxTag tags = 6; // TODO: Not yet exposed in client library.
   string name = 7;
   string image_id = 8;
+  ResourceInfo resource_info = 9;
+  repeated string regions = 10;
   reserved 2; // modal.client.Sandbox definition
 }
 
+
 message SandboxListRequest {
   string app_id = 1;
   double before_timestamp = 2;