Merge branch 'main' of https://github.com/oracle/accelerated-data-science into ODSC-61938/fix_validation_for_gguf_safetensors

Author: lu-ohai

.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"

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
@@ -459,7 +477,13 @@ pydantic
 * 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 {}
@@ -1065,11 +1067,15 @@ def get_hf_model_info(repo_id: str) -> ModelInfo:
 
 
 @cached(cache=TTLCache(maxsize=1, ttl=timedelta(hours=5), timer=datetime.now))
-def list_hf_models(query:str) -> List[str]:
+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)
+        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/extension/common_handler.py

@@ -11,16 +11,15 @@
 from huggingface_hub.utils import LocalTokenNotFoundError
 from tornado.web import HTTPError
 
-from ads.aqua import ODSC_MODEL_COMPARTMENT_OCID
 from ads.aqua.common.decorator import handle_exceptions
 from ads.aqua.common.errors import AquaResourceAccessError, AquaRuntimeError
 from ads.aqua.common.utils import (
-    fetch_service_compartment,
     get_huggingface_login_timeout,
     known_realm,
 )
 from ads.aqua.extension.base_handler import AquaAPIhandler
 from ads.aqua.extension.errors import Errors
+from ads.aqua.extension.utils import ui_compatability_check
 
 
 class ADSVersionHandler(AquaAPIhandler):
@@ -51,7 +50,7 @@ def get(self):
             AquaResourceAccessError: raised when aqua is not accessible in the given session/region.
 
         """
-        if ODSC_MODEL_COMPARTMENT_OCID or fetch_service_compartment():
+        if ui_compatability_check():
             return self.finish({"status": "ok"})
         elif known_realm():
             return self.finish({"status": "compatible"})

ads/aqua/extension/common_ws_msg_handler.py

@@ -7,7 +7,6 @@
 from importlib import metadata
 from typing import List, Union
 
-from ads.aqua import ODSC_MODEL_COMPARTMENT_OCID, fetch_service_compartment
 from ads.aqua.common.decorator import handle_exceptions
 from ads.aqua.common.errors import AquaResourceAccessError
 from ads.aqua.common.utils import known_realm
@@ -17,6 +16,7 @@
     CompatibilityCheckResponse,
     RequestResponseType,
 )
+from ads.aqua.extension.utils import ui_compatability_check
 
 
 class AquaCommonWsMsgHandler(AquaWSMsgHandler):
@@ -39,7 +39,7 @@ def process(self) -> Union[AdsVersionResponse, CompatibilityCheckResponse]:
             )
             return response
         if request.get("kind") == "CompatibilityCheck":
-            if ODSC_MODEL_COMPARTMENT_OCID or fetch_service_compartment():
+            if ui_compatability_check():
                 return CompatibilityCheckResponse(
                     message_id=request.get("message_id"),
                     kind=RequestResponseType.CompatibilityCheck,

ads/aqua/extension/utils.py

@@ -1,12 +1,15 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 # 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 dataclasses import fields
+from datetime import datetime, timedelta
 from typing import Dict, Optional
 
+from cachetools import TTLCache, cached
 from tornado.web import HTTPError
 
+from ads.aqua import ODSC_MODEL_COMPARTMENT_OCID
+from ads.aqua.common.utils import fetch_service_compartment
 from ads.aqua.extension.errors import Errors
 
 
@@ -21,3 +24,11 @@ def validate_function_parameters(data_class, input_data: Dict):
             raise HTTPError(
                 400, Errors.MISSING_REQUIRED_PARAMETER.format(required_parameter)
             )
+
+
+@cached(cache=TTLCache(maxsize=1, ttl=timedelta(minutes=1), timer=datetime.now))
+def ui_compatability_check():
+    """This method caches the service compartment OCID details that is set by either the environment variable or if
+    fetched from the configuration. The cached result is returned when multiple calls are made in quick succession
+    from the UI to avoid multiple config file loads."""
+    return ODSC_MODEL_COMPARTMENT_OCID or fetch_service_compartment()

ads/llm/__init__.py

@@ -6,10 +6,16 @@
 
 try:
     import langchain
-    from ads.llm.langchain.plugins.llm_gen_ai import GenerativeAI
-    from ads.llm.langchain.plugins.llm_md import ModelDeploymentTGI
-    from ads.llm.langchain.plugins.llm_md import ModelDeploymentVLLM
-    from ads.llm.langchain.plugins.embeddings import GenerativeAIEmbeddings
+    from ads.llm.langchain.plugins.llms.oci_data_science_model_deployment_endpoint import (
+        OCIModelDeploymentVLLM,
+        OCIModelDeploymentTGI,
+    )
+    from ads.llm.langchain.plugins.chat_models.oci_data_science import (
+        ChatOCIModelDeployment,
+        ChatOCIModelDeploymentVLLM,
+        ChatOCIModelDeploymentTGI,
+    )
+    from ads.llm.chat_template import ChatTemplates
 except ImportError as ex:
     if ex.name == "langchain":
         raise ImportError(

ads/llm/chat_template.py

@@ -0,0 +1,31 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*--
+
+# Copyright (c) 2023 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
+
+
+import os
+
+
+class ChatTemplates:
+    """Contains chat templates."""
+
+    @staticmethod
+    def _read_template(filename):
+        with open(
+            os.path.join(os.path.dirname(__file__), "templates", filename),
+            mode="r",
+            encoding="utf-8",
+        ) as f:
+            return f.read()
+
+    @staticmethod
+    def mistral():
+        """Chat template for auto tool calling with Mistral model deploy with vLLM."""
+        return ChatTemplates._read_template("tool_chat_template_mistral_parallel.jinja")
+
+    @staticmethod
+    def hermes():
+        """Chat template for auto tool calling with Hermes model deploy with vLLM."""
+        return ChatTemplates._read_template("tool_chat_template_hermes.jinja")

ads/llm/guardrails/base.py

@@ -14,7 +14,7 @@
 from typing import Any, List, Dict, Tuple
 from langchain.schema.prompt import PromptValue
 from langchain.tools.base import BaseTool, ToolException
-from langchain.pydantic_v1 import BaseModel, root_validator
+from pydantic import BaseModel, model_validator
 
 
 class RunInfo(BaseModel):
@@ -190,7 +190,8 @@ class Config:
     This is used by the ``apply_filter()`` method.
     """
 
-    @root_validator
+    @model_validator(mode="before")
+    @classmethod
     def default_name(cls, values):
         """Sets the default name of the guardrail."""
         if not values.get("name"):

ads/llm/guardrails/huggingface.py

@@ -6,7 +6,7 @@
 
 
 import evaluate
-from langchain.pydantic_v1 import root_validator
+from pydantic.v1 import root_validator
 from .base import Guardrail