Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add functional test for /conversation/custom endpoint #504

Merged
merged 7 commits into from
Mar 22, 2024
Merged

Add functional test for /conversation/custom endpoint #504

merged 7 commits into from
Mar 22, 2024

Conversation

adamdougal
Copy link
Collaborator

@adamdougal adamdougal commented Mar 20, 2024 •
edited

  • Allow the disabling of app insights and loading
    config from blob storage to make testing easier
  • Switch to Thread from Process for running the app
    • This is to stop pytest calling the session scoped fixure multiple times
    • It also fixes an issue where we were not seeing app logs
  • Setup the mock server as https due to the azure libraries enforcing it
    • This introduced additional fixtures and the trustme dependency
  • Commit the encoding file for tiktoken
    • This is to stop it making a http call over the internet to retrive it

Required by #420

Still to come:

  • Downstream failure tests
  • Downstream request body verification

@adamdougal
Add functional test for /conversation/custom endpoint
062022e 
- Allow the disabling of app insights and loading
config from blob storage to make testing easier
- Switch to `Thread` from `Process` for running the app
  - This is to stop pytest calling the session scoped fixure multiple times
  - It also fixes an issue where we were not seeing app logs
- Setup the mock server as https due to the azure libraries enforcing it
  - This introduced additional fixtures and the `trustme` dependency
- Commit the encoding file for tiktoken
  - This is to stop it making a http call over the internet to retrive it

Required by #420
@github-actions GitHub Actions
Copy link

github-actions bot commented Mar 20, 2024 •
edited

Coverage

Coverage Report •
FileStmtsMissCoverMissing
code/backend/batch/utilities/helpers
   ConfigHelper.py613444%17–20, 28–29, 32, 37, 40, 43, 46, 52–56, 61, 66–67, 73–74, 76–78, 81–84, 86, 90–91, 97–98, 216
   EnvHelper.py961287%85–87, 160, 165–166, 169–171, 178–180
code/backend/batch/utilities/loggers
   TokenLogger.py15846%8–11, 16, 19, 23–24
TOTAL163397740% 

Tests Skipped Failures Errors Time
40 0 💤 0 ❌ 0 🔥 10.403s ⏱️

ross-p-smith
ross-p-smith reviewed Mar 20, 2024
View reviewed changes
code/backend/batch/utilities/helpers/ConfigHelper.py
env_helper = EnvHelper()
config = ConfigHelper.get_default_config()

if env_helper.LOAD_CONFIG_FROM_BLOB_STORAGE:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm - this has been a problematic area to test for lots of things - so thanks!

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It caused the tests to be suuuuuper slow

@adamdougal adamdougal mentioned this pull request Mar 21, 2024
Closed
7 tasks
ross-p-smith
ross-p-smith reviewed Mar 21, 2024
View reviewed changes
code/backend/batch/utilities/helpers/EnvHelper.py
@@ -164,6 +170,9 @@ def is_chat_model(self):
return True
return False

def get_env_var_bool(self, var_name: str, default: str = "True") -> bool:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a simple unit test that we can add around this - (glad you pulled this into a function btw!) :-)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is covered by the existing unit tests.

@adamdougal adamdougal added this pull request to the merge queue Mar 22, 2024
Merged via the queue into main with commit 55477e0 Mar 22, 2024
2 checks passed
@adamdougal adamdougal deleted the adam/fts branch March 22, 2024 09:43
superhindupur pushed a commit that referenced this pull request Mar 26, 2024
@adamdougal @superhindupur
Add functional test for /conversation/custom endpoint (#504)
0175330 
* Add functional test for /conversation/custom endpoint

- Allow the disabling of app insights and loading
config from blob storage to make testing easier
- Switch to `Thread` from `Process` for running the app
  - This is to stop pytest calling the session scoped fixure multiple times
  - It also fixes an issue where we were not seeing app logs
- Setup the mock server as https due to the azure libraries enforcing it
  - This introduced additional fixtures and the `trustme` dependency
- Commit the encoding file for tiktoken
  - This is to stop it making a http call over the internet to retrive it

Required by #420

* Parameterize tests with pytest.mark.parametrize

* Improve test logging

* Extract boolean env var behaviour

* Add note about tiktoken issue

* Allow tests to be run from anywhere
github-merge-queue bot pushed a commit that referenced this pull request Mar 26, 2024
@superhindupur @cecheta
@dependabot @adamdougal @RenSilvaAU @ross-p-smith
Add basic ui tests for admin and user websites. (#503)
b759a0d 
* Add basic ui tests for admin and user websites.

* Move ui tests to tests folder and create uitest target on makefile.

* Update UI tests README to use latest env variable names.

* Delete package-lock.json file added in error.

* Update wrong command in ui tests README.md.

* Remove unnecessary fixture file.

* Update all UI dependencies (#502)

* Update minor/patch depedencies

* @vitejs/plugin-react major update

* Update vite

* Bump follow-redirects from 1.15.5 to 1.15.6 in /extensions/teams (#442)

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.5 to 1.15.6.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](follow-redirects/follow-redirects@v1.15.5...v1.15.6)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump nodemon from 2.0.22 to 3.1.0 in /extensions/teams (#493)

Bumps [nodemon](https://github.com/remy/nodemon) from 2.0.22 to 3.1.0.
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](remy/nodemon@v2.0.22...v3.1.0)

---
updated-dependencies:
- dependency-name: nodemon
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update tasks.json for func start (#511)

* Bump ts-node from 10.9.1 to 10.9.2 in /extensions/teams (#496)

Bumps [ts-node](https://github.com/TypeStrong/ts-node) from 10.9.1 to 10.9.2.
- [Release notes](https://github.com/TypeStrong/ts-node/releases)
- [Changelog](https://github.com/TypeStrong/ts-node/blob/main/development-docs/release-template.md)
- [Commits](TypeStrong/ts-node@v10.9.1...v10.9.2)

---
updated-dependencies:
- dependency-name: ts-node
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump botbuilder from 4.21.4 to 4.22.1 in /extensions/teams (#491)

Bumps [botbuilder](https://github.com/Microsoft/botbuilder-js) from 4.21.4 to 4.22.1.
- [Release notes](https://github.com/Microsoft/botbuilder-js/releases)
- [Commits](microsoft/botbuilder-js@4.21.4...4.22.1)

---
updated-dependencies:
- dependency-name: botbuilder
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump typescript from 4.9.5 to 5.4.3 in /extensions/teams (#509)

Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.9.5 to 5.4.3.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml)
- [Commits](microsoft/TypeScript@v4.9.5...v5.4.3)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump restify from 10.0.0 to 11.1.0 in /extensions/teams (#489)

Bumps [restify](https://github.com/restify/node-restify) from 10.0.0 to 11.1.0.
- [Release notes](https://github.com/restify/node-restify/releases)
- [Changelog](https://github.com/restify/node-restify/blob/master/CHANGELOG.md)
- [Commits](restify/node-restify@v10.0.0...v11.1.0)

---
updated-dependencies:
- dependency-name: restify
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Add functional test for /conversation/custom endpoint (#504)

* Add functional test for /conversation/custom endpoint

- Allow the disabling of app insights and loading
config from blob storage to make testing easier
- Switch to `Thread` from `Process` for running the app
  - This is to stop pytest calling the session scoped fixure multiple times
  - It also fixes an issue where we were not seeing app logs
- Setup the mock server as https due to the azure libraries enforcing it
  - This introduced additional fixtures and the `trustme` dependency
- Commit the encoding file for tiktoken
  - This is to stop it making a http call over the internet to retrive it

Required by #420

* Parameterize tests with pytest.mark.parametrize

* Improve test logging

* Extract boolean env var behaviour

* Add note about tiktoken issue

* Allow tests to be run from anywhere

* Update @types/node to v18 (#513)

* force solution to build for amd64 architecture as arm64 does not supp… (#506)

* force solution to build for amd64 architecture as arm64 does not support azure functions

* installing git in container

* Update .devcontainer/Dockerfile

---------

Co-authored-by: Ross Smith <[email protected]>

* Add test for failing downstream (#520)

Required by #420

Co-authored-by: Ross Smith <[email protected]>

* Add destroy to CI workflow (#521)

* Bump @types/restify from 8.5.11 to 8.5.12 in /extensions/teams (#533)

Bumps [@types/restify](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/restify) from 8.5.11 to 8.5.12.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/restify)

---
updated-dependencies:
- dependency-name: "@types/restify"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Verify the downstream calls being made by /conversations/custom (#519)

* Verify the downstream calls being made by /conversations/custom

- To ensure we are making the correct calls, with the correct api keys,
  index information and request bodies
- Implemented using a generic request matcher for now
  - This should be added to the mock server library by csernazs/pytest-httpserver#292

Required by #420

* Improve error message

* Add fixture comments for the https mock server

* Fix test comments

---------

Co-authored-by: Ross Smith <[email protected]>

* Bump @fluentui/react-icons from 2.0.232 to 2.0.233 in /code/frontend (#527)

Bumps [@fluentui/react-icons](https://github.com/microsoft/fluentui-system-icons) from 2.0.232 to 2.0.233.
- [Commits](https://github.com/microsoft/fluentui-system-icons/commits)

---
updated-dependencies:
- dependency-name: "@fluentui/react-icons"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump vite from 5.2.2 to 5.2.6 in /code/frontend (#528)

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.2.2 to 5.2.6.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v5.2.6/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump postcss from 8.4.37 to 8.4.38 in /code/frontend (#531)

Bumps [postcss](https://github.com/postcss/postcss) from 8.4.37 to 8.4.38.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](postcss/postcss@8.4.37...8.4.38)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump @types/react from 18.2.67 to 18.2.70 in /code/frontend (#532)

Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 18.2.67 to 18.2.70.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react)

---
updated-dependencies:
- dependency-name: "@types/react"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump @fluentui/react from 8.116.0 to 8.117.0 in /code/frontend (#530)

Bumps [@fluentui/react](https://github.com/microsoft/fluentui) from 8.116.0 to 8.117.0.
- [Release notes](https://github.com/microsoft/fluentui/releases)
- [Changelog](https://github.com/microsoft/fluentui/blob/master/azure-pipelines.release-fluentui.yml)
- [Commits](https://github.com/microsoft/fluentui/compare/@fluentui/react_v8.116.0...@fluentui/react_v8.117.0)

---
updated-dependencies:
- dependency-name: "@fluentui/react"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump typescript from 5.4.2 to 5.4.3 in /code/frontend (#529)

Bumps [typescript](https://github.com/Microsoft/TypeScript) from 5.4.2 to 5.4.3.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml)
- [Commits](microsoft/TypeScript@v5.4.2...v5.4.3)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* AZD can use containers instead of code for deployment (#505)

* Add adminweb docker image

* Build off my branch

* Create Requirements.

* Seperate process

* Dont traverse paths

* Use poetry in docker build

* dont install the root app

* Add frontend image

* Revert docker changes

* Install the root again

* Use requirements rather than toml

* Use Requirements for images again

* Rename docker images

* Frontend use app directory

* Add python path

* Copy the whole code folder

* Frontend runs locally

* Frontend and Admin working

* Use containers as default hosting model

* Dont build from my branch anymore

* Only build docker images - after test

* Change trigger workflow

* Only run when tests succeed

* Trigger builds only if tests pass

* Only changed App Service names

* Reverting

* Bump pytest-cov from 4.1.0 to 5.0.0 (#526)

Bumps [pytest-cov](https://github.com/pytest-dev/pytest-cov) from 4.1.0 to 5.0.0.
- [Changelog](https://github.com/pytest-dev/pytest-cov/blob/master/CHANGELOG.rst)
- [Commits](pytest-dev/pytest-cov@v4.1.0...v5.0.0)

---
updated-dependencies:
- dependency-name: pytest-cov
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump pre-commit from 3.6.2 to 3.7.0 (#524)

Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 3.6.2 to 3.7.0.
- [Release notes](https://github.com/pre-commit/pre-commit/releases)
- [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md)
- [Commits](pre-commit/pre-commit@v3.6.2...v3.7.0)

---
updated-dependencies:
- dependency-name: pre-commit
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Set AZURE_APP_SERVICE_HOSTING_MODEL for CI (#536)

* Create env before deploying (#537)

* Add basic ui tests for admin and user websites.

* Move ui tests to tests folder and create uitest target on makefile.

* Commit updated main.json.

* Move apt-get install for libraries required by cypress to dockerfile.

* Remove newline at the end of postCreate.sh.

* Conditional website address and install npm

* Move UI tests out of code folder and revert changes to azure.yaml

* Update ui tests location.

* Update dependabot.yml with new location of ui tests package.json.

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Chinedum Echeta <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Adam Dougal <[email protected]>
Co-authored-by: Ren Silva <[email protected]>
Co-authored-by: Ross Smith <[email protected]>
Co-authored-by: ross-p-smith <[email protected]>
eduardogch pushed a commit to devopsdale/chat-with-your-data-solution-accelerator that referenced this pull request Apr 30, 2024
@adamdougal
Add functional test for /conversation/custom endpoint (Azure-Samples#504
7393381 
)

* Add functional test for /conversation/custom endpoint

- Allow the disabling of app insights and loading
config from blob storage to make testing easier
- Switch to `Thread` from `Process` for running the app
  - This is to stop pytest calling the session scoped fixure multiple times
  - It also fixes an issue where we were not seeing app logs
- Setup the mock server as https due to the azure libraries enforcing it
  - This introduced additional fixtures and the `trustme` dependency
- Commit the encoding file for tiktoken
  - This is to stop it making a http call over the internet to retrive it

Required by Azure-Samples#420

* Parameterize tests with pytest.mark.parametrize

* Improve test logging

* Extract boolean env var behaviour

* Add note about tiktoken issue

* Allow tests to be run from anywhere
eduardogch pushed a commit to devopsdale/chat-with-your-data-solution-accelerator that referenced this pull request Apr 30, 2024
@superhindupur @cecheta
@dependabot @adamdougal @RenSilvaAU @ross-p-smith
Add basic ui tests for admin and user websites. (Azure-Samples#503)
bf2e120 
* Add basic ui tests for admin and user websites.

* Move ui tests to tests folder and create uitest target on makefile.

* Update UI tests README to use latest env variable names.

* Delete package-lock.json file added in error.

* Update wrong command in ui tests README.md.

* Remove unnecessary fixture file.

* Update all UI dependencies (Azure-Samples#502)

* Update minor/patch depedencies

* @vitejs/plugin-react major update

* Update vite

* Bump follow-redirects from 1.15.5 to 1.15.6 in /extensions/teams (Azure-Samples#442)

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.5 to 1.15.6.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](follow-redirects/follow-redirects@v1.15.5...v1.15.6)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump nodemon from 2.0.22 to 3.1.0 in /extensions/teams (Azure-Samples#493)

Bumps [nodemon](https://github.com/remy/nodemon) from 2.0.22 to 3.1.0.
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](remy/nodemon@v2.0.22...v3.1.0)

---
updated-dependencies:
- dependency-name: nodemon
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update tasks.json for func start (Azure-Samples#511)

* Bump ts-node from 10.9.1 to 10.9.2 in /extensions/teams (Azure-Samples#496)

Bumps [ts-node](https://github.com/TypeStrong/ts-node) from 10.9.1 to 10.9.2.
- [Release notes](https://github.com/TypeStrong/ts-node/releases)
- [Changelog](https://github.com/TypeStrong/ts-node/blob/main/development-docs/release-template.md)
- [Commits](TypeStrong/ts-node@v10.9.1...v10.9.2)

---
updated-dependencies:
- dependency-name: ts-node
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump botbuilder from 4.21.4 to 4.22.1 in /extensions/teams (Azure-Samples#491)

Bumps [botbuilder](https://github.com/Microsoft/botbuilder-js) from 4.21.4 to 4.22.1.
- [Release notes](https://github.com/Microsoft/botbuilder-js/releases)
- [Commits](microsoft/botbuilder-js@4.21.4...4.22.1)

---
updated-dependencies:
- dependency-name: botbuilder
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump typescript from 4.9.5 to 5.4.3 in /extensions/teams (Azure-Samples#509)

Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.9.5 to 5.4.3.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml)
- [Commits](microsoft/TypeScript@v4.9.5...v5.4.3)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump restify from 10.0.0 to 11.1.0 in /extensions/teams (Azure-Samples#489)

Bumps [restify](https://github.com/restify/node-restify) from 10.0.0 to 11.1.0.
- [Release notes](https://github.com/restify/node-restify/releases)
- [Changelog](https://github.com/restify/node-restify/blob/master/CHANGELOG.md)
- [Commits](restify/node-restify@v10.0.0...v11.1.0)

---
updated-dependencies:
- dependency-name: restify
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Add functional test for /conversation/custom endpoint (Azure-Samples#504)

* Add functional test for /conversation/custom endpoint

- Allow the disabling of app insights and loading
config from blob storage to make testing easier
- Switch to `Thread` from `Process` for running the app
  - This is to stop pytest calling the session scoped fixure multiple times
  - It also fixes an issue where we were not seeing app logs
- Setup the mock server as https due to the azure libraries enforcing it
  - This introduced additional fixtures and the `trustme` dependency
- Commit the encoding file for tiktoken
  - This is to stop it making a http call over the internet to retrive it

Required by Azure-Samples#420

* Parameterize tests with pytest.mark.parametrize

* Improve test logging

* Extract boolean env var behaviour

* Add note about tiktoken issue

* Allow tests to be run from anywhere

* Update @types/node to v18 (Azure-Samples#513)

* force solution to build for amd64 architecture as arm64 does not supp… (Azure-Samples#506)

* force solution to build for amd64 architecture as arm64 does not support azure functions

* installing git in container

* Update .devcontainer/Dockerfile

---------

Co-authored-by: Ross Smith <[email protected]>

* Add test for failing downstream (Azure-Samples#520)

Required by Azure-Samples#420

Co-authored-by: Ross Smith <[email protected]>

* Add destroy to CI workflow (Azure-Samples#521)

* Bump @types/restify from 8.5.11 to 8.5.12 in /extensions/teams (Azure-Samples#533)

Bumps [@types/restify](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/restify) from 8.5.11 to 8.5.12.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/restify)

---
updated-dependencies:
- dependency-name: "@types/restify"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Verify the downstream calls being made by /conversations/custom (Azure-Samples#519)

* Verify the downstream calls being made by /conversations/custom

- To ensure we are making the correct calls, with the correct api keys,
  index information and request bodies
- Implemented using a generic request matcher for now
  - This should be added to the mock server library by csernazs/pytest-httpserver#292

Required by Azure-Samples#420

* Improve error message

* Add fixture comments for the https mock server

* Fix test comments

---------

Co-authored-by: Ross Smith <[email protected]>

* Bump @fluentui/react-icons from 2.0.232 to 2.0.233 in /code/frontend (Azure-Samples#527)

Bumps [@fluentui/react-icons](https://github.com/microsoft/fluentui-system-icons) from 2.0.232 to 2.0.233.
- [Commits](https://github.com/microsoft/fluentui-system-icons/commits)

---
updated-dependencies:
- dependency-name: "@fluentui/react-icons"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump vite from 5.2.2 to 5.2.6 in /code/frontend (Azure-Samples#528)

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.2.2 to 5.2.6.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v5.2.6/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump postcss from 8.4.37 to 8.4.38 in /code/frontend (Azure-Samples#531)

Bumps [postcss](https://github.com/postcss/postcss) from 8.4.37 to 8.4.38.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](postcss/postcss@8.4.37...8.4.38)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump @types/react from 18.2.67 to 18.2.70 in /code/frontend (Azure-Samples#532)

Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 18.2.67 to 18.2.70.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react)

---
updated-dependencies:
- dependency-name: "@types/react"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump @fluentui/react from 8.116.0 to 8.117.0 in /code/frontend (Azure-Samples#530)

Bumps [@fluentui/react](https://github.com/microsoft/fluentui) from 8.116.0 to 8.117.0.
- [Release notes](https://github.com/microsoft/fluentui/releases)
- [Changelog](https://github.com/microsoft/fluentui/blob/master/azure-pipelines.release-fluentui.yml)
- [Commits](https://github.com/microsoft/fluentui/compare/@fluentui/react_v8.116.0...@fluentui/react_v8.117.0)

---
updated-dependencies:
- dependency-name: "@fluentui/react"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump typescript from 5.4.2 to 5.4.3 in /code/frontend (Azure-Samples#529)

Bumps [typescript](https://github.com/Microsoft/TypeScript) from 5.4.2 to 5.4.3.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml)
- [Commits](microsoft/TypeScript@v5.4.2...v5.4.3)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* AZD can use containers instead of code for deployment (Azure-Samples#505)

* Add adminweb docker image

* Build off my branch

* Create Requirements.

* Seperate process

* Dont traverse paths

* Use poetry in docker build

* dont install the root app

* Add frontend image

* Revert docker changes

* Install the root again

* Use requirements rather than toml

* Use Requirements for images again

* Rename docker images

* Frontend use app directory

* Add python path

* Copy the whole code folder

* Frontend runs locally

* Frontend and Admin working

* Use containers as default hosting model

* Dont build from my branch anymore

* Only build docker images - after test

* Change trigger workflow

* Only run when tests succeed

* Trigger builds only if tests pass

* Only changed App Service names

* Reverting

* Bump pytest-cov from 4.1.0 to 5.0.0 (Azure-Samples#526)

Bumps [pytest-cov](https://github.com/pytest-dev/pytest-cov) from 4.1.0 to 5.0.0.
- [Changelog](https://github.com/pytest-dev/pytest-cov/blob/master/CHANGELOG.rst)
- [Commits](pytest-dev/pytest-cov@v4.1.0...v5.0.0)

---
updated-dependencies:
- dependency-name: pytest-cov
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump pre-commit from 3.6.2 to 3.7.0 (Azure-Samples#524)

Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 3.6.2 to 3.7.0.
- [Release notes](https://github.com/pre-commit/pre-commit/releases)
- [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md)
- [Commits](pre-commit/pre-commit@v3.6.2...v3.7.0)

---
updated-dependencies:
- dependency-name: pre-commit
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Set AZURE_APP_SERVICE_HOSTING_MODEL for CI (Azure-Samples#536)

* Create env before deploying (Azure-Samples#537)

* Add basic ui tests for admin and user websites.

* Move ui tests to tests folder and create uitest target on makefile.

* Commit updated main.json.

* Move apt-get install for libraries required by cypress to dockerfile.

* Remove newline at the end of postCreate.sh.

* Conditional website address and install npm

* Move UI tests out of code folder and revert changes to azure.yaml

* Update ui tests location.

* Update dependabot.yml with new location of ui tests package.json.

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Chinedum Echeta <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Adam Dougal <[email protected]>
Co-authored-by: Ren Silva <[email protected]>
Co-authored-by: Ross Smith <[email protected]>
Co-authored-by: ross-p-smith <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tanya-borisova tanya-borisova tanya-borisova approved these changes

@ross-p-smith ross-p-smith ross-p-smith approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@adamdougal @ross-p-smith @tanya-borisova