Skip to content
Open
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
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ export WORKSPACE_BUCKET

export CLOUD_DEPLOY_REGION := us-central1

export RUNTIME_STACK := google-24-full
export PYTHON_RUNTIME := python314

export LLM_BASELINE_DOCKER_IMAGE_NAME := llm-baselines
export LLM_BASELINE_DOCKER_REPO_NAME := llm-baselines
export LLM_BASELINE_PUB_SUB_TOPIC_NAME := run-llm-baselines
Expand Down
4 changes: 2 additions & 2 deletions src/base_eval/naive_and_dummy_forecasters/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ UPLOAD_DIR = upload
Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template
sed \
-e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \
-e 's/STACK/google-22-full/g' \
-e 's/PYTHON_VERSION/python312/g' \
-e 's/STACK/$(RUNTIME_STACK)/g' \
-e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \
$< > Dockerfile

deploy : main.py .gcloudignore requirements.txt Dockerfile
Expand Down
12 changes: 8 additions & 4 deletions src/curate_questions/create_question_set/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,14 @@ UPLOAD_DIR = upload
.gcloudignore:
cp -r $(ROOT_DIR)src/helpers/.gcloudignore .

Procfile:
cp -r $(ROOT_DIR)src/helpers/Procfile .
Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template
sed \
-e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \
-e 's/STACK/$(RUNTIME_STACK)/g' \
-e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \
$< > Dockerfile

deploy : main.py .gcloudignore requirements.txt Procfile
deploy : main.py .gcloudignore requirements.txt Dockerfile
rm -rf $(UPLOAD_DIR)
mkdir -p $(UPLOAD_DIR)
cp -r $(ROOT_DIR)src/helpers $(UPLOAD_DIR)/
Expand All @@ -38,4 +42,4 @@ deploy : main.py .gcloudignore requirements.txt Procfile
--source $(UPLOAD_DIR)

clean :
rm -rf $(UPLOAD_DIR) .gcloudignore Procfile
rm -rf $(UPLOAD_DIR) .gcloudignore Dockerfile
4 changes: 2 additions & 2 deletions src/curate_questions/publish_question_set/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ UPLOAD_DIR = upload
Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template
sed \
-e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \
-e 's/STACK/google-22-full/g' \
-e 's/PYTHON_VERSION/python312/g' \
-e 's/STACK/$(RUNTIME_STACK)/g' \
-e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \
$< > Dockerfile

deploy : main.py .gcloudignore requirements.txt Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion src/helpers/Dockerfile.template
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM REGION-docker.pkg.dev/serverless-runtimes/google-22-full/runtimes/python312
FROM REGION-docker.pkg.dev/serverless-runtimes/STACK/runtimes/PYTHON_VERSION

RUN whoami || echo "whoami not found"

Expand Down
1 change: 0 additions & 1 deletion src/helpers/Procfile

This file was deleted.

4 changes: 2 additions & 2 deletions src/leaderboard/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ PRELIMINARY_UPLOAD_DIR = upload-leaderboard-preliminary
Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template
sed \
-e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \
-e 's/STACK/google-22-full/g' \
-e 's/PYTHON_VERSION/python312/g' \
-e 's/STACK/$(RUNTIME_STACK)/g' \
-e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \
$< > Dockerfile

NUM_CPUS = 8
Expand Down
4 changes: 2 additions & 2 deletions src/metadata/tag_questions/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ UPLOAD_DIR = upload
Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template
sed \
-e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \
-e 's/STACK/google-22-full/g' \
-e 's/PYTHON_VERSION/python312/g' \
-e 's/STACK/$(RUNTIME_STACK)/g' \
-e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \
$< > Dockerfile

deploy : main.py .gcloudignore requirements.txt Dockerfile
Expand Down
4 changes: 2 additions & 2 deletions src/metadata/validate_questions/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ UPLOAD_DIR = upload
Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template
sed \
-e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \
-e 's/STACK/google-22-full/g' \
-e 's/PYTHON_VERSION/python312/g' \
-e 's/STACK/$(RUNTIME_STACK)/g' \
-e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \
$< > Dockerfile

deploy : main.py .gcloudignore requirements.txt Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion src/nightly_update_workflow/compress_buckets/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM us-central1-docker.pkg.dev/serverless-runtimes/google-22-full/runtimes/python312
FROM us-central1-docker.pkg.dev/serverless-runtimes/google-24-full/runtimes/python314

RUN whoami || echo "whoami not found"

Expand Down
12 changes: 8 additions & 4 deletions src/nightly_update_workflow/manager/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@ all :

UPLOAD_DIR = upload

Procfile:
cp -r $(ROOT_DIR)src/helpers/Procfile .
Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template
sed \
-e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \
-e 's/STACK/$(RUNTIME_STACK)/g' \
-e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \
$< > Dockerfile

deploy : main.py requirements.txt Procfile
deploy : main.py requirements.txt Dockerfile
rm -rf $(UPLOAD_DIR)
mkdir -p $(UPLOAD_DIR)
cp -r $(ROOT_DIR)src/helpers $(UPLOAD_DIR)/
Expand All @@ -35,4 +39,4 @@ deploy : main.py requirements.txt Procfile
--source $(UPLOAD_DIR)

clean :
rm -rf $(UPLOAD_DIR)
rm -rf $(UPLOAD_DIR) Dockerfile
12 changes: 8 additions & 4 deletions src/nightly_update_workflow/worker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@ all :

UPLOAD_DIR = upload

Procfile:
cp -r $(ROOT_DIR)src/helpers/Procfile .
Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template
sed \
-e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \
-e 's/STACK/$(RUNTIME_STACK)/g' \
-e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \
$< > Dockerfile

deploy : main.py requirements.txt Procfile
deploy : main.py requirements.txt Dockerfile
rm -rf $(UPLOAD_DIR)
mkdir -p $(UPLOAD_DIR)
cp -r $(ROOT_DIR)src/helpers $(UPLOAD_DIR)/
Expand All @@ -34,4 +38,4 @@ deploy : main.py requirements.txt Procfile
--source $(UPLOAD_DIR)

clean :
rm -rf $(UPLOAD_DIR)
rm -rf $(UPLOAD_DIR) Dockerfile
4 changes: 2 additions & 2 deletions src/orchestration/func_infer_fetch/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ include $(ROOT_DIR)orchestration_upload.mk
Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template
sed \
-e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \
-e 's/STACK/google-22-full/g' \
-e 's/PYTHON_VERSION/python312/g' \
-e 's/STACK/$(RUNTIME_STACK)/g' \
-e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \
$< > Dockerfile

deploy : main.py .gcloudignore requirements.txt Dockerfile
Expand Down
4 changes: 2 additions & 2 deletions src/orchestration/func_infer_update/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ include $(ROOT_DIR)orchestration_upload.mk
Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template
sed \
-e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \
-e 's/STACK/google-22-full/g' \
-e 's/PYTHON_VERSION/python312/g' \
-e 's/STACK/$(RUNTIME_STACK)/g' \
-e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \
$< > Dockerfile

deploy : main.py .gcloudignore requirements.txt Dockerfile
Expand Down
4 changes: 2 additions & 2 deletions src/orchestration/func_llm_forecaster_manager/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ ORCHESTRATION_EXTRA_PACKAGES = llm_forecaster
Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template
sed \
-e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \
-e 's/STACK/google-22-full/g' \
-e 's/PYTHON_VERSION/python312/g' \
-e 's/STACK/$(RUNTIME_STACK)/g' \
-e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \
$< > Dockerfile

deploy : main.py .gcloudignore requirements.txt Dockerfile
Expand Down
4 changes: 2 additions & 2 deletions src/orchestration/func_llm_forecaster_worker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ ORCHESTRATION_EXTRA_PACKAGES = llm_forecaster
Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template
sed \
-e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \
-e 's/STACK/google-22-full/g' \
-e 's/PYTHON_VERSION/python312/g' \
-e 's/STACK/$(RUNTIME_STACK)/g' \
-e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \
$< > Dockerfile

NUM_CPUS = 4
Expand Down
4 changes: 2 additions & 2 deletions src/orchestration/func_manifold_fetch/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ include $(ROOT_DIR)orchestration_upload.mk
Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template
sed \
-e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \
-e 's/STACK/google-22-full/g' \
-e 's/PYTHON_VERSION/python312/g' \
-e 's/STACK/$(RUNTIME_STACK)/g' \
-e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \
$< > Dockerfile

deploy : main.py .gcloudignore requirements.txt Dockerfile
Expand Down
4 changes: 2 additions & 2 deletions src/orchestration/func_manifold_update/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ include $(ROOT_DIR)orchestration_upload.mk
Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template
sed \
-e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \
-e 's/STACK/google-22-full/g' \
-e 's/PYTHON_VERSION/python312/g' \
-e 's/STACK/$(RUNTIME_STACK)/g' \
-e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \
$< > Dockerfile

deploy : main.py .gcloudignore requirements.txt Dockerfile
Expand Down
4 changes: 2 additions & 2 deletions src/orchestration/func_metaculus_fetch/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ include $(ROOT_DIR)orchestration_upload.mk
Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template
sed \
-e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \
-e 's/STACK/google-22-full/g' \
-e 's/PYTHON_VERSION/python312/g' \
-e 's/STACK/$(RUNTIME_STACK)/g' \
-e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \
$< > Dockerfile

deploy : main.py .gcloudignore requirements.txt Dockerfile
Expand Down
4 changes: 2 additions & 2 deletions src/orchestration/func_metaculus_update/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ include $(ROOT_DIR)orchestration_upload.mk
Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template
sed \
-e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \
-e 's/STACK/google-22-full/g' \
-e 's/PYTHON_VERSION/python312/g' \
-e 's/STACK/$(RUNTIME_STACK)/g' \
-e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \
$< > Dockerfile

deploy : main.py .gcloudignore requirements.txt Dockerfile
Expand Down
4 changes: 2 additions & 2 deletions src/orchestration/func_polymarket_fetch/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ include $(ROOT_DIR)orchestration_upload.mk
Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template
sed \
-e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \
-e 's/STACK/google-22-full/g' \
-e 's/PYTHON_VERSION/python312/g' \
-e 's/STACK/$(RUNTIME_STACK)/g' \
-e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \
$< > Dockerfile

deploy : main.py .gcloudignore requirements.txt Dockerfile
Expand Down
4 changes: 2 additions & 2 deletions src/orchestration/func_polymarket_update/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ include $(ROOT_DIR)orchestration_upload.mk
Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template
sed \
-e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \
-e 's/STACK/google-22-full/g' \
-e 's/PYTHON_VERSION/python312/g' \
-e 's/STACK/$(RUNTIME_STACK)/g' \
-e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \
$< > Dockerfile

deploy : main.py .gcloudignore requirements.txt Dockerfile
Expand Down
4 changes: 2 additions & 2 deletions src/orchestration/func_resolve/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ ORCHESTRATION_EXTRA_PACKAGES = resolve
Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template
sed \
-e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \
-e 's/STACK/google-22-full/g' \
-e 's/PYTHON_VERSION/python312/g' \
-e 's/STACK/$(RUNTIME_STACK)/g' \
-e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \
$< > Dockerfile

NUM_CPUS = 2
Expand Down
4 changes: 2 additions & 2 deletions src/orchestration/func_yfinance_fetch/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ include $(ROOT_DIR)orchestration_upload.mk
Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template
sed \
-e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \
-e 's/STACK/google-22-full/g' \
-e 's/PYTHON_VERSION/python312/g' \
-e 's/STACK/$(RUNTIME_STACK)/g' \
-e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \
$< > Dockerfile

deploy : main.py .gcloudignore requirements.txt Dockerfile
Expand Down
4 changes: 2 additions & 2 deletions src/orchestration/func_yfinance_update/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ include $(ROOT_DIR)orchestration_upload.mk
Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template
sed \
-e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \
-e 's/STACK/google-22-full/g' \
-e 's/PYTHON_VERSION/python312/g' \
-e 's/STACK/$(RUNTIME_STACK)/g' \
-e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \
$< > Dockerfile

deploy : main.py .gcloudignore requirements.txt Dockerfile
Expand Down
12 changes: 8 additions & 4 deletions src/questions/acled/fetch/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,14 @@ UPLOAD_DIR = upload
.gcloudignore:
cp -r $(ROOT_DIR)src/helpers/.gcloudignore .

Procfile:
cp -r $(ROOT_DIR)src/helpers/Procfile .
Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template
sed \
-e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \
-e 's/STACK/$(RUNTIME_STACK)/g' \
-e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \
$< > Dockerfile

deploy : main.py .gcloudignore requirements.txt Procfile
deploy : main.py .gcloudignore requirements.txt Dockerfile
rm -rf $(UPLOAD_DIR)
mkdir -p $(UPLOAD_DIR)
cp -r $(ROOT_DIR)src/helpers $(UPLOAD_DIR)/
Expand All @@ -38,4 +42,4 @@ deploy : main.py .gcloudignore requirements.txt Procfile
--source $(UPLOAD_DIR)

clean :
rm -rf $(UPLOAD_DIR) .gcloudignore Procfile
rm -rf $(UPLOAD_DIR) .gcloudignore Dockerfile
12 changes: 8 additions & 4 deletions src/questions/acled/update_questions/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,14 @@ UPLOAD_DIR = upload
.gcloudignore:
cp -r $(ROOT_DIR)src/helpers/.gcloudignore .

Procfile:
cp -r $(ROOT_DIR)src/helpers/Procfile .
Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template
sed \
-e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \
-e 's/STACK/$(RUNTIME_STACK)/g' \
-e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \
$< > Dockerfile

deploy : main.py .gcloudignore requirements.txt Procfile
deploy : main.py .gcloudignore requirements.txt Dockerfile
rm -rf $(UPLOAD_DIR)
mkdir -p $(UPLOAD_DIR)
cp -r $(ROOT_DIR)src/helpers $(UPLOAD_DIR)/
Expand All @@ -38,4 +42,4 @@ deploy : main.py .gcloudignore requirements.txt Procfile
--source $(UPLOAD_DIR)

clean :
rm -rf $(UPLOAD_DIR) .gcloudignore Procfile
rm -rf $(UPLOAD_DIR) .gcloudignore Dockerfile
12 changes: 8 additions & 4 deletions src/questions/dbnomics/fetch/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,14 @@ UPLOAD_DIR = upload
.gcloudignore:
cp -r $(ROOT_DIR)src/helpers/.gcloudignore .

Procfile:
cp -r $(ROOT_DIR)src/helpers/Procfile .
Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template
sed \
-e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \
-e 's/STACK/$(RUNTIME_STACK)/g' \
-e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \
$< > Dockerfile

deploy : main.py .gcloudignore requirements.txt Procfile
deploy : main.py .gcloudignore requirements.txt Dockerfile
rm -rf $(UPLOAD_DIR)
mkdir -p $(UPLOAD_DIR)
cp -r $(ROOT_DIR)src/helpers $(UPLOAD_DIR)/
Expand All @@ -38,4 +42,4 @@ deploy : main.py .gcloudignore requirements.txt Procfile
--source $(UPLOAD_DIR)

clean :
rm -rf $(UPLOAD_DIR) .gcloudignore Procfile
rm -rf $(UPLOAD_DIR) .gcloudignore Dockerfile
12 changes: 8 additions & 4 deletions src/questions/dbnomics/update_questions/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,14 @@ UPLOAD_DIR = upload
.gcloudignore:
cp -r $(ROOT_DIR)src/helpers/.gcloudignore .

Procfile:
cp -r $(ROOT_DIR)src/helpers/Procfile .
Dockerfile: $(ROOT_DIR)src/helpers/Dockerfile.template
sed \
-e 's/REGION/$(CLOUD_DEPLOY_REGION)/g' \
-e 's/STACK/$(RUNTIME_STACK)/g' \
-e 's/PYTHON_VERSION/$(PYTHON_RUNTIME)/g' \
$< > Dockerfile

deploy : main.py .gcloudignore requirements.txt Procfile
deploy : main.py .gcloudignore requirements.txt Dockerfile
rm -rf $(UPLOAD_DIR)
mkdir -p $(UPLOAD_DIR)
cp -r $(ROOT_DIR)src/helpers $(UPLOAD_DIR)/
Expand All @@ -38,4 +42,4 @@ deploy : main.py .gcloudignore requirements.txt Procfile
--source $(UPLOAD_DIR)

clean :
rm -rf $(UPLOAD_DIR) .gcloudignore Procfile
rm -rf $(UPLOAD_DIR) .gcloudignore Dockerfile
Loading
Loading