Merge branch 'main' into tests/explainers

Author: codeloop

ads/aqua/config/container_config.py

@@ -80,6 +80,9 @@ class AquaContainerConfigItem(Serializable):
         default_factory=AquaContainerConfigSpec,
         description="Detailed container specification.",
     )
+    usages: Optional[List[str]] = Field(
+        default_factory=list, description="Supported usages."
+    )
 
     class Config:
         extra = "allow"
@@ -131,7 +134,7 @@ def from_container_index_json(
         -------
         AquaContainerConfig: The constructed container configuration.
         """
-        #TODO: Return this logic back if necessary in the next iteraion.
+        # TODO: Return this logic back if necessary in the next iteraion.
         # if not config:
         #     config = get_container_config()
 
@@ -144,6 +147,7 @@ def from_container_index_json(
                 for container in containers:
                     platforms = container.get("platforms", [])
                     model_formats = container.get("modelFormats", [])
+                    usages = container.get("usages", [])
                     container_spec = (
                         config.get(ContainerSpec.CONTAINER_SPEC, {}).get(
                             container_type, {}
@@ -160,6 +164,7 @@ def from_container_index_json(
                         family=container_type,
                         platforms=platforms,
                         model_formats=model_formats,
+                        usages=usages,
                         spec=(
                             AquaContainerConfigSpec(
                                 cli_param=container_spec.get(

tests/unitary/with_extras/aqua/test_ui.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*--
 
-# Copyright (c) 2024 Oracle and/or its affiliates.
+# Copyright (c) 2024, 2025 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 import hashlib
@@ -518,6 +518,7 @@ def test_list_containers(self, mock_get_container_config):
                     "platforms": [],
                     "model_formats": [],
                     "spec": None,
+                    "usages": [],
                 }
             ],
             "inference": [
@@ -541,6 +542,7 @@ def test_list_containers(self, mock_get_container_config):
                         "restricted_params": [],
                         "server_port": "8080",
                     },
+                    "usages": [],
                 },
                 {
                     "name": "dsmc://odsc-text-generation-inference",
@@ -567,6 +569,7 @@ def test_list_containers(self, mock_get_container_config):
                         ],
                         "server_port": "8080",
                     },
+                    "usages": [],
                 },
                 {
                     "name": "dsmc://odsc-vllm-serving",
@@ -592,6 +595,7 @@ def test_list_containers(self, mock_get_container_config):
                         ],
                         "server_port": "8080",
                     },
+                    "usages": [],
                 },
             ],
             "finetune": [
@@ -603,6 +607,7 @@ def test_list_containers(self, mock_get_container_config):
                     "platforms": [],
                     "model_formats": [],
                     "spec": None,
+                    "usages": [],
                 }
             ],
         }