oracle-ads 2.11.12__tar.gz → 2.11.13__tar.gz

{oracle_ads-2.11.12 → oracle_ads-2.11.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oracle_ads
-Version: 2.11.12
+Version: 2.11.13
 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
@@ -21,7 +21,7 @@ Requires-Dist: fsspec>=0.8.7
 Requires-Dist: gitpython>=3.1.2
 Requires-Dist: jinja2>=2.11.2
 Requires-Dist: matplotlib>=3.1.3, <=3.8.4
-Requires-Dist: numpy>=1.19.2
+Requires-Dist: numpy>=1.19.2, <2.0.0
 Requires-Dist: oci>=2.125.3
 Requires-Dist: ocifs>=1.1.3
 Requires-Dist: pandas>1.2.1; python_version<'3.9'
@@ -61,7 +61,7 @@ Requires-Dist: rich ; extra == "forecast"
 Requires-Dist: autots[additional] ; extra == "forecast"
 Requires-Dist: mlforecast ; extra == "forecast"
 Requires-Dist: neuralprophet>=0.7.0 ; extra == "forecast"
-Requires-Dist: numpy ; extra == "forecast"
+Requires-Dist: numpy<2.0.0 ; extra == "forecast"
 Requires-Dist: oci-cli ; extra == "forecast"
 Requires-Dist: optuna ; extra == "forecast"
 Requires-Dist: oracle-ads ; extra == "forecast"
@@ -79,7 +79,6 @@ Requires-Dist: transformers ; extra == "huggingface"
 Requires-Dist: langchain-community<0.0.32 ; extra == "llm"
 Requires-Dist: langchain>=0.1.10,<0.1.14 ; extra == "llm"
 Requires-Dist: evaluate>=0.4.0 ; extra == "llm"
-Requires-Dist: langchain-core<0.1.51 ; extra == "llm"
 Requires-Dist: ipython>=7.23.1, <8.0 ; extra == "notebook"
 Requires-Dist: ipywidgets~=7.6.3 ; extra == "notebook"
 Requires-Dist: lightgbm<4.0.0 ; extra == "onnx"

{oracle_ads-2.11.12 → oracle_ads-2.11.13}/ads/llm/langchain/plugins/base.py

@@ -8,6 +8,7 @@ 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
 
@@ -95,6 +96,11 @@ class GenerativeAiClientModel(BaseModel):
         """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 {}

{oracle_ads-2.11.12 → oracle_ads-2.11.13}/ads/model/datascience_model.py

@@ -41,6 +41,7 @@ from ads.model.service.oci_datascience_model import (
     ModelProvenanceNotFoundError,
     OCIDataScienceModel,
 )
+from ads.common import oci_client as oc
 
 logger = logging.getLogger(__name__)
 
@@ -1466,3 +1467,226 @@ class DataScienceModel(Builder):
             bucket_uri.append(uri)
 
         return bucket_uri[0] if len(bucket_uri) == 1 else bucket_uri, artifact_size
+
+    def add_artifact(
+        self,
+        uri: Optional[str] = None,
+        namespace: Optional[str] = None,
+        bucket: Optional[str] = None,
+        prefix: Optional[str] = None,
+        files: Optional[List[str]] = None,
+    ):
+        """
+        Adds information about objects in a specified bucket to the model description JSON.
+
+        Parameters
+        ----------
+        uri : str, optional
+            The URI representing the location of the artifact in OCI object storage.
+        namespace : str, optional
+            The namespace of the bucket containing the objects. Required if `uri` is not provided.
+        bucket : str, optional
+            The name of the bucket containing the objects. Required if `uri` is not provided.
+        prefix : str, optional
+            The prefix of the objects to add. Defaults to None. Cannot be provided if `files` is provided.
+        files : list of str, optional
+            A list of file names to include in the model description. If provided, only objects with matching file names will be included. Cannot be provided if `prefix` is provided.
+
+        Returns
+        -------
+        None
+
+        Raises
+        ------
+        ValueError
+            - If both `uri` and (`namespace` and `bucket`) are provided.
+            - If neither `uri` nor both `namespace` and `bucket` are provided.
+            - If both `prefix` and `files` are provided.
+            - If no files are found to add to the model description.
+
+        Note
+        ----
+        - If `files` is not provided, it retrieves information about all objects in the bucket.
+        - If `files` is provided, it only retrieves information about objects with matching file names.
+        - If no objects are found to add to the model description, a ValueError is raised.
+        """
+
+        if uri and (namespace or bucket):
+            raise ValueError(
+                "Either 'uri' must be provided or both 'namespace' and 'bucket' must be provided."
+            )
+        if uri:
+            object_storage_details = ObjectStorageDetails.from_path(uri)
+            bucket = object_storage_details.bucket
+            namespace = object_storage_details.namespace
+            prefix = (
+                None
+                if object_storage_details.filepath == ""
+                else object_storage_details.filepath
+            )
+        if (not namespace) or (not bucket):
+            raise ValueError("Both 'namespace' and 'bucket' must be provided.")
+
+        # Check if both prefix and files are provided
+        if prefix is not None and files is not None:
+            raise ValueError(
+                "Both 'prefix' and 'files' cannot be provided. Please provide only one."
+            )
+
+        if self.model_file_description == None:
+            self.empty_json = {
+                "version": "1.0",
+                "type": "modelOSSReferenceDescription",
+                "models": [],
+            }
+            self.set_spec(self.CONST_MODEL_FILE_DESCRIPTION, self.empty_json)
+
+        # Get object storage client
+        self.object_storage_client = oc.OCIClientFactory(
+            **(self.dsc_model.auth)
+        ).object_storage
+
+        # Remove if the model already exists
+        self.remove_artifact(namespace=namespace, bucket=bucket, prefix=prefix)
+
+        def check_if_file_exists(fileName):
+            isExists = False
+            try:
+                headResponse = self.object_storage_client.head_object(
+                    namespace, bucket, object_name=fileName
+                )
+                if headResponse.status == 200:
+                    isExists = True
+            except Exception as e:
+                if hasattr(e, "status") and e.status == 404:
+                    logger.error(f"File not found in bucket: {fileName}")
+                else:
+                    logger.error(f"An error occured: {e}")
+            return isExists
+
+        # Function to un-paginate the api call with while loop
+        def list_obj_versions_unpaginated():
+            objectStorageList = []
+            has_next_page, opc_next_page = True, None
+            while has_next_page:
+                response = self.object_storage_client.list_object_versions(
+                    namespace_name=namespace,
+                    bucket_name=bucket,
+                    prefix=prefix,
+                    fields="name,size",
+                    page=opc_next_page,
+                )
+                objectStorageList.extend(response.data.items)
+                has_next_page = response.has_next_page
+                opc_next_page = response.next_page
+            return objectStorageList
+
+        # Fetch object details and put it into the objects variable
+        objectStorageList = []
+        if files == None:
+            objectStorageList = list_obj_versions_unpaginated()
+        else:
+            for fileName in files:
+                if check_if_file_exists(fileName=fileName):
+                    objectStorageList.append(
+                        self.object_storage_client.list_object_versions(
+                            namespace_name=namespace,
+                            bucket_name=bucket,
+                            prefix=fileName,
+                            fields="name,size",
+                        ).data.items[0]
+                    )
+
+        objects = [
+            {"name": obj.name, "version": obj.version_id, "sizeInBytes": obj.size}
+            for obj in objectStorageList
+            if obj.size > 0
+        ]
+
+        if len(objects) == 0:
+            error_message = (
+                f"No files to add in the bucket: {bucket} with namespace: {namespace} "
+                f"and prefix: {prefix}. File names: {files}"
+            )
+            logger.error(error_message)
+            raise ValueError(error_message)
+
+        tmp_model_file_description = self.model_file_description
+        tmp_model_file_description["models"].append(
+            {
+                "namespace": namespace,
+                "bucketName": bucket,
+                "prefix": "" if not prefix else prefix,
+                "objects": objects,
+            }
+        )
+        self.set_spec(self.CONST_MODEL_FILE_DESCRIPTION, tmp_model_file_description)
+
+    def remove_artifact(
+        self,
+        uri: Optional[str] = None,
+        namespace: Optional[str] = None,
+        bucket: Optional[str] = None,
+        prefix: Optional[str] = None,
+    ):
+        """
+        Removes information about objects in a specified bucket or using a specified URI from the model description JSON.
+
+        Parameters
+        ----------
+        uri : str, optional
+            The URI representing the location of the artifact in OCI object storage.
+        namespace : str, optional
+            The namespace of the bucket containing the objects. Required if `uri` is not provided.
+        bucket : str, optional
+            The name of the bucket containing the objects. Required if `uri` is not provided.
+        prefix : str, optional
+            The prefix of the objects to remove. Defaults to None.
+
+        Returns
+        -------
+        None
+
+        Raises
+        ------
+        ValueError
+            - If both 'uri' and ('namespace' and 'bucket') are provided.
+            - If neither 'uri' nor both 'namespace' and 'bucket' are provided.
+            - If the model description JSON is None.
+        """
+
+        if uri and (namespace or bucket):
+            raise ValueError(
+                "Either 'uri' must be provided or both 'namespace' and 'bucket' must be provided."
+            )
+        if uri:
+            object_storage_details = ObjectStorageDetails.from_path(uri)
+            bucket = object_storage_details.bucket
+            namespace = object_storage_details.namespace
+            prefix = (
+                None
+                if object_storage_details.filepath == ""
+                else object_storage_details.filepath
+            )
+        if (not namespace) or (not bucket):
+            raise ValueError("Both 'namespace' and 'bucket' must be provided.")
+
+        def findModelIdx():
+            for idx, model in enumerate(self.model_file_description["models"]):
+                if (
+                    model["namespace"],
+                    model["bucketName"],
+                    (model["prefix"] if ("prefix" in model) else None),
+                ) == (namespace, bucket, "" if not prefix else prefix):
+                    return idx
+            return -1
+
+        if self.model_file_description == None:
+            return
+
+        modelSearchIdx = findModelIdx()
+        if modelSearchIdx == -1:
+            return
+        else:
+            # model found case
+            self.model_file_description["models"].pop(modelSearchIdx)

{oracle_ads-2.11.12 → oracle_ads-2.11.13}/pyproject.toml

@@ -21,7 +21,7 @@ build-backend = "flit_core.buildapi"
 
 # Required
 name = "oracle_ads" # the install (PyPI) name; name for local build in [tool.flit.module] section below
-version = "2.11.12"
+version = "2.11.13"
 
 # Optional
 description = "Oracle Accelerated Data Science SDK"
@@ -62,7 +62,7 @@ dependencies = [
   "gitpython>=3.1.2",
   "jinja2>=2.11.2",
   "matplotlib>=3.1.3, <=3.8.4",
-  "numpy>=1.19.2",
+  "numpy>=1.19.2, <2.0.0",
   "oci>=2.125.3",
   "ocifs>=1.1.3",
   "pandas>1.2.1; python_version<'3.9'", # starting pandas v2.1.0 requires-python = '>=3.9'
@@ -140,7 +140,7 @@ forecast = [
   "autots[additional]",
   "mlforecast",
   "neuralprophet>=0.7.0",
-  "numpy",
+  "numpy<2.0.0",
   "oci-cli",
   "optuna",
   "oracle-ads",
@@ -175,7 +175,7 @@ pii = [
   "spacy==3.6.1",
   "report-creator==1.0.9",
 ]
-llm = ["langchain-community<0.0.32", "langchain>=0.1.10,<0.1.14", "evaluate>=0.4.0", "langchain-core<0.1.51"]
+llm = ["langchain-community<0.0.32", "langchain>=0.1.10,<0.1.14", "evaluate>=0.4.0"]
 aqua = ["jupyter_server"]
 
 # To reduce backtracking (decrese deps install time) during test/dev env setup reducing number of versions pip is