Skip to content

Commit e038208

Browse files
authored
http/check_test: force timeout to 1s (#1728)
Avoid using the `self.timeout()` method which can lead to a sisution where we set `timeout=None`. Also rename the `self.timeout()` method to `task_gen_timeout()` to improve the readability.
1 parent 34d3eb8 commit e038208

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

ansible_ai_connect/ai/api/model_pipelines/http/pipelines.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def __init__(self, config: HttpConfiguration):
6969
i = self.config.timeout
7070
self._timeout = int(i) if i is not None else None
7171

72-
def timeout(self, task_count=1):
72+
def task_gen_timeout(self, task_count=1):
7373
return self._timeout * task_count if self._timeout else None
7474

7575

@@ -94,7 +94,7 @@ def invoke(self, params: CompletionsParameters) -> CompletionsResponse:
9494
self._prediction_url,
9595
headers=self.headers,
9696
json=model_input,
97-
timeout=self.timeout(task_count),
97+
timeout=self.task_gen_timeout(task_count),
9898
verify=self.config.verify_ssl,
9999
)
100100
result.raise_for_status()
@@ -113,7 +113,7 @@ def self_test(self) -> HealthCheckSummary:
113113
}
114114
)
115115
try:
116-
res = requests.get(url, verify=True)
116+
res = requests.get(url, verify=True, timeout=1)
117117
res.raise_for_status()
118118
except Exception as e:
119119
logger.exception(str(e))
@@ -144,7 +144,7 @@ def self_test(self) -> HealthCheckSummary:
144144
r = requests.get(
145145
self.config.inference_url + "/readiness",
146146
headers=headers,
147-
timeout=self.timeout(1),
147+
timeout=1,
148148
)
149149
r.raise_for_status()
150150

@@ -197,7 +197,7 @@ def invoke(self, params: ChatBotParameters) -> ChatBotResponse:
197197
self.config.inference_url + "/v1/query",
198198
headers=self.headers,
199199
json=data,
200-
timeout=self.timeout(1),
200+
timeout=self.task_gen_timeout(1),
201201
verify=self.config.verify_ssl,
202202
)
203203

ansible_ai_connect/ai/api/model_pipelines/langchain/pipelines.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ def __init__(self, config: LANGCHAIN_PIPELINE_CONFIGURATION):
157157
i = self.config.timeout
158158
self._timeout = int(i) if i is not None else None
159159

160-
def timeout(self, task_count=1):
160+
def task_gen_timeout(self, task_count=1):
161161
return self._timeout * task_count if self._timeout else None
162162

163163

ansible_ai_connect/ai/api/model_pipelines/llamacpp/pipelines.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def __init__(self, config: LlamaCppConfiguration):
4646
i = self.config.timeout
4747
self._timeout = int(i) if i is not None else None
4848

49-
def timeout(self, task_count=1):
49+
def task_gen_timeout(self, task_count=1):
5050
return self._timeout * task_count if self._timeout else None
5151

5252

@@ -110,7 +110,7 @@ def invoke(self, params: CompletionsParameters) -> CompletionsResponse:
110110
self._prediction_url,
111111
headers=self.headers,
112112
json=llm_params,
113-
timeout=self.timeout(task_count),
113+
timeout=self.task_gen_timeout(task_count),
114114
verify=self.config.verify_ssl,
115115
)
116116
result.raise_for_status()

ansible_ai_connect/ai/api/model_pipelines/wca/pipelines_base.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ def __init__(self, config: WCA_PIPELINE_CONFIGURATION):
207207
i = self.config.timeout
208208
self._timeout = int(i) if i is not None else None
209209

210-
def timeout(self, task_count=1):
210+
def task_gen_timeout(self, task_count=1):
211211
return self._timeout * task_count if self._timeout else None
212212

213213
@staticmethod
@@ -395,7 +395,7 @@ def post_request():
395395
prediction_url,
396396
headers=headers,
397397
json=data,
398-
timeout=self.timeout(task_count),
398+
timeout=self.task_gen_timeout(task_count),
399399
verify=self.config.verify_ssl,
400400
)
401401

@@ -469,7 +469,7 @@ def post_request() -> requests.Response:
469469
self._search_url,
470470
headers=headers,
471471
json=data,
472-
timeout=self.timeout(suggestion_count),
472+
timeout=self.task_gen_timeout(suggestion_count),
473473
verify=self.config.verify_ssl,
474474
)
475475

ansible_ai_connect/ai/api/tests/test_api_timeout.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,27 +38,27 @@ class TestApiTimeout(APIVersionTestCaseBase, WisdomServiceAPITestCaseBase):
3838

3939
def test_timeout_settings_is_none(self):
4040
model_client = HttpMetaData(mock_pipeline_config("http", timeout=None))
41-
self.assertIsNone(model_client.timeout(1))
41+
self.assertIsNone(model_client.task_gen_timeout(1))
4242

4343
def test_timeout_settings_is_not_none(self):
4444
model_client = HttpMetaData(mock_pipeline_config("http", timeout=123))
45-
self.assertEqual(123, model_client.timeout(1))
45+
self.assertEqual(123, model_client.task_gen_timeout(1))
4646

4747
def test_timeout_settings_is_not_none_multi_task(self):
4848
model_client = HttpMetaData(mock_pipeline_config("http", timeout=123))
49-
self.assertEqual(123 * 2, model_client.timeout(2))
49+
self.assertEqual(123 * 2, model_client.task_gen_timeout(2))
5050

5151
def test_timeout_settings_is_none_wca(self):
5252
model_client = WCASaaSCompletionsPipeline(mock_pipeline_config("wca", timeout=None))
53-
self.assertIsNone(model_client.timeout(1))
53+
self.assertIsNone(model_client.task_gen_timeout(1))
5454

5555
def test_timeout_settings_is_not_none_wca(self):
5656
model_client = WCASaaSCompletionsPipeline(mock_pipeline_config("wca", timeout=123))
57-
self.assertEqual(123, model_client.timeout(1))
57+
self.assertEqual(123, model_client.task_gen_timeout(1))
5858

5959
def test_timeout_settings_is_not_none_wca_multitask(self):
6060
model_client = WCASaaSCompletionsPipeline(mock_pipeline_config("wca", timeout=123))
61-
self.assertEqual(123 * 2, model_client.timeout(2))
61+
self.assertEqual(123 * 2, model_client.task_gen_timeout(2))
6262

6363
@override_settings(ANSIBLE_AI_ENABLE_TECH_PREVIEW=True)
6464
@patch("requests.Session.post", side_effect=ReadTimeout())

0 commit comments

Comments
 (0)