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

Get sources list for filter from content_provider table #5180

Merged
merged 1 commit into from
Nov 25, 2024

Conversation

krysal
Copy link
Member

@krysal krysal commented Nov 23, 2024

Fixes

Fixes #5174 by @krysal

Description

As mentioned in the issue discussion, this PR optimizes the source filter by getting the list from the source table. The provider filter is removed as it involves a similar query and we need to confirm this works first.

Testing Instructions

Run the API, just api/up, and observe the filter changes at:

Checklist

  • My pull request has a descriptive title (not a vague title likeUpdate index.md).
  • My pull request targets the default branch of the repository (main) or a parent feature branch.
  • My commit messages follow best practices.
  • My code follows the established code style of the repository.
  • I added or updated tests for the changes I made (if applicable).
  • I added or updated documentation (if applicable).
  • I tried running the project locally and verified that there are no visible errors.
  • I ran the DAG documentation generator (ov just catalog/generate-docs for catalog PRs) or the media properties generator (ov just catalog/generate-docs media-props for the catalog or ov just api/generate-docs for the API) where applicable.

Developer Certificate of Origin

Developer Certificate of Origin
Developer Certificate of Origin
Version 1.1

Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.


Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or

(b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or

(c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.

(d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.

@krysal krysal requested a review from a team as a code owner November 23, 2024 16:33
@krysal krysal requested review from obulat and dhruvkb and removed request for a team November 23, 2024 16:33
@openverse-bot openverse-bot added 🧱 stack: api Related to the Django API 🟧 priority: high Stalls work on the project or its dependents 🛠 goal: fix Bug fix 💻 aspect: code Concerns the software code in the repository labels Nov 23, 2024
@@ -866,10 +890,6 @@ def is_pending(self, obj):
"is_pending",
"media_id", # used because ``media_obj`` does not render a link
)
list_filter = (
Copy link
Contributor

Choose a reason for hiding this comment

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

Why is this filter removed, @krysal ?

Copy link
Member Author

Choose a reason for hiding this comment

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

We need to reduce potential issues when rendering the page, and the filters declared this way will result in more DISTINCT queries, which are prohibitively expensive in the image table. After confirming we can access the image list, we can re-add these filters optimally (like done here with sources), although I don't see them listed in the admin currently.

Copy link
Contributor

@obulat obulat left a comment

Choose a reason for hiding this comment

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

It's disappointing that the default filter query is so expensive!

This is the query I get for images locally (and I hope if will be faster):

SELECT 
    "image"."id",
    "image"."created_on",
    "image"."updated_on",
    "image"."identifier",
    "image"."foreign_identifier",
    "image"."title",
    "image"."foreign_landing_url",
    "image"."creator",
    "image"."creator_url",
    "image"."thumbnail",
    "image"."provider",
    "image"."url",
    "image"."filesize",
    "image"."filetype",
    "image"."watermarked",
    "image"."license",
    "image"."license_version",
    "image"."source",
    "image"."last_synced_with_source",
    "image"."removed_from_source",
    "image"."view_count",
    "image"."tags",
    "image"."category",
    "image"."meta_data",
    "image"."width",
    "image"."height",
    COUNT("nsfw_reports"."id") AS "total_report_count",
    (COUNT("nsfw_reports"."id") - COUNT("nsfw_reports"."decision_id")) AS "pending_report_count",
    MIN("nsfw_reports"."created_at") AS "oldest_report_date"
FROM 
    "image"
INNER JOIN 
    "nsfw_reports" 
ON 
    ("image"."identifier" = "nsfw_reports"."identifier")
WHERE 
    "nsfw_reports"."id" IS NOT NULL
GROUP BY 
    "image"."id"
HAVING 
    (COUNT("nsfw_reports"."id") - COUNT("nsfw_reports"."decision_id")) > 0
ORDER BY 
    "total_report_count" DESC, 
    "pending_report_count" DESC, 
    "oldest_report_date" ASC, 
    "image"."id" DESC;

@krysal
Copy link
Member Author

krysal commented Nov 25, 2024

@obulat, you can check how fast it is in Grafana. Thanks for the review!

@krysal krysal merged commit 5531359 into main Nov 25, 2024
54 checks passed
@krysal krysal deleted the fix/admin_filter branch November 25, 2024 16:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
💻 aspect: code Concerns the software code in the repository 🛠 goal: fix Bug fix 🟧 priority: high Stalls work on the project or its dependents 🧱 stack: api Related to the Django API
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

Django's image admin view times out
3 participants