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.

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

fix: prevent 504 for user table #100

Merged
merged 4 commits into from
Feb 19, 2025
Merged

Conversation

nboyse
Copy link
Collaborator

@nboyse nboyse commented Feb 19, 2025

Context

Following on from DIAPPs work (here) we would like to ensure the errors stop for our other two tables too. DIAPP has now covered the information we need regarding Chat/ChatMessages so I'm severing the connection between chats in the UserSerializer

Changes proposed in this pull request

Remove ChatSerializer as its covered by ChatMessageSerializer
Add extra fields to UserSerializer
Remove chats from being called unnecessarily in the UserSerializer which is causing the 504 timeouts
Update relevant tests

@nboyse nboyse force-pushed the hotfix/prevent-504-for-user-table branch from b65af7b to 5d0334d Compare February 19, 2025 14:13
Copy link
Contributor

@a-i-flo a-i-flo left a comment

Choose a reason for hiding this comment

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

Needs a column with user_id to be able to link with the chat_message_details.

@nboyse nboyse requested a review from a-i-flo February 19, 2025 15:45
@nboyse nboyse merged commit 8c4359d into dev Feb 19, 2025
8 checks passed
@nboyse nboyse deleted the hotfix/prevent-504-for-user-table branch February 19, 2025 15:51
nboyse added a commit that referenced this pull request Feb 19, 2025
* add ne route

* add new prompt

* tidy up

* add node to strip keyword

* exponential backoff for summarisation

* optimized prompt for summarisation

* build(deps-dev): bump cryptography from 43.0.3 to 44.0.1 in /ai-tests (#82)

Bumps [cryptography](https://github.com/pyca/cryptography) from 43.0.3 to 44.0.1.
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](pyca/cryptography@43.0.3...44.0.1)

---
updated-dependencies:
- dependency-name: cryptography
  dependency-type: indirect
...

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

* build(deps-dev): bump cryptography from 44.0.0 to 44.0.1 (#83)

Bumps [cryptography](https://github.com/pyca/cryptography) from 44.0.0 to 44.0.1.
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](pyca/cryptography@44.0.0...44.0.1)

---
updated-dependencies:
- dependency-name: cryptography
  dependency-type: indirect
...

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

* use final_res to determine log

* build(deps): bump cryptography from 43.0.3 to 44.0.1 in /django_app

Bumps [cryptography](https://github.com/pyca/cryptography) from 43.0.3 to 44.0.1.
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](pyca/cryptography@43.0.3...44.0.1)

---
updated-dependencies:
- dependency-name: cryptography
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

* chore: branch naming convention (#86)

* chore: branch naming convention

* linting throughout codebase

* update email/username relation

* revert changes to retriever

* rebase

* linting

* poetry has been messed with

* build(deps): bump cryptography from 44.0.0 to 44.0.1 in /notebooks (#84)

Bumps [cryptography](https://github.com/pyca/cryptography) from 44.0.0 to 44.0.1.
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](pyca/cryptography@44.0.0...44.0.1)

---
updated-dependencies:
- dependency-name: cryptography
  dependency-type: indirect
...

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

* fix: text_in_answer already exists and prevents further migrations

* Revert "fix: text_in_answer already exists and prevents further migrations"

* chore: fix redbox tests (#90)

* fix: implement exponential backoff (#94)

* Update homepage.html (#99)

* Update homepage.html

* the solution to the formatting issue

---------

Co-authored-by: Natasha Boyse <[email protected]>

* If documents are not selected, they should not be used (#101)

* no documents returned if not selected

* ruff

---------

Co-authored-by: Saisakul Chernbumroong <[email protected]>

* fix: prevent 504 for user table (#100)

* fix: prevent 504 for user table

* assertion is redundant

* adding user id and chat id

* formatting

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Saisakul Chernbumroong <[email protected]>
Co-authored-by: Saisakul Chernbumroong <[email protected]>
Co-authored-by: nora-errouhly <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Nora Er-Rouhly <[email protected]>
Co-authored-by: Saisakul Chernbumroong <[email protected]>
Co-authored-by: zainabmohamoud <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants