modal 0.73.10__py3-none-any.whl → 0.73.11__py3-none-any.whl

modal/_functions.py

@@ -65,7 +65,7 @@ from .exception import (
 )
 from .gpu import GPU_T, parse_gpu_config
 from .image import _Image
-from .mount import _get_client_mount, _Mount, get_auto_mounts
+from .mount import _get_client_mount, _Mount, get_sys_modules_mounts
 from .network_file_system import _NetworkFileSystem, network_file_system_mount_protos
 from .output import _get_output_manager
 from .parallel_map import (
@@ -436,7 +436,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
         return fun
 
     @staticmethod
-    def from_args(
+    def from_local(
         info: FunctionInfo,
         app,
         image: _Image,
@@ -504,18 +504,41 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
             if include_source_mode != IncludeSourceMode.INCLUDE_NOTHING:
                 entrypoint_mounts = info.get_entrypoint_mount()
             else:
-                entrypoint_mounts = []
+                entrypoint_mounts = {}
 
             all_mounts = [
                 _get_client_mount(),
                 *explicit_mounts,
-                *entrypoint_mounts,
+                *entrypoint_mounts.values(),
             ]
 
             if include_source_mode is IncludeSourceMode.INCLUDE_FIRST_PARTY:
-                # TODO(elias): if using INCLUDE_FIRST_PARTY *and* mounts are added that haven't already been
-                #  added to the image via add_local_python_source
-                all_mounts += get_auto_mounts()
+                auto_mounts = get_sys_modules_mounts()
+                # don't need to add entrypoint modules to automounts:
+                for entrypoint_module in entrypoint_mounts:
+                    auto_mounts.pop(entrypoint_module, None)
+
+                warn_missing_modules = set(auto_mounts.keys()) - image._added_python_source_set
+
+                if warn_missing_modules:
+                    python_stringified_modules = ", ".join(f'"{mod}"' for mod in sorted(warn_missing_modules))
+                    deprecation_warning(
+                        (2025, 2, 3),
+                        (
+                            'Modal will stop implicitly adding local Python modules to the Image ("automounting") in a '
+                            "future update. The following modules need to be explicitly added for future "
+                            "compatibility:\n"
+                        )
+                        + "\n".join(sorted([f"* {m}" for m in warn_missing_modules]))
+                        + "\n\n"
+                        + (
+                            "e.g.:\n"
+                            f"image_with_source = my_image.add_local_python_source({python_stringified_modules})\n\n"
+                        )
+                        + "For more information, see https://modal.com/docs/guide/modal-1-0-migration",
+                        pending=True,
+                    )
+                all_mounts += auto_mounts.values()
         else:
             # skip any mount introspection/logic inside containers, since the function
             # should already be hydrated
@@ -564,7 +587,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
             for k, pf in build_functions:
                 build_function = pf.raw_f
                 snapshot_info = FunctionInfo(build_function, user_cls=info.user_cls)
-                snapshot_function = _Function.from_args(
+                snapshot_function = _Function.from_local(
                     snapshot_info,
                     app=None,
                     image=image,

modal/_utils/function_utils.py

@@ -308,7 +308,7 @@ class FunctionInfo:
             format=api_pb2.ClassParameterInfo.PARAM_SERIALIZATION_FORMAT_PROTO, schema=modal_parameters
         )
 
-    def get_entrypoint_mount(self) -> list[_Mount]:
+    def get_entrypoint_mount(self) -> dict[str, _Mount]:
         """
         Includes:
         * Implicit mount of the function itself (the module or package that the function is part of)
@@ -322,7 +322,7 @@ class FunctionInfo:
         """
         if self.is_serialized():
             # Don't auto-mount anything for serialized functions (including notebooks)
-            return []
+            return {}
 
         # make sure the function's own entrypoint is included:
         if self._type == FunctionInfoType.PACKAGE:
@@ -331,21 +331,23 @@ class FunctionInfo:
             #  includes non-.py files, since we'll want to migrate to .py-only
             #  soon to get it consistent with the `add_local_python_source()`
             #  defaults.
-            return [_Mount._from_local_python_packages(top_level_package)]
+            return {top_level_package: _Mount._from_local_python_packages(top_level_package)}
         elif self._type == FunctionInfoType.FILE:
-            remote_path = ROOT_DIR / Path(self._file).name
+            # TODO: inspect if this file is already included as part of
+            #  a package mount, and skip it + reference that package
+            #  instead if that's the case. This avoids possible module
+            #  duplication bugs
+            module_file = Path(self._file)
+            container_module_name = module_file.stem
+            remote_path = ROOT_DIR / module_file.name
             if not _is_modal_path(remote_path):
-                # TODO: inspect if this file is already included as part of
-                #  a package mount, and skip it + reference that package
-                #  instead if that's the case. This avoids possible module
-                #  duplication bugs
-                return [
-                    _Mount._from_local_file(
+                return {
+                    container_module_name: _Mount._from_local_file(
                         self._file,
                         remote_path=remote_path,
                     )
-                ]
-        return []  # this should never be reached...
+                }
+        return {}  # this should never be reached...
 
     def get_tag(self):
         return self.function_name

modal/app.py

@@ -725,7 +725,7 @@ class _App:
                     raise InvalidError("`region` and `_experimental_scheduler_placement` cannot be used together")
                 scheduler_placement = SchedulerPlacement(region=region)
 
-            function = _Function.from_args(
+            function = _Function.from_local(
                 info,
                 app=self,
                 image=image,
@@ -862,7 +862,7 @@ class _App:
 
             info = FunctionInfo(None, serialized=serialized, user_cls=user_cls)
 
-            cls_func = _Function.from_args(
+            cls_func = _Function.from_local(
                 info,
                 app=self,
                 image=image or self._get_default_image(),

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.73.10"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.73.11"
     ): ...
     def is_closed(self) -> bool: ...
     @property
@@ -85,7 +85,7 @@ class Client:
     _snapshotted: bool
 
     def __init__(
-        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.73.10"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.73.11"
     ): ...
     def is_closed(self) -> bool: ...
     @property

modal/functions.pyi

@@ -57,7 +57,7 @@ class Function(
     def __init__(self, *args, **kwargs): ...
     def _bind_method(self, user_cls, method_name: str, partial_function: modal.partial_function.PartialFunction): ...
     @staticmethod
-    def from_args(
+    def from_local(
         info: modal._utils.function_utils.FunctionInfo,
         app,
         image: modal.image.Image,

modal/image.py

@@ -402,12 +402,14 @@ class _Image(_Object, type_prefix="im"):
     _deferred_mounts: Sequence[
         _Mount
     ]  # added as mounts on any container referencing the Image, see `def _mount_layers`
+    _added_python_source_set: frozenset[str]  # used to warn about missing mounts during auto-mount deprecation
     _metadata: Optional[api_pb2.ImageMetadata] = None  # set on hydration, private for now
 
     def _initialize_from_empty(self):
         self.inside_exceptions = []
         self._serve_mounts = frozenset()
         self._deferred_mounts = ()
+        self._added_python_source_set = frozenset()
         self.force_build = False
 
     def _initialize_from_other(self, other: "_Image"):
@@ -416,6 +418,7 @@ class _Image(_Object, type_prefix="im"):
         self.force_build = other.force_build
         self._serve_mounts = other._serve_mounts
         self._deferred_mounts = other._deferred_mounts
+        self._added_python_source_set = other._added_python_source_set
 
     def _hydrate_metadata(self, metadata: Optional[Message]):
         env_image_id = config.get("image_id")  # set as an env var in containers
@@ -440,7 +443,9 @@ class _Image(_Object, type_prefix="im"):
             self2._deferred_mounts = tuple(base_image._deferred_mounts) + (mount,)
             self2._serve_mounts = base_image._serve_mounts | ({mount} if mount.is_local() else set())
 
-        return _Image._from_loader(_load, "Image(local files)", deps=lambda: [base_image, mount])
+        img = _Image._from_loader(_load, "Image(local files)", deps=lambda: [base_image, mount])
+        img._added_python_source_set = base_image._added_python_source_set
+        return img
 
     @property
     def _mount_layers(self) -> typing.Sequence[_Mount]:
@@ -659,6 +664,9 @@ class _Image(_Object, type_prefix="im"):
         rep = f"Image({dockerfile_function})"
         obj = _Image._from_loader(_load, rep, deps=_deps)
         obj.force_build = force_build
+        obj._added_python_source_set = frozenset.union(
+            frozenset(), *(base._added_python_source_set for base in base_images.values())
+        )
         return obj
 
     def copy_mount(self, mount: _Mount, remote_path: Union[str, Path] = ".") -> "_Image":
@@ -843,7 +851,9 @@ class _Image(_Object, type_prefix="im"):
         ```
         """
         mount = _Mount._from_local_python_packages(*modules, ignore=ignore)
-        return self._add_mount_layer_or_copy(mount, copy=copy)
+        img = self._add_mount_layer_or_copy(mount, copy=copy)
+        img._added_python_source_set |= set(modules)
+        return img
 
     def copy_local_dir(
         self,
@@ -1954,7 +1964,7 @@ class _Image(_Object, type_prefix="im"):
 
         info = FunctionInfo(raw_f)
 
-        function = _Function.from_args(
+        function = _Function.from_local(
             info,
             app=None,
             image=self,  # type: ignore[reportArgumentType]  # TODO: probably conflict with type stub?

modal/image.pyi

@@ -85,6 +85,7 @@ class _Image(modal._object._Object):
     inside_exceptions: list[Exception]
     _serve_mounts: frozenset[modal.mount._Mount]
     _deferred_mounts: collections.abc.Sequence[modal.mount._Mount]
+    _added_python_source_set: frozenset[str]
     _metadata: typing.Optional[modal_proto.api_pb2.ImageMetadata]
 
     def _initialize_from_empty(self): ...
@@ -355,6 +356,7 @@ class Image(modal.object.Object):
     inside_exceptions: list[Exception]
     _serve_mounts: frozenset[modal.mount.Mount]
     _deferred_mounts: collections.abc.Sequence[modal.mount.Mount]
+    _added_python_source_set: frozenset[str]
     _metadata: typing.Optional[modal_proto.api_pb2.ImageMetadata]
 
     def __init__(self, *args, **kwargs): ...

modal/mount.py

@@ -821,14 +821,14 @@ def _is_modal_path(remote_path: PurePosixPath):
     return False
 
 
-def get_auto_mounts() -> list[_Mount]:
+def get_sys_modules_mounts() -> dict[str, _Mount]:
     """mdmd:hidden
 
     Auto-mount local modules that have been imported in global scope.
     This may or may not include the "entrypoint" of the function as well, depending on how modal is invoked
     Note: sys.modules may change during the iteration
     """
-    auto_mounts = []
+    auto_mounts = {}
     top_level_modules = []
     skip_prefixes = set()
     for name, module in sorted(sys.modules.items(), key=lambda kv: len(kv[0])):
@@ -858,6 +858,6 @@ def get_auto_mounts() -> list[_Mount]:
                 # skip any module that has paths in SYS_PREFIXES, or would overwrite the modal Package in the container
                 break
         else:
-            auto_mounts.append(potential_mount)
+            auto_mounts[module_name] = potential_mount
 
     return auto_mounts

modal/mount.pyi

@@ -306,7 +306,7 @@ def _create_client_mount(): ...
 def create_client_mount(): ...
 def _get_client_mount(): ...
 def _is_modal_path(remote_path: pathlib.PurePosixPath): ...
-def get_auto_mounts() -> list[_Mount]: ...
+def get_sys_modules_mounts() -> dict[str, _Mount]: ...
 
 ROOT_DIR: pathlib.PurePosixPath
 

{modal-0.73.10.dist-info → modal-0.73.11.dist-info}/METADATA

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

{modal-0.73.10.dist-info → modal-0.73.11.dist-info}/RECORD

@@ -3,7 +3,7 @@ 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=qahIuJvaMmWG85N5vNS1yuAQ9XZoo1ftzfatkos_q7I,29553
-modal/_functions.py,sha256=XTcpMIlGqa3MPSTbnCwvbagTCeIHlnV4g8WlkGF5SOs,70352
+modal/_functions.py,sha256=Yv8hutin0R_0ZRvUZm8kcjVMf4CNAckgMSDpbLSUl0E,71593
 modal/_ipython.py,sha256=TW1fkVOmZL3YYqdS2YlM1hqpf654Yf8ZyybHdBnlhSw,301
 modal/_location.py,sha256=S3lSxIU3h9HkWpkJ3Pwo0pqjIOSB1fjeSgUsY3x7eec,1202
 modal/_object.py,sha256=ItQcsMNkz9Y3kdTsvfNarbW-paJ2qabDyQ7njaqY0XI,11359
@@ -17,11 +17,11 @@ modal/_traceback.py,sha256=IZQzB3fVlUfMHOSyKUgw0H6qv4yHnpyq-XVCNZKfUdA,5023
 modal/_tunnel.py,sha256=zTBxBiuH1O22tS1OliAJdIsSmaZS8PlnifS_6S5z-mk,6320
 modal/_tunnel.pyi,sha256=JmmDYAy9F1FpgJ_hWx0xkom2nTOFQjn4mTPYlU3PFo4,1245
 modal/_watcher.py,sha256=K6LYnlmSGQB4tWWI9JADv-tvSvQ1j522FwT71B51CX8,3584
-modal/app.py,sha256=wRygVSrWH8iIqhDAAl2Ww_RAkz8MCJZ0Jt9qYZCF6SA,44626
+modal/app.py,sha256=MaWCYgNx8y2GQhmaXQBMKKAAfCYfdxrdYs6zCBoJzwI,44628
 modal/app.pyi,sha256=lxiuWzE_OLb3WHg-H7Pek9DGBuCUzZ55P594VhJL5LA,26113
 modal/call_graph.py,sha256=1g2DGcMIJvRy-xKicuf63IVE98gJSnQsr8R_NVMptNc,2581
 modal/client.py,sha256=8SQawr7P1PNUCq1UmJMUQXG2jIo4Nmdcs311XqrNLRE,15276
-modal/client.pyi,sha256=zquF7hra8lDrBysJUafRuLtmDHnUXpEU1nt9wRDDCUs,7593
+modal/client.pyi,sha256=ALJFDxGokLAB9KoQ5frmUZt3pg2VcXN2CAp_v7ukNuw,7593
 modal/cloud_bucket_mount.py,sha256=YOe9nnvSr4ZbeCn587d7_VhE9IioZYRvF9VYQTQux08,5914
 modal/cloud_bucket_mount.pyi,sha256=30T3K1a89l6wzmEJ_J9iWv9SknoGqaZDx59Xs-ZQcmk,1607
 modal/cls.py,sha256=kNnZrBYVXOhgEXU0rDWk2Hr-bQRrsZkMKDgC-TD_6Bs,31063
@@ -40,14 +40,14 @@ modal/file_io.py,sha256=lcMs_E9Xfm0YX1t9U2wNIBPnqHRxmImqjLW1GHqVmyg,20945
 modal/file_io.pyi,sha256=NTRft1tbPSWf9TlWVeZmTlgB5AZ_Zhu2srWIrWr7brk,9445
 modal/file_pattern_matcher.py,sha256=1cZ4V2wSLiaXqAqStETSwp3bzDD6QZOt6pmmjk3Okz4,6505
 modal/functions.py,sha256=kcNHvqeGBxPI7Cgd57NIBBghkfbeFJzXO44WW0jSmao,325
-modal/functions.pyi,sha256=mtngzj8VlzMOQATe6muBN5oH_Gw9zGKxMKZ56Z-41kU,14288
+modal/functions.pyi,sha256=YflJx4BhzmJLJzpVWbuAMv0Qv63Mgb3r9qZqrgBEr1w,14289
 modal/gpu.py,sha256=2qZMNnoMrjU-5Bu7fx68pANUAKTtZq0EWEEeBA9OUVQ,7426
-modal/image.py,sha256=Vjsi7wS9dEcoj-7m7_LmvbK5iqEuFz-SHKl2K-qWcew,90952
-modal/image.pyi,sha256=A5mW2dBguEhmRo815Ax1rBIMXTCriu7PqLMHoUPsez8,26372
+modal/image.py,sha256=ekE2693foy30Xi1LM3swKZPW6HuaACj-OBvfspVSyIE,91509
+modal/image.pyi,sha256=kdJzy1eaxNPZeCpE0TMYYLhJ6UWmkfRDeb_vzngJUoQ,26462
 modal/io_streams.py,sha256=QkQiizKRzd5bnbKQsap31LJgBYlAnj4-XkV_50xPYX0,15079
 modal/io_streams.pyi,sha256=bJ7ZLmSmJ0nKoa6r4FJpbqvzdUVa0lEe0Fa-MMpMezU,5071
-modal/mount.py,sha256=oXjSr0p666oBVcYBTCvAB4C6BZ4ZTXHqGtHPOB1yu-Y,32137
-modal/mount.pyi,sha256=dvdr4joSpW7oKnKyg9eDD0obFfekwZtW65j4NEomivQ,12523
+modal/mount.py,sha256=aUa_KTsUzpbRso5XfVw2UuKl9j1KdWEIpNCl9pF1_YI,32156
+modal/mount.pyi,sha256=CmHa7zKSxHA_7-vMQLnGfw_ZXvAvHlafvUEVJcQ1LQA,12535
 modal/network_file_system.py,sha256=WXdyL7du_fvjvuG6hSAREyJ83sSEP2xSLAIAhBsisdI,14869
 modal/network_file_system.pyi,sha256=4N3eqMbTSlqmS8VV_aJK-uvrgJC8xnf_YtW5FHfRfc8,8156
 modal/object.py,sha256=bTeskuY8JFrESjU4_UL_nTwYlBQdOLmVaOX3X6EMxsg,164
@@ -95,7 +95,7 @@ modal/_utils/blob_utils.py,sha256=N66LtZI8PpCkZ7maA7GLW5CAmYUoNJdG-GjaAUR4_NQ,14
 modal/_utils/bytes_io_segment_payload.py,sha256=uunxVJS4PE1LojF_UpURMzVK9GuvmYWRqQo_bxEj5TU,3385
 modal/_utils/deprecation.py,sha256=dycySRBxyZf3ITzEqPNM6MxXTk9-0VVLA8oCPQ5j_Os,3426
 modal/_utils/docker_utils.py,sha256=h1uETghR40mp_y3fSWuZAfbIASH1HMzuphJHghAL6DU,3722
-modal/_utils/function_utils.py,sha256=ue15TIvHiSSuuLQaGb3gJ5YmxdaFBhfE3Rt5frqIWhM,27185
+modal/_utils/function_utils.py,sha256=fc5RKK59SxV7Vg4JyURVB2CCLUNKQVcBG60_dUxviRM,27307
 modal/_utils/grpc_testing.py,sha256=H1zHqthv19eGPJz2HKXDyWXWGSqO4BRsxah3L5Xaa8A,8619
 modal/_utils/grpc_utils.py,sha256=PPB5ay-vXencXNIWPVw5modr3EH7gfq2QPcO5YJ1lMU,7737
 modal/_utils/hash_utils.py,sha256=zg3J6OGxTFGSFri1qQ12giDz90lWk8bzaxCTUCRtiX4,3034
@@ -171,10 +171,10 @@ modal_proto/options_pb2_grpc.pyi,sha256=CImmhxHsYnF09iENPoe8S4J-n93jtgUYD2JPAc0y
 modal_proto/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 modal_version/__init__.py,sha256=wiJQ53c-OMs0Xf1UeXOxQ7FwlV1VzIjnX6o-pRYZ_Pk,470
 modal_version/__main__.py,sha256=2FO0yYQQwDTh6udt1h-cBnGd1c4ZyHnHSI4BksxzVac,105
-modal_version/_version_generated.py,sha256=bRP1kitLENe-C1R8SFEB0RNXUvVdmynlJRPg8FgsxXA,149
-modal-0.73.10.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
-modal-0.73.10.dist-info/METADATA,sha256=o2yy7RC_d68S0vZZyIem-3gJG0H7EDGGXtmHHcPzmEE,2330
-modal-0.73.10.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-modal-0.73.10.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-0.73.10.dist-info/top_level.txt,sha256=1nvYbOSIKcmU50fNrpnQnrrOpj269ei3LzgB6j9xGqg,64
-modal-0.73.10.dist-info/RECORD,,
+modal_version/_version_generated.py,sha256=c8Anvfl2gD2odGTQ0RxHnfa44Y9okAWKU0eMINv_kPQ,149
+modal-0.73.11.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-0.73.11.dist-info/METADATA,sha256=zjTqoWXVVpSM6DjsVRIsiwjIK07gCrXAVodMWTUuXUQ,2330
+modal-0.73.11.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+modal-0.73.11.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-0.73.11.dist-info/top_level.txt,sha256=1nvYbOSIKcmU50fNrpnQnrrOpj269ei3LzgB6j9xGqg,64
+modal-0.73.11.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 = 10  # git: 6951dc1
+build_number = 11  # git: bdf0bd9