oracle-ads 2.11.17__py3-none-any.whl → 2.11.19__py3-none-any.whl

ads/aqua/common/utils.py

@@ -58,6 +58,7 @@ from ads.aqua.constants import (
 )
 from ads.aqua.data import AquaResourceIdentifier
 from ads.common.auth import AuthState, default_signer
+from ads.common.decorator.threaded import threaded
 from ads.common.extended_enum import ExtendedEnumMeta
 from ads.common.object_storage_details import ObjectStorageDetails
 from ads.common.oci_resource import SEARCH_TYPE, OCIResource
@@ -225,6 +226,7 @@ def read_file(file_path: str, **kwargs) -> str:
         return UNKNOWN
 
 
+@threaded()
 def load_config(file_path: str, config_file_name: str, **kwargs) -> dict:
     artifact_path = f"{file_path.rstrip('/')}/{config_file_name}"
     signer = default_signer() if artifact_path.startswith("oci://") else {}
@@ -536,14 +538,14 @@ def _build_job_identifier(
         return AquaResourceIdentifier()
 
 
-def container_config_path():
+def service_config_path():
     return f"oci://{AQUA_SERVICE_MODELS_BUCKET}@{CONDA_BUCKET_NS}/service_models/config"
 
 
 @cached(cache=TTLCache(maxsize=1, ttl=timedelta(hours=5), timer=datetime.now))
 def get_container_config():
     config = load_config(
-        file_path=container_config_path(),
+        file_path=service_config_path(),
         config_file_name=CONTAINER_INDEX,
     )
 
@@ -568,7 +570,7 @@ def get_container_image(
     """
 
     config = config_file_name or get_container_config()
-    config_file_name = container_config_path()
+    config_file_name = service_config_path()
 
     if container_type not in config:
         raise AquaValueError(
@@ -1062,3 +1064,18 @@ def get_hf_model_info(repo_id: str) -> ModelInfo:
         return HfApi().model_info(repo_id=repo_id)
     except HfHubHTTPError as err:
         raise format_hf_custom_error_message(err) from err
+
+
+@cached(cache=TTLCache(maxsize=1, ttl=timedelta(hours=5), timer=datetime.now))
+def list_hf_models(query: str) -> List[str]:
+    try:
+        models = HfApi().list_models(
+            model_name=query,
+            task="text-generation",
+            sort="downloads",
+            direction=-1,
+            limit=20,
+        )
+        return [model.id for model in models if model.disabled is None]
+    except HfHubHTTPError as err:
+        raise format_hf_custom_error_message(err) from err

ads/aqua/config/__init__.py

@@ -0,0 +1,4 @@
+#!/usr/bin/env python
+
+# Copyright (c) 2024 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/

ads/aqua/config/config.py

@@ -3,6 +3,34 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 
+from typing import Optional
+
+from ads.aqua.common.entities import ContainerSpec
+from ads.aqua.common.utils import get_container_config
+from ads.aqua.config.evaluation.evaluation_service_config import EvaluationServiceConfig
+
+DEFAULT_EVALUATION_CONTAINER = "odsc-llm-evaluate"
+
+
+def get_evaluation_service_config(
+    container: Optional[str] = DEFAULT_EVALUATION_CONTAINER,
+) -> EvaluationServiceConfig:
+    """
+    Retrieves the common evaluation configuration.
+
+    Returns
+    -------
+    EvaluationServiceConfig: The evaluation common config.
+    """
+
+    container = container or DEFAULT_EVALUATION_CONTAINER
+    return EvaluationServiceConfig(
+        **get_container_config()
+        .get(ContainerSpec.CONTAINER_SPEC, {})
+        .get(container, {})
+    )
+
+
 # TODO: move this to global config.json in object storage
 def get_finetuning_config_defaults():
     """Generate and return the fine-tuning default configuration dictionary."""

ads/aqua/config/evaluation/__init__.py

@@ -0,0 +1,4 @@
+#!/usr/bin/env python
+
+# Copyright (c) 2024 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/

ads/aqua/config/evaluation/evaluation_service_config.py

@@ -0,0 +1,282 @@
+#!/usr/bin/env python
+
+# Copyright (c) 2024 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
+
+from copy import deepcopy
+from typing import Any, Dict, List, Optional
+
+from pydantic import Field
+
+from ads.aqua.config.utils.serializer import Serializable
+
+
+class ModelParamsOverrides(Serializable):
+    """Defines overrides for model parameters, including exclusions and additional inclusions."""
+
+    exclude: Optional[List[str]] = Field(default_factory=list)
+    include: Optional[Dict[str, Any]] = Field(default_factory=dict)
+
+    class Config:
+        extra = "ignore"
+
+
+class ModelParamsVersion(Serializable):
+    """Handles version-specific model parameter overrides."""
+
+    overrides: Optional[ModelParamsOverrides] = Field(
+        default_factory=ModelParamsOverrides
+    )
+
+    class Config:
+        extra = "ignore"
+
+
+class ModelParamsContainer(Serializable):
+    """Represents a container's model configuration, including tasks, defaults, and versions."""
+
+    name: Optional[str] = None
+    default: Optional[Dict[str, Any]] = Field(default_factory=dict)
+    versions: Optional[Dict[str, ModelParamsVersion]] = Field(default_factory=dict)
+
+    class Config:
+        extra = "ignore"
+
+
+class InferenceParams(Serializable):
+    """Contains inference-related parameters with defaults."""
+
+    class Config:
+        extra = "allow"
+
+
+class InferenceContainer(Serializable):
+    """Represents the inference parameters specific to a container."""
+
+    name: Optional[str] = None
+    params: Optional[Dict[str, Any]] = Field(default_factory=dict)
+
+    class Config:
+        extra = "ignore"
+
+
+class ReportParams(Serializable):
+    """Handles the report-related parameters."""
+
+    default: Optional[Dict[str, Any]] = Field(default_factory=dict)
+
+    class Config:
+        extra = "ignore"
+
+
+class InferenceParamsConfig(Serializable):
+    """Combines default inference parameters with container-specific configurations."""
+
+    default: Optional[InferenceParams] = Field(default_factory=InferenceParams)
+    containers: Optional[List[InferenceContainer]] = Field(default_factory=list)
+
+    def get_merged_params(self, container_name: str) -> InferenceParams:
+        """
+        Merges default inference params with those specific to the given container.
+
+        Parameters
+        ----------
+        container_name (str): The name of the container.
+
+        Returns
+        -------
+        InferenceParams: The merged inference parameters.
+        """
+        merged_params = self.default.to_dict()
+        for containers in self.containers:
+            if containers.name.lower() == container_name.lower():
+                merged_params.update(containers.params or {})
+                break
+        return InferenceParams(**merged_params)
+
+    class Config:
+        extra = "ignore"
+
+
+class InferenceModelParamsConfig(Serializable):
+    """Encapsulates the model parameters for different containers."""
+
+    default: Optional[Dict[str, Any]] = Field(default_factory=dict)
+    containers: Optional[List[ModelParamsContainer]] = Field(default_factory=list)
+
+    def get_merged_model_params(
+        self,
+        container_name: str,
+        version: Optional[str] = None,
+    ) -> Dict[str, Any]:
+        """
+        Gets the model parameters for a given container, version,
+        merged with the defaults.
+
+        Parameters
+        ----------
+        container_name (str): The name of the container.
+        version (Optional[str]): The specific version of the container.
+
+        Returns
+        -------
+        Dict[str, Any]: The merged model parameters.
+        """
+        params = deepcopy(self.default)
+
+        for container in self.containers:
+            if container.name.lower() == container_name.lower():
+                params.update(container.default)
+
+                if version and version in container.versions:
+                    version_overrides = container.versions[version].overrides
+                    if version_overrides:
+                        if version_overrides.include:
+                            params.update(version_overrides.include)
+                        if version_overrides.exclude:
+                            for key in version_overrides.exclude:
+                                params.pop(key, None)
+                break
+
+        return params
+
+    class Config:
+        extra = "ignore"
+
+
+class ShapeFilterConfig(Serializable):
+    """Represents the filtering options for a specific shape."""
+
+    evaluation_container: Optional[List[str]] = Field(default_factory=list)
+    evaluation_target: Optional[List[str]] = Field(default_factory=list)
+
+    class Config:
+        extra = "ignore"
+
+
+class ShapeConfig(Serializable):
+    """Defines the configuration for a specific shape."""
+
+    name: Optional[str] = None
+    ocpu: Optional[int] = None
+    memory_in_gbs: Optional[int] = None
+    block_storage_size: Optional[int] = None
+    filter: Optional[ShapeFilterConfig] = Field(default_factory=ShapeFilterConfig)
+
+    class Config:
+        extra = "allow"
+
+
+class MetricConfig(Serializable):
+    """Handles metric configuration including task, key, and additional details."""
+
+    task: Optional[List[str]] = Field(default_factory=list)
+    key: Optional[str] = None
+    name: Optional[str] = None
+    description: Optional[str] = None
+    args: Optional[Dict[str, Any]] = Field(default_factory=dict)
+    tags: Optional[List[str]] = Field(default_factory=list)
+
+    class Config:
+        extra = "ignore"
+
+
+class ModelParamsConfig(Serializable):
+    """Encapsulates the default model parameters."""
+
+    default: Optional[Dict[str, Any]] = Field(default_factory=dict)
+
+
+class UIConfig(Serializable):
+    model_params: Optional[ModelParamsConfig] = Field(default_factory=ModelParamsConfig)
+    shapes: List[ShapeConfig] = Field(default_factory=list)
+    metrics: List[MetricConfig] = Field(default_factory=list)
+
+    def search_shapes(
+        self,
+        evaluation_container: Optional[str] = None,
+        evaluation_target: Optional[str] = None,
+    ) -> List[ShapeConfig]:
+        """
+        Searches for shapes that match the given filters.
+
+        Parameters
+        ----------
+        evaluation_container (Optional[str]): Filter for evaluation_container.
+        evaluation_target (Optional[str]): Filter for evaluation_target.
+
+        Returns
+        -------
+        List[ShapeConfig]: A list of shapes that match the filters.
+        """
+        return [
+            shape
+            for shape in self.shapes
+            if (
+                not evaluation_container
+                or evaluation_container in shape.filter.evaluation_container
+            )
+            and (
+                not evaluation_target
+                or evaluation_target in shape.filter.evaluation_target
+            )
+        ]
+
+    class Config:
+        extra = "ignore"
+
+
+class EvaluationServiceConfig(Serializable):
+    """
+    Root configuration class for evaluation setup including model,
+    inference, and shape configurations.
+    """
+
+    version: Optional[str] = "1.0"
+    kind: Optional[str] = "evaluation_service_config"
+    report_params: Optional[ReportParams] = Field(default_factory=ReportParams)
+    inference_params: Optional[InferenceParamsConfig] = Field(
+        default_factory=InferenceParamsConfig
+    )
+    inference_model_params: Optional[InferenceModelParamsConfig] = Field(
+        default_factory=InferenceModelParamsConfig
+    )
+    ui_config: Optional[UIConfig] = Field(default_factory=UIConfig)
+
+    def get_merged_inference_params(self, container_name: str) -> InferenceParams:
+        """
+        Merges default inference params with those specific to the given container.
+
+        Params
+        ------
+        container_name (str): The name of the container.
+
+        Returns
+        -------
+        InferenceParams: The merged inference parameters.
+        """
+        return self.inference_params.get_merged_params(container_name=container_name)
+
+    def get_merged_inference_model_params(
+        self,
+        container_name: str,
+        version: Optional[str] = None,
+    ) -> Dict[str, Any]:
+        """
+        Gets the model parameters for a given container, version, and task, merged with the defaults.
+
+        Parameters
+        ----------
+        container_name (str): The name of the container.
+        version (Optional[str]): The specific version of the container.
+
+        Returns
+        -------
+        Dict[str, Any]: The merged model parameters.
+        """
+        return self.inference_model_params.get_merged_model_params(
+            container_name=container_name, version=version
+        )
+
+    class Config:
+        extra = "ignore"

ads/aqua/config/evaluation/evaluation_service_model_config.py

@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+
+# Copyright (c) 2024 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
+
+"""
+This serves as a future template for implementing model-specific evaluation configurations.
+"""

ads/aqua/config/utils/__init__.py

@@ -0,0 +1,4 @@
+#!/usr/bin/env python
+
+# Copyright (c) 2024 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/