Restructure files

.devcontainer/devcontainer.json

@@ -54,7 +54,7 @@
 		}
 	},
 	// Use 'postCreateCommand' to run commands after the container is created.
-	"postCreateCommand": "pip install -r requirements-dev.txt && pip install -e src",
+	"postCreateCommand": "pip install -r requirements-dev.txt && pip install -e src/backend && pip install -e src",
 	// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
 	"remoteUser": "vscode"
 }

.github/workflows/app-tests.yaml

@@ -55,12 +55,13 @@ jobs:
             python -m pip install -r requirements-dev.txt
         - name: Install app as editable app
           run: |
+            python -m pip install -e src/backend
             python -m pip install -e src
         - name: Setup local database with seed data
           run: |
             cp .env.sample .env
-            python ./src/fastapi_app/setup_postgres_database.py
-            python ./src/fastapi_app/setup_postgres_seeddata.py
+            python ./src/backend/fastapi_app/setup_postgres_database.py
+            python ./src/backend/fastapi_app/setup_postgres_seeddata.py
         - name: Setup node
           uses: actions/setup-node@v4
           with:

README.md

@@ -128,9 +128,10 @@ Since the local app uses OpenAI models, you should first deploy it for the optim
 1. Run these commands to install the web app as a local package (named `fastapi_app`), set up the local database, and seed it with test data:
 
     ```bash
+    python3 -m pip install -e src/backend
     python3 -m pip install -e src
-    python ./src/fastapi_app/setup_postgres_database.py
-    python ./src/fastapi_app/setup_postgres_seeddata.py
+    python ./src/backend/fastapi_app/setup_postgres_database.py
+    python ./src/backend/fastapi_app/setup_postgres_seeddata.py
     ```
 
 2. Build the frontend:
@@ -139,7 +140,7 @@ Since the local app uses OpenAI models, you should first deploy it for the optim
     cd src/frontend
     npm install
     npm run build
-    cd ../..
+    cd ../../
     ```
 
     There must be an initial build of static assets before running the backend, since the backend serves static files from the `src/static` directory.

azure.yaml

@@ -4,7 +4,7 @@ metadata:
     template: rag-postgres-openai-python@0.0.1
 services:
     web:
-        project: ./src
+        project: ./src/backend
         language: py
         module: web
         host: containerapp

requirements-dev.txt

@@ -1,4 +1,4 @@
--r src/requirements.txt
+-r src/backend/requirements.txt
 ruff
 pre-commit
 pip-tools

scripts/load_python_env.sh

@@ -4,5 +4,6 @@ echo 'Creating Python virtual environment in .venv...'
 python3 -m venv .venv
 
 echo 'Installing dependencies from "requirements.txt" into virtual environment (in quiet mode)...'
+.venv/bin/python -m pip --quiet --disable-pip-version-check install -e src/backend
 .venv/bin/python -m pip --quiet --disable-pip-version-check install -e src
 .venv/bin/python -m pip --quiet --disable-pip-version-check install -r requirements-dev.txt

scripts/setup_postgres_azurerole.ps1

@@ -7,4 +7,4 @@ if ([string]::IsNullOrEmpty($POSTGRES_HOST) -or [string]::IsNullOrEmpty($POSTGRE
     exit 1
 }
 
-python ./src/fastapi_app/setup_postgres_azurerole.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --app-identity-name $APP_IDENTITY_NAME
+python ./src/backend/fastapi_app/setup_postgres_azurerole.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --app-identity-name $APP_IDENTITY_NAME

scripts/setup_postgres_azurerole.sh

@@ -9,4 +9,4 @@ fi
 
 . ./scripts/load_python_env.sh
 
-.venv/bin/python ./src/fastapi_app/setup_postgres_azurerole.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --app-identity-name $APP_IDENTITY_NAME
+.venv/bin/python ./src/backend/fastapi_app/setup_postgres_azurerole.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --app-identity-name $APP_IDENTITY_NAME

scripts/setup_postgres_database.ps1

@@ -7,4 +7,4 @@ if ([string]::IsNullOrEmpty($POSTGRES_HOST) -or [string]::IsNullOrEmpty($POSTGRE
     exit 1
 }
 
-python ./src/fastapi_app/setup_postgres_database.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --password $POSTGRES_PASSWORD
+python ./backend/src/fastapi_app/setup_postgres_database.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --password $POSTGRES_PASSWORD

scripts/setup_postgres_database.sh

@@ -4,4 +4,4 @@ POSTGRES_DATABASE=$(azd env get-values | grep POSTGRES_DATABASE | sed 's/="/=/'
 
 . ./scripts/load_python_env.sh
 
-.venv/bin/python ./src/fastapi_app/setup_postgres_database.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --database $POSTGRES_DATABASE
+.venv/bin/python ./src/backend/fastapi_app/setup_postgres_database.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --database $POSTGRES_DATABASE

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 --password $POSTGRES_PASSWORD
+python ./src/backend/fastapi_app/setup_postgres_seeddata.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --password $POSTGRES_PASSWORD

scripts/setup_postgres_seeddata.sh

@@ -4,4 +4,4 @@ POSTGRES_DATABASE=$(azd env get-values | grep POSTGRES_DATABASE | sed 's/="/=/'
 
 . ./scripts/load_python_env.sh
 
-.venv/bin/python ./src/fastapi_app/setup_postgres_seeddata.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --database $POSTGRES_DATABASE
+.venv/bin/python ./src/backend/fastapi_app/setup_postgres_seeddata.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --database $POSTGRES_DATABASE

src/backend/pyproject.toml

@@ -0,0 +1,21 @@
+[project]
+name = "fastapi_app"
+version = "1.0.0"
+description = "Create a application with fastapi and postgres-flexible"
+dependencies = [
+    "fastapi>=0.111.0,<1.0.0",
+    "python-dotenv>=1.0.1,<2.0.0",
+    "environs>=11.0.0,<12.0.0",
+    "azure-identity>=1.16.1,<2.0.0",
+    "aiohttp>=3.9.5,<4.0.0",
+    "asyncpg>=0.29.0,<1.0.0",
+    "SQLAlchemy[asyncio]>=2.0.30,<3.0.0",
+    "pgvector>=0.2.5,<0.3.0",
+    "openai>=1.34.0,<2.0.0",
+    "tiktoken>=0.7.0,<0.8.0",
+    "openai-messages-token-helper>=0.1.5,<0.2.0",
+]
+
+[build-system]
+requires = ["flit_core<4"]
+build-backend = "flit_core.buildapi"

src/frontend/vite.config.ts

@@ -5,7 +5,7 @@ import react from "@vitejs/plugin-react";
 export default defineConfig({
     plugins: [react()],
     build: {
-        outDir: "../static",
+        outDir: "../backend/static",
         emptyOutDir: true,
         sourcemap: true,
         rollupOptions: {

src/pyproject.toml

@@ -1,19 +1,9 @@
 [project]
-name = "fastapi_app"
+name = "backend"
 version = "1.0.0"
 description = "Create a application with fastapi and postgres-flexible"
 dependencies = [
-    "fastapi>=0.111.0,<1.0.0",
-    "python-dotenv>=1.0.1,<2.0.0",
-    "environs>=11.0.0,<12.0.0",
-    "azure-identity>=1.16.1,<2.0.0",
-    "aiohttp>=3.9.5,<4.0.0",
-    "asyncpg>=0.29.0,<1.0.0",
-    "SQLAlchemy[asyncio]>=2.0.30,<3.0.0",
-    "pgvector>=0.2.5,<0.3.0",
-    "openai>=1.34.0,<2.0.0",
-    "tiktoken>=0.7.0,<0.8.0",
-    "openai-messages-token-helper>=0.1.5,<0.2.0",
+    "fastapi_app"
 ]
 
 [build-system]