Metrics: add middleware #185

lusmoura · 2024-06-07T17:16:59Z

AI Description

This PR introduces a new MetricsMiddleware class to the backend, enabling the reporting of metrics such as request duration and status codes.

Code Changes:

Added MetricsMiddleware class in src/backend/services/metrics.py.
Imported necessary modules: os, time, requests, BaseHTTPMiddleware, and Request.
Defined REPORT_ENDPOINT using os.getenv.
Implemented dispatch and report_metrics methods in MetricsMiddleware to record request duration.
Added error handling for potential exceptions during metric reporting.
Included helper methods get_endpoint_name and get_status_code to extract endpoint name and status code, respectively.
Integrated MetricsMiddleware in src/backend/main.py by importing it and adding it to the middleware stack.

… luisa/metrics

src/backend/routers/chat.py

src/backend/services/metrics.py

src/backend/routers/agent.py

src/backend/model_deployments/sagemaker.py

src/backend/chat/collate.py

src/backend/chat/custom/custom.py

src/backend/model_deployments/azure.py

src/backend/tests/model_deployments/mock_deployments/mock_azure.py

tianjing-li

Couple changes

tianjing-li

Much cleaner! Approved

* Metrics: add middleware * add chat calls * merge * lint * make it async * add user id * add more fields * add retry and duration * add meta * comments * fix tests * improve error handling * rename fields * match spec * comments * clean code * only create loop when theres endpoint * add assistant id to chat

* add login page components * Add Register page and hooks for auth * Add the register page and connect all the frontend elements * Redirect to /login if the token expires and clean up some console errors * Add error messages for failed logins * frontend: Add Single Sign-on to Toolkit (#227) * Add Google SSO login plus OpenID components * Dynamically set SSO login buttons and show or hide username and password based on auth_strategies --------- Co-authored-by: Tianjing Li <[email protected]> * fix startup event * Fix build errors and update the API client * Fix tests by adding missing env vars Add test OIDC_WELL_KNOWN_ENDPOINT var to fixtures * Add a walkthrough guide of the toolkit (#251) * GUide * Chang * Change * Change * Update docs/walkthrough/walkthrough.md Co-authored-by: Luísa Moura <[email protected]> * Update walkthrough.md --------- Co-authored-by: Luísa Moura <[email protected]> * coral-web: fix agent info panel opening by default (#253) cast isEditAgentPanelOpen to boolean * [backend] enforce agent update with user-id (#246) * updates * remove client changes * remove logs * use better header user id check * fix validators * typo * Metrics: add middleware (#185) * Metrics: add middleware * add chat calls * merge * lint * make it async * add user id * add more fields * add retry and duration * add meta * comments * fix tests * improve error handling * rename fields * match spec * comments * clean code * only create loop when theres endpoint * add assistant id to chat * feat(toolkit): show assistant welcome message (#255) * feat(toolkit): show assistant welcome message * feat(toolkit): show assistant welcome message --------- Co-authored-by: misspia-cohere <[email protected]> Co-authored-by: Tianjing Li <[email protected]> Co-authored-by: Beatrix De Wilde <[email protected]> Co-authored-by: Luísa Moura <[email protected]> Co-authored-by: misspia-cohere <[email protected]> Co-authored-by: Scott <[email protected]> Co-authored-by: Khalil Najjar <[email protected]>

* Metrics: add middleware * add chat calls * merge * lint * make it async * add user id * add more fields * add retry and duration * add meta * comments * fix tests * improve error handling * rename fields * match spec * comments * clean code * only create loop when theres endpoint * add assistant id to chat

* add login page components * Add Register page and hooks for auth * Add the register page and connect all the frontend elements * Redirect to /login if the token expires and clean up some console errors * Add error messages for failed logins * frontend: Add Single Sign-on to Toolkit (#227) * Add Google SSO login plus OpenID components * Dynamically set SSO login buttons and show or hide username and password based on auth_strategies --------- Co-authored-by: Tianjing Li <[email protected]> * fix startup event * Fix build errors and update the API client * Fix tests by adding missing env vars Add test OIDC_WELL_KNOWN_ENDPOINT var to fixtures * Add a walkthrough guide of the toolkit (#251) * GUide * Chang * Change * Change * Update docs/walkthrough/walkthrough.md Co-authored-by: Luísa Moura <[email protected]> * Update walkthrough.md --------- Co-authored-by: Luísa Moura <[email protected]> * coral-web: fix agent info panel opening by default (#253) cast isEditAgentPanelOpen to boolean * [backend] enforce agent update with user-id (#246) * updates * remove client changes * remove logs * use better header user id check * fix validators * typo * Metrics: add middleware (#185) * Metrics: add middleware * add chat calls * merge * lint * make it async * add user id * add more fields * add retry and duration * add meta * comments * fix tests * improve error handling * rename fields * match spec * comments * clean code * only create loop when theres endpoint * add assistant id to chat * feat(toolkit): show assistant welcome message (#255) * feat(toolkit): show assistant welcome message * feat(toolkit): show assistant welcome message --------- Co-authored-by: misspia-cohere <[email protected]> Co-authored-by: Tianjing Li <[email protected]> Co-authored-by: Beatrix De Wilde <[email protected]> Co-authored-by: Luísa Moura <[email protected]> Co-authored-by: misspia-cohere <[email protected]> Co-authored-by: Scott <[email protected]> Co-authored-by: Khalil Najjar <[email protected]>

* Initial commit for Compass Tool * coral-web: update first turn suggestions (#225) * Addressed comments on the previous commit * Added custom_context to parse and filters to search * Formatting changes * feat(assistant): Update conversation header (#229) * feat(assistant): Update conversation header * feat(assistant): Update conversation header * update tooltip * fix IconButton import * Setup: fix dependencies (#243) * feat(toolkit): show conversation list on with agents list (#231) * Setup: remove redundant dependency (#244) * Improve Auth guide (#235) improve auth guide * coral-web: create agent + agent base form (#212) * create new agent form * render agents list * link back to base agent page * perform post submission actions * move input labels outside of input borders * move submit button * gen client * factor out agent base form * use default content type * list custom agents * check if agent name is unique * and deployment + env variables to agent form * add deployments * clean up * add submit modal * push to new agent page on create success * only show available deployments * remove deployments dropdown * feat: List Assistants returned from API (#242) * feat: list agents from BE * Update src/interfaces/coral_web/src/components/Conversation/MessagingContainer.tsx Co-authored-by: misspia-cohere <[email protected]> --------- Co-authored-by: misspia-cohere <[email protected]> * nits --------- Co-authored-by: Khalil Najjar <[email protected]> * Propagate should_store logic to the File upload logic (#247) should_store logic to the attach_files_to_messages * [backend] passing in agent when calling streaming chat (#237) * initial chat changes * need to test * done * Remove old test * default model for agents right now * Organizations DB models, CRUD and tests (#238) * Organizations initial commit * Organizations initial commit * Organizations initial commit - sync main * Organizations initial commit - sync main - blacked * Organizations initial commit - sync main - lint * Organizations initial commit - sync main - tests * Organizations initial commit - sync main - tests * Organizations initial commit - review fixes * Organizations initial commit - review fixes * Split up display name and name for Tools (#241) * CHange * change * coral-web: update assistant (#248) * create new agent form * render agents list * link back to base agent page * perform post submission actions * move input labels outside of input borders * move submit button * gen client * factor out agent base form * check if agent name is unique * and deployment + env variables to agent form * add deployments * clean up * remove deployments dropdown * init agent page * create agent drawer * use agent form * add update agent request * add get agent request * fix rebase errors * remove model from agent form * add agent drawer to conversation * remove unused componenets * use new agent name for update success message * fix(toolkit): Address code feedback + improvements (#249) address code feedback improvements --------- Co-authored-by: Khalil Najjar <[email protected]> * feat(toolkit): add/remove recently used agents (#250) * feat(toolkit): add/remove recently used agents * merge main * Add a walkthrough guide of the toolkit (#251) * GUide * Chang * Change * Change * Update docs/walkthrough/walkthrough.md Co-authored-by: Luísa Moura <[email protected]> * Update walkthrough.md --------- Co-authored-by: Luísa Moura <[email protected]> * coral-web: fix agent info panel opening by default (#253) cast isEditAgentPanelOpen to boolean * [backend] enforce agent update with user-id (#246) * updates * remove client changes * remove logs * use better header user id check * fix validators * typo * Metrics: add middleware (#185) * Metrics: add middleware * add chat calls * merge * lint * make it async * add user id * add more fields * add retry and duration * add meta * comments * fix tests * improve error handling * rename fields * match spec * comments * clean code * only create loop when theres endpoint * add assistant id to chat * feat(toolkit): show assistant welcome message (#255) * feat(toolkit): show assistant welcome message * feat(toolkit): show assistant welcome message * frontend: Login, logout, and account creation (#179) * add login page components * Add Register page and hooks for auth * Add the register page and connect all the frontend elements * Redirect to /login if the token expires and clean up some console errors * Add error messages for failed logins * frontend: Add Single Sign-on to Toolkit (#227) * Add Google SSO login plus OpenID components * Dynamically set SSO login buttons and show or hide username and password based on auth_strategies --------- Co-authored-by: Tianjing Li <[email protected]> * fix startup event * Fix build errors and update the API client * Fix tests by adding missing env vars Add test OIDC_WELL_KNOWN_ENDPOINT var to fixtures * Add a walkthrough guide of the toolkit (#251) * GUide * Chang * Change * Change * Update docs/walkthrough/walkthrough.md Co-authored-by: Luísa Moura <[email protected]> * Update walkthrough.md --------- Co-authored-by: Luísa Moura <[email protected]> * coral-web: fix agent info panel opening by default (#253) cast isEditAgentPanelOpen to boolean * [backend] enforce agent update with user-id (#246) * updates * remove client changes * remove logs * use better header user id check * fix validators * typo * Metrics: add middleware (#185) * Metrics: add middleware * add chat calls * merge * lint * make it async * add user id * add more fields * add retry and duration * add meta * comments * fix tests * improve error handling * rename fields * match spec * comments * clean code * only create loop when theres endpoint * add assistant id to chat * feat(toolkit): show assistant welcome message (#255) * feat(toolkit): show assistant welcome message * feat(toolkit): show assistant welcome message --------- Co-authored-by: misspia-cohere <[email protected]> Co-authored-by: Tianjing Li <[email protected]> Co-authored-by: Beatrix De Wilde <[email protected]> Co-authored-by: Luísa Moura <[email protected]> Co-authored-by: misspia-cohere <[email protected]> Co-authored-by: Scott <[email protected]> Co-authored-by: Khalil Najjar <[email protected]> * fix(toolkit): UX/UI improvements (#257) * Add error troubleshooting (#262) * Update chat.py --------- Co-authored-by: Jessica Wu <[email protected]> Co-authored-by: Khalil Najjar <[email protected]> Co-authored-by: Luísa Moura <[email protected]> Co-authored-by: Tomeu <[email protected]> Co-authored-by: Tianjing Li <[email protected]> Co-authored-by: misspia-cohere <[email protected]> Co-authored-by: Eugene P <[email protected]> Co-authored-by: Scott <[email protected]> Co-authored-by: Beatrix De Wilde <[email protected]> Co-authored-by: Alex W <[email protected]> Co-authored-by: misspia-cohere <[email protected]>

Metrics: add middleware

5195bb8

lusmoura had a problem deploying to development June 7, 2024 17:17 — with GitHub Actions Failure

Merge branch 'main' into luisa/metrics

f95fc03

lusmoura had a problem deploying to development June 10, 2024 14:33 — with GitHub Actions Failure

lusmoura added 3 commits June 11, 2024 12:26

add chat calls

e33f409

Merge remote-tracking branch 'refs/remotes/origin/luisa/metrics' into…

1cd34bf

… luisa/metrics

merge

0444a89

lusmoura had a problem deploying to development June 11, 2024 11:28 — with GitHub Actions Failure

lint

11d0977

lusmoura had a problem deploying to development June 11, 2024 11:32 — with GitHub Actions Failure

BeatrixCohere reviewed Jun 11, 2024

View reviewed changes

src/backend/routers/chat.py Show resolved Hide resolved

make it async

011e1f8

lusmoura had a problem deploying to development June 13, 2024 16:40 — with GitHub Actions Failure

Merge branch 'main' into luisa/metrics

715870e

lusmoura had a problem deploying to development June 17, 2024 17:08 — with GitHub Actions Failure

add user id

b3229ce

lusmoura had a problem deploying to development June 17, 2024 17:41 — with GitHub Actions Failure

add more fields

7cd7420

lusmoura had a problem deploying to development June 18, 2024 15:36 — with GitHub Actions Failure

lusmoura added 2 commits June 18, 2024 18:33

add retry and duration

3567c0e

Merge branch 'main' into luisa/metrics

442b0fc

lusmoura had a problem deploying to development June 18, 2024 17:35 — with GitHub Actions Failure

scott-cohere reviewed Jun 18, 2024

View reviewed changes

src/backend/services/metrics.py Outdated Show resolved Hide resolved

src/backend/routers/agent.py Show resolved Hide resolved

src/backend/model_deployments/sagemaker.py Outdated Show resolved Hide resolved

lusmoura added 2 commits June 19, 2024 14:37

add meta

1bef88c

comments

72f9387

lusmoura had a problem deploying to development June 19, 2024 13:52 — with GitHub Actions Failure

fix tests

e3cd410

lusmoura had a problem deploying to development June 19, 2024 15:29 — with GitHub Actions Failure

scott-cohere approved these changes Jun 19, 2024

View reviewed changes

improve error handling

307ee95

lusmoura requested a review from a team as a code owner June 20, 2024 10:10

rename fields

a356385

lusmoura had a problem deploying to development June 20, 2024 10:26 — with GitHub Actions Failure