Merge branch 'cathy/batching-integration' of github.com:modal-labs/mo…

…dal-client into cathy/batching-integration

CHANGELOG.md

@@ -96,7 +96,7 @@ Starting in this version, all `@methods` and web endpoints will be part of the s
 
 
 
-### v0.62.230 (2024-06-18)
+### 0.62.230 (2024-06-18)
 
 - It is now an error to create or lookup Modal objects (`Volume`, `Dict`, `Secret`, etc.) with an invalid name. Object names must be shorter than 64 characters and may contain only alphanumeric characters, dashes, periods, and underscores. The name check had inadvertently been removed for a brief time following an internal refactor and then reintroduced as a warning. It is once more a hard error. Please get in touch if this is blocking access to your data.
 

modal/object.py

@@ -120,12 +120,24 @@ def _init_from_other(self, other: O):
         # Transient use case, see Dict, Queue, and SharedVolume
         self._init(other._rep, other._load, other._is_another_app, other._preload)
 
+    def _validate_is_hydrated(self: O):
+        if not self._is_hydrated:
+            object_type = self.__class__.__name__.strip("_")
+            if hasattr(self, "_app") and getattr(self._app, "_running_app", "") is None:
+                # The most common cause of this error: e.g., user called a Function without using App.run()
+                reason = ", because the App it is defined on is not running."
+            else:
+                # Technically possible, but with an ambiguous cause.
+                reason = ""
+            raise ExecutionError(
+                f"{object_type} has not been hydrated with the metadata it needs to run on Modal{reason}."
+            )
+
     def clone(self: O) -> O:
         """mdmd:hidden Clone a given hydrated object."""
 
         # Object to clone must already be hydrated, otherwise from_loader is more suitable.
-        assert self._is_hydrated
-
+        self._validate_is_hydrated()
         obj = _Object.__new__(type(self))
         obj._initialize_from_other(self)
         return obj
@@ -204,16 +216,7 @@ async def resolve(self):
         if self._is_hydrated:
             return
         elif not self._hydrate_lazily:
-            object_type = self.__class__.__name__.strip("_")
-            if hasattr(self, "_app") and getattr(self._app, "_running_app", "") is None:
-                # The most common cause of this error: e.g., user called a Function without using App.run()
-                reason = ", because the App it is defined on is not running."
-            else:
-                # Technically possible, but with an ambiguous cause.
-                reason = ""
-            raise ExecutionError(
-                f"{object_type} has not been hydrated with the metadata it needs to run on Modal{reason}."
-            )
+            self._validate_is_hydrated()
         else:
             # TODO: this client and/or resolver can't be changed by a caller to X.from_name()
             resolver = Resolver(await _Client.from_env())

modal_version/_version_generated.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2024
 
 # Note: Reset this value to -1 whenever you make a minor `0.X` release of the client.
-build_number = 88  # git: f991317
+build_number = 90  # git: 0bc7824

test/cls_test.py

@@ -105,6 +105,11 @@ def test_class_with_options(client, servicer):
         assert options.retry_policy.retries == 5
 
 
+def test_class_with_options_need_hydrating(client, servicer):
+    with pytest.raises(ExecutionError, match="hydrate"):
+        Foo.with_options()  # type: ignore
+
+
 # Reusing the app runs into an issue with stale function handles.
 # TODO (akshat): have all the client tests use separate apps, and throw
 # an exception if the user tries to reuse an app.

test/mounted_files_test.py

@@ -166,7 +166,7 @@ def symlinked_python_installation_venv_path(tmp_path, repo_root):
     symlink_python_install.symlink_to(python_install_dir)
 
     # use a python executable specified via the above symlink
-    symlink_python_executable = symlink_python_install / "bin" / "python"
+    symlink_python_executable = symlink_python_install / "bin" / actual_executable.name
     # create a new venv
     subprocess.check_call([symlink_python_executable, "-m", "venv", venv_path, "--copies"])
     # check that a builtin module, like ast, is indeed identified to be in the non-resolved install path