From e81e06aa717e2504b4829bb5d2da3b61b029fcb7 Mon Sep 17 00:00:00 2001 From: Valentin Mendelev Date: Thu, 18 Dec 2025 06:37:10 -0800 Subject: [PATCH 1/4] generation.py to respect separate server type for the client Signed-off-by: Valentin Mendelev --- nemo_skills/pipeline/utils/generation.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/nemo_skills/pipeline/utils/generation.py b/nemo_skills/pipeline/utils/generation.py index cd576053c1..4b45ed8a39 100644 --- a/nemo_skills/pipeline/utils/generation.py +++ b/nemo_skills/pipeline/utils/generation.py @@ -446,6 +446,9 @@ def configure_client( - server_address: Address of the server. - extra_arguments: Updated extra arguments for the command. """ + # Check if user already specified server.server_type in extra_arguments + user_specified_server_type = "++server.server_type=" in extra_arguments + if server_gpus: # we need to host the model server_port = get_free_port(strategy="random") if get_random_port else 5000 assert server_gpus is not None, "Need to specify server_gpus if hosting the model" @@ -462,14 +465,17 @@ def configure_client( } if server_container: server_config["container"] = server_container + # Only add server_type if user didn't specify it (allows vllm_multimodal override) + server_type_arg = "" if user_specified_server_type else f"++server.server_type={server_type} " extra_arguments = ( - f"{extra_arguments} ++server.server_type={server_type} ++server.host=127.0.0.1 " + f"{extra_arguments} {server_type_arg}++server.host=127.0.0.1 " f"++server.port={server_port} ++server.model={model} " ) else: # model is hosted elsewhere server_config = None + # Only add server_type if user didn't specify it + server_type_arg = "" if user_specified_server_type else f"++server.server_type={server_type} " extra_arguments = ( - f"{extra_arguments} ++server.server_type={server_type} " - f"++server.base_url={server_address} ++server.model={model} " + f"{extra_arguments} {server_type_arg}++server.base_url={server_address} ++server.model={model} " ) return server_config, server_address, extra_arguments From 5267a290725cc5a6bf31dcedfa5e868f669fb726 Mon Sep 17 00:00:00 2001 From: Nikolay Karpov Date: Tue, 30 Dec 2025 15:48:34 -0800 Subject: [PATCH 2/4] add server_type_arg to extra_arguments Signed-off-by: Nikolay Karpov --- nemo_skills/pipeline/utils/generation.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/nemo_skills/pipeline/utils/generation.py b/nemo_skills/pipeline/utils/generation.py index 4b45ed8a39..82cd09b6ff 100644 --- a/nemo_skills/pipeline/utils/generation.py +++ b/nemo_skills/pipeline/utils/generation.py @@ -447,7 +447,8 @@ def configure_client( - extra_arguments: Updated extra arguments for the command. """ # Check if user already specified server.server_type in extra_arguments - user_specified_server_type = "++server.server_type=" in extra_arguments + server_type_arg = "" if "++server.server_type=" in extra_arguments else f"++server.server_type={server_type} " + extra_arguments = server_type_arg + extra_arguments if server_gpus: # we need to host the model server_port = get_free_port(strategy="random") if get_random_port else 5000 @@ -466,16 +467,13 @@ def configure_client( if server_container: server_config["container"] = server_container # Only add server_type if user didn't specify it (allows vllm_multimodal override) - server_type_arg = "" if user_specified_server_type else f"++server.server_type={server_type} " extra_arguments = ( - f"{extra_arguments} {server_type_arg}++server.host=127.0.0.1 " - f"++server.port={server_port} ++server.model={model} " + f"++server.host=127.0.0.1 ++server.port={server_port} ++server.model={model} {extra_arguments} " ) else: # model is hosted elsewhere server_config = None # Only add server_type if user didn't specify it - server_type_arg = "" if user_specified_server_type else f"++server.server_type={server_type} " extra_arguments = ( - f"{extra_arguments} {server_type_arg}++server.base_url={server_address} ++server.model={model} " + f"++server.base_url={server_address} ++server.model={model} {extra_arguments}" ) return server_config, server_address, extra_arguments From ab8c8f96d93a0a3755571809775ca30401a4ab69 Mon Sep 17 00:00:00 2001 From: Nikolay Karpov Date: Tue, 30 Dec 2025 15:51:36 -0800 Subject: [PATCH 3/4] mv comments Signed-off-by: Nikolay Karpov --- nemo_skills/pipeline/utils/generation.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nemo_skills/pipeline/utils/generation.py b/nemo_skills/pipeline/utils/generation.py index 82cd09b6ff..5787a573c7 100644 --- a/nemo_skills/pipeline/utils/generation.py +++ b/nemo_skills/pipeline/utils/generation.py @@ -448,6 +448,7 @@ def configure_client( """ # Check if user already specified server.server_type in extra_arguments server_type_arg = "" if "++server.server_type=" in extra_arguments else f"++server.server_type={server_type} " + # Only add server_type if user didn't specify it (allows vllm_multimodal override) extra_arguments = server_type_arg + extra_arguments if server_gpus: # we need to host the model @@ -466,13 +467,11 @@ def configure_client( } if server_container: server_config["container"] = server_container - # Only add server_type if user didn't specify it (allows vllm_multimodal override) extra_arguments = ( - f"++server.host=127.0.0.1 ++server.port={server_port} ++server.model={model} {extra_arguments} " + f"++server.host=127.0.0.1 ++server.port={server_port} ++server.model={model} {extra_arguments}" ) else: # model is hosted elsewhere server_config = None - # Only add server_type if user didn't specify it extra_arguments = ( f"++server.base_url={server_address} ++server.model={model} {extra_arguments}" ) From 39cc2c3a3d607ccc03bf5cc05043fa1b7adf4d64 Mon Sep 17 00:00:00 2001 From: Nikolay Karpov Date: Tue, 30 Dec 2025 16:08:30 -0800 Subject: [PATCH 4/4] join extra_arguments Signed-off-by: Nikolay Karpov --- nemo_skills/pipeline/utils/generation.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nemo_skills/pipeline/utils/generation.py b/nemo_skills/pipeline/utils/generation.py index 5787a573c7..c8f91a013b 100644 --- a/nemo_skills/pipeline/utils/generation.py +++ b/nemo_skills/pipeline/utils/generation.py @@ -472,7 +472,5 @@ def configure_client( ) else: # model is hosted elsewhere server_config = None - extra_arguments = ( - f"++server.base_url={server_address} ++server.model={model} {extra_arguments}" - ) + extra_arguments = f"++server.base_url={server_address} ++server.model={model} {extra_arguments}" return server_config, server_address, extra_arguments