Update entrypoint to work for app service

Author: pamelafox

.devcontainer/devcontainer.json

@@ -48,6 +48,6 @@
     "features": {
         "ghcr.io/azure/azure-dev/azd:latest": {}
     },
-    "postCreateCommand": "playwright install chromium --with-deps && pip install -e src &&  python3 src/fastapi_app/seed_data.py"
+    "postCreateCommand": "pip install -e src &&  python3 src/fastapi_app/seed_data.py"
 }
 

src/entrypoint.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 set -e
 python3 -m pip install --upgrade pip
-python3 -m pip install -e .
-python3 fastapi_app/seed_data.py
-python3 -m gunicorn fastapi_app:app
+python3 -m pip install -e src
+python3 src/fastapi_app/seed_data.py
+python3 -m gunicorn fastapi_app:app -c src/gunicorn.conf.py

src/fastapi_app/models.py

@@ -19,16 +19,13 @@
     )
 
 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")
+    POSTGRES_USERNAME = os.environ.get("POSTGRES_PASSWORD")
+    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)
 
     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,16 +1,16 @@
-import models
+from dotenv import load_dotenv
 from sqlmodel import SQLModel
 
+from fastapi_app.models import Restaurant, Review, create_db_and_tables, engine
 
-def load_from_json():
-    models.create_db_and_tables()
 
 def drop_all():
     # Explicitly remove these tables first to avoid cascade errors
-    SQLModel.metadata.remove(models.Restaurant.__table__)
-    SQLModel.metadata.remove(models.Review.__table__)
-    SQLModel.metadata.drop_all(models.engine)
+    SQLModel.metadata.remove(Restaurant.__table__)
+    SQLModel.metadata.remove(Review.__table__)
+    SQLModel.metadata.drop_all(engine)
 
 
 if __name__ == "__main__":
-    load_from_json()
+    load_dotenv()
+    create_db_and_tables()