From 4ffc3ce0a2a4204470a887b42c8436b5eb7b4f8d Mon Sep 17 00:00:00 2001 From: tellet-q <166374656+tellet-q@users.noreply.github.com> Date: Tue, 13 Aug 2024 10:36:00 +0200 Subject: [PATCH] Bump qdrant versions to 1.11.0 (#184) * Update qdrant-client version to 1.11 * Run all engines if poetry changed * Bump qdrant docker image version --- .../manual-all-engines-benchmark.yaml | 21 +++++++++++++++++++ .../qdrant-billion-scale/docker-compose.yaml | 2 +- .../qdrant-cluster-mode/docker-compose.yaml | 6 +++--- .../qdrant-limit-ram/docker-compose.yaml | 2 +- .../docker-compose-limit-cpu.yaml.yml | 2 +- .../qdrant-single-node/docker-compose.yaml | 2 +- poetry.lock | 13 ++++++------ pyproject.toml | 2 +- 8 files changed, 36 insertions(+), 14 deletions(-) diff --git a/.github/workflows/manual-all-engines-benchmark.yaml b/.github/workflows/manual-all-engines-benchmark.yaml index ccb2a487..d1a7ab43 100644 --- a/.github/workflows/manual-all-engines-benchmark.yaml +++ b/.github/workflows/manual-all-engines-benchmark.yaml @@ -26,6 +26,9 @@ jobs: - 'engine/servers/elasticsearch-single-node/**' - 'engine/servers/elasticsearch-single-node-ci/**' - 'engine/base_client/**' + poetry: + - 'poetry.lock' + - 'pyproject.toml' - uses: ./.github/workflows/actions/run-engine-benchmark if: ${{ steps.changes.outputs.elasticsearch == 'true' || github.event_name == 'workflow_dispatch' }} with: @@ -48,6 +51,9 @@ jobs: - 'engine/servers/milvus-single-node/**' - 'engine/servers/milvus-limit-ram/**' - 'engine/base_client/**' + poetry: + - 'poetry.lock' + - 'pyproject.toml' - uses: ./.github/workflows/actions/run-engine-benchmark if: ${{ steps.changes.outputs.milvus == 'true' || github.event_name == 'workflow_dispatch' }} with: @@ -70,6 +76,9 @@ jobs: - 'engine/servers/opensearch-single-node/**' - 'engine/servers/opensearch-single-node-ci/**' - 'engine/base_client/**' + poetry: + - 'poetry.lock' + - 'pyproject.toml' - uses: ./.github/workflows/actions/run-engine-benchmark if: ${{ steps.changes.outputs.opensearch == 'true' || github.event_name == 'workflow_dispatch' }} with: @@ -91,6 +100,9 @@ jobs: - 'engine/clients/pgvector/**' - 'engine/servers/pgvector-single-node/**' - 'engine/base_client/**' + poetry: + - 'poetry.lock' + - 'pyproject.toml' - uses: ./.github/workflows/actions/run-engine-benchmark if: ${{ steps.changes.outputs.pgvector == 'true' || github.event_name == 'workflow_dispatch' }} with: @@ -116,6 +128,9 @@ jobs: - 'engine/servers/qdrant-cluster-mode/**' - 'engine/servers/qdrant-continuous-benchmarks/**' - 'engine/base_client/**' + poetry: + - 'poetry.lock' + - 'pyproject.toml' - uses: ./.github/workflows/actions/run-engine-benchmark if: ${{ steps.changes.outputs.qdrant == 'true' || github.event_name == 'workflow_dispatch' }} with: @@ -137,6 +152,9 @@ jobs: - 'engine/clients/redis/**' - 'engine/servers/redis-single-node/**' - 'engine/base_client/**' + poetry: + - 'poetry.lock' + - 'pyproject.toml' - uses: ./.github/workflows/actions/run-engine-benchmark if: ${{ steps.changes.outputs.weaviate == 'true' || github.event_name == 'workflow_dispatch' }} with: @@ -158,6 +176,9 @@ jobs: - 'engine/clients/weaviate/**' - 'engine/servers/weaviate-single-node/**' - 'engine/base_client/**' + poetry: + - 'poetry.lock' + - 'pyproject.toml' - uses: ./.github/workflows/actions/run-engine-benchmark if: ${{ steps.changes.outputs.weaviate == 'true' || github.event_name == 'workflow_dispatch' }} with: diff --git a/engine/servers/qdrant-billion-scale/docker-compose.yaml b/engine/servers/qdrant-billion-scale/docker-compose.yaml index 765d36da..723a76b6 100644 --- a/engine/servers/qdrant-billion-scale/docker-compose.yaml +++ b/engine/servers/qdrant-billion-scale/docker-compose.yaml @@ -2,7 +2,7 @@ version: '3.7' services: qdrant_bench: - image: qdrant/qdrant:v1.7.3 + image: qdrant/qdrant:${QDRANT_VERSION:-v1.11.0} ports: - "6333:6333" - "6334:6334" diff --git a/engine/servers/qdrant-cluster-mode/docker-compose.yaml b/engine/servers/qdrant-cluster-mode/docker-compose.yaml index 4c5288ef..cd3adf26 100644 --- a/engine/servers/qdrant-cluster-mode/docker-compose.yaml +++ b/engine/servers/qdrant-cluster-mode/docker-compose.yaml @@ -2,7 +2,7 @@ version: "3.7" services: qdrant-node-0: - image: qdrant/qdrant:v1.7.3 + image: qdrant/qdrant:${QDRANT_VERSION:-v1.11.0} environment: - QDRANT__SERVICE__GRPC_PORT=6334 - QDRANT__CLUSTER__ENABLED=true @@ -18,7 +18,7 @@ services: qdrant-node-1: - image: qdrant/qdrant:v1.7.3 + image: qdrant/qdrant:${QDRANT_VERSION:-v1.11.0} environment: - QDRANT__SERVICE__GRPC_PORT=6334 - QDRANT__CLUSTER__ENABLED=true @@ -36,7 +36,7 @@ services: qdrant-node-2: - image: qdrant/qdrant:v1.7.3 + image: qdrant/qdrant:${QDRANT_VERSION:-v1.11.0} environment: - QDRANT__SERVICE__GRPC_PORT=6334 - QDRANT__CLUSTER__ENABLED=true diff --git a/engine/servers/qdrant-limit-ram/docker-compose.yaml b/engine/servers/qdrant-limit-ram/docker-compose.yaml index 733f3ace..c839d59c 100644 --- a/engine/servers/qdrant-limit-ram/docker-compose.yaml +++ b/engine/servers/qdrant-limit-ram/docker-compose.yaml @@ -2,7 +2,7 @@ version: '3.7' services: qdrant_bench: - image: qdrant/qdrant:v1.7.3 + image: qdrant/qdrant:${QDRANT_VERSION:-v1.11.0} ports: - "6333:6333" - "6334:6334" diff --git a/engine/servers/qdrant-single-node/docker-compose-limit-cpu.yaml.yml b/engine/servers/qdrant-single-node/docker-compose-limit-cpu.yaml.yml index b957bbe2..9c19bb06 100644 --- a/engine/servers/qdrant-single-node/docker-compose-limit-cpu.yaml.yml +++ b/engine/servers/qdrant-single-node/docker-compose-limit-cpu.yaml.yml @@ -2,7 +2,7 @@ version: '3.7' services: qdrant_bench: - image: qdrant/qdrant:${QDRANT_VERSION:-v1.7.3} + image: qdrant/qdrant:${QDRANT_VERSION:-v1.11.0} network_mode: host logging: driver: "json-file" diff --git a/engine/servers/qdrant-single-node/docker-compose.yaml b/engine/servers/qdrant-single-node/docker-compose.yaml index bcea21de..3264127b 100644 --- a/engine/servers/qdrant-single-node/docker-compose.yaml +++ b/engine/servers/qdrant-single-node/docker-compose.yaml @@ -2,7 +2,7 @@ version: '3.7' services: qdrant_bench: - image: ${CONTAINER_REGISTRY:-docker.io}/qdrant/qdrant:v1.9.5 + image: ${CONTAINER_REGISTRY:-docker.io}/qdrant/qdrant:${QDRANT_VERSION:-v1.11.0} ports: - "6333:6333" - "6334:6334" diff --git a/poetry.lock b/poetry.lock index 3513ab95..ae96c371 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand. [[package]] name = "annotated-types" @@ -1699,13 +1699,13 @@ files = [ [[package]] name = "qdrant-client" -version = "1.9.1" +version = "1.11.0" description = "Client library for the Qdrant vector search engine" optional = false python-versions = ">=3.8" files = [ - {file = "qdrant_client-1.9.1-py3-none-any.whl", hash = "sha256:b9b7e0e5c1a51410d8bb5106a869a51e12f92ab45a99030f27aba790553bd2c8"}, - {file = "qdrant_client-1.9.1.tar.gz", hash = "sha256:186b9c31d95aefe8f2db84b7746402d7365bd63b305550e530e31bde2002ce79"}, + {file = "qdrant_client-1.11.0-py3-none-any.whl", hash = "sha256:1f574ccebb91c0bc8a620c9a41a5a010084fbc4d8c6f1cd0ab7b2eeb97336fc0"}, + {file = "qdrant_client-1.11.0.tar.gz", hash = "sha256:7c1d4d7a96cfd1ee0cde2a21c607e9df86bcca795ad8d1fd274d295ab64b8458"}, ] [package.dependencies] @@ -1718,7 +1718,8 @@ pydantic = ">=1.10.8" urllib3 = ">=1.26.14,<3" [package.extras] -fastembed = ["fastembed (==0.2.6)"] +fastembed = ["fastembed (==0.3.4)"] +fastembed-gpu = ["fastembed-gpu (==0.3.4)"] [[package]] name = "redis" @@ -2112,4 +2113,4 @@ validators = "0.28.3" [metadata] lock-version = "2.0" python-versions = ">=3.8,<3.12" -content-hash = "b354f2ab7b16d4de0d6fb4a80bcc24392ea5fa15a4a1f58bbdaeb8c7f0c0b5c5" +content-hash = "6ee9362c67da4efa3dc4943e8a9e7245ea32a263422bad1ea5cea21d8a19734e" diff --git a/pyproject.toml b/pyproject.toml index 5bc02a5f..fb921b58 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ authors = ["Qdrant Team "] [tool.poetry.dependencies] python = ">=3.8,<3.12" -qdrant-client = "^1.9.0" +qdrant-client = "^1.11.0" typer = "^0.6.1" jsons = "^1.6.3" h5py = "^3.7.0"