Merge pull request from add_ads_dependency to main

Author: lu-ohai

THIRD_PARTY_LICENSES.txt

@@ -5,7 +5,6 @@ Oracle Infrastructure Cloud LangChain Plugin for Python Third Party License File
 - MIT License
 - The Universal Permissive License (UPL), Version 1.0
 - Apache License Version 2.0, January 2004
-- BSD License (Copyright (c) 2005-2024, NumPy Developers.)
 
 ======================== Third Party Components ========================
 langchain-core
@@ -14,18 +13,24 @@ langchain-core
 * Source code: https://github.com/langchain-ai/langchain/tree/master/libs/core
 * Project home: https://python.langchain.com/docs/introduction/
 
+langchain-openai
+* Copyright (c) LangChain, Inc.
+* License: MIT License (MIT)
+* Source code: https://github.com/langchain-ai/langchain
+* Project home: https://python.langchain.com/docs/introduction/
+
 oci
 * Copyright (c) 2016, 2022, Oracle and/or its affiliates.  All rights reserved.
 * License: The Universal Permissive License (UPL), Version 1.0
            Apache License Version 2.0, January 2004
 * Source code: https://github.com/oracle/oci-python-sdk
 * Project home: https://docs.oracle.com/en-us/iaas/tools/python/2.148.0/index.html
 
-numpy
-* Copyright (c) 2005-2025, NumPy Developers. All rights reserved.
-* License: BSD License (Copyright (c) 2005-2024, NumPy Developers.)
-* Source code: https://github.com/numpy/numpy
-* Project home: https://numpy.org/
+oracle-ads
+* Copyright (c) 2025, Oracle and/or its affiliates.  All rights reserved.
+* License: The Universal Permissive License (UPL), Version 1.0
+* Source code: https://github.com/oracle/accelerated-data-science
+* Project home: https://accelerated-data-science.readthedocs.io/en/latest/
 
 pydantic
 * Copyright (c) 2017 to present Pydantic Services Inc. and individual contributors.
@@ -58,7 +63,30 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
+--------------------- langchain-openai ----------------------
+MIT License
+
+Copyright (c) LangChain, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 
+--------------------- oci ----------------------
 The Universal Permissive License (UPL), Version 1.0
 
 Subject to the condition set forth below, permission is hereby granted to any person obtaining a copy of this software, associated documentation and/or data (collectively the "Software"), free of charge and under any and all copyright rights in the Software, and any and all patent rights owned or freely licensable by each licensor hereunder covering either (i) the unmodified Software as contributed to or provided by such licensor, or (ii) the Larger Works (as defined below), to deal in both
@@ -75,8 +103,6 @@ The above copyright notice and either this complete permission notice or at a mi
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ____________________________
 
---------------------- oci ----------------------
-
 The Apache Software License, Version 2.0
 Copyright (c) 2016, 2018, Oracle and/or its affiliates.  All rights reserved.
 
@@ -140,38 +166,43 @@ END OF TERMS AND CONDITIONS
    See the License for the specific language governing permissions and
    limitations under the License.
 
---------------------- NumPy ----------------------
-
-   Copyright (c) 2005-2025, NumPy Developers.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above
-       copyright notice, this list of conditions and the following
-       disclaimer in the documentation and/or other materials provided
-       with the distribution.
-
-    * Neither the name of the NumPy Developers nor the names of any
-       contributors may be used to endorse or promote products derived
-       from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+--------------------- oracle-ads ----------------------
+
+Copyright (c) 2025 Oracle and/or its affiliates.
+
+The Universal Permissive License (UPL), Version 1.0
+
+Subject to the condition set forth below, permission is hereby granted to any
+person obtaining a copy of this software, associated documentation and/or data
+(collectively the "Software"), free of charge and under any and all copyright
+rights in the Software, and any and all patent rights owned or freely
+licensable by each licensor hereunder covering either (i) the unmodified
+Software as contributed to or provided by such licensor, or (ii) the Larger
+Works (as defined below), to deal in both
+
+(a) the Software, and
+(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+one is included with the Software (each a "Larger Work" to which the Software
+is contributed by such licensors),
+
+without restriction, including without limitation the rights to copy, create
+derivative works of, display, perform, and distribute the Software and make,
+use, sell, offer for sale, import, export, have made, and have sold the
+Software and the Larger Work(s), and to sublicense the foregoing rights on
+either these or other terms.
+
+This license is subject to the following condition:
+The above copyright notice and either this complete permission notice or at
+a minimum a reference to the UPL must be included in all copies or
+substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 
 --------------------- pydantic ----------------------
 

libs/oci/README.md

@@ -11,6 +11,8 @@ All integrations in this package assume that you have the credentials setup to c
 
 ## Chat Models
 
+### OCI Generative AI
+
 `ChatOCIGenAI` class exposes chat models from OCI Generative AI.
 
 ```python
@@ -20,8 +22,48 @@ llm = ChatOCIGenAI()
 llm.invoke("Sing a ballad of LangChain.")
 ```
 
+### OCI Data Science
+
+You may also instantiate the OCI Data Science model with the generic `ChatOCIModelDeployment` or framework specific class like `ChatOCIModelDeploymentVLLM`.
+
+```python
+from langchain_oci.chat_models import ChatOCIModelDeployment, ChatOCIModelDeploymentVLLM
+
+# Create an instance of OCI Model Deployment Endpoint
+# Replace the endpoint uri with your own
+endpoint = "https://modeldeployment.<region>.oci.customer-oci.com/<ocid>/predict"
+
+messages = [
+    (
+        "system",
+        "You are a helpful assistant that translates English to French. Translate the user sentence.",
+    ),
+    ("human", "I love programming."),
+]
+
+chat = ChatOCIModelDeployment(
+    endpoint=endpoint,
+    streaming=True,
+    max_retries=1,
+    model_kwargs={
+        "temperature": 0.2,
+        "max_tokens": 512,
+    },  # other model params...
+    default_headers={
+        "route": "/v1/chat/completions",
+        # other request headers ...
+    },
+)
+chat.invoke(messages)
+
+chat_vllm = ChatOCIModelDeploymentVLLM(endpoint=endpoint)
+chat_vllm.invoke(messages)
+```
+
 ## Embeddings
 
+### OCI Generative AI
+
 `OCIGenAIEmbeddings` class exposes embeddings from OCI Generative AI.
 
 ```python
@@ -31,12 +73,60 @@ embeddings = OCIGenAIEmbeddings()
 embeddings.embed_query("What is the meaning of life?")
 ```
 
+### OCI Data Science
+
+You may also instantiate the OCI Data Science model with the `OCIModelDeploymentEndpointEmbeddings`.
+
+```python
+from langchain_oci.embeddings import OCIModelDeploymentEndpointEmbeddings
+
+# Create an instance of OCI Model Deployment Endpoint
+# Replace the endpoint uri with your own
+endpoint = "https://modeldeployment.<region>.oci.customer-oci.com/<ocid>/predict"
+
+embeddings = OCIModelDeploymentEndpointEmbeddings(
+    endpoint=endpoint,
+)
+
+query = "Hello World!"
+embeddings.embed_query(query)
+
+documents = ["This is a sample document", "and here is another one"]
+embeddings.embed_documents(documents)
+```
+
 ## LLMs
+
+### OCI Generative AI
+
 `OCIGenAI` class exposes LLMs from OCI Generative AI.
 
 ```python
 from langchain_oci import OCIGenAI
 
 llm = OCIGenAI()
 llm.invoke("The meaning of life is")
-```
+```
+
+### OCI Data Science
+
+You may also instantiate the OCI Data Science model with `OCIModelDeploymentLLM` or `OCIModelDeploymentVLLM`.
+
+```python
+from langchain_oci.llms import OCIModelDeploymentLLM, OCIModelDeploymentVLLM
+
+# Create an instance of OCI Model Deployment Endpoint
+# Replace the endpoint uri and model name with your own
+endpoint = "https://modeldeployment.<region>.oci.customer-oci.com/<ocid>/predict"
+
+llm = OCIModelDeploymentLLM(
+    endpoint=endpoint,
+    model="odsc-llm",
+)
+llm.invoke("Who is the first president of United States?")
+
+vllm = OCIModelDeploymentVLLM(
+    endpoint=endpoint,
+)
+vllm.invoke("Who is the first president of United States?")
+```

libs/oci/langchain_oci/llms/oci_data_science_model_deployment_endpoint.py

@@ -3,11 +3,13 @@
 
 """LLM for OCI data science model deployment endpoint."""
 
+from contextlib import asynccontextmanager
 import json
 import logging
 import traceback
 from typing import (
     Any,
+    AsyncGenerator,
     AsyncIterator,
     Callable,
     Dict,
@@ -30,8 +32,6 @@
 from langchain_core.utils import get_from_dict_or_env
 from pydantic import Field, model_validator
 
-from langchain_oci.utilities.requests import Requests
-
 logger = logging.getLogger(__name__)
 DEFAULT_INFERENCE_ENDPOINT = "/v1/completions"
 
@@ -169,15 +169,18 @@ def _completion_with_retry(**kwargs: Any) -> Any:
                 request_timeout = kwargs.pop("request_timeout", DEFAULT_TIME_OUT)
                 data = kwargs.pop("data")
                 stream = kwargs.pop("stream", self.streaming)
+                headers = self._headers()
+                auth = self.auth.get("signer")
+                url = self.endpoint
 
-                request = Requests(
-                    headers=self._headers(), auth=self.auth.get("signer")
-                )
-                response = request.post(
-                    url=self.endpoint,
-                    data=data,
+                response = requests.post(
+                    url=url,
+                    json=data,
                     timeout=request_timeout,
                     stream=stream,
+                    headers=headers,
+                    auth=auth,
+                    verify=True,
                     **kwargs,
                 )
                 self._check_response(response)
@@ -211,20 +214,29 @@ async def _completion_with_retry(**kwargs: Any) -> Any:
                 request_timeout = kwargs.pop("request_timeout", DEFAULT_TIME_OUT)
                 data = kwargs.pop("data")
                 stream = kwargs.pop("stream", self.streaming)
+                headers = self._headers(is_async=True, body=data)
+                auth = self.auth.get("signer")
+                url = self.endpoint
+                method = "POST"
 
-                request = Requests(headers=self._headers(is_async=True, body=data))
                 if stream:
-                    response = request.apost(
-                        url=self.endpoint,
-                        data=data,
+                    response = self._arequest(
+                        method=method,
+                        url=url,
+                        json=data,
                         timeout=request_timeout,
+                        headers=headers,
+                        auth=auth,
                     )
                     return self._aiter_sse(response)
                 else:
-                    async with request.apost(
-                        url=self.endpoint,
-                        data=data,
+                    async with self._arequest(
+                        method=method,
+                        url=url,
+                        json=data,
                         timeout=request_timeout,
+                        headers=headers,
+                        auth=auth,
                     ) as resp:
                         self._check_response(resp)
                         data = await resp.json()
@@ -244,6 +256,21 @@ async def _completion_with_retry(**kwargs: Any) -> Any:
 
         return await _completion_with_retry(**kwargs)
 
+    @asynccontextmanager
+    async def _arequest(
+        self, method: str, url: str, headers: dict, auth: Any, **kwargs: Any
+    ) -> AsyncGenerator[aiohttp.ClientResponse, None]:
+        """Make an async request."""
+        async with aiohttp.ClientSession() as session:
+            async with session.request(
+                method,
+                url,
+                headers=headers,
+                auth=auth,
+                **kwargs,
+            ) as response:
+                yield response
+
     def _check_response(self, response: Any) -> None:
         """Handle server error by checking the response status.