Merge pull request #1755 from weaviate/cleanup_multi

Remove unused configs from new vectorizer syntax

Author: dirkkul

test/collection/test_config.py

@@ -124,7 +124,6 @@ def test_basic_config():
             "multi2vec-voyageai": {
                 "model": "voyage-multimodal-3",
                 "truncation": False,
-                "output_encoding": "base64",
                 "baseURL": "https://api.voyageai.com/",
             }
         },
@@ -133,15 +132,13 @@ def test_basic_config():
         Configure.Vectorizer.multi2vec_nvidia(
             model="nvidia/nvclip",
             truncation=False,
-            output_encoding="base64",
             vectorize_collection_name=False,
             base_url="https://integrate.api.nvidia.com",
         ),
         {
             "multi2vec-nvidia": {
                 "model": "nvidia/nvclip",
                 "truncation": False,
-                "output_encoding": "base64",
                 "baseURL": "https://integrate.api.nvidia.com/",
             }
         },

weaviate/collections/classes/config_named_vectors.py

@@ -725,7 +725,6 @@ def multi2vec_voyageai(
                 baseURL=base_url,
                 model=model,
                 truncation=truncation,
-                output_encoding=output_encoding,
                 imageFields=_map_multi2vec_fields(image_fields),
                 textFields=_map_multi2vec_fields(text_fields),
             ),
@@ -769,7 +768,6 @@ def multi2vec_nvidia(
                 baseURL=base_url,
                 model=model,
                 truncation=truncation,
-                output_encoding=output_encoding,
                 imageFields=_map_multi2vec_fields(image_fields),
                 textFields=_map_multi2vec_fields(text_fields),
             ),

weaviate/collections/classes/config_vectorizers.py

@@ -507,7 +507,6 @@ class _Multi2VecVoyageaiConfig(_Multi2VecBase):
     baseURL: Optional[AnyHttpUrl]
     model: Optional[str]
     truncation: Optional[bool]
-    output_encoding: Optional[str]
 
     def _to_dict(self) -> Dict[str, Any]:
         ret_dict = super()._to_dict()
@@ -523,7 +522,6 @@ class _Multi2VecNvidiaConfig(_Multi2VecBase):
     baseURL: Optional[AnyHttpUrl]
     model: Optional[str]
     truncation: Optional[bool]
-    output_encoding: Optional[str]
 
     def _to_dict(self) -> Dict[str, Any]:
         ret_dict = super()._to_dict()
@@ -852,8 +850,8 @@ def multi2vec_voyageai(
         Args:
             model: The model to use. Defaults to `None`, which uses the server-defined default.
             truncate: The truncation strategy to use. Defaults to `None`, which uses the server-defined default.
-            output_encoding: Format in which the embeddings are encoded. Defaults to `None`, so the embeddings are represented as a list of floating-point numbers.
-            vectorize_collection_name: Whether to vectorize the collection name. Defaults to `True`.
+            output_encoding: Deprecated, has no effect.
+            vectorize_collection_name: Deprecated, has no effect.
             base_url: The base URL to use where API requests should go. Defaults to `None`, which uses the server-defined default.
             image_fields: The image fields to use in vectorization.
             text_fields: The text fields to use in vectorization.
@@ -865,7 +863,6 @@ def multi2vec_voyageai(
             baseURL=base_url,
             model=model,
             truncation=truncation,
-            output_encoding=output_encoding,
             imageFields=_map_multi2vec_fields(image_fields),
             textFields=_map_multi2vec_fields(text_fields),
         )
@@ -875,7 +872,7 @@ def multi2vec_nvidia(
         *,
         model: Optional[str] = None,
         truncation: Optional[bool] = None,
-        output_encoding: Optional[str],
+        output_encoding: Optional[str] = None,
         vectorize_collection_name: bool = True,
         base_url: Optional[AnyHttpUrl] = None,
         image_fields: Optional[Union[List[str], List[Multi2VecField]]] = None,
@@ -889,8 +886,8 @@ def multi2vec_nvidia(
         Args:
             model: The model to use. Defaults to `None`, which uses the server-defined default.
             truncate: The truncation strategy to use. Defaults to `None`, which uses the server-defined default.
-            output_encoding: Format in which the embeddings are encoded. Defaults to `None`, so the embeddings are represented as a list of floating-point numbers.
-            vectorize_collection_name: Whether to vectorize the collection name. Defaults to `True`.
+            output_encoding: Deprecated, has no effect.
+            vectorize_collection_name: Deprecated, has no effect.
             base_url: The base URL to use where API requests should go. Defaults to `None`, which uses the server-defined default.
             image_fields: The image fields to use in vectorization.
             text_fields: The text fields to use in vectorization.
@@ -902,7 +899,6 @@ def multi2vec_nvidia(
             baseURL=base_url,
             model=model,
             truncation=truncation,
-            output_encoding=output_encoding,
             imageFields=_map_multi2vec_fields(image_fields),
             textFields=_map_multi2vec_fields(text_fields),
         )

weaviate/collections/classes/config_vectors.py

@@ -813,7 +813,6 @@ def multi2vec_voyageai(
         base_url: Optional[AnyHttpUrl] = None,
         image_fields: Optional[Union[List[str], List[Multi2VecField]]] = None,
         model: Optional[Union[VoyageMultimodalModel, str]] = None,
-        output_encoding: Optional[str] = None,
         text_fields: Optional[Union[List[str], List[Multi2VecField]]] = None,
         truncation: Optional[bool] = None,
         vector_index_config: Optional[_VectorIndexConfigCreate] = None,
@@ -843,7 +842,6 @@ def multi2vec_voyageai(
                 baseURL=base_url,
                 model=model,
                 truncation=truncation,
-                output_encoding=output_encoding,
                 imageFields=_map_multi2vec_fields(image_fields),
                 textFields=_map_multi2vec_fields(text_fields),
             ),
@@ -858,7 +856,6 @@ def multi2vec_nvidia(
         base_url: Optional[AnyHttpUrl] = None,
         image_fields: Optional[Union[List[str], List[Multi2VecField]]] = None,
         model: Optional[str] = None,
-        output_encoding: Optional[str] = None,
         text_fields: Optional[Union[List[str], List[Multi2VecField]]] = None,
         truncation: Optional[bool] = None,
         vector_index_config: Optional[_VectorIndexConfigCreate] = None,
@@ -874,7 +871,6 @@ def multi2vec_nvidia(
             base_url: The base URL to use where API requests should go. Defaults to `None`, which uses the server-defined default.
             image_fields: The image fields to use in vectorization.
             model: The model to use. Defaults to `None`, which uses the server-defined default.
-            output_encoding: The output encoding to use. Defaults to `None`, which uses the server-defined default.
             text_fields: The text fields to use in vectorization.
             truncation: The truncation strategy to use. Defaults to `None`, which uses the server-defined default.
             vector_index_config: The configuration for Weaviate's vector index. Use `wvc.config.Configure.VectorIndex` to create a vector index configuration. None by default
@@ -888,7 +884,6 @@ def multi2vec_nvidia(
                 baseURL=base_url,
                 model=model,
                 truncation=truncation,
-                output_encoding=output_encoding,
                 imageFields=_map_multi2vec_fields(image_fields),
                 textFields=_map_multi2vec_fields(text_fields),
             ),