: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
refactor(experiments): route core callers through the facade (#125890)
Anderse51845ddd7e9
diff --git a/posthog/api/debug_ch_queries.py b/posthog/api/debug_ch_queries.pyindex edb6edb49ad1..36e41d10837e 100644--- a/posthog/api/debug_ch_queries.py+++ b/posthog/api/debug_ch_queries.py@@ -32,15 +32,14 @@ from posthog.clickhouse.preaggregation.experiment_metric_events_sql import (SHARDED_EXPERIMENT_METRIC_EVENTS_TABLE,)from posthog.clickhouse.query_tagging import Feature, Product, tag_queries-from posthog.models.team.extensions import get_or_create_team_extensionfrom posthog.models.team.team import Teamfrom posthog.permissions import APIScopePermissionfrom posthog.settings.base_variables import DEBUGfrom posthog.settings.data_stores import CLICKHOUSE_AUX_CLUSTER, CLICKHOUSE_CLUSTER, CLICKHOUSE_DATABASEfrom products.analytics_platform.backend.models import PreaggregationJob-from products.experiments.backend.hogql_queries.types import PrecomputeSkipReason-from products.experiments.backend.models.team_experiments_config import TeamExperimentsConfig+from products.experiments.backend.facade import api as experiments_api+from products.experiments.backend.facade.enums import PrecomputeSkipReasonfrom products.web_analytics.backend.hogql_queries.web_lazy_precompute_common import (BACKGROUND_WARMING_TRIGGERS as WEB_ANALYTICS_WARMING_TRIGGERS,)@@ -509,31 +508,22 @@ class DebugCHQueries(viewsets.ViewSet):.select_related("organization").order_by("organization__name", "name"))- # Batch-fetch precomputation configs for matched teams- configs_by_team = dict(- TeamExperimentsConfig.objects.filter(- team__in=teams,- experiment_precomputation_enabled=True,- ).values_list("team_id", "experiment_precomputation_enabled")- )+ enabled_team_ids = experiments_api.list_precomputation_enabled_team_ids([team.id for team in teams])org_ids = {str(t.organization.id) for t in teams if t.organization}arr_by_org = self._fetch_org_arr(org_ids) if org_ids else {}return Response(- [- self._serialize_precomputation_team(team, configs_by_team.get(team.id, False), arr_by_org)- for team in teams- ]+ [self._serialize_precomputation_team(team, team.id in enabled_team_ids, arr_by_org) for team in teams])# Default: only teams with precomputation enabled- configs = list(- TeamExperimentsConfig.objects.filter(experiment_precomputation_enabled=True)- .select_related("team", "team__organization")- .order_by("team__name")+ teams = list(+ Team.objects.filter(id__in=experiments_api.list_precomputation_enabled_team_ids())+ .select_related("organization")+ .order_by("name"))- org_ids = {str(c.team.organization.id) for c in configs if c.team.organization}+ org_ids = {str(t.organization.id) for t in teams if t.organization}arr_by_org = self._fetch_org_arr(org_ids) if org_ids else {}- return Response([self._serialize_precomputation_team(config.team, True, arr_by_org) for config in configs])+ return Response([self._serialize_precomputation_team(team, True, arr_by_org) for team in teams])def _update_precomputation(self, request) -> Response:team_id = request.data.get("team_id")@@ -547,12 +537,7 @@ class DebugCHQueries(viewsets.ViewSet):except (Team.DoesNotExist, TypeError, ValueError):raise exceptions.NotFound(f"Team {team_id} not found.")- config = get_or_create_team_extension(team, TeamExperimentsConfig)- config.experiment_precomputation_enabled = enabled- # A human toggling precomputation must stick: the auto-enrollment job only- # writes when precomputation_enabled_set_by is null or "auto".- config.precomputation_enabled_set_by = TeamExperimentsConfig.PrecomputationEnabledSetBy.MANUAL- config.save(update_fields=["experiment_precomputation_enabled", "precomputation_enabled_set_by"])+ experiments_api.set_precomputation_enabled(team_id=team.id, enabled=enabled)org_id = str(team.organization.id) if team.organization else Nonearr_by_org = self._fetch_org_arr({org_id}) if org_id else {}diff --git a/posthog/api/team/integration_config.py b/posthog/api/team/integration_config.pyindex 26ba263a1607..f02d2228f9e7 100644--- a/posthog/api/team/integration_config.py+++ b/posthog/api/team/integration_config.py@@ -1,9 +1,7 @@"""Serializers and handlers for product-specific project settings."""-from decimal import Decimalfrom typing import Any, cast-from django.core.exceptions import ValidationError as DjangoValidationErrorfrom django.db import transactionfrom django.utils import timezone@@ -19,6 +17,14 @@ from posthog.models.team.logs_retention import (retention_update_throttle_error,)+from products.experiments.backend.facade import api as experiments_api+from products.experiments.backend.facade.contracts import ExperimentValidationError, TeamExperimentsSettingsUpdate+from products.experiments.backend.facade.enums import (+ MAX_DEFAULT_CONFIDENCE_LEVEL,+ MAX_RECALCULATION_TIMES,+ MIN_DEFAULT_CONFIDENCE_LEVEL,+ MIN_RECALCULATION_GAP_HOURS,+)from products.feature_flags.backend.models.evaluation_context import EvaluationContext, normalize_context_namefrom products.logs.backend.models import TeamLogsConfigfrom products.tracing.backend.facade.team_extension import TeamTracingConfig@@ -254,106 +260,138 @@ def handle_tracing_config(request: request.Request, team: Team) -> response.Respreturn response.Response(TeamTracingConfigSerializer(config).data)-def handle_experiments_config(request: request.Request, team: Team) -> response.Response:- """Shared handler for the experiments_config action — exposed under both the- team/environment and project routers so both surfaces stay in parity."""- # Keeps the products app import off this module's import path.- from products.experiments.backend.models.team_experiments_config import ( # noqa: PLC0415- MAX_RECALCULATION_TIMES,- MIN_RECALCULATION_GAP_HOURS,- TeamExperimentsConfig,- validate_recalculation_times,+class TeamExperimentsConfigSerializer(serializers.Serializer):+ experiment_recalculation_times = serializers.ListField(+ child=serializers.RegexField(+ regex=r"^(?:[01]\d|2[0-3]):00:00$",+ error_messages={"invalid": "Recalculation times must be on the hour, in HH:00:00 format (UTC)."},+ ),+ required=False,+ allow_null=True,+ allow_empty=False,+ max_length=MAX_RECALCULATION_TIMES,+ help_text=(+ "Times of day (UTC) when experiment time series are recalculated, as 'HH:00:00' strings "+ f"on the hour. At most {MAX_RECALCULATION_TIMES} entries, at least "+ f"{MIN_RECALCULATION_GAP_HOURS} hours apart. Null means the default time (02:00 UTC)."+ ),+ )+ default_experiment_confidence_level = serializers.DecimalField(+ max_digits=3,+ decimal_places=2,+ min_value=MIN_DEFAULT_CONFIDENCE_LEVEL,+ max_value=MAX_DEFAULT_CONFIDENCE_LEVEL,+ required=False,+ allow_null=True,+ help_text="Default confidence level for new experiments, above 0 and below 1, for example 0.95.",+ )+ default_experiment_stats_method = serializers.ChoiceField(+ choices=Organization.DefaultExperimentStatsMethod.choices,+ required=False,+ allow_null=True,+ allow_blank=True,+ help_text="Default statistical method for new experiments in this environment.",+ )+ # Precomputation is rolled out by PostHog, through the auto-enrollment job and the+ # staff tools. A customer write here would stamp the row as manual and stop the job+ # from managing that team.+ experiment_precomputation_enabled = serializers.BooleanField(+ read_only=True,+ help_text="Whether to precompute experiment exposure data for faster query execution.",+ )+ default_only_count_matured_users = serializers.BooleanField(+ required=False,+ help_text="Default value for 'only count matured users' on new experiments in this environment.",+ )+ default_cuped_enabled = serializers.BooleanField(+ required=False,+ help_text=(+ "Default for enabling CUPED variance reduction on experiment metrics. "+ "Overridden by the experiment-level `stats_config.cuped.enabled` setting when set."+ ),+ )+ default_cuped_lookback_days = serializers.IntegerField(+ required=False,+ allow_null=True,+ min_value=1,+ max_value=30,+ help_text=(+ "Default lookback window (in days) for CUPED variance reduction. "+ "Overridden by the experiment-level `stats_config.cuped.lookback_days` setting when set. "+ "Must be between 1 and 30 days."+ ),+ )+ default_minimum_detectable_effect = serializers.IntegerField(+ required=False,+ allow_null=True,+ min_value=1,+ max_value=100,+ help_text=(+ "Default minimum detectable effect (MDE) percentage for new experiments in this environment. "+ "Valid values: 1-100. MDE is the smallest effect size you want to be able to detect with "+ "statistical significance. Lower values require more data and longer run times."+ ),+ )+ default_sequential_testing_enabled = serializers.BooleanField(+ required=False,+ help_text=(+ "Default for enabling sequential testing (always-valid p-values) on new experiments. "+ "Overridden by the experiment-level `stats_config.frequentist.sequential_testing_enabled` "+ "setting when set. Only applies to the frequentist statistical method."+ ),+ )+ default_sequential_tuning_parameter = serializers.IntegerField(+ required=False,+ allow_null=True,+ min_value=1,+ max_value=1_000_000_000,+ help_text=(+ "Default tuning parameter for sequential testing. Roughly the sample size at which the "+ "confidence sequence is tightest. Overridden by the experiment-level "+ "`stats_config.frequentist.sequential_tuning_parameter` setting when set."+ ),+ )+ flag_cleanup_repository = serializers.CharField(+ required=False,+ allow_null=True,+ allow_blank=True,+ max_length=255,+ help_text=(+ "Default GitHub repository (organization/repository) for experiment flag-cleanup PRs in "+ "this environment. Used when an experiment has no repository of its own. It must belong "+ "to the team's GitHub installation at cleanup time or it is ignored."+ ),)- class TeamExperimentsConfigSerializer(serializers.ModelSerializer):- experiment_recalculation_times = serializers.ListField(- child=serializers.RegexField(- regex=r"^(?:[01]\d|2[0-3]):00:00$",- error_messages={"invalid": "Recalculation times must be on the hour, in HH:00:00 format (UTC)."},- ),- required=False,- allow_null=True,- allow_empty=False,- max_length=MAX_RECALCULATION_TIMES,- help_text=(- "Times of day (UTC) when experiment time series are recalculated, as 'HH:00:00' strings "- f"on the hour. At most {MAX_RECALCULATION_TIMES} entries, at least "- f"{MIN_RECALCULATION_GAP_HOURS} hours apart. Null means the default time (02:00 UTC)."- ),- )- # The frequentist engine derives alpha as 1 - confidence level, so anything outside (0, 1)- # is meaningless. The field stores two decimal places, so these bounds are that open range.- default_experiment_confidence_level = serializers.DecimalField(- max_digits=3,- decimal_places=2,- min_value=Decimal("0.01"),- max_value=Decimal("0.99"),- required=False,- allow_null=True,- help_text="Default confidence level for new experiments, above 0 and below 1, for example 0.95.",- )-- class Meta:- model = TeamExperimentsConfig- fields = [- "experiment_recalculation_times",- "default_experiment_confidence_level",- "default_experiment_stats_method",- "experiment_precomputation_enabled",- "default_only_count_matured_users",- "default_cuped_enabled",- "default_cuped_lookback_days",- "default_minimum_detectable_effect",- "default_sequential_testing_enabled",- "default_sequential_tuning_parameter",- "flag_cleanup_repository",- ]- # Precomputation is rolled out by PostHog, through the auto-enrollment job and the- # staff tools. A customer write here would stamp the row as manual and stop the job- # from managing that team.- read_only_fields = ["experiment_precomputation_enabled"]-- def validate_experiment_recalculation_times(self, value: list[str] | None) -> list[str] | None:- try:- validate_recalculation_times(value)- except DjangoValidationError as e:- raise serializers.ValidationError(e.messages)- return value-- def validate_flag_cleanup_repository(self, value: str | None) -> str | None:- # Keeps the sandbox/LLM runtime the repo-selection module pulls in off the- # request import path.- from products.tasks.backend.facade import repo_selection as tasks_repo_selection # noqa: PLC0415-- if not value:- return None- parts = value.split("/")- if len(parts) != 2 or not parts[0] or not parts[1]:- raise serializers.ValidationError("Repository must be in the format organization/repository")- value = value.lower()- # Reject repos outside the team's GitHub installation now rather than storing a- # default the cleanup resolution would silently ignore.- github = tasks_repo_selection.resolve_team_github_integration(team.id, team=team, team_only=True)- cached = {- full_name.lower()- for repo in (github.list_all_cached_repositories(max_repos=1000) if github else [])- if (full_name := repo.get("full_name"))- }- if value not in cached:- raise serializers.ValidationError(- "This repository is not connected to the project's GitHub integration."- )- return value+ def validate_experiment_recalculation_times(self, value: list[str] | None) -> tuple[str, ...] | None:+ # The settings update repeats this check. It runs here too so that, for a request with several+ # invalid fields, the 400 names the first invalid field in field order.+ try:+ experiments_api.validate_recalculation_times(value)+ except ExperimentValidationError as error:+ raise serializers.ValidationError(str(error))+ return None if value is None else tuple(value)- config = get_or_create_team_extension(team, TeamExperimentsConfig)+def handle_experiments_config(request: request.Request, team: Team) -> response.Response:+ """Shared handler for the experiments_config action — exposed under both the+ team/environment and project routers so both surfaces stay in parity."""if request.method == "PATCH":- serializer = TeamExperimentsConfigSerializer(config, data=request.data, partial=True)- serializer.is_valid(raise_exception=True)- serializer.save()- return response.Response(serializer.data)+ serializer = TeamExperimentsConfigSerializer(data=request.data, partial=True)+ if not serializer.is_valid():+ # Every request creates the settings row with the defaults when it is missing, a rejected PATCH too.+ experiments_api.get_team_experiments_settings(team.id)+ raise serializers.ValidationError(serializer.errors)+ try:+ experiments_settings = experiments_api.update_team_experiments_settings(+ team_id=team.id, update=TeamExperimentsSettingsUpdate(**serializer.validated_data)+ )+ except ExperimentValidationError as error:+ raise serializers.ValidationError({error.field: [str(error)]} if error.field else [str(error)])+ else:+ experiments_settings = experiments_api.get_team_experiments_settings(team.id)- return response.Response(TeamExperimentsConfigSerializer(config).data)+ return response.Response(TeamExperimentsConfigSerializer(experiments_settings).data)def handle_logs_config(request: request.Request, team: Team) -> response.Response:diff --git a/posthog/api/test/test_debug_ch_queries.py b/posthog/api/test/test_debug_ch_queries.pyindex d1aef893f8f7..452a0d20a7ff 100644--- a/posthog/api/test/test_debug_ch_queries.py+++ b/posthog/api/test/test_debug_ch_queries.py@@ -16,7 +16,8 @@ from posthog.models.personal_api_key import PersonalAPIKeyfrom posthog.models.utils import generate_random_token_personal, hash_key_valuefrom posthog.settings.data_stores import CLICKHOUSE_AUX_CLUSTER, CLICKHOUSE_CLUSTER-from products.experiments.backend.models.team_experiments_config import TeamExperimentsConfig+from products.experiments.backend.facade.api import list_precomputation_enabled_team_ids+from products.experiments.backend.facade.testing import set_team_experiments_configclass TestDebugCHQuery(APIBaseTest):@@ -497,9 +498,8 @@ class TestCacheTableStats(SimpleTestCase):class TestPrecomputationTeamsUpdate(APIBaseTest):CLASS_DATA_LEVEL_SETUP = False- def test_staff_toggle_stamps_manual_provenance(self):- # A missing stamp would let the auto-enrollment job override a human's disable- # on its next run.+ def test_staff_toggle_disables_precomputation(self):+ set_team_experiments_config(team_id=self.team.id, experiment_precomputation_enabled=True)self.user.is_staff = Trueself.user.save()@@ -509,6 +509,4 @@ class TestPrecomputationTeamsUpdate(APIBaseTest):)self.assertEqual(resp.status_code, HTTP_200_OK, resp.content)- config = TeamExperimentsConfig.objects.get(team=self.team)- self.assertFalse(config.experiment_precomputation_enabled)- self.assertEqual(config.precomputation_enabled_set_by, TeamExperimentsConfig.PrecomputationEnabledSetBy.MANUAL)+ self.assertEqual(list_precomputation_enabled_team_ids([self.team.id]), set())diff --git a/posthog/api/test/test_project.py b/posthog/api/test/test_project.pyindex f390aaf299af..24b732bbab96 100644--- a/posthog/api/test/test_project.py+++ b/posthog/api/test/test_project.py@@ -32,7 +32,8 @@ from posthog.test.db_context_capturing import capture_db_queriesfrom posthog.test.persons import create_person, delete_personfrom products.customer_analytics.backend.facade.team_extension import TeamCustomerAnalyticsConfig-from products.experiments.backend.models.team_experiments_config import TeamExperimentsConfig+from products.experiments.backend.facade.api import get_team_experiments_settings+from products.experiments.backend.facade.testing import set_team_experiments_configfrom products.feature_flags.backend.facade.enums import FlagEvaluationsModefrom products.feature_flags.backend.models.organization_feature_flags_config import OrganizationFeatureFlagsConfig@@ -1499,10 +1500,9 @@ class TestProjectAPI(team_api_test_factory()): # type: ignore)self.assertEqual(response.status_code, status.HTTP_200_OK, response.json())self.assertFalse(response.json()["experiment_precomputation_enabled"])- config = TeamExperimentsConfig.objects.get(team_id=self.project.id)- self.assertFalse(config.experiment_precomputation_enabled)- self.assertIsNone(config.precomputation_enabled_set_by)- self.assertTrue(config.default_cuped_enabled)+ experiments_settings = get_team_experiments_settings(self.project.id)+ self.assertFalse(experiments_settings.experiment_precomputation_enabled)+ self.assertTrue(experiments_settings.default_cuped_enabled)def test_experiments_config_changes_are_logged_as_team_activity(self):# The first read creates the config row with defaults, which is not a change anyone made.@@ -1529,7 +1529,7 @@ class TestProjectAPI(team_api_test_factory()): # type: ignoredef test_experiments_config_created_with_non_default_values_is_logged(self):# The Django admin creates the row and sets values in one save, so there is no update to diff.- TeamExperimentsConfig.objects.create(team=self.team, default_cuped_enabled=True)+ set_team_experiments_config(team_id=self.team.id, default_cuped_enabled=True)log = ActivityLog.objects.get(team_id=self.team.id, scope="Team", item_id=str(self.team.id))assert log.detail is not None@@ -1545,8 +1545,9 @@ class TestProjectAPI(team_api_test_factory()): # type: ignoreformat="json",)self.assertEqual(response.status_code, status.HTTP_200_OK, response.json())- config = TeamExperimentsConfig.objects.get(team_id=self.project.id)- self.assertEqual(config.experiment_recalculation_times, ["14:00:00", "02:00:00"])+ self.assertEqual(+ get_team_experiments_settings(self.project.id).experiment_recalculation_times, ("14:00:00", "02:00:00")+ )# Old clients still PATCH the retired experiment_recalculation_time field;# it must be ignored, not rejected.@@ -1556,8 +1557,9 @@ class TestProjectAPI(team_api_test_factory()): # type: ignoreformat="json",)self.assertEqual(response.status_code, status.HTTP_200_OK, response.json())- config.refresh_from_db()- self.assertEqual(config.experiment_recalculation_times, ["14:00:00", "02:00:00"])+ self.assertEqual(+ get_team_experiments_settings(self.project.id).experiment_recalculation_times, ("14:00:00", "02:00:00")+ )response = self.client.patch(f"/api/projects/{self.project.id}/experiments_config/",@@ -1565,8 +1567,7 @@ class TestProjectAPI(team_api_test_factory()): # type: ignoreformat="json",)self.assertEqual(response.status_code, status.HTTP_200_OK, response.json())- config.refresh_from_db()- self.assertIsNone(config.experiment_recalculation_times)+ self.assertIsNone(get_team_experiments_settings(self.project.id).experiment_recalculation_times)@parameterized.expand([diff --git a/posthog/hogql_queries/insight_actors_query_runner.py b/posthog/hogql_queries/insight_actors_query_runner.pyindex ad87a9319abf..8005503cb5c6 100644--- a/posthog/hogql_queries/insight_actors_query_runner.py+++ b/posthog/hogql_queries/insight_actors_query_runner.py@@ -24,7 +24,7 @@ from posthog.hogql.query import execute_hogql_queryfrom posthog.hogql_queries.query_runner import AnalyticsQueryRunner, QueryRunner, get_query_runnerfrom posthog.types import InsightActorsQueryNode-from products.experiments.backend.hogql_queries.experiment_query_runner import ExperimentQueryRunner+from products.experiments.backend.facade.queries import ExperimentQueryRunnerfrom products.product_analytics.backend.facade.queries import (FunnelsQueryRunner,LifecycleQueryRunner,diff --git a/posthog/hogql_queries/query_runner.py b/posthog/hogql_queries/query_runner.pyindex ea089421bd13..fdbfe390ab21 100644--- a/posthog/hogql_queries/query_runner.py+++ b/posthog/hogql_queries/query_runner.py@@ -1280,7 +1280,7 @@ def get_query_runner()if kind == "ExperimentQuery":- from products.experiments.backend.hogql_queries.experiment_query_runner import ExperimentQueryRunner+ from products.experiments.backend.facade.queries import ExperimentQueryRunnerreturn ExperimentQueryRunner(query=query,@@ -1292,9 +1292,7 @@ def get_query_runner()if kind == "ExperimentExposureQuery":- from products.experiments.backend.hogql_queries.experiment_exposures_query_runner import (- ExperimentExposuresQueryRunner,- )+ from products.experiments.backend.facade.queries import ExperimentExposuresQueryRunnerreturn ExperimentExposuresQueryRunner(query=cast(ExperimentExposureQuery | dict[str, Any], query),diff --git a/posthog/models/product_intent/product_intent.py b/posthog/models/product_intent/product_intent.pyindex 5b5d484225f4..a9b00deaf58d 100644--- a/posthog/models/product_intent/product_intent.py+++ b/posthog/models/product_intent/product_intent.py@@ -22,7 +22,6 @@ from posthog.utils import get_instance_realm, get_safe_cache, safe_cache_delete,from products.dashboards.backend.models.dashboard import Dashboardfrom products.event_definitions.backend.models.event_definition import EventDefinition-from products.experiments.backend.models.experiment import Experimentfrom products.feature_flags.backend.models.feature_flag import FeatureFlagfrom products.product_analytics.backend.facade.models import Insightfrom products.product_tours.backend.models import ProductTour@@ -112,10 +111,11 @@ class ProductIntent(UUIDTModel, RootTeamMixin):return Falsedef has_activated_experiments(self) -> bool:- # the team has any launched experiments- return Experiment.objects.filter(- team=self.team, status__in=[Experiment.Status.RUNNING, Experiment.Status.STOPPED]- ).exists()+ # Local import: this module loads during django.setup() (via posthog.models), and the+ # experiments facade API imports posthog.schema, which must stay off the startup path.+ from products.experiments.backend.facade import api as experiments # noqa: PLC0415++ return experiments.team_has_launched_experiments(self.team_id)def has_activated_error_tracking(self) -> bool:# the team has resolved any issues@@ -129,8 +129,11 @@ class ProductIntent(UUIDTModel, RootTeamMixin):return Survey.objects.filter(team__project_id=self.team.project_id, start_date__isnull=False).exists()def has_activated_feature_flags(self) -> bool:+ # Local import: see has_activated_experiments.+ from products.experiments.backend.facade import api as experiments # noqa: PLC0415+# Get feature flags that have at least one filter group, excluding ones used by experiments, surveys, and product tours- experiment_flags = Experiment.objects.filter(team=self.team).values_list("feature_flag_id", flat=True)+ experiment_flags = experiments.experiment_flag_ids([self.team_id], include_deleted=True)survey_flags = Survey.objects.filter(team=self.team).values_list("targeting_flag_id", flat=True)product_tour_flags = ProductTour.all_objects.filter(team=self.team).values_list("internal_targeting_flag_id", flat=Truediff --git a/posthog/models/test/test_product_intent.py b/posthog/models/test/test_product_intent.pyindex 691f3747010c..eb4a0995b4fe 100644--- a/posthog/models/test/test_product_intent.py+++ b/posthog/models/test/test_product_intent.py@@ -26,7 +26,7 @@ from posthog.utils import get_instance_realmfrom products.dashboards.backend.models.dashboard import Dashboardfrom products.event_definitions.backend.models.event_definition import EventDefinition-from products.experiments.backend.models.experiment import Experiment+from products.experiments.backend.facade.testing import create_experimentfrom products.feature_flags.backend.models.feature_flag import FeatureFlagfrom products.product_analytics.backend.facade.models import Insightfrom products.surveys.backend.models import Survey@@ -175,7 +175,7 @@ class TestProductIntent(BaseTest):)# Create an experiment without a start date (not launched)- Experiment.objects.create(team=self.team, name="Not launched", feature_flag=feature_flag)+ create_experiment(team_id=self.team.id, name="Not launched", feature_flag_id=feature_flag.id)self.assertFalse(self.product_intent.has_activated_experiments())# Create another feature flag for the launched experiment@@ -187,8 +187,8 @@ class TestProductIntent(BaseTest):)# Create an experiment with a start date (launched)- Experiment.objects.create(- team=self.team, name="Launched", start_date=datetime.now(tz=UTC), feature_flag=launched_flag+ create_experiment(+ team_id=self.team.id, name="Launched", start_date=datetime.now(tz=UTC), feature_flag_id=launched_flag.id)self.assertTrue(self.product_intent.has_activated_experiments())@@ -242,7 +242,7 @@ class TestProductIntent(BaseTest):name="Feature Flag for Experiment Test",filters={"groups": [{"properties": [{"key": "email", "value": "[email protected]"}]}]},)- Experiment.objects.create(team=self.team, name="Experiment Test", feature_flag=feature_flag)+ create_experiment(team_id=self.team.id, name="Experiment Test", feature_flag_id=feature_flag.id)survey_flag = FeatureFlag.objects.create(team=self.team,key="targeting-flag-for-survey-test",diff --git a/posthog/temporal/tests/weekly_digest/test_activities.py b/posthog/temporal/tests/weekly_digest/test_activities.pyindex 15c294e80745..2cbe3e255c6b 100644--- a/posthog/temporal/tests/weekly_digest/test_activities.py+++ b/posthog/temporal/tests/weekly_digest/test_activities.py@@ -75,7 +75,7 @@ from posthog.token_bucket import BucketDecision, BucketUnavailablefrom products.dashboards.backend.models.dashboard import Dashboardfrom products.error_tracking.backend.facade.testing import create_issuefrom products.event_definitions.backend.models.event_definition import EventDefinition-from products.experiments.backend.models.experiment import Experiment+from products.experiments.backend.facade.testing import create_experimentfrom products.feature_flags.backend.models.feature_flag import FeatureFlagfrom products.growth.backend.models import ProductPushCampaignfrom products.surveys.backend.models import Survey@@ -186,11 +186,11 @@ def _make_event_definitions(team: Team, other_team: Team, digest: Digest) -> lisreturn ["new_event"]-def _make_experiment(team: Team, name: str, **fields: Any) -> Experiment:+def _make_experiment(team: Team, name: str, **fields: Any) -> int:flag = FeatureFlag.objects.create(team=team, key=f"flag-{uuid4().hex[:8]}", name=f"Feature Flag for Experiment {name}")- return Experiment.objects.create(team=team, feature_flag=flag, name=name, **fields)+ return create_experiment(team_id=team.id, feature_flag_id=flag.id, name=name, **fields)def _make_experiments_launched(team: Team, other_team: Team, digest: Digest) -> list[str]:@@ -319,6 +319,25 @@ def test_generic_lookup_stores_only_this_teams_rows_from_the_window(assert redis_servers.digest.keys(f"{digest.key}-{key_kind}-*") == [key]+def test_experiment_completed_lookup_stores_both_dates(team, redis_servers, common_input, digest):+ start_date = (digest.period_start - timedelta(days=30)).replace(microsecond=0)+ end_date = (digest.period_end - timedelta(days=1)).replace(microsecond=0)+ experiment_id = _make_experiment(team, "Completed", start_date=start_date, end_date=end_date)++ run_sync(generate_experiment_completed_lookup, batch_input(team, digest, common_input))++ stored = json.loads(redis_servers.digest.get(team_data_key(digest.key, TeamDataKey.EXPERIMENTS_COMPLETED, team.id)))+ assert stored == [+ {+ "name": "Completed",+ "id": experiment_id,+ "start_date": start_date.isoformat().replace("+00:00", "Z"),+ "end_date": end_date.isoformat().replace("+00:00", "Z"),+ }+ ]++@pytest.mark.django_db@pytest.mark.parametrize("error_tracking_result,expected",diff --git a/posthog/temporal/weekly_digest/activities.py b/posthog/temporal/weekly_digest/activities.pyindex 947c7f55f3eb..054a1255243c 100644--- a/posthog/temporal/weekly_digest/activities.py+++ b/posthog/temporal/weekly_digest/activities.py@@ -1,10 +1,11 @@import jsonimport mathimport time+import dataclassesfrom collections import defaultdictfrom collections.abc import Callable, Iterable, Sequencefrom datetime import UTC, datetime-from typing import Any, ParamSpec, TypeVar+from typing import Any, ParamSpec, Protocol, TypeVarfrom uuid import UUIDfrom django.conf import settings@@ -48,8 +49,6 @@ from posthog.temporal.common.metrics import get_metric_meterfrom posthog.temporal.common.utils import asyncify, make_sync_retryable_with_exponential_backofffrom posthog.temporal.weekly_digest.keys import TeamDataKey, UserDataKey, org_digest_key, team_data_key, user_data_keyfrom posthog.temporal.weekly_digest.queries import (- query_experiments_completed,- query_experiments_launched,query_new_dashboards,query_new_error_issues,query_new_event_definitions,@@ -92,6 +91,8 @@ from posthog.token_bucket import BucketDecision, Budget, consumefrom posthog.utils import get_instance_regionfrom products.error_tracking.backend.facade.api import get_new_issues_for_team+from products.experiments.backend.facade import api as experiments_api+from products.experiments.backend.facade.contracts import DigestCompletedExperiment, DigestLaunchedExperimentfrom products.growth.backend.product_push.selection import project_uses_product, resolve_product_path# Every activity below is a sync body behind `@asyncify`, which runs it on the worker's thread pool.@@ -215,12 +216,10 @@ def _eligible_team_ids(input: GenerateDigestDataBatchInput) -> set[int]:return set(_teams_in_range(input).values_list("id", flat=True))-def _rows_by_team(- input: GenerateDigestDataBatchInput, rows: QuerySet, eligible_team_ids: set[int]-) -> dict[int, list[dict[str, Any]]]:- """Group one range-wide query by team, dropping teams the digest does not cover (demo, internal)."""+def _rows_by_team(rows: Iterable[dict[str, Any]], eligible_team_ids: set[int]) -> dict[int, list[dict[str, Any]]]:+ """Group the rows of one team id range by team, dropping teams the digest does not cover (demo, internal)."""rows_by_team: dict[int, list[dict[str, Any]]] = defaultdict(list)- for row in _rows_in_range(input, rows):+ for row in rows:if row["team_id"] in eligible_team_ids:rows_by_team[row["team_id"]].append(row)return rows_by_team@@ -244,9 +243,14 @@ def _resources_by_team(rows: QuerySet = query_func(input.digest.period_start, input.digest.period_end)if per_team_limit is not None:rows = _limit_per_team(rows, per_team_limit)+ return _validate_by_team(logger, _rows_by_team(_rows_in_range(input, rows), eligible_team_ids), resource_type)++def _validate_by_team(+ logger: FilteringBoundLogger, rows_by_team: dict[int, list[dict[str, Any]]], resource_type: DigestResourceType+) -> dict[int, Any]:resources_by_team: dict[int, Any] = {}- for team_id, team_rows in _rows_by_team(input, rows, eligible_team_ids).items():+ for team_id, team_rows in rows_by_team.items():try:resources_by_team[team_id] = resource_type.model_validate(team_rows)except ValidationError as e:@@ -317,15 +321,35 @@ def generate_event_definition_lookup(input: GenerateDigestDataBatchInput) -> Non)+class _ListDigestExperiments(Protocol):+ def __call__(+ self, *, period_start: datetime, period_end: datetime, team_ids: range+ ) -> Iterable[DigestLaunchedExperiment | DigestCompletedExperiment]: ...+++def _generate_experiment_lookup(+ input: GenerateDigestDataBatchInput, key_kind: TeamDataKey, list_experiments: _ListDigestExperiments+) -> None:+ logger = _bind_batch_logger(input)+ logger.info("Generating digest data batch", key_kind=key_kind)++ eligible_team_ids = _eligible_team_ids(input)+ experiments = list_experiments(+ period_start=input.digest.period_start,+ period_end=input.digest.period_end,+ team_ids=range(input.team_id_range.start, input.team_id_range.end),+ )+ rows_by_team = _rows_by_team((dataclasses.asdict(experiment) for experiment in experiments), eligible_team_ids)+ resources_by_team = _validate_by_team(logger, rows_by_team, ExperimentList)+ _store_resources(input, logger, key_kind, resources_by_team, eligible_team_ids)++@activity.defn(name="generate-experiment-completed-lookup")@asyncifydef generate_experiment_completed_lookup(input: GenerateDigestDataBatchInput) -> None:with HeartbeaterSync(logger=LOGGER):- generate_digest_data_lookup(- input,- key_kind=TeamDataKey.EXPERIMENTS_COMPLETED,- query_func=query_experiments_completed,- resource_type=ExperimentList,+ _generate_experiment_lookup(+ input, TeamDataKey.EXPERIMENTS_COMPLETED, experiments_api.list_completed_experiments_for_digest)@@ -333,11 +357,8 @@ def generate_experiment_completed_lookup(input: GenerateDigestDataBatchInput) ->@asyncifydef generate_experiment_launched_lookup(input: GenerateDigestDataBatchInput) -> None:with HeartbeaterSync(logger=LOGGER):- generate_digest_data_lookup(- input,- key_kind=TeamDataKey.EXPERIMENTS_LAUNCHED,- query_func=query_experiments_launched,- resource_type=ExperimentList,+ _generate_experiment_lookup(+ input, TeamDataKey.EXPERIMENTS_LAUNCHED, experiments_api.list_launched_experiments_for_digest)@@ -390,7 +411,8 @@ def _generate_filter_lookup(input: GenerateDigestDataBatchInput) -> None:eligible_team_ids = _eligible_team_ids(input)rows_by_team = _rows_by_team(- input, query_saved_filters(input.digest.period_start, input.digest.period_end), eligible_team_ids+ _rows_in_range(input, query_saved_filters(input.digest.period_start, input.digest.period_end)),+ eligible_team_ids,)with redis.Redis.from_url(input.common.django_redis_url) as django_cache:playlist_counts = _load_playlist_counts_from_django_cache(diff --git a/posthog/temporal/weekly_digest/queries.py b/posthog/temporal/weekly_digest/queries.pyindex 5ec339fa36db..fb046424503b 100644--- a/posthog/temporal/weekly_digest/queries.py+++ b/posthog/temporal/weekly_digest/queries.py@@ -13,7 +13,6 @@ from posthog.session_recordings.models.session_recording_playlist import Sessionfrom products.dashboards.backend.models.dashboard import Dashboardfrom products.error_tracking.backend.facade.api import query_new_error_issues as query_new_error_issuesfrom products.event_definitions.backend.models.event_definition import EventDefinition-from products.experiments.backend.models.experiment import Experimentfrom products.feature_flags.backend.models.feature_flag import FeatureFlagfrom products.growth.backend.models import ProductPushCampaignfrom products.surveys.backend.models import Survey@@ -87,26 +86,6 @@ def query_new_event_definitions(period_start: datetime, period_end: datetime) ->)-def query_experiments_launched(period_start: datetime, period_end: datetime) -> QuerySet:- return (- Experiment.objects.filter(- start_date__gt=period_start,- start_date__lte=period_end,- )- .exclude(- end_date__gt=period_start,- end_date__lte=period_end,- )- .values("team_id", "name", "id", "start_date")- )---def query_experiments_completed(period_start: datetime, period_end: datetime) -> QuerySet:- return Experiment.objects.filter(end_date__gt=period_start, end_date__lte=period_end).values(- "team_id", "name", "id", "start_date", "end_date"- )--def query_new_external_data_sources(period_start: datetime, period_end: datetime) -> QuerySet:return ExternalDataSource.objects.filter(created_at__gt=period_start, created_at__lte=period_end, deleted=Falsediff --git a/posthog/test/playwright_setup_functions.py b/posthog/test/playwright_setup_functions.pyindex a82a6f9bef70..e2da65d5deb1 100644--- a/posthog/test/playwright_setup_functions.py+++ b/posthog/test/playwright_setup_functions.py@@ -21,7 +21,8 @@ from posthog.models.utils import hash_key_value, mask_key_valuefrom products.dashboards.backend.models.dashboard import Dashboardfrom products.dashboards.backend.models.dashboard_tile import DashboardTile-from products.experiments.backend.models.experiment import Experiment+from products.experiments.backend.facade import api as experiments_api+from products.experiments.backend.facade.contracts import CreateExperimentInput, Experimentfrom products.product_analytics.backend.facade.models import Insight, InsightVariable@@ -290,7 +291,7 @@ def create_organization_with_team(),created_experiments=([- PlaywrightSetupCreatedExperiment(id=e.id, feature_flag_key=e.feature_flag.key)+ PlaywrightSetupCreatedExperiment(id=e.id, feature_flag_key=e.feature_flag_key)for e in created_experiments]if created_experiments@@ -401,21 +402,22 @@ def _create_experiments(if not data.experiments:return []- from products.experiments.backend.experiment_service import ExperimentService-- service = ExperimentService(team=team, user=user)created: list[Experiment] = []for exp_spec in data.experiments:start_date = Noneif exp_spec.start_date:start_date = datetime.fromisoformat(exp_spec.start_date.replace("Z", "+00:00"))- experiment = service.create_experiment(- name=exp_spec.name,- feature_flag_key=exp_spec.feature_flag_key,- metrics=exp_spec.metrics,- metrics_secondary=exp_spec.metrics_secondary,- start_date=start_date,+ experiment = experiments_api.create_experiment(+ team=team,+ user=user,+ input_dto=CreateExperimentInput(+ name=exp_spec.name,+ feature_flag_key=exp_spec.feature_flag_key,+ metrics=exp_spec.metrics,+ metrics_secondary=exp_spec.metrics_secondary,+ start_date=start_date,+ ),)created.append(experiment)return createddiff --git a/products/experiments/backend/hogql_queries/types.py b/products/experiments/backend/hogql_queries/types.pydeleted file mode 100644index a164abc8a7e1..000000000000--- a/products/experiments/backend/hogql_queries/types.py+++ /dev/null@@ -1,3 +0,0 @@-from products.experiments.backend.facade.enums import PrecomputeSkipReason--__all__ = ["PrecomputeSkipReason"]