Skip to content

Commit 3cc1257

Browse files
databyjpdatabyjp
committed
Remove changes to deprecated vectorizer factories
1 parent f940647 commit 3cc1257

3 files changed

Lines changed: 58 additions & 68 deletions

File tree

‎test/collection/test_config.py‎

Lines changed: 53 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -127,61 +127,6 @@ def test_basic_config():
127127
}
128128
},
129129
),
130-
(
131-
Configure.Vectorizer.multi2vec_voyageai(
132-
model="voyage-multimodal-3.5",
133-
truncation=True,
134-
output_encoding="base64",
135-
vectorize_collection_name=True,
136-
base_url="https://api.voyageai.com",
137-
),
138-
{
139-
"multi2vec-voyageai": {
140-
"model": "voyage-multimodal-3.5",
141-
"truncation": True,
142-
"baseURL": "https://api.voyageai.com/",
143-
}
144-
},
145-
),
146-
(
147-
Configure.Vectorizer.multi2vec_voyageai(
148-
model="voyage-multimodal-3.5",
149-
truncation=True,
150-
text_fields=[Multi2VecField(name="text", weight=0.2)],
151-
image_fields=[Multi2VecField(name="image", weight=0.3)],
152-
video_fields=[Multi2VecField(name="video", weight=0.5)],
153-
),
154-
{
155-
"multi2vec-voyageai": {
156-
"model": "voyage-multimodal-3.5",
157-
"truncation": True,
158-
"textFields": ["text"],
159-
"imageFields": ["image"],
160-
"videoFields": ["video"],
161-
"weights": {
162-
"textFields": [0.2],
163-
"imageFields": [0.3],
164-
"videoFields": [0.5],
165-
},
166-
}
167-
},
168-
),
169-
(
170-
Configure.Vectorizer.multi2vec_voyageai(
171-
model="voyage-multimodal-3.5",
172-
dimensions=512,
173-
text_fields=["text"],
174-
video_fields=["video"],
175-
),
176-
{
177-
"multi2vec-voyageai": {
178-
"model": "voyage-multimodal-3.5",
179-
"dimensions": 512,
180-
"textFields": ["text"],
181-
"videoFields": ["video"],
182-
}
183-
},
184-
),
185130
(
186131
Configure.Vectorizer.multi2vec_nvidia(
187132
model="nvidia/nvclip",
@@ -2479,6 +2424,59 @@ def test_config_with_named_vectors(
24792424
}
24802425
},
24812426
),
2427+
(
2428+
Configure.Vectors.multi2vec_voyageai(
2429+
model="voyage-multimodal-3.5",
2430+
truncation=True,
2431+
base_url="https://api.voyageai.com",
2432+
),
2433+
{
2434+
"multi2vec-voyageai": {
2435+
"model": "voyage-multimodal-3.5",
2436+
"truncation": True,
2437+
"baseURL": "https://api.voyageai.com/",
2438+
}
2439+
},
2440+
),
2441+
(
2442+
Configure.Vectors.multi2vec_voyageai(
2443+
model="voyage-multimodal-3.5",
2444+
truncation=True,
2445+
text_fields=[Multi2VecField(name="text", weight=0.2)],
2446+
image_fields=[Multi2VecField(name="image", weight=0.3)],
2447+
video_fields=[Multi2VecField(name="video", weight=0.5)],
2448+
),
2449+
{
2450+
"multi2vec-voyageai": {
2451+
"model": "voyage-multimodal-3.5",
2452+
"truncation": True,
2453+
"textFields": ["text"],
2454+
"imageFields": ["image"],
2455+
"videoFields": ["video"],
2456+
"weights": {
2457+
"textFields": [0.2],
2458+
"imageFields": [0.3],
2459+
"videoFields": [0.5],
2460+
},
2461+
}
2462+
},
2463+
),
2464+
(
2465+
Configure.Vectors.multi2vec_voyageai(
2466+
model="voyage-multimodal-3.5",
2467+
dimensions=512,
2468+
text_fields=["text"],
2469+
video_fields=["video"],
2470+
),
2471+
{
2472+
"multi2vec-voyageai": {
2473+
"model": "voyage-multimodal-3.5",
2474+
"dimensions": 512,
2475+
"textFields": ["text"],
2476+
"videoFields": ["video"],
2477+
}
2478+
},
2479+
),
24822480
(
24832481
[
24842482
Configure.Vectors.multi2vec_clip(

‎weaviate/collections/classes/config_named_vectors.py‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -700,11 +700,9 @@ def multi2vec_voyageai(
700700
base_url: Optional[AnyHttpUrl] = None,
701701
model: Optional[Union[VoyageMultimodalModel, str]] = None,
702702
truncation: Optional[bool] = None,
703-
dimensions: Optional[int] = None,
704703
output_encoding: Optional[str] = None,
705704
image_fields: Optional[Union[List[str], List[Multi2VecField]]] = None,
706705
text_fields: Optional[Union[List[str], List[Multi2VecField]]] = None,
707-
video_fields: Optional[Union[List[str], List[Multi2VecField]]] = None,
708706
vector_index_config: Optional[_VectorIndexConfigCreate] = None,
709707
vectorize_collection_name: bool = True,
710708
) -> _NamedVectorConfigCreate:
@@ -719,11 +717,9 @@ def multi2vec_voyageai(
719717
vectorize_collection_name: Whether to vectorize the collection name. Defaults to `True`.
720718
model: The model to use. Defaults to `None`, which uses the server-defined default.
721719
truncation: The truncation strategy to use. Defaults to `None`, which uses the server-defined default.
722-
dimensions: The number of dimensions for the output embeddings. Defaults to `None`, which uses the model's default.
723720
base_url: The base URL to use where API requests should go. Defaults to `None`, which uses the server-defined default.
724721
image_fields: The image fields to use in vectorization.
725722
text_fields: The text fields to use in vectorization.
726-
video_fields: The video fields to use in vectorization.
727723
728724
Raises:
729725
pydantic.ValidationError: If `model` is not a valid value from the `VoyageaiMultimodalModel` type.
@@ -734,10 +730,10 @@ def multi2vec_voyageai(
734730
baseURL=base_url,
735731
model=model,
736732
truncation=truncation,
737-
dimensions=dimensions,
733+
dimensions=None,
738734
imageFields=_map_multi2vec_fields(image_fields),
739735
textFields=_map_multi2vec_fields(text_fields),
740-
videoFields=_map_multi2vec_fields(video_fields),
736+
videoFields=None,
741737
),
742738
vector_index_config=vector_index_config,
743739
)

‎weaviate/collections/classes/config_vectorizers.py‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -904,13 +904,11 @@ def multi2vec_voyageai(
904904
*,
905905
model: Optional[Union[VoyageMultimodalModel, str]] = None,
906906
truncation: Optional[bool] = None,
907-
dimensions: Optional[int] = None,
908-
output_encoding: Optional[str] = None,
907+
output_encoding: Optional[str],
909908
vectorize_collection_name: bool = True,
910909
base_url: Optional[AnyHttpUrl] = None,
911910
image_fields: Optional[Union[List[str], List[Multi2VecField]]] = None,
912911
text_fields: Optional[Union[List[str], List[Multi2VecField]]] = None,
913-
video_fields: Optional[Union[List[str], List[Multi2VecField]]] = None,
914912
) -> _VectorizerConfigCreate:
915913
"""Create a `_Multi2VecVoyageaiConfig` object for use when vectorizing using the `multi2vec-voyageai` model.
916914
@@ -920,13 +918,11 @@ def multi2vec_voyageai(
920918
Args:
921919
model: The model to use. Defaults to `None`, which uses the server-defined default.
922920
truncation: The truncation strategy to use. Defaults to `None`, which uses the server-defined default.
923-
dimensions: The number of dimensions for the output embeddings. Defaults to `None`, which uses the model's default (1024 for voyage-multimodal-3.5).
924921
output_encoding: Deprecated, has no effect.
925922
vectorize_collection_name: Deprecated, has no effect.
926923
base_url: The base URL to use where API requests should go. Defaults to `None`, which uses the server-defined default.
927924
image_fields: The image fields to use in vectorization.
928925
text_fields: The text fields to use in vectorization.
929-
video_fields: The video fields to use in vectorization.
930926
931927
Raises:
932928
pydantic.ValidationError: If `model` is not a valid value from the `VoyageMultimodalModel` type.
@@ -935,10 +931,10 @@ def multi2vec_voyageai(
935931
baseURL=base_url,
936932
model=model,
937933
truncation=truncation,
938-
dimensions=dimensions,
934+
dimensions=None,
939935
imageFields=_map_multi2vec_fields(image_fields),
940936
textFields=_map_multi2vec_fields(text_fields),
941-
videoFields=_map_multi2vec_fields(video_fields),
937+
videoFields=None,
942938
)
943939

944940
@staticmethod

0 commit comments

Comments
 (0)