Merge branch 'main' into cathy/flexible-ci-adv

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.64.67 (2024-08-30)
+
+- Fix a regression in `modal launch` behavior not showing progress output when starting the container.
+
+
+
 ### 0.64.38 (2024-08-16)
 
 - Added a `modal app rollback` CLI command for rolling back an App deployment to a previous version.

modal/_container_io_manager.py

@@ -280,7 +280,7 @@ def _init(self, container_args: api_pb2.ContainerArguments, client: _Client):
             target_concurrency = 1
             max_concurrency = 0
         else:
-            target_concurrency = container_args.function_def.allow_concurrent_inputs or 1
+            target_concurrency = container_args.function_def.target_concurrent_inputs or 1
             max_concurrency = container_args.function_def.max_concurrent_inputs or target_concurrency
 
         self._target_concurrency = target_concurrency

modal/cli/launch.py

@@ -8,6 +8,7 @@
 
 from typer import Typer
 
+from .._output import enable_output
 from ..app import App
 from ..exception import _CliUserExecutionError
 from ..runner import run_app
@@ -35,14 +36,15 @@ def _launch_program(name: str, filename: str, args: Dict[str, Any]) -> None:
     # `launch/` scripts must have a `local_entrypoint()` with no args, for simplicity here.
     func = entrypoint.info.raw_f
     isasync = inspect.iscoroutinefunction(func)
-    with run_app(app):
-        try:
-            if isasync:
-                asyncio.run(func())
-            else:
-                func()
-        except Exception as exc:
-            raise _CliUserExecutionError(inspect.getsourcefile(func)) from exc
+    with enable_output():
+        with run_app(app):
+            try:
+                if isasync:
+                    asyncio.run(func())
+                else:
+                    func()
+            except Exception as exc:
+                raise _CliUserExecutionError(inspect.getsourcefile(func)) from exc
 
 
 @launch_cli.command(name="jupyter", help="Start Jupyter Lab on Modal.")

modal_proto/api.proto

@@ -2104,6 +2104,7 @@ message TunnelData {
   uint32 port = 2;
   optional string unencrypted_host = 3;
   optional uint32 unencrypted_port = 4;
+  uint32 container_port = 5;
 }
 
 message TunnelStartRequest {

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 = 64  # git: 0440ad6
+build_number = 67  # git: 4980c2e