From cf48e58c30274e0c42b371e685989e39f539cfec Mon Sep 17 00:00:00 2001 From: rchan Date: Thu, 13 Jun 2024 16:47:49 +0100 Subject: [PATCH] make pulumi pull from main --- azure/hack_week/__main__.py | 28 ++++++++++++++-------------- azure/production/__main__.py | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/azure/hack_week/__main__.py b/azure/hack_week/__main__.py index f2c6628..3b01453 100644 --- a/azure/hack_week/__main__.py +++ b/azure/hack_week/__main__.py @@ -168,23 +168,23 @@ ), containerinstance.EnvironmentVariableArgs( name="LLAMA_INDEX_MAX_INPUT_SIZE", - value=DEFAULT_ARGS["max_input_size"], + value=str(DEFAULT_ARGS["max_input_size"]), ), containerinstance.EnvironmentVariableArgs( name="LLAMA_INDEX_K", - value=DEFAULT_ARGS["k"], + value=str(DEFAULT_ARGS["k"]), ), containerinstance.EnvironmentVariableArgs( name="LLAMA_INDEX_CHUNK_SIZE", - value=DEFAULT_ARGS["chunk_size"], + value=str(DEFAULT_ARGS["chunk_size"]), ), containerinstance.EnvironmentVariableArgs( name="LLAMA_INDEX_CHUNK_OVERLAP_RATIO", - value=DEFAULT_ARGS["chunk_overlap_ratio"], + value=str(DEFAULT_ARGS["chunk_overlap_ratio"]), ), containerinstance.EnvironmentVariableArgs( name="LLAMA_INDEX_NUM_OUTPUT", - value=DEFAULT_ARGS["num_output"], + value=str(DEFAULT_ARGS["num_output"]), ), containerinstance.EnvironmentVariableArgs( name="OPENAI_AZURE_API_BASE", @@ -206,8 +206,8 @@ ports=[], resources=containerinstance.ResourceRequirementsArgs( requests=containerinstance.ResourceRequestsArgs( - cpu=1, - memory_in_gb=12, + cpu=3, + memory_in_gb=14, ), ), volume_mounts=[ @@ -255,30 +255,30 @@ ), containerinstance.EnvironmentVariableArgs( name="LLAMA_INDEX_MAX_INPUT_SIZE", - value=DEFAULT_ARGS["max_input_size"], + value=str(DEFAULT_ARGS["max_input_size"]), ), containerinstance.EnvironmentVariableArgs( name="LLAMA_INDEX_K", - value=DEFAULT_ARGS["k"], + value=str(DEFAULT_ARGS["k"]), ), containerinstance.EnvironmentVariableArgs( name="LLAMA_INDEX_CHUNK_SIZE", - value=DEFAULT_ARGS["chunk_size"], + value=str(DEFAULT_ARGS["chunk_size"]), ), containerinstance.EnvironmentVariableArgs( name="LLAMA_INDEX_CHUNK_OVERLAP_RATIO", - value=DEFAULT_ARGS["chunk_overlap_ratio"], + value=str(DEFAULT_ARGS["chunk_overlap_ratio"]), ), containerinstance.EnvironmentVariableArgs( name="LLAMA_INDEX_NUM_OUTPUT", - value=DEFAULT_ARGS["num_output"], + value=str(DEFAULT_ARGS["num_output"]), ), ], ports=[], resources=containerinstance.ResourceRequirementsArgs( requests=containerinstance.ResourceRequestsArgs( - cpu=4, - memory_in_gb=16, + cpu=1, + memory_in_gb=8, ), ), volume_mounts=[ diff --git a/azure/production/__main__.py b/azure/production/__main__.py index 8d133c3..1bf31f9 100644 --- a/azure/production/__main__.py +++ b/azure/production/__main__.py @@ -101,7 +101,7 @@ containers=[ # api-bot container containerinstance.ContainerArgs( - image="ghcr.io/alan-turing-institute/reginald_slackbot:pulumi-reg-2pt0-update", + image="ghcr.io/alan-turing-institute/reginald_slackbot:main", name="reginald-production", # maximum of 63 characters environment_variables=[ containerinstance.EnvironmentVariableArgs( @@ -143,7 +143,7 @@ containers=[ # all_data index creation container containerinstance.ContainerArgs( - image="ghcr.io/alan-turing-institute/reginald_create_index:pulumi-reg-2pt0-update", + image="ghcr.io/alan-turing-institute/reginald_create_index:main", name="reginald-create-index-all-data", # maximum of 63 characters environment_variables=[ containerinstance.EnvironmentVariableArgs( @@ -179,7 +179,7 @@ resources=containerinstance.ResourceRequirementsArgs( requests=containerinstance.ResourceRequestsArgs( cpu=2, - memory_in_gb=8, + memory_in_gb=6, ), ), volume_mounts=[ @@ -191,7 +191,7 @@ ), # reg index creation container containerinstance.ContainerArgs( - image="ghcr.io/alan-turing-institute/reginald_create_index:pulumi-reg-2pt0-update", + image="ghcr.io/alan-turing-institute/reginald_create_index:main", name="reginald-create-index-reg", # maximum of 63 characters environment_variables=[ containerinstance.EnvironmentVariableArgs( @@ -227,7 +227,7 @@ resources=containerinstance.ResourceRequirementsArgs( requests=containerinstance.ResourceRequestsArgs( cpu=1, - memory_in_gb=4, + memory_in_gb=5, ), ), volume_mounts=[ @@ -239,7 +239,7 @@ ), # public index creation container containerinstance.ContainerArgs( - image="ghcr.io/alan-turing-institute/reginald_create_index:pulumi-reg-2pt0-update", + image="ghcr.io/alan-turing-institute/reginald_create_index:main", name="reginald-create-index-public", # maximum of 63 characters environment_variables=[ containerinstance.EnvironmentVariableArgs( @@ -275,7 +275,7 @@ resources=containerinstance.ResourceRequirementsArgs( requests=containerinstance.ResourceRequestsArgs( cpu=1, - memory_in_gb=4, + memory_in_gb=5, ), ), volume_mounts=[