Merge branch 'main' into VEC-383-feature-key-location

aerospike · Nov 5, 2024 · 7ec8c60 · 7ec8c60
2 parents 286d7cc + 39621f3
commit 7ec8c60
Show file tree

Hide file tree

Showing 19 changed files with 89 additions and 32 deletions.
diff --git a/.internal/docker-compose-prism-dev.yml b/.internal/docker-compose-prism-dev.yml
@@ -11,7 +11,7 @@ services:
       - "--config-file"
       - "/opt/aerospike/etc/aerospike/aerospike.conf"
   avs:
-    image: aerospike/aerospike-vector-search:0.10.0
+    image: aerospike/aerospike-vector-search:0.11.1
     # ports:
       # - "5000:5000"
     networks:

diff --git a/.internal/docker-compose-quote-search-dev.yml b/.internal/docker-compose-quote-search-dev.yml
@@ -11,7 +11,7 @@ services:
       - "--config-file"
       - "/opt/aerospike/etc/aerospike/aerospike.conf"
   avs:
-    image: aerospike/aerospike-vector-search:0.10.0
+    image: aerospike/aerospike-vector-search:0.11.1
     # ports:
     #   - "5002:5002"
     networks:

diff --git a/basic-search/README.md b/basic-search/README.md
@@ -6,7 +6,7 @@ vector record insertion, and basic ANN query against the AVS server using the Py
 ## Prerequisites
 
 1. A Python 3.10 - 3.11 environment and familiarity with the Python programming language (see [Setup Python Virtual Environment](../prism-image-search/README.md#setup-python-virtual-environment)).
-1. An Aerospike Vector Search host (sandbox or local) running AVS 0.10.0 or newer.
+2. An Aerospike Vector Search host (sandbox or local) running AVS 0.11.1 or newer.
 
 ## Setup build Python Virtual Environment
 

diff --git a/basic-search/requirements.txt b/basic-search/requirements.txt
@@ -1 +1 @@
-aerospike-vector-search==2.0.0
+aerospike-vector-search==3.0.0
diff --git a/docker/README.md b/docker/README.md
@@ -33,7 +33,7 @@ docker run -d \
 -p 5000:5000 \
 -p 5040:5040 \
 -v ./config:/etc/aerospike-vector-search \
-aerospike/aerospike-vector-search:0.10.0
+aerospike/aerospike-vector-search:0.11.1
 ```
 
 
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
@@ -20,7 +20,7 @@ services:
     networks:
       - svc
   aerospike-vector-search:
-    image: aerospike/aerospike-vector-search:0.10.0
+    image: aerospike/aerospike-vector-search:0.11.1
     container_name: "aerospike-vector-search"
     depends_on:
       aerospike-cluster:

diff --git a/kubernetes/full-create-and-install.sh b/kubernetes/full-create-and-install.sh
@@ -417,7 +417,7 @@ deploy_avs_helm_chart() {
     helm repo add aerospike-helm https://artifact.aerospike.io/artifactory/api/helm/aerospike-helm
     helm repo update
     if [ -z "$CHART_LOCATION" ]; then
-        helm install avs-gke --values $BUILD_DIR/manifests/avs-gke-values.yaml --namespace avs aerospike-helm/aerospike-vector-search --version 0.4.1 --wait
+        helm install avs-gke --values $BUILD_DIR/manifests/avs-gke-values.yaml --namespace avs aerospike-helm/aerospike-vector-search --version 0.6.0 --wait
     else
         helm install avs-gke --values $BUILD_DIR/manifests/avs-gke-values.yaml --namespace avs "$CHART_LOCATION" --wait
     fi

diff --git a/kubernetes/manifests/aerospike-cr-auth.yaml b/kubernetes/manifests/aerospike-cr-auth.yaml
@@ -24,21 +24,36 @@ spec:
             size: 1Gi
       - name: avs-meta
         aerospike:
-          path: /avs/dev/xvdf
+          path: /avs-meta/dev/xvdf
+        source:
+          persistentVolume:
+            storageClass: ssd
+            volumeMode: Block
+            size: 2Gi
+      - name: avs-index
+        aerospike:
+          path: /avs-index/dev/xvdf
+        source:
+          persistentVolume:
+            storageClass: ssd
+            volumeMode: Block
+            size: 20Gi
+      - name: avs-data
+        aerospike:
+          path: /avs-data/dev/xvdf
         source:
           persistentVolume:
             storageClass: ssd
             volumeMode: Block
             size: 20Gi
-
       - name: ns
         aerospike:
           path: /test/dev/xvdf
         source:
           persistentVolume:
             storageClass: ssd
             volumeMode: Block
-            size: 20Gi
+            size: 1Gi
       - name: aerospike-config-secret
         source:
           secret:
@@ -128,7 +143,18 @@ spec:
           type: device
           devices:
             - /test/dev/xvdf
-
+      - name: avs-index
+        replication-factor: 2
+        storage-engine:
+          type: device
+          devices:
+            - /avs-index/dev/xvdf
+      - name: avs-data
+        replication-factor: 2
+        storage-engine:
+          type: device
+          devices:
+            - /avs-data/dev/xvdf
       - name: avs-meta
         nsup-period: 600
         nsup-threads: 2
@@ -137,4 +163,4 @@ spec:
         storage-engine:
           type: device
           devices:
-            - /avs/dev/xvdf
+            - /avs-meta/dev/xvdf
diff --git a/kubernetes/manifests/aerospike-cr.yaml b/kubernetes/manifests/aerospike-cr.yaml
@@ -24,21 +24,36 @@ spec:
             size: 1Gi
       - name: avs-meta
         aerospike:
-          path: /avs/dev/xvdf
+          path: /avs-meta/dev/xvdf
+        source:
+          persistentVolume:
+            storageClass: ssd
+            volumeMode: Block
+            size: 2Gi
+      - name: avs-index
+        aerospike:
+          path: /avs-index/dev/xvdf
+        source:
+          persistentVolume:
+            storageClass: ssd
+            volumeMode: Block
+            size: 20Gi
+      - name: avs-data
+        aerospike:
+          path: /avs-data/dev/xvdf
         source:
           persistentVolume:
             storageClass: ssd
             volumeMode: Block
             size: 20Gi
-
       - name: ns
         aerospike:
           path: /test/dev/xvdf
         source:
           persistentVolume:
             storageClass: ssd
             volumeMode: Block
-            size: 20Gi
+            size: 1Gi
       - name: aerospike-config-secret
         source:
           secret:
@@ -90,7 +105,18 @@ spec:
           type: device
           devices:
             - /test/dev/xvdf
-
+      - name: avs-index
+        replication-factor: 2
+        storage-engine:
+          type: device
+          devices:
+            - /avs-index/dev/xvdf
+      - name: avs-data
+        replication-factor: 2
+        storage-engine:
+          type: device
+          devices:
+            - /avs-data/dev/xvdf
       - name: avs-meta
         nsup-period: 600
         nsup-threads: 2
@@ -99,4 +125,4 @@ spec:
         storage-engine:
           type: device
           devices:
-            - /avs/dev/xvdf
+            - /avs-meta/dev/xvdf
diff --git a/kubernetes/manifests/avs-gke-values-auth.yaml b/kubernetes/manifests/avs-gke-values-auth.yaml
@@ -91,7 +91,7 @@ image:
   repository: "aerospike/aerospike-vector-search"
   pullPolicy: "IfNotPresent"
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "0.10.0"
+  tag: "0.11.1"
 extraSecretVolumeMounts:
   - name: aerospike-tls
     mountPath: "/etc/ssl/certs"

diff --git a/kubernetes/manifests/avs-gke-values.yaml b/kubernetes/manifests/avs-gke-values.yaml
@@ -47,7 +47,7 @@ image:
   repository: "aerospike/aerospike-vector-search"
   pullPolicy: "IfNotPresent"
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "0.10.0"
+  tag: "0.11.1"
 extraSecretVolumeMounts:
   - name: aerospike-tls
     mountPath: "/etc/ssl/certs"

diff --git a/prism-image-search/README.md b/prism-image-search/README.md
@@ -10,7 +10,7 @@ Aerospike Vector Search (AVS) performs Approximate Nearest Neighbor(ANN) search
 You don't have to know Aerospike to get started, but you do need the following:
 
 1. A Python 3.10 - 3.11 environment and familiarity with the Python programming language (see [Setup Python Virtual Environment](./README.md#setup-python-virtual-environment)).
-1. An Aerospike Vector Search host (preview environment or local) running AVS 0.10.0 or newer.
+2. An Aerospike Vector Search host (preview environment or local) running AVS 0.11.1 or newer.
 
 ## Configure AVS host
 
@@ -54,7 +54,7 @@ description.
 
 ## Install using docker compose
 If you have a license key, you can easily setup Aerospike, AVS, and the prism-image-search
-app using docker-compose. When using docker-compose, you'll need to place your images in `container-volumes`
+app using docker-compose. When using docker-compose, you'll need to place your images in `container-volumes/prism/images/static/data`
 
 ```shell
 ln -s ~/Pictures container-volumes/prism/images/static/data
@@ -67,9 +67,9 @@ docker build -t prism . -f Dockerfile-prism
 ```
 ### 2. Add features.conf
 AVS needs an Aerospike features.conf file with the vector-search feature enabled.
-Optionally set `FEATURE_KEY` environment variable with the location of your `features.conf` file.
 
-If no variable is set it will expect the features.conf to be in  `container-volumes/avs/etc/aerospike-vector-search`
+Optionally set `FEATURE_KEY` environment variable with the location of your `features.conf` file or 
+if no variable is set it will expect the features.conf to be in  `container-volumes/avs/etc/aerospike-vector-search`.
 
 ### 3. Start the environment
 ```

diff --git a/prism-image-search/docker-compose-dev.yml b/prism-image-search/docker-compose-dev.yml
@@ -19,9 +19,10 @@ services:
       timeout: 20s
       retries: 10
   avs:
-    image: aerospike/aerospike-vector-search:0.10.0
+    image: aerospike/aerospike-vector-search:0.11.1
     environment:
       FEATURE_KEY: "${FEATURE_KEY:-./container-volumes/avs/etc/aerospike-vector-search/features.conf}"
+
     depends_on:
       aerospike:
         condition: service_healthy

diff --git a/prism-image-search/docker-compose.yml b/prism-image-search/docker-compose.yml
@@ -19,7 +19,7 @@ services:
       timeout: 20s
       retries: 10
   avs:
-    image: aerospike/aerospike-vector-search:0.10.0
+    image: aerospike/aerospike-vector-search:0.11.1
     environment:
       FEATURE_KEY: "${FEATURE_KEY:-./container-volumes/avs/etc/aerospike-vector-search/features.conf}"
     depends_on:

diff --git a/prism-image-search/prism/requirements.txt b/prism-image-search/prism/requirements.txt
@@ -1,6 +1,6 @@
 # TODO: Include exact versions
 # Aerospike dependencies
-aerospike-vector-search==2.0.0
+aerospike-vector-search==3.0.0
 
 # Flask framework
 flask~=2.3.2
@@ -11,7 +11,7 @@ waitress
 
 # Image processing
 numpy==1.26.4 # fix issues in dependencies after 2.0.0 release
-sentence-transformers==2.2.2
+sentence-transformers==3.2.1
 torch==2.0.1
 tqdm~=4.66.1
 Pillow~=10.0.0

diff --git a/quote-semantic-search/README.md b/quote-semantic-search/README.md
@@ -11,7 +11,7 @@ Aerospike Vector Search (AVS) performs Approximate Nearest Neighbor(ANN) search
 You don't have to know Aerospike to get started, but you do need the following:
 
 1. A Python 3.10 - 3.11 environment and familiarity with the Python programming language (see [Setup Python Virtual Environment](../prism-image-search/README.md#setup-python-virtual-environment)).
-1. An Aerospike Vector Search host (preview or local) running AVS 0.10.0 or newer.
+2. An Aerospike Vector Search host (preview or local) running AVS 0.11.1.
 
 ## Configure AVS host
 

diff --git a/quote-semantic-search/docker-compose-dev.yml b/quote-semantic-search/docker-compose-dev.yml
@@ -19,12 +19,14 @@ services:
       timeout: 20s
       retries: 10
   avs:
-    image: aerospike/aerospike-vector-search:0.10.0
+    image: aerospike/aerospike-vector-search:0.11.1
     environment:
       FEATURE_KEY: "${FEATURE_KEY:-./container-volumes/avs/etc/aerospike-vector-search/features.conf}"
     depends_on:
       aerospike:
         condition: service_healthy
+    # ports:
+    #   - "5002:5002"
     networks:
       - avs-demo
     volumes:

diff --git a/quote-semantic-search/docker-compose.yml b/quote-semantic-search/docker-compose.yml
@@ -19,12 +19,14 @@ services:
       timeout: 20s
       retries: 10
   avs:
-    image: aerospike/aerospike-vector-search:0.10.0
+    image: aerospike/aerospike-vector-search:0.11.1
     environment:
       FEATURE_KEY: "${FEATURE_KEY:-./container-volumes/avs/etc/aerospike-vector-search/features.conf}"
     depends_on:
       aerospike:
         condition: service_healthy
+    # ports:
+    #   - "5002:5002"
     networks:
       - avs-demo
     volumes:

diff --git a/quote-semantic-search/quote-search/requirements.txt b/quote-semantic-search/quote-search/requirements.txt
@@ -1,6 +1,6 @@
 # TODO: Include exact versions
 # Aerospike dependencies
-aerospike-vector-search==2.0.0
+aerospike-vector-search==3.0.0
 
 
 # Flask framework
@@ -12,7 +12,7 @@ waitress
 
 # Quote processing
 numpy==1.26.4 # fix issues in dependencies after 2.0.0 release
-sentence-transformers==2.2.2
+sentence-transformers==3.2.1
 torch==2.0.1
 tqdm~=4.66.1
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		aerospike-vector-search==2.0.0
		aerospike-vector-search==3.0.0