Removing from_container_index method

Author: kumar-shivam-ranjan

ads/aqua/config/container_config.py

@@ -7,7 +7,6 @@
 from oci.data_science.models import ContainerSummary
 from pydantic import Field
 
-from ads.aqua.common.entities import ContainerSpec
 from ads.aqua.config.utils.serializer import Serializable
 from ads.aqua.constants import (
     SERVICE_MANAGED_CONTAINER_URI_SCHEME,
@@ -185,24 +184,31 @@ def from_service_config(
                             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),
-                    }
+                    },
+                    {},
                 ]
                 container_spec = AquaContainerConfigSpec(
                     cli_param=container.workload_configuration_details_list[0].cmd,
@@ -239,88 +245,3 @@ def from_service_config(
         return cls(
             inference=inference_items, finetune=finetune_items, evaluate=evaluate_items
         )
-
-    @classmethod
-    def from_container_index_json(
-        cls,
-        config: Dict,
-        enable_spec: Optional[bool] = False,
-    ) -> "AquaContainerConfig":
-        """
-        Creates an AquaContainerConfig instance from a container index JSON.
-
-        Parameters
-        ----------
-        config (Optional[Dict]): The container index JSON.
-        enable_spec (Optional[bool]): If True, fetch container specification details.
-
-        Returns
-        -------
-        AquaContainerConfig: The constructed container configuration.
-        """
-        # TODO: Return this logic back if necessary in the next iteraion.
-        # if not config:
-        #     config = get_container_config()
-        inference_items: Dict[str, AquaContainerConfigItem] = {}
-        finetune_items: Dict[str, AquaContainerConfigItem] = {}
-        evaluate_items: Dict[str, AquaContainerConfigItem] = {}
-
-        for container_type, containers in config.items():
-            if isinstance(containers, list):
-                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, {}
-                        )
-                        if enable_spec
-                        else None
-                    )
-                    container_item = AquaContainerConfigItem(
-                        name=container.get("name", ""),
-                        version=container.get("version", ""),
-                        display_name=container.get(
-                            "displayName", container.get("version", "")
-                        ),
-                        family=container_type,
-                        platforms=platforms,
-                        model_formats=model_formats,
-                        usages=usages,
-                        spec=(
-                            AquaContainerConfigSpec(
-                                cli_param=container_spec.get(
-                                    ContainerSpec.CLI_PARM, ""
-                                ),
-                                server_port=container_spec.get(
-                                    ContainerSpec.SERVER_PORT, ""
-                                ),
-                                health_check_port=container_spec.get(
-                                    ContainerSpec.HEALTH_CHECK_PORT, ""
-                                ),
-                                env_vars=container_spec.get(ContainerSpec.ENV_VARS, []),
-                                restricted_params=container_spec.get(
-                                    ContainerSpec.RESTRICTED_PARAMS, []
-                                ),
-                            )
-                            if container_spec
-                            else None
-                        ),
-                    )
-                    if container.get("type").lower() == "inference":
-                        inference_items[container_type] = container_item
-                    elif (
-                        container.get("type").lower() == "fine-tune"
-                        or container_type == "odsc-llm-fine-tuning"
-                    ):
-                        finetune_items[container_type] = container_item
-                    elif (
-                        container.get("type").lower() in ("evaluation", "evaluate")
-                        or container_type == "odsc-llm-evaluate"
-                    ):
-                        evaluate_items[container_type] = container_item
-
-        return cls(
-            inference=inference_items, finetune=finetune_items, evaluate=evaluate_items
-        )

ads/aqua/modeldeployment/deployment.py

@@ -468,7 +468,6 @@ def _create(
             env_var.update({"BASE_MODEL_FILE": f"{model_file}"})
             tags.update({Tags.MODEL_ARTIFACT_FILE: model_file})
 
-        # todo: use AquaContainerConfig.from_container_index_json instead.
         # Fetch the startup cli command for the container
         # container_index.json will have "containerSpec" section which will provide the cli params for
         # a given container family
@@ -521,9 +520,9 @@ def _create(
         if params:
             env_var.update({"PARAMS": params})
         env_vars = container_spec.env_vars if container_spec else []
-        env_vars = [{k: v} for env in env_vars for k, v in env.items() if v]
         for env in env_vars:
             if isinstance(env, dict):
+                env = {k: v for k, v in env.items() if v}
                 for key, _ in env.items():
                     if key not in env_var:
                         env_var.update(env)