Skip to content

Commit a7b6430

Browse files
speedstorm1copybara-github
authored andcommitted
chore: update tests to be compatible with Python 3.14, set 3.14 testing workflow as required
PiperOrigin-RevId: 825273830
1 parent e600277 commit a7b6430

File tree

6 files changed

+54
-22
lines changed

6 files changed

+54
-22
lines changed

testing/constraints-3.14.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ ipython==8.22.2 # Pinned to unbreak TypeAliasType import error
1313
google-adk==0.0.2
1414
google-genai>=1.10.0
1515
google-vizier==0.1.21
16-
pyarrow>=18.0.0
16+
pyarrow>=22.0.0

tests/unit/aiplatform/test_prediction.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3287,7 +3287,10 @@ def test_health(self, model_server_env_mock, importlib_import_module_mock_twice)
32873287

32883288
assert response.status_code == 200
32893289

3290-
def test_predict(self, model_server_env_mock, importlib_import_module_mock_twice):
3290+
@pytest.mark.asyncio
3291+
async def test_predict(
3292+
self, model_server_env_mock, importlib_import_module_mock_twice
3293+
):
32913294
model_server = CprModelServer()
32923295
client = TestClient(model_server.app)
32933296

tests/unit/vertex_rag/test_rag_data.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -419,9 +419,10 @@ def create_transformation_config(
419419
def rag_corpus_eq(returned_corpus, expected_corpus):
420420
assert returned_corpus.name == expected_corpus.name
421421
assert returned_corpus.display_name == expected_corpus.display_name
422-
assert returned_corpus.backend_config.__eq__(expected_corpus.backend_config)
423-
assert returned_corpus.vertex_ai_search_config.__eq__(
424-
expected_corpus.vertex_ai_search_config
422+
assert returned_corpus.backend_config == expected_corpus.backend_config
423+
assert (
424+
returned_corpus.vertex_ai_search_config
425+
== expected_corpus.vertex_ai_search_config
425426
)
426427

427428

@@ -464,8 +465,8 @@ def import_files_request_eq(returned_request, expected_request):
464465

465466
def rag_engine_config_eq(returned_config, expected_config):
466467
assert returned_config.name == expected_config.name
467-
assert returned_config.rag_managed_db_config.__eq__(
468-
expected_config.rag_managed_db_config
468+
assert (
469+
returned_config.rag_managed_db_config == expected_config.rag_managed_db_config
469470
)
470471

471472

tests/unit/vertex_rag/test_rag_data_preview.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -674,12 +674,13 @@ def create_transformation_config(
674674
def rag_corpus_eq(returned_corpus, expected_corpus):
675675
assert returned_corpus.name == expected_corpus.name
676676
assert returned_corpus.display_name == expected_corpus.display_name
677-
assert returned_corpus.vector_db.__eq__(expected_corpus.vector_db)
678-
assert returned_corpus.backend_config.__eq__(expected_corpus.backend_config)
679-
assert returned_corpus.vertex_ai_search_config.__eq__(
680-
expected_corpus.vertex_ai_search_config
677+
assert returned_corpus.vector_db == expected_corpus.vector_db
678+
assert returned_corpus.backend_config == expected_corpus.backend_config
679+
assert (
680+
returned_corpus.vertex_ai_search_config
681+
== expected_corpus.vertex_ai_search_config
681682
)
682-
assert returned_corpus.corpus_type_config.__eq__(expected_corpus.corpus_type_config)
683+
assert returned_corpus.corpus_type_config == expected_corpus.corpus_type_config
683684

684685

685686
def rag_file_eq(returned_file, expected_file):
@@ -729,8 +730,8 @@ def import_files_request_eq(returned_request, expected_request):
729730

730731
def rag_engine_config_eq(returned_config, expected_config):
731732
assert returned_config.name == expected_config.name
732-
assert returned_config.rag_managed_db_config.__eq__(
733-
expected_config.rag_managed_db_config
733+
assert (
734+
returned_config.rag_managed_db_config == expected_config.rag_managed_db_config
734735
)
735736

736737

vertexai/preview/rag/utils/_gapic_utils.py

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,24 @@ def _check_rag_embedding_model_config(
185185
return gapic_vector_db.rag_embedding_model_config.ByteSize() > 0
186186

187187

188+
def _check_document_corpus(
189+
gapic_corpus_type_config: GapicRagCorpus.CorpusTypeConfig,
190+
) -> bool:
191+
try:
192+
return gapic_corpus_type_config.__contains__("document_corpus")
193+
except AttributeError:
194+
return gapic_corpus_type_config.document_corpus.ByteSize() > 0
195+
196+
197+
def _check_memory_corpus(
198+
gapic_corpus_type_config: GapicRagCorpus.CorpusTypeConfig,
199+
) -> bool:
200+
try:
201+
return gapic_corpus_type_config.__contains__("memory_corpus")
202+
except AttributeError:
203+
return gapic_corpus_type_config.memory_corpus.ByteSize() > 0
204+
205+
188206
def _convert_gapic_to_rag_managed_db(
189207
gapic_rag_managed_db: GapicRagVectorDbConfig.RagManagedDb,
190208
) -> RagManagedDb:
@@ -252,10 +270,10 @@ def convert_gapic_to_vector_db(
252270

253271

254272
def convert_gapic_to_vertex_ai_search_config(
255-
gapic_vertex_ai_search_config: VertexAiSearchConfig,
256-
) -> VertexAiSearchConfig:
273+
gapic_vertex_ai_search_config: GapicVertexAiSearchConfig,
274+
) -> Optional[VertexAiSearchConfig]:
257275
"""Convert Gapic VertexAiSearchConfig to VertexAiSearchConfig."""
258-
if gapic_vertex_ai_search_config.serving_config:
276+
if gapic_vertex_ai_search_config.ByteSize() > 0:
259277
return VertexAiSearchConfig(
260278
serving_config=gapic_vertex_ai_search_config.serving_config,
261279
)
@@ -293,6 +311,8 @@ def convert_gapic_to_backend_config(
293311
gapic_vector_db: GapicRagVectorDbConfig,
294312
) -> RagVectorDbConfig:
295313
"""Convert Gapic RagVectorDbConfig to VertexVectorSearch, Pinecone, or RagManagedDb."""
314+
if not gapic_vector_db or not gapic_vector_db.ByteSize():
315+
return None
296316
vector_config = RagVectorDbConfig()
297317
if _check_pinecone(gapic_vector_db):
298318
vector_config.vector_db = Pinecone(
@@ -314,16 +334,21 @@ def convert_gapic_to_backend_config(
314334
gapic_vector_db.rag_embedding_model_config
315335
)
316336
)
337+
if (
338+
vector_config.vector_db is None
339+
and vector_config.rag_embedding_model_config is None
340+
):
341+
return None
317342
return vector_config
318343

319344

320345
def convert_gapic_to_rag_corpus_type_config(
321346
gapic_rag_corpus_type_config: GapicRagCorpus.CorpusTypeConfig,
322347
) -> RagCorpusTypeConfig:
323348
"""Convert GapicRagCorpus.CorpusTypeConfig to RagCorpusTypeConfig."""
324-
if gapic_rag_corpus_type_config.document_corpus:
349+
if _check_document_corpus(gapic_rag_corpus_type_config):
325350
return RagCorpusTypeConfig(corpus_type_config=DocumentCorpus())
326-
elif gapic_rag_corpus_type_config.memory_corpus:
351+
elif _check_memory_corpus(gapic_rag_corpus_type_config):
327352
return RagCorpusTypeConfig(
328353
corpus_type_config=MemoryCorpus(
329354
llm_parser=LlmParserConfig(

vertexai/rag/utils/_gapic_utils.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,8 @@ def convert_gapic_to_backend_config(
175175
gapic_vector_db: GapicRagVectorDbConfig,
176176
) -> RagVectorDbConfig:
177177
"""Convert Gapic RagVectorDbConfig to VertexVectorSearch, Pinecone, or RagManagedDb."""
178+
if not gapic_vector_db:
179+
return None
178180
vector_config = RagVectorDbConfig()
179181
if _check_pinecone(gapic_vector_db):
180182
vector_config.vector_db = Pinecone(
@@ -198,10 +200,10 @@ def convert_gapic_to_backend_config(
198200

199201

200202
def convert_gapic_to_vertex_ai_search_config(
201-
gapic_vertex_ai_search_config: VertexAiSearchConfig,
202-
) -> VertexAiSearchConfig:
203+
gapic_vertex_ai_search_config: GapicVertexAiSearchConfig,
204+
) -> Optional[VertexAiSearchConfig]:
203205
"""Convert Gapic VertexAiSearchConfig to VertexAiSearchConfig."""
204-
if gapic_vertex_ai_search_config.serving_config:
206+
if gapic_vertex_ai_search_config.ByteSize() > 0:
205207
return VertexAiSearchConfig(
206208
serving_config=gapic_vertex_ai_search_config.serving_config,
207209
)

0 commit comments

Comments
 (0)