diff --git a/integration/conftest.py b/integration/conftest.py index 01e44e2c2..9e6bfd9b1 100644 --- a/integration/conftest.py +++ b/integration/conftest.py @@ -148,7 +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(), + vectorizer_config=vectorizer_config or Configure.Vectorizer.self_provided(), properties=properties, references=references, inverted_index_config=inverted_index_config, @@ -278,7 +278,7 @@ async def _factory( collection: CollectionAsync[Any, Any] = await client_fixture.collections.create( name=name_fixture, description=description, - vectorizer_config=vectorizer_config or Configure.Vectorizer.none(), + vectorizer_config=vectorizer_config or Configure.Vectorizer.self_provided(), properties=properties, references=references, inverted_index_config=inverted_index_config, @@ -335,11 +335,11 @@ def _factory( pytest.skip("No OpenAI API key found.") if vectorizer_config is None: - vectorizer_config = Configure.Vectorizer.none() + vectorizer_config = Configure.Vectorizer.self_provided() collection = collection_factory( name=name, - vectorizer_config=vectorizer_config or Configure.Vectorizer.none(), + vectorizer_config=vectorizer_config or Configure.Vectorizer.self_provided(), properties=[ Property(name="text", data_type=DataType.TEXT), Property(name="content", data_type=DataType.TEXT), @@ -384,11 +384,11 @@ async def _factory( pytest.skip("No OpenAI API key found.") if vectorizer_config is None: - vectorizer_config = Configure.Vectorizer.none() + vectorizer_config = Configure.Vectorizer.self_provided() collection = await async_collection_factory( name=name, - vectorizer_config=vectorizer_config or Configure.Vectorizer.none(), + vectorizer_config=vectorizer_config or Configure.Vectorizer.self_provided(), properties=[ Property(name="text", data_type=DataType.TEXT), Property(name="content", data_type=DataType.TEXT), diff --git a/integration/test_auth.py b/integration/test_auth.py index 95e11f32c..59eb693ba 100644 --- a/integration/test_auth.py +++ b/integration/test_auth.py @@ -276,7 +276,7 @@ def test_auth_e2e(request: SubRequest) -> None: properties=[ Property(name="name", data_type=DataType.TEXT), ], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) col.data.insert({"name": "test"}) col.data.insert_many([{"name": "test2"}]) diff --git a/integration/test_batch_v4.py b/integration/test_batch_v4.py index 345879240..5faeb9510 100644 --- a/integration/test_batch_v4.py +++ b/integration/test_batch_v4.py @@ -105,7 +105,7 @@ def _factory( ], references=[ReferenceProperty(name="test", target_collection=name_fixture)], multi_tenancy_config=Configure.multi_tenancy(multi_tenant), - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) return client_fixture, name_fixture diff --git a/integration/test_client.py b/integration/test_client.py index cb9bda516..925d83bbd 100644 --- a/integration/test_client.py +++ b/integration/test_client.py @@ -165,7 +165,9 @@ def test_create_get_and_delete(client: weaviate.WeaviateClient, request: SubRequ name = request.node.name client.collections.delete(name) - col = client.collections.create(name=name, vectorizer_config=Configure.Vectorizer.none()) + col = client.collections.create( + name=name, vectorizer_config=Configure.Vectorizer.self_provided() + ) assert client.collections.exists(name) assert isinstance(col, Collection) @@ -183,11 +185,11 @@ def test_delete_multiple(client: weaviate.WeaviateClient, request: SubRequest) - client.collections.create( name=name1, - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) client.collections.create( name=name2, - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) assert client.collections.exists(name1) assert client.collections.exists(name2) @@ -300,7 +302,9 @@ def test_create_export_and_recreate_named_vectors( source_properties=["name"], vectorize_collection_name=False, ), - Configure.NamedVectors.none("custom", vector_index_config=Configure.VectorIndex.flat()), + Configure.NamedVectors.self_provided( + "custom", vector_index_config=Configure.VectorIndex.flat() + ), ], ) conf = col.config.get() @@ -322,7 +326,7 @@ def test_collection_name_capitalization( try: collection = client.collections.create( name=name_small, - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) assert collection.name == name_big client.collections.delete(name_small) @@ -337,7 +341,7 @@ def test_client_cluster_with_lazy_shard_loading( ) -> None: try: collection = client.collections.create( - name=request.node.name, vectorizer_config=Configure.Vectorizer.none() + name=request.node.name, vectorizer_config=Configure.Vectorizer.self_provided() ) nodes = client.cluster.nodes(collection.name, output="verbose") @@ -359,7 +363,7 @@ def test_client_cluster_without_lazy_shard_loading( client = client_factory(8090, 50061) try: collection = client.collections.create( - name=request.node.name, vectorizer_config=Configure.Vectorizer.none() + name=request.node.name, vectorizer_config=Configure.Vectorizer.self_provided() ) nodes = client.cluster.nodes(collection.name, output="verbose") @@ -383,7 +387,7 @@ def test_client_cluster_multitenant(client: weaviate.WeaviateClient, request: Su collection = client.collections.create( name=request.node.name, multi_tenancy_config=Configure.multi_tenancy(enabled=True), - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) nodes = client.cluster.nodes(collection.name, output="verbose") @@ -396,7 +400,7 @@ def test_client_cluster_multitenant(client: weaviate.WeaviateClient, request: Su def test_client_cluster_minimal(client: weaviate.WeaviateClient, request: SubRequest) -> None: try: collection = client.collections.create( - name=request.node.name, vectorizer_config=Configure.Vectorizer.none() + name=request.node.name, vectorizer_config=Configure.Vectorizer.self_provided() ) nodes = client.cluster.nodes(collection.name, output="minimal") @@ -520,7 +524,7 @@ def test_client_with_skip_init_check(request: SubRequest) -> None: client.collections.delete(request.node.name) col = client.collections.create( name=request.node.name, - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[ Property(name="name", data_type=DataType.TEXT), Property(name="age", data_type=DataType.INT), @@ -634,7 +638,7 @@ def test_local_proxies() -> None: collection = client.collections.create( "TestLocalProxies", properties=[wvc.config.Property(name="name", data_type=wvc.config.DataType.TEXT)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) collection.data.insert({"name": "Test"}) assert collection.query.fetch_objects().objects[0].properties["name"] == "Test" diff --git a/integration/test_collection.py b/integration/test_collection.py index 06d08a426..c6629928f 100644 --- a/integration/test_collection.py +++ b/integration/test_collection.py @@ -71,7 +71,7 @@ class TestInsert(TypedDict): dummy = collection_factory( properties=[Property(name="Name", data_type=DataType.TEXT)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) collection = collection_factory_get(dummy.name, TestInsert) uuid = collection.data.insert(properties=TestInsert(name="some name")) @@ -87,7 +87,7 @@ def test_insert_with_dict_generic( ) -> None: dummy = collection_factory( properties=[Property(name="Name", data_type=DataType.TEXT)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) collection = collection_factory_get(dummy.name, Dict[str, str]) uuid = collection.data.insert(properties={"name": "some name"}) @@ -100,7 +100,7 @@ def test_insert_with_dict_generic( def test_insert_with_no_generic(collection_factory: CollectionFactory) -> None: collection = collection_factory( properties=[Property(name="Name", data_type=DataType.TEXT)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) uuid = collection.data.insert(properties={"name": "some name"}) objects = collection.query.fetch_objects() @@ -112,7 +112,7 @@ def test_insert_with_no_generic(collection_factory: CollectionFactory) -> None: def test_insert_with_consistency_level(collection_factory: CollectionFactory) -> None: collection = collection_factory( properties=[Property(name="Name", data_type=DataType.TEXT)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ).with_consistency_level(ConsistencyLevel.ALL) uuid = collection.data.insert(properties={"name": "some name"}) objects = collection.query.fetch_objects() @@ -134,7 +134,7 @@ def __init__(self) -> None: def test_delete_by_id(collection_factory: CollectionFactory) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) uuid = collection.data.insert(properties={}) @@ -145,7 +145,7 @@ def test_delete_by_id(collection_factory: CollectionFactory) -> None: def test_delete_by_id_consistency_level(collection_factory: CollectionFactory) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ).with_consistency_level(ConsistencyLevel.ALL) uuid = collection.data.insert(properties={}) @@ -224,7 +224,7 @@ def test_insert_many( ) -> None: collection = collection_factory( properties=[Property(name="Name", data_type=DataType.TEXT)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) if not should_error: ret = collection.data.insert_many(objects) @@ -258,7 +258,7 @@ def test_insert_many_all_error( ) -> None: collection = collection_factory( properties=[Property(name="Name", data_type=DataType.TEXT)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), multi_tenancy_config=Configure.multi_tenancy(True), ) with pytest.raises(WeaviateInsertManyAllFailedError) as e: @@ -278,7 +278,7 @@ class TestInsertManyWithTypedDict(TypedDict): dummy = collection_factory( properties=[Property(name="Name", data_type=DataType.TEXT)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) collection = collection_factory_get(dummy.name, TestInsertManyWithTypedDict) ret = collection.data.insert_many( @@ -297,7 +297,7 @@ class TestInsertManyWithTypedDict(TypedDict): def test_insert_many_with_refs(collection_factory: CollectionFactory) -> None: ref_collection = collection_factory( - name="target", vectorizer_config=Configure.Vectorizer.none() + name="target", vectorizer_config=Configure.Vectorizer.self_provided() ) uuid_to1 = ref_collection.data.insert(properties={}) uuid_to2 = ref_collection.data.insert(properties={}) @@ -306,7 +306,7 @@ def test_insert_many_with_refs(collection_factory: CollectionFactory) -> None: name="source", properties=[Property(name="Name", data_type=DataType.TEXT)], references=[ReferenceProperty(name="ref_single", target_collection=ref_collection.name)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) collection.config.add_reference( ReferenceProperty.MultiTarget( @@ -377,7 +377,7 @@ def test_insert_many_with_refs(collection_factory: CollectionFactory) -> None: def test_insert_many_error(collection_factory: CollectionFactory) -> None: collection = collection_factory( properties=[Property(name="Name", data_type=DataType.TEXT)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) ret = collection.data.insert_many( [ @@ -403,7 +403,7 @@ def test_insert_many_error(collection_factory: CollectionFactory) -> None: def test_replace(collection_factory: CollectionFactory) -> None: collection = collection_factory( properties=[Property(name="Name", data_type=DataType.TEXT)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) uuid = collection.data.insert(properties={"name": "some name"}) collection.data.replace(properties={"name": "other name"}, uuid=uuid) @@ -413,7 +413,7 @@ def test_replace(collection_factory: CollectionFactory) -> None: @pytest.mark.parametrize("to_uuids", [UUID3, [UUID3]]) def test_replace_with_refs(collection_factory: CollectionFactory, to_uuids: UUIDS) -> None: ref_collection = collection_factory( - name="target", vectorizer_config=Configure.Vectorizer.none() + name="target", vectorizer_config=Configure.Vectorizer.self_provided() ) ref_collection.data.insert(properties={}, uuid=UUID1) ref_collection.data.insert(properties={}, uuid=UUID2) @@ -423,7 +423,7 @@ def test_replace_with_refs(collection_factory: CollectionFactory, to_uuids: UUID name="source", properties=[Property(name="Name", data_type=DataType.TEXT)], references=[ReferenceProperty(name="ref", target_collection=ref_collection.name)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) uuid = collection.data.insert( properties={"name": "some name"}, @@ -453,7 +453,7 @@ def test_replace_with_refs(collection_factory: CollectionFactory, to_uuids: UUID def test_replace_overwrites_vector(collection_factory: CollectionFactory) -> None: collection = collection_factory( properties=[Property(name="Name", data_type=DataType.TEXT)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) uuid = collection.data.insert(properties={"name": "some name"}, vector=[1, 2, 3]) obj = collection.query.fetch_object_by_id(uuid, include_vector=True) @@ -474,7 +474,7 @@ def test_replace_overwrites_vector(collection_factory: CollectionFactory) -> Non @pytest.mark.parametrize("to_uuids", [UUID3, [UUID3]]) def test_update_with_refs(collection_factory: CollectionFactory, to_uuids: UUIDS) -> None: ref_collection = collection_factory( - name="target", vectorizer_config=Configure.Vectorizer.none() + name="target", vectorizer_config=Configure.Vectorizer.self_provided() ) ref_collection.data.insert(properties={}, uuid=UUID1) ref_collection.data.insert(properties={}, uuid=UUID2) @@ -484,7 +484,7 @@ def test_update_with_refs(collection_factory: CollectionFactory, to_uuids: UUIDS name="source", properties=[Property(name="Name", data_type=DataType.TEXT)], references=[ReferenceProperty(name="ref", target_collection=ref_collection.name)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) uuid = collection.data.insert( properties={"name": "some name"}, @@ -528,7 +528,7 @@ def test_types(collection_factory: CollectionFactory, data_type: DataType, value name = "name" collection = collection_factory( properties=[Property(name=name, data_type=data_type)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) uuid_object = collection.data.insert(properties={name: value}) @@ -545,7 +545,7 @@ def test_types(collection_factory: CollectionFactory, data_type: DataType, value def test_bm25(collection_factory: CollectionFactory) -> None: collection = collection_factory( properties=[Property(name="Name", data_type=DataType.TEXT)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) res = collection.data.insert_many( @@ -562,7 +562,7 @@ def test_bm25(collection_factory: CollectionFactory) -> None: def test_bm25_group_by(collection_factory: CollectionFactory) -> None: collection = collection_factory( properties=[Property(name="Name", data_type=DataType.TEXT)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) res = collection.data.insert_many( @@ -590,7 +590,7 @@ def test_bm25_group_by(collection_factory: CollectionFactory) -> None: def test_bm25_limit(collection_factory: CollectionFactory, limit: int) -> None: collection = collection_factory( properties=[Property(name="Name", data_type=DataType.TEXT, tokenization=Tokenization.WORD)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) res = collection.data.insert_many( @@ -608,7 +608,7 @@ def test_bm25_limit(collection_factory: CollectionFactory, limit: int) -> None: def test_bm25_offset(collection_factory: CollectionFactory, offset: int, expected: int) -> None: collection = collection_factory( properties=[Property(name="Name", data_type=DataType.TEXT, tokenization=Tokenization.WORD)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) res = collection.data.insert_many( @@ -627,7 +627,7 @@ def test_bm25_offset(collection_factory: CollectionFactory, offset: int, expecte def test_fetch_objects_offset(collection_factory: CollectionFactory, offset: int) -> None: collection = collection_factory( properties=[Property(name="Name", data_type=DataType.TEXT)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) nr_objects = 5 @@ -642,7 +642,7 @@ def test_fetch_objects_offset(collection_factory: CollectionFactory, offset: int def test_fetch_objects_limit(collection_factory: CollectionFactory, limit: int) -> None: collection = collection_factory( properties=[Property(name="Name", data_type=DataType.TEXT)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) for i in range(5): collection.data.insert({"Name": str(i)}) @@ -653,7 +653,7 @@ def test_fetch_objects_limit(collection_factory: CollectionFactory, limit: int) def test_search_after(collection_factory: CollectionFactory) -> None: collection = collection_factory( properties=[Property(name="Name", data_type=DataType.TEXT)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) nr_objects = 10 @@ -669,7 +669,7 @@ def test_search_after(collection_factory: CollectionFactory) -> None: def test_auto_limit(collection_factory: CollectionFactory) -> None: collection = collection_factory( properties=[Property(name="Name", data_type=DataType.TEXT)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), inverted_index_config=Configure.inverted_index(), ) for _ in range(4): @@ -702,7 +702,7 @@ def test_query_properties(collection_factory: CollectionFactory) -> None: Property(name="Name", data_type=DataType.TEXT), Property(name="Age", data_type=DataType.INT), ], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) collection.data.insert({"Name": "rain", "Age": 1}) collection.data.insert({"Name": "sun", "Age": 2}) @@ -827,7 +827,7 @@ def test_near_object_group_by_argument(collection_factory: CollectionFactory) -> def test_multi_searches(collection_factory: CollectionFactory) -> None: collection = collection_factory( properties=[Property(name="name", data_type=DataType.TEXT)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) collection.data.insert(properties={"name": "word"}) @@ -854,7 +854,7 @@ def test_multi_searches(collection_factory: CollectionFactory) -> None: def test_fetch_objects_with_limit(collection_factory: CollectionFactory) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[Property(name="name", data_type=DataType.TEXT)], ) @@ -867,7 +867,7 @@ def test_fetch_objects_with_limit(collection_factory: CollectionFactory) -> None def test_add_property(collection_factory: CollectionFactory) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[Property(name="name", data_type=DataType.TEXT)], ) uuid1 = collection.data.insert({"name": "first"}) @@ -924,7 +924,7 @@ def test_add_property_with_vectorizer(collection_factory: CollectionFactory) -> def test_add_reference(collection_factory: CollectionFactory) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[Property(name="name", data_type=DataType.TEXT)], ) uuid1 = collection.data.insert({"name": "first"}) @@ -946,7 +946,7 @@ def test_add_reference(collection_factory: CollectionFactory) -> None: def test_collection_config_get(collection_factory: CollectionFactory) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[ Property(name="name", data_type=DataType.TEXT), Property(name="age", data_type=DataType.INT), @@ -991,7 +991,7 @@ def test_return_properties_metadata_references_combos( include_vector: bool, ) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[ Property(name="name", data_type=DataType.TEXT), Property(name="age", data_type=DataType.INT), @@ -1067,7 +1067,7 @@ def test_insert_date_property( collection_factory: CollectionFactory, hours: int, minutes: int, sign: int ) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[Property(name="date", data_type=DataType.DATE)], ) @@ -1088,7 +1088,7 @@ def test_insert_date_property( def test_exist(collection_factory: CollectionFactory) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) uuid1 = collection.data.insert({}) @@ -1101,7 +1101,7 @@ def test_return_list_properties(collection_factory: CollectionFactory) -> None: name_small = "TestReturnList" collection = collection_factory( name=name_small, - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[ Property(name="ints", data_type=DataType.INT_ARRAY), Property(name="floats", data_type=DataType.NUMBER_ARRAY), @@ -1176,7 +1176,7 @@ def test_near_text( def test_near_text_error(collection_factory: CollectionFactory) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) with pytest.raises(ValueError): @@ -1407,7 +1407,7 @@ def test_return_properties_with_query_specific_typed_dict( collection_factory: CollectionFactory, which_case: int ) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[ Property(name="int_", data_type=DataType.INT), Property(name="ints", data_type=DataType.INT_ARRAY), @@ -1469,7 +1469,7 @@ class _Data(TypedDict): ints: List[int] collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[ Property(name="int_", data_type=DataType.INT), Property(name="ints", data_type=DataType.INT_ARRAY), @@ -1494,7 +1494,7 @@ class _Data(TypedDict): int_: int collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[ Property(name="int_", data_type=DataType.INT), Property(name="ints", data_type=DataType.INT_ARRAY), @@ -1515,7 +1515,7 @@ class _Data(TypedDict): def test_batch_with_arrays(collection_factory: CollectionFactory) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[ Property(name="texts", data_type=DataType.TEXT_ARRAY), Property(name="ints", data_type=DataType.INT_ARRAY), @@ -1581,7 +1581,7 @@ def test_sort( expected: List[int], ) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[ Property(name="age", data_type=DataType.INT), Property(name="name", data_type=DataType.TEXT), @@ -1607,7 +1607,7 @@ def test_sort( def test_optional_ref_returns(collection_factory: CollectionFactory) -> None: ref_collection = collection_factory( name="target", - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[Property(name="text", data_type=DataType.TEXT)], ) uuid_to1 = ref_collection.data.insert(properties={"text": "ref text"}) @@ -1617,7 +1617,7 @@ def test_optional_ref_returns(collection_factory: CollectionFactory) -> None: references=[ ReferenceProperty(name="ref", target_collection=ref_collection.name), ], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) collection.data.insert({}, references={"ref": uuid_to1}) @@ -1636,7 +1636,7 @@ def test_return_properties_with_type_hint_generic( value: str, ) -> None: dummy = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[ Property(name="name", data_type=DataType.TEXT), ], diff --git a/integration/test_collection_aggregate.py b/integration/test_collection_aggregate.py index af417c8d7..94cdbc553 100644 --- a/integration/test_collection_aggregate.py +++ b/integration/test_collection_aggregate.py @@ -39,7 +39,7 @@ def test_collection_length(collection_factory: CollectionFactory, how_many: int) -> None: """Uses `.aggregate` behind-the-scenes.""" collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) collection.data.insert_many([{} for _ in range(how_many)]) assert len(collection) == how_many @@ -49,7 +49,7 @@ def test_collection_length(collection_factory: CollectionFactory, how_many: int) def test_collection_length_tenant(collection_factory: CollectionFactory, how_many: int) -> None: """Uses `.aggregate` behind-the-scenes.""" collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), multi_tenancy_config=Configure.multi_tenancy(enabled=True), ) collection.tenants.create( diff --git a/integration/test_collection_async.py b/integration/test_collection_async.py index 5dcaad634..969d6a241 100644 --- a/integration/test_collection_async.py +++ b/integration/test_collection_async.py @@ -24,7 +24,7 @@ async def test_fetch_objects(async_collection_factory: AsyncCollectionFactory) - properties=[ Property(name="name", data_type=DataType.TEXT), ], - vectorizer_config=wvc.config.Configure.Vectorizer.none(), + vectorizer_config=wvc.config.Configure.Vectorizer.self_provided(), ) await collection.data.insert_many( [ @@ -67,7 +67,7 @@ async def test_fetch_objects_by_ids( properties=[ Property(name="name", data_type=DataType.TEXT), ], - vectorizer_config=wvc.config.Configure.Vectorizer.none(), + vectorizer_config=wvc.config.Configure.Vectorizer.self_provided(), ) await collection.data.insert_many( [ @@ -89,7 +89,7 @@ async def test_config_update(async_collection_factory: AsyncCollectionFactory) - Property(name="name", data_type=DataType.TEXT), ], multi_tenancy_config=wvc.config.Configure.multi_tenancy(), - vectorizer_config=wvc.config.Configure.Vectorizer.none(), + vectorizer_config=wvc.config.Configure.Vectorizer.self_provided(), ) await collection.config.update( multi_tenancy_config=wvc.config.Reconfigure.multi_tenancy( @@ -105,7 +105,7 @@ async def test_config_add_property(async_collection_factory: AsyncCollectionFact properties=[ Property(name="name", data_type=DataType.TEXT), ], - vectorizer_config=wvc.config.Configure.Vectorizer.none(), + vectorizer_config=wvc.config.Configure.Vectorizer.self_provided(), ) await collection.config.add_property(Property(name="age", data_type=DataType.INT)) @@ -116,7 +116,7 @@ async def test_config_add_reference(async_collection_factory: AsyncCollectionFac properties=[ Property(name="name", data_type=DataType.TEXT), ], - vectorizer_config=wvc.config.Configure.Vectorizer.none(), + vectorizer_config=wvc.config.Configure.Vectorizer.self_provided(), ) await collection.config.add_reference( wvc.config.ReferenceProperty(name="test", target_collection=collection.name) @@ -129,7 +129,7 @@ async def test_references(async_collection_factory: AsyncCollectionFactory) -> N properties=[ Property(name="name", data_type=DataType.TEXT), ], - vectorizer_config=wvc.config.Configure.Vectorizer.none(), + vectorizer_config=wvc.config.Configure.Vectorizer.self_provided(), ) await collection.config.add_reference( wvc.config.ReferenceProperty(name="marriage", target_collection=collection.name) @@ -199,7 +199,7 @@ async def test_iterator(async_collection_factory: AsyncCollectionFactory) -> Non properties=[ Property(name="name", data_type=DataType.TEXT), ], - vectorizer_config=wvc.config.Configure.Vectorizer.none(), + vectorizer_config=wvc.config.Configure.Vectorizer.self_provided(), ) await collection.data.insert_many( [ @@ -218,7 +218,7 @@ async def test_delete_many(async_collection_factory: AsyncCollectionFactory) -> properties=[ Property(name="name", data_type=DataType.TEXT), ], - vectorizer_config=wvc.config.Configure.Vectorizer.none(), + vectorizer_config=wvc.config.Configure.Vectorizer.self_provided(), ) ret = await collection.data.insert_many( [ @@ -234,7 +234,7 @@ async def test_delete_many(async_collection_factory: AsyncCollectionFactory) -> @pytest.mark.asyncio async def test_generate(async_openai_collection: AsyncOpenAICollectionFactory) -> None: collection = await async_openai_collection( - vectorizer_config=wvc.config.Configure.Vectorizer.none(), + vectorizer_config=wvc.config.Configure.Vectorizer.self_provided(), ) await collection.data.insert_many( [ @@ -279,7 +279,7 @@ async def test_generate_by_ids( expected: set, ) -> None: collection = await async_openai_collection( - vectorizer_config=wvc.config.Configure.Vectorizer.none(), + vectorizer_config=wvc.config.Configure.Vectorizer.self_provided(), ) await collection.data.insert_many( [ diff --git a/integration/test_collection_batch.py b/integration/test_collection_batch.py index 72b3b7c53..9abdf0ca8 100644 --- a/integration/test_collection_batch.py +++ b/integration/test_collection_batch.py @@ -62,7 +62,7 @@ def batch_collection( def _factory(name: str = "", multi_tenancy: bool = False) -> Collection[Any, Any]: collection = collection_factory( name=name, - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[ Property(name="name", data_type=DataType.TEXT), Property(name="age", data_type=DataType.INT), diff --git a/integration/test_collection_batch_delete.py b/integration/test_collection_batch_delete.py index 38c187751..c382bd40a 100644 --- a/integration/test_collection_batch_delete.py +++ b/integration/test_collection_batch_delete.py @@ -35,7 +35,7 @@ @pytest.mark.parametrize("verbose", [True, False]) def test_verbosity(collection_factory: CollectionFactory, verbose: bool) -> None: - collection = collection_factory(vectorizer_config=Configure.Vectorizer.none()) + collection = collection_factory(vectorizer_config=Configure.Vectorizer.self_provided()) uuid1 = collection.data.insert(properties={}) uuid2 = collection.data.insert(properties={}) @@ -63,7 +63,7 @@ def test_verbosity(collection_factory: CollectionFactory, verbose: bool) -> None def test_batch_delete_with_tenant(collection_factory: CollectionFactory) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), multi_tenancy_config=Configure.multi_tenancy(enabled=True), ) collection.tenants.create([Tenant(name="tenant1"), Tenant(name="tenant2")]) @@ -87,7 +87,7 @@ def test_batch_delete_with_tenant(collection_factory: CollectionFactory) -> None @pytest.mark.parametrize("dry_run", [True, False]) def test_dry_run(collection_factory: CollectionFactory, dry_run: bool) -> None: - collection = collection_factory(vectorizer_config=Configure.Vectorizer.none()) + collection = collection_factory(vectorizer_config=Configure.Vectorizer.self_provided()) uuid1 = collection.data.insert(properties={}) uuid2 = collection.data.insert(properties={}) @@ -111,7 +111,7 @@ def test_dry_run(collection_factory: CollectionFactory, dry_run: bool) -> None: def test_delete_by_time_metadata(collection_factory: CollectionFactory) -> None: collection = collection_factory( inverted_index_config=Configure.inverted_index(index_timestamps=True), - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) uuid1 = collection.data.insert(properties={}) @@ -133,7 +133,7 @@ def test_delete_many_or(collection_factory: CollectionFactory) -> None: Property(name="Name", data_type=DataType.TEXT), Property(name="Age", data_type=DataType.INT), ], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) collection.data.insert_many( [ @@ -159,7 +159,7 @@ def test_delete_many_return(collection_factory: CollectionFactory) -> None: properties=[ Property(name="Name", data_type=DataType.TEXT), ], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) collection.data.insert_many( [ @@ -179,7 +179,7 @@ def test_delete_many_and(collection_factory: CollectionFactory) -> None: Property(name="Name", data_type=DataType.TEXT), Property(name="Age", data_type=DataType.INT), ], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) collection.data.insert_many( [ @@ -533,7 +533,7 @@ def test_delete_many_simple( collection = collection_factory( properties=properties, inverted_index_config=Configure.inverted_index(index_null_state=True), - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) collection.data.insert_many(inserts) assert len(collection.query.fetch_objects().objects) == len(inserts) diff --git a/integration/test_collection_config.py b/integration/test_collection_config.py index 9a909ba0b..05da6c2e6 100644 --- a/integration/test_collection_config.py +++ b/integration/test_collection_config.py @@ -49,7 +49,7 @@ def client() -> Generator[weaviate.WeaviateClient, None, None]: def test_collections_list(client: weaviate.WeaviateClient) -> None: client.collections.create( - name="TestCollectionsList", vectorizer_config=Configure.Vectorizer.none() + name="TestCollectionsList", vectorizer_config=Configure.Vectorizer.self_provided() ) collections = client.collections.list_all() @@ -65,7 +65,7 @@ def test_collections_list(client: weaviate.WeaviateClient) -> None: def test_collection_get_simple(collection_factory: CollectionFactory) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[ Property(name="name", data_type=DataType.TEXT), Property(name="age", data_type=DataType.INT), @@ -110,7 +110,7 @@ def test_collection_vectorizer_config(collection_factory: CollectionFactory) -> def test_collection_generative_config(openai_collection: OpenAICollection) -> None: collection = openai_collection( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) config = collection.config.get() @@ -179,7 +179,7 @@ def test_collection_config_defaults(collection_factory: CollectionFactory) -> No multi_tenancy_config=Configure.multi_tenancy(), replication_config=Configure.replication(), vector_index_config=Configure.VectorIndex.hnsw(), - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) config = collection.config.get() @@ -390,7 +390,7 @@ def test_collection_config_full(collection_factory: CollectionFactory) -> None: def test_collection_config_update(collection_factory: CollectionFactory) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[ Property(name="name", data_type=DataType.TEXT), Property(name="age", data_type=DataType.INT), @@ -673,7 +673,7 @@ def test_update_flat(collection_factory: CollectionFactory) -> None: def test_collection_config_get_shards(collection_factory: CollectionFactory) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[ Property(name="name", data_type=DataType.TEXT), Property(name="age", data_type=DataType.INT), @@ -687,7 +687,7 @@ def test_collection_config_get_shards(collection_factory: CollectionFactory) -> def test_collection_update_shards(collection_factory: CollectionFactory) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), multi_tenancy_config=Configure.multi_tenancy(enabled=True), ) @@ -719,7 +719,7 @@ def test_collection_update_shards(collection_factory: CollectionFactory) -> None def test_collection_config_get_shards_multi_tenancy(collection_factory: CollectionFactory) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), multi_tenancy_config=Configure.multi_tenancy(enabled=True), properties=[ Property(name="name", data_type=DataType.TEXT), @@ -796,7 +796,7 @@ def test_config_reranker_module( ) -> None: collection = collection_factory( reranker_config=reranker_config, - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) conf = collection.config.get() assert conf.reranker_config is not None @@ -806,7 +806,7 @@ def test_config_reranker_module( def test_config_nested_properties(collection_factory: CollectionFactory) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[ Property( name="name", @@ -830,7 +830,7 @@ def test_config_nested_properties(collection_factory: CollectionFactory) -> None def test_config_export_and_recreate_from_config(collection_factory: CollectionFactory) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[ Property(name="name", data_type=DataType.TEXT), Property(name="age", data_type=DataType.INT), @@ -853,7 +853,7 @@ def test_config_export_and_recreate_from_dict(collection_factory: CollectionFact generative_config=Configure.Generative.custom( "generative-anyscale", module_config={"temperature": 0.5} ), - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), reranker_config=Configure.Reranker.custom( "reranker-cohere", module_config={"model": "rerank-english-v2.0"} ), @@ -971,7 +971,7 @@ def test_config_export_and_recreate_from_dict(collection_factory: CollectionFact def test_config_add_existing_property_and_reference(collection_factory: CollectionFactory) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[ Property(name="name", data_type=DataType.TEXT), ], @@ -989,7 +989,7 @@ def test_config_add_existing_property_and_reference(collection_factory: Collecti def test_config_skip_vector_index(collection_factory: CollectionFactory) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), vector_index_config=Configure.VectorIndex.none(), ) config = collection.config.get() @@ -1320,7 +1320,7 @@ def test_replication_config( def test_update_property_descriptions(collection_factory: CollectionFactory) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[ Property(name="name", data_type=DataType.TEXT), Property(name="age", data_type=DataType.INT), diff --git a/integration/test_collection_filter.py b/integration/test_collection_filter.py index 025fa4279..81e0f026e 100644 --- a/integration/test_collection_filter.py +++ b/integration/test_collection_filter.py @@ -47,7 +47,7 @@ def test_filters_text( ) -> None: collection = collection_factory( properties=[Property(name="Name", data_type=DataType.TEXT)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) uuids = [ @@ -80,7 +80,7 @@ def test_array_types( results: List[int], ) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[ Property(name="texts", data_type=DataType.TEXT_ARRAY), Property(name="ints", data_type=DataType.INT_ARRAY), @@ -117,7 +117,7 @@ def test_filter_with_wrong_types( results: Optional[List[int]], ) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[ Property(name="int", data_type=DataType.INT), Property(name="float", data_type=DataType.NUMBER), @@ -172,7 +172,7 @@ def test_filters_nested( results: List[int], ) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[Property(name="num", data_type=DataType.NUMBER)], inverted_index_config=Configure.inverted_index(index_null_state=True), ) @@ -193,7 +193,7 @@ def test_filters_nested( def test_length_filter(collection_factory: CollectionFactory) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[Property(name="field", data_type=DataType.TEXT)], inverted_index_config=Configure.inverted_index(index_property_length=True), ) @@ -226,7 +226,7 @@ def test_filters_comparison( results: List[int], ) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[Property(name="number", data_type=DataType.INT)], inverted_index_config=Configure.inverted_index(index_null_state=True), ) @@ -290,7 +290,7 @@ def test_filters_contains( results: List[int], ) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[ Property(name="text", data_type=DataType.TEXT), Property(name="texts", data_type=DataType.TEXT_ARRAY), @@ -398,7 +398,7 @@ def test_ref_filters( ) -> None: to_collection = collection_factory( name="Target", - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[ Property(name="int", data_type=DataType.INT), Property(name="text", data_type=DataType.TEXT), @@ -415,7 +415,7 @@ def test_ref_filters( Property(name="name", data_type=DataType.TEXT), ], references=[ReferenceProperty(name="ref", target_collection=to_collection.name)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) from_collection.config.add_reference( ReferenceProperty(name="ref2", target_collection=from_collection.name) @@ -446,7 +446,7 @@ def test_ref_filters( def test_ref_filters_multi_target(collection_factory: CollectionFactory) -> None: to_collection = collection_factory( name="target", - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[Property(name="int", data_type=DataType.INT)], ) @@ -457,7 +457,7 @@ def test_ref_filters_multi_target(collection_factory: CollectionFactory) -> None properties=[ Property(name="name", data_type=DataType.TEXT), ], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) from_collection.config.add_reference( ReferenceProperty.MultiTarget( @@ -533,7 +533,7 @@ def test_filter_id(collection_factory: CollectionFactory, weav_filter: _FilterVa properties=[ Property(name="Name", data_type=DataType.TEXT), ], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) collection.data.insert_many( @@ -578,7 +578,7 @@ def test_filter_ids( properties=[ Property(name="Name", data_type=DataType.TEXT), ], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) collection.data.insert_many( @@ -601,7 +601,7 @@ def test_filter_timestamp_direct_path(collection_factory: CollectionFactory, pat properties=[ Property(name="Name", data_type=DataType.TEXT), ], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), inverted_index_config=Configure.inverted_index(index_timestamps=True), ) @@ -628,7 +628,7 @@ def test_time_update_and_creation_time(collection_factory: CollectionFactory) -> properties=[ Property(name="Name", data_type=DataType.TEXT), ], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), inverted_index_config=Configure.inverted_index(index_timestamps=True), ) @@ -678,7 +678,7 @@ def test_time_filter( results: List[int], ) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), inverted_index_config=Configure.inverted_index(index_timestamps=True), ) collection.data.insert(properties={}) @@ -700,7 +700,7 @@ def test_time_filter( def test_time_filter_contains(collection_factory: CollectionFactory) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), inverted_index_config=Configure.inverted_index(index_timestamps=True), ) collection.data.insert(properties={}) diff --git a/integration/test_collection_geo.py b/integration/test_collection_geo.py index b70daac00..8a485a973 100644 --- a/integration/test_collection_geo.py +++ b/integration/test_collection_geo.py @@ -6,7 +6,7 @@ def test_creating_geo_props(collection_factory: CollectionFactory) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[Property(name="geo", data_type=DataType.GEO_COORDINATES)], ) @@ -39,7 +39,7 @@ def test_creating_geo_props(collection_factory: CollectionFactory) -> None: def test_geo_props_query(collection_factory: CollectionFactory) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[Property(name="geo", data_type=DataType.GEO_COORDINATES)], ) @@ -51,7 +51,7 @@ def test_geo_props_query(collection_factory: CollectionFactory) -> None: def test_geo_props_filter(collection_factory: CollectionFactory) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[Property(name="geo", data_type=DataType.GEO_COORDINATES)], ) diff --git a/integration/test_collection_hybrid.py b/integration/test_collection_hybrid.py index dc49943c7..9f396a1e9 100644 --- a/integration/test_collection_hybrid.py +++ b/integration/test_collection_hybrid.py @@ -99,7 +99,7 @@ def test_search_hybrid_only_vector( def test_hybrid_limit(collection_factory: CollectionFactory, limit: int) -> None: collection = collection_factory( properties=[Property(name="Name", data_type=DataType.TEXT)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) res = collection.data.insert_many( @@ -117,7 +117,7 @@ def test_hybrid_limit(collection_factory: CollectionFactory, limit: int) -> None def test_hybrid_offset(collection_factory: CollectionFactory, offset: int, expected: int) -> None: collection = collection_factory( properties=[Property(name="Name", data_type=DataType.TEXT)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) res = collection.data.insert_many( @@ -387,8 +387,8 @@ def test_vector_per_target( collection = collection_factory( properties=[], vectorizer_config=[ - Configure.NamedVectors.none("first"), - Configure.NamedVectors.none("second"), + Configure.NamedVectors.self_provided("first"), + Configure.NamedVectors.self_provided("second"), ], ) @@ -450,8 +450,8 @@ def test_same_target_vector_multiple_input_combinations( collection = collection_factory( properties=[], vectorizer_config=[ - wvc.config.Configure.NamedVectors.none("first"), - wvc.config.Configure.NamedVectors.none("second"), + wvc.config.Configure.NamedVectors.self_provided("first"), + wvc.config.Configure.NamedVectors.self_provided("second"), ], ) @@ -494,7 +494,7 @@ def test_vector_distance(collection_factory: CollectionFactory): def test_aggregate_max_vector_distance(collection_factory: CollectionFactory) -> None: collection = collection_factory( properties=[Property(name="name", data_type=DataType.TEXT)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) if collection._connection._weaviate_version.is_lower_than(1, 26, 3): diff --git a/integration/test_collection_model.py b/integration/test_collection_model.py index 42438734e..3d3ca1cdb 100644 --- a/integration/test_collection_model.py +++ b/integration/test_collection_model.py @@ -41,7 +41,7 @@ # client = weaviate.WeaviateClient(connection_params) # client._collection_model.delete(Group) # collection = client._collection_model.create( -# CollectionModelConfig[Group](model=Group, vectorizer_config=Configure.Vectorizer.none()) +# CollectionModelConfig[Group](model=Group, vectorizer_config=Configure.Vectorizer.self_provided()) # ) # collection.data.insert(obj=Group(name="Name", uuid=REF_TO_UUID)) @@ -75,7 +75,7 @@ # client._collection_model.delete(ModelTypes) # collection = client._collection_model.create( # CollectionModelConfig[ModelTypes]( -# model=ModelTypes, vectorizer_config=Configure.Vectorizer.none() +# model=ModelTypes, vectorizer_config=Configure.Vectorizer.self_provided() # ) # ) # assert collection.model == ModelTypes @@ -110,7 +110,7 @@ # client._collection_model.delete(ModelTypes) # collection = client._collection_model.create( # CollectionModelConfig[ModelTypes]( -# model=ModelTypes, vectorizer_config=Configure.Vectorizer.none() +# model=ModelTypes, vectorizer_config=Configure.Vectorizer.self_provided() # ) # ) # assert collection.model == ModelTypes @@ -130,7 +130,7 @@ # client._collection_model.delete(DeleteModel) # client._collection_model.create( # CollectionModelConfig[DeleteModel]( -# model=DeleteModel, vectorizer_config=Configure.Vectorizer.none() +# model=DeleteModel, vectorizer_config=Configure.Vectorizer.self_provided() # ) # ) @@ -146,7 +146,7 @@ # client._collection_model.delete(SearchTest) # collection = client._collection_model.create( # CollectionModelConfig[SearchTest]( -# model=SearchTest, vectorizer_config=Configure.Vectorizer.none() +# model=SearchTest, vectorizer_config=Configure.Vectorizer.self_provided() # ) # ) @@ -165,7 +165,7 @@ # client._collection_model.delete(TenantsTest) # collection = client._collection_model.create( # CollectionModelConfig[TenantsTest]( -# vectorizer_config=Configure.Vectorizer.none(), +# vectorizer_config=Configure.Vectorizer.self_provided(), # multi_tenancy_config=Configure.multi_tenancy(enabled=True), # model=TenantsTest, # ) @@ -191,7 +191,7 @@ # client._collection_model.delete(TenantsUpdateTest) # collection = client._collection_model.create( # CollectionModelConfig[TenantsUpdateTest]( -# vectorizer_config=Configure.Vectorizer.none(), +# vectorizer_config=Configure.Vectorizer.self_provided(), # multi_tenancy_config=Configure.multi_tenancy(enabled=True), # model=TenantsUpdateTest, # ) @@ -216,7 +216,7 @@ # client._collection_model.delete(TenantsUpdateTest) # collection = client._collection_model.create( # CollectionModelConfig[TenantsUpdateTest]( -# vectorizer_config=Configure.Vectorizer.none(), +# vectorizer_config=Configure.Vectorizer.self_provided(), # multi_tenancy_config=Configure.multi_tenancy(enabled=True), # model=TenantsUpdateTest, # ) @@ -237,7 +237,7 @@ # client._collection_model.delete(TestMultiSearches) # collection = client._collection_model.create( # CollectionModelConfig[TestMultiSearches]( -# model=TestMultiSearches, vectorizer_config=Configure.Vectorizer.none() +# model=TestMultiSearches, vectorizer_config=Configure.Vectorizer.self_provided() # ) # ) @@ -269,7 +269,7 @@ # # client._collection_model.delete(TestMultiSearchesWithReferences) # # collection = client._collection_model.create( # # CollectionModelConfig[TestMultiSearchesWithReferences]( -# # model=TestMultiSearchesWithReferences, vectorizer_config=Configure.Vectorizer.none() +# # model=TestMultiSearchesWithReferences, vectorizer_config=Configure.Vectorizer.self_provided() # # ) # # ) @@ -307,7 +307,7 @@ # collection = client._collection_model.create( # CollectionModelConfig[TestTenantSearch]( # model=TestTenantSearch, -# vectorizer_config=Configure.Vectorizer.none(), +# vectorizer_config=Configure.Vectorizer.self_provided(), # multi_tenancy_config=Configure.multi_tenancy(enabled=True), # ) # ) @@ -363,7 +363,7 @@ # client._collection_model.delete(TestPropUpdate) # collection_first = client._collection_model.create( # CollectionModelConfig[TestPropUpdate]( -# model=TestPropUpdate, vectorizer_config=Configure.Vectorizer.none() +# model=TestPropUpdate, vectorizer_config=Configure.Vectorizer.self_provided() # ) # ) # uuid_first = collection_first.data.insert(TestPropUpdate(name="first")) @@ -413,7 +413,7 @@ # collection = client._collection_model.create( # CollectionModelConfig[TestReturnEverythingORM]( # model=TestReturnEverythingORM, -# vectorizer_config=Configure.Vectorizer.none(), +# vectorizer_config=Configure.Vectorizer.self_provided(), # ) # ) # collection.data.insert(TestReturnEverythingORM(name="word")) @@ -436,7 +436,7 @@ # collection = client._collection_model.create( # CollectionModelConfig[TestEmptyProperties]( # model=TestEmptyProperties, -# vectorizer_config=Configure.Vectorizer.none(), +# vectorizer_config=Configure.Vectorizer.self_provided(), # ) # ) # collection.data.insert(TestEmptyProperties(name="word")) @@ -459,7 +459,7 @@ # client._collection_model.delete(TestRefPropUpdate) # collection_first = client._collection_model.create( # CollectionModelConfig[TestRefPropUpdate]( -# model=TestRefPropUpdate, vectorizer_config=Configure.Vectorizer.none() +# model=TestRefPropUpdate, vectorizer_config=Configure.Vectorizer.self_provided() # ) # ) # uuid_first = collection_first.data.insert(TestRefPropUpdate(name="first")) @@ -480,7 +480,7 @@ # client._collection_model.delete(TestDatetime) # collection = client._collection_model.create( # CollectionModelConfig[TestDatetime]( -# model=TestDatetime, vectorizer_config=Configure.Vectorizer.none() +# model=TestDatetime, vectorizer_config=Configure.Vectorizer.self_provided() # ) # ) # now = datetime.now(timezone.utc) diff --git a/integration/test_collection_multi_node.py b/integration/test_collection_multi_node.py index 355936f96..a0010b1ae 100644 --- a/integration/test_collection_multi_node.py +++ b/integration/test_collection_multi_node.py @@ -18,7 +18,7 @@ def test_consistency_on_multinode( collection_factory: CollectionFactory, level: ConsistencyLevel ) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[ Property(name="name", data_type=DataType.TEXT), ], diff --git a/integration/test_collection_near_vector.py b/integration/test_collection_near_vector.py index a10f191ad..b1f6593ee 100644 --- a/integration/test_collection_near_vector.py +++ b/integration/test_collection_near_vector.py @@ -130,7 +130,7 @@ def test_near_vector_group_by_argument(collection_factory: CollectionFactory) -> def test_near_vector_with_other_input( collection_factory: CollectionFactory, near_vector: Any ) -> None: - collection = collection_factory(vectorizer_config=Configure.Vectorizer.none()) + collection = collection_factory(vectorizer_config=Configure.Vectorizer.self_provided()) uuid1 = collection.data.insert({}, vector=[1, 0]) collection.data.insert({}, vector=[0, 1]) @@ -162,8 +162,8 @@ def test_near_vector_with_named_vector_other_input( collection = collection_factory( vectorizer_config=[ - Configure.NamedVectors.none("first"), - Configure.NamedVectors.none("second"), + Configure.NamedVectors.self_provided("first"), + Configure.NamedVectors.self_provided("second"), ] ) @@ -182,8 +182,8 @@ def test_near_vector_with_extra_vectors(collection_factory: CollectionFactory): collection = collection_factory( vectorizer_config=[ - Configure.NamedVectors.none("first"), - Configure.NamedVectors.none("second"), + Configure.NamedVectors.self_provided("first"), + Configure.NamedVectors.self_provided("second"), ] ) diff --git a/integration/test_collection_openai.py b/integration/test_collection_openai.py index 1a7875fae..f48b60788 100644 --- a/integration/test_collection_openai.py +++ b/integration/test_collection_openai.py @@ -537,7 +537,7 @@ def test_openai_invalid_key(request: SubRequest) -> None: name=request.node.name, properties=[Property(name="text", data_type=DataType.TEXT)], generative_config=Configure.Generative.openai(), - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) collection.data.insert(properties={"text": "test"}) with pytest.raises(WeaviateQueryError): @@ -552,7 +552,7 @@ def test_openai_no_module(request: SubRequest) -> None: name=request.node.name, properties=[Property(name="text", data_type=DataType.TEXT)], generative_config=Configure.Generative.openai(), - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) try: collection.data.insert(properties={"text": "test"}) diff --git a/integration/test_collection_references.py b/integration/test_collection_references.py index e5446a959..47c367e90 100644 --- a/integration/test_collection_references.py +++ b/integration/test_collection_references.py @@ -38,14 +38,14 @@ def test_reference_add_delete_replace( delete: SingleReferenceInput, ) -> None: ref_collection = collection_factory( - name="Target", vectorizer_config=Configure.Vectorizer.none() + name="Target", vectorizer_config=Configure.Vectorizer.self_provided() ) ref_collection.data.insert(properties={}, uuid=TO_UUID) collection = collection_factory( references=[ ReferenceProperty.MultiTarget(name="ref", target_collections=[ref_collection.name]) ], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) uuid_from1 = collection.data.insert({}, uuid=uuid.uuid4()) @@ -89,14 +89,14 @@ def test_reference_add_delete_replace_multi_target( collection_factory: CollectionFactory, ) -> None: ref_collection = collection_factory( - name="Target", vectorizer_config=Configure.Vectorizer.none() + name="Target", vectorizer_config=Configure.Vectorizer.self_provided() ) ref_collection.data.insert(properties={}, uuid=TO_UUID) collection = collection_factory( references=[ ReferenceProperty.MultiTarget(name="ref", target_collections=[ref_collection.name]) ], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) uuid_from1 = collection.data.insert({}, uuid=uuid.uuid4()) @@ -163,12 +163,12 @@ def test_reference_add_multiple_uuids_error( collection_factory: CollectionFactory, to: SingleReferenceInput ) -> None: ref_collection = collection_factory( - name="Target", vectorizer_config=Configure.Vectorizer.none() + name="Target", vectorizer_config=Configure.Vectorizer.self_provided() ) ref_collection.data.insert(properties={}, uuid=TO_UUID) collection = collection_factory( references=[ReferenceProperty(name="ref", target_collection=ref_collection.name)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) uuid_from1 = collection.data.insert({}, uuid=uuid.uuid4()) with pytest.raises(WeaviateInvalidInputError): @@ -186,12 +186,12 @@ def test_reference_delete_multiple_uuids_error( collection_factory: CollectionFactory, to: SingleReferenceInput ) -> None: ref_collection = collection_factory( - name="Target", vectorizer_config=Configure.Vectorizer.none() + name="Target", vectorizer_config=Configure.Vectorizer.self_provided() ) ref_collection.data.insert(properties={}, uuid=TO_UUID) collection = collection_factory( references=[ReferenceProperty(name="ref", target_collection=ref_collection.name)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) uuid_from1 = collection.data.insert({}, uuid=uuid.uuid4()) with pytest.raises(WeaviateInvalidInputError): @@ -201,7 +201,7 @@ def test_reference_delete_multiple_uuids_error( def test_mono_references_grpc(collection_factory: CollectionFactory) -> None: A = collection_factory( name="A", - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[ Property(name="Name", data_type=DataType.TEXT), ], @@ -219,7 +219,7 @@ def test_mono_references_grpc(collection_factory: CollectionFactory) -> None: references=[ ReferenceProperty(name="a", target_collection=A.name), ], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) uuid_B = B.data.insert({"Name": "B"}, references={"a": uuid_A1}) B.data.reference_add(from_uuid=uuid_B, from_property="a", to=uuid_A2) @@ -244,7 +244,7 @@ def test_mono_references_grpc(collection_factory: CollectionFactory) -> None: references=[ ReferenceProperty(name="b", target_collection=B.name), ], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) C.data.insert({"Name": "find me"}, references={"b": uuid_B}) @@ -436,7 +436,7 @@ class CRefs(TypedDict): def test_multi_references_grpc(collection_factory: CollectionFactory) -> None: A = collection_factory( name="A", - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[ Property(name="Name", data_type=DataType.TEXT), ], @@ -448,7 +448,7 @@ def test_multi_references_grpc(collection_factory: CollectionFactory) -> None: properties=[ Property(name="Name", data_type=DataType.TEXT), ], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) uuid_B = B.data.insert({"Name": "B"}) @@ -458,7 +458,7 @@ def test_multi_references_grpc(collection_factory: CollectionFactory) -> None: references=[ ReferenceProperty.MultiTarget(name="ref", target_collections=[A.name, B.name]), ], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) C.data.insert( { @@ -517,7 +517,7 @@ def test_multi_references_grpc(collection_factory: CollectionFactory) -> None: def test_multi_references_grpc_with_generics(collection_factory: CollectionFactory) -> None: A = collection_factory( name="A", - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[ Property(name="Name", data_type=DataType.TEXT), ], @@ -529,7 +529,7 @@ def test_multi_references_grpc_with_generics(collection_factory: CollectionFacto properties=[ Property(name="Name", data_type=DataType.TEXT), ], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) uuid_B = B.data.insert({"Name": "B"}) @@ -539,7 +539,7 @@ def test_multi_references_grpc_with_generics(collection_factory: CollectionFacto references=[ ReferenceProperty.MultiTarget(name="ref", target_collections=[A.name, B.name]), ], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) C.data.insert( { @@ -611,7 +611,7 @@ class CRefsB(TypedDict): def test_references_batch(collection_factory: CollectionFactory) -> None: ref_collection = collection_factory( name="To", - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[Property(name="number", data_type=DataType.INT)], ) num_objects = 10 @@ -627,7 +627,7 @@ def test_references_batch(collection_factory: CollectionFactory) -> None: Property(name="num", data_type=DataType.INT), ], references=[ReferenceProperty(name="ref", target_collection=ref_collection.name)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) uuids_from = list( collection.data.insert_many( @@ -679,12 +679,12 @@ def test_references_batch(collection_factory: CollectionFactory) -> None: def test_batch_reference_multi_target(collection_factory: CollectionFactory) -> None: to_collection = collection_factory( name="To", - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[Property(name="number", data_type=DataType.INT)], ) from_collection = collection_factory( name="From", - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[Property(name="num", data_type=DataType.INT)], ) from_collection.config.add_reference( @@ -756,7 +756,7 @@ def test_batch_reference_multi_target(collection_factory: CollectionFactory) -> def test_insert_many_with_refs(collection_factory: CollectionFactory) -> None: collection = collection_factory( properties=[Property(name="Name", data_type=DataType.TEXT)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) collection.config.add_reference( ReferenceProperty(name="self", target_collection=collection.name) @@ -809,7 +809,7 @@ def test_insert_many_with_refs(collection_factory: CollectionFactory) -> None: def test_references_batch_with_errors(collection_factory: CollectionFactory) -> None: to = collection_factory( name="To", - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) collection = collection_factory( @@ -818,7 +818,7 @@ def test_references_batch_with_errors(collection_factory: CollectionFactory) -> Property(name="num", data_type=DataType.INT), ], references=[ReferenceProperty(name="ref", target_collection=to.name)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) batch_return = collection.data.reference_add_many( @@ -838,7 +838,7 @@ def test_references_batch_with_errors(collection_factory: CollectionFactory) -> # client.collections.create( # name=name1, -# vectorizer_config=Configure.Vectorizer.none(), +# vectorizer_config=Configure.Vectorizer.self_provided(), # properties=[ # Property(name="Name", data_type=DataType.TEXT), # Property(name="Age", data_type=DataType.INT), @@ -858,7 +858,7 @@ def test_references_batch_with_errors(collection_factory: CollectionFactory) -> # Property(name="Name", data_type=DataType.TEXT), # ], # references=[ReferenceProperty(name="ref", target_collection=name1)], -# vectorizer_config=Configure.Vectorizer.none(), +# vectorizer_config=Configure.Vectorizer.self_provided(), # ) # client.collections.use(name2).data.insert( @@ -889,7 +889,7 @@ def test_references_batch_with_errors(collection_factory: CollectionFactory) -> def test_object_without_references(collection_factory: CollectionFactory) -> None: - to = collection_factory(name="To", vectorizer_config=Configure.Vectorizer.none()) + to = collection_factory(name="To", vectorizer_config=Configure.Vectorizer.self_provided()) source = collection_factory( name="From", @@ -897,7 +897,7 @@ def test_object_without_references(collection_factory: CollectionFactory) -> Non ReferenceProperty(name="ref_partial", target_collection=to.name), ReferenceProperty(name="ref_full", target_collection=to.name), ], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) uuid_to = to.data.insert(properties={}) @@ -930,14 +930,14 @@ def test_object_without_references(collection_factory: CollectionFactory) -> Non def test_ref_case_sensitivity(collection_factory: CollectionFactory) -> None: - to = collection_factory(name="To", vectorizer_config=Configure.Vectorizer.none()) + to = collection_factory(name="To", vectorizer_config=Configure.Vectorizer.self_provided()) source = collection_factory( name="From", references=[ ReferenceProperty(name="ref", target_collection=to.name), ], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) # added as upper-case UUID @@ -969,13 +969,13 @@ def test_ref_case_sensitivity(collection_factory: CollectionFactory) -> None: def test_empty_return_reference(collection_factory: CollectionFactory) -> None: - to = collection_factory(name="To", vectorizer_config=Configure.Vectorizer.none()) + to = collection_factory(name="To", vectorizer_config=Configure.Vectorizer.self_provided()) source = collection_factory( name="From", references=[ ReferenceProperty(name="ref", target_collection=to.name), ], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) uuid_source = source.data.insert(properties={}) obj = source.query.fetch_object_by_id( @@ -991,7 +991,7 @@ def test_empty_return_reference(collection_factory: CollectionFactory) -> None: def test_refs_different_input_insert( collection_factory: CollectionFactory, to_uuid: ReferenceInput ) -> None: - to = collection_factory(name="To", vectorizer_config=Configure.Vectorizer.none()) + to = collection_factory(name="To", vectorizer_config=Configure.Vectorizer.self_provided()) to.data.insert(properties={}, uuid=TO_UUID) source = collection_factory( @@ -999,7 +999,7 @@ def test_refs_different_input_insert( references=[ ReferenceProperty(name="ref", target_collection=to.name), ], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) from_uuid = source.data.insert(properties={}, references={"ref": to_uuid}) @@ -1016,7 +1016,7 @@ def test_refs_different_input_insert( def test_refs_different_input_insert_many( collection_factory: CollectionFactory, to_uuid: ReferenceInput ) -> None: - to = collection_factory(name="To", vectorizer_config=Configure.Vectorizer.none()) + to = collection_factory(name="To", vectorizer_config=Configure.Vectorizer.self_provided()) to.data.insert(properties={}, uuid=TO_UUID) source = collection_factory( @@ -1024,7 +1024,7 @@ def test_refs_different_input_insert_many( references=[ ReferenceProperty(name="ref", target_collection=to.name), ], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) source.config.add_reference( ReferenceProperty.MultiTarget(name="multi", target_collections=[to.name, source.name]) @@ -1057,7 +1057,7 @@ def test_refs_different_input_insert_many( @pytest.mark.parametrize("to_uuid", [TO_UUID, str(TO_UUID)]) def test_refs_different_reference_add(collection_factory: CollectionFactory, to_uuid: str) -> None: - to = collection_factory(name="To", vectorizer_config=Configure.Vectorizer.none()) + to = collection_factory(name="To", vectorizer_config=Configure.Vectorizer.self_provided()) to.data.insert(properties={}, uuid=TO_UUID) source = collection_factory( @@ -1065,7 +1065,7 @@ def test_refs_different_reference_add(collection_factory: CollectionFactory, to_ references=[ ReferenceProperty(name="ref", target_collection=to.name), ], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) from_uuid = source.data.insert(properties={}) @@ -1082,7 +1082,7 @@ def test_refs_different_reference_add(collection_factory: CollectionFactory, to_ def test_refs_different_reference_add_many( collection_factory: CollectionFactory, to_uuid: UUID ) -> None: - to = collection_factory(name="To", vectorizer_config=Configure.Vectorizer.none()) + to = collection_factory(name="To", vectorizer_config=Configure.Vectorizer.self_provided()) to.data.insert(properties={}, uuid=TO_UUID) to.data.insert(properties={}, uuid=TO_UUID2) @@ -1091,7 +1091,7 @@ def test_refs_different_reference_add_many( references=[ ReferenceProperty(name="ref", target_collection=to.name), ], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) from_uuid = source.data.insert(properties={}) @@ -1113,7 +1113,7 @@ def test_refs_different_reference_add_many( def test_refs_different_reference_replace( collection_factory: CollectionFactory, to_uuid: ReferenceInput ) -> None: - to = collection_factory(name="To", vectorizer_config=Configure.Vectorizer.none()) + to = collection_factory(name="To", vectorizer_config=Configure.Vectorizer.self_provided()) to.data.insert(properties={}, uuid=TO_UUID) to.data.insert(properties={}, uuid=TO_UUID2) @@ -1122,7 +1122,7 @@ def test_refs_different_reference_replace( references=[ ReferenceProperty(name="ref", target_collection=to.name), ], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) from_uuid = source.data.insert(properties={}) diff --git a/integration/test_collection_rerank.py b/integration/test_collection_rerank.py index 8c799f52d..3fe050f43 100644 --- a/integration/test_collection_rerank.py +++ b/integration/test_collection_rerank.py @@ -10,7 +10,7 @@ def test_query_using_rerank_with_old_server(collection_factory: CollectionFactory) -> None: collection = collection_factory( reranker_config=wvc.config.Configure.Reranker.custom("reranker-dummy"), - vectorizer_config=wvc.config.Configure.Vectorizer.none(), + vectorizer_config=wvc.config.Configure.Vectorizer.self_provided(), properties=[wvc.config.Property(name="text", data_type=wvc.config.DataType.TEXT)], ) if collection._connection._weaviate_version.is_at_least(1, 23, 1): diff --git a/integration/test_gql_raw_v4.py b/integration/test_gql_raw_v4.py index a2aca610c..cdb0d3b96 100644 --- a/integration/test_gql_raw_v4.py +++ b/integration/test_gql_raw_v4.py @@ -10,7 +10,7 @@ def test_raw_gql_v4() -> None: collection = client.collections.create( name=name, properties=[Property(name="Name", data_type=DataType.TEXT)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) try: collection.data.insert_many([{"Name": f"name {i}"} for i in range(number)]) diff --git a/integration/test_iterator.py b/integration/test_iterator.py index 033c6d73b..cdf1146a3 100644 --- a/integration/test_iterator.py +++ b/integration/test_iterator.py @@ -122,7 +122,7 @@ def test_iterator_arguments( def test_iterator_dict_hint(collection_factory: CollectionFactory, request: SubRequest) -> None: collection = collection_factory( properties=[Property(name="data", data_type=DataType.INT)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) collection.data.insert_many([DataObject(properties={"data": i}) for i in range(10)]) @@ -151,7 +151,7 @@ class That(TypedDict): Property(name="this", data_type=DataType.TEXT), Property(name="that", data_type=DataType.TEXT), ], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), data_model_properties=That, ) @@ -188,7 +188,7 @@ class That(TypedDict): def test_iterator(collection_factory: CollectionFactory, count: int) -> None: collection = collection_factory( properties=[Property(name="data", data_type=DataType.INT)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), data_model_properties=Dict[str, int], ) @@ -213,7 +213,7 @@ def test_iterator(collection_factory: CollectionFactory, count: int) -> None: def test_iterator_with_after(collection_factory: CollectionFactory) -> None: collection = collection_factory( properties=[Property(name="data", data_type=DataType.INT)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), data_model_properties=Dict[str, int], ) diff --git a/integration/test_named_vectors.py b/integration/test_named_vectors.py index b7888f605..ec91050e9 100644 --- a/integration/test_named_vectors.py +++ b/integration/test_named_vectors.py @@ -48,8 +48,8 @@ def test_create_named_vectors( source_properties=["title", "content"], vectorize_collection_name=False, ), - wvc.config.Configure.NamedVectors.none(name="bringYourOwn"), - wvc.config.Configure.NamedVectors.none(name="bringYourOwn2"), + wvc.config.Configure.NamedVectors.self_provided(name="bringYourOwn"), + wvc.config.Configure.NamedVectors.self_provided(name="bringYourOwn2"), ], ) @@ -89,7 +89,7 @@ def test_insert_many_add(collection_factory: CollectionFactory) -> None: wvc.config.Configure.NamedVectors.text2vec_contextionary( "title", source_properties=["title"], vectorize_collection_name=False ), - wvc.config.Configure.NamedVectors.none(name="bringYourOwn"), + wvc.config.Configure.NamedVectors.self_provided(name="bringYourOwn"), ], ) @@ -115,7 +115,7 @@ def test_update(collection_factory: CollectionFactory) -> None: wvc.config.Property(name="content", data_type=wvc.config.DataType.TEXT), ], vectorizer_config=[ - wvc.config.Configure.NamedVectors.none(name="bringYourOwn"), + wvc.config.Configure.NamedVectors.self_provided(name="bringYourOwn"), ], ) @@ -146,7 +146,7 @@ def test_replace(collection_factory: CollectionFactory) -> None: wvc.config.Property(name="content", data_type=wvc.config.DataType.TEXT), ], vectorizer_config=[ - wvc.config.Configure.NamedVectors.none(name="bringYourOwn"), + wvc.config.Configure.NamedVectors.self_provided(name="bringYourOwn"), ], ) @@ -256,7 +256,7 @@ def test_batch_add(collection_factory: CollectionFactory) -> None: wvc.config.Configure.NamedVectors.text2vec_contextionary( "title", source_properties=["title"], vectorize_collection_name=False ), - wvc.config.Configure.NamedVectors.none(name="bringYourOwn"), + wvc.config.Configure.NamedVectors.self_provided(name="bringYourOwn"), ], ) uuid1 = uuid.uuid4() @@ -289,7 +289,7 @@ def test_named_vector_with_index_config(collection_factory: CollectionFactory) - quantizer=wvc.config.Configure.VectorIndex.Quantizer.bq(rescore_limit=10), ), ), - wvc.config.Configure.NamedVectors.none( + wvc.config.Configure.NamedVectors.self_provided( "custom", ), wvc.config.Configure.NamedVectors.text2vec_contextionary( @@ -530,8 +530,8 @@ def test_named_vector_multi_target( collection = collection_factory( properties=[], vectorizer_config=[ - wvc.config.Configure.NamedVectors.none("first"), - wvc.config.Configure.NamedVectors.none("second"), + wvc.config.Configure.NamedVectors.self_provided("first"), + wvc.config.Configure.NamedVectors.self_provided("second"), ], ) @@ -550,8 +550,8 @@ def test_named_vector_multi_target_vector_per_target(collection_factory: Collect collection = collection_factory( properties=[], vectorizer_config=[ - wvc.config.Configure.NamedVectors.none("first"), - wvc.config.Configure.NamedVectors.none("second"), + wvc.config.Configure.NamedVectors.self_provided("first"), + wvc.config.Configure.NamedVectors.self_provided("second"), ], ) @@ -572,8 +572,8 @@ def test_multi_query_error_no_target_vector(collection_factory: CollectionFactor collection = collection_factory( properties=[], vectorizer_config=[ - wvc.config.Configure.NamedVectors.none("first"), - wvc.config.Configure.NamedVectors.none("second"), + wvc.config.Configure.NamedVectors.self_provided("first"), + wvc.config.Configure.NamedVectors.self_provided("second"), ], ) @@ -619,8 +619,8 @@ def test_same_target_vector_multiple_input( collection = collection_factory( properties=[], vectorizer_config=[ - wvc.config.Configure.NamedVectors.none("first"), - wvc.config.Configure.NamedVectors.none("second"), + wvc.config.Configure.NamedVectors.self_provided("first"), + wvc.config.Configure.NamedVectors.self_provided("second"), ], ) @@ -671,8 +671,8 @@ def test_same_target_vector_multiple_input_combinations( collection = collection_factory( properties=[], vectorizer_config=[ - wvc.config.Configure.NamedVectors.none("first"), - wvc.config.Configure.NamedVectors.none("second"), + wvc.config.Configure.NamedVectors.self_provided("first"), + wvc.config.Configure.NamedVectors.self_provided("second"), ], ) @@ -697,8 +697,8 @@ def test_deprecated_syntax(collection_factory: CollectionFactory): collection = collection_factory( properties=[], vectorizer_config=[ - wvc.config.Configure.NamedVectors.none("first"), - wvc.config.Configure.NamedVectors.none("second"), + wvc.config.Configure.NamedVectors.self_provided("first"), + wvc.config.Configure.NamedVectors.self_provided("second"), ], ) @@ -742,8 +742,8 @@ def test_include_vector_on_references( ref_collection = collection_factory( name="Target", vectorizer_config=[ - wvc.config.Configure.NamedVectors.none(name="bringYourOwn1"), - wvc.config.Configure.NamedVectors.none(name="bringYourOwn2"), + wvc.config.Configure.NamedVectors.self_provided(name="bringYourOwn1"), + wvc.config.Configure.NamedVectors.self_provided(name="bringYourOwn2"), ], ) @@ -778,7 +778,7 @@ def test_colbert_vectors_byov(collection_factory: CollectionFactory) -> None: ) ], vectorizer_config=[ - wvc.config.Configure.NamedVectors.none( + wvc.config.Configure.NamedVectors.self_provided( name="colbert", vector_index_config=wvc.config.Configure.VectorIndex.hnsw( multi_vector=wvc.config.Configure.VectorIndex.MultiVector.multi_vector( @@ -786,7 +786,7 @@ def test_colbert_vectors_byov(collection_factory: CollectionFactory) -> None: ) ), ), - wvc.config.Configure.NamedVectors.none( + wvc.config.Configure.NamedVectors.self_provided( name="regular", ), ], diff --git a/integration/test_tenants.py b/integration/test_tenants.py index 8a2bd37a8..f6d807e52 100644 --- a/integration/test_tenants.py +++ b/integration/test_tenants.py @@ -26,7 +26,7 @@ def test_shards_on_tenants( client_factory: ClientFactory, collection_factory: CollectionFactory ) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), multi_tenancy_config=Configure.multi_tenancy(enabled=True), ) collection.tenants.create(Tenant(name="tenant1")) @@ -43,7 +43,7 @@ def test_delete_by_id_tenant( collection_factory: CollectionFactory, tenant: Union[str, Tenant] ) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), multi_tenancy_config=Configure.multi_tenancy(enabled=True), ) collection.tenants.create(tenant) @@ -57,7 +57,7 @@ def test_delete_by_id_tenant( def test_insert_many_with_tenant(collection_factory: CollectionFactory) -> None: collection = collection_factory( properties=[Property(name="Name", data_type=DataType.TEXT)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), multi_tenancy_config=Configure.multi_tenancy(enabled=True), ) @@ -83,7 +83,7 @@ def test_insert_many_with_tenant(collection_factory: CollectionFactory) -> None: def test_replace_with_tenant(collection_factory: CollectionFactory) -> None: collection = collection_factory( properties=[Property(name="Name", data_type=DataType.TEXT)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), multi_tenancy_config=Configure.multi_tenancy(enabled=True), ) @@ -100,7 +100,7 @@ def test_replace_with_tenant(collection_factory: CollectionFactory) -> None: def test_tenants_update(collection_factory: CollectionFactory) -> None: collection = collection_factory( properties=[Property(name="Name", data_type=DataType.TEXT)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), ) uuid = collection.data.insert(properties={"name": "some name"}) collection.data.update(properties={"name": "other name"}, uuid=uuid, vector=[1, 2, 3]) @@ -112,7 +112,7 @@ def test_tenants_update(collection_factory: CollectionFactory) -> None: def test_update_with_tenant(collection_factory: CollectionFactory) -> None: collection = collection_factory( properties=[Property(name="Name", data_type=DataType.TEXT)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), multi_tenancy_config=Configure.multi_tenancy(enabled=True), ) @@ -128,7 +128,7 @@ def test_update_with_tenant(collection_factory: CollectionFactory) -> None: def test_tenants(collection_factory: CollectionFactory) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), multi_tenancy_config=Configure.multi_tenancy(), ) @@ -159,7 +159,7 @@ def test_tenants(collection_factory: CollectionFactory) -> None: def test_search_with_tenant(collection_factory: CollectionFactory) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[Property(name="name", data_type=DataType.TEXT)], multi_tenancy_config=Configure.multi_tenancy(enabled=True), ) @@ -178,7 +178,7 @@ def test_search_with_tenant(collection_factory: CollectionFactory) -> None: def test_fetch_object_by_id_with_tenant(collection_factory: CollectionFactory) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[Property(name="name", data_type=DataType.TEXT)], multi_tenancy_config=Configure.multi_tenancy(enabled=True), ) @@ -204,7 +204,7 @@ def test_fetch_object_by_id_with_tenant(collection_factory: CollectionFactory) - def test_fetch_objects_with_tenant(collection_factory: CollectionFactory) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), properties=[Property(name="name", data_type=DataType.TEXT)], multi_tenancy_config=Configure.multi_tenancy(enabled=True), ) @@ -229,7 +229,7 @@ def test_fetch_objects_with_tenant(collection_factory: CollectionFactory) -> Non def test_exist_with_tenant(collection_factory: CollectionFactory) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), multi_tenancy_config=Configure.multi_tenancy(enabled=True), ) collection.tenants.create([Tenant(name="Tenant1"), Tenant(name="Tenant2")]) @@ -245,7 +245,7 @@ def test_exist_with_tenant(collection_factory: CollectionFactory) -> None: def test_tenant_with_activity(collection_factory: CollectionFactory) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), multi_tenancy_config=Configure.multi_tenancy(enabled=True), ) @@ -272,7 +272,7 @@ def test_tenant_with_activity(collection_factory: CollectionFactory) -> None: def test_update_tenant(collection_factory: CollectionFactory) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), multi_tenancy_config=Configure.multi_tenancy(enabled=True), ) with pytest.warns(DeprecationWarning) as recwarn: @@ -300,7 +300,7 @@ def test_update_tenant(collection_factory: CollectionFactory) -> None: def test_tenant_exists(collection_factory: CollectionFactory) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), multi_tenancy_config=Configure.multi_tenancy(enabled=True), ) tenant = Tenant(name="1") @@ -325,7 +325,7 @@ def test_tenant_get_by_name( tenant3: Union[str, Tenant], ) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), multi_tenancy_config=Configure.multi_tenancy(), ) @@ -344,7 +344,7 @@ def test_tenant_get_by_name( def test_autotenant_toggling(collection_factory: CollectionFactory) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), multi_tenancy_config=Configure.multi_tenancy(enabled=True), ) if collection._connection._weaviate_version.is_lower_than(1, 25, 0): @@ -379,7 +379,7 @@ def test_tenants_create( tenants: Union[TenantCreateInputType, List[TenantCreateInputType]], ) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), multi_tenancy_config=Configure.multi_tenancy(), ) @@ -402,7 +402,7 @@ def test_tenants_remove( collection_factory: CollectionFactory, tenants: Union[str, Tenant, List[Union[str, Tenant]]] ) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), multi_tenancy_config=Configure.multi_tenancy(), ) @@ -426,7 +426,7 @@ def test_tenants_create_with_read_only_activity_status( collection_factory: CollectionFactory, tenants: Union[Tenant, List[Tenant]] ) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), multi_tenancy_config=Configure.multi_tenancy(), ) with pytest.raises(WeaviateInvalidInputError): @@ -448,7 +448,7 @@ def test_tenants_update_with_read_only_activity_status( collection_factory: CollectionFactory, tenants: Union[Tenant, List[Tenant]] ) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), multi_tenancy_config=Configure.multi_tenancy(), ) with pytest.raises(WeaviateInvalidInputError): @@ -459,7 +459,7 @@ def test_tenants_create_and_update_1001_tenants( collection_factory: CollectionFactory, ) -> None: collection = collection_factory( - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), multi_tenancy_config=Configure.multi_tenancy(), ) @@ -489,7 +489,7 @@ def test_tenants_auto_tenant_creation( collection = collection_factory( properties=[Property(name="name", data_type=DataType.TEXT)], - vectorizer_config=Configure.Vectorizer.none(), + vectorizer_config=Configure.Vectorizer.self_provided(), multi_tenancy_config=Configure.multi_tenancy(auto_tenant_creation=True), ) diff --git a/test/collection/test_config.py b/test/collection/test_config.py index f8b754ed8..3807de59d 100644 --- a/test/collection/test_config.py +++ b/test/collection/test_config.py @@ -1146,7 +1146,7 @@ def test_config_with_reranker( @pytest.mark.parametrize( "vectorizer_config", [ - Configure.Vectorizer.none(), + Configure.Vectorizer.self_provided(), Configure.Vectorizer.text2vec_contextionary(), [ Configure.NamedVectors.text2vec_cohere(name="one"), diff --git a/weaviate/collections/classes/config.py b/weaviate/collections/classes/config.py index fddf14371..7ab5ad56c 100644 --- a/weaviate/collections/classes/config.py +++ b/weaviate/collections/classes/config.py @@ -1155,7 +1155,7 @@ class _CollectionConfigCreateBase(_ConfigCreateModel): default=None, alias="vector_index_config" ) moduleConfig: _VectorizerConfigCreate = Field( - default=_Vectorizer.none(), alias="vectorizer_config" + default=_Vectorizer.self_provided(), alias="vectorizer_config" ) generativeSearch: Optional[_GenerativeProvider] = Field(default=None, alias="generative_config") rerankerConfig: Optional[_RerankerProvider] = Field(default=None, alias="reranker_config") @@ -1938,7 +1938,7 @@ class _CollectionConfigCreate(_ConfigCreateModel): default=None, alias="vector_index_config" ) vectorizerConfig: Optional[Union[_VectorizerConfigCreate, List[_NamedVectorConfigCreate]]] = ( - Field(default=_Vectorizer.none(), alias="vectorizer_config") + Field(default=_Vectorizer.self_provided(), alias="vectorizer_config") ) generativeSearch: Optional[_GenerativeProvider] = Field(default=None, alias="generative_config") rerankerConfig: Optional[_RerankerProvider] = Field(default=None, alias="reranker_config") diff --git a/weaviate/collections/classes/config_named_vectors.py b/weaviate/collections/classes/config_named_vectors.py index 9bd4a3bf9..a43dc3b6c 100644 --- a/weaviate/collections/classes/config_named_vectors.py +++ b/weaviate/collections/classes/config_named_vectors.py @@ -109,7 +109,13 @@ class _NamedVectorConfigUpdate(_ConfigUpdateModel): class _NamedVectors: - @staticmethod + @docstring_deprecated( + deprecated_in="4.9.0", + details="This method is deprecated and will be removed in Q1 '26. Please use :meth:`~weaviate.collections.classes.config._NamedVectors.self_provided` instead.", + ) + @typing_deprecated( + "This method is deprecated and will be removed in Q2 '26. Please use `self_provided` instead." + ) def none( name: str, *, vector_index_config: Optional[_VectorIndexConfigCreate] = None ) -> _NamedVectorConfigCreate: @@ -125,6 +131,24 @@ def none( vector_index_config=vector_index_config, ) + @staticmethod + def self_provided( + name: str, + *, + vector_index_config: Optional[_VectorIndexConfigCreate] = None, + ) -> _NamedVectorConfigCreate: + """Create a named vector using no vectorizer. You will need to provide the vectors yourself. + + Args: + name: The name of the named vector. + vector_index_config: The configuration for Weaviate's vector index. Use wvc.config.Configure.VectorIndex to create a vector index configuration. None by default + """ + return _NamedVectorConfigCreate( + name=name, + vectorizer=_VectorizerConfigCreate(vectorizer=Vectorizers.NONE), + vector_index_config=vector_index_config, + ) + @staticmethod def custom( name: str, diff --git a/weaviate/collections/classes/config_vectorizers.py b/weaviate/collections/classes/config_vectorizers.py index 5c0a45441..1b88cfc6d 100644 --- a/weaviate/collections/classes/config_vectorizers.py +++ b/weaviate/collections/classes/config_vectorizers.py @@ -542,9 +542,20 @@ class _Vectorizer: will ensure that any mis-specifications will be caught before the request is sent to Weaviate. """ - @staticmethod + @docstring_deprecated( + deprecated_in="4.9.0", + details="This method is deprecated and will be removed in Q1 '26. Please use :meth:`~weaviate.collections.classes.config._Vectorizer.self_provided` instead.", + ) + @typing_deprecated( + "This method is deprecated and will be removed in Q2 '26. Please use `self_provided` instead." + ) def none() -> _VectorizerConfigCreate: - """Create a `_VectorizerConfigCreate` object with the vectorizer set to `Vectorizer.NONE`.""" + """Create a `_VectorizerConfigCreate` object with the vectorizer set to `Vectorizer.none` meaning that you provide the vectors with Weaviate just indexing them.""" + return _VectorizerConfigCreate(vectorizer=Vectorizers.NONE) + + @staticmethod + def self_provided() -> _VectorizerConfigCreate: + """Create a `_VectorizerConfigCreate` object with the vectorizer set to `Vectorizer.self_provided` meaning that you provide the vectors with Weaviate just indexing them.""" return _VectorizerConfigCreate(vectorizer=Vectorizers.NONE) @staticmethod