Skip to content

Commit 39e800b

Browse files
committed
Update
1 parent b1c141e commit 39e800b

6 files changed

Lines changed: 28 additions & 91 deletions

File tree

qa/L0_backend_python/model_readiness/test.sh

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ done
110110
#
111111
# Test User-Defined Model Readiness Function
112112
#
113-
echo -e "\n***\n*** Testing User-Defined is_model_ready() Function\n***"
113+
echo -e "\n***\n*** Testing User-Defined is_ready() Function\n***"
114114

115115
# Helper function to set up test models with different readiness behaviors based on config parameters
116116
setup_readiness_test_model() {
@@ -119,7 +119,7 @@ setup_readiness_test_model() {
119119
local delay_secs=$3
120120

121121
mkdir -p ./models/$model_name/1/
122-
if [ "$model_name" == "is_model_ready_fn_coroutine_returns_true" ]; then
122+
if [ "$model_name" == "is_ready_fn_coroutine_returns_true" ]; then
123123
cp ./test_models/readiness_coroutine_model.py ./models/$model_name/1/model.py
124124
else
125125
cp ./test_models/readiness_model.py ./models/$model_name/1/model.py
@@ -139,19 +139,19 @@ EOF
139139
}
140140

141141
# Create readiness test models using shared model.py + config parameters
142-
setup_readiness_test_model "is_model_ready_fn_returns_true" "true" "0.1"
143-
setup_readiness_test_model "is_model_ready_fn_returns_false" "false" "0.1"
144-
setup_readiness_test_model "is_model_ready_fn_raises_error" "exception" "0.1"
145-
setup_readiness_test_model "is_model_ready_fn_returns_non_boolean" "non_boolean" "0.1"
146-
setup_readiness_test_model "is_model_ready_fn_timeout" "true" "8"
147-
setup_readiness_test_model "is_model_ready_fn_coroutine_returns_true" "coroutine" "0.1"
142+
setup_readiness_test_model "is_ready_fn_returns_true" "true" "0.1"
143+
setup_readiness_test_model "is_ready_fn_returns_false" "false" "0.1"
144+
setup_readiness_test_model "is_ready_fn_raises_error" "exception" "0.1"
145+
setup_readiness_test_model "is_ready_fn_returns_non_boolean" "non_boolean" "0.1"
146+
setup_readiness_test_model "is_ready_fn_timeout" "true" "8"
147+
setup_readiness_test_model "is_ready_fn_coroutine_returns_true" "coroutine" "0.1"
148148

149149
# Decoupled model has a unique execute() and its own config
150-
mkdir -p ./models/is_model_ready_fn_returns_true_decoupled/1/
151-
cp ./test_models/is_model_ready_fn_returns_true_decoupled/model.py \
152-
./models/is_model_ready_fn_returns_true_decoupled/1/model.py
153-
cp ./test_models/is_model_ready_fn_returns_true_decoupled/config.pbtxt \
154-
./models/is_model_ready_fn_returns_true_decoupled/config.pbtxt
150+
mkdir -p ./models/is_ready_fn_returns_true_decoupled/1/
151+
cp ./test_models/is_ready_fn_returns_true_decoupled/model.py \
152+
./models/is_ready_fn_returns_true_decoupled/1/model.py
153+
cp ./test_models/is_ready_fn_returns_true_decoupled/config.pbtxt \
154+
./models/is_ready_fn_returns_true_decoupled/config.pbtxt
155155

156156
# Start server with all models
157157
SERVER_ARGS="--model-repository=$(pwd)/models --backend-directory=${BACKEND_DIR} --log-verbose=1"

qa/L0_backend_python/model_readiness/test_model_readiness.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ def test_model_not_ready(self):
157157

158158
class TestUserDefinedModelReadinessFunction(unittest.TestCase):
159159
"""
160-
Test user-defined is_model_ready() function
160+
Test user-defined is_ready() function
161161
"""
162162

163163
def setUp(self):
@@ -201,7 +201,7 @@ def _run_inference_decoupled(self, index, model_name, expected_responses_count):
201201
triton_client.stop_stream()
202202

203203
def test_multiple_concurrent_ready_and_infer_requests_decoupled(self):
204-
model_name = "is_model_ready_fn_returns_true_decoupled"
204+
model_name = "is_ready_fn_returns_true_decoupled"
205205
num_requests = 16
206206
response_count = 8
207207
readiness_errors = []
@@ -252,7 +252,7 @@ def inference_wrapper(index, model_name):
252252
self.assertEqual(len(infer_errors), 0, f"Inference errors: {infer_errors}")
253253

254254
def test_is_model_ready_coroutine_returns_true(self):
255-
model_name = "is_model_ready_fn_coroutine_returns_true"
255+
model_name = "is_ready_fn_coroutine_returns_true"
256256
for _ in range(5):
257257
self.assertTrue(
258258
self.client_http.is_model_ready(model_name),
@@ -266,7 +266,7 @@ def test_is_model_ready_coroutine_returns_true(self):
266266
call_inference_identity_model(model_name, "grpc", self.client_grpc)
267267

268268
def test_is_model_ready_returns_true(self):
269-
model_name = "is_model_ready_fn_returns_true"
269+
model_name = "is_ready_fn_returns_true"
270270
num_requests = 10
271271

272272
# Send multiple requests in sequence to ensure consistent behavior
@@ -285,7 +285,7 @@ def test_is_model_ready_returns_true(self):
285285
call_inference_identity_model(model_name, "grpc", self.client_grpc)
286286

287287
def test_is_model_ready_returns_false(self):
288-
model_name = "is_model_ready_fn_returns_false"
288+
model_name = "is_ready_fn_returns_false"
289289
num_requests = 10
290290

291291
# Send multiple requests in sequence to ensure consistent behavior
@@ -304,7 +304,7 @@ def test_is_model_ready_returns_false(self):
304304
call_inference_identity_model(model_name, "grpc", self.client_grpc)
305305

306306
def test_is_model_ready_raises_exception(self):
307-
model_name = "is_model_ready_fn_raises_error"
307+
model_name = "is_ready_fn_raises_error"
308308
num_requests = 10
309309

310310
# Send multiple requests in sequence to ensure consistent behavior
@@ -323,7 +323,7 @@ def test_is_model_ready_raises_exception(self):
323323
call_inference_identity_model(model_name, "grpc", self.client_grpc)
324324

325325
# Verify a healthy model is still ready to confirm server stability.
326-
model_name = "is_model_ready_fn_returns_true"
326+
model_name = "is_ready_fn_returns_true"
327327
for i in range(num_requests):
328328
self.assertTrue(
329329
self.client_http.is_model_ready(model_name),
@@ -339,7 +339,7 @@ def test_is_model_ready_raises_exception(self):
339339
call_inference_identity_model(model_name, "grpc", self.client_grpc)
340340

341341
def test_is_model_ready_returns_non_boolean(self):
342-
model_name = "is_model_ready_fn_returns_non_boolean"
342+
model_name = "is_ready_fn_returns_non_boolean"
343343
num_requests = 10
344344

345345
# Send multiple requests in sequence to ensure consistent behavior
@@ -358,7 +358,7 @@ def test_is_model_ready_returns_non_boolean(self):
358358
call_inference_identity_model(model_name, "grpc", self.client_grpc)
359359

360360
# Verify a healthy model is still ready to confirm server stability.
361-
model_name = "is_model_ready_fn_returns_true"
361+
model_name = "is_ready_fn_returns_true"
362362
for i in range(num_requests):
363363
self.assertTrue(
364364
self.client_http.is_model_ready(model_name),
@@ -374,7 +374,7 @@ def test_is_model_ready_returns_non_boolean(self):
374374
call_inference_identity_model(model_name, "grpc", self.client_grpc)
375375

376376
def test_is_model_ready_takes_long_time(self):
377-
model_name = "is_model_ready_fn_timeout"
377+
model_name = "is_ready_fn_timeout"
378378
num_requests = 10
379379

380380
# Send multiple requests in sequence to ensure consistent behavior
@@ -403,7 +403,7 @@ def test_is_model_ready_takes_long_time(self):
403403
call_inference_identity_model(model_name, "grpc", self.client_grpc)
404404

405405
def test_multiple_concurrent_ready_and_infer_requests(self):
406-
model_name = "is_model_ready_fn_returns_true"
406+
model_name = "is_ready_fn_returns_true"
407407
ready_results = {"http": [], "grpc": []}
408408
ready_errors = {"http": [], "grpc": []}
409409
infer_results = {"http": [], "grpc": []}

qa/L0_backend_python/model_readiness/test_models/is_model_ready_fn_returns_true_decoupled/model.py

Lines changed: 0 additions & 63 deletions
This file was deleted.

qa/L0_backend_python/model_readiness/test_models/is_model_ready_fn_returns_true_decoupled/config.pbtxt renamed to qa/L0_backend_python/model_readiness/test_models/is_ready_fn_returns_true_decoupled/config.pbtxt

File renamed without changes.

qa/L0_backend_python/model_readiness/test_models/readiness_coroutine_model.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
class TritonPythonModel:
3434
"""
35-
Parameterized test model for async is_model_ready() testing.
35+
Parameterized test model for async is_ready() testing.
3636
3737
Behavior is controlled via config.pbtxt parameters:
3838
READINESS_FN_DELAY_SECS - seconds to await before returning (e.g. "0.1")
@@ -53,6 +53,6 @@ def execute(self, requests):
5353
responses.append(pb_utils.InferenceResponse([out_tensor]))
5454
return responses
5555

56-
async def is_model_ready(self):
56+
async def is_ready(self):
5757
await asyncio.sleep(self.readiness_delay_secs)
5858
return True

qa/L0_backend_python/model_readiness/test_models/readiness_model.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
class TritonPythonModel:
3434
"""
35-
Parameterized test model for user-defined is_model_ready() testing.
35+
Parameterized test model for user-defined is_ready() testing.
3636
3737
Behavior is controlled via config.pbtxt parameters:
3838
READINESS_FN_RETURN_VALUE - "true", "false", "exception", or "non_boolean"
@@ -57,7 +57,7 @@ def execute(self, requests):
5757
responses.append(pb_utils.InferenceResponse([out_tensor]))
5858
return responses
5959

60-
def is_model_ready(self):
60+
def is_ready(self):
6161
if self.readiness_delay_secs > 0:
6262
time.sleep(self.readiness_delay_secs)
6363

0 commit comments

Comments
 (0)