Skip to content

Commit 5b455f4

Browse files
committed
Fix tests
1 parent b416603 commit 5b455f4

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

test/components/embedders/test_azure_document_embedder.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
from haystack.components.embedders import AzureOpenAIDocumentEmbedder
1414
from haystack.utils.azure import default_azure_ad_token_provider
1515
from unittest.mock import Mock, patch
16+
from haystack.utils.http_client import init_http_client
1617

1718

1819
class TestAzureOpenAIDocumentEmbedder:
@@ -220,14 +221,14 @@ def test_init_http_client(self, monkeypatch):
220221
monkeypatch.setenv("AZURE_OPENAI_ENDPOINT", "https://test.openai.azure.com")
221222

222223
embedder = AzureOpenAIDocumentEmbedder()
223-
client = embedder._init_http_client()
224+
client = init_http_client(embedder.http_client_kwargs, async_client=False)
224225
assert client is None
225226

226227
embedder.http_client_kwargs = {"proxy": "http://example.com:3128"}
227-
client = embedder._init_http_client(async_client=False)
228+
client = init_http_client(embedder.http_client_kwargs, async_client=False)
228229
assert isinstance(client, httpx.Client)
229230

230-
client = embedder._init_http_client(async_client=True)
231+
client = init_http_client(embedder.http_client_kwargs, async_client=True)
231232
assert isinstance(client, httpx.AsyncClient)
232233

233234
def test_http_client_kwargs_type_validation(self, monkeypatch):

test/components/embedders/test_azure_text_embedder.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
from haystack.components.embedders import AzureOpenAITextEmbedder
1010
from haystack.utils.azure import default_azure_ad_token_provider
11+
from haystack.utils.http_client import init_http_client
1112

1213

1314
class TestAzureOpenAITextEmbedder:
@@ -174,14 +175,14 @@ def test_init_http_client(self, monkeypatch):
174175
monkeypatch.setenv("AZURE_OPENAI_ENDPOINT", "https://test.openai.azure.com")
175176

176177
embedder = AzureOpenAITextEmbedder()
177-
client = embedder._init_http_client()
178+
client = init_http_client(embedder.http_client_kwargs, async_client=False)
178179
assert client is None
179180

180181
embedder.http_client_kwargs = {"proxy": "http://example.com:3128"}
181-
client = embedder._init_http_client(async_client=False)
182+
client = init_http_client(embedder.http_client_kwargs, async_client=False)
182183
assert isinstance(client, httpx.Client)
183184

184-
client = embedder._init_http_client(async_client=True)
185+
client = init_http_client(embedder.http_client_kwargs, async_client=True)
185186
assert isinstance(client, httpx.AsyncClient)
186187

187188
def test_http_client_kwargs_type_validation(self, monkeypatch):

test/components/generators/chat/test_azure.py

+3
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ def test_to_dict_default(self, monkeypatch):
110110
"tools": None,
111111
"tools_strict": False,
112112
"azure_ad_token_provider": None,
113+
"http_client_kwargs": None,
113114
},
114115
}
115116

@@ -124,6 +125,7 @@ def test_to_dict_with_parameters(self, monkeypatch):
124125
max_retries=10,
125126
generation_kwargs={"max_tokens": 10, "some_test_param": "test-params"},
126127
azure_ad_token_provider=default_azure_ad_token_provider,
128+
http_client_kwargs={"proxy": "http://localhost:8080"},
127129
)
128130
data = component.to_dict()
129131
assert data == {
@@ -143,6 +145,7 @@ def test_to_dict_with_parameters(self, monkeypatch):
143145
"tools_strict": False,
144146
"default_headers": {},
145147
"azure_ad_token_provider": "haystack.utils.azure.default_azure_ad_token_provider",
148+
"http_client_kwargs": {"proxy": "http://localhost:8080"},
146149
},
147150
}
148151

0 commit comments

Comments
 (0)