Skip to content

Enhance AQUA SDK to Inject VLLM_USE_V1 Based on Global Container Config #1184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 16, 2025
Merged

Enhance AQUA SDK to Inject VLLM_USE_V1 Based on Global Container Config #1184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e882d0
Enhance AQUA SDK to Inject VLLM_USE_V1 Based on Container Config
mrDzurb May 16, 2025
82e2ff7
Fixes unit tests
mrDzurb May 16, 2025
0d02d2a
Merge branch 'main' into ODSC-72373/vllm_use_v1
mrDzurb May 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 38 additions & 39 deletions ads/aqua/config/container_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from oci.data_science.models import ContainerSummary
from pydantic import Field

from ads.aqua import logger
from ads.aqua.config.utils.serializer import Serializable
from ads.aqua.constants import (
SERVICE_MANAGED_CONTAINER_URI_SCHEME,
Expand Down Expand Up @@ -168,50 +169,47 @@ def from_service_config(
container_type = container.family_name
usages = [x.upper() for x in container.usages]
if "INFERENCE" in usages or "MULTI_MODEL" in usages:
# Extract additional configurations
additional_configurations = {}
try:
additional_configurations = (
container.workload_configuration_details_list[
0
].additional_configurations
)
except (AttributeError, IndexError) as ex:
logger.debug(
"Failed to extract `additional_configurations` for container '%s': %s",
getattr(container, "container_name", "<unknown>"),
ex,
)

container_item.platforms.append(
container.workload_configuration_details_list[
0
].additional_configurations.get("platforms")
additional_configurations.get("platforms")
)
container_item.model_formats.append(
container.workload_configuration_details_list[
0
].additional_configurations.get("modelFormats")
additional_configurations.get("modelFormats")
)

# Parse environment variables from `additional_configurations`.
# Only keys present in the configuration will be added to the result.
config_keys = {
"MODEL_DEPLOY_PREDICT_ENDPOINT": UNKNOWN,
"MODEL_DEPLOY_HEALTH_ENDPOINT": UNKNOWN,
"MODEL_DEPLOY_ENABLE_STREAMING": UNKNOWN,
"PORT": UNKNOWN,
"HEALTH_CHECK_PORT": UNKNOWN,
"VLLM_USE_V1": UNKNOWN,
}

env_vars = [
{
"MODEL_DEPLOY_PREDICT_ENDPOINT": container.workload_configuration_details_list[
0
].additional_configurations.get(
"MODEL_DEPLOY_PREDICT_ENDPOINT", UNKNOWN
)
},
{
"MODEL_DEPLOY_HEALTH_ENDPOINT": container.workload_configuration_details_list[
0
].additional_configurations.get(
"MODEL_DEPLOY_HEALTH_ENDPOINT", UNKNOWN
)
},
{
"MODEL_DEPLOY_ENABLE_STREAMING": container.workload_configuration_details_list[
0
].additional_configurations.get(
"MODEL_DEPLOY_ENABLE_STREAMING", UNKNOWN
)
},
{
"PORT": container.workload_configuration_details_list[
0
].additional_configurations.get("PORT", "")
},
{
"HEALTH_CHECK_PORT": container.workload_configuration_details_list[
0
].additional_configurations.get("HEALTH_CHECK_PORT", UNKNOWN),
},
{key: additional_configurations.get(key, default)}
for key, default in config_keys.items()
if key in additional_configurations
]
container_spec = AquaContainerConfigSpec(

# Build container spec
container_item.spec = AquaContainerConfigSpec(
cli_param=container.workload_configuration_details_list[0].cmd,
server_port=str(
container.workload_configuration_details_list[0].server_port
Expand All @@ -236,13 +234,14 @@ def from_service_config(
)
),
)
container_item.spec = container_spec

if "INFERENCE" in usages or "MULTI_MODEL" in usages:
inference_items[container_type] = container_item
if "FINE_TUNE" in usages:
finetune_items[container_type] = container_item
if "EVALUATION" in usages:
evaluate_items[container_type] = container_item

return cls(
inference=inference_items, finetune=finetune_items, evaluate=evaluate_items
)
2 changes: 1 addition & 1 deletion tests/unitary/with_extras/aqua/test_ui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@ def test_list_containers(self, mock_list_service_containers):
"cli_param": "--served-model-name odsc-llm --disable-custom-all-reduce --seed 42 ",
"env_vars": [
{"MODEL_DEPLOY_PREDICT_ENDPOINT": "/v1/completions"},
{"MODEL_DEPLOY_HEALTH_ENDPOINT": ""},
# {"MODEL_DEPLOY_HEALTH_ENDPOINT": ""},
{"MODEL_DEPLOY_ENABLE_STREAMING": "true"},
{"PORT": "8080"},
{"HEALTH_CHECK_PORT": "8080"},
Expand Down