Merge remote-tracking branch 'upstream/main' into archive_model

Author: dbasunag

.pre-commit-config.yaml

@@ -35,7 +35,7 @@ repos:
       - id: detect-secrets
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.11
+    rev: v0.11.12
     hooks:
       - id: ruff
       - id: ruff-format
@@ -49,12 +49,12 @@ repos:
   #     - id: renovate-config-validator
 
   - repo: https://github.com/gitleaks/gitleaks
-    rev: v8.26.0
+    rev: v8.27.0
     hooks:
       - id: gitleaks
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.15.0
+    rev: v1.16.0
     hooks:
       - id: mypy
         additional_dependencies: ["types-PyYAML", "types-requests"]

pyproject.toml

@@ -63,7 +63,7 @@ dependencies = [
     "timeout-sampler>=1.0.6",
     "shortuuid>=1.0.13",
     "jira>=3.8.0",
-    "openshift-python-wrapper>=11.0.50",
+    "openshift-python-wrapper>=11.0.57",
     "semver>=3.0.4",
     "sqlalchemy>=2.0.40",
     "pytest-order>=1.3.0",

tests/model_registry/conftest.py

@@ -9,7 +9,7 @@
 from ocp_resources.data_science_cluster import DataScienceCluster
 from ocp_resources.deployment import Deployment
 
-from ocp_resources.model_registry import ModelRegistry
+from ocp_resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
 from schemathesis.specs.openapi.schemas import BaseOpenAPISchema
 from schemathesis.generation.stateful.state_machine import APIStateMachine
 from schemathesis.core.transport import Response
@@ -29,6 +29,8 @@
     DB_RESOURCES_NAME,
     MODEL_REGISTRY_DB_SECRET_STR_DATA,
     MODEL_REGISTRY_DB_SECRET_ANNOTATIONS,
+    OAUTH_PROXY_CONFIG_DICT,
+    MODEL_REGISTRY_STANDARD_LABELS,
 )
 from utilities.constants import Labels
 from tests.model_registry.utils import (
@@ -37,8 +39,9 @@
     get_model_registry_deployment_template_dict,
     get_model_registry_db_label_dict,
     wait_for_pods_running,
+    create_model_registry_instance,
 )
-from utilities.constants import Annotations, Protocols, DscComponents
+from utilities.constants import Protocols, DscComponents
 from model_registry import ModelRegistry as ModelRegistryClient
 from semver import Version
 from utilities.infra import get_product_version
@@ -145,53 +148,113 @@ def model_registry_db_deployment(
 
 @pytest.fixture(scope="class")
 def model_registry_instance(
-    admin_client: DynamicClient,
     model_registry_namespace: str,
-    model_registry_db_deployment: Deployment,
-    model_registry_db_secret: Secret,
-    model_registry_db_service: Service,
+    model_registry_mysql_config: dict[str, Any],
 ) -> Generator[ModelRegistry, Any, Any]:
-    with ModelRegistry(
-        name=MR_INSTANCE_NAME,
+    """Creates a model registry instance with service mesh configuration."""
+    with create_model_registry_instance(
         namespace=model_registry_namespace,
-        label={
-            Annotations.KubernetesIo.NAME: MR_INSTANCE_NAME,
-            Annotations.KubernetesIo.INSTANCE: MR_INSTANCE_NAME,
-            Annotations.KubernetesIo.PART_OF: MR_OPERATOR_NAME,
-            Annotations.KubernetesIo.CREATED_BY: MR_OPERATOR_NAME,
-        },
+        name=MR_INSTANCE_NAME,
+        labels=MODEL_REGISTRY_STANDARD_LABELS,
         grpc={},
         rest={},
         istio=ISTIO_CONFIG_DICT,
-        mysql={
-            "host": f"{model_registry_db_deployment.name}.{model_registry_db_deployment.namespace}.svc.cluster.local",
-            "database": model_registry_db_secret.string_data["database-name"],
-            "passwordSecret": {"key": "database-password", "name": DB_RESOURCES_NAME},
-            "port": 3306,
-            "skipDBCreation": False,
-            "username": model_registry_db_secret.string_data["database-user"],
-        },
+        mysql=model_registry_mysql_config,
+        wait_for_resource=True,
+    ) as mr:
+        mr.wait_for_condition(condition="Available", status="True")
+        yield mr
+
+
+@pytest.fixture(scope="class")
+def model_registry_instance_oauth_proxy(
+    model_registry_namespace: str,
+    model_registry_mysql_config: dict[str, Any],
+) -> Generator[ModelRegistry, Any, Any]:
+    """Creates a model registry instance with oauth proxy configuration."""
+    with create_model_registry_instance(
+        namespace=model_registry_namespace,
+        name=MR_INSTANCE_NAME,
+        labels=MODEL_REGISTRY_STANDARD_LABELS,
+        grpc={},
+        rest={},
+        oauth_proxy=OAUTH_PROXY_CONFIG_DICT,
+        mysql=model_registry_mysql_config,
         wait_for_resource=True,
     ) as mr:
         mr.wait_for_condition(condition="Available", status="True")
         yield mr
 
 
+@pytest.fixture(scope="class")
+def model_registry_mysql_config(
+    model_registry_db_deployment: Deployment, model_registry_db_secret: Secret
+) -> dict[str, Any]:
+    return {
+        "host": f"{model_registry_db_deployment.name}.{model_registry_db_deployment.namespace}.svc.cluster.local",
+        "database": model_registry_db_secret.string_data["database-name"],
+        "passwordSecret": {"key": "database-password", "name": model_registry_db_deployment.name},
+        "port": 3306,
+        "skipDBCreation": False,
+        "username": model_registry_db_secret.string_data["database-user"],
+    }
+
+
 @pytest.fixture(scope="class")
 def model_registry_instance_service(
     admin_client: DynamicClient,
     model_registry_namespace: str,
     model_registry_instance: ModelRegistry,
 ) -> Service:
+    """
+    Get the service for the regular model registry instance.
+    Args:
+        admin_client: The admin client
+        model_registry_namespace: The namespace where the model registry is deployed
+        model_registry_instance: The model registry instance to get the service for
+    Returns:
+        Service: The service for the model registry instance
+    """
+    return get_mr_service_by_label(
+        client=admin_client,
+        ns=Namespace(name=model_registry_namespace),
+        mr_instance=model_registry_instance,
+    )
+
+
+@pytest.fixture(scope="class")
+def model_registry_instance_oauth_service(
+    admin_client: DynamicClient,
+    model_registry_namespace: str,
+    model_registry_instance_oauth_proxy: ModelRegistry,
+) -> Service:
+    """
+    Get the service for the OAuth proxy model registry instance.
+    Args:
+        admin_client: The admin client
+        model_registry_namespace: The namespace where the model registry is deployed
+        model_registry_instance_oauth_proxy: The OAuth proxy model registry instance
+    Returns:
+        Service: The service for the OAuth proxy model registry instance
+    """
     return get_mr_service_by_label(
-        client=admin_client, ns=Namespace(name=model_registry_namespace), mr_instance=model_registry_instance
+        client=admin_client,
+        ns=Namespace(name=model_registry_namespace),
+        mr_instance=model_registry_instance_oauth_proxy,
     )
 
 
 @pytest.fixture(scope="class")
 def model_registry_instance_rest_endpoint(
     model_registry_instance_service: Service,
 ) -> str:
+    """
+    Get the REST endpoint for the model registry instance.
+    Args:
+        model_registry_instance_service: The service for the model registry instance
+    Returns:
+        str: The REST endpoint for the model registry instance
+    """
     return get_endpoint_from_mr_service(svc=model_registry_instance_service, protocol=Protocols.REST)
 
 
@@ -262,9 +325,29 @@ def updated_dsc_component_state_scope_class(
 
 
 @pytest.fixture(scope="class")
-def model_registry_client(current_client_token: str, model_registry_instance_rest_endpoint: str) -> ModelRegistryClient:
-    # address and port need to be split in the client instantiation
-    server, port = model_registry_instance_rest_endpoint.split(":")
+def model_registry_client(
+    request: FixtureRequest,
+    current_client_token: str,
+) -> ModelRegistryClient:
+    """
+    Get a client for the model registry instance.
+    Args:
+        request: The pytest request object
+        current_client_token: The current client token
+    Returns:
+        ModelRegistryClient: A client for the model registry instance
+    """
+    # Get the service fixture name from the request
+    service_fixture = getattr(request, "param", {}).get("service_fixture", "model_registry_instance_service")
+
+    # Get the service from the fixture
+    service = request.getfixturevalue(argname=service_fixture)
+
+    # Get the REST endpoint
+    rest_endpoint = get_endpoint_from_mr_service(svc=service, protocol=Protocols.REST)
+
+    # Create the client
+    server, port = rest_endpoint.split(":")
     return ModelRegistryClient(
         server_address=f"{Protocols.HTTPS}://{server}",
         port=port,

tests/model_registry/constants.py

@@ -1,6 +1,6 @@
 from typing import Any
 from ocp_resources.resource import Resource
-from utilities.constants import ModelFormat
+from utilities.constants import ModelFormat, Annotations
 
 
 class ModelRegistryEndpoints:
@@ -29,6 +29,11 @@ class ModelRegistryEndpoints:
 ISTIO_CONFIG_DICT: dict[str, Any] = {
     "gateway": {"grpc": {"tls": {}}, "rest": {"tls": {}}},
 }
+OAUTH_PROXY_CONFIG_DICT: dict[str, Any] = {
+    "port": 8443,
+    "routePort": 443,
+    "serviceRoute": "enabled",
+}
 DB_RESOURCES_NAME: str = "db-model-registry"
 MR_DB_IMAGE_DIGEST: str = (
     "public.ecr.aws/docker/library/mysql@sha256:9de9d54fecee6253130e65154b930978b1fcc336bcc86dfd06e89b72a2588ebe"
@@ -43,3 +48,9 @@ class ModelRegistryEndpoints:
     f"{Resource.ApiGroup.TEMPLATE_OPENSHIFT_IO}/expose-password": "'{.data[''database-password'']}'",
     f"{Resource.ApiGroup.TEMPLATE_OPENSHIFT_IO}/expose-username": "'{.data[''database-user'']}'",
 }
+MODEL_REGISTRY_STANDARD_LABELS = {
+    Annotations.KubernetesIo.NAME: MR_INSTANCE_NAME,
+    Annotations.KubernetesIo.INSTANCE: MR_INSTANCE_NAME,
+    Annotations.KubernetesIo.PART_OF: MR_OPERATOR_NAME,
+    Annotations.KubernetesIo.CREATED_BY: MR_OPERATOR_NAME,
+}

tests/model_registry/image_validation/test_verify_rhoai_images.py

@@ -8,7 +8,7 @@
 from utilities.general import (
     validate_container_images,
 )
-from ocp_resources.model_registry import ModelRegistry
+from ocp_resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
 from ocp_resources.pod import Pod
 
 LOGGER = get_logger(name=__name__)

tests/model_registry/negative_tests/test_model_registry_creation_negative.py

@@ -3,7 +3,7 @@
 from simple_logger.logger import get_logger
 from ocp_resources.data_science_cluster import DataScienceCluster
 from ocp_resources.deployment import Deployment
-from ocp_resources.model_registry import ModelRegistry
+from ocp_resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
 from pytest_testconfig import config as py_config
 from ocp_resources.namespace import Namespace
 from ocp_resources.secret import Secret

tests/model_registry/python_client/test_model_registry_creation_oauth.py

@@ -0,0 +1,77 @@
+import pytest
+from typing import Self
+from simple_logger.logger import get_logger
+from pytest_testconfig import config as py_config
+from semver import Version
+from utilities.infra import get_product_version
+from utilities.constants import DscComponents
+from tests.model_registry.constants import MODEL_NAME, MODEL_DICT
+from model_registry import ModelRegistry as ModelRegistryClient
+
+LOGGER = get_logger(name=__name__)
+MINVER = Version.parse(version="2.21.0")
+
+
+@pytest.mark.parametrize(
+    "updated_dsc_component_state_scope_class, model_registry_client",
+    [
+        pytest.param(
+            {
+                "component_patch": {
+                    DscComponents.MODELREGISTRY: {
+                        "managementState": DscComponents.ManagementState.MANAGED,
+                        "registriesNamespace": py_config["model_registry_namespace"],
+                    },
+                },
+            },
+            {"service_fixture": "model_registry_instance_oauth_service"},
+            id="oauth_proxy",
+        ),
+    ],
+    indirect=True,
+)
+@pytest.mark.usefixtures("updated_dsc_component_state_scope_class")
+class TestModelRegistryCreationOAuth:
+    """
+    Tests the creation of a model registry with OAuth proxy configuration.
+    Jira ID: RHOAIENG-26194
+    """
+
+    @pytest.mark.smoke
+    def test_registering_model_with_oauth(
+        self: Self,
+        admin_client,
+        model_registry_client: ModelRegistryClient,
+    ):
+        if py_config["distribution"] == "downstream" and get_product_version(admin_client=admin_client) < MINVER:
+            pytest.skip("Skipping test for RHOAI < 2.21")
+
+        # Register a new model
+        registered_model = model_registry_client.register_model(
+            name=MODEL_DICT["model_name"],
+            uri=MODEL_DICT["model_uri"],
+            version=MODEL_DICT["model_version"],
+            description=MODEL_DICT["model_description"],
+            model_format_name=MODEL_DICT["model_format"],
+            model_format_version=MODEL_DICT["model_format_version"],
+            storage_key=MODEL_DICT["model_storage_key"],
+            storage_path=MODEL_DICT["model_storage_path"],
+            metadata=MODEL_DICT["model_metadata"],
+        )
+
+        # Get and verify the model
+        model = model_registry_client.get_registered_model(name=MODEL_NAME)
+        expected_attrs = {
+            "id": registered_model.id,
+            "name": registered_model.name,
+            "description": registered_model.description,
+            "owner": registered_model.owner,
+            "state": registered_model.state,
+        }
+        errors = [
+            f"Unexpected {attr} expected: {expected}, received {getattr(model, attr)}"
+            for attr, expected in expected_attrs.items()
+            if getattr(model, attr) != expected
+        ]
+        if errors:
+            pytest.fail("errors found in model registry response validation:\n{}".format("\n".join(errors)))

tests/model_registry/rbac/test_mr_rbac.py

@@ -9,7 +9,7 @@
 from utilities.infra import switch_user_context
 from kubernetes.dynamic import DynamicClient
 from ocp_resources.group import Group
-from ocp_resources.model_registry import ModelRegistry
+from ocp_resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
 from ocp_resources.role import Role
 from ocp_resources.role_binding import RoleBinding
 from utilities.constants import DscComponents

tests/model_registry/rbac/utils.py

@@ -4,7 +4,7 @@
 from ocp_resources.namespace import Namespace
 from model_registry import ModelRegistry as ModelRegistryClient
 from tests.model_registry.utils import get_endpoint_from_mr_service, get_mr_service_by_label
-from ocp_resources.model_registry import ModelRegistry
+from ocp_resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
 from utilities.infra import get_openshift_token
 from kubernetes.dynamic import DynamicClient