-
Notifications
You must be signed in to change notification settings - Fork 115
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- rename variables for readability - reworked install for reliability and downloading from a trusted source - fixing tests locally with python version collisions - prepare variables for future image repo renaming/migration Signed-off-by: greg pereira <[email protected]>
- Loading branch information
1 parent
47b2339
commit a1c4bc3
Showing
2 changed files
with
62 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,58 +1,45 @@ | ||
| CHROMADBIMAGE ?= quay.io/ai-lab/chromadb:latest | ||
| MODELIMAGE ?= quay.io/ai-lab/mistral-7b-instruct:latest | ||
| APPIMAGE ?= quay.io/ai-lab/${APP}:latest | ||
| SERVERIMAGE ?= quay.io/ai-lab/llamacpp-python:latest | ||
| SSHPUBKEY ?= $(shell cat ${HOME}/.ssh/id_rsa.pub;) | ||
| BOOTCIMAGE ?= quay.io/ai-lab/${APP}-bootc:latest | ||
| REGISTRY ?= quay.io | ||
| IMAGE_NAME ?= ai-lab/${APP}:latest | ||
| CHROMADB_IMAGE ?= $(REGISTRY)/ai-lab/chromadb:latest | ||
| MODEL_IMAGE ?= $(REGISTRY)/ai-lab/mistral-7b-instruct:latest | ||
| APP_IMAGE ?= $(REGISTRY)/$(IMAGE_NAME) | ||
| SERVER_IMAGE ?= $(REGISTRY)/ai-lab/llamacpp-python:latest | ||
| SSH_PUBKEY ?= $(shell cat ${HOME}/.ssh/id_rsa.pub;) | ||
| BOOTC_IMAGE ?= quay.io/ai-lab/${APP}-bootc:latest | ||
| FROM ?= | ||
| ARCH ?= | ||
|
|
||
| .PHONY: build | ||
| build: | ||
| podman build $${ARCH:+--arch $${ARCH}} $${FROM:+--from $${FROM}} -f builds/Containerfile -t ${APPIMAGE} . | ||
| podman build $${ARCH:+--arch $${ARCH}} $${FROM:+--from $${FROM}} -f builds/Containerfile -t ${APP_IMAGE} . | ||
|
|
||
| .PHONY: bootc | ||
| bootc: quadlet | ||
| podman build $${ARCH:+--arch $${ARCH}} $${FROM:+--from $${FROM}} --cap-add SYS_ADMIN --build-arg "SSHPUBKEY=$(SSHPUBKEY)" -f bootc/Containerfile -t ${BOOTCIMAGE} . | ||
| podman build $${ARCH:+--arch $${ARCH}} $${FROM:+--from $${FROM}} --cap-add SYS_ADMIN --build-arg "SSH_PUBKEY=$(SSH_PUBKEY)" -f bootc/Containerfile -t ${BOOTC_IMAGE} . | ||
|
|
||
| .PHONY: quadlet | ||
| quadlet: | ||
| # Modify quadlet files to match the server, model and app image | ||
| mkdir -p build | ||
| sed -e "s|SERVERIMAGE|${SERVERIMAGE}|" \ | ||
| -e "s|APPIMAGE|${APPIMAGE}|g" \ | ||
| -e "s|MODELIMAGE|${MODELIMAGE}|g" \ | ||
| -e "s|CHROMADBIMAGE|${CHROMADBIMAGE}|g" \ | ||
| sed -e "s|SERVER_IMAGE|${SERVER_IMAGE}|" \ | ||
| -e "s|APP_IMAGE|${APP_IMAGE}|g" \ | ||
| -e "s|MODEL_IMAGE|${MODEL_IMAGE}|g" \ | ||
| -e "s|CHROMADB_IMAGE|${CHROMADB_IMAGE}|g" \ | ||
| quadlet/${APP}.image \ | ||
| > build/${APP}.image | ||
| sed -e "s|SERVERIMAGE|${SERVERIMAGE}|" \ | ||
| -e "s|APPIMAGE|${APPIMAGE}|g" \ | ||
| -e "s|MODELIMAGE|${MODELIMAGE}|g" \ | ||
| -e "s|CHROMADBIMAGE|${CHROMADBIMAGE}|g" \ | ||
| sed -e "s|SERVER_IMAGE|${SERVER_IMAGE}|" \ | ||
| -e "s|APP_IMAGE|${APP_IMAGE}|g" \ | ||
| -e "s|MODEL_IMAGE|${MODEL_IMAGE}|g" \ | ||
| -e "s|CHROMADB_IMAGE|${CHROMADB_IMAGE}|g" \ | ||
| quadlet/${APP}.yaml \ | ||
| > build/${APP}.yaml | ||
| cp quadlet/${APP}.kube build/${APP}.kube | ||
|
|
||
| .PHONY: install | ||
| install: | ||
| wget https://www.slimjetbrowser.com/chrome/files/103.0.5060.53/google-chrome-stable_current_amd64.deb | ||
| sudo dpkg -i google-chrome-stable_current_amd64.deb | ||
| wget https://chromedriver.storage.googleapis.com/103.0.5060.53/chromedriver_linux64.zip | ||
| unzip chromedriver_linux64.zip | ||
| pip install -r tests/requirements.txt | ||
|
|
||
| .PHONY: run | ||
| run: | ||
| podman run -it -p 8501:8501 -e MODEL_SERVICE_ENDPOINT=http://10.88.0.1:8001/v1 ${APPIMAGE} | ||
|
|
||
| .PHONY: functional_tests | ||
| functional_tests: | ||
| python3 -m pytest -vvv --driver=Chrome --driver-path=./chromedriver tests/functional | ||
|
|
||
| .PHONY: integration_test | ||
| integration_tests: | ||
| URL=${URL} python3 -m pytest -vvv --driver=Chrome --driver-path=./chromedriver tests/integration | ||
| podman run -it -p 8501:8501 -e MODEL_SERVICE_ENDPOINT=http://10.88.0.1:8001/v1 ${APP_IMAGE} | ||
|
|
||
| .PHONY: clean | ||
| clean: | ||
| rm -rf build | ||
| -rm -rf tests/__pycache__ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,45 @@ | ||
| APP ?= chatbot | ||
| PORT ?= 8501 | ||
|
|
||
| include ../../common/Makefile.common | ||
|
|
||
| CHROMEDRIVER_EXISTS ?= $(shell command -v chromedriver) | ||
| UNZIP_EXISTS ?= $(shell command -v unzip) | ||
|
|
||
| CHROMEDRIVER_VERSION := 103.0.5060.53 | ||
| CHROMEDRIVER_MIRROR := https://chromedriver.storage.googleapis.com | ||
| CHROMEDRIVER_DOWNLOAD_PATH := | ||
|
|
||
| OS := $(shell uname -s) | ||
| ARCH := $(shell uname -m) | ||
|
|
||
| ifeq ($(OS),Darwin) # This structure may vary if we upgrade chromedriver, see index: https://chromedriver.storage.googleapis.com/index.html | ||
| ifeq ($(ARCH),amd64) | ||
| CHROMEDRIVER_DOWNLOAD_PATH := chromedriver_mac64.zip | ||
| else ifeq ($(ARCH),arm64) | ||
| CHROMEDRIVER_DOWNLOAD_PATH := chromedriver_mac64_m1.zip | ||
| endif | ||
| else ifeq ($(OS),Linux) | ||
| CHROMEDRIVER_DOWNLOAD_PATH := chromedriver_linux64.zip | ||
| endif | ||
|
|
||
| .PHONY: install | ||
| install: | ||
| @if [[ -z "$(CHROMEDRIVER_EXISTS)" ]]; then \ | ||
| if [[ -n "$(UNZIP_EXISTS)" ]]; then \ | ||
| curl -sLO $(CHROMEDRIVER_MIRROR)/$(CHROMEDRIVER_VERSION)/$(CHROMEDRIVER_DOWNLOAD_PATH); \ | ||
| unzip $(CHROMEDRIVER_DOWNLOAD_PATH); \ | ||
| mv chromedriver /usr/local/bin/chromedriver; \ | ||
| elif [[ -z "$(UNZIP_EXISTS)" ]]; then \ | ||
| echo "Install make target requires unizp binary."; \ | ||
| fi; \ | ||
| fi; \ | ||
| pip install -r tests/requirements.txt | ||
|
|
||
| .PHONY: functional_tests | ||
| functional_tests: | ||
| IMAGE_NAME=${IMAGE_NAME} REGISTRY=${REGISTRY} pytest -vvv --driver=Chrome --driver-path=$(CHROMEDRIVER_EXISTS) tests/functional | ||
|
|
||
| .PHONY: integration_test | ||
| integration_tests: | ||
| URL=${URL} IMAGE_NAME=${IMAGE_NAME} REGISTRY=${REGISTRY} pytest -vvv --driver=Chrome --driver-path=$(CHROMEDRIVER_EXISTS) tests/integration |