Merge branch 'main' into rohan/doc

CHANGELOG.md

@@ -10,6 +10,12 @@ We appreciate your patience while we speedily work towards a stable release of t
 
 <!-- NEW CONTENT GENERATED BELOW. PLEASE PRESERVE THIS COMMENT. -->
 
+### 0.66.49 (2024-11-26)
+
+- `modal config set-environment` will now raise if the requested environment does not exist.
+
+
+
 ### 0.66.45 (2024-11-26)
 
 - The `modal launch` CLI now accepts a `--detach` flag to run the App in detached mode, such that it will persist after the local client disconnects.

modal/_resolver.py

@@ -130,9 +130,14 @@ async def loader():
                         raise NotFoundError(exc.message)
                     raise
 
-                # Check that the id of functions and classes didn't change
+                # Check that the id of functions didn't change
                 # Persisted refs are ignored because their life cycle is managed independently.
-                if not obj._is_another_app and existing_object_id is not None and obj.object_id != existing_object_id:
+                if (
+                    not obj._is_another_app
+                    and existing_object_id is not None
+                    and existing_object_id.startswith("fu-")
+                    and obj.object_id != existing_object_id
+                ):
                     raise Exception(
                         f"Tried creating an object using existing id {existing_object_id}"
                         f" but it has id {obj.object_id}"

modal/cli/config.py

@@ -3,6 +3,7 @@
 from rich.console import Console
 
 from modal.config import _profile, _store_user_config, config
+from modal.environments import Environment
 
 config_cli = typer.Typer(
     name="config",
@@ -38,6 +39,8 @@ def show(redact: bool = typer.Option(True, help="Redact the `token_secret` value
 
 @config_cli.command(help=SET_DEFAULT_ENV_HELP)
 def set_environment(environment_name: str):
+    # Confirm that the environment exists by looking it up
+    Environment.lookup(environment_name)
     _store_user_config({"environment": environment_name})
     typer.echo(f"New default environment for profile {_profile}: {environment_name}")
 

modal/config.py

@@ -268,7 +268,7 @@ def __repr__(self):
         return repr(self.to_dict())
 
     def to_dict(self):
-        return {key: self.get(key) for key in _SETTINGS.keys()}
+        return {key: self.get(key) for key in sorted(_SETTINGS)}
 
 
 config = Config()