Merge branch 'main' into ahosler-patch-2

Author: ahosler

.github/workflows/run-unittests-py38-cov-report.yml

@@ -115,6 +115,7 @@ jobs:
             cov-${{ matrix.name }}/htmlcov/
             cov-${{ matrix.name }}/.coverage
             cov-${{ matrix.name }}/coverage.xml
+          include-hidden-files: true
 
   coverage-report:
     name: "Coverage report"

.gitignore

@@ -163,3 +163,6 @@ logs/
 
 # Python Wheel
 *.whl
+
+# The demo folder
+.demo

THIRD_PARTY_LICENSES.txt

@@ -72,6 +72,12 @@ fastavro
 * Source code: https://github.com/fastavro/fastavro
 * Project home: https://github.com/fastavro/fastavro
 
+fiona
+* Copyright (c) 2007, Sean C. Gillies
+* License: BSD 3-Clause "New" or "Revised" License
+* Source code: https://github.com/Toblerity/Fiona
+* Project home: https://github.com/Toblerity/Fiona
+
 folium
 * Copyright (C) 2013, Rob Story
 * License: MIT License
@@ -151,6 +157,18 @@ langchain
 * Source code: https://github.com/langchain-ai/langchain
 * Project home: https://www.langchain.com/
 
+langchain-community
+* Copyright (c) 2023 LangChain, Inc.
+* License: MIT license
+* Source code: https://github.com/langchain-ai/langchain/tree/master/libs/community
+* Project home: https://github.com/langchain-ai/langchain/tree/master/libs/community
+
+langchain-openai
+* Copyright (c) 2023 LangChain, Inc.
+* License: MIT license
+* Source code: https://github.com/langchain-ai/langchain/tree/master/libs/partners/openai
+* Project home: https://github.com/langchain-ai/langchain/tree/master/libs/partners/openai
+
 lightgbm
 * Copyright (c) 2023 Microsoft Corporation
 * License: MIT license
@@ -453,13 +471,19 @@ mlforecast
 * Source code: https://github.com/Nixtla/mlforecast
 * Project home: https://github.com/Nixtla/mlforecast
 
+pydantic
+* Copyright (c) 2017 to present Pydantic Services Inc. and individual contributors.
+* License: The MIT License (MIT)
+* Source code: https://github.com/pydantic/pydantic
+* Project home: https://docs.pydantic.dev/latest/
+
 rrcf
 * Copyright 2018 kLabUM
 * License: MIT License
 * Source code: https://github.com/kLabUM/rrcf
 * Project home: https://github.com/kLabUM/rrcf
 
-=======
+
 =============================== Licenses ===============================
 ------------------------------------------------------------------------
 

ads/aqua/common/utils.py

@@ -58,6 +58,7 @@
 )
 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/