Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

avs python 3.0.0 changes supporting avs 0.11.1 #64

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .internal/docker-compose-prism-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .internal/docker-compose-quote-search-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion basic-search/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion basic-search/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
aerospike-vector-search==2.0.0
aerospike-vector-search==3.0.0
2 changes: 1 addition & 1 deletion docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```


2 changes: 1 addition & 1 deletion docker/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/manifests/avs-gke-values-auth.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/manifests/avs-gke-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions prism-image-search/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand All @@ -68,7 +68,7 @@ docker build -t prism . -f Dockerfile-prism

### 2. Add features.conf
AVS needs an Aerospike features.conf file with the vector-search feature enabled.
Add your features.conf file to container-volumes/avs/etc/avs.
Add your features.conf file to `container-volumes/avs/etc/aerospike-vector-search`.

### 3. Start the environment
```
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
53 changes: 53 additions & 0 deletions prism-image-search/docker-compose-dev.yml
Original file line number Diff line number Diff line change
@@ -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: {}
4 changes: 2 additions & 2 deletions prism-image-search/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
depends_on:
aerospike:
condition: service_healthy
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions prism-image-search/prism/requirements.txt
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion quote-semantic-search/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
55 changes: 55 additions & 0 deletions quote-semantic-search/docker-compose-dev.yml
Original file line number Diff line number Diff line change
@@ -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: {}
4 changes: 2 additions & 2 deletions quote-semantic-search/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ services:
depends_on:
aerospike:
condition: service_healthy
image: aerospike/aerospike-vector-search:0.10.0
image: aerospike/aerospike-vector-search:0.11.1
# ports:
# - "5002:5002"
networks:
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions quote-semantic-search/quote-search/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# TODO: Include exact versions
# Aerospike dependencies
aerospike-vector-search==2.0.0
aerospike-vector-search==3.0.0


# Flask framework
Expand All @@ -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