[RAPTOR-15444] fix ADDRESS env var assignment from cli param (#1807)

Author: yakov-g

custom_model_runner/datarobot_drum/drum/entry_point.py

@@ -1,19 +1,17 @@
 from datarobot_drum.drum.gunicorn.run_gunicorn import main_gunicorn
 from datarobot_drum.drum.main import main
-import sys
 from datarobot_drum import RuntimeParameters
+from datarobot_drum.drum.utils.setup import setup_options
 
+from datarobot_drum.drum.enum import ArgumentsOptions
 
-def run_drum_server():
-    cmd_args = sys.argv
-    is_server = False
-    if len(cmd_args) > 1 and cmd_args[1] == "server":
-        is_server = True
 
+def run_drum_server():
+    options = setup_options()
     if (
-        RuntimeParameters.has("DRUM_SERVER_TYPE")
+        options.subparser_name == ArgumentsOptions.SERVER
+        and RuntimeParameters.has("DRUM_SERVER_TYPE")
         and str(RuntimeParameters.get("DRUM_SERVER_TYPE")).lower() == "gunicorn"
-        and is_server
     ):
         main_gunicorn()
     else:

custom_model_runner/datarobot_drum/drum/gunicorn/gunicorn.conf.py

@@ -66,7 +66,7 @@
     if temp_loglevel in {"debug", "info", "warning", "error", "critical"}:
         loglevel = temp_loglevel
 
-bind = os.environ.get("ADDRESS", "0.0.0.0:8080")
+bind = os.environ["ADDRESS"]
 # loglevel = "info"
 accesslog = "-"
 access_log_format = '%(h)s %(l)s %(u)s %(t)s "%(r)s" %(s)s %(b)s "%(f)s" "%(a)s"'

custom_model_runner/datarobot_drum/drum/utils/setup.py

@@ -5,6 +5,7 @@
 Released under the terms of DataRobot Tool and Utility Agreement.
 """
 
+import os
 import sys
 
 from datarobot_drum import RuntimeParameters
@@ -31,7 +32,6 @@ def setup_options(args=None):
         Parsed command line options as an argparse.Namespace object.
     """
     arg_parser = CMRunnerArgsRegistry.get_arg_parser()
-
     try:
         import argcomplete
     except ImportError:
@@ -48,6 +48,11 @@ def setup_options(args=None):
 
     options = arg_parser.parse_args(args)
 
+    # Override env var from CLI parameter.
+    # Now only ADDRESS is supported.
+    if getattr(options, "address", None):
+        os.environ["ADDRESS"] = options.address
+
     """Set max workers from runtime parameters if available."""
     if RuntimeParameters.has("CUSTOM_MODEL_WORKERS"):
         options.max_workers = RuntimeParameters.get("CUSTOM_MODEL_WORKERS")

tests/functional/test_runtime_parameters.py

@@ -222,8 +222,8 @@ def _test_custom_model_with_runtime_params(
         if docker:
             cmd += " --docker {} --verbose ".format(docker)
 
-        _, stdout, _ = _exec_shell_cmd(cmd, err_msg=None, assert_if_fail=False, env=env)
-        return stdout
+        _, stdout, stderr = _exec_shell_cmd(cmd, err_msg=None, assert_if_fail=False, env=env)
+        return stdout, stderr
 
     @classmethod
     def _setup_runtime_parameters(
@@ -251,20 +251,20 @@ def _setup_runtime_parameters(
     def test_runtime_parameters_invalid_yaml(
         self, resources, tmp_path, runtime_param_values_stream, use_runtime_params_env_var
     ):
-        stdout = self._test_custom_model_with_runtime_params(
+        stdout, stderr = self._test_custom_model_with_runtime_params(
             resources,
             tmp_path,
             runtime_param_values_stream,
             is_invalid_yaml=True,
             use_runtime_params_env_var=use_runtime_params_env_var,
         )
-        assert "Invalid runtime parameter values YAML content!" in stdout
+        assert "Invalid runtime parameter values YAML content!" in stdout + stderr
 
     @pytest.mark.parametrize("use_runtime_params_env_var", [True, False])
     def test_runtime_parameters_missing_attr(
         self, resources, tmp_path, runtime_param_values_stream, use_runtime_params_env_var
     ):
-        stdout = self._test_custom_model_with_runtime_params(
+        stdout, stderr = self._test_custom_model_with_runtime_params(
             resources,
             tmp_path,
             runtime_param_values_stream,
@@ -273,27 +273,27 @@ def test_runtime_parameters_missing_attr(
         )
         assert re.search(
             r".*Failed to load runtime parameter.*{\\'credentialType\\': DataError\(\\'is required\\'\)}.*",
-            stdout,
+            stdout + stderr,
         )
 
     def test_runtime_parameters_boolean_invalid(
         self, resources, tmp_path, runtime_param_values_stream
     ):
-        stderr = self._test_custom_model_with_runtime_params(
+        stdout, stderr = self._test_custom_model_with_runtime_params(
             resources, tmp_path, runtime_param_values_stream, bool_var_value="text"
         )
         assert re.search(
             r".*Failed to load runtime parameter.*value should be True or False.*",
-            stderr,
+            stdout + stderr,
         )
 
     def test_runtime_parameters_numeric_invalid(
         self, resources, tmp_path, runtime_param_values_stream
     ):
-        stderr = self._test_custom_model_with_runtime_params(
+        stdout, stderr = self._test_custom_model_with_runtime_params(
             resources, tmp_path, runtime_param_values_stream, numeric_var_value="text"
         )
         assert re.search(
             r".*Failed to load runtime parameter.*value can.*t be converted to float.*",
-            stderr,
+            stdout + stderr,
         )