Merge branch 'main' of github.com:oracle/accelerated-data-science into fix_report_title

Author: skjoracle

CODEOWNERS

@@ -1 +1 @@
-* @darenr @mayoor @mrDzurb @VipulMascarenhas @qiuosier @ahosler
+* @mayoor @mrDzurb @VipulMascarenhas @lu-ohai @smfirmin @sambitkumohanty

ads/aqua/modeldeployment/deployment.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (c) 2024, 2025 Oracle and/or its affiliates.
+# Copyright (c) 2024, 2026 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 
@@ -1007,6 +1007,13 @@ def _create(
 
         env_var.update({"AQUA_TELEMETRY_BUCKET_NS": AQUA_TELEMETRY_BUCKET_NS})
         env_var.update({"AQUA_TELEMETRY_BUCKET": AQUA_TELEMETRY_BUCKET})
+        # TODO: remove this once dsc model deployment propagates compartment id in the container runtime
+        env_var.update(
+            {
+                "MD_COMPARTMENT_OCID": create_deployment_details.compartment_id
+                or COMPARTMENT_OCID
+            }
+        )
 
         logger.info(f"Env vars used for deploying {aqua_model.id} :{env_var}")
 
@@ -1053,6 +1060,13 @@ def _create_multi(
         """
         model_name_list = []
         env_var = {**(create_deployment_details.env_var or UNKNOWN_DICT)}
+        # TODO: remove this once dsc model deployment propagates compartment id in the container runtime
+        env_var.update(
+            {
+                "MD_COMPARTMENT_OCID": create_deployment_details.compartment_id
+                or COMPARTMENT_OCID
+            }
+        )
 
         container_type_key = self._get_container_type_key(
             model=aqua_model_group,

ads/aqua/version.json

@@ -1,3 +1,3 @@
 {
-  "aqua": "2.0.0"
+  "aqua": "2.0.1"
 }

ads/common/model_artifact.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
-# -*- coding: utf-8; -*-
 
-# Copyright (c) 2020, 2023 Oracle and/or its affiliates.
+# Copyright (c) 2020, 2026 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 import warnings
@@ -21,34 +20,46 @@
 import json
 import os
 import re
-import git
 import shutil
 import subprocess
 import sys
 import textwrap
 import uuid
-import python_jsonschema_objects as pjs
 from enum import Enum
 from pathlib import Path
 from typing import Dict, Optional, Union
 
-import ads.dataset.factory as factory
 import fsspec
+import git
 import numpy as np
 import oci.data_science
 import oci.exceptions
 import pandas as pd
-import pkg_resources
+import python_jsonschema_objects as pjs
 import yaml
+from oci.data_science.models import ModelProvenance
 
-from ads.common.decorator.runtime_dependency import (
-    runtime_dependency,
-    OptionalDependency,
-)
-from ads.common import logger, utils
 from ads.common import auth as authutil
+from ads.common import logger, utils
 from ads.common.data import ADSData
+from ads.common.decorator.deprecate import deprecated
 from ads.common.error import ChangesNotCommitted
+from ads.common.object_storage_details import (
+    InvalidObjectStoragePath,
+    ObjectStorageDetails,
+)
+from ads.common.utils import DATA_SCHEMA_MAX_COL_NUM
+from ads.config import (
+    JOB_RUN_COMPARTMENT_OCID,
+    JOB_RUN_OCID,
+    NB_SESSION_COMPARTMENT_OCID,
+    NB_SESSION_OCID,
+    PROJECT_OCID,
+)
+from ads.dataset import factory
+from ads.feature_engineering.schema import DataSizeTooWide, Schema, SchemaSizeTooLarge
+from ads.model.common.utils import fetch_manifest_from_conda_location
+from ads.model.extractor.model_info_extractor_factory import ModelInfoExtractorFactory
 from ads.model.model_introspect import (
     TEST_STATUS,
     Introspectable,
@@ -66,33 +77,12 @@
     ModelTaxonomyMetadata,
     UseCaseType,
 )
-from ads.common.object_storage_details import (
-    InvalidObjectStoragePath,
-    ObjectStorageDetails,
-)
-from ads.common.utils import DATA_SCHEMA_MAX_COL_NUM
-from ads.config import (
-    JOB_RUN_COMPARTMENT_OCID,
-    JOB_RUN_OCID,
-    NB_SESSION_COMPARTMENT_OCID,
-    NB_SESSION_OCID,
-    PROJECT_OCID,
-)
-from ads.common.decorator.deprecate import deprecated
-from ads.feature_engineering.schema import DataSizeTooWide, Schema, SchemaSizeTooLarge
-from ads.model.extractor.model_info_extractor_factory import ModelInfoExtractorFactory
 from ads.model.model_version_set import ModelVersionSet
-from ads.model.common.utils import fetch_manifest_from_conda_location
-from git import InvalidGitRepositoryError, Repo
-
-from oci.data_science.models import ModelProvenance
 
 try:
     from yaml import CDumper as dumper
-    from yaml import CLoader as loader
 except:
     from yaml import Dumper as dumper
-    from yaml import Loader as loader
 
 MODEL_ARTIFACT_VERSION = "3.0"
 INPUT_SCHEMA_FILE_NAME = "input_schema.json"
@@ -102,7 +92,7 @@
 _COMPARTMENT_OCID = NB_SESSION_COMPARTMENT_OCID or JOB_RUN_COMPARTMENT_OCID
 
 
-class InvalidDataType(Exception):   # pragma: no cover
+class InvalidDataType(Exception):  # pragma: no cover
     """Invalid Data Type."""
 
     pass
@@ -119,7 +109,7 @@ class InvalidDataType(Exception):   # pragma: no cover
 """
 
 
-class ConflictStrategy(object):
+class ConflictStrategy:
     IGNORE = "IGNORE"
     UPDATE = "UPDATE"
     CREATE = "CREATE"
@@ -305,7 +295,7 @@ def __fetch_training_env_details(self, training_info):
                     os.path.join(os.path.expanduser("~"), "conda", "config.yaml")
                 ):
                     with open(
-                        (os.path.join(os.path.expanduser("~"), "conda", "config.yaml"))
+                        os.path.join(os.path.expanduser("~"), "conda", "config.yaml")
                     ) as conf:
                         user_config = yaml.load(conf, Loader=yaml.FullLoader)
                     pack_bucket = user_config["bucket_info"]["name"]
@@ -327,7 +317,7 @@ def __fetch_training_env_details(self, training_info):
                 if manifest_type == PACK_TYPE.USER_CUSTOM_PACK.value:
                     if self.data_science_env:
                         raise Exception(
-                            f"For Published conda environments, assign the path of the environment in "
+                            "For Published conda environments, assign the path of the environment in "
                             + "Object Storage to the `inference_conda_env` parameter and set the "
                             + "parameter `data_science_env` to `False`."
                         )
@@ -338,16 +328,15 @@ def __fetch_training_env_details(self, training_info):
                     )
                     if self.ignore_deployment_error:
                         logger.warn(error_message)
-                    else:
-                        if not self.inference_conda_env:
-                            logger.error(error_message)
-                            logger.info(
-                                "Provide a URI to the conda environment that you wish to use with the model "
-                                "deployment service if you do not want to publish the current training environment."
-                            )
-                            raise Exception(
-                                f"Could not resolve the path in the Object Storage for the conda environment: {conda_prefix}"
-                            )
+                    elif not self.inference_conda_env:
+                        logger.error(error_message)
+                        logger.info(
+                            "Provide a URI to the conda environment that you wish to use with the model "
+                            "deployment service if you do not want to publish the current training environment."
+                        )
+                        raise Exception(
+                            f"Could not resolve the path in the Object Storage for the conda environment: {conda_prefix}"
+                        )
                 else:
                     logger.warn(
                         f"Could not resolve the Object Storage destination of {conda_prefix}. Correct "
@@ -416,15 +405,15 @@ def _generate_empty_runtime_yaml(
             f"The inference conda environment is {inference_conda_env} and the Python version is {inference_python_version}."
         )
         if inference_conda_env:
-            content["MODEL_DEPLOYMENT"]["INFERENCE_CONDA_ENV"][
-                "INFERENCE_ENV_SLUG"
-            ] = ""
-            content["MODEL_DEPLOYMENT"]["INFERENCE_CONDA_ENV"][
-                "INFERENCE_ENV_TYPE"
-            ] = ""
-            content["MODEL_DEPLOYMENT"]["INFERENCE_CONDA_ENV"][
-                "INFERENCE_ENV_PATH"
-            ] = inference_conda_env
+            content["MODEL_DEPLOYMENT"]["INFERENCE_CONDA_ENV"]["INFERENCE_ENV_SLUG"] = (
+                ""
+            )
+            content["MODEL_DEPLOYMENT"]["INFERENCE_CONDA_ENV"]["INFERENCE_ENV_TYPE"] = (
+                ""
+            )
+            content["MODEL_DEPLOYMENT"]["INFERENCE_CONDA_ENV"]["INFERENCE_ENV_PATH"] = (
+                inference_conda_env
+            )
         if inference_python_version:
             content["MODEL_DEPLOYMENT"]["INFERENCE_CONDA_ENV"][
                 "INFERENCE_PYTHON_VERSION"
@@ -511,7 +500,7 @@ def _generate_runtime_yaml(self, model_file_name="model.onnx"):
         if (
             not self.inference_conda_env
             and not self.data_science_env
-            and inference_info.INFERENCE_ENV_TYPE == PACK_TYPE.SERVICE_PACK.value
+            and PACK_TYPE.SERVICE_PACK.value == inference_info.INFERENCE_ENV_TYPE
             and training_env_info.TRAINING_ENV_PATH == inference_info.INFERENCE_ENV_PATH
         ):
             error_message = (
@@ -526,7 +515,7 @@ def _generate_runtime_yaml(self, model_file_name="model.onnx"):
 
         if not inference_info.INFERENCE_ENV_PATH and not self.inference_conda_env:
             error_message = (
-                f"The inference conda environment is missing. Set the `inference_conda_env` parameter "
+                "The inference conda environment is missing. Set the `inference_conda_env` parameter "
                 + "or publish the conda environment and run the `.prepare()` method."
             )
             if not self.ignore_deployment_error:
@@ -808,7 +797,7 @@ def save(
 
         runtime_yaml_file = os.path.join(self.artifact_dir, "runtime.yaml")
         if os.path.exists(runtime_yaml_file):
-            with open(runtime_yaml_file, "r") as mfile:
+            with open(runtime_yaml_file) as mfile:
                 runtime_prep_info = yaml.load(mfile, Loader=yaml.FullLoader)
                 # runtime_info['pack-info'] = deployment_pack_info
         else:
@@ -982,8 +971,11 @@ def install_requirements(self, conflict_strategy=ConflictStrategy.IGNORE):
             IGNORE: Use the installed version in  case of a conflict.
             UPDATE: Force update dependency to the version required by model artifact in case of conflict.
         """
-        importlib.reload(pkg_resources)
-        from pkg_resources import DistributionNotFound, VersionConflict
+        from importlib.metadata import PackageNotFoundError
+        from importlib.metadata import version as get_version
+
+        from packaging.markers import default_environment
+        from packaging.requirements import Requirement
 
         if self.version.split(".")[0] not in ["0", "1"] and os.path.exists(
             Path(os.path.join(self.artifact_dir), "requirements.txt")
@@ -1010,19 +1002,43 @@ def install_requirements(self, conflict_strategy=ConflictStrategy.IGNORE):
             )
 
         version_conflicts = {}
+        env = default_environment()
         for requirement in requirements:
+            req_line = requirement.strip()
+            if not req_line or req_line.startswith("#"):
+                continue
+            # Skip include or index options lines
+            if req_line.startswith(("-", "--")):
+                continue
+            try:
+                req = Requirement(req_line)
+            except Exception:
+                # If the requirement line cannot be parsed, attempt to install it as-is.
+                pip_install(req_line)
+                continue
+
+            # Evaluate environment markers, if any
+            if req.marker and not req.marker.evaluate(environment=env):
+                continue
+
+            package_name = req.name
+            spec = req.specifier  # SpecifierSet
+
             try:
-                pkg_resources.require(requirement)
-            except VersionConflict as vc:
+                installed_version = get_version(package_name)
+            except PackageNotFoundError:
+                # Not installed; install the requirement as written
+                pip_install(req_line)
+                continue
+
+            if spec and installed_version not in spec:
                 if conflict_strategy == ConflictStrategy.UPDATE:
-                    pip_install("%s%s" % (vc.req.name, vc.req.specifier), "-U")
+                    pip_install(f"{package_name}{spec}", "-U")
                 elif conflict_strategy == ConflictStrategy.IGNORE:
-                    version_conflicts[
-                        "%s==%s" % (vc.dist.key, vc.dist.parsed_version)
-                    ] = "%s%s" % (vc.req.name, vc.req.specifier)
-            except DistributionNotFound as dnf:
-                pip_install(requirement)
-                # distributions_not_found.add('%s%s' % (dnf.req.name, dnf.req.specifier))
+                    version_conflicts[f"{package_name}=={installed_version}"] = (
+                        f"{package_name}{spec}"
+                    )
+
         if len(version_conflicts) > 0:
             print(
                 "\033[93m"
@@ -1308,21 +1324,15 @@ def _populate_metadata_custom(self):
             )
         )
         try:
-            env_type = (
-                self._runtime_info.MODEL_DEPLOYMENT.INFERENCE_CONDA_ENV.INFERENCE_ENV_TYPE._value
-            )
+            env_type = self._runtime_info.MODEL_DEPLOYMENT.INFERENCE_CONDA_ENV.INFERENCE_ENV_TYPE._value
         except:
             env_type = None
         try:
-            slug_name = (
-                self._runtime_info.MODEL_DEPLOYMENT.INFERENCE_CONDA_ENV.INFERENCE_ENV_SLUG._value
-            )
+            slug_name = self._runtime_info.MODEL_DEPLOYMENT.INFERENCE_CONDA_ENV.INFERENCE_ENV_SLUG._value
         except:
             slug_name = None
         try:
-            env_path = (
-                self._runtime_info.MODEL_DEPLOYMENT.INFERENCE_CONDA_ENV.INFERENCE_ENV_PATH._value
-            )
+            env_path = self._runtime_info.MODEL_DEPLOYMENT.INFERENCE_CONDA_ENV.INFERENCE_ENV_PATH._value
         except:
             env_path = None
 
@@ -1467,7 +1477,6 @@ def _save_from_local_file(
         self._save_data_path(",  ".join(oci_storage_paths), data_type)
 
     def _save_data_path(self, oci_storage_path, data_type):
-
         key = (
             MetadataCustomKeys.TRAINING_DATASET
             if data_type == "training"
@@ -1728,7 +1737,7 @@ def from_model_catalog(
         return result_artifact
 
 
-class VersionConflictWarning(object):
+class VersionConflictWarning:
     def __init__(self, version_conflicts):
         self.version_conflicts = version_conflicts