Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
b362382
Create size-labeler.yml
rnetser Dec 18, 2024
3c6a875
Delete .github/workflows/size-labeler.yml
rnetser Dec 18, 2024
ccb63af
Merge branch 'main' of github.com:rnetser/opendatahub-tests
rnetser Dec 24, 2024
da0c898
Merge branch 'main' of https://github.com/opendatahub-io/opendatahub-…
rnetser Dec 25, 2024
94a82ec
Merge branch 'main' of https://github.com/opendatahub-io/opendatahub-…
rnetser Dec 26, 2024
c0c82dd
Merge branch 'main' of https://github.com/opendatahub-io/opendatahub-…
rnetser Dec 27, 2024
5feb447
Merge branch 'main' of https://github.com/opendatahub-io/opendatahub-…
rnetser Dec 30, 2024
19b9c56
Merge branch 'main' of https://github.com/opendatahub-io/opendatahub-…
rnetser Dec 31, 2024
e22ac1a
Merge branch 'main' of https://github.com/opendatahub-io/opendatahub-…
rnetser Dec 31, 2024
56ab9c5
Merge branch 'main' of https://github.com/opendatahub-io/opendatahub-…
rnetser Dec 31, 2024
5a17f03
Merge branch 'main' of https://github.com/opendatahub-io/opendatahub-…
rnetser Dec 31, 2024
ef5fe65
Merge branch 'main' of https://github.com/opendatahub-io/opendatahub-…
rnetser Dec 31, 2024
1875a44
Merge branch 'main' of https://github.com/opendatahub-io/opendatahub-…
rnetser Jan 1, 2025
840d442
Merge branch 'main' of https://github.com/opendatahub-io/opendatahub-…
rnetser Jan 2, 2025
c0d4436
Merge branch 'main' of https://github.com/opendatahub-io/opendatahub-…
rnetser Jan 2, 2025
ba7971a
Merge branch 'main' of https://github.com/opendatahub-io/opendatahub-…
rnetser Jan 3, 2025
fd73a94
Merge branch 'main' of https://github.com/opendatahub-io/opendatahub-…
rnetser Jan 7, 2025
bde0493
Merge branch 'main' of https://github.com/opendatahub-io/opendatahub-…
rnetser Jan 8, 2025
d3cd799
Merge branch 'main' of https://github.com/opendatahub-io/opendatahub-…
rnetser Jan 9, 2025
710befa
Merge branch 'main' of https://github.com/opendatahub-io/opendatahub-…
rnetser Jan 12, 2025
a662364
Merge branch 'main' of https://github.com/opendatahub-io/opendatahub-…
rnetser Jan 16, 2025
579c283
Merge branch 'main' of https://github.com/opendatahub-io/opendatahub-…
rnetser Jan 16, 2025
927cbb0
Merge branch 'main' of https://github.com/opendatahub-io/opendatahub-…
rnetser Jan 19, 2025
99e242e
Merge branch 'main' of https://github.com/opendatahub-io/opendatahub-…
rnetser Jan 22, 2025
5b83bab
Merge branch 'main' of https://github.com/opendatahub-io/opendatahub-…
rnetser Jan 24, 2025
4b5b007
Merge branch 'main' of https://github.com/opendatahub-io/opendatahub-…
rnetser Jan 27, 2025
b8e5dee
Merge branch 'main' of https://github.com/opendatahub-io/opendatahub-…
rnetser Jan 30, 2025
0039df0
Merge branch 'main' of https://github.com/opendatahub-io/opendatahub-…
rnetser Jan 30, 2025
17938d6
model mesh - add auth tests
rnetser Feb 2, 2025
44a3120
xx
rnetser Feb 2, 2025
a418727
Merge branch 'main' of https://github.com/opendatahub-io/opendatahub-…
rnetser Feb 3, 2025
d291c32
Merge branch 'main' of https://github.com/opendatahub-io/opendatahub-…
rnetser Feb 4, 2025
b6650d8
Merge branch 'main' of https://github.com/opendatahub-io/opendatahub-…
rnetser Feb 5, 2025
8b9f838
Merge branch 'main' of https://github.com/opendatahub-io/opendatahub-…
rnetser Feb 7, 2025
d53a04c
Merge branch 'main' of https://github.com/opendatahub-io/opendatahub-…
rnetser Feb 10, 2025
db89111
Merge branch 'main' of https://github.com/opendatahub-io/opendatahub-…
rnetser Feb 10, 2025
773d81a
Merge branch 'main' of https://github.com/opendatahub-io/opendatahub-…
rnetser Feb 12, 2025
01be6e9
Merge branch 'main' of https://github.com/opendatahub-io/opendatahub-…
rnetser Feb 13, 2025
71df8d5
Merge branch 'main' of https://github.com/opendatahub-io/opendatahub-…
rnetser Feb 16, 2025
8896bd7
Merge branch 'main' of https://github.com/opendatahub-io/opendatahub-…
rnetser Feb 18, 2025
0eeb162
Merge branch 'main' of https://github.com/opendatahub-io/opendatahub-…
rnetser Feb 18, 2025
38e8a69
ci: on main upstream xxxxxxxxxxx
rnetser Feb 19, 2025
875f597
ci: reabsingxxxxxxxxxxxxxx
rnetser Feb 20, 2025
c90abf6
ci: reabsingxxxxxxxxxxxxxx
rnetser Feb 20, 2025
4a26346
ci: Merge branch 'main' of https://github.com/opendatahub-io/opendata…
rnetser Feb 24, 2025
8302ed1
ci: Merge branch 'main' of https://github.com/opendatahub-io/opendata…
rnetser Feb 25, 2025
ff1b155
ci: rebase on main
rnetser Mar 6, 2025
2104956
feat: add multi server serverless
rnetser Mar 6, 2025
ccafeee
feat: add multi server serverless
rnetser Mar 6, 2025
6f82b16
feat: add multi server serverless
rnetser Mar 10, 2025
7f8b680
ci: rebase on main
rnetser Mar 10, 2025
acfa113
ci: resolve conflicts
rnetser Mar 12, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file.
Empty file.
28 changes: 28 additions & 0 deletions tests/model_serving/model_server/serverless/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,20 @@

import pytest
from _pytest.fixtures import FixtureRequest
from kubernetes.dynamic import DynamicClient
from ocp_resources.inference_service import InferenceService
from ocp_resources.resource import ResourceEditor
from ocp_resources.namespace import Namespace
from ocp_resources.secret import Secret
from ocp_resources.serving_runtime import ServingRuntime

from tests.model_serving.model_server.serverless.utils import wait_for_canary_rollout
from tests.model_serving.model_server.utils import run_inference_multiple_times
from utilities.constants import ModelFormat, Protocols
from utilities.inference_utils import Inference
from utilities.manifests.caikit_tgis import CAIKIT_TGIS_INFERENCE_CONFIG
from utilities.constants import KServeDeploymentType, ModelName, ModelStoragePath
from utilities.inference_utils import create_isvc


@pytest.fixture(scope="class")
Expand Down Expand Up @@ -59,3 +65,25 @@ def multiple_tgis_inference_requests(s3_models_inference_service: InferenceServi
iterations=50,
run_in_parallel=True,
)


@pytest.fixture(scope="class")
def s3_flan_small_hf_caikit_serverless_inference_service(
request: FixtureRequest,
admin_client: DynamicClient,
model_namespace: Namespace,
serving_runtime_from_template: ServingRuntime,
models_endpoint_s3_secret: Secret,
) -> Generator[InferenceService, Any, Any]:
with create_isvc(
client=admin_client,
name=f"{ModelName.FLAN_T5_SMALL}-model",
namespace=model_namespace.name,
runtime=serving_runtime_from_template.name,
storage_key=models_endpoint_s3_secret.name,
storage_path=ModelStoragePath.FLAN_T5_SMALL_HF,
model_format=serving_runtime_from_template.instance.spec.supportedModelFormats[0].name,
deployment_mode=KServeDeploymentType.SERVERLESS,
external_route=True,
) as isvc:
yield isvc
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
import pytest

from tests.model_serving.model_server.utils import run_inference_multiple_times
from utilities.constants import (
KServeDeploymentType,
ModelAndFormat,
ModelName,
ModelStoragePath,
Protocols,
RuntimeTemplates,
)
from utilities.inference_utils import Inference
from utilities.manifests.pytorch import PYTORCH_TGIS_INFERENCE_CONFIG
from utilities.manifests.tgis_grpc import TGIS_INFERENCE_CONFIG

pytestmark = [pytest.mark.serverless, pytest.mark.sanity]


@pytest.mark.polarion("ODS-2371")
@pytest.mark.parametrize(
"model_namespace, serving_runtime_from_template, s3_models_inference_service",
[
pytest.param(
{"name": "serverless-multi-tgis-models"},
{
"name": "tgis-runtime",
"template-name": RuntimeTemplates.TGIS_GRPC_SERVING,
"multi-model": False,
"enable-http": False,
"enable-grpc": True,
},
{
"name": f"{ModelName.BLOOM_560M}-model",
"deployment-mode": KServeDeploymentType.SERVERLESS,
"model-dir": f"{ModelStoragePath.BLOOM_560M_CAIKIT}/artifacts",
"external-route": True,
},
)
],
indirect=True,
)
@pytest.mark.usefixtures("s3_flan_small_hf_caikit_serverless_inference_service")
class TestServerlessMultipleProjectsInNamespace:
def test_serverless_multi_tgis_models_inference_bloom(
self,
s3_models_inference_service,
):
"""Test inference with Bloom Caikit model when multiple models in the same namespace"""
run_inference_multiple_times(
isvc=s3_models_inference_service,
inference_config=PYTORCH_TGIS_INFERENCE_CONFIG,
model_name=ModelAndFormat.BLOOM_560M_CAIKIT,
inference_type=Inference.ALL_TOKENS,
protocol=Protocols.GRPC,
run_in_parallel=True,
iterations=5,
)

def test_serverless_multi_tgis_models_inference_flan(
self, s3_flan_small_hf_caikit_serverless_inference_service, s3_models_inference_service
):
"""Test inference with Flan Caikit model when multiple models in the same namespace"""
run_inference_multiple_times(
isvc=s3_flan_small_hf_caikit_serverless_inference_service,
inference_config=TGIS_INFERENCE_CONFIG,
model_name=ModelAndFormat.FLAN_T5_SMALL_CAIKIT,
inference_type=Inference.ALL_TOKENS,
protocol=Protocols.GRPC,
run_in_parallel=True,
iterations=5,
)
9 changes: 6 additions & 3 deletions tests/model_serving/model_server/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,10 @@ def run_inference_multiple_times(
verify_inference_response(**infer_kwargs)

if futures:
exceptions = []
for result in as_completed(futures):
_exception = result.exception()
if _exception:
LOGGER.error(f"Failed to run inference. Error: {_exception}")
if _exception := result.exception():
exceptions.append(_exception)

if exceptions:
raise InferenceResponseError(f"Failed to run inference. Error: {exceptions}")
Loading