Skip to content

Commit

Permalink
Rename cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
josephine-wolf-oberholtzer committed May 28, 2024
1 parent 825a548 commit 71a6414
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 20 deletions.
14 changes: 7 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ DC := docker compose
DCR := $(DC) run --rm --cap-add SYS_NICE
CONTAINER := api
export CORPUS_PATH ?= ~/Dropbox/AlzaboMix/ClassicMix
export PRAETOR_CONFIG_PATH ?= alzabo.local.yaml
export ALZABO_CONFIG_PATH ?= alzabo.local.yaml

help: ## Print this help
@awk 'BEGIN {FS = ":.*?## "} /^[a-z0-9A-Z_-]+:.*?## / {printf "%-30s%s\n", $$1, $$2}' $(MAKEFILE_LIST)
Expand All @@ -16,7 +16,7 @@ build: ## Build Docker images
$(DC) --progress plain build --build-arg BUILDKIT_INLINE_CACHE=1 $(CONTAINER)

up: up-datastores ## Bring up containers
PRAETOR_CONFIG_PATH="alzabo.server.yaml" $(DC) up -d
ALZABO_CONFIG_PATH="alzabo.server.yaml" $(DC) up -d

up-datastores: ## Bring up Milvus containers
$(DC) up -d attu etcd milvus minio redis
Expand Down Expand Up @@ -55,7 +55,7 @@ client-x: ## Run the client
python -m alzabo --api-url http://localhost:8000 run

client-es9: ## Run the client with ES-9
PRAETOR_CONFIG_PATH=alzabo.es9.yaml python -m alzabo --api-url http://localhost:8000 run
ALZABO_CONFIG_PATH=alzabo.es9.yaml python -m alzabo --api-url http://localhost:8000 run

### FORMATTING

Expand Down Expand Up @@ -89,16 +89,16 @@ kubeval:
### TESTING

pytest: up-datastores ## Run pytest
PRAETOR_CONFIG_PATH="" $(DCR) --cap-add SYS_NICE $(CONTAINER) pytest
ALZABO_CONFIG_PATH="" $(DCR) --cap-add SYS_NICE $(CONTAINER) pytest

pytest-cov: up-datastores ## Run pytest with coverage
PRAETOR_CONFIG_PATH="" $(DCR) --cap-add SYS_NICE $(CONTAINER) pytest --cov=alzabo --cov-report=html --cov-report=term --durations=10
ALZABO_CONFIG_PATH="" $(DCR) --cap-add SYS_NICE $(CONTAINER) pytest --cov=alzabo --cov-report=html --cov-report=term --durations=10

pytest-x: up-datastores ## Run pytest and fail fast
PRAETOR_CONFIG_PATH="" $(DCR) --cap-add SYS_NICE $(CONTAINER) pytest -x
ALZABO_CONFIG_PATH="" $(DCR) --cap-add SYS_NICE $(CONTAINER) pytest -x

pytest-sw: up-datastores ## Run pytest and fail fast
PRAETOR_CONFIG_PATH="" $(DCR) --cap-add SYS_NICE $(CONTAINER) pytest --sw
ALZABO_CONFIG_PATH="" $(DCR) --cap-add SYS_NICE $(CONTAINER) pytest --sw

test: reformat lint pytest-cov

Expand Down
26 changes: 13 additions & 13 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ services:
--reload
--workers 2
--worker-class aiohttp.GunicornUVLoopWebWorker
PRAETOR_API_AUTH_ENABLED: "${PRAETOR_API_AUTH_ENABLED:-false}"
PRAETOR_AST_ENABLED: "${PRAETOR_AST_ENABLED:-true}"
PRAETOR_CONFIG_PATH: "${PRAETOR_CONFIG_PATH:-}"
PRAETOR_S3_ACCESS_KEY_ID: minioadmin
PRAETOR_S3_ENDPOINT_URL: http://minio:9000
PRAETOR_S3_SECRET_ACCESS_KEY: minioadmin
PRAETOR_SCSYNTH_ENABLED: "${PRAETOR_SCSYNTH_ENABLED:-true}"
ALZABO_API_AUTH_ENABLED: "${ALZABO_API_AUTH_ENABLED:-false}"
ALZABO_AST_ENABLED: "${ALZABO_AST_ENABLED:-true}"
ALZABO_CONFIG_PATH: "${ALZABO_CONFIG_PATH:-}"
ALZABO_S3_ACCESS_KEY_ID: minioadmin
ALZABO_S3_ENDPOINT_URL: http://minio:9000
ALZABO_S3_SECRET_ACCESS_KEY: minioadmin
ALZABO_SCSYNTH_ENABLED: "${ALZABO_SCSYNTH_ENABLED:-true}"
image: ghcr.io/josephine-wolf-oberholtzer/alzabo
ports:
- 8000:8000
Expand Down Expand Up @@ -57,12 +57,12 @@ services:
- --concurrency=4
- --loglevel=INFO
environment:
PRAETOR_AST_ENABLED: "${PRAETOR_AST_ENABLED:-true}"
PRAETOR_CONFIG_PATH: "${PRAETOR_CONFIG_PATH:-}"
PRAETOR_S3_ACCESS_KEY_ID: minioadmin
PRAETOR_S3_ENDPOINT_URL: http://minio:9000
PRAETOR_S3_SECRET_ACCESS_KEY: minioadmin
PRAETOR_SCSYNTH_ENABLED: "${PRAETOR_SCSYNTH_ENABLED:-true}"
ALZABO_AST_ENABLED: "${ALZABO_AST_ENABLED:-true}"
ALZABO_CONFIG_PATH: "${ALZABO_CONFIG_PATH:-}"
ALZABO_S3_ACCESS_KEY_ID: minioadmin
ALZABO_S3_ENDPOINT_URL: http://minio:9000
ALZABO_S3_SECRET_ACCESS_KEY: minioadmin
ALZABO_SCSYNTH_ENABLED: "${ALZABO_SCSYNTH_ENABLED:-true}"
image: ghcr.io/josephine-wolf-oberholtzer/alzabo
volumes:
- ./:/app
Expand Down

0 comments on commit 71a6414

Please sign in to comment.