modal 1.5.1.dev9__tar.gz → 1.5.1.dev11__tar.gz

{modal-1.5.1.dev9 → modal-1.5.1.dev11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.5.1.dev9
+Version: 1.5.1.dev11
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
 License-Expression: Apache-2.0
@@ -23,7 +23,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.12.3
+Requires-Dist: synchronicity~=0.12.5
 Requires-Dist: toml
 Requires-Dist: types-certifi
 Requires-Dist: types-toml

{modal-1.5.1.dev9 → modal-1.5.1.dev11}/modal/_image.py

@@ -9,6 +9,7 @@ import typing
 import warnings
 from collections.abc import Callable, Collection, Sequence
 from dataclasses import dataclass, field
+from functools import wraps
 from inspect import isfunction
 from pathlib import Path, PurePosixPath
 from typing import (
@@ -424,6 +425,20 @@ async def _image_await_build_result(image_id: str, client: _Client) -> api_pb2.I
     return result_response
 
 
+def _requires_image_instance(method):
+    @wraps(method)
+    def wrapper(self, *args, **kwargs):
+        if not isinstance(self, _Image):
+            raise InvalidError(
+                "Image has not been constructed yet. "
+                f"Use one of the static factory methods prior to calling {method.__name__} "
+                "like `modal.Image.debian_slim`, `modal.Image.from_registry`, or `modal.Image.micromamba`"
+            )
+        return method(self, *args, **kwargs)
+
+    return wrapper
+
+
 class _Image(_Object, type_prefix="im"):
     """Base class for container images to run functions in.
 
@@ -755,6 +770,7 @@ class _Image(_Object, type_prefix="im"):
             context_mount_function=lambda: mount,
         )
 
+    @_requires_image_instance
     def add_local_file(self, local_path: str | Path, remote_path: str, *, copy: bool = False) -> "_Image":
         """Adds a local file to the image at `remote_path` within the container.
 
@@ -791,6 +807,7 @@ class _Image(_Object, type_prefix="im"):
         mount = _Mount._from_local_file(local_path, remote_path)
         return self._add_mount_layer_or_copy(mount, copy=copy)
 
+    @_requires_image_instance
     def add_local_dir(
         self,
         local_path: str | Path,
@@ -869,6 +886,7 @@ class _Image(_Object, type_prefix="im"):
         mount = _Mount._add_local_dir(Path(local_path), PurePosixPath(remote_path), ignore=_ignore_fn(ignore))
         return self._add_mount_layer_or_copy(mount, copy=copy)
 
+    @_requires_image_instance
     def add_local_python_source(
         self, *modules: str, copy: bool = False, ignore: Sequence[str] | Callable[[Path], bool] = NON_PYTHON_FILES
     ) -> "_Image":
@@ -1012,6 +1030,7 @@ class _Image(_Object, type_prefix="im"):
             await resolver.load(self, load_context)
         return self
 
+    @_requires_image_instance
     def pip_install(
         self,
         *packages: str | list[str],
@@ -1098,6 +1117,7 @@ class _Image(_Object, type_prefix="im"):
             secrets=secrets,
         )
 
+    @_requires_image_instance
     def pip_install_private_repos(
         self,
         *repositories: str,
@@ -1218,6 +1238,7 @@ class _Image(_Object, type_prefix="im"):
             force_build=self.force_build or force_build,
         )
 
+    @_requires_image_instance
     def pip_install_from_requirements(
         self,
         requirements_txt: str,
@@ -1279,6 +1300,7 @@ class _Image(_Object, type_prefix="im"):
             secrets=secrets,
         )
 
+    @_requires_image_instance
     def pip_install_from_pyproject(
         self,
         pyproject_toml: str,
@@ -1362,6 +1384,7 @@ class _Image(_Object, type_prefix="im"):
             gpu_config=parse_gpu_config(gpu),
         )
 
+    @_requires_image_instance
     def uv_pip_install(
         self,
         *packages: str | list[str],
@@ -1493,6 +1516,7 @@ class _Image(_Object, type_prefix="im"):
             secrets=secrets,
         )
 
+    @_requires_image_instance
     def poetry_install_from_file(
         self,
         poetry_pyproject_toml: str,
@@ -1602,6 +1626,7 @@ class _Image(_Object, type_prefix="im"):
             gpu_config=parse_gpu_config(gpu),
         )
 
+    @_requires_image_instance
     def uv_sync(
         self,
         uv_project_dir: str = "./",
@@ -1785,6 +1810,7 @@ class _Image(_Object, type_prefix="im"):
             gpu_config=parse_gpu_config(gpu),
         )
 
+    @_requires_image_instance
     def dockerfile_commands(
         self,
         *dockerfile_commands: str | list[str],
@@ -1873,6 +1899,7 @@ class _Image(_Object, type_prefix="im"):
             build_args=build_args,
         )
 
+    @_requires_image_instance
     def entrypoint(
         self,
         entrypoint_commands: list[str],
@@ -1893,6 +1920,7 @@ class _Image(_Object, type_prefix="im"):
 
         return self.dockerfile_commands(dockerfile_cmd)
 
+    @_requires_image_instance
     def shell(
         self,
         shell_commands: list[str],
@@ -1913,6 +1941,7 @@ class _Image(_Object, type_prefix="im"):
 
         return self.dockerfile_commands(dockerfile_cmd)
 
+    @_requires_image_instance
     def run_commands(
         self,
         *commands: str | list[str],
@@ -1997,6 +2026,7 @@ class _Image(_Object, type_prefix="im"):
             _namespace=api_pb2.DEPLOYMENT_NAMESPACE_GLOBAL,
         )
 
+    @_requires_image_instance
     def micromamba_install(
         self,
         *packages: str | list[str],
@@ -2528,6 +2558,7 @@ class _Image(_Object, type_prefix="im"):
             _namespace=api_pb2.DEPLOYMENT_NAMESPACE_GLOBAL,
         )
 
+    @_requires_image_instance
     def apt_install(
         self,
         *packages: str | list[str],
@@ -2579,6 +2610,7 @@ class _Image(_Object, type_prefix="im"):
             secrets=secrets,
         )
 
+    @_requires_image_instance
     def run_function(
         self,
         raw_f: Callable[..., Any],
@@ -2697,6 +2729,7 @@ class _Image(_Object, type_prefix="im"):
             force_build=self.force_build or force_build,
         )
 
+    @_requires_image_instance
     def env(self, vars: dict[str, str]) -> "_Image":
         """Sets the environment variables in an Image.
 
@@ -2727,6 +2760,7 @@ class _Image(_Object, type_prefix="im"):
             dockerfile_function=build_dockerfile,
         )
 
+    @_requires_image_instance
     def workdir(self, path: str | PurePosixPath) -> "_Image":
         """Set the working directory for subsequent image build steps and function execution.
 
@@ -2756,6 +2790,7 @@ class _Image(_Object, type_prefix="im"):
             dockerfile_function=build_dockerfile,
         )
 
+    @_requires_image_instance
     def cmd(self, cmd: list[str]) -> "_Image":
         """Set the default command (`CMD`) to run when a container is started.
 
@@ -2784,6 +2819,7 @@ class _Image(_Object, type_prefix="im"):
 
         return self.dockerfile_commands(dockerfile_cmd)
 
+    @_requires_image_instance
     def pipe(
         self,
         func: Callable[Concatenate["modal.Image", P], "modal.Image"],

{modal-1.5.1.dev9 → modal-1.5.1.dev11}/modal/_server.py

@@ -52,7 +52,7 @@ class _Server:
     Instead, use the [`@app.server()`](https://modal.com/docs/sdk/py/latest/modal.App#server) decorator.
 
     ```python notest
-    @app.server(port=8000, routing_region="us-east")
+    @app.server(port=8080, routing_region="us-east")
     class MyServer:
         @modal.enter()
         def start_server(self):

{modal-1.5.1.dev9 → modal-1.5.1.dev11}/modal/client.pyi

@@ -35,7 +35,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.5.1.dev9",
+        version: str = "1.5.1.dev11",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -205,7 +205,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.5.1.dev9",
+        version: str = "1.5.1.dev11",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.5.1.dev9 → modal-1.5.1.dev11}/modal/server.pyi

@@ -14,7 +14,7 @@ class Server:
     Instead, use the [`@app.server()`](https://modal.com/docs/sdk/py/latest/modal.App#server) decorator.
 
     ```python notest
-    @app.server(port=8000, routing_region="us-east")
+    @app.server(port=8080, routing_region="us-east")
     class MyServer:
         @modal.enter()
         def start_server(self):

{modal-1.5.1.dev9 → modal-1.5.1.dev11}/modal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.5.1.dev9
+Version: 1.5.1.dev11
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
 License-Expression: Apache-2.0
@@ -23,7 +23,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.12.3
+Requires-Dist: synchronicity~=0.12.5
 Requires-Dist: toml
 Requires-Dist: types-certifi
 Requires-Dist: types-toml

{modal-1.5.1.dev9 → modal-1.5.1.dev11}/modal.egg-info/requires.txt

@@ -4,7 +4,7 @@ certifi
 click~=8.1
 protobuf!=4.24.0,<7.0,>=3.19
 rich>=12.0.0
-synchronicity~=0.12.3
+synchronicity~=0.12.5
 toml
 types-certifi
 types-toml

{modal-1.5.1.dev9 → modal-1.5.1.dev11}/modal_proto/api_grpc.py

@@ -267,6 +267,10 @@ class ModalClientBase(abc.ABC):
     async def EndpointGetByName(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.EndpointGetByNameRequest, modal_proto.api_pb2.EndpointGetByNameResponse]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def EndpointGetLifecycle(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.EndpointGetLifecycleRequest, modal_proto.api_pb2.EndpointGetLifecycleResponse]') -> None:
+        pass
+
     @abc.abstractmethod
     async def EndpointList(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.EndpointListRequest, modal_proto.api_pb2.EndpointListResponse]') -> None:
         pass
@@ -839,6 +843,34 @@ class ModalClientBase(abc.ABC):
     async def VolumeRename(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.VolumeRenameRequest, google.protobuf.empty_pb2.Empty]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def WebhookTokenCreate(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.WebhookTokenCreateRequest, modal_proto.api_pb2.TokenCreateResponse]') -> None:
+        pass
+
+    @abc.abstractmethod
+    async def WebhookTokenDelete(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.TokenDeleteRequest, google.protobuf.empty_pb2.Empty]') -> None:
+        pass
+
+    @abc.abstractmethod
+    async def WebhookTokenEnvironmentAdd(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.WebhookTokenEnvironmentAddRequest, google.protobuf.empty_pb2.Empty]') -> None:
+        pass
+
+    @abc.abstractmethod
+    async def WebhookTokenEnvironmentList(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.WebhookTokenEnvironmentListRequest, modal_proto.api_pb2.WebhookTokenEnvironmentListResponse]') -> None:
+        pass
+
+    @abc.abstractmethod
+    async def WebhookTokenEnvironmentRemove(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.WebhookTokenEnvironmentRemoveRequest, google.protobuf.empty_pb2.Empty]') -> None:
+        pass
+
+    @abc.abstractmethod
+    async def WebhookTokenList(self, stream: 'grpclib.server.Stream[google.protobuf.empty_pb2.Empty, modal_proto.api_pb2.WebhookTokenListResponse]') -> None:
+        pass
+
+    @abc.abstractmethod
+    async def WebhookTokenListForEnvironment(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.WebhookTokenListForEnvironmentRequest, modal_proto.api_pb2.WebhookTokenListResponse]') -> None:
+        pass
+
     @abc.abstractmethod
     async def WorkspaceBillingReport(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.WorkspaceBillingReportRequest, modal_proto.api_pb2.WorkspaceBillingReportItem]') -> None:
         pass
@@ -1229,6 +1261,12 @@ class ModalClientBase(abc.ABC):
                 modal_proto.api_pb2.EndpointGetByNameRequest,
                 modal_proto.api_pb2.EndpointGetByNameResponse,
             ),
+            '/modal.client.ModalClient/EndpointGetLifecycle': grpclib.const.Handler(
+                self.EndpointGetLifecycle,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.EndpointGetLifecycleRequest,
+                modal_proto.api_pb2.EndpointGetLifecycleResponse,
+            ),
             '/modal.client.ModalClient/EndpointList': grpclib.const.Handler(
                 self.EndpointList,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -2087,6 +2125,48 @@ class ModalClientBase(abc.ABC):
                 modal_proto.api_pb2.VolumeRenameRequest,
                 google.protobuf.empty_pb2.Empty,
             ),
+            '/modal.client.ModalClient/WebhookTokenCreate': grpclib.const.Handler(
+                self.WebhookTokenCreate,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.WebhookTokenCreateRequest,
+                modal_proto.api_pb2.TokenCreateResponse,
+            ),
+            '/modal.client.ModalClient/WebhookTokenDelete': grpclib.const.Handler(
+                self.WebhookTokenDelete,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.TokenDeleteRequest,
+                google.protobuf.empty_pb2.Empty,
+            ),
+            '/modal.client.ModalClient/WebhookTokenEnvironmentAdd': grpclib.const.Handler(
+                self.WebhookTokenEnvironmentAdd,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.WebhookTokenEnvironmentAddRequest,
+                google.protobuf.empty_pb2.Empty,
+            ),
+            '/modal.client.ModalClient/WebhookTokenEnvironmentList': grpclib.const.Handler(
+                self.WebhookTokenEnvironmentList,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.WebhookTokenEnvironmentListRequest,
+                modal_proto.api_pb2.WebhookTokenEnvironmentListResponse,
+            ),
+            '/modal.client.ModalClient/WebhookTokenEnvironmentRemove': grpclib.const.Handler(
+                self.WebhookTokenEnvironmentRemove,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.WebhookTokenEnvironmentRemoveRequest,
+                google.protobuf.empty_pb2.Empty,
+            ),
+            '/modal.client.ModalClient/WebhookTokenList': grpclib.const.Handler(
+                self.WebhookTokenList,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                google.protobuf.empty_pb2.Empty,
+                modal_proto.api_pb2.WebhookTokenListResponse,
+            ),
+            '/modal.client.ModalClient/WebhookTokenListForEnvironment': grpclib.const.Handler(
+                self.WebhookTokenListForEnvironment,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.WebhookTokenListForEnvironmentRequest,
+                modal_proto.api_pb2.WebhookTokenListResponse,
+            ),
             '/modal.client.ModalClient/WorkspaceBillingReport': grpclib.const.Handler(
                 self.WorkspaceBillingReport,
                 grpclib.const.Cardinality.UNARY_STREAM,
@@ -2489,6 +2569,12 @@ class ModalClientStub:
             modal_proto.api_pb2.EndpointGetByNameRequest,
             modal_proto.api_pb2.EndpointGetByNameResponse,
         )
+        self.EndpointGetLifecycle = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/EndpointGetLifecycle',
+            modal_proto.api_pb2.EndpointGetLifecycleRequest,
+            modal_proto.api_pb2.EndpointGetLifecycleResponse,
+        )
         self.EndpointList = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/EndpointList',
@@ -3347,6 +3433,48 @@ class ModalClientStub:
             modal_proto.api_pb2.VolumeRenameRequest,
             google.protobuf.empty_pb2.Empty,
         )
+        self.WebhookTokenCreate = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/WebhookTokenCreate',
+            modal_proto.api_pb2.WebhookTokenCreateRequest,
+            modal_proto.api_pb2.TokenCreateResponse,
+        )
+        self.WebhookTokenDelete = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/WebhookTokenDelete',
+            modal_proto.api_pb2.TokenDeleteRequest,
+            google.protobuf.empty_pb2.Empty,
+        )
+        self.WebhookTokenEnvironmentAdd = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/WebhookTokenEnvironmentAdd',
+            modal_proto.api_pb2.WebhookTokenEnvironmentAddRequest,
+            google.protobuf.empty_pb2.Empty,
+        )
+        self.WebhookTokenEnvironmentList = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/WebhookTokenEnvironmentList',
+            modal_proto.api_pb2.WebhookTokenEnvironmentListRequest,
+            modal_proto.api_pb2.WebhookTokenEnvironmentListResponse,
+        )
+        self.WebhookTokenEnvironmentRemove = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/WebhookTokenEnvironmentRemove',
+            modal_proto.api_pb2.WebhookTokenEnvironmentRemoveRequest,
+            google.protobuf.empty_pb2.Empty,
+        )
+        self.WebhookTokenList = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/WebhookTokenList',
+            google.protobuf.empty_pb2.Empty,
+            modal_proto.api_pb2.WebhookTokenListResponse,
+        )
+        self.WebhookTokenListForEnvironment = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/WebhookTokenListForEnvironment',
+            modal_proto.api_pb2.WebhookTokenListForEnvironmentRequest,
+            modal_proto.api_pb2.WebhookTokenListResponse,
+        )
         self.WorkspaceBillingReport = grpclib.client.UnaryStreamMethod(
             channel,
             '/modal.client.ModalClient/WorkspaceBillingReport',