From 7281d2bb6a99c7b8e83bc7a8a1f2f1ef7eaad030 Mon Sep 17 00:00:00 2001
From: Pamela Fox <pamela.fox@gmail.com>
Date: Tue, 9 Jul 2024 14:39:28 -0700
Subject: [PATCH 1/5] Port to azd env get value

---
 scripts/setup_postgres_azurerole.ps1 |  8 ++++----
 scripts/setup_postgres_azurerole.sh  |  6 +++---
 scripts/setup_postgres_database.ps1  | 12 ++++++------
 scripts/setup_postgres_database.sh   |  6 +++---
 scripts/setup_postgres_seeddata.ps1  | 12 ++++++------
 scripts/setup_postgres_seeddata.sh   |  6 +++---
 6 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/scripts/setup_postgres_azurerole.ps1 b/scripts/setup_postgres_azurerole.ps1
index 5a7434f7..4bd1a062 100644
--- a/scripts/setup_postgres_azurerole.ps1
+++ b/scripts/setup_postgres_azurerole.ps1
@@ -1,10 +1,10 @@
-$POSTGRES_HOST = ((azd env get-values | Select-String -Pattern "POSTGRES_HOST") -replace '^POSTGRES_HOST=', '')
-$POSTGRES_USERNAME = ((azd env get-values | Select-String -Pattern "POSTGRES_USERNAME") -replace '^POSTGRES_USERNAME=', '')
-$APP_IDENTITY_NAME = ((azd env get-values | Select-String -Pattern "SERVICE_WEB_IDENTITY_NAME") -replace '^SERVICE_WEB_IDENTITY_NAME=', '')
+$POSTGRES_HOST = (azd env get-value POSTGRES_HOST)
+$POSTGRES_USERNAME = (azd env get-value POSTGRES_USERNAME)
+$APP_IDENTITY_NAME = (azd env get-value SERVICE_WEB_IDENTITY_NAME)
 
 if ([string]::IsNullOrEmpty($POSTGRES_HOST) -or [string]::IsNullOrEmpty($POSTGRES_USERNAME) -or [string]::IsNullOrEmpty($APP_IDENTITY_NAME)) {
     Write-Host "Can't find POSTGRES_HOST, POSTGRES_USERNAME, and SERVICE_WEB_IDENTITY_NAME environment variables. Make sure you run azd up first."
     exit 1
 }
 
-python ./src/fastapi_app/setup_postgres_azurerole.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --app-identity-name $APP_IDENTITY_NAME
\ No newline at end of file
+python ./src/fastapi_app/setup_postgres_azurerole.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --app-identity-name $APP_IDENTITY_NAME
diff --git a/scripts/setup_postgres_azurerole.sh b/scripts/setup_postgres_azurerole.sh
index d750ddc8..b76a5d6a 100755
--- a/scripts/setup_postgres_azurerole.sh
+++ b/scripts/setup_postgres_azurerole.sh
@@ -1,6 +1,6 @@
-POSTGRES_HOST=$(azd env get-values | grep POSTGRES_HOST | sed 's/="/=/' | sed 's/"$//' | sed 's/^POSTGRES_HOST=//')
-POSTGRES_USERNAME=$(azd env get-values | grep POSTGRES_USERNAME | sed 's/="/=/' | sed 's/"$//' | sed 's/^POSTGRES_USERNAME=//')
-APP_IDENTITY_NAME=$(azd env get-values | grep SERVICE_WEB_IDENTITY_NAME | sed 's/="/=/' | sed 's/"$//' | sed 's/^SERVICE_WEB_IDENTITY_NAME=//')
+POSTGRES_HOST=$(azd env get-value POSTGRES_HOST)
+POSTGRES_USERNAME=$(azd env get-value POSTGRES_USERNAME)
+APP_IDENTITY_NAME=$(azd env get-value SERVICE_WEB_IDENTITY_NAME)
 
 if [ -z "$POSTGRES_HOST" ] || [ -z "$POSTGRES_USERNAME" ] || [ -z "$APP_IDENTITY_NAME" ]; then
     echo "Can't find POSTGRES_HOST, POSTGRES_USERNAME, and SERVICE_WEB_IDENTITY_NAME environment variables. Make sure you run azd up first."
diff --git a/scripts/setup_postgres_database.ps1 b/scripts/setup_postgres_database.ps1
index 11ae8976..8b0bb671 100644
--- a/scripts/setup_postgres_database.ps1
+++ b/scripts/setup_postgres_database.ps1
@@ -1,10 +1,10 @@
-$POSTGRES_HOST = ((azd env get-values | Select-String -Pattern "POSTGRES_HOST") -replace '^POSTGRES_HOST=', '')
-$POSTGRES_USERNAME = ((azd env get-values | Select-String -Pattern "POSTGRES_USERNAME") -replace '^POSTGRES_USERNAME=', '')
-$POSTGRES_PASSWORD = ((azd env get-values | Select-String -Pattern "POSTGRES_PASSWORD") -replace '^POSTGRES_PASSWORD=', '')
+$POSTGRES_HOST = (azd env get-value POSTGRES_HOST)
+$POSTGRES_USERNAME = (azd env get-value POSTGRES_USERNAME)
+$POSTGRES_DATABASE = (azd env get-value POSTGRES_DATABASE)
 
-if ([string]::IsNullOrEmpty($POSTGRES_HOST) -or [string]::IsNullOrEmpty($POSTGRES_USERNAME) -or [string]::IsNullOrEmpty($POSTGRES_PASSWORD)) {
-    Write-Host "Can't find POSTGRES_HOST, POSTGRES_USERNAME, and POSTGRES_PASSWORD environment variables. Make sure you run azd up first."
+if ([string]::IsNullOrEmpty($POSTGRES_HOST) -or [string]::IsNullOrEmpty($POSTGRES_USERNAME) -or [string]::IsNullOrEmpty($POSTGRES_DATABASE)) {
+    Write-Host "Can't find POSTGRES_HOST, POSTGRES_USERNAME, and POSTGRES_DATABASE environment variables. Make sure you run azd up first."
     exit 1
 }
 
-python ./src/fastapi_app/setup_postgres_database.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --password $POSTGRES_PASSWORD
\ No newline at end of file
+python ./src/fastapi_app/setup_postgres_database.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --database $POSTGRES_DATABASE
diff --git a/scripts/setup_postgres_database.sh b/scripts/setup_postgres_database.sh
index add480ca..49dea7ee 100755
--- a/scripts/setup_postgres_database.sh
+++ b/scripts/setup_postgres_database.sh
@@ -1,6 +1,6 @@
-POSTGRES_HOST=$(azd env get-values | grep POSTGRES_HOST | sed 's/="/=/' | sed 's/"$//' | sed 's/^POSTGRES_HOST=//')
-POSTGRES_USERNAME=$(azd env get-values | grep POSTGRES_USERNAME | sed 's/="/=/' | sed 's/"$//' | sed 's/^POSTGRES_USERNAME=//')
-POSTGRES_DATABASE=$(azd env get-values | grep POSTGRES_DATABASE | sed 's/="/=/' | sed 's/"$//' | sed 's/^POSTGRES_DATABASE=//')
+POSTGRES_HOST=$(azd env get-value POSTGRES_HOST)
+POSTGRES_USERNAME=$(azd env get-value POSTGRES_USERNAME)
+POSTGRES_DATABASE=$(azd env get-value POSTGRES_DATABASE)
 
 . ./scripts/load_python_env.sh
 
diff --git a/scripts/setup_postgres_seeddata.ps1 b/scripts/setup_postgres_seeddata.ps1
index b6c7400d..79a7a192 100644
--- a/scripts/setup_postgres_seeddata.ps1
+++ b/scripts/setup_postgres_seeddata.ps1
@@ -1,10 +1,10 @@
-$POSTGRES_HOST = ((azd env get-values | Select-String -Pattern "POSTGRES_HOST") -replace '^POSTGRES_HOST=', '')
-$POSTGRES_USERNAME = ((azd env get-values | Select-String -Pattern "POSTGRES_USERNAME") -replace '^POSTGRES_USERNAME=', '')
-$POSTGRES_PASSWORD = ((azd env get-values | Select-String -Pattern "POSTGRES_PASSWORD") -replace '^POSTGRES_PASSWORD=', '')
+$POSTGRES_HOST = (azd env get-value POSTGRES_HOST)
+$POSTGRES_USERNAME = (azd env get-value POSTGRES_USERNAME)
+$POSTGRES_DATABASE = (azd env get-value POSTGRES_DATABASE)
 
-if ([string]::IsNullOrEmpty($POSTGRES_HOST) -or [string]::IsNullOrEmpty($POSTGRES_USERNAME) -or [string]::IsNullOrEmpty($POSTGRES_PASSWORD)) {
-    Write-Host "Can't find POSTGRES_HOST, POSTGRES_USERNAME, and POSTGRES_PASSWORD environment variables. Make sure you run azd up first."
+if ([string]::IsNullOrEmpty($POSTGRES_HOST) -or [string]::IsNullOrEmpty($POSTGRES_USERNAME) -or [string]::IsNullOrEmpty($POSTGRES_DATABASE)) {
+    Write-Host "Can't find POSTGRES_HOST, POSTGRES_USERNAME, and POSTGRES_DATABASE environment variables. Make sure you run azd up first."
     exit 1
 }
 
-python ./src/fastapi_app/setup_postgres_seeddata.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --password $POSTGRES_PASSWORD
\ No newline at end of file
+python ./src/fastapi_app/setup_postgres_seeddata.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --database $POSTGRES_DATABASE
diff --git a/scripts/setup_postgres_seeddata.sh b/scripts/setup_postgres_seeddata.sh
index 0422d389..e7d41246 100755
--- a/scripts/setup_postgres_seeddata.sh
+++ b/scripts/setup_postgres_seeddata.sh
@@ -1,6 +1,6 @@
-POSTGRES_HOST=$(azd env get-values | grep POSTGRES_HOST | sed 's/="/=/' | sed 's/"$//' | sed 's/^POSTGRES_HOST=//')
-POSTGRES_USERNAME=$(azd env get-values | grep POSTGRES_USERNAME | sed 's/="/=/' | sed 's/"$//' | sed 's/^POSTGRES_USERNAME=//')
-POSTGRES_DATABASE=$(azd env get-values | grep POSTGRES_DATABASE | sed 's/="/=/' | sed 's/"$//' | sed 's/^POSTGRES_DATABASE=//')
+POSTGRES_HOST=$(azd env get-value POSTGRES_HOST)
+POSTGRES_USERNAME=$(azd env get-value POSTGRES_USERNAME)
+POSTGRES_DATABASE=$(azd env get-value POSTGRES_DATABASE)
 
 . ./scripts/load_python_env.sh
 

From 93a32e2f27352046087eb69977629f96b1c3ce42 Mon Sep 17 00:00:00 2001
From: Pamela Fox <pamela.fox@gmail.com>
Date: Fri, 9 Aug 2024 13:49:15 -0700
Subject: [PATCH 2/5] Make johns suggestions

---
 scripts/setup_postgres_database.ps1 | 2 +-
 scripts/setup_postgres_seeddata.ps1 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/setup_postgres_database.ps1 b/scripts/setup_postgres_database.ps1
index 0de025eb..c404b01a 100644
--- a/scripts/setup_postgres_database.ps1
+++ b/scripts/setup_postgres_database.ps1
@@ -7,4 +7,4 @@ if ([string]::IsNullOrEmpty($POSTGRES_HOST) -or [string]::IsNullOrEmpty($POSTGRE
     exit 1
 }
 
-python ./backend/src/fastapi_app/setup_postgres_database.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --database $POSTGRES_DATABASE
+python ./src/backend/fastapi_app/setup_postgres_database.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --database $POSTGRES_DATABASE
diff --git a/scripts/setup_postgres_seeddata.ps1 b/scripts/setup_postgres_seeddata.ps1
index 79a7a192..e030484a 100644
--- a/scripts/setup_postgres_seeddata.ps1
+++ b/scripts/setup_postgres_seeddata.ps1
@@ -7,4 +7,4 @@ if ([string]::IsNullOrEmpty($POSTGRES_HOST) -or [string]::IsNullOrEmpty($POSTGRE
     exit 1
 }
 
-python ./src/fastapi_app/setup_postgres_seeddata.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --database $POSTGRES_DATABASE
+python ./src/backend/fastapi_app/setup_postgres_seeddata.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --database $POSTGRES_DATABASE

From 205cc08ac6e9b802d0d57de7e6bfef439eaf1840 Mon Sep 17 00:00:00 2001
From: Pamela Fox <pamela.fox@gmail.com>
Date: Fri, 9 Aug 2024 13:50:13 -0700
Subject: [PATCH 3/5] Add requiredVersions

---
 azure.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/azure.yaml b/azure.yaml
index aab8bf16..c099a770 100644
--- a/azure.yaml
+++ b/azure.yaml
@@ -2,6 +2,8 @@
 name: rag-postgres-openai-python
 metadata:
     template: rag-postgres-openai-python@0.0.1
+requiredVersions:
+    azd: ">= 1.9.5"
 services:
     web:
         project: ./src/backend

From 07ab2ba21cf0db158f26e9dd815a5d80c821e166 Mon Sep 17 00:00:00 2001
From: Pamela Fox <pamela.fox@gmail.com>
Date: Fri, 9 Aug 2024 22:03:28 +0000
Subject: [PATCH 4/5] Add check for azd env

---
 scripts/setup_postgres_azurerole.ps1 | 4 ++++
 scripts/setup_postgres_azurerole.sh  | 4 ++++
 scripts/setup_postgres_database.ps1  | 4 ++++
 scripts/setup_postgres_database.sh   | 4 ++++
 scripts/setup_postgres_seeddata.ps1  | 4 ++++
 scripts/setup_postgres_seeddata.sh   | 4 ++++
 6 files changed, 24 insertions(+)

diff --git a/scripts/setup_postgres_azurerole.ps1 b/scripts/setup_postgres_azurerole.ps1
index 95a89a62..ac87f45b 100644
--- a/scripts/setup_postgres_azurerole.ps1
+++ b/scripts/setup_postgres_azurerole.ps1
@@ -1,4 +1,8 @@
 $POSTGRES_HOST = (azd env get-value POSTGRES_HOST)
+if (-not $?) {
+    Write-Host "Failed to find a value or POSTGRES_HOST in your azd environment. Make sure you run azd up first."
+    exit 1
+}
 $POSTGRES_USERNAME = (azd env get-value POSTGRES_USERNAME)
 $APP_IDENTITY_NAME = (azd env get-value SERVICE_WEB_IDENTITY_NAME)
 
diff --git a/scripts/setup_postgres_azurerole.sh b/scripts/setup_postgres_azurerole.sh
index 9c5cfa37..d14cd5b6 100755
--- a/scripts/setup_postgres_azurerole.sh
+++ b/scripts/setup_postgres_azurerole.sh
@@ -1,4 +1,8 @@
 POSTGRES_HOST=$(azd env get-value POSTGRES_HOST)
+if [ $? -ne 0 ]; then
+    echo "Failed to find a value or POSTGRES_HOST in your azd environment. Make sure you run azd up first."
+    exit 1
+fi
 POSTGRES_USERNAME=$(azd env get-value POSTGRES_USERNAME)
 APP_IDENTITY_NAME=$(azd env get-value SERVICE_WEB_IDENTITY_NAME)
 
diff --git a/scripts/setup_postgres_database.ps1 b/scripts/setup_postgres_database.ps1
index 0de025eb..c4d51ab1 100644
--- a/scripts/setup_postgres_database.ps1
+++ b/scripts/setup_postgres_database.ps1
@@ -1,4 +1,8 @@
 $POSTGRES_HOST = (azd env get-value POSTGRES_HOST)
+if (-not $?) {
+    Write-Host "Failed to find a value or POSTGRES_HOST in your azd environment. Make sure you run azd up first."
+    exit 1
+}
 $POSTGRES_USERNAME = (azd env get-value POSTGRES_USERNAME)
 $POSTGRES_DATABASE = (azd env get-value POSTGRES_DATABASE)
 
diff --git a/scripts/setup_postgres_database.sh b/scripts/setup_postgres_database.sh
index beb32c15..40da59f7 100755
--- a/scripts/setup_postgres_database.sh
+++ b/scripts/setup_postgres_database.sh
@@ -1,4 +1,8 @@
 POSTGRES_HOST=$(azd env get-value POSTGRES_HOST)
+if [ $? -ne 0 ]; then
+    echo "Failed to find a value or POSTGRES_HOST in your azd environment. Make sure you run azd up first."
+    exit 1
+fi
 POSTGRES_USERNAME=$(azd env get-value POSTGRES_USERNAME)
 POSTGRES_DATABASE=$(azd env get-value POSTGRES_DATABASE)
 
diff --git a/scripts/setup_postgres_seeddata.ps1 b/scripts/setup_postgres_seeddata.ps1
index 79a7a192..55f200d7 100644
--- a/scripts/setup_postgres_seeddata.ps1
+++ b/scripts/setup_postgres_seeddata.ps1
@@ -1,4 +1,8 @@
 $POSTGRES_HOST = (azd env get-value POSTGRES_HOST)
+if (-not $?) {
+    Write-Host "Failed to find a value or POSTGRES_HOST in your azd environment. Make sure you run azd up first."
+    exit 1
+}
 $POSTGRES_USERNAME = (azd env get-value POSTGRES_USERNAME)
 $POSTGRES_DATABASE = (azd env get-value POSTGRES_DATABASE)
 
diff --git a/scripts/setup_postgres_seeddata.sh b/scripts/setup_postgres_seeddata.sh
index 4e6a9e03..38db5262 100755
--- a/scripts/setup_postgres_seeddata.sh
+++ b/scripts/setup_postgres_seeddata.sh
@@ -1,4 +1,8 @@
 POSTGRES_HOST=$(azd env get-value POSTGRES_HOST)
+if [ $? -ne 0 ]; then
+    echo "Failed to find a value or POSTGRES_HOST in your azd environment. Make sure you run azd up first."
+    exit 1
+fi
 POSTGRES_USERNAME=$(azd env get-value POSTGRES_USERNAME)
 POSTGRES_DATABASE=$(azd env get-value POSTGRES_DATABASE)
 

From b2fa1a7031a14b901bff61cd82e65da2be8f7a9c Mon Sep 17 00:00:00 2001
From: Pamela Fox <pamela.fox@gmail.com>
Date: Fri, 9 Aug 2024 22:12:07 +0000
Subject: [PATCH 5/5] Too echo-y

---
 src/backend/fastapi_app/postgres_engine.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/fastapi_app/postgres_engine.py b/src/backend/fastapi_app/postgres_engine.py
index b3970e1a..0dcaf814 100644
--- a/src/backend/fastapi_app/postgres_engine.py
+++ b/src/backend/fastapi_app/postgres_engine.py
@@ -30,7 +30,7 @@ def get_password_from_azure_credential():
 
     engine = create_async_engine(
         DATABASE_URI,
-        echo=True,
+        echo=False,
     )
 
     @event.listens_for(engine.sync_engine, "do_connect")