modal 1.0.0.dev7__tar.gz → 1.0.0.dev10__tar.gz

{modal-1.0.0.dev7 → modal-1.0.0.dev10}/PKG-INFO

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

{modal-1.0.0.dev7 → modal-1.0.0.dev10}/modal/_functions.py

@@ -71,7 +71,7 @@ from .exception import (
 )
 from .gpu import GPU_T, parse_gpu_config
 from .image import _Image
-from .mount import _get_client_mount, _Mount, get_sys_modules_mounts
+from .mount import _get_client_mount, _Mount
 from .network_file_system import _NetworkFileSystem, network_file_system_mount_protos
 from .output import _get_output_manager
 from .parallel_map import (
@@ -581,30 +581,6 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
             *entrypoint_mounts.values(),
         ]
 
-        if include_source_mode is IncludeSourceMode.INCLUDE_FIRST_PARTY and is_local():
-            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"
-                    + (f"e.g.:\nimage_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",
-                )
-            all_mounts += auto_mounts.values()
-
         retry_policy = _parse_retries(
             retries, f"Function '{info.get_tag()}'" if info.raw_f else f"Class '{info.get_tag()}'"
         )

{modal-1.0.0.dev7 → modal-1.0.0.dev10}/modal/_serialization.py

@@ -324,8 +324,8 @@ def _deserialize_asgi(asgi: api_pb2.Asgi) -> Any:
     elif msg_type == "websocket_send":
         return {
             "type": "websocket.send",
-            "bytes": asgi.websocket_send.bytes if asgi.websocket_send.HasField("bytes") else None,
-            "text": asgi.websocket_send.text if asgi.websocket_send.HasField("text") else None,
+            **({"bytes": asgi.websocket_send.bytes} if asgi.websocket_send.HasField("bytes") else {}),
+            **({"text": asgi.websocket_send.text} if asgi.websocket_send.HasField("text") else {}),
         }
     elif msg_type == "websocket_disconnect":
         return {

{modal-1.0.0.dev7 → modal-1.0.0.dev10}/modal/_utils/function_utils.py

@@ -23,7 +23,7 @@ from .._serialization import (
     signature_to_parameter_specs,
 )
 from .._traceback import append_modal_tb
-from ..config import config, logger
+from ..config import logger
 from ..exception import (
     DeserializationError,
     ExecutionError,
@@ -627,8 +627,7 @@ class FunctionCreationStatus:
 
 class IncludeSourceMode(enum.Enum):
     INCLUDE_NOTHING = False  # can only be set in source, can't be set in config
-    INCLUDE_MAIN_PACKAGE = True  # also represented by AUTOMOUNT=0 in config
-    INCLUDE_FIRST_PARTY = "legacy"  # mounts all "local" modules in sys.modules - represented by AUTOMOUNT=1 in config
+    INCLUDE_MAIN_PACKAGE = True  # Default behavior
 
 
 def get_include_source_mode(function_or_app_specific) -> IncludeSourceMode:
@@ -650,6 +649,4 @@ def get_include_source_mode(function_or_app_specific) -> IncludeSourceMode:
         # explicitly set in app/function
         return IncludeSourceMode(function_or_app_specific)
 
-    # note that the automount config boolean isn't a 1-1 mapping with include_source!
-    legacy_automount_mode: bool = config.get("automount")
-    return IncludeSourceMode.INCLUDE_FIRST_PARTY if legacy_automount_mode else IncludeSourceMode.INCLUDE_MAIN_PACKAGE
+    return IncludeSourceMode.INCLUDE_MAIN_PACKAGE

{modal-1.0.0.dev7 → modal-1.0.0.dev10}/modal/_utils/grpc_utils.py

@@ -148,15 +148,20 @@ def create_channel(
 
         logger.debug(f"Sending request to {event.method_name}")
 
-    async def recv_trailing_metadata(trailing_metadata: grpclib.events.RecvTrailingMetadata) -> None:
+    async def recv_initial_metadata(initial_metadata: grpclib.events.RecvInitialMetadata) -> None:
         # If we receive an auth token from the server, include it in all future requests.
         # TODO(nathan): This isn't perfect because the metadata isn't propagated when the
         # process is forked and a new channel is created. This is OK for now since this
         # token is only used by the experimental input plane
+        if token := initial_metadata.metadata.get("x-modal-auth-token"):
+            metadata["x-modal-auth-token"] = str(token)
+
+    async def recv_trailing_metadata(trailing_metadata: grpclib.events.RecvTrailingMetadata) -> None:
         if token := trailing_metadata.metadata.get("x-modal-auth-token"):
             metadata["x-modal-auth-token"] = str(token)
 
     grpclib.events.listen(channel, grpclib.events.SendRequest, send_request)
+    grpclib.events.listen(channel, grpclib.events.RecvInitialMetadata, recv_initial_metadata)
     grpclib.events.listen(channel, grpclib.events.RecvTrailingMetadata, recv_trailing_metadata)
 
     return channel

{modal-1.0.0.dev7 → modal-1.0.0.dev10}/modal/cli/programs/run_jupyter.py

@@ -15,7 +15,7 @@ from modal import App, Image, Queue, Secret, Volume, forward
 # 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(include_source=True)  # TODO: remove include_source=True when automount is disabled by default
+app = App()
 
 image = Image.from_registry(args.get("image"), add_python=args.get("add_python")).pip_install("jupyterlab")
 

{modal-1.0.0.dev7 → modal-1.0.0.dev10}/modal/cli/programs/vscode.py

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

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

{modal-1.0.0.dev7 → modal-1.0.0.dev10}/modal/config.py

@@ -51,10 +51,6 @@ Other possible configuration options are:
   Defaults to 10.
   Number of seconds to wait for logs to drain when closing the session,
   before giving up.
-* `automount` (in the .toml file) / `MODAL_AUTOMOUNT` (as an env var).
-  Defaults to True.
-  By default, Modal automatically mounts modules imported in the current scope, that
-  are deemed to be "local". This can be turned off by setting this to False.
 * `force_build` (in the .toml file) / `MODAL_FORCE_BUILD` (as an env var).
   Defaults to False.
   When set, ignores the Image cache and builds all Image layers. Note that this
@@ -233,7 +229,6 @@ _SETTINGS = {
     "sync_entrypoint": _Setting(),
     "logs_timeout": _Setting(10, float),
     "image_id": _Setting(),
-    "automount": _Setting(True, transform=_to_boolean),
     "heartbeat_interval": _Setting(15, float),
     "function_runtime": _Setting(),
     "function_runtime_debug": _Setting(False, transform=_to_boolean),  # For internal debugging use.

{modal-1.0.0.dev7 → modal-1.0.0.dev10}/modal.egg-info/PKG-INFO

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

{modal-1.0.0.dev7 → modal-1.0.0.dev10}/modal_version/__init__.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2025
 """Supplies the current version of the modal client library."""
 
-__version__ = "1.0.0.dev7"
+__version__ = "1.0.0.dev10"