Merge pull request Azure-Samples#1 from bobtabor/cherrypick-updates

Fixes

Author: bobtabor-msft

src/fastapi_app/models.py

@@ -1,19 +1,34 @@
 import os
 import typing
 from datetime import datetime
+from urllib.parse import quote_plus
 
 from sqlmodel import Field, SQLModel, create_engine
 
-POSTGRES_USERNAME = os.environ.get("POSTGRES_USERNAME")
-POSTGRES_PASSWORD = os.environ.get("POSTGRES_PASSWORD")
-POSTGRES_HOST = os.environ.get("POSTGRES_HOST")
-POSTGRES_DATABASE = os.environ.get("POSTGRES_DATABASE")
-POSTGRES_PORT = os.environ.get("POSTGRES_PORT", 5432)
-POSTGRES_SSL = os.environ.get("POSTGRES_SSL")
-
-sql_url = f"postgresql://{POSTGRES_USERNAME}:{POSTGRES_PASSWORD}@{POSTGRES_HOST}:{POSTGRES_PORT}/{POSTGRES_DATABASE}"
-if POSTGRES_SSL:
-    sql_url = f"{sql_url}?sslmode={POSTGRES_SSL}"
+sql_url = ""
+if os.getenv("AZURE_POSTGRESQL_CONNECTIONSTRING"):
+    env_connection_string = os.getenv("AZURE_POSTGRESQL_CONNECTIONSTRING")
+
+    # Parse the connection string
+    details = dict(item.split('=') for item in env_connection_string.split())
+
+    # Properly format the URL for SQLAlchemy
+    sql_url = (
+        f"postgresql://{quote_plus(details['user'])}:{quote_plus(details['password'])}"
+        f"@{details['host']}:{details['port']}/{details['dbname']}?sslmode={details['sslmode']}"
+    )
+
+else:
+    POSTGRES_USERNAME = os.environ.get("DBUSER")
+    POSTGRES_PASSWORD = os.environ.get("DBPASS")
+    POSTGRES_HOST = os.environ.get("DBHOST")
+    POSTGRES_DATABASE = os.environ.get("DBNAME")
+    POSTGRES_PORT = os.environ.get("DBPORT", 5432)
+    POSTGRES_SSL = os.environ.get("DBSSL")
+
+    sql_url = f"postgresql://{POSTGRES_USERNAME}:{POSTGRES_PASSWORD}@{POSTGRES_HOST}:{POSTGRES_PORT}/{POSTGRES_DATABASE}"
+    if POSTGRES_SSL:
+        sql_url = f"{sql_url}?sslmode={POSTGRES_SSL}"
 
 engine = create_engine(sql_url)
 

src/fastapi_app/seed_data.py

@@ -1,7 +1,6 @@
+import models
 from sqlmodel import SQLModel
 
-from fastapi_app import models
-
 
 def load_from_json():
     models.create_db_and_tables()