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

ads/llm/requirements.txt

@@ -1,3 +1,3 @@
-langchain>=0.0.295
-pydantic>=1.10.13,<3
+langchain>=0.3
+pydantic>=2,<3
 typing-extensions>=4.2.0

ads/llm/serialize.py

@@ -12,7 +12,6 @@ from typing import Any, Dict, List, Optional
 import fsspec
 import yaml
 from langchain import llms
-from langchain.chains import RetrievalQA
 from langchain.chains.loading import load_chain_from_config
 from langchain.llms import loading
 from langchain.load.load import Reviver
@@ -21,7 +20,7 @@ from langchain.schema.runnable import RunnableParallel
 
 from ads.common.auth import default_signer
 from ads.common.object_storage_details import ObjectStorageDetails
-from ads.llm import GenerativeAI, ModelDeploymentTGI, ModelDeploymentVLLM
+from ads.llm import OCIModelDeploymentVLLM, OCIModelDeploymentTGI
 from ads.llm.chain import GuardrailSequence
 from ads.llm.guardrails.base import CustomGuardrailBase
 from ads.llm.serializers.runnable_parallel import RunnableParallelSerializer
@@ -29,9 +28,8 @@ from ads.llm.serializers.retrieval_qa import RetrievalQASerializer
 
 # This is a temp solution for supporting custom LLM in legacy load_chain
 __lc_llm_dict = llms.get_type_to_cls_dict()
-__lc_llm_dict[GenerativeAI.__name__] = lambda: GenerativeAI
-__lc_llm_dict[ModelDeploymentTGI.__name__] = lambda: ModelDeploymentTGI
-__lc_llm_dict[ModelDeploymentVLLM.__name__] = lambda: ModelDeploymentVLLM
+__lc_llm_dict[OCIModelDeploymentTGI.__name__] = lambda: OCIModelDeploymentTGI
+__lc_llm_dict[OCIModelDeploymentVLLM.__name__] = lambda: OCIModelDeploymentVLLM
 
 
 def __new_type_to_cls_dict():
@@ -47,7 +45,6 @@ custom_serialization = {
     GuardrailSequence: GuardrailSequence.save,
     CustomGuardrailBase: CustomGuardrailBase.save,
     RunnableParallel: RunnableParallelSerializer.save,
-    RetrievalQA: RetrievalQASerializer.save,
 }
 
 # Mapping _type to custom deserialization functions

ads/llm/templates/tool_chat_template_hermes.jinja

@@ -0,0 +1,130 @@
+{%- macro json_to_python_type(json_spec) %}
+    {%- set basic_type_map = {
+    "string": "str",
+    "number": "float",
+    "integer": "int",
+    "boolean": "bool"
+} %}
+
+    {%- if basic_type_map[json_spec.type] is defined %}
+        {{- basic_type_map[json_spec.type] }}
+    {%- elif json_spec.type == "array" %}
+        {{- "list[" +  json_to_python_type(json_spec|items) + "]" }}
+    {%- elif json_spec.type == "object" %}
+        {%- if json_spec.additionalProperties is defined %}
+            {{- "dict[str, " + json_to_python_type(json_spec.additionalProperties) + ']' }}
+        {%- else %}
+            {{- "dict" }}
+        {%- endif %}
+    {%- elif json_spec.type is iterable %}
+        {{- "Union[" }}
+        {%- for t in json_spec.type %}
+            {{- json_to_python_type({"type": t}) }}
+            {%- if not loop.last %}
+                {{- "," }}
+            {%- endif %}
+        {%- endfor %}
+        {{- "]" }}
+    {%- else %}
+        {{- "Any" }}
+    {%- endif %}
+{%- endmacro %}
+
+
+{{- bos_token }}
+{{- "<|im_start|>system\nYou are a function calling AI model. You are provided with function signatures within <tools></tools> XML tags. You may call one or more functions to assist with the user query. Don't make assumptions about what values to plug into functions. Here are the available tools: <tools> " }}
+{%- if tools is iterable and tools | length > 0 %}
+    {%- for tool in tools %}
+        {%- if tool.function is defined %}
+            {%- set tool = tool.function %}
+        {%- endif %}
+        {{- '{"type": "function", "function": ' }}
+        {{- '{"name": "' + tool.name + '", ' }}
+        {{- '"description": "' + tool.name + '(' }}
+        {%- for param_name, param_fields in tool.parameters.properties|items %}
+            {{- param_name + ": " + json_to_python_type(param_fields) }}
+            {%- if not loop.last %}
+                {{- ", " }}
+            {%- endif %}
+        {%- endfor %}
+        {{- ")" }}
+        {%- if tool.return is defined %}
+            {{- " -> " + json_to_python_type(tool.return) }}
+        {%- endif %}
+        {{- " - " + tool.description + "\n\n" }}
+        {%- for param_name, param_fields in tool.parameters.properties|items %}
+            {%- if loop.first %}
+                {{- "    Args:\n" }}
+            {%- endif %}
+            {{- "        " + param_name + "(" + json_to_python_type(param_fields) + "): " + param_fields.description|trim }}
+        {%- endfor %}
+        {%- if tool.return is defined and tool.return.description is defined %}
+            {{- "\n    Returns:\n        " + tool.return.description }}
+        {%- endif %}
+        {{- '"' }}
+        {{- ', "parameters": ' }}
+        {%- if tool.parameters.properties | length == 0 %}
+            {{- "{}" }}
+        {%- else %}
+            {{- tool.parameters|tojson }}
+        {%- endif %}
+        {{- "}" }}
+        {%- if not loop.last %}
+            {{- "\n" }}
+        {%- endif %}
+    {%- endfor %}
+{%- endif %}
+{{- " </tools>" }}
+{{- 'Use the following pydantic model json schema for each tool call you will make: {"properties": {"name": {"title": "Name", "type": "string"}, "arguments": {"title": "Arguments", "type": "object"}}, "required": ["name", "arguments"], "title": "FunctionCall", "type": "object"}}
+' }}
+{{- "For each function call return a json object with function name and arguments within <tool_call></tool_call> XML tags as follows:
+" }}
+{{- "<tool_call>
+" }}
+{{- '{"name": <function-name>, "arguments": <args-dict>}
+' }}
+{{- '</tool_call><|im_end|>' }}
+{%- for message in messages %}
+    {%- if message.role == "user" or message.role == "system" or (message.role == "assistant" and message.tool_calls is not defined) %}
+        {{- '<|im_start|>' + message.role + '\n' + message.content + '<|im_end|>' + '\n' }}
+    {%- elif message.role == "assistant" and message.tool_calls is defined %}
+        {{- '<|im_start|>' + message.role }}
+        {%- for tool_call in message.tool_calls %}
+            {{- '\n<tool_call>\n' }}
+            {%- if tool_call.function is defined %}
+                {%- set tool_call = tool_call.function %}
+            {%- endif %}
+            {{- '{' }}
+            {{- '"name": "' }}
+            {{- tool_call.name }}
+            {{- '"' }}
+            {%- if tool_call.arguments is defined %}
+                {{- ', ' }}
+                {{- '"arguments": ' }}
+                {{- tool_call.arguments|tojson }}
+            {%- endif %}
+            {{- '}' }}
+            {{- '\n</tool_call>' }}
+        {%- endfor %}
+        {{- '<|im_end|>\n' }}
+    {%- elif message.role == "tool" %}
+        {%- if loop.previtem and loop.previtem.role != "tool" %}
+            {{- '<|im_start|>tool\n' }}
+        {%- endif %}
+        {{- '<tool_response>\n' }}
+        {{- message.content }}
+        {%- if not loop.last %}
+            {{- '\n</tool_response>\n' }}
+        {%- else %}
+            {{- '\n</tool_response>' }}
+        {%- endif %}
+        {%- if not loop.last and loop.nextitem.role != "tool" %}
+            {{- '<|im_end|>' }}
+        {%- elif loop.last %}
+            {{- '<|im_end|>' }}
+        {%- endif %}
+    {%- endif %}
+{%- endfor %}
+{%- if add_generation_prompt %}
+    {{- '<|im_start|>assistant\n' }}
+{%- endif %}

ads/llm/templates/tool_chat_template_mistral_parallel.jinja

@@ -0,0 +1,94 @@
+{%- if messages[0]["role"] == "system" %}
+    {%- set system_message = messages[0]["content"] %}
+    {%- set loop_messages = messages[1:] %}
+{%- else %}
+    {%- set loop_messages = messages %}
+{%- endif %}
+{%- if not tools is defined %}
+    {%- set tools = none %}
+{%- endif %}
+{%- if tools is defined %}
+    {%- set parallel_tool_prompt = "You are a helpful assistant that can call tools. If you call one or more tools, format them in a single JSON array or objects, where each object is a tool call, not as separate objects outside of an array or multiple arrays. Use the format [{\"name\": tool call name, \"arguments\": tool call arguments}, additional tool calls] if you call more than one tool. If you call tools, do not attempt to interpret them or otherwise provide a response until you receive a tool call result that you can interpret for the user." %}
+    {%- if system_message is defined %}
+        {%- set system_message = parallel_tool_prompt + "\n\n" + system_message %}
+    {%- else %}
+        {%- set system_message = parallel_tool_prompt %}
+    {%- endif %}
+{%- endif %}
+{%- set user_messages = loop_messages | selectattr("role", "equalto", "user") | list %}
+
+{%- for message in loop_messages | rejectattr("role", "equalto", "tool") | rejectattr("role", "equalto", "tool_results") | selectattr("tool_calls", "undefined") %}
+    {%- if (message["role"] == "user") != (loop.index0 % 2 == 0) %}
+        {{- raise_exception("After the optional system message, conversation roles must alternate user/assistant/user/assistant/...") }}
+    {%- endif %}
+{%- endfor %}
+
+{{- bos_token }}
+{%- for message in loop_messages %}
+    {%- if message["role"] == "user" %}
+        {%- if tools is not none and (message == user_messages[-1]) %}
+            {{- "[AVAILABLE_TOOLS] [" }}
+            {%- for tool in tools %}
+                {%- set tool = tool.function %}
+                {{- '{"type": "function", "function": {' }}
+                {%- for key, val in tool.items() if key != "return" %}
+                    {%- if val is string %}
+                        {{- '"' + key + '": "' + val + '"' }}
+                    {%- else %}
+                        {{- '"' + key + '": ' + val|tojson }}
+                    {%- endif %}
+                    {%- if not loop.last %}
+                        {{- ", " }}
+                    {%- endif %}
+                {%- endfor %}
+                {{- "}}" }}
+                {%- if not loop.last %}
+                    {{- ", " }}
+                {%- else %}
+                    {{- "]" }}
+                {%- endif %}
+            {%- endfor %}
+            {{- "[/AVAILABLE_TOOLS]" }}
+        {%- endif %}
+        {%- if loop.last and system_message is defined %}
+            {{- "[INST] " + system_message + "\n\n" + message["content"] + "[/INST]" }}
+        {%- else %}
+            {{- "[INST] " + message["content"] + "[/INST]" }}
+        {%- endif %}
+    {%- elif message["role"] == "tool_calls" or message.tool_calls is defined %}
+        {%- if message.tool_calls is defined %}
+            {%- set tool_calls = message.tool_calls %}
+        {%- else %}
+            {%- set tool_calls = message.content %}
+        {%- endif %}
+        {{- "[TOOL_CALLS] [" }}
+        {%- for tool_call in tool_calls %}
+            {%- set out = tool_call.function|tojson %}
+            {{- out[:-1] }}
+            {%- if not tool_call.id is defined or tool_call.id|length < 9 %}
+                {{- raise_exception("Tool call IDs should be alphanumeric strings with length >= 9! (1)" + tool_call.id) }}
+            {%- endif %}
+            {{- ', "id": "' + tool_call.id[-9:] + '"}' }}
+            {%- if not loop.last %}
+                {{- ", " }}
+            {%- else %}
+                {{- "]" + eos_token }}
+            {%- endif %}
+        {%- endfor %}
+    {%- elif message["role"] == "assistant" %}
+        {{- " " + message["content"] + eos_token }}
+    {%- elif message["role"] == "tool_results" or message["role"] == "tool" %}
+        {%- if message.content is defined and message.content.content is defined %}
+            {%- set content = message.content.content %}
+        {%- else %}
+            {%- set content = message.content %}
+        {%- endif %}
+        {{- '[TOOL_RESULTS] {"content": ' + content|string + ", " }}
+        {%- if not message.tool_call_id is defined or message.tool_call_id|length < 9 %}
+            {{- raise_exception("Tool call IDs should be alphanumeric strings with length >= 9! (2)" + message.tool_call_id) }}
+        {%- endif %}
+        {{- '"call_id": "' + message.tool_call_id[-9:] + '"}[/TOOL_RESULTS]' }}
+    {%- else %}
+        {{- raise_exception("Only user and assistant roles are supported, with the exception of an initial optional system message!") }}
+    {%- endif %}
+{%- endfor %}

{oracle_ads-2.11.18.dist-info → oracle_ads-2.12.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oracle_ads
-Version: 2.11.18
+Version: 2.12.0
 Summary: Oracle Accelerated Data Science SDK
 Keywords: Oracle Cloud Infrastructure,OCI,Machine Learning,ML,Artificial Intelligence,AI,Data Science,Cloud,Oracle
 Author: Oracle Data Science
@@ -33,6 +33,7 @@ Requires-Dist: requests
 Requires-Dist: scikit-learn>=1.0
 Requires-Dist: tabulate>=0.8.9
 Requires-Dist: tqdm>=4.59.0
+Requires-Dist: pydantic>=2.6.3
 Requires-Dist: oracle_ads[opctl] ; extra == "anomaly"
 Requires-Dist: autots ; extra == "anomaly"
 Requires-Dist: oracledb ; extra == "anomaly"
@@ -81,8 +82,10 @@ Requires-Dist: fiona<=1.9.6 ; extra == "geo"
 Requires-Dist: oracle_ads[viz] ; extra == "geo"
 Requires-Dist: transformers ; extra == "huggingface"
 Requires-Dist: tf-keras ; extra == "huggingface"
-Requires-Dist: langchain-community<0.0.32 ; extra == "llm"
-Requires-Dist: langchain>=0.1.10,<0.1.14 ; extra == "llm"
+Requires-Dist: langchain>=0.2 ; extra == "llm"
+Requires-Dist: langchain-community ; extra == "llm"
+Requires-Dist: langchain_openai ; extra == "llm"
+Requires-Dist: pydantic>=2,<3 ; extra == "llm"
 Requires-Dist: evaluate>=0.4.0 ; extra == "llm"
 Requires-Dist: ipython>=7.23.1, <8.0 ; extra == "notebook"
 Requires-Dist: ipywidgets~=7.6.3 ; extra == "notebook"
@@ -144,7 +147,7 @@ Requires-Dist: statsmodels>=0.14.1 ; extra == "testsuite" and ( python_version>=
 Requires-Dist: tables ; extra == "testsuite"
 Requires-Dist: tables>3.9.0 ; extra == "testsuite" and ( python_version>='3.9')
 Requires-Dist: xlrd>=1.2.0 ; extra == "testsuite"
-Requires-Dist: spacy>=3.4.2 ; extra == "text"
+Requires-Dist: spacy>=3.4.2,<3.8 ; extra == "text"
 Requires-Dist: wordcloud>=1.8.1 ; extra == "text"
 Requires-Dist: oracle_ads[viz] ; extra == "torch"
 Requires-Dist: torch ; extra == "torch"

{oracle_ads-2.11.18.dist-info → oracle_ads-2.12.0.dist-info}/RECORD

@@ -4,43 +4,49 @@ ads/config.py,sha256=t_zDKftVYOLPP-t8IcnzEbtmMRX-6a8QKY9E_SnqA8M,8163
 ads/aqua/__init__.py,sha256=IUKZAsxUGVicsyeSwsGwK6rAUJ1vIUW9ywduA3U22xc,1015
 ads/aqua/app.py,sha256=BQuQ9RERU0rKmn3N3xicKzYaXOd7xBwX1aVuVLNgw98,11993
 ads/aqua/cli.py,sha256=W-0kswzRDEilqHyw5GSMOrARgvOyPRtkEtpy54ew0Jo,3907
-ads/aqua/constants.py,sha256=4CqHFsxyCYfEUlYbzRVFnR0I5tw18iKlCDXHJUXeJxU,2869
+ads/aqua/constants.py,sha256=M2bbrIlq9z-DTq8stsv1OHNfLAxwhTA3X-cdtQ8uGcc,2868
 ads/aqua/data.py,sha256=7T7kdHGnEH6FXL_7jv_Da0CjEWXfjQZTFkaZWQikis4,932
-ads/aqua/ui.py,sha256=vLQSBcrQ-7zyPJIlpGEHYaz2sf_90lsadOxq6v80tjg,25227
+ads/aqua/ui.py,sha256=2hH9YmyJfDd70qV2EQyx0HFuPY5KSMH-WyCKRBt3qGU,25211
 ads/aqua/common/__init__.py,sha256=rZrmh1nho40OCeabXCNWtze-mXi-PGKetcZdxZSn3_0,204
 ads/aqua/common/decorator.py,sha256=XFS7tYGkN4dVzmB1wTYiJk1XqJ-VLhvzfZjExiQClgc,3640
 ads/aqua/common/entities.py,sha256=UsP8CczuifLOLr_gAhulh8VmgGSFir3rli1MMQ-CZhk,537
 ads/aqua/common/enums.py,sha256=hJABLhORCnAkZ6OxsjxhhkmZQQcMzfBzOQkAZLgxNXs,2603
 ads/aqua/common/errors.py,sha256=Ev2xbaqkDqeCYDx4ZgOKOoM0sXsOXP3GIV6N1lhIUxM,3085
-ads/aqua/common/utils.py,sha256=qAwIBdTQ5abd0b2Q68nzUJ0FuijGniYS3NcoMoB_lAI,34370
-ads/aqua/config/config.py,sha256=tOGyuXlBRw4b4HkJgc1T3y1umqu_ME_-ImXX3pt_aB0,782
+ads/aqua/common/utils.py,sha256=MM-RZVpGNXm9KHmju1UZl7UjnbvQZjUzykcTISGsF4Y,34919
+ads/aqua/config/__init__.py,sha256=2a_1LI4jWtJpbic5_v4EoOUTXCAH7cmsy9BW5prDHjU,179
+ads/aqua/config/config.py,sha256=YIbd_9yP5kZd3G2q4q0TM6hzMdJSQ8BHPRAFE_5Xk3s,1548
 ads/aqua/config/deployment_config_defaults.json,sha256=1fzb8EZOcFMjwktes40qgetKvdmUtEGCl4Jp4eb8tJg,665
 ads/aqua/config/resource_limit_names.json,sha256=0ecGLCLxll9qt3E7fVZPtzpurqe1PGdTk0Rjn_cWh8k,235
+ads/aqua/config/evaluation/__init__.py,sha256=2a_1LI4jWtJpbic5_v4EoOUTXCAH7cmsy9BW5prDHjU,179
+ads/aqua/config/evaluation/evaluation_service_config.py,sha256=JAaK_2dSVyoGv22PkjGgzMbt9WLBaZAOlk02yY3590k,8735
+ads/aqua/config/evaluation/evaluation_service_model_config.py,sha256=ITs_RBCynWuygjNdcUD7e2BLbPyPP3UozryEWlnju9s,280
+ads/aqua/config/utils/__init__.py,sha256=2a_1LI4jWtJpbic5_v4EoOUTXCAH7cmsy9BW5prDHjU,179
+ads/aqua/config/utils/serializer.py,sha256=RTyeFw2fDxmcTsERRd8AJDuyOuRQckL9dDLk8HFdxxc,11347
 ads/aqua/dummy_data/icon.txt,sha256=wlB79r3A4mUBbrK5yVVXrNEEKpvfZiwBx2sKlj7wzA4,6326
 ads/aqua/dummy_data/oci_model_deployments.json,sha256=xSBj6CEbFHHk9Ytgfu-lOgqWOss2DgSaK6tk2vgziEI,1939
 ads/aqua/dummy_data/oci_models.json,sha256=mxUU8o3plmAFfr06fQmIQuiGe2qFFBlUB7QNPUNB1cE,36997
 ads/aqua/dummy_data/readme.md,sha256=AlBPt0HBSOFA5HbYVsFsdTm-BC3R5NRpcKrTxdjEnlI,1256
 ads/aqua/evaluation/__init__.py,sha256=Fd7WL7MpQ1FtJjlftMY2KHli5cz1wr5MDu3hGmV89a0,298
 ads/aqua/evaluation/constants.py,sha256=GvcXvPIw-VDKw4a8WNKs36uWdT-f7VJrWSpnnRnthGg,1533
-ads/aqua/evaluation/entities.py,sha256=h6aEskUgJcR_360kNxMU13qLEg_9MrZQQ73dJJZ8IAY,5675
+ads/aqua/evaluation/entities.py,sha256=mlu_ohjNPxxyDh4s_dFFxXJqKrwutAn48Wqr_odcT2M,5713
 ads/aqua/evaluation/errors.py,sha256=qzR63YEIA8haCh4HcBHFFm7j4g6jWDfGszqrPkXx9zQ,4564
-ads/aqua/evaluation/evaluation.py,sha256=lc6CpOZ-f9lZfGG32gA4Ut0oJnxGGzRRYkuM0viW7wA,60919
+ads/aqua/evaluation/evaluation.py,sha256=LoEBUHwJwMa-seLa8d4qzPRMic_4AjeYcxMbftkoXa0,59885
 ads/aqua/extension/__init__.py,sha256=mRArjU6UZpZYVr0qHSSkPteA_CKcCZIczOFaK421m9o,1453
 ads/aqua/extension/aqua_ws_msg_handler.py,sha256=PcRhBqGpq5aOPP0ibhaKfmkA8ajimldsvJC32o9JeTw,3291
 ads/aqua/extension/base_handler.py,sha256=MuVxsJG66NdatL-Hh99UD3VQOQw1ir-q2YBajwh9cJk,5132
-ads/aqua/extension/common_handler.py,sha256=nU_1lgFhXHHMX7DPgm1yOVx-wWggCMWEF1l4Qoi6BJw,4250
-ads/aqua/extension/common_ws_msg_handler.py,sha256=bNtuCpCD5ZIULYqs1ANsYgYnu81f9nZGb2NeTR5gCmw,2280
+ads/aqua/extension/common_handler.py,sha256=Oz3riHDy5pFfbArLge5iaaRoK8PEAnkBvhqqVGbUsvE,4196
+ads/aqua/extension/common_ws_msg_handler.py,sha256=pMX79tmJKTKog684o6vuwZkAD47l8SxtRx5TNn8se7k,2230
 ads/aqua/extension/deployment_handler.py,sha256=8MafpUaN-1gqyIksJ9EO55mbdGV57IWf1GmJ-zs9h8c,9475
 ads/aqua/extension/deployment_ws_msg_handler.py,sha256=JX3ZHRtscrflSxT7ZTEEI_p_owtk3m5FZq3QXE96AGY,2013
 ads/aqua/extension/errors.py,sha256=i37EnRzxGgvxzUNoyEORzHYmB296DGOUb6pm7VwEyTU,451
-ads/aqua/extension/evaluation_handler.py,sha256=Q8l_Mnzp1NOx6N9vXpUWN2kGKdICSRR7dPvm-dNqJBE,4464
+ads/aqua/extension/evaluation_handler.py,sha256=RT2W7WDtxNIT0uirLfTcDlmTPYCuMuWRhiDxYZYliZs,4542
 ads/aqua/extension/evaluation_ws_msg_handler.py,sha256=dv0iwOSTxYj1kQ1rPEoDmGgFBzLUCLXq5h7rpmY2T1M,2098
 ads/aqua/extension/finetune_handler.py,sha256=ZCdXoEYzfViZfJsk0solCB6HQkg0skG1jFfqq1zF-vw,3312
-ads/aqua/extension/model_handler.py,sha256=j5YzZ6hkLaTPbUZd1ax8ts1kF1NTvK3glTBM29gZr-o,8428
+ads/aqua/extension/model_handler.py,sha256=usiyLPaJJLAjtDhyFCNseaT3AQelZkBkLwoCno4Uo1o,9079
 ads/aqua/extension/models_ws_msg_handler.py,sha256=3CPfzWl1xfrE2Dpn_WYP9zY0kY5zlsAE8tU_6Y2-i18,1801
 ads/aqua/extension/ui_handler.py,sha256=IYhtyL4oE8zlxe-kfbvWSmFsayyXaZZZButDdxM3hcA,9850
 ads/aqua/extension/ui_websocket_handler.py,sha256=oLFjaDrqkSERbhExdvxjLJX0oRcP-DVJ_aWn0qy0uvo,5084
-ads/aqua/extension/utils.py,sha256=3pUTKoy-mXuLl7cGF0gFID32_RCCADCb5UlaMs0QWqs,840
+ads/aqua/extension/utils.py,sha256=UKafTX6tN6ObOkWCLy6c3y_cNmUHfD64PtIaR5B7Sl0,1476
 ads/aqua/extension/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ads/aqua/extension/models/ws_models.py,sha256=-m6IJRS-4I6AMLDwgu19XdrvHyOStuBx9t4B0LgS07g,3348
 ads/aqua/finetuning/__init__.py,sha256=vwYT5PluMR0mDQwVIavn_8Icms7LmvfV_FOrJ8fJx8I,296
@@ -54,7 +60,7 @@ ads/aqua/model/enums.py,sha256=t8GbK2nblIPm3gClR8W31RmbtTuqpoSzoN4W3JfD6AI,1004
 ads/aqua/model/model.py,sha256=gMoELf_HjuUYYcW05XfNRghXk3IhBP0PPaQDgP_-QUA,54277
 ads/aqua/modeldeployment/__init__.py,sha256=RJCfU1yazv3hVWi5rS08QVLTpTwZLnlC8wU8diwFjnM,391
 ads/aqua/modeldeployment/constants.py,sha256=lJF77zwxmlECljDYjwFAMprAUR_zctZHmawiP-4alLg,296
-ads/aqua/modeldeployment/deployment.py,sha256=srpf-U9Nm7_RUT_jvVPUxbRFFpfC9RjogMHI-vFsJ4E,29020
+ads/aqua/modeldeployment/deployment.py,sha256=zrzC0i4H25M50dqrYF88ZyHUj3N6WjxQdcRLHLDgyA4,27976
 ads/aqua/modeldeployment/entities.py,sha256=QgiLxdWfoNg-u4P7DqauZh9oQQ-WjSs37s8WR84m164,4744
 ads/aqua/modeldeployment/inference.py,sha256=JPqzbHJoM-PpIU_Ft9lHudO9_1vFr7OPQ2GHjPoAufU,2142
 ads/aqua/training/__init__.py,sha256=w2DNWltXtASQgbrHyvKo0gMs5_chZoG-CSDMI4qe7i0,202
@@ -440,25 +446,27 @@ ads/jobs/templates/driver_pytorch.py,sha256=lZMokjQqcYVqTfXzhQYjc1Z-kXhmYgxZe3pg
 ads/jobs/templates/driver_utils.py,sha256=tFQOwdspi6eXNftFt1ZLtFChc3HQ37rdf3cQ4kf3ayg,22097
 ads/jobs/templates/hostname_from_env.c,sha256=SeEoIQnuCiP9fiYWJ5MokWBUi1u0mcSo-nTXbXyZp7w,2309
 ads/jobs/templates/oci_metrics.py,sha256=3l4h17W_dheSK34thp95pMvG0iqBufoXck3I8_4zX6I,5859
-ads/llm/__init__.py,sha256=ku_cx5jqTcYQzEWU6lMisuK1PFJU9Jva6Ncq8VpnrBI,714
+ads/llm/__init__.py,sha256=t5yoDsD5huaEp38qdI5iTtkfXmJQ-5XDSrvcHM_XnHU,830
 ads/llm/chain.py,sha256=KuQcZGQsrlcl3CjtLk8KOHtSu0XJvFRL_Wv0Gz2RdF4,9526
+ads/llm/chat_template.py,sha256=t2QRfLLR_c_cq3JqABghWqiCSWjjuVc_mfEN-yVYG10,934
 ads/llm/deploy.py,sha256=VYm_8ML8iXL_y-G8LqSm1VsQQTSFq7rA95VCdhLz1A0,1985
-ads/llm/requirements.txt,sha256=ZOtrHBFR6A5LCly-nqbwGD7iWTBVHIWRPrAejN3oQl0,65
-ads/llm/serialize.py,sha256=C5Zo8NjO1iAJ4De9tuOB8bQO-5Bcp6VszSULA46LOOM,7423
+ads/llm/requirements.txt,sha256=vaVwhWCteqmo0fRsEk6M8S1LQMjULU_Bt_syBAa2G-s,55
+ads/llm/serialize.py,sha256=WjQNMPACyR8nIh1dB7BLFUmqUrumld6vt91lg1DWzWI,7281
 ads/llm/guardrails/__init__.py,sha256=sAqmLhogrLXb3xI7dPOj9HmSkpTnLh9wkzysuGd8AXk,204
-ads/llm/guardrails/base.py,sha256=3z_gSik-d859fvDGe4UGjSon_aeqE0PqZwHOCS_89J0,16491
-ads/llm/guardrails/huggingface.py,sha256=ts54JD6AUgXu7HoqYYU6NCQhwdhlWl0DSxuQ9ZRCQ3k,1314
+ads/llm/guardrails/base.py,sha256=UESjl8VgQGnDwpf8dy0PWpOJxpZKKnGHN6s46qnQUNw,16512
+ads/llm/guardrails/huggingface.py,sha256=4DFanCYb3R1SKYSFdcEyGH2ywQgf2yFDDZGJtOcoph0,1304
 ads/llm/langchain/__init__.py,sha256=sAqmLhogrLXb3xI7dPOj9HmSkpTnLh9wkzysuGd8AXk,204
 ads/llm/langchain/plugins/__init__.py,sha256=sAqmLhogrLXb3xI7dPOj9HmSkpTnLh9wkzysuGd8AXk,204
-ads/llm/langchain/plugins/base.py,sha256=fmcI7KRCzh1Y-k7FbTzS-3WyAGomanFK0ZPZcqPIkFA,4704
-ads/llm/langchain/plugins/contant.py,sha256=p1k9p7LwITygnZttNRauato1PhybUPESnIcZv3kkqLY,1008
-ads/llm/langchain/plugins/embeddings.py,sha256=nOm902vY1P1oV6v1M7o9Fh0lSc7Gg0Nj5-puOByO6xI,2046
-ads/llm/langchain/plugins/llm_gen_ai.py,sha256=HeFHUV1aqdw661VoyYdjG973m-LntU0YWozOZ9YEKi0,9975
-ads/llm/langchain/plugins/llm_md.py,sha256=YhlT1gu4BZShcdQ4sy6S9N4h9BC-FqSbvYTAVoHkgpw,9899
+ads/llm/langchain/plugins/chat_models/__init__.py,sha256=sAqmLhogrLXb3xI7dPOj9HmSkpTnLh9wkzysuGd8AXk,204
+ads/llm/langchain/plugins/chat_models/oci_data_science.py,sha256=q398lxXycKlAtPmkVqeEE-Uaqymj13HZIRaCm2B_xDU,33667
+ads/llm/langchain/plugins/llms/__init__.py,sha256=sAqmLhogrLXb3xI7dPOj9HmSkpTnLh9wkzysuGd8AXk,204
+ads/llm/langchain/plugins/llms/oci_data_science_model_deployment_endpoint.py,sha256=ng3pEoXXEaCc_qSHkXwyJmZC9dGPO-imQT4JN6jAJnc,32353
 ads/llm/serializers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ads/llm/serializers/retrieval_qa.py,sha256=VQ4rFRrDHOpAcMYNvRbT19LcDGwRrE1lczerLQYKxwU,5133
 ads/llm/serializers/runnable_parallel.py,sha256=USCVhMNi67AiCmu-s_mmOvc0sK7v4yKVwBTJm60x7wE,835
 ads/llm/templates/score_chain.jinja2,sha256=H6_riqJlFtnQk7Za4rb7wGffWVLEUxxqgXlsbMPdInY,4869
+ads/llm/templates/tool_chat_template_hermes.jinja,sha256=nQgWGwZludNFmUO7V8emgPQud828l9T4e5QmsDyLq4k,5226
+ads/llm/templates/tool_chat_template_mistral_parallel.jinja,sha256=xkZLgw50a3wPiw9I5HmDlZiEAXPg9wtwnrkhaAiI_1o,4773
 ads/model/__init__.py,sha256=r4U2NvroKMUa-tqNnXBtND9cA6b1Yefmdj6lgdoKlDk,1900
 ads/model/artifact.py,sha256=ONKyjZKO5wmAYI-GT63z8yLm_QsmIGXcob9KrnwtF5k,20503
 ads/model/artifact_downloader.py,sha256=-9IYkjZ0LaMWf5foz5HUGTZCEm67f-3LbDsigNlzEPg,9751
@@ -805,8 +813,8 @@ ads/type_discovery/unknown_detector.py,sha256=yZuYQReO7PUyoWZE7onhhtYaOg6088wf1y
 ads/type_discovery/zipcode_detector.py,sha256=3AlETg_ZF4FT0u914WXvTT3F3Z6Vf51WiIt34yQMRbw,1421
 ads/vault/__init__.py,sha256=x9tMdDAOdF5iDHk9u2di_K-ze5Nq068x25EWOBoWwqY,245
 ads/vault/vault.py,sha256=hFBkpYE-Hfmzu1L0sQwUfYcGxpWmgG18JPndRl0NOXI,8624
-oracle_ads-2.11.18.dist-info/entry_points.txt,sha256=9VFnjpQCsMORA4rVkvN8eH6D3uHjtegb9T911t8cqV0,35
-oracle_ads-2.11.18.dist-info/LICENSE.txt,sha256=zoGmbfD1IdRKx834U0IzfFFFo5KoFK71TND3K9xqYqo,1845
-oracle_ads-2.11.18.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-oracle_ads-2.11.18.dist-info/METADATA,sha256=iFxKKVAC8wzz6V79zwLCYZHHPx741I_hEsdXY4fKjpo,16037
-oracle_ads-2.11.18.dist-info/RECORD,,
+oracle_ads-2.12.0.dist-info/entry_points.txt,sha256=9VFnjpQCsMORA4rVkvN8eH6D3uHjtegb9T911t8cqV0,35
+oracle_ads-2.12.0.dist-info/LICENSE.txt,sha256=zoGmbfD1IdRKx834U0IzfFFFo5KoFK71TND3K9xqYqo,1845
+oracle_ads-2.12.0.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+oracle_ads-2.12.0.dist-info/METADATA,sha256=-Dmo877fdCzqL0LMAxE0UASxtvPRZ6S_vzvDa--vIsY,16150
+oracle_ads-2.12.0.dist-info/RECORD,,

ads/llm/langchain/plugins/base.py

@@ -1,118 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*--
-
-# Copyright (c) 2023, 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 typing import Any, Dict, List, Optional
-
-from langchain.llms.base import LLM
-from langchain.pydantic_v1 import BaseModel, Field, root_validator
-
-from ads import logger
-from ads.common.auth import default_signer
-from ads.config import COMPARTMENT_OCID
-
-
-class BaseLLM(LLM):
-    """Base OCI LLM class. Contains common attributes."""
-
-    auth: dict = Field(default_factory=default_signer, exclude=True)
-    """ADS auth dictionary for OCI authentication.
-    This can be generated by calling `ads.common.auth.api_keys()` or `ads.common.auth.resource_principal()`.
-    If this is not provided then the `ads.common.default_signer()` will be used."""
-
-    max_tokens: int = 256
-    """Denotes the number of tokens to predict per generation."""
-
-    temperature: float = 0.2
-    """A non-negative float that tunes the degree of randomness in generation."""
-
-    k: int = 0
-    """Number of most likely tokens to consider at each step."""
-
-    p: int = 0.75
-    """Total probability mass of tokens to consider at each step."""
-
-    stop: Optional[List[str]] = None
-    """Stop words to use when generating. Model output is cut off at the first occurrence of any of these substrings."""
-
-    def _print_request(self, prompt, params):
-        if self.verbose:
-            print(f"LLM API Request:\n{prompt}")
-
-    def _print_response(self, completion, response):
-        if self.verbose:
-            print(f"LLM API Completion:\n{completion}")
-
-    @classmethod
-    def get_lc_namespace(cls) -> List[str]:
-        """Get the namespace of the LangChain object."""
-        return ["ads", "llm"]
-
-    @classmethod
-    def is_lc_serializable(cls) -> bool:
-        """This class can be serialized with default LangChain serialization."""
-        return True
-
-
-class GenerativeAiClientModel(BaseModel):
-    """Base model for generative AI embedding model and LLM."""
-
-    # This auth is the same as the auth in BaseLLM class.
-    # However, this is needed for the Gen AI embedding model.
-    # Do not remove this attribute
-    auth: dict = Field(default_factory=default_signer, exclude=True)
-    """ADS auth dictionary for OCI authentication.
-    This can be generated by calling `ads.common.auth.api_keys()` or `ads.common.auth.resource_principal()`.
-    If this is not provided then the `ads.common.default_signer()` will be used."""
-
-    client: Any  #: :meta private:
-    """OCI GenerativeAiClient."""
-
-    compartment_id: str = None
-    """Compartment ID of the caller."""
-
-    endpoint_kwargs: Dict[str, Any] = {}
-    """Optional attributes passed to the OCI API call."""
-
-    client_kwargs: Dict[str, Any] = {}
-    """Holds any client parameters for creating GenerativeAiClient"""
-
-    @staticmethod
-    def _import_client():
-        try:
-            from oci.generative_ai_inference import GenerativeAiInferenceClient
-        except ImportError as ex:
-            raise ImportError(
-                "Could not import GenerativeAiInferenceClient from oci. "
-                "The OCI SDK installed does not support generative AI service."
-            ) from ex
-        return GenerativeAiInferenceClient
-
-    @root_validator()
-    def validate_environment(  # pylint: disable=no-self-argument
-        cls, values: Dict
-    ) -> Dict:
-        """Validate that python package exists in environment."""
-        # Initialize client only if user does not pass in client.
-        # Users may choose to initialize the OCI client by themselves and pass it into this model.
-        logger.warning(
-            f"The ads langchain plugin {cls.__name__} will be deprecated soon. "
-            "Please refer to https://python.langchain.com/v0.2/docs/integrations/providers/oci/ "
-            "for the latest support."
-        )
-        if not values.get("client"):
-            auth = values.get("auth", {})
-            client_kwargs = auth.get("client_kwargs") or {}
-            client_kwargs.update(values["client_kwargs"])
-            # Import the GenerativeAIClient here so that there will be no error when user import ads.llm
-            # and the install OCI SDK does not support generative AI service yet.
-            client_class = cls._import_client()
-            values["client"] = client_class(**auth, **client_kwargs)
-        # Set default compartment ID
-        if not values.get("compartment_id"):
-            if COMPARTMENT_OCID:
-                values["compartment_id"] = COMPARTMENT_OCID
-            else:
-                raise ValueError("Please specify compartment_id.")
-        return values

ads/llm/langchain/plugins/contant.py

@@ -1,44 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*--
-
-# Copyright (c) 2023, 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 enum import Enum
-
-
-class StrEnum(str, Enum):
-    """Enum with string members
-    https://docs.python.org/3.11/library/enum.html#enum.StrEnum
-    """
-
-    # Pydantic uses Python's standard enum classes to define choices.
-    # https://docs.pydantic.dev/latest/api/standard_library_types/#enum
-
-
-DEFAULT_TIME_OUT = 300
-DEFAULT_CONTENT_TYPE_JSON = "application/json"
-
-
-class Task(StrEnum):
-    TEXT_GENERATION = "text_generation"
-    TEXT_SUMMARIZATION = "text_summarization"
-
-
-class LengthParam(StrEnum):
-    SHORT = "SHORT"
-    MEDIUM = "MEDIUM"
-    LONG = "LONG"
-    AUTO = "AUTO"
-
-
-class FormatParam(StrEnum):
-    PARAGRAPH = "PARAGRAPH"
-    BULLETS = "BULLETS"
-    AUTO = "AUTO"
-
-
-class ExtractivenessParam(StrEnum):
-    LOW = "LOW"
-    MEDIUM = "MEDIUM"
-    HIGH = "HIGH"
-    AUTO = "AUTO"