From 6ca7b4c6469392c7880312370ffc754ed737c2ab Mon Sep 17 00:00:00 2001
From: rahulkumar <rkumar@aerospike.com>
Date: Mon, 28 Oct 2024 15:19:28 -0700
Subject: [PATCH] avs python 3.0.0 changes supporting avs 0.11.1

---
 basic-search/README.md                        |   2 +-
 kubernetes/manifests/avs-gke-values-auth.yaml |   2 +-
 prism-image-search/README.md                  |   6 +-
 .../prism/images/static/data/avs.png          | Bin 0 -> 1840 bytes
 prism-image-search/docker-compose-dev.yml     |  53 +++++++++++++++++
 prism-image-search/docker-compose.yml         |   2 +-
 quote-semantic-search/docker-compose-dev.yml  |  55 ++++++++++++++++++
 quote-semantic-search/docker-compose.yml      |   2 +-
 8 files changed, 115 insertions(+), 7 deletions(-)
 create mode 100644 prism-image-search/container-volumes/prism/images/static/data/avs.png
 create mode 100644 prism-image-search/docker-compose-dev.yml
 create mode 100644 quote-semantic-search/docker-compose-dev.yml

diff --git a/basic-search/README.md b/basic-search/README.md
index ddc1f45..fa7c052 100644
--- 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)).
-2. An Aerospike Vector Search host (sandbox or local) running AVS 0.11.0 or 0.11.1.
+2. An Aerospike Vector Search host (sandbox or local) running AVS 0.11.1 or newer.
 
 ## Setup build Python Virtual Environment
 
diff --git a/kubernetes/manifests/avs-gke-values-auth.yaml b/kubernetes/manifests/avs-gke-values-auth.yaml
index 15f4eb7..e9799db 100644
--- 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/prism-image-search/README.md b/prism-image-search/README.md
index 4bafbbb..e442a0c 100644
--- a/prism-image-search/README.md
+++ b/prism-image-search/README.md
@@ -53,8 +53,8 @@ description.
 
 
 ## Install using docker compose
-If you have a license key, you can easily set up 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/prism/images/static/data`
+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/prism/images/static/data`
 
 ```shell
 ln -s ~/Pictures container-volumes/prism/images/static/data
@@ -72,7 +72,7 @@ Add your features.conf file to `container-volumes/avs/etc/aerospike-vector-searc
 
 ### 3. Start the environment
 ```
-docker-compose up
+docker compose up
 ```
 
 ## Developing
diff --git a/prism-image-search/container-volumes/prism/images/static/data/avs.png b/prism-image-search/container-volumes/prism/images/static/data/avs.png
new file mode 100644
index 0000000000000000000000000000000000000000..c70a759ae5d96a4c30652938b618ce00236f6ddd
GIT binary patch
literal 1840
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

literal 0
HcmV?d00001

diff --git a/prism-image-search/docker-compose-dev.yml b/prism-image-search/docker-compose-dev.yml
new file mode 100644
index 0000000..81aa4f1
--- /dev/null
+++ b/prism-image-search/docker-compose-dev.yml
@@ -0,0 +1,53 @@
+services:
+  aerospike:
+    image: aerospike/aerospike-server-enterprise:7.0.0.2
+    ports:
+      - "3000:3000"
+    networks:
+      - avs-demo
+    volumes:
+      - ./container-volumes/aerospike/etc/aerospike:/opt/aerospike/etc/aerospike
+    command:
+      - "--config-file"
+      - "/opt/aerospike/etc/aerospike/aerospike.conf"
+      # use this line to store all index and vector data in the default namespace (test)
+      # - "/opt/aerospike/etc/aerospike/aerospike-single-namespace.conf"
+    healthcheck:
+#      test: [ "CMD", "asinfo", "-U", "admin", "-P", "admin", "-p", "3000", "-v", "build" ]
+      test: [ "CMD", "asinfo", "-p", "3000", "-v", "build" ]
+      interval: 5s
+      timeout: 20s
+      retries: 10
+  avs:
+    image: aerospike/aerospike-vector-search:0.11.1
+    depends_on:
+      aerospike:
+        condition: service_healthy
+    networks:
+      - avs-demo
+    volumes:
+      - ./container-volumes/avs/etc/aerospike-vector-search:/etc/aerospike-vector-search
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://avs:5040/manage/rest/v1"]
+      interval: 5s
+      timeout: 20s
+      retries: 10
+  app:
+    image: prism:latest
+    depends_on: 
+      avs:
+        condition: service_healthy
+    ports:
+      - "8080:8080"
+    networks:
+      - avs-demo
+    environment:
+      AVS_HOST: avs
+      AVS_PORT: "5000"
+      APP_NUM_QUOTES: "5000"
+      GRPC_DNS_RESOLVER: native
+    volumes:
+      - ./container-volumes/prism/images:/prism/static/images/data
+
+networks:
+  avs-demo: {}
diff --git a/prism-image-search/docker-compose.yml b/prism-image-search/docker-compose.yml
index 81aa4f1..54d74db 100644
--- a/prism-image-search/docker-compose.yml
+++ b/prism-image-search/docker-compose.yml
@@ -33,7 +33,7 @@ services:
       timeout: 20s
       retries: 10
   app:
-    image: prism:latest
+    image: aerospike/prism-search-example:latest
     depends_on: 
       avs:
         condition: service_healthy
diff --git a/quote-semantic-search/docker-compose-dev.yml b/quote-semantic-search/docker-compose-dev.yml
new file mode 100644
index 0000000..44f227d
--- /dev/null
+++ b/quote-semantic-search/docker-compose-dev.yml
@@ -0,0 +1,55 @@
+services:
+  aerospike:
+    image: aerospike/aerospike-server-enterprise:7.0.0.2
+    # ports:
+    #   - "3000:3000"
+    networks:
+      - avs-demo
+    volumes:
+      - ./container-volumes/aerospike/etc/aerospike:/opt/aerospike/etc/aerospike
+    command:
+      - "--config-file"
+      - "/opt/aerospike/etc/aerospike/aerospike.conf"
+      # use this line to store all index and vector data in the default namespace (test)
+      # - "/opt/aerospike/etc/aerospike/aerospike-single-namespace.conf"
+    healthcheck:
+#      test: [ "CMD", "asinfo", "-U", "admin", "-P", "admin", "-p", "3000", "-v", "build" ]
+      test: [ "CMD", "asinfo", "-p", "3000", "-v", "build" ]
+      interval: 5s
+      timeout: 20s
+      retries: 10
+  avs:
+    depends_on:
+      aerospike:
+        condition: service_healthy
+    image: aerospike/aerospike-vector-search:0.11.1
+    # ports:
+    #   - "5002:5002"
+    networks:
+      - avs-demo
+    volumes:
+      - ./container-volumes/avs/etc/aerospike-vector-search:/etc/aerospike-vector-search
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://avs:5040/manage/rest/v1"]
+      interval: 5s
+      timeout: 20s
+      retries: 10
+  app:
+    image: quote-search:latest
+    depends_on:
+      avs:
+        condition: service_healthy
+    ports:
+      - "8080:8080"
+    networks:
+      - avs-demo
+    volumes:
+      - ./container-volumes/quote-search/data:/container-volumes/quote-search/data
+    environment:
+      AVS_HOST: avs
+      AVS_PORT: "5000"
+      APP_NUM_QUOTES: "5000"
+      GRPC_DNS_RESOLVER: native
+
+networks:
+  avs-demo: {}
\ No newline at end of file
diff --git a/quote-semantic-search/docker-compose.yml b/quote-semantic-search/docker-compose.yml
index c90c4a7..473dddb 100644
--- a/quote-semantic-search/docker-compose.yml
+++ b/quote-semantic-search/docker-compose.yml
@@ -35,7 +35,7 @@ services:
       timeout: 20s
       retries: 10
   app:
-    image: quote-search
+    image: aerospike/quote-search-example:latest
     depends_on:
       avs:
         condition: service_healthy