Private
Public Access
reapply_rules_for_user_backlog narrowed its *backlog* to the triggering rule's feed/tag scope, but then loaded every enabled rule for the user and ran all of them against that backlog with no per-rule scope check — so re-applying one feed- or tag-scoped rule could also fire an unrelated rule scoped to a different feed/tag, if it happened to match. rule_in_scope() moves the feed/tag scope check into the engine itself (apply_filter_rules_for_feed already computed this per-subscription via query filters; it now just passes the tag ids and lets the engine decide), so backlog re-apply and ingest-time dispatch can't drift into scoping rules differently again. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
50 lines
1.6 KiB
Python
50 lines
1.6 KiB
Python
from celery import shared_task
|
|
|
|
from apps.feeds.models import Subscription
|
|
from apps.rules.engine import evaluate_rules_for_article
|
|
from apps.rules.models import FilterRule
|
|
|
|
from .models import Article, SubscriptionTag
|
|
|
|
|
|
@shared_task
|
|
def apply_filter_rules_for_feed(feed_id: int, article_ids: list[int]):
|
|
"""For every subscriber of ``feed_id``, evaluate their enabled
|
|
FilterRules (scoped to this feed/tag or unscoped) against the given
|
|
articles. Dispatched by the fetch pipeline after new/updated articles
|
|
are committed for a feed.
|
|
|
|
Per-rule scoping is left to evaluate_rules_for_article/rule_in_scope
|
|
rather than filtered into this query, so this and the backlog
|
|
re-apply task (apps.rules.tasks) can't scope rules differently.
|
|
"""
|
|
if not article_ids:
|
|
return 0
|
|
|
|
articles = list(Article.objects.filter(pk__in=article_ids).select_related("feed"))
|
|
if not articles:
|
|
return 0
|
|
|
|
subscriptions = Subscription.objects.filter(feed_id=feed_id).select_related("user")
|
|
|
|
evaluated = 0
|
|
for subscription in subscriptions:
|
|
rules = list(
|
|
FilterRule.objects.filter(user=subscription.user, is_enabled=True).order_by(
|
|
"priority", "id"
|
|
)
|
|
)
|
|
if not rules:
|
|
continue
|
|
subscription_tag_ids = set(
|
|
SubscriptionTag.objects.filter(
|
|
user=subscription.user, subscription=subscription
|
|
).values_list("tag_id", flat=True)
|
|
)
|
|
|
|
for article in articles:
|
|
evaluate_rules_for_article(subscription.user, article, rules, subscription_tag_ids)
|
|
evaluated += 1
|
|
|
|
return evaluated
|