modal 0.71.6__py3-none-any.whl → 0.71.8__py3-none-any.whl

modal/_container_entrypoint.py

@@ -116,7 +116,7 @@ class UserCodeEventLoop:
 
     def __enter__(self):
         self.loop = asyncio.new_event_loop()
-        self.tasks = []
+        self.tasks = set()
         return self
 
     def __exit__(self, exc_type, exc_value, traceback):
@@ -130,7 +130,10 @@ class UserCodeEventLoop:
         self.loop.close()
 
     def create_task(self, coro):
-        self.tasks.append(self.loop.create_task(coro))
+        task = self.loop.create_task(coro)
+        self.tasks.add(task)
+        task.add_done_callback(self.tasks.discard)
+        return task
 
     def run(self, coro):
         task = asyncio.ensure_future(coro, loop=self.loop)
@@ -531,10 +534,13 @@ def main(container_args: api_pb2.ContainerArguments, client: Client):
         with container_io_manager.handle_user_exception():
             finalized_functions = service.get_finalized_functions(function_def, container_io_manager)
         # Execute the function.
+        lifespan_background_tasks = []
         try:
             for finalized_function in finalized_functions.values():
                 if finalized_function.lifespan_manager:
-                    event_loop.create_task(finalized_function.lifespan_manager.background_task())
+                    lifespan_background_tasks.append(
+                        event_loop.create_task(finalized_function.lifespan_manager.background_task())
+                    )
                     with container_io_manager.handle_user_exception():
                         event_loop.run(finalized_function.lifespan_manager.lifespan_startup())
             call_function(
@@ -559,6 +565,10 @@ def main(container_args: api_pb2.ContainerArguments, client: Client):
                             with container_io_manager.handle_user_exception():
                                 event_loop.run(finalized_function.lifespan_manager.lifespan_shutdown())
                 finally:
+                    # no need to keep the lifespan asgi call around - we send it no more messages
+                    for lifespan_background_task in lifespan_background_tasks:
+                        lifespan_background_task.cancel()  # prevent dangling tasks
+
                     # Identify "exit" methods and run them.
                     # want to make sure this is called even if the lifespan manager fails
                     if service.user_cls_instance is not None and not is_auto_snapshot:

modal/_runtime/asgi.py

@@ -22,11 +22,11 @@ FIRST_MESSAGE_TIMEOUT_SECONDS = 5.0
 
 
 class LifespanManager:
-    startup: asyncio.Future
-    shutdown: asyncio.Future
-    queue: asyncio.Queue
-    has_run_init: bool = False
-    lifespan_supported: bool = False
+    _startup: asyncio.Future
+    _shutdown: asyncio.Future
+    _queue: asyncio.Queue
+    _has_run_init: bool = False
+    _lifespan_supported: bool = False
 
     def __init__(self, asgi_app, state):
         self.asgi_app = asgi_app
@@ -37,59 +37,63 @@ class LifespanManager:
         # no async code since it has to run inside
         # the event loop to tie the
         # objects to the correct loop in python 3.9
-        if not self.has_run_init:
-            self.queue = asyncio.Queue()
-            self.startup = asyncio.Future()
-            self.shutdown = asyncio.Future()
-            self.has_run_init = True
+        if not self._has_run_init:
+            self._queue = asyncio.Queue()
+            self._startup = asyncio.Future()
+            self._shutdown = asyncio.Future()
+            self._has_run_init = True
 
     async def background_task(self):
         await self.ensure_init()
 
         async def receive():
-            self.lifespan_supported = True
-            return await self.queue.get()
+            self._lifespan_supported = True
+            return await self._queue.get()
 
         async def send(message):
             if message["type"] == "lifespan.startup.complete":
-                self.startup.set_result(None)
+                self._startup.set_result(None)
             elif message["type"] == "lifespan.startup.failed":
-                self.startup.set_exception(ExecutionError("ASGI lifespan startup failed"))
+                self._startup.set_exception(ExecutionError("ASGI lifespan startup failed"))
             elif message["type"] == "lifespan.shutdown.complete":
-                self.shutdown.set_result(None)
+                self._shutdown.set_result(None)
             elif message["type"] == "lifespan.shutdown.failed":
-                self.shutdown.set_exception(ExecutionError("ASGI lifespan shutdown failed"))
+                self._shutdown.set_exception(ExecutionError("ASGI lifespan shutdown failed"))
             else:
                 raise ExecutionError(f"Unexpected message type: {message['type']}")
 
         try:
             await self.asgi_app({"type": "lifespan", "state": self.state}, receive, send)
         except Exception as e:
-            if not self.lifespan_supported:
+            if not self._lifespan_supported:
                 logger.info(f"ASGI lifespan task exited before receiving any messages with exception:\n{e}")
-                self.startup.set_result(None)
-                self.shutdown.set_result(None)
+                if not self._startup.done():
+                    self._startup.set_result(None)
+                if not self._shutdown.done():
+                    self._shutdown.set_result(None)
                 return
 
             logger.error(f"Error in ASGI lifespan task: {e}")
-            if not self.startup.done():
-                self.startup.set_exception(ExecutionError("ASGI lifespan task exited startup"))
-            if not self.shutdown.done():
-                self.shutdown.set_exception(ExecutionError("ASGI lifespan task exited shutdown"))
+            if not self._startup.done():
+                self._startup.set_exception(ExecutionError("ASGI lifespan task exited startup"))
+            if not self._shutdown.done():
+                self._shutdown.set_exception(ExecutionError("ASGI lifespan task exited shutdown"))
         else:
             logger.info("ASGI Lifespan protocol is probably not supported by this library")
-            self.startup.set_result(None)
-            self.shutdown.set_result(None)
+            if not self._startup.done():
+                self._startup.set_result(None)
+            if not self._shutdown.done():
+                self._shutdown.set_result(None)
 
     async def lifespan_startup(self):
         await self.ensure_init()
-        self.queue.put_nowait({"type": "lifespan.startup"})
-        await self.startup
+        self._queue.put_nowait({"type": "lifespan.startup"})
+        await self._startup
 
     async def lifespan_shutdown(self):
         await self.ensure_init()
-        self.queue.put_nowait({"type": "lifespan.shutdown"})
-        await self.shutdown
+        self._queue.put_nowait({"type": "lifespan.shutdown"})
+        await self._shutdown
 
 
 def asgi_app_wrapper(asgi_app, container_io_manager) -> tuple[Callable[..., AsyncGenerator], LifespanManager]:

modal/client.pyi

@@ -26,7 +26,7 @@ class _Client:
     _stub: typing.Optional[modal_proto.api_grpc.ModalClientStub]
 
     def __init__(
-        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.71.6"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.71.8"
     ): ...
     def is_closed(self) -> bool: ...
     @property
@@ -81,7 +81,7 @@ class Client:
     _stub: typing.Optional[modal_proto.api_grpc.ModalClientStub]
 
     def __init__(
-        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.71.6"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.71.8"
     ): ...
     def is_closed(self) -> bool: ...
     @property

modal/image.py

@@ -832,6 +832,24 @@ class _Image(_Object, type_prefix="im"):
             ),
         )
 
+    @staticmethod
+    async def from_id(image_id: str, client: Optional[_Client] = None) -> "_Image":
+        """Construct an Image from an id and look up the Image result.
+
+        The ID of an Image object can be accessed using `.object_id`.
+        """
+        if client is None:
+            client = await _Client.from_env()
+
+        async def _load(self: _Image, resolver: Resolver, existing_object_id: Optional[str]):
+            resp = await retry_transient_errors(client.stub.ImageFromId, api_pb2.ImageFromIdRequest(image_id=image_id))
+            self._hydrate(resp.image_id, resolver.client, resp.metadata)
+
+        rep = "Image()"
+        obj = _Image._from_loader(_load, rep)
+
+        return obj
+
     def pip_install(
         self,
         *packages: Union[str, list[str]],  # A list of Python packages, eg. ["numpy", "matplotlib>=3.5.0"]

modal/image.pyi

@@ -126,6 +126,8 @@ class _Image(modal.object._Object):
         remote_path: typing.Union[str, pathlib.Path] = ".",
         ignore: typing.Union[collections.abc.Sequence[str], typing.Callable[[pathlib.Path], bool]] = [],
     ) -> _Image: ...
+    @staticmethod
+    async def from_id(image_id: str, client: typing.Optional[modal.client._Client] = None) -> _Image: ...
     def pip_install(
         self,
         *packages: typing.Union[str, list[str]],
@@ -387,6 +389,13 @@ class Image(modal.object.Object):
         remote_path: typing.Union[str, pathlib.Path] = ".",
         ignore: typing.Union[collections.abc.Sequence[str], typing.Callable[[pathlib.Path], bool]] = [],
     ) -> Image: ...
+
+    class __from_id_spec(typing_extensions.Protocol):
+        def __call__(self, image_id: str, client: typing.Optional[modal.client.Client] = None) -> Image: ...
+        async def aio(self, image_id: str, client: typing.Optional[modal.client.Client] = None) -> Image: ...
+
+    from_id: __from_id_spec
+
     def pip_install(
         self,
         *packages: typing.Union[str, list[str]],

{modal-0.71.6.dist-info → modal-0.71.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: modal
-Version: 0.71.6
+Version: 0.71.8
 Summary: Python client library for Modal
 Author: Modal Labs
 Author-email: support@modal.com

{modal-0.71.6.dist-info → modal-0.71.8.dist-info}/RECORD

@@ -2,7 +2,7 @@ modal/__init__.py,sha256=3NJLLHb0TRc2tc68kf8NHzORx38GbtbZvPEWDWrQ6N4,2234
 modal/__main__.py,sha256=scYhGFqh8OJcVDo-VOxIT6CCwxOgzgflYWMnIZiMRqE,2871
 modal/_clustered_functions.py,sha256=kTf-9YBXY88NutC1akI-gCbvf01RhMPCw-zoOI_YIUE,2700
 modal/_clustered_functions.pyi,sha256=vllkegc99A0jrUOWa8mdlSbdp6uz36TsHhGxysAOpaQ,771
-modal/_container_entrypoint.py,sha256=-zUa567FgOKmF0TtFWQ6DgehUD2CMfABDBQ8oLSpjyc,29171
+modal/_container_entrypoint.py,sha256=U1ZU-Sa0LC646YPh0AWSGVBHmzfTxYUiGu2viKzW-Zs,29643
 modal/_ipython.py,sha256=TW1fkVOmZL3YYqdS2YlM1hqpf654Yf8ZyybHdBnlhSw,301
 modal/_location.py,sha256=S3lSxIU3h9HkWpkJ3Pwo0pqjIOSB1fjeSgUsY3x7eec,1202
 modal/_output.py,sha256=0fWX_KQwhER--U81ys16CL-pA5A-LN20C0EZjElKGJQ,25410
@@ -19,7 +19,7 @@ modal/app.py,sha256=vEE0cK5QPF6_cdW5AJvcuWxz5KmeprHwBEtlDkVRHgE,45582
 modal/app.pyi,sha256=Gx7gxjfQ70sxhbwfpx1VjvzEON-ZEMTJ_Vy8qt0oQvo,25302
 modal/call_graph.py,sha256=1g2DGcMIJvRy-xKicuf63IVE98gJSnQsr8R_NVMptNc,2581
 modal/client.py,sha256=JAnd4-GCN093BwkvOFAK5a6iy5ycxofjpUncMxlrIMw,15253
-modal/client.pyi,sha256=NfXng63F8_mjJjfXLCd0JrnZkIDk9U-XyL8_l52QLN4,7278
+modal/client.pyi,sha256=TrQn13Pm1t7N2XRd5-jvxe5zzSL69I5EcZndQUyFmcM,7278
 modal/cloud_bucket_mount.py,sha256=G7T7jWLD0QkmrfKR75mSTwdUZ2xNfj7pkVqb4ipmxmI,5735
 modal/cloud_bucket_mount.pyi,sha256=CEi7vrH3kDUF4LAy4qP6tfImy2UJuFRcRbsgRNM1wo8,1403
 modal/cls.py,sha256=3hjb0JcoPjxKZNeK22f5rR43bZRBjoRI7_EMZXY7YrE,31172
@@ -39,8 +39,8 @@ modal/file_pattern_matcher.py,sha256=LaI7Paxg0xR9D-D7Tgc60xR0w1KZee22LjGbFie1Vms
 modal/functions.py,sha256=3uJPbrEAWhpFfLfUnoRjGmvEUC-_wVh-8yNJBx8eVeM,68249
 modal/functions.pyi,sha256=LiSDgH-X7jcZ56pAoLMwo3x9Dzdp_3Sd7W5MVAJPoCg,25407
 modal/gpu.py,sha256=MTxj6ql8EpgfBg8YmZ5a1cLznyuZFssX1qXbEX4LKVM,7503
-modal/image.py,sha256=Krvcsclomp9YsqSNwFj2FoAyg10OvU47RDnsNCwjGbQ,84550
-modal/image.pyi,sha256=1fgGvsL5Rb0Sa-_2OCgIyJ_QgHcL0_9MWD_oY7cyFFM,24937
+modal/image.py,sha256=oKqqLhc3Ap2XMG5MKVlERKkMTwJPkNMNcSzxoZh4zuw,85259
+modal/image.pyi,sha256=Pa1_LVr3FyNsnu_MhBO08fBgCeLazTEe25phYdu0bzE,25365
 modal/io_streams.py,sha256=Xxc5grJiO94nBA48FFWH3S3g6SPR0xFVgZ_DZ1oFmvI,14428
 modal/io_streams.pyi,sha256=bCCVSxkMcosYd8O3PQDDwJw7TQ8JEcnYonLJ5t27TQs,4804
 modal/io_streams_helper.py,sha256=B5Ui56ph7LkRpZX0tAF80Q-gOMsvPPLx5bpIPX0kgDc,1772
@@ -78,7 +78,7 @@ modal/token_flow.pyi,sha256=gOYtYujrWt_JFZeiI8EmfahXPx5GCR5Na-VaPQcWgEY,1937
 modal/volume.py,sha256=T-pLxCYqmqRO6OolpAXlPxomMu0RWjti2e4kUpaj2cQ,29229
 modal/volume.pyi,sha256=eekb2dnAAwFK_NO9ciAOOTthl8NP1iAmMFrCGgjDA2k,11100
 modal/_runtime/__init__.py,sha256=MIEP8jhXUeGq_eCjYFcqN5b1bxBM4fdk0VESpjWR0fc,28
-modal/_runtime/asgi.py,sha256=Mjs859pSgOmtZL-YmEsSKN557v1A2Ax_5-ERgPfj55E,21920
+modal/_runtime/asgi.py,sha256=c4hmaMW1pLo-cm7ouriJjieuFm4ZF6D2LMy0638sfOs,22139
 modal/_runtime/container_io_manager.py,sha256=HgDLjE78yy1P7WZTmsEVDf89YnFFWG63Ddes8uYLVDY,43764
 modal/_runtime/execution_context.py,sha256=E6ofm6j1POXGPxS841X3V7JU6NheVb8OkQc7JpLq4Kg,2712
 modal/_runtime/telemetry.py,sha256=T1RoAGyjBDr1swiM6pPsGRSITm7LI5FDK18oNXxY08U,5163
@@ -166,10 +166,10 @@ modal_proto/options_pb2_grpc.pyi,sha256=CImmhxHsYnF09iENPoe8S4J-n93jtgUYD2JPAc0y
 modal_proto/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 modal_version/__init__.py,sha256=BEBWj9tcbFUwzEjUrqly601rauw5cYsHdcmJHs3iu0s,470
 modal_version/__main__.py,sha256=2FO0yYQQwDTh6udt1h-cBnGd1c4ZyHnHSI4BksxzVac,105
-modal_version/_version_generated.py,sha256=jbZljLgZ-HocRNgrswTNVhAp8D4H4g32moUc0dud9-s,148
-modal-0.71.6.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
-modal-0.71.6.dist-info/METADATA,sha256=NoiwOq43-7EWLSJ8JnfeI7NyPHwFU_5wjNDsrojkIe4,2328
-modal-0.71.6.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-modal-0.71.6.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-0.71.6.dist-info/top_level.txt,sha256=1nvYbOSIKcmU50fNrpnQnrrOpj269ei3LzgB6j9xGqg,64
-modal-0.71.6.dist-info/RECORD,,
+modal_version/_version_generated.py,sha256=Wsequ_fpOFVKI_31Vx8o7dmn9xo9m9A_dDR6wZzyDIU,148
+modal-0.71.8.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-0.71.8.dist-info/METADATA,sha256=KRAySrnrs0NscfurQ57XIYvXEEJ9FKumg47sf3ufFi8,2328
+modal-0.71.8.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+modal-0.71.8.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-0.71.8.dist-info/top_level.txt,sha256=1nvYbOSIKcmU50fNrpnQnrrOpj269ei3LzgB6j9xGqg,64
+modal-0.71.8.dist-info/RECORD,,

modal_version/_version_generated.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2025
 
 # Note: Reset this value to -1 whenever you make a minor `0.X` release of the client.
-build_number = 6  # git: 37bdeea
+build_number = 8  # git: e068215