:hedgehog: PostHog is the leading platform for building self-driving products. Our developer tools – AI observability, analytics, session replay, flags, experiments, error tracking, logs, and more – capture all the context agents need to diagnose problems, uncover opportunities, and ship fixes. Steer it all from Slack, web, desktop, or the MCP.
Python ab-testingai-analyticsanalyticscdpdata-warehouseexperimentsfeature-flagsjavascriptproduct-analyticspythonreactsession-replaysurveystypescriptweb-analytics
chore(subscriptions): move the subscription models into the product (#116889)
Thomas Obermüllerfe45977ac013
diff --git a/.agents/skills/developing-subscriptions/SKILL.md b/.agents/skills/developing-subscriptions/SKILL.mdindex 661a7365200e..11c44b426202 100644--- a/.agents/skills/developing-subscriptions/SKILL.md+++ b/.agents/skills/developing-subscriptions/SKILL.md@@ -113,7 +113,7 @@ Use a mock destination or test transport for external delivery checks.| Concern | Start here || --------------------------------------------------- | ----------------------------------------------------------- || API, serializers, validation, delivery history | `products/subscriptions/backend/presentation/views.py` |-| Subscription and delivery models | `products/exports/backend/models/subscription.py` |+| Subscription and delivery models | `products/subscriptions/backend/models/` || Delivery workflows and activities | `products/subscriptions/backend/temporal/` || Destination delivery and automatic disable behavior | `products/subscriptions/backend/logic/` || What core and other products may import | `products/subscriptions/backend/facade/` |diff --git a/ee/tasks/test/test_slack.py b/ee/tasks/test/test_slack.pyindex 5d82cf5e77b5..8970e053d2a5 100644--- a/ee/tasks/test/test_slack.py+++ b/ee/tasks/test/test_slack.py@@ -7,7 +7,6 @@ from posthog.models.integration import Integrationfrom posthog.models.sharing_configuration import SharingConfigurationfrom products.dashboards.backend.models.dashboard import Dashboard-from products.exports.backend.models.subscription import Subscriptionfrom products.product_analytics.backend.facade.models import Insightfrom products.subscriptions.backend.facade.contracts import SharedInsightImage@@ -41,7 +40,6 @@ def create_mock_unfurl_event(team_id: str, links: list[str]):@patch("ee.tasks.slack.SlackIntegration")@time_machine.travel("2022-01-01T12:00:00.000Z", tick=False)class TestSlackSubscriptionsTasks(APIBaseTest):- subscription: Subscriptiondashboard: Dashboardinsight: Insightintegration: Integrationdiff --git a/posthog/api/test/test_sharing.py b/posthog/api/test/test_sharing.pyindex 6723da189c1b..ffbbf3a69fc0 100644--- a/posthog/api/test/test_sharing.py+++ b/posthog/api/test/test_sharing.py@@ -46,9 +46,9 @@ from products.dashboards.backend.models.dashboard_tile import ButtonTile, Dashbofrom products.dashboards.backend.models.dashboard_widget import DashboardWidgetfrom products.data_modeling.backend.facade.models import DataWarehouseSavedQueryfrom products.exports.backend.models.exported_asset import ExportedAsset, get_render_access_token-from products.exports.backend.models.subscription import Subscriptionfrom products.notebooks.backend.models import Notebookfrom products.product_analytics.backend.facade.models import Insight+from products.subscriptions.backend.facade.testing import create_subscriptiondef mock_exporter_template(test_func):@@ -2689,15 +2689,7 @@ class TestSaveTimeAccessBlock(APIBaseTest):if exposure == "shared":SharingConfiguration.objects.create(team=self.team, dashboard=dashboard, enabled=True)elif exposure == "subscription":- Subscription.objects.create(- team=self.team,- dashboard=dashboard,- target_type="email",- target_value="[email protected]",- frequency="daily",- start_date=timezone.now(),- created_by=self.user,- )+ create_subscription(team_id=self.team.id, dashboard_id=dashboard.id)filters = {"properties": [denied_filter]}sent_filters: dict[str, Any] = filtersif target.startswith("grouped"):diff --git a/posthog/api/unsubscribe.py b/posthog/api/unsubscribe.pyindex 82adad63b13e..67913332a810 100644--- a/posthog/api/unsubscribe.py+++ b/posthog/api/unsubscribe.py@@ -2,7 +2,7 @@ from django.http import HttpRequest, JsonResponseimport jwt-from products.exports.backend.models.subscription import unsubscribe_using_token+from products.subscriptions.backend.facade import api as subscriptions_apidef unsubscribe(request: HttpRequest):@@ -11,7 +11,7 @@ def unsubscribe(request: HttpRequest):return JsonResponse({"success": False})try:- unsubscribe_using_token(token)+ subscriptions_api.unsubscribe(token)except jwt.DecodeError:return JsonResponse({"success": False})diff --git a/posthog/models/resource_transfer/test/test_inter_project_transferer.py b/posthog/models/resource_transfer/test/test_inter_project_transferer.pyindex 140544f8e90e..dd17fa58f6b4 100644--- a/posthog/models/resource_transfer/test/test_inter_project_transferer.py+++ b/posthog/models/resource_transfer/test/test_inter_project_transferer.py@@ -21,6 +21,7 @@ from products.dashboards.backend.models.dashboard import Dashboardfrom products.dashboards.backend.models.dashboard_tile import DashboardTile, Textfrom products.dashboards.backend.models.dashboard_widget import DashboardWidgetfrom products.product_analytics.backend.facade.models import Insight+from products.subscriptions.backend.facade.testing import create_subscriptionfrom products.surveys.backend.models import Survey@@ -137,24 +138,14 @@ class TestBuildResourceDuplicationGraph(BaseTest):list(build_resource_duplication_graph(annotation, set()))def test_insight_with_dashboard_export_subscription_does_not_traverse_through_table(self) -> None:- from datetime import datetime- from zoneinfo import ZoneInfo-- from products.exports.backend.models.subscription import Subscription-insight = Insight.objects.create(team=self.team, name="Exported insight")dashboard = Dashboard.objects.create(team=self.team, name="Subscribed dashboard")- subscription = Subscription.objects.create(- team=self.team,+ create_subscription(+ team_id=self.team.id,title="Weekly digest",- dashboard=dashboard,- target_type="email",- target_value="[email protected]",- frequency="weekly",- interval=1,- start_date=datetime(2022, 1, 1, 0, 0, 0, 0, tzinfo=ZoneInfo("UTC")),+ dashboard_id=dashboard.id,+ dashboard_export_insight_ids=[insight.id],)- subscription.dashboard_export_insights.add(insight)graph = list(build_resource_duplication_graph(insight, set()))model_names = {v.model.__name__ for v in graph}diff --git a/posthog/test/repo_invariants/dataclass_frozen_baseline.txt b/posthog/test/repo_invariants/dataclass_frozen_baseline.txtindex d941d7383b5f..e116d6595741 100644--- a/posthog/test/repo_invariants/dataclass_frozen_baseline.txt+++ b/posthog/test/repo_invariants/dataclass_frozen_baseline.txt@@ -117,7 +117,6 @@1 products/experiments/backend/running_time_calculator.py1 products/experiments/stats/frequentist/method.py1 products/experiments/stats/frequentist/tests.py-1 products/exports/backend/models/subscription.py1 products/exports/backend/tasks/csv_exporter.py1 products/feature_flags/backend/flag_status.py1 products/feature_flags/backend/management/commands/audit_flag_filters.py@@ -173,6 +172,7 @@1 products/stamphog/packages/pr-approval-agent/github.py1 products/stamphog/packages/pr-approval-agent/review_pr.py1 products/streamlit_apps/backend/logic/zip_validator.py+1 products/subscriptions/backend/models/subscription.py1 products/subscriptions/backend/temporal/activities.py1 products/surveys/backend/summarization/llm/gemini.py1 products/tasks/backend/logic/services/agent_command.pydiff --git a/posthog/test/repo_invariants/setup_receivers_baseline.txt b/posthog/test/repo_invariants/setup_receivers_baseline.txtindex 9a8a14ecb961..8bdae774b496 100644--- a/posthog/test/repo_invariants/setup_receivers_baseline.txt+++ b/posthog/test/repo_invariants/setup_receivers_baseline.txt@@ -37,7 +37,6 @@ model_activity:products.data_quality.backend.activity_logging.handle_data_qualitmodel_activity:products.data_tools.backend.activity_logging.handle_expression_activitymodel_activity:products.experiments.backend.activity_logging.handle_experiment_changemodel_activity:products.experiments.backend.activity_logging.handle_team_experiments_config_change-model_activity:products.exports.backend.models.subscription.log_subscription_activitymodel_activity:products.feature_flags.backend.activity_logging.handle_feature_flag_changemodel_activity:products.legal_documents.backend.signals.handle_legal_document_changemodel_activity:products.logs.backend.activity_logging.handle_logs_alert_activity@@ -54,6 +53,7 @@ model_activity:products.signals.backend.activity_logging.handle_signal_scout_conmodel_activity:products.signals.backend.activity_logging.handle_signal_team_config_changemodel_activity:products.stamphog.backend.activity_logging.handle_stamphog_repo_config_changemodel_activity:products.streamlit_apps.backend.activity_logging.handle_streamlit_app_change+model_activity:products.subscriptions.backend.models.subscription.log_subscription_activitymodel_activity:products.tracing.backend.activity_logging.handle_traces_retention_rule_activitymodel_activity:products.warehouse_sources.backend.activity_logging.handle_external_data_schema_changemodel_activity:products.warehouse_sources.backend.activity_logging.handle_external_data_source_change@@ -213,7 +213,6 @@ post_save:products.data_warehouse.backend.models.revenue_analytics_config.createpost_save:products.early_access_features.backend.signals.create_waitlist_survey_on_concept_stagepost_save:products.event_definitions.backend.models.event_definition._invalidate_default_event_info_on_savepost_save:products.event_definitions.backend.models.property_definition._invalidate_has_person_email_on_save-post_save:products.exports.backend.models.subscription.subscription_savedpost_save:products.feature_flags.backend.flag_version_sync.bump_dependent_flag_versions_on_flag_definition_changepost_save:products.feature_flags.backend.flag_version_sync.bump_flag_versions_on_cohort_definition_changepost_save:products.feature_flags.backend.flags_cache.cohort_changed_flags_cache@@ -252,6 +251,7 @@ post_save:products.signals.backend.spend_receivers.scout_run_createdpost_save:products.signals.backend.spend_receivers.task_run_createdpost_save:products.slack_app.backend.signals.invalidate_repo_list_on_user_github_changepost_save:products.slack_app.backend.signals.onboard_slack_inbox_on_install+post_save:products.subscriptions.backend.models.subscription.subscription_savedpost_save:products.surveys.backend.models.survey_changedpost_save:products.tasks.backend.models.bump_task_activity_on_runpost_save:products.tasks.backend.models.bump_task_activity_on_thread_messagediff --git a/products/dashboards/backend/api/dashboard.py b/products/dashboards/backend/api/dashboard.pyindex 6c266ca36bb5..e4677c15b86f 100644--- a/products/dashboards/backend/api/dashboard.py+++ b/products/dashboards/backend/api/dashboard.py@@ -180,7 +180,6 @@ from products.dashboards.backend.widget_registry import (validate_widget_config,)from products.dashboards.backend.widget_specs.configs import CONVERSATIONS_RECENT_TICKETS_WIDGET_TYPE-from products.exports.backend.facade.api import dashboard_ids_with_subscriptionsfrom products.mcp_analytics.backend.dashboard_templates import get_mcp_analytics_default_templatefrom products.notifications.backend.facade.api import (NotificationData,@@ -199,6 +198,7 @@ from products.product_analytics.backend.presentation.insight import (InsightViewSet,get_insight_type,)+from products.subscriptions.backend.facade.api import dashboard_ids_with_subscriptionsfrom ee.hogai.utils.aio import async_to_syncdiff --git a/products/exports/backend/admin/__init__.py b/products/exports/backend/admin/__init__.pyindex 18a965d49bb5..b6ac0f1d5c28 100644--- a/products/exports/backend/admin/__init__.py+++ b/products/exports/backend/admin/__init__.py@@ -1 +1 @@-from . import exported_asset_admin, subscription_admin # noqa: F401+from . import exported_asset_admin # noqa: F401diff --git a/products/exports/backend/facade/api.py b/products/exports/backend/facade/api.pyindex 4687d4e80520..322177475d07 100644--- a/products/exports/backend/facade/api.py+++ b/products/exports/backend/facade/api.py@@ -1,7 +1,6 @@"""Public Python interface for creating and retrieving one-off exports."""import io-from collections.abc import Collectionfrom datetime import datetime, timedeltafrom django.conf import settings@@ -30,7 +29,6 @@ from products.exports.backend.models.exported_asset import (save_content as _save_content,save_content_from_file as _save_content_from_file,)-from products.exports.backend.models.subscription import Subscriptionfrom products.exports.backend.tasks.failure_handler import (InvalidExportContext as InvalidExportContext,RetryableExportError as RetryableExportError,@@ -123,42 +121,6 @@ def save_export_asset_content_from_file(_save_content_from_file(asset, file_path, max_database_bytes=max_database_bytes)-def delete_insight_subscriptions(*, project_id: int, insight_ids: Collection[int]) -> None:- # nosemgrep: environment-model-scoped-by-project -- insights are project-level, so deleting one removes its subscriptions in every environment- for subscription in Subscription.objects.filter(team__project_id=project_id, insight_id__in=insight_ids):- subscription.delete()---def insight_ids_with_subscriptions(insight_ids: Collection[int]) -> set[int]:- """Which of the given insights have a subscription that has not been deleted.-- Paused subscriptions (enabled=False) count: disabling delivery does not withdraw the intent- to deliver this insight again.- """- # Caller-supplied ids that are already team-scoped by the caller's own query; this only maps- # ids to ids and returns no row data.- # nosemgrep: idor-lookup-without-team- return set(- Subscription.objects.filter(insight_id__in=insight_ids, deleted=False).values_list("insight_id", flat=True)- )---def dashboard_ids_with_subscriptions(dashboard_ids: Collection[int]) -> set[int]:- """Which of the given dashboards have a subscription that has not been deleted.-- Paused subscriptions (enabled=False) count: disabling delivery does not withdraw the intent- to deliver this dashboard again.- """- # Caller-supplied ids that are already team-scoped by the caller's own query; this only maps- # ids to ids and returns no row data.- # nosemgrep: idor-lookup-without-team- return set(- Subscription.objects.filter(dashboard_id__in=dashboard_ids, deleted=False).values_list(- "dashboard_id", flat=True- )- )--# The limit contexts an export writer can pin, keyed by the string it stores in export_context.# The API rejects this key from clients, so only PostHog's own writers reach this map._PINNABLE_EXPORT_LIMIT_CONTEXTS = {"posthog_ai": LimitContext.POSTHOG_AI}diff --git a/products/exports/backend/migrations/0016_move_subscription_models.py b/products/exports/backend/migrations/0016_move_subscription_models.pynew file mode 100644index 000000000000..6520b624ace3--- /dev/null+++ b/products/exports/backend/migrations/0016_move_subscription_models.py@@ -0,0 +1,109 @@+# Generated by Django 5.2.18 on 2026-10-14 09:48++from django.db import migrations++MODELS_TO_MOVE = ("subscription", "subscriptiondelivery", "subscriptioncontext")+++def _move_content_types(apps, schema_editor, from_label, to_label):+ """Move ContentTypes between apps, handling duplicates idempotently."""+ db_alias = schema_editor.connection.alias+ ContentType = apps.get_model("contenttypes", "ContentType")++ for model_name in MODELS_TO_MOVE:+ source = ContentType.objects.using(db_alias).filter(app_label=from_label, model=model_name).first()+ target = ContentType.objects.using(db_alias).filter(app_label=to_label, model=model_name).first()+ if source is None:+ continue+ if target is not None:+ # A post_migrate run created the target with its own default permissions, so moving the+ # source's permissions onto it would break the (content_type, codename) unique key. Keep+ # the source, which existing admin log entries and permission grants point at, and drop+ # the duplicate together with its permissions.+ target.delete(using=db_alias)+ source.app_label = to_label+ source.save(using=db_alias)+++def update_content_types(apps, schema_editor):+ _move_content_types(apps, schema_editor, "exports", "subscriptions")+++def reverse_content_types(apps, schema_editor):+ _move_content_types(apps, schema_editor, "subscriptions", "exports")+++class Migration(migrations.Migration):+ dependencies = [+ ("exports", "0015_exportedasset_session_index"),+ ("pulse", "0003_alter_resourcelink_subscription"),+ ("subscriptions", "0001_move_subscription_models"),+ ]++ # The subscription tables stay. subscriptions/0001 already records them under the+ # subscriptions app, so this migration only removes them from the exports state.+ operations = [+ migrations.SeparateDatabaseAndState(+ state_operations=[+ migrations.RemoveField(+ model_name="subscription",+ name="created_by",+ ),+ migrations.RemoveField(+ model_name="subscription",+ name="dashboard",+ ),+ migrations.RemoveField(+ model_name="subscription",+ name="dashboard_export_insights",+ ),+ migrations.RemoveField(+ model_name="subscription",+ name="insight",+ ),+ migrations.RemoveField(+ model_name="subscription",+ name="integration",+ ),+ migrations.RemoveField(+ model_name="subscription",+ name="team",+ ),+ migrations.RemoveField(+ model_name="subscriptiondelivery",+ name="subscription",+ ),+ migrations.RemoveField(+ model_name="subscriptioncontext",+ name="subscription",+ ),+ migrations.RemoveField(+ model_name="subscriptioncontext",+ name="dashboard",+ ),+ migrations.RemoveField(+ model_name="subscriptioncontext",+ name="insight",+ ),+ migrations.RemoveField(+ model_name="subscriptioncontext",+ name="team",+ ),+ migrations.RemoveField(+ model_name="subscriptiondelivery",+ name="team",+ ),+ migrations.DeleteModel(+ name="Subscription",+ ),+ migrations.DeleteModel(+ name="SubscriptionContext",+ ),+ migrations.DeleteModel(+ name="SubscriptionDelivery",+ ),+ ],+ database_operations=[],+ ),+ migrations.RunPython(update_content_types, reverse_content_types),+ ]diff --git a/products/exports/backend/migrations/max_migration.txt b/products/exports/backend/migrations/max_migration.txtindex db7f4c4f0c1b..bef6425d6e18 100644--- a/products/exports/backend/migrations/max_migration.txt+++ b/products/exports/backend/migrations/max_migration.txt@@ -1 +1 @@-0015_exportedasset_session_index+0016_move_subscription_modelsdiff --git a/products/exports/backend/models/__init__.py b/products/exports/backend/models/__init__.pyindex 6f1bcccd06fc..ff2720890149 100644--- a/products/exports/backend/models/__init__.py+++ b/products/exports/backend/models/__init__.py@@ -1,10 +1,5 @@from .exported_asset import ExportedAsset-from .subscription import Subscription, SubscriptionDelivery-from .subscription_context import SubscriptionContext__all__ = ["ExportedAsset",- "Subscription",- "SubscriptionContext",- "SubscriptionDelivery",]diff --git a/products/feature_flags/backend/management/commands/delete_feature_flag_usage_insights.py b/products/feature_flags/backend/management/commands/delete_feature_flag_usage_insights.pyindex a4613a00ce2f..34cbfb0f23f7 100644--- a/products/feature_flags/backend/management/commands/delete_feature_flag_usage_insights.py+++ b/products/feature_flags/backend/management/commands/delete_feature_flag_usage_insights.py@@ -29,13 +29,13 @@ from posthog.utils import friendly_timefrom products.alerts.backend.facade.api import insight_ids_with_alertsfrom products.dashboards.backend.models.dashboard import Dashboardfrom products.dashboards.backend.models.dashboard_tile import DashboardTile-from products.exports.backend.facade.api import dashboard_ids_with_subscriptions, insight_ids_with_subscriptionsfrom products.feature_flags.backend.api.feature_flag import (USAGE_DASHBOARD_DESCRIPTION_PREFIX,USAGE_DASHBOARD_NAME_PREFIX,)from products.feature_flags.backend.models.feature_flag import FeatureFlagfrom products.product_analytics.backend.facade.models import Insight+from products.subscriptions.backend.facade.api import dashboard_ids_with_subscriptions, insight_ids_with_subscriptions# Tags each activity-log entry so a sweep's deletions are distinguishable from a user's._JOB_TYPE = "delete_feature_flag_usage_insights"diff --git a/products/model_crossing_uses_baseline.txt b/products/model_crossing_uses_baseline.txtindex d1779103ecf9..0c6f241cde9b 100644--- a/products/model_crossing_uses_baseline.txt+++ b/products/model_crossing_uses_baseline.txt@@ -527,7 +527,6 @@ product_analytics.Insight ee.hogai.context.entity_search.context in-collection 1product_analytics.Insight ee.hogai.context.entity_search.context instance-many(order_by) 1product_analytics.Insight ee.hogai.tools.upsert_dashboard.tool construct 1product_analytics.Insight exports.ExportedAsset.insight reverse-accessor(exportedasset_set) 1-product_analytics.Insight exports.Subscription.dashboard_export_insights reverse-accessor(subscriptions_dashboard_export) 1product_analytics.Insight posthog.SharingConfiguration.insight reverse-accessor(sharingconfiguration_set) 1product_analytics.Insight posthog.api.cohort instance-many(order_by) 1product_analytics.Insight posthog.api.search in-collection 1@@ -593,6 +592,7 @@ product_analytics.Insight products.subscriptions.backend.presentation.views instproduct_analytics.Insight products.subscriptions.backend.presentation.views instance-many(manager) 2product_analytics.Insight products.subscriptions.backend.temporal.snapshot_activities instance-many(only) 1product_analytics.Insight products.surveys.backend.api.survey instance-single 1+product_analytics.Insight subscriptions.Subscription.dashboard_export_insights reverse-accessor(subscriptions_dashboard_export) 1product_analytics.Insight surveys.Survey.linked_insight reverse-accessor(surveys_linked_insight) 1product_analytics.TrendsDisplay products.product_analytics.backend.facade.queries facade-wiring 1product_analytics.UpgradeQueriesWorkflowInputs products.product_analytics.backend.facade.temporal facade-wiring 1diff --git a/products/product_analytics/AGENTS.md b/products/product_analytics/AGENTS.mdindex 70f1d4b9d8ad..38d427fb43f5 100644--- a/products/product_analytics/AGENTS.md+++ b/products/product_analytics/AGENTS.md@@ -58,7 +58,7 @@ Do not revive independently deleted related resources when adding or changing re### Where to make changes- Read [the insight API](backend/presentation/insight.py) when changing deletion or restore behavior. `InsightSerializer.update` handles single deletion; `InsightViewSet.bulk_delete` bypasses model saves with a queryset update, so it must perform cleanup explicitly.-- Read [the exports facade](../exports/backend/facade/api.py) when changing subscription cleanup. `delete_insight_subscriptions` calls each subscription's `delete()` method so model activity logging runs.+- Read [the subscriptions facade](../subscriptions/backend/facade/api.py) when changing subscription cleanup. `delete_insight_subscriptions` calls each subscription's `delete()` method so model activity logging runs.- Read [the alerts facade](../alerts/backend/facade/api.py) when changing alert cleanup. `delete_insight_alerts` calls each alert's `delete()` method to preserve activity logging; queryset deletion bypasses that override.- Read [the dashboards facade](../dashboards/backend/facade/api.py) when changing tile cleanup or restoration. Use `hide_tiles_for_insights` and `restore_tiles_for_insights` rather than duplicating their rules.- Extend [the existing insight API tests](backend/tests/api/test_insight.py) when changing these behaviors. Cover single and bulk deletion, unrelated resources surviving, and restore behavior.diff --git a/products/product_analytics/backend/presentation/insight.py b/products/product_analytics/backend/presentation/insight.pyindex e74dd203b1af..7b100fd8ce66 100644--- a/products/product_analytics/backend/presentation/insight.py+++ b/products/product_analytics/backend/presentation/insight.py@@ -167,7 +167,6 @@ from products.dashboards.backend.facade.api import (update_insight_dashboard_membership,)from products.dashboards.backend.facade.enums import PrivilegeLevel, RestrictionLevel-from products.exports.backend.facade.api import delete_insight_subscriptionsfrom products.product_analytics.backend.facade.account_filters import plan_test_account_filter_updatefrom products.product_analytics.backend.facade.api import (insight_variables_for_team,@@ -196,6 +195,7 @@ from products.product_analytics.backend.presentation.insight_metadata import ()from products.product_analytics.backend.presentation.insight_write_validation import validate_insight_writefrom products.product_analytics.backend.presentation.query_concurrency import query_concurrency_slots+from products.subscriptions.backend.facade.api import delete_insight_subscriptionsfrom common.hogvm.python.utils import HogVMExceptiondiff --git a/products/product_analytics/backend/tests/api/test_insight.py b/products/product_analytics/backend/tests/api/test_insight.pyindex 975bb7ecb6ec..1e5ba385f6f9 100644--- a/products/product_analytics/backend/tests/api/test_insight.py+++ b/products/product_analytics/backend/tests/api/test_insight.py@@ -72,9 +72,14 @@ from products.alerts.backend.models.alert import AlertConfiguration, AlertSubscrfrom products.dashboards.backend.facade.access import DashboardAccessMethodfrom products.dashboards.backend.models.dashboard import Dashboardfrom products.dashboards.backend.models.dashboard_tile import DashboardTile, Text-from products.exports.backend.models.subscription import Subscription, SubscriptionDeliveryfrom products.product_analytics.backend.facade.models import Insight, InsightVariablefrom products.product_analytics.backend.models.insight import InsightViewed+from products.subscriptions.backend.facade.testing import (+ create_subscription,+ create_subscription_delivery,+ subscription_delivery_exists,+ subscription_is_deleted,+)# What "insight created"/"insight updated" report for a single-event trends query.PAGEVIEW_QUERY_ANALYTICS_PROPERTIES = {@@ -3114,15 +3119,11 @@ class TestInsight(ClickhouseTestMixin, APIBaseTest, QueryMatchingTest):def test_soft_delete_causes_404(self) -> None:insight_id, _ = self.dashboard_api.create_insight({"name": "to be deleted"})self.dashboard_api.get_insight(insight_id=insight_id, expected_status=status.HTTP_200_OK)- subscription = Subscription.objects.create(- team=self.team, insight_id=insight_id, start_date=timezone.now(), frequency="daily"- )- unrelated = Subscription.objects.create(team=self.team, start_date=timezone.now(), frequency="daily")- deleted_subscription = Subscription.objects.create(- team=self.team, insight_id=insight_id, start_date=timezone.now(), frequency="daily", deleted=True- )- delivery = SubscriptionDelivery.objects.create(- team=self.team, subscription=subscription, idempotency_key="insight-delete-test", status="completed"+ subscription_id = create_subscription(team_id=self.team.id, insight_id=insight_id)+ unrelated_id = create_subscription(team_id=self.team.id)+ deleted_subscription_id = create_subscription(team_id=self.team.id, insight_id=insight_id, deleted=True)+ delivery_id = create_subscription_delivery(+ team_id=self.team.id, subscription_id=subscription_id, status="completed")update_response = self.client.patch(f"/api/projects/{self.team.id}/insights/{insight_id}", {"deleted": True})@@ -3130,16 +3131,15 @@ class TestInsight(ClickhouseTestMixin, APIBaseTest, QueryMatchingTest):self.dashboard_api.get_insight(insight_id=insight_id, expected_status=status.HTTP_404_NOT_FOUND)- self.assertFalse(Subscription.objects.filter(pk=subscription.pk).exists())+ self.assertIsNone(subscription_is_deleted(team_id=self.team.id, subscription_id=subscription_id))deletion_log = ActivityLog.objects.get(- team_id=self.team.id, scope="Subscription", item_id=str(subscription.pk), activity="deleted"+ team_id=self.team.id, scope="Subscription", item_id=str(subscription_id), activity="deleted")self.assertEqual(deletion_log.user_id, self.user.id)- unrelated.refresh_from_db()- self.assertFalse(unrelated.deleted)+ self.assertIs(subscription_is_deleted(team_id=self.team.id, subscription_id=unrelated_id), False)- self.assertFalse(Subscription.objects.filter(pk=deleted_subscription.pk).exists())- self.assertFalse(SubscriptionDelivery.objects.filter(pk=delivery.pk).exists())+ self.assertIsNone(subscription_is_deleted(team_id=self.team.id, subscription_id=deleted_subscription_id))+ self.assertFalse(subscription_delivery_exists(team_id=self.team.id, delivery_id=delivery_id))def test_soft_delete_locks_the_insight_before_removing_its_alerts(self) -> None:insight_id, _ = self.dashboard_api.create_insight({"name": "to be deleted"})@@ -3160,9 +3160,7 @@ class TestInsight(ClickhouseTestMixin, APIBaseTest, QueryMatchingTest):def test_soft_delete_can_be_reversed_by_patch(self) -> None:insight_id, _ = self.dashboard_api.create_insight({"name": "an insight"})- subscription = Subscription.objects.create(- team=self.team, insight_id=insight_id, start_date=timezone.now(), frequency="daily"- )+ subscription_id = create_subscription(team_id=self.team.id, insight_id=insight_id)self.client.patch(f"/api/projects/{self.team.id}/insights/{insight_id}",@@ -3206,7 +3204,7 @@ class TestInsight(ClickhouseTestMixin, APIBaseTest, QueryMatchingTest):"type": "Insight",}- self.assertFalse(Subscription.objects.filter(pk=subscription.pk).exists())+ self.assertIsNone(subscription_is_deleted(team_id=self.team.id, subscription_id=subscription_id))def test_soft_delete_cannot_be_reversed_for_another_team(self) -> None:other_team = Team.objects.create(organization=self.organization, name="other team")@@ -4451,10 +4449,8 @@ class TestInsightBulkDelete(ClickhouseTestMixin, APIBaseTest, QueryMatchingTest)insight = self._create_insight()tile = DashboardTile.objects.create(insight=insight, dashboard=dashboard)alert = AlertConfiguration.objects.create(team=self.team, insight=insight, name="alert")- subscription = Subscription.objects.create(- team=self.team, insight_id=insight.id, start_date=timezone.now(), frequency="daily"- )- unrelated = Subscription.objects.create(team=self.team, start_date=timezone.now(), frequency="daily")+ subscription_id = create_subscription(team_id=self.team.id, insight_id=insight.id)+ unrelated_id = create_subscription(team_id=self.team.id)response = self._bulk_delete([insight.id])@@ -4462,13 +4458,12 @@ class TestInsightBulkDelete(ClickhouseTestMixin, APIBaseTest, QueryMatchingTest)self.assertTrue(DashboardTile.objects_including_soft_deleted.get(id=tile.id).deleted)self.assertFalse(AlertConfiguration.objects.filter(id=alert.id).exists())- self.assertFalse(Subscription.objects.filter(pk=subscription.pk).exists())+ self.assertIsNone(subscription_is_deleted(team_id=self.team.id, subscription_id=subscription_id))deletion_log = ActivityLog.objects.get(- team_id=self.team.id, scope="Subscription", item_id=str(subscription.pk), activity="deleted"+ team_id=self.team.id, scope="Subscription", item_id=str(subscription_id), activity="deleted")self.assertEqual(deletion_log.user_id, self.user.id)- unrelated.refresh_from_db()- self.assertFalse(unrelated.deleted)+ self.assertIs(subscription_is_deleted(team_id=self.team.id, subscription_id=unrelated_id), False)def test_bulk_delete_reports_unknown_ids_as_skipped(self) -> None:insight = self._create_insight()diff --git a/products/pulse/backend/generation/persist.py b/products/pulse/backend/generation/persist.pyindex 8e3a7efab241..3fa14a788b3a 100644--- a/products/pulse/backend/generation/persist.py+++ b/products/pulse/backend/generation/persist.py@@ -10,11 +10,11 @@ from products.alerts.backend.models import AlertConfigurationfrom products.annotations.backend.models.annotation import Annotationfrom products.dashboards.backend.models.dashboard import Dashboardfrom products.experiments.backend.models.experiment import Experiment-from products.exports.backend.models.subscription import Subscriptionfrom products.product_analytics.backend.facade.models import Insightfrom products.pulse.backend.generation.schemas import BriefOut, BriefSectionOut, OpportunityOutfrom products.pulse.backend.models import Opportunity, ProductBrief, ResourceLink, build_actionfrom products.pulse.backend.sources.base import EvidenceRef, EvidenceType, SourceItem, build_evidence_index+from products.subscriptions.backend.facade.api import subscription_ids_in_teamlogger = structlog.get_logger(__name__)@@ -107,12 +107,14 @@ def _build_opportunity()-_LinkTarget = Insight | Dashboard | Annotation | Experiment | AlertConfiguration | Subscription+# A subscription resolves to its id, because its model stays behind the subscriptions facade.+_LinkTarget = Insight | Dashboard | Annotation | Experiment | AlertConfiguration | intdef _resolve_link_fks(team_id: int, evidence: list[EvidenceRef]) -> dict[tuple[EvidenceType, str], _LinkTarget]:"""Batch-resolve cited refs, keyed by EvidenceRef.key, to the model instances the ResourceLink- FKs point at. A ref that resolves to nothing is still linked (cached columns only)."""+ FKs point at, or to the id for a subscription. A ref that resolves to nothing is still linked+ (cached columns only)."""by_type: dict[EvidenceType, set[str]] = {}for ref in evidence:by_type.setdefault(ref.type, set()).add(ref.ref)@@ -135,7 +137,6 @@ def _resolve_link_fks(team_id: int, evidence: list[EvidenceRef]) -> dict[tuple[E(EvidenceType.DASHBOARD, Dashboard),(EvidenceType.ANNOTATION, Annotation),(EvidenceType.EXPERIMENT, Experiment),- (EvidenceType.SUBSCRIPTION, Subscription),):refs = by_type.get(evidence_type)if not refs:@@ -146,6 +147,15 @@ def _resolve_link_fks(team_id: int, evidence: list[EvidenceRef]) -> dict[tuple[Elogger.warning("pulse_persist_non_numeric_ref", evidence_type=evidence_type, refs=sorted(non_numeric))for obj in model.objects.filter(team_id=team_id, id__in=numeric_ids):resolved[(evidence_type, str(obj.id))] = obj+ subscription_refs = by_type.get(EvidenceType.SUBSCRIPTION)+ if subscription_refs:+ numeric_ids = [int(r) for r in subscription_refs if r.isdigit()]+ if non_numeric := subscription_refs - {str(i) for i in numeric_ids}:+ logger.warning(+ "pulse_persist_non_numeric_ref", evidence_type=EvidenceType.SUBSCRIPTION, refs=sorted(non_numeric)+ )+ for subscription_id in subscription_ids_in_team(team_id=team_id, subscription_ids=numeric_ids):+ resolved[(EvidenceType.SUBSCRIPTION, str(subscription_id))] = subscription_idreturn resolved@@ -165,7 +175,11 @@ def _build_links(url=ref.url[:_URL_MAX_LENGTH],)if ref.fk_field is not None:- setattr(link, ref.fk_field, resolved_fks.get(ref.key))+ target = resolved_fks.get(ref.key)+ if isinstance(target, int):+ setattr(link, f"{ref.fk_field}_id", target)+ else:+ setattr(link, ref.fk_field, target)links.append(link)return linksdiff --git a/products/pulse/backend/migrations/0003_alter_resourcelink_subscription.py b/products/pulse/backend/migrations/0003_alter_resourcelink_subscription.pynew file mode 100644index 000000000000..611ddbbba5f9--- /dev/null+++ b/products/pulse/backend/migrations/0003_alter_resourcelink_subscription.py@@ -0,0 +1,32 @@+# Generated by Django 5.2.18 on 2026-10-14 09:48++import django.db.models.deletion+from django.db import migrations, models+++class Migration(migrations.Migration):+ dependencies = [+ ("pulse", "0002_resourcelink_alert_resourcelink_subscription_and_more"),+ ("subscriptions", "0001_move_subscription_models"),+ ]++ # The FK column and its constraint already point at posthog_subscription, so only the+ # state changes. A database AlterField would drop and re-add the constraint for nothing.+ operations = [+ migrations.SeparateDatabaseAndState(+ state_operations=[+ migrations.AlterField(+ model_name="resourcelink",+ name="subscription",+ field=models.ForeignKey(+ blank=True,+ null=True,+ on_delete=django.db.models.deletion.SET_NULL,+ related_name="+",+ to="subscriptions.subscription",+ ),+ ),+ ],+ database_operations=[],+ ),+ ]diff --git a/products/pulse/backend/migrations/max_migration.txt b/products/pulse/backend/migrations/max_migration.txtindex 3a9821b7766b..831db4dc08c7 100644--- a/products/pulse/backend/migrations/max_migration.txt+++ b/products/pulse/backend/migrations/max_migration.txt@@ -1 +1 @@-0002_resourcelink_alert_resourcelink_subscription_and_more+0003_alter_resourcelink_subscriptiondiff --git a/products/pulse/backend/models.py b/products/pulse/backend/models.pyindex 0dcdd8504e13..c2f06ab0c1b2 100644--- a/products/pulse/backend/models.py+++ b/products/pulse/backend/models.py@@ -187,7 +187,7 @@ class ResourceLink(PulseModel):"alerts.AlertConfiguration", on_delete=models.SET_NULL, null=True, blank=True, related_name="+")subscription = models.ForeignKey(- "exports.Subscription", on_delete=models.SET_NULL, null=True, blank=True, related_name="+"+ "subscriptions.Subscription", on_delete=models.SET_NULL, null=True, blank=True, related_name="+")resource_type = models.CharField(max_length=20, choices=ResourceType.choices)diff --git a/products/pulse/backend/sources/resource_health.py b/products/pulse/backend/sources/resource_health.pyindex 85227eaf5505..21a1d8713dde 100644--- a/products/pulse/backend/sources/resource_health.py+++ b/products/pulse/backend/sources/resource_health.py@@ -1,7 +1,7 @@from collections.abc import Callablefrom datetime import timedelta-from django.db.models import Count, IntegerField, Max, Value+from django.db.models import IntegerField, Max, Valuefrom django.db.models.functions import Coalesce, Greatestfrom django.utils import timezone@@ -13,12 +13,12 @@ from posthog.schema_enums import AlertStatefrom products.access_control.backend.facade.user_access_control import UserAccessControlfrom products.alerts.backend.models import AlertConfiguration-from products.exports.backend.models.subscription import SubscriptionDeliveryfrom products.product_analytics.backend.facade.models import Insightfrom products.pulse.backend.config import MAX_ITEMS_PER_DETECTOR, STUCK_REFRESH_ATTEMPTSfrom products.pulse.backend.models import BriefConfigfrom products.pulse.backend.sources.base import EvidenceRef, EvidenceType, SourceItem, SourceItemKindfrom products.pulse.backend.urls import insight_url, subscription_url+from products.subscriptions.backend.facade.api import failed_delivery_countslogger = structlog.get_logger(__name__)@@ -114,32 +114,14 @@ class ResourceHealthSource:self, team: Team, lookback_days: int, user_access_control: UserAccessControl) -> list[SourceItem]:since = timezone.now() - timedelta(days=lookback_days)- rows = (- SubscriptionDelivery.objects.filter(- team=team,- status=SubscriptionDelivery.Status.FAILED,- created_at__gte=since,- subscription__deleted=False,- )- .values(- "subscription_id",- "subscription__title",- "subscription__prompt",- )- .annotate(failed_deliveries=Count("id"), last_failed_at=Max("created_at"))- .order_by("-failed_deliveries")[:MAX_ITEMS_PER_DETECTOR]- )+ rows = failed_delivery_counts(team_id=team.id, since=since, limit=MAX_ITEMS_PER_DETECTOR)items: list[SourceItem] = []for row in rows:# Prefer the subscription's own name; fall back to a prompt snippet (AI-prompt subs need# not be titled) before the bare id.- label = (- row["subscription__title"]- or (row["subscription__prompt"] or "").strip()[:60]- or f"Subscription {row['subscription_id']}"- )- count = row["failed_deliveries"]- url = subscription_url(team.id, row["subscription_id"])+ label = row.title or (row.prompt or "").strip()[:60] or f"Subscription {row.subscription_id}"+ count = row.failed_deliveries+ url = subscription_url(team.id, row.subscription_id)items.append(self._health_item(title=f"Subscription '{label}' failed to deliver {count} time{'s' if count != 1 else ''}",@@ -149,12 +131,12 @@ class ResourceHealthSource:"its recipients are not receiving their reports."),ref_type=EvidenceType.SUBSCRIPTION,- ref=str(row["subscription_id"]),+ ref=str(row.subscription_id),label=label,url=url,metrics={"failed_deliveries": count,- "last_failed_at": row["last_failed_at"].isoformat(),+ "last_failed_at": row.last_failed_at.isoformat(),},))diff --git a/products/pulse/backend/test/test_persist.py b/products/pulse/backend/test/test_persist.pyindex 856d2e5689ea..493a69b0dda6 100644--- a/products/pulse/backend/test/test_persist.py+++ b/products/pulse/backend/test/test_persist.py@@ -1,17 +1,12 @@-from datetime import timedelta-from posthog.test.base import BaseTestfrom unittest.mock import MagicMock, patch-from django.utils import timezone-from parameterized import parameterizedfrom posthog.models.scoping import team_scopefrom posthog.schema_enums import AlertStatefrom products.alerts.backend.models import AlertConfiguration-from products.exports.backend.models.subscription import Subscriptionfrom products.product_analytics.backend.facade.models import Insightfrom products.pulse.backend.generation.persist import _fingerprint, persist_brief_outputfrom products.pulse.backend.generation.schemas import BriefOut, BriefSectionOut, OpportunityOut@@ -24,6 +19,7 @@ from products.pulse.backend.models import (ResourceType,)from products.pulse.backend.sources.base import EvidenceRef, EvidenceType, SourceItem, SourceItemKind+from products.subscriptions.backend.facade.testing import create_subscription_EVIDENCE = EvidenceRef(type=EvidenceType.INSIGHT, ref="abc", label="Pageviews", url="/project/1/insights/abc")@@ -209,14 +205,7 @@ class TestPersistBriefOutput(BaseTest):alert = AlertConfiguration.objects.create(team=self.team, insight=insight, name="a", state=AlertState.ERRORED, enabled=True)- subscription = Subscription.objects.create(- team=self.team,- title="s",- target_type="email",- target_value="[email protected]",- frequency="weekly",- start_date=timezone.now() - timedelta(days=1),- )+ subscription_id = create_subscription(team_id=self.team.id, title="s")item = SourceItem(source="resource_health",kind=SourceItemKind.HEALTH,@@ -224,7 +213,7 @@ class TestPersistBriefOutput(BaseTest):description="d",evidence=[EvidenceRef(type=EvidenceType.ALERT, ref=str(alert.id), label="a", url=""),- EvidenceRef(type=EvidenceType.SUBSCRIPTION, ref=str(subscription.id), label="s", url=""),+ EvidenceRef(type=EvidenceType.SUBSCRIPTION, ref=str(subscription_id), label="s", url=""),],fingerprint_hint="alert:x",)@@ -245,4 +234,4 @@ class TestPersistBriefOutput(BaseTest):persist_brief_output(brief=self._brief(), out=out, items=[item])links = {link.resource_type: link for link in self._links()}assert links[ResourceType.ALERT].alert_id == alert.id- assert links[ResourceType.SUBSCRIPTION].subscription_id == subscription.id+ assert links[ResourceType.SUBSCRIPTION].subscription_id == subscription_iddiff --git a/products/pulse/backend/test/test_resource_health_source.py b/products/pulse/backend/test/test_resource_health_source.pyindex 28d870c9a38d..2d49d145e839 100644--- a/products/pulse/backend/test/test_resource_health_source.py+++ b/products/pulse/backend/test/test_resource_health_source.py@@ -1,4 +1,3 @@-import uuidfrom datetime import timedeltafrom typing import Any@@ -18,10 +17,10 @@ from products.access_control.backend.models.access_control import AccessControlfrom products.alerts.backend.models import AlertConfigurationfrom products.dashboards.backend.models.dashboard import Dashboardfrom products.dashboards.backend.models.dashboard_tile import DashboardTile-from products.exports.backend.models.subscription import Subscription, SubscriptionDeliveryfrom products.product_analytics.backend.facade.models import Insightfrom products.pulse.backend.sources.base import EvidenceRef, EvidenceType, SourceItemfrom products.pulse.backend.sources.resource_health import STUCK_REFRESH_ATTEMPTS, ResourceHealthSource+from products.subscriptions.backend.facade.testing import create_subscription, create_subscription_delivery_TRENDS_QUERY = {"kind": "InsightVizNode",@@ -50,34 +49,16 @@ class TestResourceHealthGather(BaseTest):defaults.update(kwargs)return AlertConfiguration.objects.create(**defaults)- def _subscription(self, title: str = "Weekly report", **kwargs: Any) -> Subscription:- defaults: dict[str, Any] = {- "team": self.team,- "title": title,- "target_type": "email",- "target_value": "[email protected]",- "frequency": "weekly",- "start_date": timezone.now() - timedelta(days=30),- }- defaults.update(kwargs)- return Subscription.objects.create(**defaults)-- def _delivery(- self, subscription: Subscription, status: str = SubscriptionDelivery.Status.FAILED, days_ago: float = 1- ) -> SubscriptionDelivery:- delivery = SubscriptionDelivery.objects.create(- subscription=subscription,- team=self.team,- temporal_workflow_id="wf",- idempotency_key=str(uuid.uuid4()),- trigger_type="scheduled",- target_type="email",- target_value="[email protected]",+ def _subscription(self, title: str = "Weekly report", deleted: bool = False) -> int:+ return create_subscription(team_id=self.team.id, title=title, deleted=deleted)++ def _delivery(self, subscription_id: int, status: str = "failed", days_ago: float = 1) -> None:+ create_subscription_delivery(+ team_id=self.team.id,+ subscription_id=subscription_id,status=status,+ created_at=timezone.now() - timedelta(days=days_ago),)- # created_at is auto_now_add — move it explicitly to place the delivery in/out of period- SubscriptionDelivery.objects.filter(id=delivery.id).update(created_at=timezone.now() - timedelta(days=days_ago))- return deliverydef _set_refresh_state(self, insight: Insight, refresh_attempt: int, dashboard_tile: DashboardTile | None = None@@ -88,7 +69,7 @@ class TestResourceHealthGather(BaseTest):def test_healthy_team_yields_no_items(self) -> None:self._alert(state=AlertState.NOT_FIRING)- self._delivery(self._subscription(), status=SubscriptionDelivery.Status.COMPLETED)+ self._delivery(self._subscription(), status="completed")self._set_refresh_state(self._insight(), refresh_attempt=0)assert self._gather() == []@@ -134,10 +115,10 @@ class TestResourceHealthGather(BaseTest):assert self._gather() == []def test_failed_deliveries_grouped_per_subscription(self) -> None:- subscription = self._subscription()- self._delivery(subscription, days_ago=1)- self._delivery(subscription, days_ago=2)- self._delivery(subscription, status=SubscriptionDelivery.Status.COMPLETED, days_ago=1)+ subscription_id = self._subscription()+ self._delivery(subscription_id, days_ago=1)+ self._delivery(subscription_id, days_ago=2)+ self._delivery(subscription_id, status="completed", days_ago=1)items = self._gather()@@ -149,18 +130,18 @@ class TestResourceHealthGather(BaseTest):assert item.evidence == [EvidenceRef(type=EvidenceType.SUBSCRIPTION,- ref=str(subscription.id),+ ref=str(subscription_id),label="Weekly report",- url=f"/project/{self.team.id}/subscriptions/{subscription.id}",+ url=f"/project/{self.team.id}/subscriptions/{subscription_id}",)]- assert item.fingerprint_hint == f"subscription:{subscription.id}"+ assert item.fingerprint_hint == f"subscription:{subscription_id}"@parameterized.expand([- ("out_of_period", SubscriptionDelivery.Status.FAILED, 8.0),- ("completed_in_period", SubscriptionDelivery.Status.COMPLETED, 1.0),- ("skipped_in_period", SubscriptionDelivery.Status.SKIPPED, 1.0),+ ("out_of_period", "failed", 8.0),+ ("completed_in_period", "completed", 1.0),+ ("skipped_in_period", "skipped", 1.0),])def test_non_failing_deliveries_ignored(self, _name: str, status: str, days_ago: float) -> None:@@ -169,10 +150,7 @@ class TestResourceHealthGather(BaseTest):assert self._gather() == []def test_deleted_subscription_failures_ignored(self) -> None:- subscription = self._subscription()- subscription.deleted = True- subscription.save()- self._delivery(subscription)+ self._delivery(self._subscription(deleted=True))assert self._gather() == []diff --git a/products/exports/backend/admin/subscription_admin.py b/products/subscriptions/backend/admin.pysimilarity index 72%rename from products/exports/backend/admin/subscription_admin.pyrename to products/subscriptions/backend/admin.pyindex d075ee3dd811..5104fcdbe0bb 100644--- a/products/exports/backend/admin/subscription_admin.py+++ b/products/subscriptions/backend/admin.py@@ -1,10 +1,11 @@from django.contrib import admin+from django.http import HttpRequestfrom django.urls import reversefrom django.utils.html import format_htmlfrom posthog.admin.paginators.no_count_paginator import NoCountPaginator-from products.exports.backend.models.subscription import Subscription+from products.subscriptions.backend.models.subscription import Subscription@admin.register(Subscription)@@ -30,17 +31,17 @@ class SubscriptionAdmin(admin.ModelAdmin):ordering = ("-id",)exclude = ("dashboard_export_insights",)- def has_add_permission(self, request):+ def has_add_permission(self, request: HttpRequest) -> bool:return False- def has_change_permission(self, request, obj=None):+ def has_change_permission(self, request: HttpRequest, obj: Subscription | None = None) -> bool:return False- def has_delete_permission(self, request, obj=None):+ def has_delete_permission(self, request: HttpRequest, obj: Subscription | None = None) -> bool:return False@admin.display(description="Team")- def team_link(self, subscription: Subscription):+ def team_link(self, subscription: Subscription) -> str:return format_html('<a href="{}">{}</a>',reverse("admin:posthog_team_change", args=[subscription.team_id]),diff --git a/products/subscriptions/backend/facade/api.py b/products/subscriptions/backend/facade/api.pyindex 8ccf4eb4ab5d..d12e647d1dfc 100644--- a/products/subscriptions/backend/facade/api.py+++ b/products/subscriptions/backend/facade/api.py@@ -8,14 +8,17 @@ dataclasses. Never return ORM instances or import DRF.from __future__ import annotations+from collections.abc import Collection+from datetime import datetimefrom typing import TYPE_CHECKING-from products.subscriptions.backend.logic import auto_disable, subscription_utils+from products.subscriptions.backend.logic import auto_disable, queries, subscription_utilsfrom products.subscriptions.backend.logic.subscription_utils import MAX_INSIGHTS as MAX_INSIGHTSfrom products.subscriptions.backend.logic.teams_subscriptions import (TEAMS_WEBHOOK_URL_ERROR as TEAMS_WEBHOOK_URL_ERROR,TEAMS_WEBHOOK_URL_MASKED_ERROR as TEAMS_WEBHOOK_URL_MASKED_ERROR,)+from products.subscriptions.backend.models.subscription import Subscription, unsubscribe_using_tokenfrom products.subscriptions.backend.temporal.ai_subscription import spec_generatorfrom products.subscriptions.backend.temporal.ai_subscription.spec_generator import (PROMPT_MAX_LENGTH as AI_PROMPT_MAX_LENGTH,@@ -46,8 +49,14 @@ __all__ = ["TEAMS_WEBHOOK_URL_ERROR","TEAMS_WEBHOOK_URL_MASKED_ERROR","ai_query_plan_status",+ "dashboard_ids_with_subscriptions",+ "delete_insight_subscriptions",+ "failed_delivery_counts",+ "insight_ids_with_subscriptions","render_shared_insight_image","sanitize_prompt",+ "subscription_ids_in_team",+ "unsubscribe","validate_re_enable",]@@ -70,3 +79,54 @@ def ai_query_plan_status(ai_query_plan: object | None) -> str:def render_shared_insight_image(sharing_configuration: SharingConfiguration) -> contracts.SharedInsightImage | None:"""Render the first insight a share link shows as an image. Returns None when it shows no insight."""return subscription_utils.shared_insight_image(sharing_configuration)+++def unsubscribe(token: str) -> None:+ """Remove the email in an unsubscribe token from its subscription. Raises jwt.DecodeError for a bad token."""+ unsubscribe_using_token(token)+++def failed_delivery_counts(*, team_id: int, since: datetime, limit: int) -> list[contracts.FailedDeliveryCount]:+ """Subscriptions that failed to deliver since `since`, most failures first. Deleted subscriptions are left out."""+ return queries.failed_delivery_counts(team_id=team_id, since=since, limit=limit)+++def subscription_ids_in_team(*, team_id: int, subscription_ids: Collection[int]) -> set[int]:+ """Which of the given subscription ids belong to the team."""+ return queries.subscription_ids_in_team(team_id=team_id, subscription_ids=subscription_ids)+++def delete_insight_subscriptions(*, project_id: int, insight_ids: Collection[int]) -> None:+ # nosemgrep: environment-model-scoped-by-project -- insights are project-level, so deleting one removes its subscriptions in every environment+ for subscription in Subscription.objects.filter(team__project_id=project_id, insight_id__in=insight_ids):+ subscription.delete()+++def insight_ids_with_subscriptions(insight_ids: Collection[int]) -> set[int]:+ """Which of the given insights have a subscription that has not been deleted.++ Paused subscriptions (enabled=False) count: disabling delivery does not withdraw the intent+ to deliver this insight again.+ """+ # Caller-supplied ids that are already team-scoped by the caller's own query; this only maps+ # ids to ids and returns no row data.+ # nosemgrep: idor-lookup-without-team+ return set(+ Subscription.objects.filter(insight_id__in=insight_ids, deleted=False).values_list("insight_id", flat=True)+ )+++def dashboard_ids_with_subscriptions(dashboard_ids: Collection[int]) -> set[int]:+ """Which of the given dashboards have a subscription that has not been deleted.++ Paused subscriptions (enabled=False) count: disabling delivery does not withdraw the intent+ to deliver this dashboard again.+ """+ # Caller-supplied ids that are already team-scoped by the caller's own query; this only maps+ # ids to ids and returns no row data.+ # nosemgrep: idor-lookup-without-team+ return set(+ Subscription.objects.filter(dashboard_id__in=dashboard_ids, deleted=False).values_list(+ "dashboard_id", flat=True+ )+ )diff --git a/products/subscriptions/backend/facade/contracts.py b/products/subscriptions/backend/facade/contracts.pyindex f2f9a7c12225..7661a0256716 100644--- a/products/subscriptions/backend/facade/contracts.py+++ b/products/subscriptions/backend/facade/contracts.py@@ -7,6 +7,7 @@ No Django imports. Used by the facade as inputs and outputs.import typingimport dataclasses+from datetime import datetimeclass SubscriptionTriggerType:@@ -48,3 +49,14 @@ class SharedInsightImage:title: str | Noneimage_url: stralt_text: str | None++[email protected](frozen=True)+class FailedDeliveryCount:+ """How often one subscription failed to deliver in a period."""++ subscription_id: int+ title: str | None+ prompt: str | None+ failed_deliveries: int+ last_failed_at: datetimediff --git a/products/subscriptions/backend/facade/testing.py b/products/subscriptions/backend/facade/testing.pyindex b8992c2d629d..7c037e079885 100644--- a/products/subscriptions/backend/facade/testing.py+++ b/products/subscriptions/backend/facade/testing.py@@ -4,29 +4,80 @@ Suites outside this product plant subscription rows and read fixture constants tinstead of importing the models or the product's own test helpers."""+import uuid+from collections.abc import Collectionfrom datetime import UTC, datetime-from products.exports.backend.models.subscription import Subscription+from products.subscriptions.backend.models.subscription import Subscription, SubscriptionDeliveryfrom products.subscriptions.backend.temporal.ai_subscription.spec_generator import (AI_QUERY_PLAN_VERSION as AI_QUERY_PLAN_VERSION,)-__all__ = ["AI_QUERY_PLAN_VERSION", "create_subscription"]+__all__ = [+ "AI_QUERY_PLAN_VERSION",+ "create_subscription",+ "create_subscription_delivery",+ "subscription_delivery_exists",+ "subscription_is_deleted",+]def create_subscription(- *, team_id: int, insight_id: int | None = None, dashboard_id: int | None = None, enabled: bool = True+ *,+ team_id: int,+ insight_id: int | None = None,+ dashboard_id: int | None = None,+ title: str | None = None,+ enabled: bool = True,+ deleted: bool = False,+ dashboard_export_insight_ids: Collection[int] = (),) -> int:"""Create a daily email subscription to an insight or a dashboard, and return its id."""subscription = Subscription.objects.create(team_id=team_id,insight_id=insight_id,dashboard_id=dashboard_id,+ title=title,enabled=enabled,+ deleted=deleted,target_type=Subscription.SubscriptionTarget.EMAIL,target_value="[email protected],[email protected]",frequency=Subscription.SubscriptionFrequency.DAILY,interval=1,start_date=datetime(2022, 1, 1, 9, 0, tzinfo=UTC),)+ if dashboard_export_insight_ids:+ subscription.dashboard_export_insights.add(*dashboard_export_insight_ids)return subscription.id+++def create_subscription_delivery(+ *, team_id: int, subscription_id: int, status: str, created_at: datetime | None = None+) -> uuid.UUID:+ """Record a delivery attempt for a subscription, and return its id.++ `status` is a delivery status value such as "failed" or "completed". `created_at` backdates the+ record, which the model otherwise stamps with the current time.+ """+ delivery = SubscriptionDelivery.objects.create(+ team_id=team_id,+ subscription_id=subscription_id,+ temporal_workflow_id="test-workflow",+ idempotency_key=str(uuid.uuid4()),+ trigger_type="scheduled",+ target_type=Subscription.SubscriptionTarget.EMAIL,+ target_value="[email protected]",+ status=status,+ )+ if created_at is not None:+ SubscriptionDelivery.objects.filter(team_id=team_id, id=delivery.id).update(created_at=created_at)+ return delivery.id+++def subscription_is_deleted(*, team_id: int, subscription_id: int) -> bool | None:+ """The subscription's soft-delete flag, or None when the row no longer exists."""+ return Subscription.objects.filter(team_id=team_id, id=subscription_id).values_list("deleted", flat=True).first()+++def subscription_delivery_exists(*, team_id: int, delivery_id: uuid.UUID) -> bool:+ return SubscriptionDelivery.objects.filter(team_id=team_id, id=delivery_id).exists()diff --git a/products/subscriptions/backend/logic/__init__.py b/products/subscriptions/backend/logic/__init__.pyindex 428e7314a6cf..532d7dce1656 100644--- a/products/subscriptions/backend/logic/__init__.py+++ b/products/subscriptions/backend/logic/__init__.py@@ -7,7 +7,7 @@ import posthoganalyticsfrom temporalio import activity, workflowfrom temporalio.common import MetricCounter, MetricMeter-from products.exports.backend.models.subscription import Subscription+from products.subscriptions.backend.models.subscription import Subscriptionif TYPE_CHECKING:from products.subscriptions.backend.temporal.types import NoExportableInsightsContextdiff --git a/products/subscriptions/backend/logic/auto_disable.py b/products/subscriptions/backend/logic/auto_disable.pyindex 32be781a2493..c03b03745f52 100644--- a/products/subscriptions/backend/logic/auto_disable.py+++ b/products/subscriptions/backend/logic/auto_disable.py@@ -8,7 +8,6 @@ from posthog.email import EmailMessagefrom posthog.exceptions_capture import capture_exceptionfrom posthog.models import User-from products.exports.backend.models.subscription import Subscriptionfrom products.notifications.backend.facade.api import (NotificationData,NotificationType,@@ -18,6 +17,7 @@ from products.notifications.backend.facade.api import ()from products.notifications.backend.facade.enums import NotificationOnlyResourceTypefrom products.subscriptions.backend.logic import SUPPORTED_TARGET_TYPES+from products.subscriptions.backend.models.subscription import Subscriptionclass DisableReason(NamedTuple):diff --git a/products/subscriptions/backend/logic/email_subscriptions.py b/products/subscriptions/backend/logic/email_subscriptions.pyindex bab7d8882fdf..ab576d11dc3b 100644--- a/products/subscriptions/backend/logic/email_subscriptions.py+++ b/products/subscriptions/backend/logic/email_subscriptions.py@@ -7,7 +7,6 @@ from posthog.email import EmailMessage, raise_if_delivery_rejectedfrom posthog.utils import absolute_urifrom products.exports.backend.models.exported_asset import ExportedAsset-from products.exports.backend.models.subscription import Subscription, get_unsubscribe_tokenfrom products.subscriptions.backend.logic.subscription_utils import (MAX_INSIGHTS,UTM_TAGS_BASE,@@ -15,6 +14,7 @@ from products.subscriptions.backend.logic.subscription_utils import (failed_asset_details,next_delivery_date_display,)+from products.subscriptions.backend.models.subscription import Subscription, get_unsubscribe_tokenlogger = structlog.get_logger(__name__)diff --git a/products/subscriptions/backend/logic/failure_notifications.py b/products/subscriptions/backend/logic/failure_notifications.pyindex 95af1432933b..6859c79c456e 100644--- a/products/subscriptions/backend/logic/failure_notifications.py+++ b/products/subscriptions/backend/logic/failure_notifications.py@@ -6,7 +6,6 @@ from django.utils.formats import date_formatfrom posthog.email import EmailMessagefrom posthog.models import User-from products.exports.backend.models.subscription import Subscriptionfrom products.notifications.backend.facade.api import (NotificationData,NotificationType,@@ -16,6 +15,7 @@ from products.notifications.backend.facade.api import (has_been_dispatched,)from products.notifications.backend.facade.enums import NotificationOnlyResourceType+from products.subscriptions.backend.models.subscription import Subscriptiondef _get_notification_creator(subscription: Subscription) -> User | None:diff --git a/products/subscriptions/backend/logic/queries.py b/products/subscriptions/backend/logic/queries.pynew file mode 100644index 000000000000..ba999886e2ef--- /dev/null+++ b/products/subscriptions/backend/logic/queries.py@@ -0,0 +1,35 @@+from collections.abc import Collection+from datetime import datetime++from django.db.models import Count, Max++from products.subscriptions.backend.facade.contracts import FailedDeliveryCount+from products.subscriptions.backend.models.subscription import Subscription, SubscriptionDelivery+++def failed_delivery_counts(*, team_id: int, since: datetime, limit: int) -> list[FailedDeliveryCount]:+ rows = (+ SubscriptionDelivery.objects.filter(+ team_id=team_id,+ status=SubscriptionDelivery.Status.FAILED,+ created_at__gte=since,+ subscription__deleted=False,+ )+ .values("subscription_id", "subscription__title", "subscription__prompt")+ .annotate(failed_deliveries=Count("id"), last_failed_at=Max("created_at"))+ .order_by("-failed_deliveries")[:limit]+ )+ return [+ FailedDeliveryCount(+ subscription_id=row["subscription_id"],+ title=row["subscription__title"],+ prompt=row["subscription__prompt"],+ failed_deliveries=row["failed_deliveries"],+ last_failed_at=row["last_failed_at"],+ )+ for row in rows+ ]+++def subscription_ids_in_team(*, team_id: int, subscription_ids: Collection[int]) -> set[int]:+ return set(Subscription.objects.filter(team_id=team_id, id__in=subscription_ids).values_list("id", flat=True))diff --git a/products/subscriptions/backend/logic/slack_subscriptions.py b/products/subscriptions/backend/logic/slack_subscriptions.pyindex 52b8957c0f24..8064a877fbba 100644--- a/products/subscriptions/backend/logic/slack_subscriptions.py+++ b/products/subscriptions/backend/logic/slack_subscriptions.py@@ -18,7 +18,6 @@ from posthog.sync import database_sync_to_asyncfrom posthog.utils import absolute_urifrom products.exports.backend.models.exported_asset import ExportedAsset-from products.exports.backend.models.subscription import Subscription, SubscriptionResourcefrom products.slack_app.backend.facade.api import slack_followup_invite, slack_followup_invite_textfrom products.subscriptions.backend.logic.subscription_utils import (DEBUG_PLACEHOLDER_IMAGE_URL,@@ -29,6 +28,7 @@ from products.subscriptions.backend.logic.subscription_utils import (subscription_support_url,summary_skipped_over_budget_message,)+from products.subscriptions.backend.models.subscription import Subscription, SubscriptionResourcelogger = structlog.get_logger(__name__)diff --git a/products/subscriptions/backend/logic/subscription_utils.py b/products/subscriptions/backend/logic/subscription_utils.pyindex 0e44cc599709..bb39b9bc72ef 100644--- a/products/subscriptions/backend/logic/subscription_utils.py+++ b/products/subscriptions/backend/logic/subscription_utils.py@@ -13,9 +13,9 @@ from posthog.tasks import exporterfrom posthog.utils import wait_for_parallel_celery_groupfrom products.exports.backend.models.exported_asset import ExportedAsset-from products.exports.backend.models.subscription import Subscriptionfrom products.product_analytics.backend.facade.models import Insightfrom products.subscriptions.backend.facade.contracts import SharedInsightImage+from products.subscriptions.backend.models.subscription import Subscriptionlogger = structlog.get_logger(__name__)diff --git a/products/subscriptions/backend/logic/teams_subscriptions.py b/products/subscriptions/backend/logic/teams_subscriptions.pyindex 04b8d9ba0c3c..69511dcc9574 100644--- a/products/subscriptions/backend/logic/teams_subscriptions.py+++ b/products/subscriptions/backend/logic/teams_subscriptions.py@@ -6,7 +6,6 @@ from posthog.helpers.markdown_safety import strip_external_links_markdownfrom posthog.utils import absolute_urifrom products.exports.backend.models.exported_asset import ExportedAsset-from products.exports.backend.models.subscription import Subscriptionfrom products.subscriptions.backend.logic.subscription_utils import (DEBUG_PLACEHOLDER_IMAGE_URL,TRUNCATION_MARKER,@@ -17,6 +16,7 @@ from products.subscriptions.backend.logic.subscription_utils import (subscription_support_url,summary_skipped_over_budget_message,)+from products.subscriptions.backend.models.subscription import SubscriptionTEAMS_UTM_TAGS = f"{UTM_TAGS_BASE}&utm_medium=teams"diff --git a/products/subscriptions/backend/migrations/0001_move_subscription_models.py b/products/subscriptions/backend/migrations/0001_move_subscription_models.pynew file mode 100644index 000000000000..a0a694eefa68--- /dev/null+++ b/products/subscriptions/backend/migrations/0001_move_subscription_models.py@@ -0,0 +1,343 @@+# Generated by Django 5.2.18 on 2026-10-14 09:48++import django.db.models.deletion+import django.contrib.postgres.fields+from django.conf import settings+from django.db import migrations, models++import posthog.uuidt+++class Migration(migrations.Migration):+ initial = True++ dependencies = [+ ("exports", "0015_exportedasset_session_index"),+ ("dashboards", "0026_dashboardtile_group_key_badge"),+ ("posthog", "1397_uploaded_media_dimensions_and_archive"),+ ("product_analytics", "0011_insight_viewed_context_fields"),+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),+ ]++ # The tables already exist: exports created them, and exports/0016 removes them from its+ # state. This migration only records them under the subscriptions app.+ operations = [+ migrations.SeparateDatabaseAndState(+ state_operations=[+ migrations.CreateModel(+ name="Subscription",+ fields=[+ (+ "id",+ models.AutoField(+ auto_created=True,+ primary_key=True,+ serialize=False,+ verbose_name="ID",+ ),+ ),+ ("prompt", models.TextField(blank=True, null=True)),+ (+ "ai_query_plan",+ models.JSONField(blank=True, default=None, null=True),+ ),+ ("ai_prompt_config", models.JSONField(blank=True, default=dict)),+ ("title", models.CharField(blank=True, max_length=100, null=True)),+ (+ "target_type",+ models.CharField(+ choices=[+ ("email", "Email"),+ ("slack", "Slack"),+ ("teams", "Microsoft Teams"),+ ],+ max_length=10,+ ),+ ),+ ("target_value", models.TextField()),+ (+ "frequency",+ models.CharField(+ choices=[+ ("daily", "Daily"),+ ("weekly", "Weekly"),+ ("monthly", "Monthly"),+ ("yearly", "Yearly"),+ ],+ max_length=10,+ ),+ ),+ ("interval", models.IntegerField(default=1)),+ ("count", models.IntegerField(null=True)),+ (+ "byweekday",+ django.contrib.postgres.fields.ArrayField(+ base_field=models.CharField(+ choices=[+ ("monday", "Monday"),+ ("tuesday", "Tuesday"),+ ("wednesday", "Wednesday"),+ ("thursday", "Thursday"),+ ("friday", "Friday"),+ ("saturday", "Saturday"),+ ("sunday", "Sunday"),+ ],+ max_length=10,+ ),+ blank=True,+ default=None,+ null=True,+ size=None,+ ),+ ),+ ("bysetpos", models.IntegerField(null=True)),+ ("start_date", models.DateTimeField()),+ ("until_date", models.DateTimeField(blank=True, null=True)),+ ("next_delivery_date", models.DateTimeField(blank=True, null=True)),+ ("created_at", models.DateTimeField(auto_now_add=True)),+ ("deleted", models.BooleanField(default=False)),+ ("enabled", models.BooleanField(default=True)),+ ("summary_enabled", models.BooleanField(default=False)),+ (+ "summary_prompt_guide",+ models.CharField(blank=True, default="", max_length=500),+ ),+ ("delivery_config", models.JSONField(default=dict)),+ (+ "created_by",+ models.ForeignKey(+ blank=True,+ null=True,+ on_delete=django.db.models.deletion.SET_NULL,+ related_name="+",+ to=settings.AUTH_USER_MODEL,+ ),+ ),+ (+ "dashboard",+ models.ForeignKey(+ null=True,+ on_delete=django.db.models.deletion.CASCADE,+ related_name="+",+ to="dashboards.dashboard",+ ),+ ),+ (+ "dashboard_export_insights",+ models.ManyToManyField(+ blank=True,+ related_name="subscriptions_dashboard_export",+ to="product_analytics.insight",+ ),+ ),+ (+ "insight",+ models.ForeignKey(+ null=True,+ on_delete=django.db.models.deletion.CASCADE,+ related_name="+",+ to="product_analytics.insight",+ ),+ ),+ (+ "integration",+ models.ForeignKey(+ blank=True,+ db_index=False,+ null=True,+ on_delete=django.db.models.deletion.SET_NULL,+ related_name="+",+ to="posthog.integration",+ ),+ ),+ (+ "team",+ models.ForeignKey(+ on_delete=django.db.models.deletion.CASCADE,+ related_name="+",+ to="posthog.team",+ ),+ ),+ ],+ options={+ "db_table": "posthog_subscription",+ },+ ),+ migrations.CreateModel(+ name="SubscriptionContext",+ fields=[+ (+ "id",+ models.UUIDField(+ default=posthog.uuidt.uuid7,+ editable=False,+ primary_key=True,+ serialize=False,+ ),+ ),+ ("created_at", models.DateTimeField(auto_now_add=True)),+ (+ "dashboard",+ models.ForeignKey(+ null=True,+ on_delete=django.db.models.deletion.CASCADE,+ related_name="+",+ to="dashboards.dashboard",+ ),+ ),+ (+ "insight",+ models.ForeignKey(+ null=True,+ on_delete=django.db.models.deletion.CASCADE,+ related_name="+",+ to="product_analytics.insight",+ ),+ ),+ (+ "subscription",+ models.ForeignKey(+ on_delete=django.db.models.deletion.CASCADE,+ related_name="contexts",+ to="subscriptions.subscription",+ ),+ ),+ (+ "team",+ models.ForeignKey(+ db_constraint=False,+ on_delete=django.db.models.deletion.CASCADE,+ related_name="+",+ to="posthog.team",+ ),+ ),+ ],+ options={+ "db_table": "posthog_subscription_context",+ },+ ),+ migrations.CreateModel(+ name="SubscriptionDelivery",+ fields=[+ (+ "id",+ models.UUIDField(+ default=posthog.uuidt.uuid7,+ editable=False,+ primary_key=True,+ serialize=False,+ ),+ ),+ ("temporal_workflow_id", models.CharField(max_length=255)),+ ("idempotency_key", models.CharField(max_length=255, unique=True)),+ ("trigger_type", models.CharField(max_length=20)),+ ("scheduled_at", models.DateTimeField(null=True)),+ ("target_type", models.CharField(max_length=10)),+ ("target_value", models.TextField()),+ (+ "exported_asset_ids",+ django.contrib.postgres.fields.ArrayField(+ base_field=models.IntegerField(), default=list, size=None+ ),+ ),+ ("content_snapshot", models.JSONField(default=dict)),+ (+ "context_refs",+ django.contrib.postgres.fields.ArrayField(+ base_field=models.CharField(max_length=64),+ db_default=[],+ default=list,+ size=None,+ ),+ ),+ ("change_summary", models.TextField(blank=True, null=True)),+ ("recipient_results", models.JSONField(default=list)),+ (+ "status",+ models.CharField(+ choices=[+ ("starting", "Starting"),+ ("completed", "Completed"),+ ("failed", "Failed"),+ ("skipped", "Skipped"),+ ],+ default="starting",+ max_length=24,+ ),+ ),+ ("error", models.JSONField(blank=True, null=True)),+ ("created_at", models.DateTimeField(auto_now_add=True)),+ ("last_updated_at", models.DateTimeField(auto_now=True)),+ ("finished_at", models.DateTimeField(blank=True, null=True)),+ (+ "subscription",+ models.ForeignKey(+ on_delete=django.db.models.deletion.CASCADE,+ related_name="deliveries",+ to="subscriptions.subscription",+ ),+ ),+ (+ "team",+ models.ForeignKey(+ on_delete=django.db.models.deletion.CASCADE,+ related_name="+",+ to="posthog.team",+ ),+ ),+ ],+ options={+ "db_table": "posthog_subscription_delivery",+ "ordering": ["-created_at"],+ },+ ),+ migrations.AddIndex(+ model_name="subscription",+ index=models.Index(fields=["integration"], name="posthog_sub_integration_idx"),+ ),+ migrations.AddConstraint(+ model_name="subscriptioncontext",+ constraint=models.CheckConstraint(+ condition=models.Q(+ models.Q(("dashboard__isnull", False), ("insight__isnull", True)),+ models.Q(("dashboard__isnull", True), ("insight__isnull", False)),+ _connector="OR",+ ),+ name="subscription_context_exactly_one_target",+ ),+ ),+ migrations.AddConstraint(+ model_name="subscriptioncontext",+ constraint=models.UniqueConstraint(+ condition=models.Q(("dashboard__isnull", False)),+ fields=("subscription", "dashboard"),+ name="subscription_context_unique_dashboard",+ ),+ ),+ migrations.AddConstraint(+ model_name="subscriptioncontext",+ constraint=models.UniqueConstraint(+ condition=models.Q(("insight__isnull", False)),+ fields=("subscription", "insight"),+ name="subscription_context_unique_insight",+ ),+ ),+ migrations.AddIndex(+ model_name="subscriptiondelivery",+ index=models.Index(fields=["subscription", "-created_at"], name="posthog_subdel_sub_crtd"),+ ),+ migrations.AddIndex(+ model_name="subscriptiondelivery",+ index=models.Index(fields=["team", "-created_at"], name="posthog_subdel_team_crtd"),+ ),+ migrations.AddIndex(+ model_name="subscriptiondelivery",+ index=models.Index(+ fields=["subscription", "status", "-finished_at"],+ name="posthog_subdel_sub_fin",+ ),+ ),+ ],+ database_operations=[],+ ),+ ]diff --git a/products/subscriptions/backend/migrations/__init__.py b/products/subscriptions/backend/migrations/__init__.pynew file mode 100644index 000000000000..e69de29bb2d1diff --git a/products/subscriptions/backend/migrations/max_migration.txt b/products/subscriptions/backend/migrations/max_migration.txtnew file mode 100644index 000000000000..c2fd3774d60d--- /dev/null+++ b/products/subscriptions/backend/migrations/max_migration.txt@@ -0,0 +1 @@+0001_move_subscription_modelsdiff --git a/products/subscriptions/backend/models/__init__.py b/products/subscriptions/backend/models/__init__.pynew file mode 100644index 000000000000..f3ff1b3d6218--- /dev/null+++ b/products/subscriptions/backend/models/__init__.py@@ -0,0 +1,8 @@+from .subscription import Subscription, SubscriptionDelivery+from .subscription_context import SubscriptionContext++__all__ = [+ "Subscription",+ "SubscriptionContext",+ "SubscriptionDelivery",+]diff --git a/products/exports/backend/models/subscription.py b/products/subscriptions/backend/models/subscription.pysimilarity index 97%rename from products/exports/backend/models/subscription.pyrename to products/subscriptions/backend/models/subscription.pyindex 4afc2b30247d..17006e495e7d 100644--- a/products/exports/backend/models/subscription.py+++ b/products/subscriptions/backend/models/subscription.py@@ -13,9 +13,24 @@ from django.db.models.signals import post_savefrom django.dispatch import receiverfrom django.utils import timezone-from dateutil.rrule import DAILY, FR, MO, MONTHLY, SA, SU, TH, TU, WE, WEEKLY, YEARLY, rrule+from dateutil.rrule import (+ DAILY,+ FR,+ MO,+ MONTHLY,+ SA,+ SU,+ TH,+ TU,+ WE,+ WEEKLY,+ YEARLY,+ rrule,+ weekday as rrule_weekday,+)from posthog.constants import AvailableFeature+from posthog.event_usage import report_user_actionfrom posthog.exceptions_capture import capture_exceptionfrom posthog.jwt import PosthogJwtAudience, decode_jwt, encode_jwtfrom posthog.models.activity_logging.activity_log import Change, ChangeAction, Detail, changes_between, log_activity@@ -27,6 +42,7 @@ from posthog.utils import absolute_uriif TYPE_CHECKING:from posthog.event_usage import AnalyticsPropsfrom posthog.models.organization import Organization+ from posthog.models.user import User# Resolved lazily via __getattr__ below; declared here so consumers type-check as int.SUBSCRIPTION_COUNT_ALLOWED_ON_FREE_TIER: int@@ -231,7 +247,7 @@ class Subscription(ModelActivityMixin, models.Model):]db_table = "posthog_subscription"- def __init__(self, *args, **kwargs):+ def __init__(self, *args: Any, **kwargs: Any) -> None:super().__init__(*args, **kwargs)# Only cache rrule if all required fields are loaded (not deferred).# The rrule property accesses multiple fields (frequency, count, interval, etc).@@ -497,7 +513,7 @@ class Subscription(ModelActivityMixin, models.Model):return host or "webhook"@property- def summary(self):+ def summary(self) -> str:try:human_frequency = {"daily": "day",@@ -568,9 +584,9 @@ class Subscription(ModelActivityMixin, models.Model):@receiver(post_save, sender=Subscription, dispatch_uid="hook-subscription-saved")-def subscription_saved(sender, instance, created, raw, using, **kwargs):- from posthog.event_usage import report_user_action-+def subscription_saved(+ sender: type["Subscription"], instance: "Subscription", created: bool, raw: bool, using: str, **kwargs: Any+) -> None:# Partial-field saves are internal bookkeeping (e.g. next_delivery_date rescheduling), not a# user create/update — a real API save writes the whole row. Skip them so re-enabling or the# scheduler doesn't emit a second "<kind> subscription updated" event.@@ -599,8 +615,15 @@ def subscription_saved(sender, instance, created, raw, using, **kwargs):@mutable_receiver(model_activity_signal, sender=Subscription)def log_subscription_activity(- sender, scope, before_update, after_update, activity, user, was_impersonated=False, **kwargs-):+ sender: type["Subscription"],+ scope: str,+ before_update: Optional["Subscription"],+ after_update: Optional["Subscription"],+ activity: str,+ user: Optional["User"],+ was_impersonated: bool = False,+ **kwargs: Any,+) -> None:instance = after_update or before_updateif instance is None:return@@ -643,8 +666,8 @@ def log_subscription_activity(capture_exception(exc)-def to_rrule_weekdays(weekday: Subscription.SubscriptionByWeekDay):- return {DATEUTIL_WEEKDAY_SHORTHAND_BY_NAME.get(x) for x in weekday}+def to_rrule_weekdays(weekday: Subscription.SubscriptionByWeekDay) -> set[rrule_weekday]:+ return {DATEUTIL_WEEKDAY_SHORTHAND_BY_NAME[x] for x in weekday}def get_unsubscribe_token(subscription: Subscription, email: str) -> str:diff --git a/products/exports/backend/models/subscription_context.py b/products/subscriptions/backend/models/subscription_context.pysimilarity index 100%rename from products/exports/backend/models/subscription_context.pyrename to products/subscriptions/backend/models/subscription_context.pydiff --git a/products/subscriptions/backend/presentation/views.py b/products/subscriptions/backend/presentation/views.pyindex fca0805ba95e..0faed0a56800 100644--- a/products/subscriptions/backend/presentation/views.py+++ b/products/subscriptions/backend/presentation/views.py@@ -73,13 +73,6 @@ from posthog.utils import human_list, str_to_boolfrom products.access_control.backend.facade.user_access_control import UserAccessControlfrom products.dashboards.backend.models.dashboard import Dashboardfrom products.dashboards.backend.models.dashboard_tile import DashboardTile-from products.exports.backend.models.subscription import (- AIQueryPlanStatus,- Subscription,- SubscriptionDelivery,- attribute_subscription_saves,-)-from products.exports.backend.models.subscription_context import SubscriptionContext, context_reffrom products.product_analytics.backend.facade.api import insights_including_soft_deleted_for_teamfrom products.product_analytics.backend.facade.models import Insightfrom products.subscriptions.backend.facade.api import (@@ -102,6 +95,13 @@ from products.subscriptions.backend.facade.contracts import (PromptRejectedError,SubscriptionTriggerType,)+from products.subscriptions.backend.models.subscription import (+ AIQueryPlanStatus,+ Subscription,+ SubscriptionDelivery,+ attribute_subscription_saves,+)+from products.subscriptions.backend.models.subscription_context import SubscriptionContext, context_reffrom ee.billing.quota_limiting import QuotaLimitingCaches, QuotaResource, is_team_limiteddiff --git a/products/subscriptions/backend/temporal/activities.py b/products/subscriptions/backend/temporal/activities.pyindex c9af6821a188..6adb3289fc04 100644--- a/products/subscriptions/backend/temporal/activities.py+++ b/products/subscriptions/backend/temporal/activities.py@@ -16,8 +16,6 @@ from posthog.sync import database_sync_to_asyncfrom products.dashboards.backend.models.dashboard_tile import DashboardTilefrom products.exports.backend.models.exported_asset import ExportedAsset-from products.exports.backend.models.subscription import Subscription, SubscriptionDelivery-from products.exports.backend.models.subscription_context import SubscriptionContextfrom products.product_analytics.backend.facade.models import Insightfrom products.subscriptions.backend.logic import _capture_delivery_failed_eventfrom products.subscriptions.backend.logic.auto_disable import (@@ -33,6 +31,8 @@ from products.subscriptions.backend.logic.failure_notifications import (from products.subscriptions.backend.logic.slack_subscriptions import send_slack_message_with_integration_asyncfrom products.subscriptions.backend.logic.subscription_utils import MAX_INSIGHTSfrom products.subscriptions.backend.logic.teams_subscriptions import build_teams_subscription_card+from products.subscriptions.backend.models.subscription import Subscription, SubscriptionDelivery+from products.subscriptions.backend.models.subscription_context import SubscriptionContextfrom products.subscriptions.backend.temporal.ai_subscription.activities import _deliver_ai_subscriptionfrom products.subscriptions.backend.temporal.delivery_common import (auto_disable_and_return,diff --git a/products/subscriptions/backend/temporal/ai_subscription/activities.py b/products/subscriptions/backend/temporal/ai_subscription/activities.pyindex 392aeaebf2bb..b2f87833cbc0 100644--- a/products/subscriptions/backend/temporal/ai_subscription/activities.py+++ b/products/subscriptions/backend/temporal/ai_subscription/activities.py@@ -16,13 +16,13 @@ from posthog.models import OrganizationMembershipfrom posthog.ph_client import ph_scoped_capturefrom posthog.sync import database_sync_to_async-from products.exports.backend.models.subscription import Subscription, SubscriptionDeliveryfrom products.subscriptions.backend.facade.contracts import PromptRejectedErrorfrom products.subscriptions.backend.logic import _capture_delivery_failed_eventfrom products.subscriptions.backend.logic.auto_disable import (AI_CONSENT_REVOKED_DISABLE_REASON,AI_PROMPT_INVALID_DISABLE_REASON,)+from products.subscriptions.backend.models.subscription import Subscription, SubscriptionDeliveryfrom products.subscriptions.backend.temporal.ai_subscription.delivery import (build_ai_subscription_report,build_ai_teams_card,diff --git a/products/subscriptions/backend/temporal/ai_subscription/delivery.py b/products/subscriptions/backend/temporal/ai_subscription/delivery.pyindex 815b1b24ee4b..a05933310b19 100644--- a/products/subscriptions/backend/temporal/ai_subscription/delivery.py+++ b/products/subscriptions/backend/temporal/ai_subscription/delivery.py@@ -22,12 +22,6 @@ from posthog.sync import database_sync_to_asyncfrom posthog.utils import absolute_urifrom products.exports.backend.facade.api import get_delivery_image_url-from products.exports.backend.models.subscription import (- AIQueryPlanStatus,- Subscription,- SubscriptionDelivery,- get_unsubscribe_token,-)from products.slack_app.backend.facade.api import slack_followup_invitefrom products.subscriptions.backend.facade.contracts import PromptRejectedError, SubscriptionTriggerTypefrom products.subscriptions.backend.logic.slack_subscriptions import (@@ -45,6 +39,12 @@ from products.subscriptions.backend.logic.teams_subscriptions import (teams_open_url_action,teams_text_block,)+from products.subscriptions.backend.models.subscription import (+ AIQueryPlanStatus,+ Subscription,+ SubscriptionDelivery,+ get_unsubscribe_token,+)from products.subscriptions.backend.temporal.ai_subscription.report_pipeline import AiReportResult, generate_ai_reportfrom products.subscriptions.backend.temporal.ai_subscription.spec_generator import ReportWindow, compute_report_windowfrom products.subscriptions.backend.temporal.types import AI_REPORT_WINDOW_END_KEYdiff --git a/products/subscriptions/backend/temporal/ai_subscription/report_pipeline.py b/products/subscriptions/backend/temporal/ai_subscription/report_pipeline.pyindex e1ca31a214c6..480dfba9e2eb 100644--- a/products/subscriptions/backend/temporal/ai_subscription/report_pipeline.py+++ b/products/subscriptions/backend/temporal/ai_subscription/report_pipeline.py@@ -23,8 +23,8 @@ from posthog.slo.context import SloSpec, slo_operationfrom posthog.slo.types import SloArea, SloOperationfrom posthog.sync import database_sync_to_async-from products.exports.backend.models.subscription import AIQueryPlanStatusfrom products.subscriptions.backend.facade.contracts import PromptRejectedError+from products.subscriptions.backend.models.subscription import AIQueryPlanStatusfrom products.subscriptions.backend.temporal.ai_subscription.charts import (SPEC_INVALID_DROP_REASONS,ChartFailureReason,diff --git a/products/subscriptions/backend/temporal/ai_subscription/spec_generator.py b/products/subscriptions/backend/temporal/ai_subscription/spec_generator.pyindex f57e54c6c20b..0703a7d04405 100644--- a/products/subscriptions/backend/temporal/ai_subscription/spec_generator.py+++ b/products/subscriptions/backend/temporal/ai_subscription/spec_generator.py@@ -18,9 +18,9 @@ from posthog.models import EventDefinition, EventProperty, PropertyDefinition, Tfrom posthog.models.group_type_mapping import get_group_types_for_projectfrom posthog.security.llm_prompt_sanitization import sanitize_core_memory_text, sanitize_user_text-from products.exports.backend.models.subscription import AIQueryPlanStatus, Subscriptionfrom products.posthog_ai.backend.models.assistant import CoreMemoryfrom products.subscriptions.backend.facade.contracts import PromptRejectedError+from products.subscriptions.backend.models.subscription import AIQueryPlanStatus, Subscriptionfrom products.subscriptions.backend.temporal.ai_subscription.prompts import (EVENT_SELECTION_PROMPT,EVENT_SELECTION_PROMPT_NAME,diff --git a/products/subscriptions/backend/temporal/ai_subscription/test/test_activities.py b/products/subscriptions/backend/temporal/ai_subscription/test/test_activities.pyindex ce2058e5f8a6..9967b090999f 100644--- a/products/subscriptions/backend/temporal/ai_subscription/test/test_activities.py+++ b/products/subscriptions/backend/temporal/ai_subscription/test/test_activities.py@@ -6,8 +6,8 @@ import pytestfrom asgiref.sync import sync_to_asyncfrom parameterized import parameterized-from products.exports.backend.models.subscription import AIQueryPlanStatus, Subscription, SubscriptionDeliveryfrom products.product_analytics.backend.facade.models import Insight+from products.subscriptions.backend.models.subscription import AIQueryPlanStatus, Subscription, SubscriptionDeliveryfrom products.subscriptions.backend.temporal.ai_subscription.activities import (DiagnosticCounts,_load_snapshot,diff --git a/products/subscriptions/backend/temporal/ai_subscription/test/test_delivery.py b/products/subscriptions/backend/temporal/ai_subscription/test/test_delivery.pyindex d3dc7bee28b3..f38264b1d1e8 100644--- a/products/subscriptions/backend/temporal/ai_subscription/test/test_delivery.py+++ b/products/subscriptions/backend/temporal/ai_subscription/test/test_delivery.py@@ -10,11 +10,11 @@ from django.template.loader import render_to_stringfrom parameterized import parameterizedfrom slack_sdk.errors import SlackApiError-from products.exports.backend.models.subscription import AIQueryPlanStatus, Subscription, SubscriptionDeliveryfrom products.slack_app.backend.facade.testing import REQUIRED_SLACK_SCOPESfrom products.subscriptions.backend.facade.contracts import SubscriptionTriggerTypefrom products.subscriptions.backend.logic.slack_subscriptions import SlackMessagefrom products.subscriptions.backend.logic.teams_subscriptions import TEAMS_CARD_TEXT_BUDGET+from products.subscriptions.backend.models.subscription import AIQueryPlanStatus, Subscription, SubscriptionDeliveryfrom products.subscriptions.backend.temporal.ai_subscription.activities import _deliver_ai_subscriptionfrom products.subscriptions.backend.temporal.ai_subscription.delivery import (CHART_IMAGE_URL_TTL,diff --git a/products/subscriptions/backend/temporal/ai_subscription/test/test_report_pipeline.py b/products/subscriptions/backend/temporal/ai_subscription/test/test_report_pipeline.pyindex 23a6e858bb33..949fcd1767cf 100644--- a/products/subscriptions/backend/temporal/ai_subscription/test/test_report_pipeline.py+++ b/products/subscriptions/backend/temporal/ai_subscription/test/test_report_pipeline.py@@ -13,8 +13,8 @@ from posthog.hogql.errors import ExposedHogQLError, InternalHogQLError, QueryErrfrom posthog.errors import ExposedCHQueryErrorfrom posthog.exceptions import ClickHouseQueryMemoryLimitExceeded, ClickHouseQueryTimeOut-from products.exports.backend.models.subscription import AIQueryPlanStatusfrom products.subscriptions.backend.facade.contracts import PromptRejectedError+from products.subscriptions.backend.models.subscription import AIQueryPlanStatusfrom products.subscriptions.backend.temporal.ai_subscription.charts import (ChartFailureReason,ChartRenderFailure,diff --git a/products/subscriptions/backend/temporal/ai_subscription/test/test_spec_generator.py b/products/subscriptions/backend/temporal/ai_subscription/test/test_spec_generator.pyindex 0932012cad3a..aa762d18ee8f 100644--- a/products/subscriptions/backend/temporal/ai_subscription/test/test_spec_generator.py+++ b/products/subscriptions/backend/temporal/ai_subscription/test/test_spec_generator.py@@ -12,8 +12,8 @@ from posthog.schema import CachedTeamTaxonomyQueryResponse, TeamTaxonomyItem, Tefrom posthog.exceptions import ClickHouseQueryTimeOutfrom posthog.models import EventDefinition, EventProperty, PropertyDefinition, Team-from products.exports.backend.models.subscription import AIQueryPlanStatus, Subscriptionfrom products.subscriptions.backend.facade.contracts import PromptRejectedError+from products.subscriptions.backend.models.subscription import AIQueryPlanStatus, Subscriptionfrom products.subscriptions.backend.temporal.ai_subscription.schemas import QueryPlan, QueryPlanStep, RelevantEventsfrom products.subscriptions.backend.temporal.ai_subscription.spec_generator import (AI_QUERY_PLAN_VERSION,diff --git a/products/subscriptions/backend/temporal/delivery_common.py b/products/subscriptions/backend/temporal/delivery_common.pyindex 22fffbaf8534..f17614dfe6d7 100644--- a/products/subscriptions/backend/temporal/delivery_common.py+++ b/products/subscriptions/backend/temporal/delivery_common.py@@ -10,7 +10,6 @@ from posthog.exceptions_capture import capture_exceptionfrom posthog.models.integration import Integrationfrom posthog.sync import database_sync_to_async-from products.exports.backend.models.subscription import Subscriptionfrom products.subscriptions.backend.logic import SLACK_USER_CONFIG_ERRORS, _capture_delivery_failed_eventfrom products.subscriptions.backend.logic.auto_disable import (SLACK_DISCONNECTED_DISABLE_REASON,@@ -20,6 +19,7 @@ from products.subscriptions.backend.logic.auto_disable import (disable_invalid_subscription,)from products.subscriptions.backend.logic.slack_subscriptions import SlackDeliveryResult, get_slack_integration_for_team+from products.subscriptions.backend.models.subscription import Subscriptionfrom products.subscriptions.backend.temporal.types import (DeliverSubscriptionInputs,DeliverSubscriptionResult,diff --git a/products/subscriptions/backend/temporal/delivery_webhook.py b/products/subscriptions/backend/temporal/delivery_webhook.pyindex 864e4052bc54..ba315b33700c 100644--- a/products/subscriptions/backend/temporal/delivery_webhook.py+++ b/products/subscriptions/backend/temporal/delivery_webhook.py@@ -12,9 +12,9 @@ from posthog.security.pinned_requests import SSRFBlockedError, pinned_sessionfrom posthog.security.url_validation import is_microsoft_teams_webhook_urlfrom posthog.settings.utils import get_from_env-from products.exports.backend.models.subscription import Subscriptionfrom products.subscriptions.backend.logic import _capture_delivery_failed_eventfrom products.subscriptions.backend.logic.auto_disable import WEBHOOK_REJECTED_DISABLE_REASON+from products.subscriptions.backend.models.subscription import Subscriptionfrom products.subscriptions.backend.temporal.delivery_common import auto_disable_and_return, error_detail_resultsfrom products.subscriptions.backend.temporal.retry_policy import SUBSCRIPTION_DELIVER_ATTEMPT_TIMEOUTfrom products.subscriptions.backend.temporal.types import DeliverSubscriptionResult, RecipientResultdiff --git a/products/subscriptions/backend/temporal/insight_snapshot.py b/products/subscriptions/backend/temporal/insight_snapshot.pyindex be0dec623026..3169a7ccf5f8 100644--- a/products/subscriptions/backend/temporal/insight_snapshot.py+++ b/products/subscriptions/backend/temporal/insight_snapshot.py@@ -27,8 +27,8 @@ from posthog.models import Team, Userfrom products.dashboards.backend.models.dashboard import Dashboardfrom products.dashboards.backend.models.dashboard_tile import DashboardTile-from products.exports.backend.models.subscription import Subscriptionfrom products.product_analytics.backend.facade.models import Insight+from products.subscriptions.backend.models.subscription import Subscriptionfrom products.subscriptions.backend.temporal.delivery_common import strip_null_bytesfrom products.subscriptions.backend.temporal.types import MISSING_QUERY_ERROR_TYPE, safe_error_messagediff --git a/products/subscriptions/backend/temporal/snapshot_activities.py b/products/subscriptions/backend/temporal/snapshot_activities.pyindex c56425df719e..229c48989600 100644--- a/products/subscriptions/backend/temporal/snapshot_activities.py+++ b/products/subscriptions/backend/temporal/snapshot_activities.py@@ -14,9 +14,9 @@ from posthog.sync import database_sync_to_asyncfrom products.annotations.backend.api.annotation_context import build_annotations_block, resolve_snapshot_date_rangefrom products.exports.backend.models.exported_asset import ExportedAsset-from products.exports.backend.models.subscription import Subscription, SubscriptionDeliveryfrom products.posthog_ai.backend.models.assistant import CoreMemoryfrom products.product_analytics.backend.facade.models import Insight+from products.subscriptions.backend.models.subscription import Subscription, SubscriptionDeliveryfrom products.subscriptions.backend.temporal.llm_change_summary import generate_change_summaryfrom products.subscriptions.backend.temporal.results_summarizer import build_results_summaryfrom products.subscriptions.backend.temporal.types import (diff --git a/products/subscriptions/backend/temporal/test_snapshot_ai_consent.py b/products/subscriptions/backend/temporal/test_snapshot_ai_consent.pyindex cb7ff0c632c0..58ab7ce00899 100644--- a/products/subscriptions/backend/temporal/test_snapshot_ai_consent.py+++ b/products/subscriptions/backend/temporal/test_snapshot_ai_consent.py@@ -8,9 +8,9 @@ import structlogfrom asgiref.sync import sync_to_asyncfrom temporalio.testing import ActivityEnvironment-from products.exports.backend.models.subscription import Subscription, SubscriptionDeliveryfrom products.posthog_ai.backend.models.assistant import CoreMemoryfrom products.product_analytics.backend.facade.models import Insight+from products.subscriptions.backend.models.subscription import Subscription, SubscriptionDeliveryfrom products.subscriptions.backend.temporal.snapshot_activities import snapshot_subscription_insightsfrom products.subscriptions.backend.temporal.types import SnapshotInsightsInputsdiff --git a/products/subscriptions/backend/temporal/test_webhook_delivery.py b/products/subscriptions/backend/temporal/test_webhook_delivery.pyindex 25bbb4dbc4ba..cf4a4bfeceac 100644--- a/products/subscriptions/backend/temporal/test_webhook_delivery.py+++ b/products/subscriptions/backend/temporal/test_webhook_delivery.py@@ -16,7 +16,7 @@ from temporalio.exceptions import ApplicationErrorfrom posthog.security.url_validation import PinnedUrlVerdict-from products.exports.backend.models.subscription import Subscription+from products.subscriptions.backend.models.subscription import Subscriptionfrom products.subscriptions.backend.temporal.delivery_webhook import _WEBHOOK_SEND_CAPACITY, deliver_teams_webhookfrom products.subscriptions.backend.temporal.types import RecipientResultfrom products.subscriptions.backend.tests.subscriptions_test_factory import create_subscriptiondiff --git a/products/subscriptions/backend/tests/logic/test_auto_disable.py b/products/subscriptions/backend/tests/logic/test_auto_disable.pyindex 9e9a48cdd607..8dc6312a57ee 100644--- a/products/subscriptions/backend/tests/logic/test_auto_disable.py+++ b/products/subscriptions/backend/tests/logic/test_auto_disable.py@@ -8,7 +8,6 @@ from parameterized import parameterizedfrom posthog.models import User-from products.exports.backend.models.subscription import Subscriptionfrom products.subscriptions.backend.logic.auto_disable import (AI_PROMPT_INVALID_DISABLE_REASON,SLACK_DISCONNECTED_DISABLE_REASON,@@ -21,6 +20,7 @@ from products.subscriptions.backend.logic.failure_notifications import (create_subscription_delivery_failure_notification,send_subscription_delivery_failure_email,)+from products.subscriptions.backend.models.subscription import Subscriptionclass TestValidateReEnable:diff --git a/products/subscriptions/backend/tests/logic/test_email_subscriptions.py b/products/subscriptions/backend/tests/logic/test_email_subscriptions.pyindex eab12d928a8a..abd617e94887 100644--- a/products/subscriptions/backend/tests/logic/test_email_subscriptions.py+++ b/products/subscriptions/backend/tests/logic/test_email_subscriptions.py@@ -12,10 +12,10 @@ from posthog.tasks.test.utils_email_tests import mock_email_messagesfrom products.dashboards.backend.models.dashboard import Dashboardfrom products.exports.backend.models.exported_asset import ExportedAsset-from products.exports.backend.models.subscription import Subscriptionfrom products.product_analytics.backend.facade.models import Insightfrom products.subscriptions.backend.logic.email_subscriptions import send_email_subscription_reportfrom products.subscriptions.backend.logic.subscription_utils import MAX_INSIGHTS+from products.subscriptions.backend.models.subscription import Subscriptionfrom products.subscriptions.backend.tests.subscriptions_test_factory import create_subscriptiondiff --git a/products/subscriptions/backend/tests/logic/test_slack_subscriptions.py b/products/subscriptions/backend/tests/logic/test_slack_subscriptions.pyindex a481c55e9531..343c782acf9d 100644--- a/products/subscriptions/backend/tests/logic/test_slack_subscriptions.py+++ b/products/subscriptions/backend/tests/logic/test_slack_subscriptions.py@@ -14,7 +14,6 @@ from posthog.models.integration import Integrationfrom products.dashboards.backend.models.dashboard import Dashboardfrom products.exports.backend.models.exported_asset import ExportedAsset-from products.exports.backend.models.subscription import Subscriptionfrom products.product_analytics.backend.facade.models import Insightfrom products.slack_app.backend.facade.testing import REQUIRED_SLACK_SCOPESfrom products.subscriptions.backend.logic import SLACK_USER_CONFIG_ERRORS@@ -29,6 +28,7 @@ from products.subscriptions.backend.logic.slack_subscriptions import (send_slack_subscription_report,)from products.subscriptions.backend.logic.subscription_utils import ASSET_GENERATION_FAILED_MESSAGE+from products.subscriptions.backend.models.subscription import Subscriptionfrom products.subscriptions.backend.tests.subscriptions_test_factory import create_subscriptiondiff --git a/products/subscriptions/backend/tests/subscriptions_test_factory.py b/products/subscriptions/backend/tests/subscriptions_test_factory.pyindex 8d1a4b46a78e..012cfe644e72 100644--- a/products/subscriptions/backend/tests/subscriptions_test_factory.py+++ b/products/subscriptions/backend/tests/subscriptions_test_factory.py@@ -2,7 +2,7 @@ from datetime import datetimefrom typing import Anyfrom zoneinfo import ZoneInfo-from products.exports.backend.models.subscription import Subscription+from products.subscriptions.backend.models.subscription import Subscriptiondef create_subscription(**kwargs: Any) -> Subscription:diff --git a/products/subscriptions/backend/tests/temporal/test_subscriptions_workflows.py b/products/subscriptions/backend/tests/temporal/test_subscriptions_workflows.pyindex dfda647f97fc..fa0bec000df4 100644--- a/products/subscriptions/backend/tests/temporal/test_subscriptions_workflows.py+++ b/products/subscriptions/backend/tests/temporal/test_subscriptions_workflows.py@@ -38,8 +38,6 @@ from posthog.test.insight_queries import default_pageview_queryfrom products.dashboards.backend.models.dashboard import Dashboardfrom products.dashboards.backend.models.dashboard_tile import DashboardTilefrom products.exports.backend.models.exported_asset import ExportedAsset-from products.exports.backend.models.subscription import Subscription, SubscriptionDelivery-from products.exports.backend.models.subscription_context import SubscriptionContextfrom products.exports.backend.tasks.failure_handler import ExcelColumnLimitExceededfrom products.product_analytics.backend.facade.models import Insightfrom products.subscriptions.backend.facade.contracts import (@@ -52,6 +50,8 @@ from products.subscriptions.backend.logic.auto_disable import (SLACK_DISCONNECTED_DISABLE_REASON,)from products.subscriptions.backend.logic.slack_subscriptions import SlackDeliveryResult+from products.subscriptions.backend.models.subscription import Subscription, SubscriptionDelivery+from products.subscriptions.backend.models.subscription_context import SubscriptionContextfrom products.subscriptions.backend.temporal.activities import (_resolve_exportable_insights,advance_next_delivery_date,diff --git a/products/subscriptions/backend/tests/test_subscription.py b/products/subscriptions/backend/tests/test_subscription.pyindex 3a14a8db9444..9e4b45aa6203 100644--- a/products/subscriptions/backend/tests/test_subscription.py+++ b/products/subscriptions/backend/tests/test_subscription.py@@ -29,13 +29,6 @@ from posthog.test.insight_queries import browser_filtered_pageview_query, defaulfrom products.access_control.backend.models.access_control import AccessControlfrom products.dashboards.backend.models.dashboard import Dashboardfrom products.dashboards.backend.models.dashboard_tile import DashboardTile-from products.exports.backend.models.subscription import (- SUBSCRIPTION_COUNT_ALLOWED_ON_FREE_TIER,- AIQueryPlanStatus,- Subscription,- SubscriptionDelivery,-)-from products.exports.backend.models.subscription_context import SubscriptionContextfrom products.product_analytics.backend.facade.models import Insightfrom products.subscriptions.backend.facade.api import (AI_REPORT_CHARTS_KEY,@@ -50,6 +43,13 @@ from products.subscriptions.backend.facade.api import ()from products.subscriptions.backend.facade.contracts import ProcessSubscriptionWorkflowInputs, SubscriptionTriggerTypefrom products.subscriptions.backend.facade.testing import AI_QUERY_PLAN_VERSION+from products.subscriptions.backend.models.subscription import (+ SUBSCRIPTION_COUNT_ALLOWED_ON_FREE_TIER,+ AIQueryPlanStatus,+ Subscription,+ SubscriptionDelivery,+)+from products.subscriptions.backend.models.subscription_context import SubscriptionContextfrom products.subscriptions.backend.tests.subscriptions_test_factory import create_subscriptionfrom ee.api.test.base import APILicensedTestdiff --git a/posthog/models/test/test_subscription_activity_log.py b/products/subscriptions/backend/tests/test_subscription_activity_log.pysimilarity index 98%rename from posthog/models/test/test_subscription_activity_log.pyrename to products/subscriptions/backend/tests/test_subscription_activity_log.pyindex 976cdf21a332..db50446653e9 100644--- a/posthog/models/test/test_subscription_activity_log.py+++ b/products/subscriptions/backend/tests/test_subscription_activity_log.py@@ -11,8 +11,8 @@ from posthog.event_usage import EventSourcefrom posthog.models.activity_logging.activity_log import ActivityLogfrom products.dashboards.backend.models.dashboard import Dashboard-from products.exports.backend.models.subscription import Subscription, attribute_subscription_savesfrom products.product_analytics.backend.facade.models import Insight+from products.subscriptions.backend.models.subscription import Subscription, attribute_subscription_saves@time_machine.travel("2022-01-01", tick=False)diff --git a/products/exports/backend/tests/test_subscription_context_model.py b/products/subscriptions/backend/tests/test_subscription_context_model.pysimilarity index 98%rename from products/exports/backend/tests/test_subscription_context_model.pyrename to products/subscriptions/backend/tests/test_subscription_context_model.pyindex 496b8df8af34..bbdfb151ed40 100644--- a/products/exports/backend/tests/test_subscription_context_model.py+++ b/products/subscriptions/backend/tests/test_subscription_context_model.py@@ -10,8 +10,8 @@ from parameterized import parameterizedfrom posthog.models.scoping.manager import TeamScopeErrorfrom products.dashboards.backend.models.dashboard import Dashboard-from products.exports.backend.models import Subscription, SubscriptionContextfrom products.product_analytics.backend.facade.models import Insight+from products.subscriptions.backend.models import Subscription, SubscriptionContextclass TestSubscriptionContextModel(BaseTest):diff --git a/posthog/models/test/test_subscription_model.py b/products/subscriptions/backend/tests/test_subscription_model.pysimilarity index 99%rename from posthog/models/test/test_subscription_model.pyrename to products/subscriptions/backend/tests/test_subscription_model.pyindex fe388f22e8b0..0c5d447dce5c 100644--- a/posthog/models/test/test_subscription_model.py+++ b/products/subscriptions/backend/tests/test_subscription_model.py@@ -19,7 +19,8 @@ from posthog.event_usage import EventSourcefrom posthog.jwt import PosthogJwtAudiencefrom products.dashboards.backend.models.dashboard import Dashboard-from products.exports.backend.models.subscription import (+from products.product_analytics.backend.facade.models import Insight+from products.subscriptions.backend.models.subscription import (SUBSCRIPTION_COUNT_ALLOWED_ON_FREE_TIER,UNSUBSCRIBE_TOKEN_EXP_DAYS,Subscription,@@ -28,7 +29,6 @@ from products.exports.backend.models.subscription import (get_unsubscribe_token,unsubscribe_using_token,)-from products.product_analytics.backend.facade.models import Insightclass TestSubscriptionScheduling:@@ -729,7 +729,7 @@ class TestSubscriptionLimit(BaseTest):self.organization.available_product_features = []self.organization.save()self._create_subscriptions(2)- with patch("products.exports.backend.models.subscription.SUBSCRIPTION_COUNT_ALLOWED_ON_FREE_TIER", 2):+ with patch("products.subscriptions.backend.models.subscription.SUBSCRIPTION_COUNT_ALLOWED_ON_FREE_TIER", 2):result = Subscription.check_subscription_limit(self.team.id, self.organization)assert result is not Noneassert "2" in resultdiff --git a/pyproject.toml b/pyproject.tomlindex 4bc2065f9a42..a6de2de40059 100644--- a/pyproject.toml+++ b/pyproject.toml@@ -762,14 +762,13 @@ ignore_imports = ["products.batch_exports.backend.presentation.views.batch_export.runs -> products.batch_exports.backend.models.batch_export","products.batch_exports.backend.presentation.views.batch_export.runs -> products.batch_exports.backend.service",# TODO: subscriptions presentation wave. The viewsets and model serializers moved from ee/- # with their ORM access: the subscription models (in exports until they move into the- # product) and the dashboard models behind dashboard and tile selection. Thin them to- # parse -> facade -> serialize and delete each entry. backend:contract-check stays off- # until this list is empty.+ # with their ORM access: the product's own subscription models and the dashboard models+ # behind dashboard and tile selection. Thin them to parse -> facade -> serialize and delete+ # each entry. backend:contract-check stays off until this list is empty."products.subscriptions.backend.presentation.views -> products.dashboards.backend.models.dashboard","products.subscriptions.backend.presentation.views -> products.dashboards.backend.models.dashboard_tile",- "products.subscriptions.backend.presentation.views -> products.exports.backend.models.subscription",- "products.subscriptions.backend.presentation.views -> products.exports.backend.models.subscription_context",+ "products.subscriptions.backend.presentation.views -> products.subscriptions.backend.models.subscription",+ "products.subscriptions.backend.presentation.views -> products.subscriptions.backend.models.subscription_context",]# routes.py is the one module core reads to assemble a product's API router, so it is thediff --git a/tach.toml b/tach.tomlindex 80ecd7393168..79fe1ab016e6 100644--- a/tach.toml+++ b/tach.toml@@ -310,9 +310,9 @@ depends_on = ["products.surveys", "products.access_control",# The canvas_app widget resolves its canvas through the canvas facade as the viewer."products.canvas",- # Facade-only: the dashboard filter access check asks the exports facade whether a+ # Facade-only: the dashboard filter access check asks the subscriptions facade whether a# subscription delivers the dashboard.- "products.exports",+ "products.subscriptions",]layer = "modules"@@ -532,7 +532,7 @@ depends_on = ["products.dashboards","products.early_access_features","products.experiments",- "products.exports",+ "products.subscriptions","products.product_analytics","products.product_tours","products.surveys", "products.access_control",@@ -727,7 +727,7 @@ depends_on = ["products.annotations","products.dashboards","products.experiments",- "products.exports",+ "products.subscriptions","products.product_analytics", "products.access_control",]layer = "modules"@@ -784,7 +784,7 @@ depends_on = ["products.alerts","products.dashboards","products.event_definitions",- "products.exports",+ "products.subscriptions","products.annotations","products.warehouse_sources", "products.access_control",# A trends query filtering on a first-pageview-aware property builds it through