From c4c931b2fa2aec59ad0aa6d9d2189c48c7d10800 Mon Sep 17 00:00:00 2001 From: Li Wan Date: Thu, 26 Sep 2024 17:38:27 +1000 Subject: [PATCH] Skip languagebind tests and add map features --- tests/cloud_test_logic/cloud_test_index.py | 46 ++++++++++++---------- tests/v2_tests/test_add_documents.py | 3 ++ 2 files changed, 28 insertions(+), 21 deletions(-) diff --git a/tests/cloud_test_logic/cloud_test_index.py b/tests/cloud_test_logic/cloud_test_index.py index 4be10e73..5507c743 100644 --- a/tests/cloud_test_logic/cloud_test_index.py +++ b/tests/cloud_test_logic/cloud_test_index.py @@ -108,31 +108,35 @@ class CloudTestIndex(str, Enum): {"name": "int_field_1", "type": "int", "features": ["score_modifier"]}, {"name": "int_filter_field_1", "type": "int", "features": ["filter", "score_modifier"]}, {"name": "bool_field_1", "type": "bool", "features": ["filter"]}, + {"name": "map_field_1", "type": "map", "features": ["score_modifier"]}, + {"name": "map_field_2", "type": "map", "features": ["score_modifier"]}, + {"name": "map_field_3", "type": "map", "features": ["score_modifier"]}, + {"name": "map_field_4", "type": "map", "features": ["score_modifier"]}, ], "tensorFields": ["text_field_1", "text_field_2", "text_field_3", "image_field_1"], "imagePreprocessing": { "patchMethod": "simple", } }, - CloudTestIndex.structured_languagebind_model: { - "type": "structured", - "model": "LanguageBind/Video_V1.5_FT_Audio_FT_Image", - "inferenceType": "marqo.GPU", - "storageClass": "marqo.balanced", - "allFields": [ - {"name": "text_field_1", "type": "text"}, - {"name": "text_field_2", "type": "text"}, - {"name": "text_field_3", "type": "text"}, - {"name": "video_field_1", "type": "video_pointer"}, - {"name": "video_field_2", "type": "video_pointer"}, - {"name": "video_field_3", "type": "video_pointer"}, - {"name": "audio_field_1", "type": "audio_pointer"}, - {"name": "audio_field_2", "type": "audio_pointer"}, - {"name": "image_field_1", "type": "image_pointer"}, - {"name": "image_field_2", "type": "image_pointer"}, - {"name": "multimodal_field", "type": "multimodal_combination"}, - ], - "tensorFields": ["multimodal_field", "text_field_3", "video_field_3", "audio_field_2", "image_field_2"], - "normalizeEmbeddings": True, - }, + # CloudTestIndex.structured_languagebind_model: { + # "type": "structured", + # "model": "LanguageBind/Video_V1.5_FT_Audio_FT_Image", + # "inferenceType": "marqo.GPU", + # "storageClass": "marqo.balanced", + # "allFields": [ + # {"name": "text_field_1", "type": "text"}, + # {"name": "text_field_2", "type": "text"}, + # {"name": "text_field_3", "type": "text"}, + # {"name": "video_field_1", "type": "video_pointer"}, + # {"name": "video_field_2", "type": "video_pointer"}, + # {"name": "video_field_3", "type": "video_pointer"}, + # {"name": "audio_field_1", "type": "audio_pointer"}, + # {"name": "audio_field_2", "type": "audio_pointer"}, + # {"name": "image_field_1", "type": "image_pointer"}, + # {"name": "image_field_2", "type": "image_pointer"}, + # {"name": "multimodal_field", "type": "multimodal_combination"}, + # ], + # "tensorFields": ["multimodal_field", "text_field_3", "video_field_3", "audio_field_2", "image_field_2"], + # "normalizeEmbeddings": True, + # }, } diff --git a/tests/v2_tests/test_add_documents.py b/tests/v2_tests/test_add_documents.py index 6142cc0d..0a65b44e 100644 --- a/tests/v2_tests/test_add_documents.py +++ b/tests/v2_tests/test_add_documents.py @@ -574,6 +574,7 @@ def test_custom_vector_doc(self): assert doc_res['_tensor_facets'][0]["my_custom_vector"] == "custom vector text" assert doc_res['_tensor_facets'][0]['_embedding'] == [1.0 for _ in range(DEFAULT_DIMENSIONS)] + @mark.skip def test_no_model_custom_vector_doc(self): """ Tests the `no_model` index model and searching with no `q` parameter. @@ -708,6 +709,7 @@ def test_add_empty_docs_batched(self): tensor_fields="field a") assert res == [] + @mark.skip def test_add_multimodal_single_documents(self): documents = [ { @@ -754,6 +756,7 @@ def test_add_multimodal_single_documents(self): self.assertIn('_embedding', tensor_facets[0]) self.assertEqual(len(tensor_facets[0]['_embedding']), 768) + @mark.skip def test_add_multimodal_field_document(self): multimodal_document = [{ "_id": "1_multimodal",