[serve] Fix bug with 'proxy_location' set for 'serve run' CLI command

Signed-off-by: axreldable <aleksei.starikov.ax@gmail.com>

Author: axreldable

python/ray/serve/scripts.py

@@ -27,7 +27,8 @@
     SERVE_DEFAULT_APP_NAME,
     SERVE_NAMESPACE,
 )
-from ray.serve.config import DeploymentMode, ProxyLocation, gRPCOptions
+from ray.serve.api import _prepare_http_options
+from ray.serve.config import DeploymentMode, HTTPOptions, ProxyLocation, gRPCOptions
 from ray.serve.deployment import Application, deployment_to_schema
 from ray.serve.schema import (
     LoggingConfig,
@@ -529,13 +530,16 @@ def run(
             "need to call `ray.init` in your code when using `serve run`."
         )
 
-    http_options = {"location": "EveryNode"}
+    proxy_location = None
+    http_options = None
     grpc_options = gRPCOptions()
     # Merge http_options and grpc_options with the ones on ServeDeploySchema.
     if is_config and isinstance(config, ServeDeploySchema):
-        http_options = {**config.http_options.dict(), **http_options}
+        proxy_location = config.proxy_location
+        http_options = HTTPOptions(**config.http_options.dict())
         grpc_options = gRPCOptions(**config.grpc_options.dict())
 
+    http_options = _prepare_http_options(proxy_location, http_options)
     client = _private_api.serve_start(
         http_options=http_options,
         grpc_options=grpc_options,

python/ray/serve/tests/conftest.py

@@ -21,7 +21,7 @@
     check_ray_stopped,
     start_telemetry_app,
 )
-from ray.serve.config import HTTPOptions, gRPCOptions
+from ray.serve.config import HTTPOptions, ProxyLocation, gRPCOptions
 from ray.serve.context import _get_global_client
 from ray.tests.conftest import (  # noqa
     external_redis,
@@ -148,6 +148,7 @@ def _shared_serve_instance():
         _system_config={"metrics_report_interval_ms": 1000, "task_retry_delay_ms": 50},
     )
     serve.start(
+        proxy_location=ProxyLocation.HeadOnly,
         http_options={"host": "0.0.0.0"},
         grpc_options={
             "port": 9000,

python/ray/serve/tests/test_cli_3.py

@@ -4,6 +4,7 @@
 import subprocess
 import sys
 import time
+from typing import Union
 
 import httpx
 import pytest
@@ -138,6 +139,60 @@ def build_echo_app_typed(args: TypedArgs):
 
 
 class TestRun:
+    @pytest.mark.skipif(
+        sys.platform == "win32", reason="File path incorrect on Windows."
+    )
+    @pytest.mark.parametrize(
+        "proxy_location,expected",
+        [
+            (
+                None,
+                "EveryNode",
+            ),  # default ProxyLocation `EveryNode` is used as http_options.location is not specified
+            ("EveryNode", "EveryNode"),
+            ("HeadOnly", "HeadOnly"),
+            ("Disabled", "Disabled"),
+        ],
+    )
+    def test_proxy_location(self, ray_start_stop, tmp_path, proxy_location, expected):
+        # when the `serve run` cli command is executed
+        # without serve already running (for the first time)
+        # `proxy_location` should be set from the config file if specified
+        def is_proxy_location_correct(expected_proxy_location: str) -> bool:
+            try:
+                response = httpx.get(
+                    "http://localhost:8265/api/serve/applications/"
+                ).text
+                response_json = json.loads(response)
+                print("response_json")
+                print(response_json)
+                return response_json["proxy_location"] == expected_proxy_location
+            except httpx.HTTPError:
+                return False
+
+        def arithmetic_config(with_proxy_location: Union[str, None]) -> str:
+            config_file_name = os.path.join(
+                os.path.dirname(__file__), "test_config_files", "arithmetic.yaml"
+            )
+            with open(config_file_name, "r") as config_file:
+                arithmetic_config_dict = yaml.safe_load(config_file)
+
+            config_path = tmp_path / "config.yaml"
+            if proxy_location:
+                arithmetic_config_dict["proxy_location"] = with_proxy_location
+            with open(config_path, "w") as f:
+                yaml.dump(arithmetic_config_dict, f)
+            return str(config_path)
+
+        config_path = arithmetic_config(with_proxy_location=proxy_location)
+        p = subprocess.Popen(["serve", "run", config_path])
+        wait_for_condition(
+            lambda: is_proxy_location_correct(expected_proxy_location=expected),
+            timeout=10,
+        )
+        p.send_signal(signal.SIGINT)
+        p.wait()
+
     @pytest.mark.parametrize("number_of_kill_signals", (1, 2))
     @pytest.mark.skipif(
         sys.platform == "win32", reason="File path incorrect on Windows."

python/ray/serve/tests/test_controller.py

@@ -124,7 +124,7 @@ def autoscaling_app():
                 "worker_id": controller_details.worker_id,
                 "log_file_path": controller_details.log_file_path,
             },
-            "proxy_location": "EveryNode",
+            "proxy_location": "HeadOnly",
             "http_options": {"host": "0.0.0.0"},
             "grpc_options": {
                 "port": 9000,