modal 0.74.62__py3-none-any.whl → 0.75.1__py3-none-any.whl

modal/_functions.py

@@ -336,6 +336,67 @@ class _Invocation:
                     break
 
 
+class _InputPlaneInvocation:
+    """Internal client representation of a single-input call to a Modal Function using the input
+    plane server API. As of 4/22/2025, this class is experimental and not used in production.
+    It is OK to make breaking changes to this class."""
+
+    stub: ModalClientModal
+
+    def __init__(
+        self,
+        stub: ModalClientModal,
+        attempt_token: str,
+        client: _Client,
+    ):
+        self.stub = stub
+        self.client = client  # Used by the deserializer.
+        self.attempt_token = attempt_token
+
+    @staticmethod
+    async def create(
+        function: "_Function",
+        args,
+        kwargs,
+        *,
+        client: _Client,
+        input_plane_url: str,
+    ) -> "_InputPlaneInvocation":
+        stub = await client.get_stub(input_plane_url)
+
+        function_id = function.object_id
+        item = await _create_input(args, kwargs, stub, method_name=function._use_method_name)
+
+        request = api_pb2.AttemptStartRequest(
+            function_id=function_id,
+            parent_input_id=current_input_id() or "",
+            input=item,
+        )
+        response = await retry_transient_errors(stub.AttemptStart, request)
+        attempt_token = response.attempt_token
+
+        return _InputPlaneInvocation(stub, attempt_token, client)
+
+    async def run_function(self) -> Any:
+        # TODO(nathan): add retry logic
+        while True:
+            request = api_pb2.AttemptAwaitRequest(
+                attempt_token=self.attempt_token,
+                timeout_secs=OUTPUTS_TIMEOUT,
+                requested_at=time.time(),
+            )
+            response: api_pb2.AttemptAwaitResponse = await retry_transient_errors(
+                self.stub.AttemptAwait,
+                request,
+                attempt_timeout=OUTPUTS_TIMEOUT + ATTEMPT_TIMEOUT_GRACE_PERIOD,
+            )
+
+            if response.HasField("output"):
+                return await _process_result(
+                    response.output.result, response.output.data_format, self.stub, self.client
+                )
+
+
 # Wrapper type for api_pb2.FunctionStats
 @dataclass(frozen=True)
 class FunctionStats:
@@ -1323,6 +1384,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
         self._class_parameter_info = metadata.class_parameter_info
         self._method_handle_metadata = dict(metadata.method_handle_metadata)
         self._definition_id = metadata.definition_id
+        self._input_plane_url = metadata.input_plane_url
 
     def _get_metadata(self):
         # Overridden concrete implementation of base class method
@@ -1337,6 +1399,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
             definition_id=self._definition_id,
             method_handle_metadata=self._method_handle_metadata,
             function_schema=self._metadata.function_schema if self._metadata else None,
+            input_plane_url=self._input_plane_url
         )
 
     def _check_no_web_url(self, fn_name: str):
@@ -1351,9 +1414,19 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
     @property
     @live_method
     async def web_url(self) -> Optional[str]:
+        """Deprecated. Use the `Function.get_web_url()` method instead.
+
+        URL of a Function running as a web endpoint.
+        """
+        deprecation_msg = """The Function.web_url property will be removed in a future version of Modal.
+Use the `Function.get_web_url()` method instead.
+"""
+        deprecation_warning((2025, 5, 6), deprecation_msg, pending=True)
+        return self._web_url
+
+    @live_method
+    async def get_web_url(self) -> Optional[str]:
         """URL of a Function running as a web endpoint."""
-        # TODO If we remove the @live_method above, we may want to provide better feedback when the underlying
-        # attribute is None because the object is not hydrated, rather than because it's not a web endpoint.
         return self._web_url
 
     @property
@@ -1408,13 +1481,23 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
                 yield item
 
     async def _call_function(self, args, kwargs) -> ReturnType:
-        invocation = await _Invocation.create(
-            self,
-            args,
-            kwargs,
-            client=self.client,
-            function_call_invocation_type=api_pb2.FUNCTION_CALL_INVOCATION_TYPE_SYNC,
-        )
+        invocation: Union[_Invocation, _InputPlaneInvocation]
+        if self._input_plane_url:
+            invocation = await _InputPlaneInvocation.create(
+                self,
+                args,
+                kwargs,
+                client=self.client,
+                input_plane_url=self._input_plane_url,
+            )
+        else:
+            invocation = await _Invocation.create(
+                self,
+                args,
+                kwargs,
+                client=self.client,
+                function_call_invocation_type=api_pb2.FUNCTION_CALL_INVOCATION_TYPE_SYNC,
+            )
 
         return await invocation.run_function()
 

modal/client.pyi

@@ -27,7 +27,7 @@ class _Client:
     _snapshotted: bool
 
     def __init__(
-        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.74.62"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.75.1"
     ): ...
     def is_closed(self) -> bool: ...
     @property
@@ -86,7 +86,7 @@ class Client:
     _snapshotted: bool
 
     def __init__(
-        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.74.62"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.75.1"
     ): ...
     def is_closed(self) -> bool: ...
     @property

modal/file_pattern_matcher.py

@@ -94,6 +94,8 @@ class FilePatternMatcher(_AbstractPatternMatcher):
                     raise ValueError('Illegal exclusion pattern: "!"')
                 new_pattern.exclusion = True
                 pattern = pattern[1:]
+            if os.path.isabs(pattern):
+                raise ValueError("Ignore patterns cannot be absolute paths")
             # In Python, we can proceed without explicit syntax checking
             new_pattern.cleaned_pattern = pattern
             new_pattern.dirs = pattern.split(os.path.sep)

modal/functions.pyi

@@ -186,6 +186,13 @@ class Function(
     def _check_no_web_url(self, fn_name: str): ...
     @property
     def web_url(self) -> typing.Optional[str]: ...
+
+    class __get_web_url_spec(typing_extensions.Protocol[SUPERSELF]):
+        def __call__(self, /) -> typing.Optional[str]: ...
+        async def aio(self, /) -> typing.Optional[str]: ...
+
+    get_web_url: __get_web_url_spec[typing_extensions.Self]
+
     @property
     def is_generator(self) -> bool: ...
 

modal/image.py

@@ -279,8 +279,9 @@ def _create_context_mount(
     include_fn = FilePatternMatcher(*copy_patterns)
 
     def ignore_with_include(source: Path) -> bool:
-        relative_source = source.relative_to(context_dir)
-        if not include_fn(relative_source) or ignore_fn(relative_source):
+        if source.is_absolute():
+            source = source.relative_to(context_dir)
+        if not include_fn(source) or ignore_fn(source):
             return True
 
         return False

modal/mount.py

@@ -153,9 +153,9 @@ class _MountDir(_MountEntry):
 
         for local_filename in gen:
             local_path = Path(local_filename)
-            if not self.ignore(local_path):
-                local_relpath = local_path.expanduser().absolute().relative_to(local_dir)
-                mount_path = self.remote_path / local_relpath.as_posix()
+            rel_local_path = local_path.relative_to(local_dir)
+            if not self.ignore(rel_local_path):
+                mount_path = self.remote_path / rel_local_path.as_posix()
                 yield local_path.resolve(), mount_path
 
     def watch_entry(self):
@@ -339,8 +339,8 @@ class _Mount(_Object, type_prefix="mo"):
         return _Mount._new()._extend(
             _MountDir(
                 local_dir=local_path,
-                ignore=ignore,
                 remote_path=remote_path,
+                ignore=ignore,
                 recursive=True,
             ),
         )

{modal-0.74.62.dist-info → modal-0.75.1.dist-info}/METADATA

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

{modal-0.74.62.dist-info → modal-0.75.1.dist-info}/RECORD

@@ -3,7 +3,7 @@ modal/__main__.py,sha256=sTJcc9EbDuCKSwg3tL6ZckFw9WWdlkXW8mId1IvJCNc,2846
 modal/_clustered_functions.py,sha256=kTf-9YBXY88NutC1akI-gCbvf01RhMPCw-zoOI_YIUE,2700
 modal/_clustered_functions.pyi,sha256=2aWxN2v5WUnj-R-sk6BzJ-3AvggkQGQjwhtvbDH3pds,777
 modal/_container_entrypoint.py,sha256=2Zx9O_EMJg0H77EdnC2vGKs6uFMWwbP1NLFf-qYmWmU,28962
-modal/_functions.py,sha256=9vDIyDiAqW3TTpcda0mMDP62BgMd8kUjth16xSd4Nwc,77738
+modal/_functions.py,sha256=7Cec6Q7_ND6Ejlwn0c6Y2OufOmsg6huWqeRTZY6faYM,80527
 modal/_ipython.py,sha256=TW1fkVOmZL3YYqdS2YlM1hqpf654Yf8ZyybHdBnlhSw,301
 modal/_location.py,sha256=joiX-0ZeutEUDTrrqLF1GHXCdVLF-rHzstocbMcd_-k,366
 modal/_object.py,sha256=6ve4sI2nRAnjPCuAXdSoUplaXfzC9MqRlF_ZLULwwy0,11472
@@ -22,7 +22,7 @@ modal/app.py,sha256=xojuGZv4LaQwZU5ntj7WbmMjeNuB9Gll8Mzqe2LyiEs,51323
 modal/app.pyi,sha256=zNwR1_2LpmQc9AhemuAeVdk90XNYDw9keOkXAwAATeA,28732
 modal/call_graph.py,sha256=1g2DGcMIJvRy-xKicuf63IVE98gJSnQsr8R_NVMptNc,2581
 modal/client.py,sha256=o-aQThHpvDHUzg_kUafyhWzACViUBhY2WLZ2EitnSHA,16787
-modal/client.pyi,sha256=cbDMHReNe9h_63WwrsH0Fy6JQKulelNCftigIgwDJEs,8385
+modal/client.pyi,sha256=pPWEh6maNF0V7pvpLnCRw60B_aUEpB8Au_EhJsW9C3M,8383
 modal/cloud_bucket_mount.py,sha256=YOe9nnvSr4ZbeCn587d7_VhE9IioZYRvF9VYQTQux08,5914
 modal/cloud_bucket_mount.pyi,sha256=30T3K1a89l6wzmEJ_J9iWv9SknoGqaZDx59Xs-ZQcmk,1607
 modal/cls.py,sha256=aHoMEWMZUN7bOezs3tRPxzS1FP3gTxZBORVjbPmtxyg,35338
@@ -37,15 +37,15 @@ modal/environments.pyi,sha256=4HbI0kywveaUVI7HqDtZ4HphCTGXYi_wie2hz87up5A,3425
 modal/exception.py,sha256=4JyO-SACaLNDe2QC48EjsK8GMkZ8AgEurZ8j1YdRu8E,5263
 modal/file_io.py,sha256=lcMs_E9Xfm0YX1t9U2wNIBPnqHRxmImqjLW1GHqVmyg,20945
 modal/file_io.pyi,sha256=oB7x-rKq7bmm8cA7Z7W9C9yeko7KK9m9i5GidFnkGK4,9569
-modal/file_pattern_matcher.py,sha256=trosX-Bp7dOubudN1bLLhRAoidWy1TcoaR4Pv8CedWw,6497
+modal/file_pattern_matcher.py,sha256=R0BChpQUXiCDUv__dWTovRMrw1iBTg0kw5p1vwOqcqk,6613
 modal/functions.py,sha256=kcNHvqeGBxPI7Cgd57NIBBghkfbeFJzXO44WW0jSmao,325
-modal/functions.pyi,sha256=1GV493uk0Q7baSSPK4HtadK-1qSGMwM_OxlmgVvWP00,16742
+modal/functions.pyi,sha256=xc6igwNS77kYkyuVpWOlMPkanxriesIaKFTYlvmuXp0,16993
 modal/gpu.py,sha256=Kbhs_u49FaC2Zi0TjCdrpstpRtT5eZgecynmQi5IZVE,6752
-modal/image.py,sha256=ZCghS6l1O7pezXcdMHk6RoJpW3qWszfWGJTW38lNXaU,92797
+modal/image.py,sha256=lg3XxIWNYV8je88oEPbihzSEq_9gumc0NLbzZLAhm74,92807
 modal/image.pyi,sha256=MDq7tNJevElK78VxFYrZRe_00kz9gPdg98MN5c6fFoE,25644
 modal/io_streams.py,sha256=YDZVQSDv05DeXg5TwcucC9Rj5hQBx2GXdluan9rIUpw,15467
 modal/io_streams.pyi,sha256=1UK6kWLREASQfq-wL9wSp5iqjLU0egRZPDn4LXs1PZY,5136
-modal/mount.py,sha256=_YoJ1TYgttZYGCS-698e8XpExt-mYr994-cMBSOU6EE,32696
+modal/mount.py,sha256=lGxbu6tTEA8EdePQWYs2uu0Z3f3H_PjiXwDXOmStwrM,32674
 modal/mount.pyi,sha256=PHs-N9LGSDfYWw70UrhvGZW_6uWwyx-1GAieROzCNNs,12583
 modal/network_file_system.py,sha256=9_4EFTM1tKSTdwk0f4beSlWCiat6gC6ZjbsOWje07TM,14779
 modal/network_file_system.pyi,sha256=58DiUqHGlARmI3cz-Yo7IFObKKFIiGh5UIU5JxGNFfc,8333
@@ -146,7 +146,7 @@ modal/requirements/2024.10.txt,sha256=qD-5cVIVM9wXesJ6JC89Ew-3m2KjEElUz3jaw_MddR
 modal/requirements/PREVIEW.txt,sha256=qD-5cVIVM9wXesJ6JC89Ew-3m2KjEElUz3jaw_MddRo,296
 modal/requirements/README.md,sha256=9tK76KP0Uph7O0M5oUgsSwEZDj5y-dcUPsnpR0Sc-Ik,854
 modal/requirements/base-images.json,sha256=57vMSqzMbLBxw5tFWSaMiIkkVEps4JfX5PAtXGnkS4U,740
-modal-0.74.62.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-0.75.1.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
 modal_docs/__init__.py,sha256=svYKtV8HDwDCN86zbdWqyq5T8sMdGDj0PVlzc2tIxDM,28
 modal_docs/gen_cli_docs.py,sha256=c1yfBS_x--gL5bs0N4ihMwqwX8l3IBWSkBAKNNIi6bQ,3801
 modal_docs/gen_reference_docs.py,sha256=d_CQUGQ0rfw28u75I2mov9AlS773z9rG40-yq5o7g2U,6359
@@ -169,11 +169,11 @@ modal_proto/options_pb2.pyi,sha256=l7DBrbLO7q3Ir-XDkWsajm0d0TQqqrfuX54i4BMpdQg,1
 modal_proto/options_pb2_grpc.py,sha256=1oboBPFxaTEXt9Aw7EAj8gXHDCNMhZD2VXqocC9l_gk,159
 modal_proto/options_pb2_grpc.pyi,sha256=CImmhxHsYnF09iENPoe8S4J-n93jtgUYD2JPAc0yJSI,247
 modal_proto/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-modal_version/__init__.py,sha256=m94xZNWIjH8oUtJk4l9xfovzDJede2o7X-q0MHVECtM,470
+modal_version/__init__.py,sha256=PenIvZdwt-HVdbetAyxuPoyZTtzx2moKZoJLK8iZ804,470
 modal_version/__main__.py,sha256=2FO0yYQQwDTh6udt1h-cBnGd1c4ZyHnHSI4BksxzVac,105
-modal_version/_version_generated.py,sha256=XHXqJAOLosyRQo7ott3IiY3kCUw5siP3sK181LABQw8,149
-modal-0.74.62.dist-info/METADATA,sha256=ND8dOtq_rxRLwOjHpKLN5sWFa-q6gCbHIU2BEJWy3tk,2451
-modal-0.74.62.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-modal-0.74.62.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-0.74.62.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
-modal-0.74.62.dist-info/RECORD,,
+modal_version/_version_generated.py,sha256=_nDSI8hGHxzdQjG0q_a6V1UkzG2U0-lDGnd-alp1KWU,148
+modal-0.75.1.dist-info/METADATA,sha256=rI8s9zk_8oi-zEgq1ErtRePjGukBN2ino__FTqWzJ1E,2450
+modal-0.75.1.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+modal-0.75.1.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-0.75.1.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
+modal-0.75.1.dist-info/RECORD,,

modal_version/__init__.py

@@ -7,7 +7,7 @@ from ._version_generated import build_number
 major_number = 0
 
 # Bump this manually on breaking changes, then reset the number in _version_generated.py
-minor_number = 74
+minor_number = 75
 
 # Right now, automatically increment the patch number in CI
 __version__ = f"{major_number}.{minor_number}.{max(build_number, 0)}"

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 = 62  # git: 8a55f4a
+build_number = 1  # git: 0f5c526