Skip to content

Commit 734af0c

Browse files
committed
Merge branch 'main' of https://github.com/weaviate/weaviate-python-client into poc-separate-sync-and-async
2 parents cb6957a + 366d4f8 commit 734af0c

3 files changed

Lines changed: 29 additions & 18 deletions

File tree

ci/docker-compose-wcs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ services:
2424
AUTHENTICATION_OIDC_USERNAME_CLAIM: 'email'
2525
AUTHENTICATION_OIDC_GROUPS_CLAIM: 'groups'
2626
AUTHORIZATION_ADMINLIST_ENABLED: 'true'
27-
AUTHORIZATION_ADMINLIST_USERS: 'ms_2d0e007e7136de11d5f29fce7a53dae219a51458@existiert.net'
27+
AUTHORIZATION_ADMINLIST_USERS: 'oidc-test-user@weaviate.io'
2828
AUTHENTICATION_OIDC_SCOPES: 'openid,email'
2929
AUTHENTICATION_APIKEY_ENABLED: 'true'
3030
AUTHENTICATION_APIKEY_ALLOWED_KEYS: 'my-secret-key'
31-
AUTHENTICATION_APIKEY_USERS: 'ms_2d0e007e7136de11d5f29fce7a53dae219a51458@existiert.net'
31+
AUTHENTICATION_APIKEY_USERS: 'oidc-test-user@weaviate.io'
3232
DISABLE_TELEMETRY: 'true'
3333
...

docs/changelog.rst

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
Changelog
22
=========
33

4+
Version 4.12.0
5+
--------------
6+
This minor version includes:
7+
- Support for new 1.30 features:
8+
- Dynamic user management of OIDC and native DB users
9+
- Improved multi-dimensional/colBERT vectors
10+
- Query-time configuration of generative modules
11+
- Tenant-based filtering of data permissions in RBAC
12+
- The new ``generative-xai`` module
13+
14+
415
Version 4.11.3
516
--------------
617
This patch version includes:
@@ -35,7 +46,7 @@ Version 4.11.0
3546
This minor version includes:
3647
- Support for new 1.29 features:
3748
- RBAC is ready for production
38-
- Multi-dimensional/COLBert vectors experimental, breaking changes are expected)
49+
- Multi-dimensional/COLBert vectors experimental, breaking changes are expected
3950
- Aggregations are using GRPC now
4051
- Improved exception handling for errors returned by Weaviate
4152
- Add support for NVIDIA modules:

integration/test_auth.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,14 @@ def test_authentication_client_credentials(
6666
@pytest.mark.parametrize(
6767
"name,user,env_variable_name,port,scope,warning",
6868
[
69-
# ( # WCS keycloak times out too often
70-
# "WCS",
71-
# "ms_2d0e007e7136de11d5f29fce7a53dae219a51458@existiert.net",
72-
# "WCS_DUMMY_CI_PW",
73-
# WCS_PORT,
74-
# None,
75-
# False,
76-
# ),
69+
( # WCS keycloak times out too often
70+
"WCS",
71+
"oidc-test-user@weaviate.io",
72+
"WCS_DUMMY_CI_PW",
73+
WCS_PORT,
74+
None,
75+
False,
76+
),
7777
(
7878
"okta",
7979
"test@test.de",
@@ -171,12 +171,12 @@ def _get_access_token(url: str, user: str, pw: str) -> Dict[str, str]:
171171
@pytest.mark.parametrize(
172172
"name,user,env_variable_name,port",
173173
[
174-
# ( # WCS keycloak times out too often
175-
# "WCS",
176-
# "ms_2d0e007e7136de11d5f29fce7a53dae219a51458@existiert.net",
177-
# "WCS_DUMMY_CI_PW",
178-
# WCS_PORT,
179-
# ),
174+
( # WCS keycloak times out too often
175+
"WCS",
176+
"oidc-test-user@weaviate.io",
177+
"WCS_DUMMY_CI_PW",
178+
WCS_PORT,
179+
),
180180
(
181181
"okta",
182182
"test@test.de",
@@ -203,7 +203,7 @@ def test_authentication_with_bearer_token(
203203
refresh_token=token["refresh_token"],
204204
)
205205
with weaviate.connect_to_local(port=port, auth_credentials=auth) as client:
206-
client.collections.list_all()
206+
client.collections.exists("something")
207207

208208

209209
def test_authentication_with_bearer_token_no_refresh() -> None:

0 commit comments

Comments
 (0)