Merge pull request Azure-Samples#12 from Azure-Samples/codespace-fixes

pamelafox · web-flow · commit 97cd7aa016bc · 2024-05-14T16:07:23.000-07:00
Fixes from Codespace deployment
diff --git a/README.md b/README.md
@@ -142,7 +142,7 @@ Since the local app uses OpenAI models, you should first deploy it for the optim
 2. Run the FastAPI backend:
 
     ```shell
-    fastapi dev src/api/main.py
+    python3 -m uvicorn fastapi_app:create_app --factory --reload
     ```
 
     Or you can run "Backend" in the VS Code Run & Debug menu.
diff --git a/infra/main.bicep b/infra/main.bicep
@@ -17,25 +17,12 @@ param principalId string = ''
 
 @minLength(1)
 @description('Location for the OpenAI resource')
+// Look for gpt-35-turbo 0125 on the availability table:
 // https://learn.microsoft.com/en-us/azure/ai-services/openai/concepts/models#standard-deployment-model-availability
 @allowed([
-  'australiaeast'
-  'brazilsouth'
   'canadaeast'
-  'eastus'
-  'eastus2'
-  'francecentral'
-  'japaneast'
   'northcentralus'
-  'norwayeast'
-  'southafricanorth'
   'southcentralus'
-  'southindia'
-  'swedencentral'
-  'switzerlandnorth'
-  'uksouth'
-  'westeurope'
-  'westus'
 ])
 @metadata({
   azd: {
diff --git a/src/entrypoint.sh b/src/entrypoint.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 set -e
-python3 -m gunicorn fastapi_app:create_app()
+python3 -m gunicorn "fastapi_app:create_app()"
diff --git a/src/fastapi_app/postgres_engine.py b/src/fastapi_app/postgres_engine.py
@@ -40,7 +40,7 @@ async def create_postgres_engine_from_env(azure_credential=None) -> AsyncEngine:
         host=os.environ["POSTGRES_HOST"],
         username=os.environ["POSTGRES_USERNAME"],
         database=os.environ["POSTGRES_DATABASE"],
-        password=os.environ["POSTGRES_PASSWORD"],
+        password=os.environ.get("POSTGRES_PASSWORD"),
         sslmode=os.environ.get("POSTGRES_SSL"),
         azure_credential=azure_credential,
     )
diff --git a/src/fastapi_app/query_rewriter.py b/src/fastapi_app/query_rewriter.py
@@ -68,7 +68,7 @@ def extract_search_arguments(chat_completion: ChatCompletion):
             if function.name == "search_database":
                 arg = json.loads(function.arguments)
                 search_query = arg.get("search_query")
-                if "price_filter" in arg:
+                if "price_filter" in arg and arg["price_filter"]:
                     price_filter = arg["price_filter"]
                     filters.append(
                         {
@@ -77,7 +77,7 @@ def extract_search_arguments(chat_completion: ChatCompletion):
                             "value": price_filter["value"],
                         }
                     )
-                if "brand_filter" in arg:
+                if "brand_filter" in arg and arg["brand_filter"]:
                     brand_filter = arg["brand_filter"]
                     filters.append(
                         {

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ async def create_postgres_engine_from_env(azure_credential=None) -> AsyncEngine:`
`40`	`40`	`host=os.environ["POSTGRES_HOST"],`
`41`	`41`	`username=os.environ["POSTGRES_USERNAME"],`
`42`	`42`	`database=os.environ["POSTGRES_DATABASE"],`
`43`		`- password=os.environ["POSTGRES_PASSWORD"],`
	`43`	`+ password=os.environ.get("POSTGRES_PASSWORD"),`
`44`	`44`	`sslmode=os.environ.get("POSTGRES_SSL"),`
`45`	`45`	`azure_credential=azure_credential,`
`46`	`46`	`)`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ def extract_search_arguments(chat_completion: ChatCompletion):`
`68`	`68`	`if function.name == "search_database":`
`69`	`69`	`arg = json.loads(function.arguments)`
`70`	`70`	`search_query = arg.get("search_query")`
`71`		`- if "price_filter" in arg:`
	`71`	`+ if "price_filter" in arg and arg["price_filter"]:`
`72`	`72`	`price_filter = arg["price_filter"]`
`73`	`73`	`filters.append(`
`74`	`74`	`{`
`@@ -77,7 +77,7 @@ def extract_search_arguments(chat_completion: ChatCompletion):`
`77`	`77`	`"value": price_filter["value"],`
`78`	`78`	`}`
`79`	`79`	`)`
`80`		`- if "brand_filter" in arg:`
	`80`	`+ if "brand_filter" in arg and arg["brand_filter"]:`
`81`	`81`	`brand_filter = arg["brand_filter"]`
`82`	`82`	`filters.append(`
`83`	`83`	`{`