Skip to content

Introduce user_provided() as more verbose alternative to none() #1643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tsmith023 wants to merge 4 commits into from
Closed

Introduce user_provided() as more verbose alternative to none() #1643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
22d6974
Introduce `user_provided()` as more verbose alternative to `none()`
tsmith023 Apr 16, 2025
916bb48
Merge branch 'main' of https://github.com/weaviate/weaviate-python-cl…
tsmith023 Jun 25, 2025
6003e7b
Rename from `user_provided` to `self_provided`
tsmith023 Jun 25, 2025
1084446
Add deprecations to `.none()` vectorizer factory methods
tsmith023 Jun 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions integration/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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),
Expand Down Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion integration/test_auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"}])
Expand Down
2 changes: 1 addition & 1 deletion integration/test_batch_v4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
26 changes: 15 additions & 11 deletions integration/test_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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)
Expand Down Expand Up @@ -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()
Expand All @@ -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)
Expand All @@ -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")
Expand All @@ -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")
Expand All @@ -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")
Expand All @@ -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")
Expand Down Expand Up @@ -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),
Expand Down Expand Up @@ -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"
Expand Down
Loading