|
1 | 1 | IMAGE_VERSION ?= 0.0.1-beta |
2 | 2 | RANDOM := $(shell bash -c 'echo $$RANDOM') |
3 | | -LOC_NAME ?= northcentralus |
| 3 | +LOC_NAME ?= swedencentral |
4 | 4 | RG_NAME ?= rg-store-demo-$(RANDOM) |
5 | 5 | ACR_NAME ?= acrstoredemo$(RANDOM) |
6 | 6 | AKS_NAME ?= aks-store-demo-$(RANDOM) |
7 | 7 | AOAI_NAME ?= aoai-store-demo-$(RANDOM) |
8 | | -GPT_35_TURBO_VERSION ?= 0613 |
9 | | -GPT_35_TURBO_CAPACITY ?= 30 |
| 8 | +AOAI_MODEL_NAME ?= gpt-4o-mini |
| 9 | +AOAI_MODEL_VERSION ?= 2024-07-18 |
| 10 | +AOAI_MODEL_CAPACITY ?= 8 |
| 11 | +AOAI_MODEL_SKU ?= GlobalStandard |
10 | 12 | BUILD_ORDER_SERVICE ?= false |
11 | 13 | BUILD_MAKELINE_SERVICE ?= false |
12 | 14 | BUILD_PRODUCT_SERVICE ?= false |
@@ -59,7 +61,7 @@ provision-azure: ## Provision Azure Resources |
59 | 61 | @az aks create -n $(AKS_NAME) -g $(RG_NAME) --attach-acr $(ACR_NAME) |
60 | 62 | @az aks get-credentials -n $(AKS_NAME) -g $(RG_NAME) |
61 | 63 | @az cognitiveservices account create --name $(AOAI_NAME) -g $(RG_NAME) -l $(LOC_NAME) --kind OpenAI --sku S0 --custom-domain $(AOAI_NAME) |
62 | | - @az cognitiveservices account deployment create -n $(AOAI_NAME) -g $(RG_NAME) --deployment-name gpt-35-turbo --model-format OpenAI --model-name gpt-35-turbo --model-version $(GPT_35_TURBO_VERSION) --sku Standard --capacity $(GPT_35_TURBO_CAPACITY) |
| 64 | + @az cognitiveservices account deployment create -n $(AOAI_NAME) -g $(RG_NAME) --deployment-name $(AOAI_MODEL_NAME) --model-format OpenAI --model-name $(AOAI_MODEL_NAME) --model-version $(AOAI_MODEL_VERSION) --sku $(AOAI_MODEL_SKU) --capacity $(AOAI_MODEL_CAPACITY) |
63 | 65 |
|
64 | 66 | @if [ "$(BUILD_ORDER_SERVICE)" = true ]; then \ |
65 | 67 | az acr build -r $(ACR_NAME) -t order-service:$(IMAGE_VERSION) ./src/order-service; \ |
@@ -135,7 +137,7 @@ deploy-azure-ai: deploy-azure kustomize ai-service.yaml ## Deploy ai-service to |
135 | 137 | @# Set environment variables |
136 | 138 | @echo "USE_AZURE_OPENAI=True" > .env |
137 | 139 | @echo "USE_AZURE_AD=False" >> .env |
138 | | - @echo "AZURE_OPENAI_DEPLOYMENT_NAME=gpt-35-turbo" >> .env |
| 140 | + @echo "AZURE_OPENAI_DEPLOYMENT_NAME=$(AOAI_MODEL_NAME)" >> .env |
139 | 141 | @echo "AZURE_OPENAI_ENDPOINT=$$(az cognitiveservices account show -n $(AOAI_NAME) -g $(RG_NAME) --query properties.endpoint -o tsv)" >> .env |
140 | 142 | @echo "OPENAI_API_KEY=$$(az cognitiveservices account keys list -n $(AOAI_NAME) -g $(RG_NAME) --query key1 -o tsv)" >> .env |
141 | 143 |
|
|
0 commit comments