Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
7ca29b9
Introduce `Configure.Vectors` and `vector_config` in `.create`/`.update`
tsmith023 Apr 25, 2025
5512fc4
Merge branch 'main' of https://github.com/weaviate/weaviate-python-cl…
tsmith023 Apr 28, 2025
d088596
Update CI images to latest build on each branch
tsmith023 Apr 28, 2025
df10ec6
Change prop descr test to handle props sorted by name
tsmith023 Apr 28, 2025
84a5a90
Make changes to pass unit tests of legacy vectorization
tsmith023 Apr 28, 2025
34e7264
Alter specific tests for old versions with new syntax
tsmith023 Apr 28, 2025
5301dcf
Add skip to test with resolved issue absent from previous vers
tsmith023 Apr 28, 2025
698616d
Merge branch 'main' of https://github.com/weaviate/weaviate-python-cl…
tsmith023 Jun 25, 2025
cb9015c
- Add `MultiVectors` factory
tsmith023 Jun 25, 2025
e4ae748
Update CI tags to latest patch
tsmith023 Jun 25, 2025
e5c65bf
Rename `.text2colbert_jinaa()` to `text2vec_jinaai()`
tsmith023 Jun 26, 2025
d2ed94d
Add warnings for all deprecated syntax
tsmith023 Jun 27, 2025
d15eccf
Merge branch 'main' of https://github.com/weaviate/weaviate-python-cl…
tsmith023 Jun 27, 2025
1ac08a7
Response to review comments
tsmith023 Jun 27, 2025
f33d12b
Update tests to reflect single vectors usage
tsmith023 Jun 30, 2025
197928b
Fix vector config name passing when creating collections
tsmith023 Jun 30, 2025
cc1751b
Merge branch 'dev/1.32' of https://github.com/weaviate/weaviate-pytho…
tsmith023 Jun 30, 2025
22e7185
Merge branch 'dev/1.32' of https://github.com/weaviate/weaviate-pytho…
tsmith023 Jul 10, 2025
f4b3c23
Skip parsing vector to obj if it's empty
tsmith023 Jul 10, 2025
2a8aa52
Update CI images to latest patches
tsmith023 Jul 10, 2025
a005f34
Remove unneeded added parsing
tsmith023 Jul 10, 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
10 changes: 5 additions & 5 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ concurrency:
env:
WEAVIATE_125: 1.25.34
WEAVIATE_126: 1.26.17
WEAVIATE_127: 1.27.14
WEAVIATE_128: 1.28.8
WEAVIATE_129: 1.29.8
WEAVIATE_130: 1.30.9
WEAVIATE_127: 1.27.27
WEAVIATE_128: 1.28.16
WEAVIATE_129: 1.29.9
WEAVIATE_130: 1.30.11
WEAVIATE_131: 1.31.5
WEAVIATE_132: 1.32.0-rc.0-6eb89d6.amd64
WEAVIATE_132: 1.32.0-rc.1-098c594

jobs:
lint-and-format:
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@ repos:
language: node
pass_filenames: false
types: [python]
additional_dependencies: [[email protected].398]
additional_dependencies: [[email protected].400]
1 change: 0 additions & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import contextlib
import os
import sys

from importlib.metadata import PackageNotFoundError
from importlib.metadata import version as version_func

Expand Down
23 changes: 18 additions & 5 deletions integration/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
_ReferencePropertyBase,
_ReplicationConfigCreate,
_RerankerProvider,
_VectorConfigCreate,
_VectorIndexConfigCreate,
_VectorizerConfigCreate,
)
Expand Down Expand Up @@ -58,6 +59,9 @@ def __call__(
vector_index_config: Optional[_VectorIndexConfigCreate] = None,
description: Optional[str] = None,
reranker_config: Optional[_RerankerProvider] = None,
vector_config: Optional[
Optional[Union[_VectorConfigCreate, List[_VectorConfigCreate]]]
] = None,
) -> Collection[Any, Any]:
"""Typing for fixture."""
...
Expand Down Expand Up @@ -129,6 +133,9 @@ def _factory(
vector_index_config: Optional[_VectorIndexConfigCreate] = None,
description: Optional[str] = None,
reranker_config: Optional[_RerankerProvider] = None,
vector_config: Optional[
Optional[Union[_VectorConfigCreate, List[_VectorConfigCreate]]]
] = None,
) -> Collection[Any, Any]:
try:
nonlocal client_fixture, name_fixtures, call_counter # noqa: F824
Expand All @@ -148,7 +155,8 @@ 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.none() if vector_config is None else None),
properties=properties,
references=references,
inverted_index_config=inverted_index_config,
Expand All @@ -159,6 +167,7 @@ def _factory(
replication_config=replication_config,
vector_index_config=vector_index_config,
reranker_config=reranker_config,
vector_config=vector_config,
)
return collection
except Exception as e:
Expand Down Expand Up @@ -315,6 +324,9 @@ def __call__(
vectorizer_config: Optional[
Union[_VectorizerConfigCreate, List[_NamedVectorConfigCreate]]
] = None,
vector_config: Optional[
Optional[Union[_VectorConfigCreate, List[_VectorConfigCreate]]]
] = None,
) -> Collection[Any, Any]:
"""Typing for fixture."""
...
Expand All @@ -329,17 +341,18 @@ def _factory(
vectorizer_config: Optional[
Union[_VectorizerConfigCreate, List[_NamedVectorConfigCreate]]
] = None,
vector_config: Optional[
Optional[Union[_VectorConfigCreate, List[_VectorConfigCreate]]]
] = None,
) -> Collection[Any, Any]:
api_key = os.environ.get("OPENAI_APIKEY")
if api_key is None:
pytest.skip("No OpenAI API key found.")

if vectorizer_config is None:
vectorizer_config = Configure.Vectorizer.none()

collection = collection_factory(
name=name,
vectorizer_config=vectorizer_config or Configure.Vectorizer.none(),
vectorizer_config=vectorizer_config,
vector_config=vector_config or Configure.Vectors.self_provided(),
properties=[
Property(name="text", data_type=DataType.TEXT),
Property(name="content", data_type=DataType.TEXT),
Expand Down
6 changes: 3 additions & 3 deletions integration/test_client.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from typing import Callable, Generator, Tuple, Union
from typing import Callable, Generator, Optional, Tuple, Union

import pytest
from _pytest.fixtures import SubRequest
Expand Down Expand Up @@ -28,7 +28,7 @@

@pytest.fixture(scope="module")
def client_factory() -> Generator[Callable[[int, int], weaviate.WeaviateClient], None, None]:
client: weaviate.WeaviateClient = None
client: Optional[weaviate.WeaviateClient] = None

def maker(http: int, grpc: int) -> weaviate.WeaviateClient:
nonlocal client
Expand Down Expand Up @@ -593,7 +593,7 @@ async def test_async_client_with_extra_options() -> None:

def test_client_error_for_wcs_without_auth() -> None:
with pytest.raises(weaviate.exceptions.AuthenticationFailedError) as e:
weaviate.connect_to_wcs(cluster_url=WCS_URL, auth_credentials=None)
weaviate.connect_to_wcs(cluster_url=WCS_URL, auth_credentials=None) # pyright: ignore
assert "wvc.init.Auth.api_key" in e.value.message


Expand Down
Loading
Loading