From 83d965dbbc8c1cc086fb8c520cda8613366af19f Mon Sep 17 00:00:00 2001 From: Joshua Laymon Date: Sun, 7 Sep 2025 03:20:14 +0000 Subject: [PATCH 1/8] Update web/entrypoint.sh --- web/entrypoint.sh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/web/entrypoint.sh b/web/entrypoint.sh index 06823b8..2e7d857 100755 --- a/web/entrypoint.sh +++ b/web/entrypoint.sh @@ -1,14 +1,11 @@ #!/usr/bin/env bash set -e + echo "Waiting for Postgres..." until pg_isready -h "${POSTGRES_HOST:-db}" -p "${POSTGRES_PORT:-5432}" -U "${POSTGRES_USER:-illustrations}" >/dev/null 2>&1; do sleep 1 done + python manage.py migrate -python manage.py init_users -if [ "${IMPORT_SEED_ON_START}" = "true" ] && [ -f "${SEED_CSV}" ] && [ ! -f /data/imports/.seed_done ]; then - echo "Seeding from ${SEED_CSV}..." - python manage.py import_seed "${SEED_CSV}" - touch /data/imports/.seed_done -fi -python manage.py runserver 0.0.0.0:8000 + +python manage.py runserver 0.0.0.0:8000 \ No newline at end of file -- 2.45.2 From 5520f46966a11c625c99b50e5720024861fbd3a3 Mon Sep 17 00:00:00 2001 From: Joshua Laymon Date: Sun, 7 Sep 2025 03:24:38 +0000 Subject: [PATCH 2/8] Update web/version.txt --- web/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/version.txt b/web/version.txt index b208aac..b75003b 100644 --- a/web/version.txt +++ b/web/version.txt @@ -1 +1 @@ -v4.1.20 \ No newline at end of file +v4.1.21 \ No newline at end of file -- 2.45.2 From 2b8073361cc19257c2f056117d28df09ff4f344b Mon Sep 17 00:00:00 2001 From: Joshua Laymon Date: Sun, 7 Sep 2025 03:33:03 +0000 Subject: [PATCH 3/8] Update .env --- .env | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.env b/.env index 8ea47fc..5997bb9 100644 --- a/.env +++ b/.env @@ -14,10 +14,10 @@ DJANGO_ALLOWED_HOSTS=* CSRF_TRUSTED_ORIGINS= ADMIN_USERNAME=joshlaymon ADMIN_PASSWORD=1993llelMO65026illustrations -USER_USERNAME=boblaymon -USER_PASSWORD=power8 +# USER_USERNAME=boblaymon +# USER_PASSWORD=power8 # Seed import -IMPORT_SEED_ON_START=true -SEED_CSV=/data/imports/illustrations_seed.csv +IMPORT_SEED_ON_START=false +#SEED_CSV=/data/imports/illustrations_seed.csv OPENAI_API_KEY=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 \ No newline at end of file -- 2.45.2 From 909a8fed8bcc0d4c7ff9e1db474eeabd1703cb85 Mon Sep 17 00:00:00 2001 From: Joshua Laymon Date: Sun, 7 Sep 2025 03:34:12 +0000 Subject: [PATCH 4/8] Update .env --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 5997bb9..56c16e4 100644 --- a/.env +++ b/.env @@ -19,5 +19,5 @@ ADMIN_PASSWORD=1993llelMO65026illustrations # Seed import IMPORT_SEED_ON_START=false -#SEED_CSV=/data/imports/illustrations_seed.csv +# SEED_CSV=/data/imports/illustrations_seed.csv OPENAI_API_KEY=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 \ No newline at end of file -- 2.45.2 From 3271f3f0dda19cb43b152d429428e75f48cab434 Mon Sep 17 00:00:00 2001 From: Joshua Laymon Date: Sun, 7 Sep 2025 03:34:51 +0000 Subject: [PATCH 5/8] Update .env --- .env | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.env b/.env index 56c16e4..cbc4ddb 100644 --- a/.env +++ b/.env @@ -14,10 +14,10 @@ DJANGO_ALLOWED_HOSTS=* CSRF_TRUSTED_ORIGINS= ADMIN_USERNAME=joshlaymon ADMIN_PASSWORD=1993llelMO65026illustrations -# USER_USERNAME=boblaymon -# USER_PASSWORD=power8 +USER_USERNAME=boblaymon +USER_PASSWORD=power8 # Seed import IMPORT_SEED_ON_START=false -# SEED_CSV=/data/imports/illustrations_seed.csv +SEED_CSV=/data/imports/illustrations_seed.csv OPENAI_API_KEY=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 \ No newline at end of file -- 2.45.2 From ae0be63c83a198b4c0a6ed364825d164a690ce43 Mon Sep 17 00:00:00 2001 From: Joshua Laymon Date: Sun, 7 Sep 2025 03:35:50 +0000 Subject: [PATCH 6/8] Update .env --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index cbc4ddb..8ea47fc 100644 --- a/.env +++ b/.env @@ -18,6 +18,6 @@ USER_USERNAME=boblaymon USER_PASSWORD=power8 # Seed import -IMPORT_SEED_ON_START=false +IMPORT_SEED_ON_START=true SEED_CSV=/data/imports/illustrations_seed.csv OPENAI_API_KEY=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 \ No newline at end of file -- 2.45.2 From e0d1cc1563241aea25b3cd657710f7593cc45ebb Mon Sep 17 00:00:00 2001 From: Joshua Laymon Date: Sun, 7 Sep 2025 03:36:36 +0000 Subject: [PATCH 7/8] Update .env --- .env | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.env b/.env index 8ea47fc..56c16e4 100644 --- a/.env +++ b/.env @@ -14,10 +14,10 @@ DJANGO_ALLOWED_HOSTS=* CSRF_TRUSTED_ORIGINS= ADMIN_USERNAME=joshlaymon ADMIN_PASSWORD=1993llelMO65026illustrations -USER_USERNAME=boblaymon -USER_PASSWORD=power8 +# USER_USERNAME=boblaymon +# USER_PASSWORD=power8 # Seed import -IMPORT_SEED_ON_START=true -SEED_CSV=/data/imports/illustrations_seed.csv +IMPORT_SEED_ON_START=false +# SEED_CSV=/data/imports/illustrations_seed.csv OPENAI_API_KEY=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 \ No newline at end of file -- 2.45.2 From f4239571fcd36ec08fd33f0c0aca5575238eba0f Mon Sep 17 00:00:00 2001 From: Joshua Laymon Date: Sun, 7 Sep 2025 03:37:35 +0000 Subject: [PATCH 8/8] Update web/requirements.txt --- web/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/requirements.txt b/web/requirements.txt index 368757f..c24e087 100644 --- a/web/requirements.txt +++ b/web/requirements.txt @@ -1,4 +1,4 @@ Django==5.0.6 psycopg2-binary==2.9.9 python-dateutil==2.9.0.post0 -openai>=1.0.0 \ No newline at end of file +openai>=1.0,<2.0 \ No newline at end of file -- 2.45.2