Merge branch 'main' into support-disconnected-llama-stack

Author: jgarciao

pyproject.toml

@@ -73,7 +73,7 @@ dependencies = [
     "marshmallow>=4.0",
     "pytest-html>=4.1.1",
     "fire",
-    "llama_stack_client>=0.6.0,<0.7",
+    "llama_stack_client>=0.7.1,<0.8",
     "pytest-xdist==3.8.0",
     "dictdiffer>=0.9.0",
     "pytest>=9.0.0",

tests/model_explainability/evalhub/conftest.py

@@ -25,6 +25,7 @@ def evalhub_cr(
         client=admin_client,
         name="evalhub",
         namespace=model_namespace.name,
+        database={"type": "sqlite"},
         wait_for_resource=True,
     ) as evalhub:
         yield evalhub

tests/model_explainability/evalhub/constants.py

@@ -3,12 +3,26 @@
 EVALHUB_CONTAINER_PORT: int = 8080
 EVALHUB_HEALTH_PATH: str = "/api/v1/health"
 EVALHUB_PROVIDERS_PATH: str = "/api/v1/evaluations/providers"
+EVALHUB_JOBS_PATH: str = "/api/v1/evaluations/jobs"
 EVALHUB_HEALTH_STATUS_HEALTHY: str = "healthy"
 
 EVALHUB_APP_LABEL: str = "eval-hub"
+EVALHUB_CONTAINER_NAME: str = "evalhub"
+EVALHUB_COMPONENT_LABEL: str = "api"
 
 # CRD details
 EVALHUB_API_GROUP: str = "trustyai.opendatahub.io"
 EVALHUB_API_VERSION: str = "v1alpha1"
 EVALHUB_KIND: str = "EvalHub"
 EVALHUB_PLURAL: str = "evalhubs"
+
+# Multi-tenancy
+EVALHUB_TENANT_LABEL_KEY: str = "evalhub.trustyai.opendatahub.io/tenant"
+EVALHUB_COLLECTIONS_PATH: str = "/api/v1/evaluations/collections"
+EVALHUB_PROVIDERS_ACCESS_CLUSTERROLE: str = "trustyai-service-operator-evalhub-providers-access"
+EVALHUB_MT_CR_NAME: str = "evalhub-mt"
+EVALHUB_VLLM_EMULATOR_PORT: int = 8000
+
+# ClusterRole names (kustomize namePrefix applied by operator install)
+EVALHUB_JOBS_WRITER_CLUSTERROLE: str = "trustyai-service-operator-evalhub-jobs-writer"
+EVALHUB_JOB_CONFIG_CLUSTERROLE: str = "trustyai-service-operator-evalhub-job-config"