modal 1.0.0.dev13__tar.gz → 1.0.0.dev15__tar.gz

{modal-1.0.0.dev13 → modal-1.0.0.dev15}/PKG-INFO

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

{modal-1.0.0.dev13 → modal-1.0.0.dev15}/modal/_functions.py

@@ -1508,20 +1508,6 @@ Use the `Function.get_web_url()` method instead.
         async for res in invocation.run_generator():
             yield res
 
-    @synchronizer.no_io_translation
-    async def _call_generator_nowait(self, args, kwargs):
-        deprecation_warning(
-            (2024, 12, 11),
-            "Calling spawn on a generator function is deprecated and will soon raise an exception.",
-        )
-        return await _Invocation.create(
-            self,
-            args,
-            kwargs,
-            client=self.client,
-            function_call_invocation_type=api_pb2.FUNCTION_CALL_INVOCATION_TYPE_ASYNC,
-        )
-
     @synchronizer.no_io_translation
     @live_method
     async def remote(self, *args: P.args, **kwargs: P.kwargs) -> ReturnType:
@@ -1634,7 +1620,7 @@ Use the `Function.get_web_url()` method instead.
         """
         self._check_no_web_url("_experimental_spawn")
         if self._is_generator:
-            invocation = await self._call_generator_nowait(args, kwargs)
+            raise InvalidError("Cannot `spawn` a generator function.")
         else:
             invocation = await self._call_function_nowait(
                 args, kwargs, function_call_invocation_type=api_pb2.FUNCTION_CALL_INVOCATION_TYPE_ASYNC
@@ -1666,14 +1652,13 @@ Use the `Function.get_web_url()` method instead.
         """
         self._check_no_web_url("spawn")
         if self._is_generator:
-            invocation = await self._call_generator_nowait(args, kwargs)
+            raise InvalidError("Cannot `spawn` a generator function.")
         else:
             invocation = await self._call_function_nowait(args, kwargs, api_pb2.FUNCTION_CALL_INVOCATION_TYPE_ASYNC)
 
         fc: _FunctionCall[ReturnType] = _FunctionCall._new_hydrated(
             invocation.function_call_id, invocation.client, None
         )
-        fc._is_generator = self._is_generator if self._is_generator else False
         return fc
 
     def get_raw_f(self) -> Callable[..., Any]:
@@ -1732,22 +1717,8 @@ class _FunctionCall(typing.Generic[ReturnType], _Object, type_prefix="fc"):
 
         The returned coroutine is not cancellation-safe.
         """
-
-        if self._is_generator:
-            raise Exception("Cannot get the result of a generator function call. Use `get_gen` instead.")
-
         return await self._invocation().poll_function(timeout=timeout)
 
-    async def get_gen(self) -> AsyncGenerator[Any, None]:
-        """
-        Calls the generator remotely, executing it with the given arguments and returning the execution's result.
-        """
-        if not self._is_generator:
-            raise Exception("Cannot iterate over a non-generator function call. Use `get` instead.")
-
-        async for res in self._invocation().run_generator():
-            yield res
-
     async def get_call_graph(self) -> list[InputInfo]:
         """Returns a structure representing the call graph from a given root
         call ID, along with the status of execution for each node.
@@ -1778,9 +1749,7 @@ class _FunctionCall(typing.Generic[ReturnType], _Object, type_prefix="fc"):
         await retry_transient_errors(self._client.stub.FunctionCallCancel, request)
 
     @staticmethod
-    async def from_id(
-        function_call_id: str, client: Optional[_Client] = None, is_generator: bool = False
-    ) -> "_FunctionCall[Any]":
+    async def from_id(function_call_id: str, client: Optional[_Client] = None) -> "_FunctionCall[Any]":
         """Instantiate a FunctionCall object from an existing ID.
 
         Examples:
@@ -1803,7 +1772,6 @@ class _FunctionCall(typing.Generic[ReturnType], _Object, type_prefix="fc"):
             client = await _Client.from_env()
 
         fc: _FunctionCall[Any] = _FunctionCall._new_hydrated(function_call_id, client, None)
-        fc._is_generator = is_generator
         return fc
 
     @staticmethod

{modal-1.0.0.dev13 → modal-1.0.0.dev15}/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.dev13",
+        version: str = "1.0.0.dev15",
     ): ...
     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.dev13",
+        version: str = "1.0.0.dev15",
     ): ...
     def is_closed(self) -> bool: ...
     @property

{modal-1.0.0.dev13 → modal-1.0.0.dev15}/modal/functions.pyi

@@ -228,12 +228,6 @@ class Function(
 
     _call_generator: ___call_generator_spec[typing_extensions.Self]
 
-    class ___call_generator_nowait_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self, /, args, kwargs): ...
-        async def aio(self, /, args, kwargs): ...
-
-    _call_generator_nowait: ___call_generator_nowait_spec[typing_extensions.Self]
-
     class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> ReturnType_INNER: ...
         async def aio(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> ReturnType_INNER: ...
@@ -350,12 +344,6 @@ class FunctionCall(typing.Generic[modal._functions.ReturnType], modal.object.Obj
 
     get: __get_spec[modal._functions.ReturnType, typing_extensions.Self]
 
-    class __get_gen_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self, /) -> typing.Generator[typing.Any, None, None]: ...
-        def aio(self, /) -> collections.abc.AsyncGenerator[typing.Any, None]: ...
-
-    get_gen: __get_gen_spec[typing_extensions.Self]
-
     class __get_call_graph_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, /) -> list[modal.call_graph.InputInfo]: ...
         async def aio(self, /) -> list[modal.call_graph.InputInfo]: ...
@@ -370,18 +358,10 @@ class FunctionCall(typing.Generic[modal._functions.ReturnType], modal.object.Obj
 
     class __from_id_spec(typing_extensions.Protocol):
         def __call__(
-            self,
-            /,
-            function_call_id: str,
-            client: typing.Optional[modal.client.Client] = None,
-            is_generator: bool = False,
+            self, /, function_call_id: str, client: typing.Optional[modal.client.Client] = None
         ) -> FunctionCall[typing.Any]: ...
         async def aio(
-            self,
-            /,
-            function_call_id: str,
-            client: typing.Optional[modal.client.Client] = None,
-            is_generator: bool = False,
+            self, /, function_call_id: str, client: typing.Optional[modal.client.Client] = None
         ) -> FunctionCall[typing.Any]: ...
 
     from_id: __from_id_spec

{modal-1.0.0.dev13 → modal-1.0.0.dev15}/modal.egg-info/PKG-INFO

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

{modal-1.0.0.dev13 → modal-1.0.0.dev15}/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-1.0.0.dev13 → modal-1.0.0.dev15}/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',