Private
Public Access
Scope backlog re-apply per-feed and always queue it through Celery (T5, S5)
Completes the T5 fix: reapply_rules_for_user_backlog now computes each feed's subscription-tag ids up front and passes them to evaluate_rules_for_article per article, so a feed/tag-scoped rule from a different feed can't fire on this backlog (see the previous commit's rule_in_scope() in apps.rules.engine). Also completes S5's second half: the "Re-apply" view now always dispatches reapply_rules_for_user.delay() instead of calling the backlog function inline from the request — a large backlog or a regex that outruns the new timeout guard no longer risks tying up a web worker. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
1 parent
91c0b1dd26
commit
fd8eeb605e
3 files changed
+133
-12
No files matched your search
+24
-6
@@ -1,6 +1,6 @@
|
|||||||
from celery import shared_task
|
from celery import shared_task
|
||||||
|
|
||||||
from apps.articles.models import Article
|
from apps.articles.models import Article, SubscriptionTag
|
||||||
from apps.feeds.models import Subscription
|
from apps.feeds.models import Subscription
|
||||||
|
|
||||||
from .engine import evaluate_rules_for_article
|
from .engine import evaluate_rules_for_article
|
||||||
@@ -12,9 +12,20 @@ def reapply_rules_for_user_backlog(rule_id: int) -> int:
|
|||||||
rule, so priority/short-circuit ordering stays correct) against their
|
rule, so priority/short-circuit ordering stays correct) against their
|
||||||
unread backlog, scoped by the triggering rule's own feed/tag scope.
|
unread backlog, scoped by the triggering rule's own feed/tag scope.
|
||||||
|
|
||||||
Exists as a plain function so it can be called synchronously for
|
The *backlog* is narrowed to the triggering rule's own feed/tag scope
|
||||||
immediate feedback (e.g. from a "Re-apply" view) or wrapped in a task
|
(re-applying a feed-scoped rule has no reason to touch other feeds'
|
||||||
for background use — see reapply_rules_for_user below.
|
articles), but which of the user's *other* rules apply to each of
|
||||||
|
those articles is still per-article/per-feed — evaluate_rules_for_article
|
||||||
|
checks that via rule_in_scope, so a feed- or tag-scoped rule for a
|
||||||
|
different feed can't fire on this backlog just because it happened to
|
||||||
|
match (see apps.rules.engine.rule_in_scope).
|
||||||
|
|
||||||
|
Exists as a plain function, separate from the reapply_rules_for_user
|
||||||
|
task below, so it's unit-testable without Celery — but every caller
|
||||||
|
should go through that task (see apps.rules.views.reapply_rule), not
|
||||||
|
call this directly from a request: a large backlog or a pathological
|
||||||
|
regex (bounded but not eliminated by apps.rules.engine's timeout
|
||||||
|
guard) could otherwise tie up a web worker for a long time.
|
||||||
"""
|
"""
|
||||||
try:
|
try:
|
||||||
rule = FilterRule.objects.select_related("user").get(pk=rule_id)
|
rule = FilterRule.objects.select_related("user").get(pk=rule_id)
|
||||||
@@ -45,13 +56,20 @@ def reapply_rules_for_user_backlog(rule_id: int) -> int:
|
|||||||
|
|
||||||
rules = list(FilterRule.objects.filter(user=user, is_enabled=True).order_by("priority", "id"))
|
rules = list(FilterRule.objects.filter(user=user, is_enabled=True).order_by("priority", "id"))
|
||||||
|
|
||||||
|
subscription_tag_ids_by_feed: dict[int, set[int]] = {}
|
||||||
|
for feed_id, tag_id in SubscriptionTag.objects.filter(
|
||||||
|
user=user, subscription__feed_id__in=feed_ids
|
||||||
|
).values_list("subscription__feed_id", "tag_id"):
|
||||||
|
subscription_tag_ids_by_feed.setdefault(feed_id, set()).add(tag_id)
|
||||||
|
|
||||||
count = 0
|
count = 0
|
||||||
for article in backlog:
|
for article in backlog:
|
||||||
evaluate_rules_for_article(user, article, rules)
|
subscription_tag_ids = subscription_tag_ids_by_feed.get(article.feed_id, set())
|
||||||
|
evaluate_rules_for_article(user, article, rules, subscription_tag_ids)
|
||||||
count += 1
|
count += 1
|
||||||
return count
|
return count
|
||||||
|
|
||||||
|
|
||||||
@shared_task
|
@shared_task(time_limit=120, soft_time_limit=90)
|
||||||
def reapply_rules_for_user(rule_id: int):
|
def reapply_rules_for_user(rule_id: int):
|
||||||
return reapply_rules_for_user_backlog(rule_id)
|
return reapply_rules_for_user_backlog(rule_id)
|
||||||
+103
-1
@@ -1,8 +1,17 @@
|
|||||||
|
from unittest.mock import patch
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
from django.contrib.auth import get_user_model
|
from django.contrib.auth import get_user_model
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
|
|
||||||
from apps.articles.models import STARRED_TAG_NAME, Article, ArticleTag, UserArticleState
|
from apps.articles.models import (
|
||||||
|
STARRED_TAG_NAME,
|
||||||
|
Article,
|
||||||
|
ArticleTag,
|
||||||
|
SubscriptionTag,
|
||||||
|
Tag,
|
||||||
|
UserArticleState,
|
||||||
|
)
|
||||||
from apps.feeds.models import Feed, Subscription
|
from apps.feeds.models import Feed, Subscription
|
||||||
|
|
||||||
from .models import FilterRule
|
from .models import FilterRule
|
||||||
@@ -119,6 +128,28 @@ def test_reapply_rule_view_applies_to_unread_backlog(client, alice, feed):
|
|||||||
assert is_starred(alice, article) is True
|
assert is_starred(alice, article) is True
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.django_db
|
||||||
|
def test_reapply_rule_view_always_queues_through_celery_never_runs_inline(client, alice, feed):
|
||||||
|
# A large backlog or a pathological regex must not be able to tie up
|
||||||
|
# the request/response cycle — the view should dispatch a task, not
|
||||||
|
# call reapply_rules_for_user_backlog directly.
|
||||||
|
Subscription.objects.create(user=alice, feed=feed)
|
||||||
|
rule = FilterRule.objects.create(
|
||||||
|
user=alice,
|
||||||
|
match_field=FilterRule.FIELD_TITLE,
|
||||||
|
match_type=FilterRule.MATCH_CONTAINS,
|
||||||
|
match_value="Python",
|
||||||
|
action=FilterRule.ACTION_STAR,
|
||||||
|
)
|
||||||
|
client.login(username="alice", password="pw-alice-123")
|
||||||
|
|
||||||
|
with patch("apps.rules.views.reapply_rules_for_user.delay") as mock_delay:
|
||||||
|
response = client.post(reverse("rules:reapply_rule", args=[rule.pk]))
|
||||||
|
|
||||||
|
assert response.status_code == 302
|
||||||
|
mock_delay.assert_called_once_with(rule.pk)
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.django_db
|
@pytest.mark.django_db
|
||||||
def test_reapply_skips_already_read_articles(alice, feed):
|
def test_reapply_skips_already_read_articles(alice, feed):
|
||||||
article = Article.objects.create(feed=feed, guid="guid-1", title="Python 4 released")
|
article = Article.objects.create(feed=feed, guid="guid-1", title="Python 4 released")
|
||||||
@@ -160,3 +191,74 @@ def test_reapply_respects_feed_scope(alice):
|
|||||||
|
|
||||||
assert is_starred(alice, article_a) is True
|
assert is_starred(alice, article_a) is True
|
||||||
assert not UserArticleState.objects.filter(user=alice, article=article_b).exists()
|
assert not UserArticleState.objects.filter(user=alice, article=article_b).exists()
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.django_db
|
||||||
|
def test_reapply_does_not_apply_a_different_feeds_scoped_rule_to_the_backlog():
|
||||||
|
# Regression test for a bug where re-applying one feed-scoped rule
|
||||||
|
# loaded *every* enabled rule and ran it against the whole backlog
|
||||||
|
# with no scope check — so a same-matching rule scoped to a feed
|
||||||
|
# the user isn't re-applying would still fire on this backlog.
|
||||||
|
feed_a = Feed.objects.create(feed_url="https://a.example.com/feed.xml")
|
||||||
|
feed_b = Feed.objects.create(feed_url="https://b.example.com/feed.xml")
|
||||||
|
alice = User.objects.create_user("alice", password="pw-alice-123")
|
||||||
|
Subscription.objects.create(user=alice, feed=feed_a)
|
||||||
|
Subscription.objects.create(user=alice, feed=feed_b)
|
||||||
|
article_a = Article.objects.create(feed=feed_a, guid="guid-1", title="Python in A")
|
||||||
|
|
||||||
|
triggering_rule = FilterRule.objects.create(
|
||||||
|
user=alice,
|
||||||
|
feed=feed_a,
|
||||||
|
match_field=FilterRule.FIELD_TITLE,
|
||||||
|
match_type=FilterRule.MATCH_CONTAINS,
|
||||||
|
match_value="Python",
|
||||||
|
action=FilterRule.ACTION_STAR,
|
||||||
|
)
|
||||||
|
FilterRule.objects.create(
|
||||||
|
user=alice,
|
||||||
|
feed=feed_b,
|
||||||
|
match_field=FilterRule.FIELD_TITLE,
|
||||||
|
match_type=FilterRule.MATCH_CONTAINS,
|
||||||
|
match_value="Python",
|
||||||
|
action=FilterRule.ACTION_TAG,
|
||||||
|
action_value="feed-b-only",
|
||||||
|
)
|
||||||
|
|
||||||
|
reapply_rules_for_user_backlog(triggering_rule.pk)
|
||||||
|
|
||||||
|
assert is_starred(alice, article_a) is True
|
||||||
|
assert not Tag.objects.filter(user=alice, name="feed-b-only").exists()
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.django_db
|
||||||
|
def test_reapply_applies_a_tag_scoped_rule_only_to_that_tags_feeds():
|
||||||
|
feed_a = Feed.objects.create(feed_url="https://a.example.com/feed.xml")
|
||||||
|
feed_b = Feed.objects.create(feed_url="https://b.example.com/feed.xml")
|
||||||
|
alice = User.objects.create_user("alice", password="pw-alice-123")
|
||||||
|
sub_a = Subscription.objects.create(user=alice, feed=feed_a)
|
||||||
|
Subscription.objects.create(user=alice, feed=feed_b)
|
||||||
|
tag = Tag.objects.create(user=alice, name="work")
|
||||||
|
SubscriptionTag.objects.create(user=alice, subscription=sub_a, tag=tag)
|
||||||
|
article_a = Article.objects.create(feed=feed_a, guid="guid-1", title="Python in A")
|
||||||
|
article_b = Article.objects.create(feed=feed_b, guid="guid-2", title="Python in B")
|
||||||
|
|
||||||
|
unscoped_trigger = FilterRule.objects.create(
|
||||||
|
user=alice,
|
||||||
|
match_field=FilterRule.FIELD_TITLE,
|
||||||
|
match_type=FilterRule.MATCH_CONTAINS,
|
||||||
|
match_value="unrelated-trigger-value",
|
||||||
|
action=FilterRule.ACTION_MARK_READ,
|
||||||
|
)
|
||||||
|
FilterRule.objects.create(
|
||||||
|
user=alice,
|
||||||
|
tag=tag,
|
||||||
|
match_field=FilterRule.FIELD_TITLE,
|
||||||
|
match_type=FilterRule.MATCH_CONTAINS,
|
||||||
|
match_value="Python",
|
||||||
|
action=FilterRule.ACTION_STAR,
|
||||||
|
)
|
||||||
|
|
||||||
|
reapply_rules_for_user_backlog(unscoped_trigger.pk)
|
||||||
|
|
||||||
|
assert is_starred(alice, article_a) is True
|
||||||
|
assert is_starred(alice, article_b) is False
|
||||||
+6
-5
@@ -5,7 +5,7 @@ from django.views.decorators.http import require_POST
|
|||||||
|
|
||||||
from .forms import FilterRuleForm
|
from .forms import FilterRuleForm
|
||||||
from .models import FilterRule
|
from .models import FilterRule
|
||||||
from .tasks import reapply_rules_for_user_backlog
|
from .tasks import reapply_rules_for_user
|
||||||
|
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
@@ -48,8 +48,9 @@ def delete_rule(request, rule_id):
|
|||||||
@require_POST
|
@require_POST
|
||||||
def reapply_rule(request, rule_id):
|
def reapply_rule(request, rule_id):
|
||||||
rule = get_object_or_404(FilterRule, user=request.user, pk=rule_id)
|
rule = get_object_or_404(FilterRule, user=request.user, pk=rule_id)
|
||||||
# Run synchronously for immediate feedback, same pattern as add_feed —
|
# Always queued, never run inline from the request/response cycle —
|
||||||
# a Celery worker isn't required for this to work.
|
# a large backlog or a pathological regex could otherwise tie up a
|
||||||
count = reapply_rules_for_user_backlog(rule.pk)
|
# web worker for a long time (see apps.rules.tasks).
|
||||||
messages.success(request, f"Re-applied your rules to {count} unread article(s).")
|
reapply_rules_for_user.delay(rule.pk)
|
||||||
|
messages.success(request, "Re-applying your rules to your unread backlog…")
|
||||||
return redirect("rules:rule_list")
|
return redirect("rules:rule_list")
|
||||||
Reference in new issue
Block a user