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

Epic/5571 bot preview #2152

Merged
merged 3 commits into from
Dec 11, 2024
Merged

Epic/5571 bot preview #2152

merged 3 commits into from
Dec 11, 2024

Conversation

amoedoamorim
Copy link
Contributor

Description

I'm opening a new PR targeting develop as Jay's and Sawy's work was merged from a feature branch to this epic branch.

@caiosba and @melsawy can you please review and lmk if it's safe to merge? Just want to be extra sure as Jay's OOO today and tomorrrow.

jayjay-w and others added 2 commits December 3, 2024 19:01
* Add new field to TeamType to allow bot queries

Add a bot_query field to TeamType which will send queries to the
backend simulating tipline bot queries.

Initially, this is returning the most recent Explainers/FactChecks
as TiplineSearchResults, but eventually it will be hooked to the
actual bot implementation.

* Add reviewer feedback

Add reviewer feedback

* Add id field to TiplineSearchResult

Add id field to TiplineSearchResult

* Regenerate GraphQL Api Schema

Regenerate GraphQL Api Schema
* CV2-5761 list most relevant articles fact check and explainer for project media item

CV2-5761 list most relevant articles fact check and explainer for project media item

commit 5c95273
Author: Mohamed El-Sawy <[email protected]>
Date:   Tue Dec 3 07:11:22 2024 +0200

    CV2-5761 list most relevant articles fact check and explainer for project media item (#2142)

    * CV2-5761: include FactCheck & Explainer for item most relevant

    * CV2-5751: fix articles sort and change the limit

    * CV2-5761: keep default sort (sort by score)

    * CV2-5761: enforce limit value as a method args

    * CV2-5761: cleanup

    * CV2-5761: add more tests

    * CV2-5761: add missing test to back coverage 100%

    * CV2-5761: apply PR comments

commit f87308d
Merge: fe3eda9 8383796
Author: Sawy <[email protected]>
Date:   Mon Dec 2 08:42:17 2024 +0200

    Merge branch 'develop' into epic/CV2-5373-most-recent-articles-to-most-relevant-articles

commit fe3eda9
Merge: 236367e e5018c4
Author: Sawy <[email protected]>
Date:   Fri Nov 29 17:41:20 2024 +0200

    Merge branch 'develop' into epic/CV2-5373-most-recent-articles-to-most-relevant-articles

commit 236367e
Author: Mohamed El-Sawy <[email protected]>
Date:   Tue Nov 26 20:50:22 2024 +0200

    CV2-5731 Refactoring smooch search (#2137)

    * CV2-5731: call tipline search_for_articles method and append Explainers if no articles exists

    * CV2-5731: fix graphql query and add more tests

    * CV2-5731: apply PR comments and add more tests

commit 03d9074
Merge: 58d0ade 06a7bf8
Author: Sawy <[email protected]>
Date:   Tue Nov 26 17:38:26 2024 +0200

    Merge branch 'develop' into epic/CV2-5373-most-recent-articles-to-most-relevant-articles

commit 58d0ade
Merge: b22f022 160baeb
Author: Sawy <[email protected]>
Date:   Mon Nov 25 15:45:25 2024 +0200

    Merge branch 'develop' into epic/CV2-5373-most-recent-articles-to-most-relevant-articles

commit b22f022
Author: Mohamed El-Sawy <[email protected]>
Date:   Sat Nov 23 15:50:01 2024 +0200

    CV2-5730: return dummy relevant articles (#2136)

commit 464eb3e
Merge: cb53dfa 0fab2bf
Author: Sawy <[email protected]>
Date:   Sat Nov 23 07:28:29 2024 +0200

    Merge branch 'develop' into epic/CV2-5373-most-recent-articles-to-most-relevant-articles

commit cb53dfa
Merge: cfc7370 5770afe
Author: Sawy <[email protected]>
Date:   Wed Nov 20 19:28:39 2024 +0200

    Merge branch 'develop' into epic/CV2-5373-most-recent-articles-to-most-relevant-articles

commit cfc7370
Author: Sawy <[email protected]>
Date:   Tue Nov 19 10:41:09 2024 +0200

    CV2-5373: update relay files

commit 33bd366
Author: Sawy <[email protected]>
Date:   Mon Nov 18 12:37:18 2024 +0200

    CV2-5373: add a new graphql fields  &

* Return actual matching explainers and fact checks when using the bot_query method

Currently the `bot_query` method in `TeamType` returns the 3 most recent explainers/fact checks as `TiplineSearchResult`s. Now we are changing this to actually return matching explainers and fact checks.

* CV2-5373: check language exists for fc_language condition

---------

Co-authored-by: Sawy <[email protected]>
@melsawy
Copy link
Contributor

melsawy commented Dec 9, 2024

@amoedoamorim this PR also include my work I do not think it's save to merge this one into develop branch

@caiosba
Copy link
Contributor

caiosba commented Dec 10, 2024

@amoedoamorim I think we'll need to wait for @melsawy's changes to be merged first.

@caiosba caiosba removed their request for review December 10, 2024 00:33
Copy link
Contributor

@caiosba caiosba left a comment

Choose a reason for hiding this comment

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

@amoedoamorim I rebased and fixed conflicts, changes look good to me - can you please test locally as well?

@amoedoamorim amoedoamorim merged commit cb54d3a into develop Dec 11, 2024
11 checks passed
@amoedoamorim
Copy link
Contributor Author

@amoedoamorim I rebased and fixed conflicts, changes look good to me - can you please test locally as well?

Tested locally, works well. Merging!

@jayjay-w jayjay-w deleted the epic/5571-bot-preview branch December 20, 2024 21:31
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.

4 participants