From 9940cf4598c1c7f3c703dc7fb9035790f981f59f Mon Sep 17 00:00:00 2001 From: Tommy Smith Date: Fri, 27 Oct 2023 22:27:17 +0100 Subject: [PATCH 1/5] make changes --- ci/docker-compose-async.yml | 2 +- ci/docker-compose-azure.yml | 2 +- ci/docker-compose-cluster.yml | 4 ++-- ci/docker-compose-okta-cc.yml | 2 +- ci/docker-compose-okta-users.yml | 2 +- ci/docker-compose-openai.yml | 2 +- ci/docker-compose-wcs.yml | 2 +- ci/docker-compose.yml | 2 +- docs/changelog.rst | 5 +++++ 9 files changed, 14 insertions(+), 9 deletions(-) diff --git a/ci/docker-compose-async.yml b/ci/docker-compose-async.yml index c0b74578b..3a8b2978e 100644 --- a/ci/docker-compose-async.yml +++ b/ci/docker-compose-async.yml @@ -9,7 +9,7 @@ services: - '8090' - --scheme - http - image: semitechnologies/weaviate:preview-add-vectorqueuesize-to-schema-classname-shards-response-afa42cb + image: semitechnologies/weaviate:1.22.0 ports: - "8090:8090" restart: on-failure:0 diff --git a/ci/docker-compose-azure.yml b/ci/docker-compose-azure.yml index 44fbf2fe1..fb9d280af 100644 --- a/ci/docker-compose-azure.yml +++ b/ci/docker-compose-azure.yml @@ -10,7 +10,7 @@ services: - --scheme - http - --write-timeout=600s - image: semitechnologies/weaviate:preview-add-vectorqueuesize-to-schema-classname-shards-response-afa42cb + image: semitechnologies/weaviate:1.22.0 ports: - 8081:8081 restart: on-failure:0 diff --git a/ci/docker-compose-cluster.yml b/ci/docker-compose-cluster.yml index 20bc58066..af9e5a4fd 100644 --- a/ci/docker-compose-cluster.yml +++ b/ci/docker-compose-cluster.yml @@ -2,7 +2,7 @@ version: '3.4' services: weaviate-node-1: - image: semitechnologies/weaviate:preview-add-vectorqueuesize-to-schema-classname-shards-response-afa42cb + image: semitechnologies/weaviate:1.22.0 restart: on-failure:0 ports: - "8087:8080" @@ -25,7 +25,7 @@ services: - '8080' - --scheme - http - image: semitechnologies/weaviate:preview-add-vectorqueuesize-to-schema-classname-shards-response-afa42cb + image: semitechnologies/weaviate:1.22.0 ports: - 8088:8080 - 6061:6060 diff --git a/ci/docker-compose-okta-cc.yml b/ci/docker-compose-okta-cc.yml index 1cdbdfb76..626d899b9 100644 --- a/ci/docker-compose-okta-cc.yml +++ b/ci/docker-compose-okta-cc.yml @@ -10,7 +10,7 @@ services: - --scheme - http - --write-timeout=600s - image: semitechnologies/weaviate:preview-add-vectorqueuesize-to-schema-classname-shards-response-afa42cb + image: semitechnologies/weaviate:1.22.0 ports: - 8082:8082 restart: on-failure:0 diff --git a/ci/docker-compose-okta-users.yml b/ci/docker-compose-okta-users.yml index b1fd8f51d..b7ac8d6a2 100644 --- a/ci/docker-compose-okta-users.yml +++ b/ci/docker-compose-okta-users.yml @@ -10,7 +10,7 @@ services: - --scheme - http - --write-timeout=600s - image: semitechnologies/weaviate:preview-add-vectorqueuesize-to-schema-classname-shards-response-afa42cb + image: semitechnologies/weaviate:1.22.0 ports: - 8083:8083 restart: on-failure:0 diff --git a/ci/docker-compose-openai.yml b/ci/docker-compose-openai.yml index 4bec986a1..6bad9a9f9 100644 --- a/ci/docker-compose-openai.yml +++ b/ci/docker-compose-openai.yml @@ -9,7 +9,7 @@ services: - '8086' - --scheme - http - image: semitechnologies/weaviate:preview-add-vectorqueuesize-to-schema-classname-shards-response-afa42cb + image: semitechnologies/weaviate:1.22.0 ports: - 8086:8086 restart: on-failure:0 diff --git a/ci/docker-compose-wcs.yml b/ci/docker-compose-wcs.yml index f19b076fb..a8e85d236 100644 --- a/ci/docker-compose-wcs.yml +++ b/ci/docker-compose-wcs.yml @@ -10,7 +10,7 @@ services: - --scheme - http - --write-timeout=600s - image: semitechnologies/weaviate:preview-add-vectorqueuesize-to-schema-classname-shards-response-afa42cb + image: semitechnologies/weaviate:1.22.0 ports: - 8085:8085 restart: on-failure:0 diff --git a/ci/docker-compose.yml b/ci/docker-compose.yml index bcfbff6c6..c6d0ebd88 100644 --- a/ci/docker-compose.yml +++ b/ci/docker-compose.yml @@ -10,7 +10,7 @@ services: - --scheme - http - --write-timeout=600s - image: semitechnologies/weaviate:preview-add-vectorqueuesize-to-schema-classname-shards-response-afa42cb + image: semitechnologies/weaviate:1.22.0 ports: - "8080:8080" - "50051:50051" diff --git a/docs/changelog.rst b/docs/changelog.rst index 781f1fb7c..481df120e 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,5 +1,10 @@ Changelog ========= +Version 3.24.2 +-------------- +This patch version includes: + +- Small fix to the batching process to ensure that failed multi-tenant objects are re-added to the batch with their tenant attached Version 3.24.1 -------------- From 60827e1bae258a2759974aa1ca7e7b60c073d925 Mon Sep 17 00:00:00 2001 From: Tommy Smith Date: Fri, 27 Oct 2023 22:39:34 +0100 Subject: [PATCH 2/5] update changelog for 3.25 --- docs/changelog.rst | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/changelog.rst b/docs/changelog.rst index 481df120e..6869c9508 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,5 +1,16 @@ Changelog ========= +Version 3.25.0 +-------------- +This minor version includes: + +- Support for new Weaviate nested objects on insert and query + - ``client.data_object.create()`` now supports nested objects + - ``client.query.get()`` now supports nested objects +- Updates to use Weaviate's v1 gRPC API +- Support for batching with Weaviate>1.22.0 version and async vector indexing +- Addition of the `client.batch.wait_for_async_indexing()` method to force block until async indexing is complete + Version 3.24.2 -------------- This patch version includes: From fba121fbe26bc031c11a6fae668d09a12ae739b1 Mon Sep 17 00:00:00 2001 From: Tommy Smith Date: Fri, 27 Oct 2023 22:55:01 +0100 Subject: [PATCH 3/5] fix cluster test --- integration/test_cluster.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/integration/test_cluster.py b/integration/test_cluster.py index 396650d63..93dbfa551 100644 --- a/integration/test_cluster.py +++ b/integration/test_cluster.py @@ -4,8 +4,8 @@ import weaviate -GIT_HASH = "afa42cb" -SERVER_VERSION = "1.22.0-rc.0" +GIT_HASH = "b4f2ffb" +SERVER_VERSION = "1.22.0" NODE_NAME = "node1" NUM_OBJECT = 10 From eadf9a7a5db5f69e289ca08d2052f03919b65b2e Mon Sep 17 00:00:00 2001 From: Tommy Smith Date: Fri, 27 Oct 2023 22:55:56 +0100 Subject: [PATCH 4/5] update GHA to use latest py vers --- .github/workflows/main.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 798f86639..d62986179 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -24,7 +24,7 @@ jobs: version: "22.10" - uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version: "3.11" cache: 'pip' # caching pip dependencies - run: pip install -r requirements-devel.txt - name: "Flake 8" @@ -40,7 +40,7 @@ jobs: strategy: fail-fast: false matrix: - version: ["3.8", "3.9", "3.10", "3.11"] + version: ["3.8", "3.9", "3.10", "3.11", "3.12"] folder: ["weaviate"] steps: - uses: actions/checkout@v3 @@ -58,7 +58,7 @@ jobs: strategy: fail-fast: false matrix: - version: ["3.8", "3.9", "3.10", "3.11"] + version: ["3.8", "3.9", "3.10", "3.11", "3.12"] folder: ["test", "mock_tests"] steps: - uses: actions/checkout@v3 @@ -82,7 +82,7 @@ jobs: strategy: fail-fast: false matrix: - version: [ "3.8", "3.9", "3.10", "3.11"] + version: [ "3.8", "3.9", "3.10", "3.11", "3.12"] optional_dependencies: [false] include: - version: "3.11" @@ -154,10 +154,10 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 - - name: Set up Python 3.10 + - name: Set up Python 3.11 uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version: "3.11" cache: 'pip' # caching pip dependencies - name: Install dependencies run: pip install -r requirements-devel.txt @@ -210,10 +210,10 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 - - name: Set up Python 3.10 + - name: Set up Python 3.11 uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version: "3.11" cache: 'pip' # caching pip dependencies - name: Install dependencies run: pip install -r requirements-devel.txt From bb4dd9f93a1edda8923a8742bbeccec8c182ebbb Mon Sep 17 00:00:00 2001 From: Tommy Smith Date: Fri, 27 Oct 2023 23:11:45 +0100 Subject: [PATCH 5/5] update --- docs/changelog.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/changelog.rst b/docs/changelog.rst index 6869c9508..8046b8ded 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -10,6 +10,7 @@ This minor version includes: - Updates to use Weaviate's v1 gRPC API - Support for batching with Weaviate>1.22.0 version and async vector indexing - Addition of the `client.batch.wait_for_async_indexing()` method to force block until async indexing is complete +- Add tests for Python 3.12 to ensure compatibility Version 3.24.2 --------------