Merge branch 'azdenvgetval' of https://github.com/Azure-Samples/rag-postgres-openai-python into azdenvgetval

Author: pamelafox

.devcontainer/devcontainer.json

@@ -18,7 +18,8 @@
         },
         "ghcr.io/azure/azure-dev/azd:latest": {},
         // Required for azd to package the app to ACA
-        "ghcr.io/devcontainers/features/docker-in-docker:2": {}
+        "ghcr.io/devcontainers/features/docker-in-docker:2": {},
+		"ghcr.io/prulloac/devcontainer-features/ollama:1": {}
     },
 	// Configure tool-specific properties.
 	"customizations": {

.env.sample

@@ -18,13 +18,17 @@ AZURE_OPENAI_CHAT_MODEL=gpt-35-turbo
 AZURE_OPENAI_EMBED_DEPLOYMENT=text-embedding-ada-002
 AZURE_OPENAI_EMBED_MODEL=text-embedding-ada-002
 AZURE_OPENAI_EMBED_MODEL_DIMENSIONS=1536
+AZURE_OPENAI_EMBEDDING_COLUMN=embedding_ada002
 # Only needed when using key-based Azure authentication:
 AZURE_OPENAI_KEY=
 # Needed for OpenAI.com:
 OPENAICOM_KEY=YOUR-OPENAI-API-KEY
 OPENAICOM_CHAT_MODEL=gpt-3.5-turbo
 OPENAICOM_EMBED_MODEL=text-embedding-ada-002
 OPENAICOM_EMBED_MODEL_DIMENSIONS=1536
+OPENAICOM_EMBEDDING_COLUMN=embedding_ada002
 # Needed for Ollama:
 OLLAMA_ENDPOINT=http://host.docker.internal:11434/v1
-OLLAMA_CHAT_MODEL=phi3:3.8b
+OLLAMA_CHAT_MODEL=llama3.1
+OLLAMA_EMBED_MODEL=nomic-embed-text
+OLLAMA_EMBEDDING_COLUMN=embedding_nomic

.github/workflows/app-tests.yaml

@@ -73,4 +73,15 @@ jobs:
         - name: Run MyPy
           run: python3 -m mypy .
         - name: Run Pytest
-          run: python3 -m pytest
+          run: python3 -m pytest -s -vv --cov --cov-fail-under=85
+        - name: Run E2E tests with Playwright
+          id: e2e
+          run: |
+            playwright install chromium --with-deps
+            python3 -m pytest tests/e2e.py --tracing=retain-on-failure
+        - name: Upload test artifacts
+          if: ${{ failure() && steps.e2e.conclusion == 'failure' }}
+          uses: actions/upload-artifact@v4
+          with:
+            name: playwright-traces${{ matrix.python_version }}
+            path: test-results

.gitignore

@@ -146,3 +146,5 @@ npm-debug.log*
 node_modules
 static/
 
+# Playwright test trace
+test-results/

.pre-commit-config.yaml

@@ -4,6 +4,7 @@ repos:
     hooks:
     -   id: check-yaml
     -   id: end-of-file-fixer
+        exclude: ^tests/snapshots
     -   id: trailing-whitespace
 -   repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.1.0

.vscode/launch.json

@@ -17,9 +17,10 @@
         "name": "Backend",
         "type": "debugpy",
         "request": "launch",
+        "cwd": "${workspaceFolder}",
         "module": "uvicorn",
         "args": ["fastapi_app:create_app", "--factory", "--reload"],
-        "justMyCode": true
+        "justMyCode": false
     }
   ],
   "compounds": [

.vscode/settings.json

@@ -22,5 +22,10 @@
                 "ssl": true
             }
         }
-    ]
+    ],
+    "python.testing.pytestArgs": [
+        "tests"
+    ],
+    "python.testing.unittestEnabled": false,
+    "python.testing.pytestEnabled": true
 }

README.md

@@ -73,10 +73,11 @@ A related option is VS Code Dev Containers, which will open the project in your
     ```
 
 3. Open the project folder
-4. Install required Python packages:
+4. Install required Python packages and backend application:
 
     ```shell
     pip install -r requirements-dev.txt
+    pip install -e src/backend
     ```
 
 5. Continue with the [deployment steps](#deployment)
@@ -125,7 +126,7 @@ Since the local app uses OpenAI models, you should first deploy it for the optim
     ```
 
 3. To use OpenAI.com OpenAI, set `OPENAI_CHAT_HOST` and `OPENAI_EMBED_HOST` to "openai". Then fill in the value for `OPENAICOM_KEY`.
-4. To use Ollama, set `OPENAI_CHAT_HOST` to "ollama". Then update the values for `OLLAMA_ENDPOINT` and `OLLAMA_CHAT_MODEL` to match your local setup and model. Note that you won't be able to use function calling with an Ollama model, and you'll need to either turn off vector search or use either "azure" or "openai" for `OPENAI_EMBED_HOST`.
+4. To use Ollama, set `OPENAI_CHAT_HOST` to "ollama". Then update the values for `OLLAMA_ENDPOINT` and `OLLAMA_CHAT_MODEL` to match your local setup and model. Note that most Ollama models are not compatible with the "Advanced flow", due to the need for function calling support, so you'll need to disable that in _Developer Settings_ in the UI. In addition, the database rows are embedded using the default OpenAI embedding model, so you can't search them using an Ollama embedding model. You can either choose to set `OPENAI_EMBED_HOST` to "azure" or "openai", or turn off vector search in _Developer Settings_.
 
 ### Running the frontend and backend
 

docs/images/streaming.gif

@@ -11,9 +11,9 @@ python_version = 3.12
 exclude = [".venv/*"]
 
 [tool.pytest.ini_options]
-addopts = "-ra --cov"
+addopts = "-ra"
 testpaths = ["tests"]
-pythonpath = ['src']
+pythonpath = ['src/backend']
 filterwarnings = ["ignore::DeprecationWarning"]
 
 [[tool.mypy.overrides]]