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

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/