Revert "Vectors/deprecate legacy introduce named vectors only syntax (#1659)"

This reverts commit f8d7d2d.

Author: rlmanrique

.github/workflows/main.yaml

@@ -20,12 +20,12 @@ concurrency:
 env:
   WEAVIATE_125: 1.25.34
   WEAVIATE_126: 1.26.17
-  WEAVIATE_127: 1.27.27
-  WEAVIATE_128: 1.28.16
-  WEAVIATE_129: 1.29.9
-  WEAVIATE_130: 1.30.11
+  WEAVIATE_127: 1.27.14
+  WEAVIATE_128: 1.28.8
+  WEAVIATE_129: 1.29.8
+  WEAVIATE_130: 1.30.9
   WEAVIATE_131: 1.31.5
-  WEAVIATE_132: 1.32.0-rc.1-098c594
+  WEAVIATE_132: 1.32.0-rc.0-6eb89d6.amd64
 
 jobs:
   lint-and-format:

.pre-commit-config.yaml

@@ -49,4 +49,4 @@ repos:
       language: node
       pass_filenames: false
       types: [python]
-      additional_dependencies: [pyright@1.1.400]
+      additional_dependencies: [pyright@1.1.398]

docs/conf.py

@@ -6,6 +6,7 @@
 import contextlib
 import os
 import sys
+
 from importlib.metadata import PackageNotFoundError
 from importlib.metadata import version as version_func
 

integration/conftest.py

@@ -28,7 +28,6 @@
     _ReferencePropertyBase,
     _ReplicationConfigCreate,
     _RerankerProvider,
-    _VectorConfigCreate,
     _VectorIndexConfigCreate,
     _VectorizerConfigCreate,
 )
@@ -59,9 +58,6 @@ def __call__(
         vector_index_config: Optional[_VectorIndexConfigCreate] = None,
         description: Optional[str] = None,
         reranker_config: Optional[_RerankerProvider] = None,
-        vector_config: Optional[
-            Optional[Union[_VectorConfigCreate, List[_VectorConfigCreate]]]
-        ] = None,
     ) -> Collection[Any, Any]:
         """Typing for fixture."""
         ...
@@ -133,9 +129,6 @@ def _factory(
         vector_index_config: Optional[_VectorIndexConfigCreate] = None,
         description: Optional[str] = None,
         reranker_config: Optional[_RerankerProvider] = None,
-        vector_config: Optional[
-            Optional[Union[_VectorConfigCreate, List[_VectorConfigCreate]]]
-        ] = None,
     ) -> Collection[Any, Any]:
         try:
             nonlocal client_fixture, name_fixtures, call_counter  # noqa: F824
@@ -155,8 +148,7 @@ def _factory(
             collection: Collection[Any, Any] = client_fixture.collections.create(
                 name=name_fixture,
                 description=description,
-                vectorizer_config=vectorizer_config
-                or (Configure.Vectorizer.none() if vector_config is None else None),
+                vectorizer_config=vectorizer_config or Configure.Vectorizer.none(),
                 properties=properties,
                 references=references,
                 inverted_index_config=inverted_index_config,
@@ -167,7 +159,6 @@ def _factory(
                 replication_config=replication_config,
                 vector_index_config=vector_index_config,
                 reranker_config=reranker_config,
-                vector_config=vector_config,
             )
             return collection
         except Exception as e:
@@ -324,9 +315,6 @@ def __call__(
         vectorizer_config: Optional[
             Union[_VectorizerConfigCreate, List[_NamedVectorConfigCreate]]
         ] = None,
-        vector_config: Optional[
-            Optional[Union[_VectorConfigCreate, List[_VectorConfigCreate]]]
-        ] = None,
     ) -> Collection[Any, Any]:
         """Typing for fixture."""
         ...
@@ -341,18 +329,17 @@ def _factory(
         vectorizer_config: Optional[
             Union[_VectorizerConfigCreate, List[_NamedVectorConfigCreate]]
         ] = None,
-        vector_config: Optional[
-            Optional[Union[_VectorConfigCreate, List[_VectorConfigCreate]]]
-        ] = None,
     ) -> Collection[Any, Any]:
         api_key = os.environ.get("OPENAI_APIKEY")
         if api_key is None:
             pytest.skip("No OpenAI API key found.")
 
+        if vectorizer_config is None:
+            vectorizer_config = Configure.Vectorizer.none()
+
         collection = collection_factory(
             name=name,
-            vectorizer_config=vectorizer_config,
-            vector_config=vector_config or Configure.Vectors.self_provided(),
+            vectorizer_config=vectorizer_config or Configure.Vectorizer.none(),
             properties=[
                 Property(name="text", data_type=DataType.TEXT),
                 Property(name="content", data_type=DataType.TEXT),

integration/test_client.py

@@ -1,4 +1,4 @@
-from typing import Callable, Generator, Optional, Tuple, Union
+from typing import Callable, Generator, Tuple, Union
 
 import pytest
 from _pytest.fixtures import SubRequest
@@ -28,7 +28,7 @@
 
 @pytest.fixture(scope="module")
 def client_factory() -> Generator[Callable[[int, int], weaviate.WeaviateClient], None, None]:
-    client: Optional[weaviate.WeaviateClient] = None
+    client: weaviate.WeaviateClient = None
 
     def maker(http: int, grpc: int) -> weaviate.WeaviateClient:
         nonlocal client
@@ -593,7 +593,7 @@ async def test_async_client_with_extra_options() -> None:
 
 def test_client_error_for_wcs_without_auth() -> None:
     with pytest.raises(weaviate.exceptions.AuthenticationFailedError) as e:
-        weaviate.connect_to_wcs(cluster_url=WCS_URL, auth_credentials=None)  # pyright: ignore
+        weaviate.connect_to_wcs(cluster_url=WCS_URL, auth_credentials=None)
         assert "wvc.init.Auth.api_key" in e.value.message