oracle-ads 2.11.18__py3-none-any.whl → 2.12.0__py3-none-any.whl

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/aqua/modeldeployment/deployment.py

@@ -146,7 +146,7 @@ class AquaDeploymentApp(AquaApp):
         env_var : dict, optional
             Environment variable for the deployment, by default None.
         container_family: str
-            The image family of model deployment container runtime. Required for unverified Aqua models.
+            The image family of model deployment container runtime.
         memory_in_gbs: float
             The memory in gbs for the shape selected.
         ocpus: float
@@ -230,41 +230,14 @@ class AquaDeploymentApp(AquaApp):
 
             env_var.update({"FT_MODEL": f"{fine_tune_output_path}"})
 
-        is_custom_container = False
-        try:
-            container_type_key = aqua_model.custom_metadata_list.get(
-                AQUA_DEPLOYMENT_CONTAINER_METADATA_NAME
-            ).value
-        except ValueError as err:
-            message = (
-                f"{AQUA_DEPLOYMENT_CONTAINER_METADATA_NAME} key is not available in the custom metadata field "
-                f"for model {aqua_model.id}."
-            )
-            logger.debug(message)
-            if not container_family:
-                raise AquaValueError(
-                    f"{message}. For unverified Aqua models, container_family parameter should be "
-                    f"set and value can be one of {', '.join(InferenceContainerTypeFamily.values())}."
-                ) from err
-            container_type_key = container_family
-        try:
-            # Check if the container override flag is set. If set, then the user has chosen custom image
-            if aqua_model.custom_metadata_list.get(
-                    AQUA_DEPLOYMENT_CONTAINER_OVERRIDE_FLAG_METADATA_NAME
-            ).value:
-                is_custom_container = True
-        except Exception:
-            pass
+        container_type_key = self._get_container_type_key(
+            model=aqua_model,
+            container_family=container_family
+        )
 
         # fetch image name from config
-        # If the image is of type custom, then `container_type_key` is the inference image
-        container_image = (
-            get_container_image(
-                container_type=container_type_key,
-            )
-            if not is_custom_container
-            else container_type_key
-        )
+        container_image = get_container_image(container_type=container_type_key)
+
         logging.info(
             f"Aqua Image used for deploying {aqua_model.id} : {container_image}"
         )
@@ -433,6 +406,26 @@ class AquaDeploymentApp(AquaApp):
             deployment.dsc_model_deployment, self.region
         )
 
+    @staticmethod
+    def _get_container_type_key(model: DataScienceModel, container_family: str) -> str:
+        container_type_key = UNKNOWN
+        if container_family:
+            container_type_key = container_family
+        else:
+            try:
+                container_type_key = model.custom_metadata_list.get(
+                    AQUA_DEPLOYMENT_CONTAINER_METADATA_NAME
+                ).value
+            except ValueError as err:
+                raise AquaValueError(
+                    f"{AQUA_DEPLOYMENT_CONTAINER_METADATA_NAME} key is not available in the custom metadata field "
+                    f"for model {model.id}. For unverified Aqua models, {AQUA_DEPLOYMENT_CONTAINER_METADATA_NAME} should be"
+                    f"set and value can be one of {', '.join(InferenceContainerTypeFamily.values())}."
+                ) from err
+            
+        return container_type_key
+        
+
     @telemetry(entry_point="plugin=deployment&action=list", name="aqua")
     def list(self, **kwargs) -> List["AquaDeployment"]:
         """List Aqua model deployments in a given compartment and under certain project.
@@ -672,23 +665,10 @@ class AquaDeploymentApp(AquaApp):
         restricted_params = []
         if params:
             model = DataScienceModel.from_id(model_id)
-            try:
-                container_type_key = model.custom_metadata_list.get(
-                    AQUA_DEPLOYMENT_CONTAINER_METADATA_NAME
-                ).value
-            except ValueError as err:
-                message = (
-                    f"{AQUA_DEPLOYMENT_CONTAINER_METADATA_NAME} key is not available in the custom metadata field "
-                    f"for model {model_id}."
-                )
-                logger.debug(message)
-
-                if not container_family:
-                    raise AquaValueError(
-                        f"{message}. For unverified Aqua models, container_family parameter should be "
-                        f"set and value can be one of {', '.join(InferenceContainerTypeFamily.values())}."
-                    ) from err
-                container_type_key = container_family
+            container_type_key = self._get_container_type_key(
+                model=model,
+                container_family=container_family
+            )
 
             container_config = get_container_config()
             container_spec = container_config.get(ContainerSpec.CONTAINER_SPEC, {}).get(

ads/aqua/ui.py

@@ -84,9 +84,6 @@ class AquaContainerConfigSpec(DataClassSerializable):
     health_check_port: str = None
     env_vars: List[dict] = None
     restricted_params: List[str] = None
-    evaluation_configuration: AquaContainerEvaluationConfig = field(
-        default_factory=AquaContainerEvaluationConfig
-    )
 
 
 @dataclass(repr=False)
@@ -184,32 +181,37 @@ class AquaContainerConfig(DataClassSerializable):
                         family=container_type,
                         platforms=platforms,
                         model_formats=model_formats,
-                        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, []
-                            ),
-                            evaluation_configuration=AquaContainerEvaluationConfig.from_config(
-                                container_spec.get(
-                                    ContainerSpec.EVALUATION_CONFIGURATION, {}
-                                )
-                            ),
-                        )
-                        if container_spec
-                        else None,
+                        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") == "inference":
                         inference_items[container_type] = container_item
-                    elif container_type == "odsc-llm-fine-tuning":
+                    elif (
+                        container.get("type") == "fine-tune"
+                        or container_type == "odsc-llm-fine-tuning"
+                    ):
                         finetune_items[container_type] = container_item
-                    elif container_type == "odsc-llm-evaluate":
+                    elif (
+                        container.get("type") == "evaluate"
+                        or container_type == "odsc-llm-evaluate"
+                    ):
                         evaluate_items[container_type] = container_item
 
         return AquaContainerConfig(

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 @@ import sys
 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 Guardrail(BaseTool):
     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
 
 

ads/llm/langchain/plugins/chat_models/__init__.py

@@ -0,0 +1,5 @@
+#!/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/