Fix automount deprecations

conftest.py

@@ -1,4 +1,7 @@
 # Copyright Modal Labs 2022
+import pytest
+
+
 def pytest_markdown_docs_globals():
     import math
 
@@ -14,3 +17,9 @@ def pytest_markdown_docs_globals():
         "wsgi_app": modal.wsgi_app,
         "__file__": "xyz.py",
     }
+
+
+@pytest.fixture(autouse=True)
+def disable_auto_mount(monkeypatch):
+    monkeypatch.setenv("MODAL_AUTOMOUNT", "0")
+    yield

modal/_functions.py

@@ -536,7 +536,6 @@ def from_local(
                             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:

modal/cli/programs/run_jupyter.py

@@ -15,7 +15,7 @@
 # Passed by `modal launch` locally via CLI, plumbed to remote runner through secrets.
 args: dict[str, Any] = json.loads(os.environ.get("MODAL_LAUNCH_ARGS", "{}"))
 
-app = App()
+app = App(include_source=True)  # TODO: remove include_source=True when automount is disabled by default
 
 image = Image.from_registry(args.get("image"), add_python=args.get("add_python")).pip_install("jupyterlab")
 

modal/cli/programs/vscode.py

@@ -22,7 +22,7 @@
 FIXUD_INSTALLER = "https://github.com/boxboat/fixuid/releases/download/v0.6.0/fixuid-0.6.0-linux-$ARCH.tar.gz"
 
 
-app = App()
+app = App(include_source=True)  # TODO: remove include_source=True when automount is disabled by default
 image = (
     Image.from_registry(args.get("image"), add_python="3.11")
     .apt_install("curl", "dumb-init", "git", "git-lfs")

pyproject.toml

@@ -18,7 +18,6 @@ module = [
 ]
 ignore_errors = true
 
-
 [tool.pytest.ini_options]
 timeout = 300
 addopts = "--ignore=modal/cli/programs"

test/cli_imports_test.py

@@ -29,8 +29,8 @@ def main():
 """
 python_module_src = """
 import modal
-app = modal.App("FOO")
-other_app = modal.App("BAR")
+app = modal.App("FOO", include_source=True)  # TODO: remove include_source=True)
+other_app = modal.App("BAR", include_source=True)  # TODO: remove include_source=True)
 @other_app.function()
 def func():
     pass
@@ -45,8 +45,8 @@ def meth(self):
 
 python_package_src = """
 import modal
-app = modal.App("FOO")
-other_app = modal.App("BAR")
+app = modal.App("FOO", include_source=True)  # TODO: remove include_source=True)
+other_app = modal.App("BAR", include_source=True)  # TODO: remove include_source=True)
 @other_app.function()
 def func():
     pass
@@ -55,8 +55,8 @@ def func():
 
 python_subpackage_src = """
 import modal
-app = modal.App("FOO")
-other_app = modal.App("BAR")
+app = modal.App("FOO", include_source=True)  # TODO: remove include_source=True)
+other_app = modal.App("BAR", include_source=True)  # TODO: remove include_source=True)
 @other_app.function()
 def func():
     pass
@@ -65,8 +65,8 @@ def func():
 
 python_file_src = """
 import modal
-app = modal.App("FOO")
-other_app = modal.App("BAR")
+app = modal.App("FOO", include_source=True)  # TODO: remove include_source=True)
+other_app = modal.App("BAR", include_source=True)  # TODO: remove include_source=True)
 @other_app.function()
 def func():
     pass

test/cli_test.py

@@ -35,7 +35,7 @@
 
 import other_module
 
-app = modal.App("my_app")
+app = modal.App("my_app", include_source=True)  # TODO: remove include_source=True)
 
 # Sanity check that the module is imported properly
 import sys

test/cls_test.py

@@ -31,7 +31,7 @@
 
 from .supports.base_class import BaseCls2
 
-app = App("app")
+app = App("app", include_source=True)
 
 
 @pytest.fixture(autouse=True)
@@ -68,7 +68,7 @@ def test_run_class(client, servicer):
     assert len(servicer.precreated_functions) == 0
     assert servicer.n_functions == 0
     with app.run(client=client):
-        method_handle_object_id = Foo.bar.object_id  # method handle object id will probably go away
+        method_handle_object_id = Foo._get_class_service_function().object_id  # type: ignore
         assert isinstance(Foo, Cls)
         assert isinstance(NoParamsCls, Cls)
         class_id = Foo.object_id
@@ -152,7 +152,7 @@ def test_class_with_options_need_hydrating(client, servicer):
 # 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.
-app_remote = App()
+app_remote = App(include_source=True)  # TODO: remove include_source=True when automount is disabled by default
 
 
 @app_remote.cls(cpu=42)
@@ -192,7 +192,7 @@ def test_call_cls_remote_modal_type(client):
             FooRemote(42, q)  # type: ignore
 
 
-app_2 = App()
+app_2 = App(include_source=True)  # TODO: remove include_source=True when automount is disabled by default
 
 
 @app_2.cls(cpu=42)
@@ -234,7 +234,7 @@ def bar(self, x):
     assert bound_bar(100) == 1000000
 
 
-app_remote_2 = App()
+app_remote_2 = App(include_source=True)  # TODO: remove include_source=True when automount is disabled by default
 
 
 @app_remote_2.cls(cpu=42)
@@ -255,7 +255,7 @@ async def test_call_cls_remote_async(client):
         assert await bar_remote.baz.remote.aio(8) == 64  # Mock servicer just squares the argument
 
 
-app_local = App()
+app_local = App(include_source=True)  # TODO: remove include_source=True when automount is disabled by default
 
 
 @app_local.cls(cpu=42, enable_memory_snapshot=True)
@@ -298,7 +298,7 @@ def test_can_call_remotely_from_local(client):
         assert foo.baz.remote(9) == 81
 
 
-app_remote_3 = App()
+app_remote_3 = App(include_source=True)  # TODO: remove include_source=True when automount is disabled by default
 
 
 @app_remote_3.cls(cpu=42)
@@ -334,10 +334,10 @@ def test_lookup(client, servicer):
 
     # objects are resolved
     assert cls.object_id.startswith("cs-")
-    assert cls.bar.object_id.startswith("fu-")
+    assert cls._get_class_service_function().object_id.startswith("fu-")
 
     # Check that function properties are preserved
-    assert cls.bar.is_generator is False
+    assert cls().bar.is_generator is False
 
     # Make sure we can instantiate the class
     with servicer.intercept() as ctx:
@@ -412,7 +412,7 @@ def test_lookup_lazy_spawn(client, servicer):
     assert function_call.get() == 7693
 
 
-baz_app = App()
+baz_app = App(include_source=True)  # TODO: remove include_source=True when automount is disabled by default
 
 
 @baz_app.cls()
@@ -430,7 +430,7 @@ def test_call_not_modal_method():
     assert baz.not_modal_method(7) == 35
 
 
-cls_with_enter_app = App()
+cls_with_enter_app = App(include_source=True)  # TODO: remove include_source=True when automount is disabled by default
 
 
 def get_thread_id():
@@ -504,7 +504,7 @@ async def test_async_enter_on_local_modal_call():
     assert obj.entered
 
 
-inheritance_app = App()
+inheritance_app = App(include_source=True)  # TODO: remove include_source=True when automount is disabled by default
 
 
 class BaseCls:
@@ -528,7 +528,7 @@ def test_derived_cls(client, servicer):
         assert DerivedCls().run.remote(3) == 9
 
 
-inheritance_app_2 = App()
+inheritance_app_2 = App(include_source=True)  # TODO: remove include_source=True when automount is disabled by default
 
 
 @inheritance_app_2.cls()
@@ -563,7 +563,7 @@ def test_rehydrate(client, servicer, reset_container_app):
     assert obj.bar.local(7) == 343
 
 
-app_unhydrated = App()
+app_unhydrated = App(include_source=True)  # TODO: remove include_source=True when automount is disabled by default
 
 
 @app_unhydrated.cls()
@@ -578,7 +578,7 @@ def test_unhydrated():
         foo.bar.remote(42)
 
 
-app_method_args = App()
+app_method_args = App(include_source=True)  # TODO: remove include_source=True when automount is disabled by default
 
 
 @app_method_args.cls(keep_warm=5)
@@ -684,7 +684,7 @@ def test_handlers():
     assert list(pfs.keys()) == ["my_exit"]
 
 
-web_app_app = App()
+web_app_app = App(include_source=True)  # TODO: remove include_source=True when automount is disabled by default
 
 
 @web_app_app.cls()
@@ -705,7 +705,7 @@ def test_web_cls(client):
         assert c.asgi.web_url == "http://asgi.internal"
 
 
-handler_app = App("handler-app")
+handler_app = App("handler-app", include_source=True)
 
 
 image = Image.debian_slim().pip_install("xyz")
@@ -733,7 +733,7 @@ def test_build_image(client, servicer):
         assert servicer.force_built_images == []
 
 
-other_handler_app = App("other-handler-app")
+other_handler_app = App("other-handler-app", include_source=True)
 
 
 with pytest.warns(DeprecationError, match="@modal.build"):
@@ -758,7 +758,7 @@ def test_force_build_image(client, servicer):
         assert servicer.force_built_images == ["im-3"]
 
 
-build_timeout_handler_app = App("build-timeout-handler-app")
+build_timeout_handler_app = App("build-timeout-handler-app", include_source=True)
 
 
 with pytest.warns(DeprecationError, match="@modal.build"):
@@ -867,7 +867,7 @@ def test_cross_process_userclass_serde(supports_dir):
     assert revived_cls().method() == "a"  # this should be bound to the object
 
 
-app2 = modal.App("app2")
+app2 = App("app2", include_source=True)
 
 
 @app2.cls()
@@ -954,7 +954,7 @@ def __init__(self):
         pass
 
 
-app_batched = App()
+app_batched = App(include_source=True)  # TODO: remove include_source=True when automount is disabled by default
 
 
 def test_batched_method_duplicate_error(client):
@@ -1074,4 +1074,5 @@ def method(self):
 
 
 def test_method_on_cls_access_warns():
-    print(Foo.bar)
+    with pytest.warns(match="instantiate classes before using methods"):
+        print(Foo.bar)

test/conftest.py

@@ -2173,12 +2173,6 @@ def import_fail_for_rich(name: str, *args, **kwargs) -> ModuleType:
     yield
 
 
-@pytest.fixture
-def disable_auto_mount(monkeypatch):
-    monkeypatch.setenv("MODAL_AUTOMOUNT", "0")
-    yield
-
-
 @pytest.fixture()
 def supports_on_path(supports_dir, monkeypatch):
     monkeypatch.syspath_prepend(str(supports_dir))

test/container_buffer_test.py

@@ -1,7 +1,7 @@
 # Copyright Modal Labs 2024
 from modal import App
 
-app = App()
+app = App(include_source=True)  # TODO: remove include_source=True when automount is disabled by default
 
 
 @app.function(

test/function_test.py

@@ -19,7 +19,7 @@
 from modal_proto import api_pb2
 from test.helpers import deploy_app_externally
 
-app = App()
+app = App(include_source=True)  # TODO: remove include_source=True when automount is disabled by default
 
 
 if os.environ.get("GITHUB_ACTIONS") == "true":
@@ -716,7 +716,7 @@ def test_from_id_iter_gen(client, servicer, is_generator):
         assert rehydrated_function_call.get() == "hello"
 
 
-lc_app = App()
+lc_app = App(include_source=True)  # TODO: remove include_source=True when automount is disabled by default
 
 
 @lc_app.function()
@@ -1086,7 +1086,14 @@ def test_from_name_web_url(servicer, set_env_client):
     ],
 )
 def test_include_source_mode(
-    app_constructor_value, function_decorator_value, config_automount, expected_mounts, servicer, credentials, tmp_path
+    app_constructor_value,
+    function_decorator_value,
+    config_automount,
+    expected_mounts,
+    servicer,
+    credentials,
+    tmp_path,
+    monkeypatch,
 ):
     # a little messy since it tests the "end to end" mounting behavior for the app
     app_constructor_value = "None" if app_constructor_value is None else app_constructor_value
@@ -1105,10 +1112,11 @@ def f():
     (tmp_path / "mod.py").touch()  # some file
     entrypoint_file.write_text(src)
 
+    monkeypatch.delenv("MODAL_AUTOMOUNT")
     if config_automount is not None:
-        env = {"MODAL_AUTOMOUNT": config_automount}
+        env = {**os.environ, "MODAL_AUTOMOUNT": config_automount}
     else:
-        env = {}
+        env = {**os.environ}
     output = deploy_app_externally(servicer, credentials, str(entrypoint_file), env=env)
     print(output)
     mounts = servicer.mounts_excluding_published_client()

test/gpu_fallbacks_test.py

@@ -2,7 +2,7 @@
 from modal import App
 from modal_proto import api_pb2
 
-app = App()
+app = App(include_source=True)  # TODO: remove include_source=True when automount is disabled by default
 
 
 @app.function(gpu=["a10g"])

test/i6pn_clustered_test.py

@@ -3,7 +3,7 @@
 import modal.experimental
 from modal import App
 
-app = App()
+app = App(include_source=True)  # TODO: remove include_source=True when automount is disabled by default
 
 
 @app.function()