modal 1.0.0.dev12__py3-none-any.whl → 1.0.0.dev14__py3-none-any.whl

modal/client.pyi

@@ -31,7 +31,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.0.0.dev12",
+        version: str = "1.0.0.dev14",
     ): ...
     def is_closed(self) -> bool: ...
     @property
@@ -94,7 +94,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.0.0.dev12",
+        version: str = "1.0.0.dev14",
     ): ...
     def is_closed(self) -> bool: ...
     @property

modal/mount.py

@@ -5,9 +5,6 @@ import concurrent.futures
 import dataclasses
 import os
 import re
-import site
-import sys
-import sysconfig
 import time
 import typing
 import warnings
@@ -32,7 +29,7 @@ from ._utils.name_utils import check_object_name
 from ._utils.package_utils import get_module_mount_info
 from .client import _Client
 from .config import config, logger
-from .exception import ExecutionError, InvalidError, ModuleNotMountable
+from .exception import ExecutionError, InvalidError
 from .file_pattern_matcher import FilePatternMatcher
 
 ROOT_DIR: PurePosixPath = PurePosixPath("/root")
@@ -800,22 +797,6 @@ def _get_client_mount():
         return _Mount.from_name(client_mount_name(), namespace=api_pb2.DEPLOYMENT_NAMESPACE_GLOBAL)
 
 
-SYS_PREFIXES = {
-    Path(p)
-    for p in (
-        sys.prefix,
-        sys.base_prefix,
-        sys.exec_prefix,
-        sys.base_exec_prefix,
-        *sysconfig.get_paths().values(),
-        *site.getsitepackages(),
-        site.getusersitepackages(),
-    )
-}
-
-
-SYS_PREFIXES |= {p.resolve() for p in SYS_PREFIXES}
-
 MODAL_PACKAGES = ["modal", "modal_proto", "modal_version"]
 
 
@@ -829,45 +810,3 @@ def _is_modal_path(remote_path: PurePosixPath):
         if is_modal_path:
             return True
     return False
-
-
-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 = {}
-    top_level_modules = []
-    skip_prefixes = set()
-    for name, module in sorted(sys.modules.items(), key=lambda kv: len(kv[0])):
-        parent = name.rsplit(".")[0]
-        if parent and parent in skip_prefixes:
-            skip_prefixes.add(name)
-            continue
-        skip_prefixes.add(name)
-        top_level_modules.append((name, module))
-
-    for module_name, module in top_level_modules:
-        if module_name.startswith("__"):
-            # skip "built in" modules like __main__ and __mp_main__
-            # the running function's main file should be included anyway
-            continue
-
-        try:
-            # at this point we don't know if the sys.modules module should be mounted or not
-            potential_mount = _Mount._from_local_python_packages(module_name)
-            mount_paths = potential_mount._top_level_paths()
-        except ModuleNotMountable:
-            # this typically happens if the module is a built-in, has binary components or doesn't exist
-            continue
-
-        for local_path, remote_path in mount_paths:
-            if any(local_path.is_relative_to(p) for p in SYS_PREFIXES) or _is_modal_path(remote_path):
-                # skip any module that has paths in SYS_PREFIXES, or would overwrite the modal Package in the container
-                break
-        else:
-            auto_mounts[module_name] = potential_mount
-
-    return auto_mounts

modal/mount.pyi

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

{modal-1.0.0.dev12.dist-info → modal-1.0.0.dev14.dist-info}/METADATA

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

{modal-1.0.0.dev12.dist-info → modal-1.0.0.dev14.dist-info}/RECORD

@@ -22,7 +22,7 @@ modal/app.py,sha256=HuZu6c3CExccRcBfA7Geh-c_ajWGHB2w0xlVyDIVXlg,48146
 modal/app.pyi,sha256=JT6UkaK3bq9TTYLtxHmjApmuEPHM6XZvLCSaCEAIm0E,24219
 modal/call_graph.py,sha256=1g2DGcMIJvRy-xKicuf63IVE98gJSnQsr8R_NVMptNc,2581
 modal/client.py,sha256=o-aQThHpvDHUzg_kUafyhWzACViUBhY2WLZ2EitnSHA,16787
-modal/client.pyi,sha256=VEwMNhcD6iXZa2jqFHpmpQTUsiVp4KF74nFl3aeFIvI,8459
+modal/client.pyi,sha256=C19wDiRmUfMS0NWjgxkzpqe8iVa83xyu6DapDexDmuE,8459
 modal/cloud_bucket_mount.py,sha256=YOe9nnvSr4ZbeCn587d7_VhE9IioZYRvF9VYQTQux08,5914
 modal/cloud_bucket_mount.pyi,sha256=30T3K1a89l6wzmEJ_J9iWv9SknoGqaZDx59Xs-ZQcmk,1607
 modal/cls.py,sha256=dBbeARwOWftlKd1cwtM0cHFtQWSWkwVXwVmOV4w0SyI,37907
@@ -45,8 +45,8 @@ modal/image.py,sha256=glnu6LDf3iFq71CGVstHx40CKVN4rw8tukPLAy5JgTQ,92464
 modal/image.pyi,sha256=NbegOjy6QX_SL-eTxtJm1_4gOJHW04Ja449QHZIdKgU,25586
 modal/io_streams.py,sha256=YDZVQSDv05DeXg5TwcucC9Rj5hQBx2GXdluan9rIUpw,15467
 modal/io_streams.pyi,sha256=1UK6kWLREASQfq-wL9wSp5iqjLU0egRZPDn4LXs1PZY,5136
-modal/mount.py,sha256=djtfIt9N5t2zujLU9VtVQaYyNazgjGCM9wKv5NxhLf4,32844
-modal/mount.pyi,sha256=PHs-N9LGSDfYWw70UrhvGZW_6uWwyx-1GAieROzCNNs,12583
+modal/mount.py,sha256=HbpGQbqqT5pTP4dh8j6USWXb2Fr1ro3V1uHIardkya4,30726
+modal/mount.pyi,sha256=_qDhjR8Xg0ArdCw0JCivhhLCQO-Q-n_RlG5Ct4yJBQ0,12528
 modal/network_file_system.py,sha256=lgtmHYjzA5gDMx0tysH0-WJB2Ao9JD2W15NyYK2A7_w,14612
 modal/network_file_system.pyi,sha256=58DiUqHGlARmI3cz-Yo7IFObKKFIiGh5UIU5JxGNFfc,8333
 modal/object.py,sha256=bTeskuY8JFrESjU4_UL_nTwYlBQdOLmVaOX3X6EMxsg,164
@@ -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-1.0.0.dev12.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-1.0.0.dev14.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
@@ -154,13 +154,13 @@ modal_docs/mdmd/__init__.py,sha256=svYKtV8HDwDCN86zbdWqyq5T8sMdGDj0PVlzc2tIxDM,2
 modal_docs/mdmd/mdmd.py,sha256=Irx49MCCTlBOP4FBdLR--JrpA3-WhsVeriq0LGgsRic,6232
 modal_docs/mdmd/signatures.py,sha256=XJaZrK7Mdepk5fdX51A8uENiLFNil85Ud0d4MH8H5f0,3218
 modal_proto/__init__.py,sha256=MIEP8jhXUeGq_eCjYFcqN5b1bxBM4fdk0VESpjWR0fc,28
-modal_proto/api.proto,sha256=FsDsaAnxXchuynObvATVN_DK08L_n1ORfBgLGcvUtNA,95331
-modal_proto/api_grpc.py,sha256=C0nQFKPCQN3lBeke1Xd7x4Jzd5m8RxnuFEoUxjIQIwA,115918
-modal_proto/api_pb2.py,sha256=cuBgM8HFj2sRk1Irh7BI2J3gUqlntKFJnn3Btn9Xyz0,335440
-modal_proto/api_pb2.pyi,sha256=xCmXaSAZ8woXRcsMebETr-giLcqN6c_BYuUhVXW8IuM,458857
-modal_proto/api_pb2_grpc.py,sha256=dlQcjQVsUJN6cTG9JX6fxaB2iXUFyfhEF9VtQIh-yZE,250736
-modal_proto/api_pb2_grpc.pyi,sha256=5j_xfVcvGDXmr9vpUQofD6aLpaI2ZfIdefB9jBHtqnE,58657
-modal_proto/modal_api_grpc.py,sha256=kmpUqh6tc-mgqsZdH7JeFGrA4HULZggCSI2nDz65JvA,17532
+modal_proto/api.proto,sha256=Qp0gpXAw0H8X8oPrU2Aa-_kewoI53-bUf0LWe_DO4hM,95862
+modal_proto/api_grpc.py,sha256=iY5o_Tm4VDP-Wa1JgA_NpQa_Y-4FYB_RN9wdSUExjwI,117469
+modal_proto/api_pb2.py,sha256=Jvq4X0FG5xQaiNVr7XlOZQWfmm_9b2JmN8LNT2hJJdU,337902
+modal_proto/api_pb2.pyi,sha256=KNcKpRgynsi3y6bVGen_y6FrHnXXUMOyREqbJExqb6Y,461341
+modal_proto/api_pb2_grpc.py,sha256=NL5prOS_hh_pA1hVvQP_ZRE1w49N-PR8iNPRZ65i6nA,254089
+modal_proto/api_pb2_grpc.pyi,sha256=Xxgdcnv1mBnu5_AQxJ6fo0yz7GnqVU0HVObNfZWHVfM,59440
+modal_proto/modal_api_grpc.py,sha256=0ir2lnwT3-IgPcAWw98yWMAiqZPkjvNro9UBk4u8hnk,17763
 modal_proto/modal_options_grpc.py,sha256=qJ1cuwA54oRqrdTyPTbvfhFZYd9HhJKK5UCwt523r3Y,120
 modal_proto/options.proto,sha256=zp9h5r61ivsp0XwEWwNBsVqNTbRA1VSY_UtN7sEcHtE,549
 modal_proto/options_grpc.py,sha256=M18X3d-8F_cNYSVM3I25dUTO5rZ0rd-vCCfynfh13Nc,125
@@ -169,10 +169,10 @@ 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=dXFOMp_84VL3XvjRUaCxSaVjkW3Z3UfAwaVrsX4B1uQ,121
+modal_version/__init__.py,sha256=QmxfDN_Pb98otTMAjgLVfOaVZb6eomqwBOF8uqbmvrI,121
 modal_version/__main__.py,sha256=2FO0yYQQwDTh6udt1h-cBnGd1c4ZyHnHSI4BksxzVac,105
-modal-1.0.0.dev12.dist-info/METADATA,sha256=i_ibjGDttvlb51N0oZpOTTI1PRl2f6KICf3WMAlIZWQ,2455
-modal-1.0.0.dev12.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-modal-1.0.0.dev12.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-1.0.0.dev12.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
-modal-1.0.0.dev12.dist-info/RECORD,,
+modal-1.0.0.dev14.dist-info/METADATA,sha256=vXEUlkRYPfpijnZrkjhIxCaWF0pENgYw9l4E0aXKLtI,2455
+modal-1.0.0.dev14.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+modal-1.0.0.dev14.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-1.0.0.dev14.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
+modal-1.0.0.dev14.dist-info/RECORD,,

modal_proto/api.proto

@@ -2972,6 +2972,17 @@ message VolumeHeartbeatRequest {
   string volume_id = 1;
 }
 
+message VolumeListFiles2Request {
+  string volume_id = 1;
+  string path = 2;
+  bool recursive = 4;
+  optional uint32 max_entries = 3;
+}
+
+message VolumeListFiles2Response {
+  repeated FileEntry entries = 1;
+}
+
 message VolumeListFilesRequest {
   string volume_id = 1;
   string path = 2;
@@ -3090,6 +3101,12 @@ message VolumeReloadRequest {
   string volume_id = 1;
 }
 
+message VolumeRemoveFile2Request {
+  string volume_id = 1 [ (modal.options.audit_target_attr) = true ];
+  string path = 2;
+  bool recursive = 3;
+}
+
 message VolumeRemoveFileRequest {
   string volume_id = 1 [ (modal.options.audit_target_attr) = true ];
   string path = 2;
@@ -3329,10 +3346,12 @@ service ModalClient {
   rpc VolumeHeartbeat(VolumeHeartbeatRequest) returns (google.protobuf.Empty);
   rpc VolumeList(VolumeListRequest) returns (VolumeListResponse);
   rpc VolumeListFiles(VolumeListFilesRequest) returns (stream VolumeListFilesResponse);
+  rpc VolumeListFiles2(VolumeListFiles2Request) returns (stream VolumeListFiles2Response);
   rpc VolumePutFiles(VolumePutFilesRequest) returns (google.protobuf.Empty);
   rpc VolumePutFiles2(VolumePutFiles2Request) returns (VolumePutFiles2Response);
   rpc VolumeReload(VolumeReloadRequest) returns (google.protobuf.Empty);
   rpc VolumeRemoveFile(VolumeRemoveFileRequest) returns (google.protobuf.Empty);
+  rpc VolumeRemoveFile2(VolumeRemoveFile2Request) returns (google.protobuf.Empty);
   rpc VolumeRename(VolumeRenameRequest) returns (google.protobuf.Empty);
 
   // Workspaces

modal_proto/api_grpc.py

@@ -598,6 +598,10 @@ class ModalClientBase(abc.ABC):
     async def VolumeListFiles(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.VolumeListFilesRequest, modal_proto.api_pb2.VolumeListFilesResponse]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def VolumeListFiles2(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.VolumeListFiles2Request, modal_proto.api_pb2.VolumeListFiles2Response]') -> None:
+        pass
+
     @abc.abstractmethod
     async def VolumePutFiles(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.VolumePutFilesRequest, google.protobuf.empty_pb2.Empty]') -> None:
         pass
@@ -614,6 +618,10 @@ class ModalClientBase(abc.ABC):
     async def VolumeRemoveFile(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.VolumeRemoveFileRequest, google.protobuf.empty_pb2.Empty]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def VolumeRemoveFile2(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.VolumeRemoveFile2Request, google.protobuf.empty_pb2.Empty]') -> None:
+        pass
+
     @abc.abstractmethod
     async def VolumeRename(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.VolumeRenameRequest, google.protobuf.empty_pb2.Empty]') -> None:
         pass
@@ -1494,6 +1502,12 @@ class ModalClientBase(abc.ABC):
                 modal_proto.api_pb2.VolumeListFilesRequest,
                 modal_proto.api_pb2.VolumeListFilesResponse,
             ),
+            '/modal.client.ModalClient/VolumeListFiles2': grpclib.const.Handler(
+                self.VolumeListFiles2,
+                grpclib.const.Cardinality.UNARY_STREAM,
+                modal_proto.api_pb2.VolumeListFiles2Request,
+                modal_proto.api_pb2.VolumeListFiles2Response,
+            ),
             '/modal.client.ModalClient/VolumePutFiles': grpclib.const.Handler(
                 self.VolumePutFiles,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -1518,6 +1532,12 @@ class ModalClientBase(abc.ABC):
                 modal_proto.api_pb2.VolumeRemoveFileRequest,
                 google.protobuf.empty_pb2.Empty,
             ),
+            '/modal.client.ModalClient/VolumeRemoveFile2': grpclib.const.Handler(
+                self.VolumeRemoveFile2,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.VolumeRemoveFile2Request,
+                google.protobuf.empty_pb2.Empty,
+            ),
             '/modal.client.ModalClient/VolumeRename': grpclib.const.Handler(
                 self.VolumeRename,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -2406,6 +2426,12 @@ class ModalClientStub:
             modal_proto.api_pb2.VolumeListFilesRequest,
             modal_proto.api_pb2.VolumeListFilesResponse,
         )
+        self.VolumeListFiles2 = grpclib.client.UnaryStreamMethod(
+            channel,
+            '/modal.client.ModalClient/VolumeListFiles2',
+            modal_proto.api_pb2.VolumeListFiles2Request,
+            modal_proto.api_pb2.VolumeListFiles2Response,
+        )
         self.VolumePutFiles = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/VolumePutFiles',
@@ -2430,6 +2456,12 @@ class ModalClientStub:
             modal_proto.api_pb2.VolumeRemoveFileRequest,
             google.protobuf.empty_pb2.Empty,
         )
+        self.VolumeRemoveFile2 = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/VolumeRemoveFile2',
+            modal_proto.api_pb2.VolumeRemoveFile2Request,
+            google.protobuf.empty_pb2.Empty,
+        )
         self.VolumeRename = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/VolumeRename',