Skip to content

: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.

chore(queries): replace the filters cached_property helper (#119085)

Phil Haackc6a9c4ab0456
diff --git a/posthog/hogql_queries/data_warehouse_mixin.py b/posthog/hogql_queries/data_warehouse_mixin.py
index c35cc4fc5fcc..61a397e7c029 100644
--- a/posthog/hogql_queries/data_warehouse_mixin.py
+++ b/posthog/hogql_queries/data_warehouse_mixin.py
@@ -1,9 +1,9 @@
+from functools import cached_property
+
from posthog.schema import ActionsNode, DataWarehouseNode, EventsNode, GroupNode
from posthog.hogql import ast
-from posthog.models.filters.mixins.utils import cached_property
-
class DataWarehouseInsightQueryMixin:
series: EventsNode | ActionsNode | DataWarehouseNode | GroupNode
diff --git a/posthog/hogql_queries/endpoints/endpoints_usage_overview.py b/posthog/hogql_queries/endpoints/endpoints_usage_overview.py
index 4fbd838f1b8b..c4c26d20a967 100644
--- a/posthog/hogql_queries/endpoints/endpoints_usage_overview.py
+++ b/posthog/hogql_queries/endpoints/endpoints_usage_overview.py
@@ -1,3 +1,5 @@
+from functools import cached_property
+
from posthog.schema import (
CachedEndpointsUsageOverviewQueryResponse,
EndpointsUsageOverviewItem,
@@ -11,7 +13,6 @@ from posthog.hogql.query import execute_hogql_query
from posthog.hogql_queries.endpoints.endpoints_usage_query_runner import EndpointsUsageQueryRunner
from posthog.hogql_queries.utils.query_previous_period_date_range import QueryPreviousPeriodDateRange
-from posthog.models.filters.mixins.utils import cached_property
class EndpointsUsageOverviewQueryRunner(EndpointsUsageQueryRunner[EndpointsUsageOverviewQueryResponse]):
diff --git a/posthog/hogql_queries/endpoints/endpoints_usage_query_runner.py b/posthog/hogql_queries/endpoints/endpoints_usage_query_runner.py
index 3884df5f71e4..a74c52305bf0 100644
--- a/posthog/hogql_queries/endpoints/endpoints_usage_query_runner.py
+++ b/posthog/hogql_queries/endpoints/endpoints_usage_query_runner.py
@@ -1,6 +1,7 @@
import typing
from abc import ABC
from datetime import datetime
+from functools import cached_property
from typing import Union, cast
from posthog.schema import EndpointsUsageOverviewQuery, EndpointsUsageTableQuery, EndpointsUsageTrendsQuery
@@ -9,7 +10,6 @@ from posthog.hogql import ast
from posthog.hogql_queries.query_runner import AnalyticsQueryResponseProtocol, AnalyticsQueryRunner
from posthog.hogql_queries.utils.query_date_range import QueryDateRange
-from posthog.models.filters.mixins.utils import cached_property
EndpointsUsageQueryNode = Union[
EndpointsUsageOverviewQuery,
diff --git a/posthog/hogql_queries/endpoints/endpoints_usage_trends.py b/posthog/hogql_queries/endpoints/endpoints_usage_trends.py
index b622cffbcb8c..d8e28471a54e 100644
--- a/posthog/hogql_queries/endpoints/endpoints_usage_trends.py
+++ b/posthog/hogql_queries/endpoints/endpoints_usage_trends.py
@@ -1,4 +1,5 @@
from datetime import datetime
+from functools import cached_property
from typing import cast
from posthog.schema import (
@@ -14,7 +15,6 @@ from posthog.hogql.query import execute_hogql_query
from posthog.hogql_queries.endpoints.endpoints_usage_query_runner import EndpointsUsageQueryRunner
from posthog.hogql_queries.utils.query_date_range import QueryDateRange
-from posthog.models.filters.mixins.utils import cached_property
class EndpointsUsageTrendsQueryRunner(EndpointsUsageQueryRunner[EndpointsUsageTrendsQueryResponse]):
diff --git a/posthog/hogql_queries/insight_actors_query_options_runner.py b/posthog/hogql_queries/insight_actors_query_options_runner.py
index 809763365e16..0be97614d6ec 100644
--- a/posthog/hogql_queries/insight_actors_query_options_runner.py
+++ b/posthog/hogql_queries/insight_actors_query_options_runner.py
@@ -1,3 +1,4 @@
+from functools import cached_property
from typing import Any, Optional, cast
from posthog.schema import (
@@ -13,7 +14,6 @@ from posthog.hogql.timings import HogQLTimings
from posthog.hogql_queries.query_runner import QueryRunner, get_query_runner, query_node_modifiers
from posthog.models import Team
-from posthog.models.filters.mixins.utils import cached_property
from posthog.models.user import User
from products.product_analytics.backend.facade.queries import (
diff --git a/posthog/hogql_queries/insight_actors_query_runner.py b/posthog/hogql_queries/insight_actors_query_runner.py
index 133b97b52582..b9063a7efb32 100644
--- a/posthog/hogql_queries/insight_actors_query_runner.py
+++ b/posthog/hogql_queries/insight_actors_query_runner.py
@@ -1,3 +1,4 @@
+from functools import cached_property
from typing import Any, Optional, cast
from posthog.schema import (
@@ -26,7 +27,6 @@ from posthog.hogql.timings import HogQLTimings
from posthog.hogql_queries.query_runner import AnalyticsQueryRunner, QueryRunner, get_query_runner, query_node_modifiers
from posthog.models import Team
-from posthog.models.filters.mixins.utils import cached_property
from posthog.models.user import User
from posthog.types import InsightActorsQueryNode
diff --git a/posthog/hogql_queries/properties_timeline/properties_timeline.py b/posthog/hogql_queries/properties_timeline/properties_timeline.py
index 69562c0df963..178ae27d5413 100644
--- a/posthog/hogql_queries/properties_timeline/properties_timeline.py
+++ b/posthog/hogql_queries/properties_timeline/properties_timeline.py
@@ -103,7 +103,7 @@ class PropertiesTimeline:
else (property_type == "group" and property_group_type_index == filter.aggregation_group_type_index)
)
- property_filters = filter.property_groups.flat
+ property_filters = list(filter.property_groups.flat)
for event in filter.entities:
property_filters.extend(event.property_groups.flat)
all_property_identifiers = extract_tables_and_properties(property_filters, team_id=team_id)
diff --git a/posthog/models/filters/mixins/common.py b/posthog/models/filters/mixins/common.py
index 19d360e07167..3588a5401116 100644
--- a/posthog/models/filters/mixins/common.py
+++ b/posthog/models/filters/mixins/common.py
@@ -1,5 +1,6 @@
import json
import datetime
+from functools import cached_property
from math import ceil
from typing import Any, Literal, Optional, Union
from zoneinfo import ZoneInfo
@@ -41,7 +42,7 @@ from posthog.constants import (
)
from posthog.models.entity import Entity
from posthog.models.filters.mixins.base import BaseParamMixin, BreakdownType
-from posthog.models.filters.mixins.utils import cached_property, include_dict, include_query_tags, process_bool
+from posthog.models.filters.mixins.utils import include_dict, include_query_tags, process_bool
from posthog.models.filters.utils import GroupTypeIndex, validate_group_type_index
from posthog.utils import DEFAULT_DATE_FROM_DAYS, relative_date_parse_with_delta_mapping
diff --git a/posthog/models/filters/mixins/groups.py b/posthog/models/filters/mixins/groups.py
index 1bae3747650d..60e291d4fa7c 100644
--- a/posthog/models/filters/mixins/groups.py
+++ b/posthog/models/filters/mixins/groups.py
@@ -1,8 +1,9 @@
+from functools import cached_property
from typing import Optional
from posthog.constants import AGGREGATION_GROUP_TYPE_INDEX
from posthog.models.filters.mixins.common import BaseParamMixin
-from posthog.models.filters.mixins.utils import cached_property, include_dict
+from posthog.models.filters.mixins.utils import include_dict
from posthog.models.filters.utils import GroupTypeIndex, validate_group_type_index
diff --git a/posthog/models/filters/mixins/interval.py b/posthog/models/filters/mixins/interval.py
index 22db741e8abc..85e20b4a6aa5 100644
--- a/posthog/models/filters/mixins/interval.py
+++ b/posthog/models/filters/mixins/interval.py
@@ -1,9 +1,10 @@
+from functools import cached_property
from typing import cast
from posthog.constants import INTERVAL
from posthog.models.filters.mixins.base import IntervalType
from posthog.models.filters.mixins.common import DateMixin
-from posthog.models.filters.mixins.utils import cached_property, include_dict
+from posthog.models.filters.mixins.utils import include_dict
class IntervalMixin(DateMixin): # Interval doesn't make sense without a date range
diff --git a/posthog/models/filters/mixins/property.py b/posthog/models/filters/mixins/property.py
index 74ca8036861b..bacfe1650251 100644
--- a/posthog/models/filters/mixins/property.py
+++ b/posthog/models/filters/mixins/property.py
@@ -1,10 +1,11 @@
import json
+from functools import cached_property
from rest_framework.exceptions import ValidationError
from posthog.constants import PROPERTIES
from posthog.models.filters.mixins.base import BaseParamMixin
-from posthog.models.filters.mixins.utils import cached_property, include_dict, include_query_tags
+from posthog.models.filters.mixins.utils import include_dict, include_query_tags
from posthog.models.property import Property, PropertyGroup
from posthog.models.property.parse import parse_properties, parse_property_group_data
diff --git a/posthog/models/filters/mixins/utils.py b/posthog/models/filters/mixins/utils.py
index ab64a27f9fb2..d205ec03b64d 100644
--- a/posthog/models/filters/mixins/utils.py
+++ b/posthog/models/filters/mixins/utils.py
@@ -1,18 +1,7 @@
-from collections.abc import Callable
-from functools import lru_cache
-from typing import Optional, TypeVar, Union
+from typing import Optional, Union
from posthog.utils import str_to_bool
-T = TypeVar("T")
-
-
-# Each decorated function gets one cache slot. Every instance in the process shares it. The slot keys
-# on the instance's __hash__ and __eq__, so a class that compares by value, such as a Django model,
-# gets the result that another equal instance cached. Use functools.cached_property instead.
-def cached_property(func: Callable[..., T]) -> T:
- return property(lru_cache(maxsize=1)(func)) # type: ignore
-
def include_dict(f):
f.include_dict = True
diff --git a/posthog/models/property/property.py b/posthog/models/property/property.py
index 02c65e8f405c..805288823a71 100644
--- a/posthog/models/property/property.py
+++ b/posthog/models/property/property.py
@@ -1,10 +1,10 @@
import json
import math
from enum import StrEnum
+from functools import cached_property
from typing import Any, Literal, Optional, Union, cast
from posthog.constants import PropertyOperatorType
-from posthog.models.filters.mixins.utils import cached_property
from posthog.models.filters.utils import GroupTypeIndex, validate_group_type_index
# Relocated to the Django-free posthog.property_columns module so the HogQL engine can use them
diff --git a/products/demo/backend/logic/legacy/web_data_generator.py b/products/demo/backend/logic/legacy/web_data_generator.py
index bb525f192452..29014386cea2 100644
--- a/products/demo/backend/logic/legacy/web_data_generator.py
+++ b/products/demo/backend/logic/legacy/web_data_generator.py
@@ -1,6 +1,7 @@
import json
import random
from datetime import timedelta
+from functools import cached_property
from pathlib import Path
from typing import Any
@@ -11,7 +12,6 @@ from dateutil.relativedelta import relativedelta
from posthog.schema import ActionsNode, FunnelsQuery, InsightVizNode
from posthog.models import Person, PropertyDefinition
-from posthog.models.filters.mixins.utils import cached_property
from posthog.models.utils import UUIDT
from products.actions.backend.models.action import Action
diff --git a/products/error_tracking/backend/hogql_queries/error_tracking_query_runner.py b/products/error_tracking/backend/hogql_queries/error_tracking_query_runner.py
index 8853a52f4ec8..e52b6d754237 100644
--- a/products/error_tracking/backend/hogql_queries/error_tracking_query_runner.py
+++ b/products/error_tracking/backend/hogql_queries/error_tracking_query_runner.py
@@ -1,4 +1,5 @@
import datetime
+from functools import cached_property
from zoneinfo import ZoneInfo
from django.db import OperationalError
@@ -17,7 +18,6 @@ from posthog.hogql.query import execute_hogql_query
from posthog.hogql_queries.paginators import HogQLHasMorePaginator
from posthog.hogql_queries.query_runner import AnalyticsQueryRunner
-from posthog.models.filters.mixins.utils import cached_property
from posthog.utils import relative_date_parse
from products.error_tracking.backend.hogql_queries.access import ErrorTrackingQueryRunnerAccessMixin
diff --git a/products/logs/backend/group_by_query_runner.py b/products/logs/backend/group_by_query_runner.py
index 23e5cdf8503b..a5ca4c4c18a9 100644
--- a/products/logs/backend/group_by_query_runner.py
+++ b/products/logs/backend/group_by_query_runner.py
@@ -1,4 +1,5 @@
from collections.abc import Sequence
+from functools import cached_property
from typing import TYPE_CHECKING, NamedTuple
from zoneinfo import ZoneInfo
@@ -15,7 +16,6 @@ from posthog.hogql.query import execute_hogql_query
from posthog.clickhouse.client.connection import Workload
from posthog.hogql_queries.query_runner import AnalyticsQueryRunner
-from posthog.models.filters.mixins.utils import cached_property
from products.logs.backend.logs_query_runner import LogsQueryResponse, LogsQueryRunnerMixin
diff --git a/products/logs/backend/log_attributes_query_runner.py b/products/logs/backend/log_attributes_query_runner.py
index e12e25c99778..0e77508d46b7 100644
--- a/products/logs/backend/log_attributes_query_runner.py
+++ b/products/logs/backend/log_attributes_query_runner.py
@@ -1,4 +1,5 @@
import datetime as dt
+from functools import cached_property
from zoneinfo import ZoneInfo
from posthog.schema import IntervalType, LogAttributeResult, LogAttributesQuery, LogAttributesQueryResponse, MatchedOn
@@ -11,7 +12,6 @@ from posthog.hogql.query import execute_hogql_query
from posthog.clickhouse.client.connection import Workload
from posthog.hogql_queries.query_runner import AnalyticsQueryRunner
from posthog.hogql_queries.utils.query_date_range import QueryDateRange
-from posthog.models.filters.mixins.utils import cached_property
from products.logs.backend.logs_query_runner import LogsQueryRunnerMixin, ilike_pattern
diff --git a/products/logs/backend/log_values_query_runner.py b/products/logs/backend/log_values_query_runner.py
index 3b958f4370c5..b135a9afc80e 100644
--- a/products/logs/backend/log_values_query_runner.py
+++ b/products/logs/backend/log_values_query_runner.py
@@ -1,4 +1,5 @@
import datetime as dt
+from functools import cached_property
from zoneinfo import ZoneInfo
from posthog.schema import IntervalType, LogValueResult, LogValuesQuery, LogValuesQueryResponse
@@ -11,7 +12,6 @@ from posthog.hogql.query import execute_hogql_query
from posthog.clickhouse.client.connection import Workload
from posthog.hogql_queries.query_runner import AnalyticsQueryRunner
from posthog.hogql_queries.utils.query_date_range import QueryDateRange
-from posthog.models.filters.mixins.utils import cached_property
from products.logs.backend.logs_query_runner import LogsQueryRunnerMixin, ilike_pattern
diff --git a/products/logs/backend/logs_query_runner.py b/products/logs/backend/logs_query_runner.py
index 3f906a38c00c..2ab6efb2d675 100644
--- a/products/logs/backend/logs_query_runner.py
+++ b/products/logs/backend/logs_query_runner.py
@@ -1,6 +1,7 @@
import json
import base64
import datetime as dt
+from functools import cached_property
from typing import TYPE_CHECKING, cast
from zoneinfo import ZoneInfo
@@ -27,7 +28,6 @@ from posthog.clickhouse.client.connection import Workload
from posthog.hogql_queries.paginators import HogQLHasMorePaginator
from posthog.hogql_queries.query_runner import AnalyticsQueryRunner, QueryRunner
from posthog.hogql_queries.utils.query_date_range import QueryDateRange
-from posthog.models.filters.mixins.utils import cached_property
from posthog.models.person.person import MAX_LIMIT_DISTINCT_IDS, get_distinct_ids_for_subquery
from posthog.models.person.util import get_person_by_pk_or_uuid
from posthog.personhog_client.caller_tag import personhog_caller_tag
diff --git a/products/logs/backend/sparkline_query_runner.py b/products/logs/backend/sparkline_query_runner.py
index 764cbe3dbc20..f48ae5ebec0d 100644
--- a/products/logs/backend/sparkline_query_runner.py
+++ b/products/logs/backend/sparkline_query_runner.py
@@ -1,3 +1,4 @@
+from functools import cached_property
from zoneinfo import ZoneInfo
from posthog.schema import LogsSparklineBreakdownBy, LogsSparklineRankBy
@@ -9,7 +10,6 @@ from posthog.hogql.query import execute_hogql_query
from posthog.clickhouse.client.connection import Workload
from posthog.hogql_queries.utils.breakdowns import BREAKDOWN_OTHER_STRING_LABEL
-from posthog.models.filters.mixins.utils import cached_property
from products.logs.backend.logs_query_runner import LogsQueryResponse, LogsQueryRunner
diff --git a/products/product_analytics/backend/hogql_queries/funnels/funnels_query_runner.py b/products/product_analytics/backend/hogql_queries/funnels/funnels_query_runner.py
index 585ce7ef0606..8457315290c4 100644
--- a/products/product_analytics/backend/hogql_queries/funnels/funnels_query_runner.py
+++ b/products/product_analytics/backend/hogql_queries/funnels/funnels_query_runner.py
@@ -1,7 +1,7 @@
import json
from collections.abc import Callable, Sequence
from datetime import datetime, timedelta
-from functools import partial
+from functools import cached_property, partial
from math import ceil
from typing import Any, Optional, TypeVar, cast
@@ -47,7 +47,6 @@ from posthog.hogql_queries.utils.query_previous_period_date_range import QueryPr
from posthog.hogql_queries.validation.rules import DisallowUnsupportedDataWarehouseSettings
from posthog.hogql_queries.validation.validation import QueryValidationRule
from posthog.models import Team
-from posthog.models.filters.mixins.utils import cached_property
from posthog.models.user import User
from products.cohorts.backend.models.cohort import Cohort
diff --git a/products/product_analytics/backend/hogql_queries/lifecycle/lifecycle_query_runner.py b/products/product_analytics/backend/hogql_queries/lifecycle/lifecycle_query_runner.py
index d944700298e5..6bbe3d62852d 100644
--- a/products/product_analytics/backend/hogql_queries/lifecycle/lifecycle_query_runner.py
+++ b/products/product_analytics/backend/hogql_queries/lifecycle/lifecycle_query_runner.py
@@ -1,5 +1,6 @@
from collections.abc import Sequence
from datetime import datetime, timedelta
+from functools import cached_property
from math import ceil
from typing import Any, Optional
@@ -33,7 +34,6 @@ from posthog.hogql_queries.utils.query_date_range import QueryDateRange, compare
from posthog.hogql_queries.utils.timestamp_utils import format_label_date, get_earliest_timestamp_from_series
from posthog.hogql_queries.validation.rules import DisallowUnsupportedDataWarehouseSettings, RequireAtLeastOneSeries
from posthog.hogql_queries.validation.validation import QueryValidationRule
-from posthog.models.filters.mixins.utils import cached_property
from products.actions.backend.models.action import Action
from products.product_analytics.backend.hogql_queries.lifecycle.lifecycle_validation_rules import (
diff --git a/products/product_analytics/backend/hogql_queries/paths/paths_query_runner.py b/products/product_analytics/backend/hogql_queries/paths/paths_query_runner.py
index 292db6053473..698e81a76312 100644
--- a/products/product_analytics/backend/hogql_queries/paths/paths_query_runner.py
+++ b/products/product_analytics/backend/hogql_queries/paths/paths_query_runner.py
@@ -1,6 +1,7 @@
import itertools
from collections import defaultdict
from datetime import datetime, timedelta
+from functools import cached_property
from math import ceil
from re import (
compile as re_compile,
@@ -38,7 +39,6 @@ from posthog.hogql_queries.query_runner import AnalyticsQueryRunner
from posthog.hogql_queries.utils.query_date_range import QueryDateRange
from posthog.hogql_queries.utils.sampling import correct_result_for_sampling
from posthog.models import Team
-from posthog.models.filters.mixins.utils import cached_property
from posthog.models.user import User
from products.product_analytics.backend.hogql_queries.funnels.funnels_query_runner import FunnelsQueryRunner
diff --git a/products/product_analytics/backend/hogql_queries/retention/retention_query_runner.py b/products/product_analytics/backend/hogql_queries/retention/retention_query_runner.py
index acbed7705500..4a584c89d854 100644
--- a/products/product_analytics/backend/hogql_queries/retention/retention_query_runner.py
+++ b/products/product_analytics/backend/hogql_queries/retention/retention_query_runner.py
@@ -1,5 +1,6 @@
from collections.abc import Sequence
from datetime import datetime, timedelta
+from functools import cached_property
from math import ceil
from typing import Any, Literal, Optional, cast
@@ -46,7 +47,6 @@ from posthog.hogql_queries.utils.sampling import correct_result_for_sampling
from posthog.hogql_queries.validation.rules import DisallowUnsupportedDataWarehouseSettings
from posthog.hogql_queries.validation.validation import QueryValidationRule
from posthog.models import Team
-from posthog.models.filters.mixins.utils import cached_property
from posthog.models.user import User
from products.actions.backend.models.action import Action
diff --git a/products/product_analytics/backend/hogql_queries/stickiness/stickiness_query_runner.py b/products/product_analytics/backend/hogql_queries/stickiness/stickiness_query_runner.py
index 86066b27da19..30f19432d356 100644
--- a/products/product_analytics/backend/hogql_queries/stickiness/stickiness_query_runner.py
+++ b/products/product_analytics/backend/hogql_queries/stickiness/stickiness_query_runner.py
@@ -1,5 +1,6 @@
from collections.abc import Sequence
from datetime import timedelta
+from functools import cached_property
from math import ceil
from typing import Any, Optional, cast
@@ -38,7 +39,6 @@ from posthog.hogql_queries.validation.rules import (
)
from posthog.hogql_queries.validation.validation import QueryValidationRule
from posthog.models import Team
-from posthog.models.filters.mixins.utils import cached_property
from posthog.models.user import User
from products.actions.backend.models.action import Action
diff --git a/products/product_analytics/backend/hogql_queries/trends/breakdown.py b/products/product_analytics/backend/hogql_queries/trends/breakdown.py
index b466b6c72b5a..1851f8c6e504 100644
--- a/products/product_analytics/backend/hogql_queries/trends/breakdown.py
+++ b/products/product_analytics/backend/hogql_queries/trends/breakdown.py
@@ -1,4 +1,5 @@
import json
+from functools import cached_property
from typing import Union, cast
from posthog.schema import (
@@ -31,7 +32,6 @@ from posthog.hogql_queries.utils.breakdowns import (
strip_user_aliases,
)
from posthog.hogql_queries.utils.query_date_range import QueryDateRange
-from posthog.models.filters.mixins.utils import cached_property
from posthog.models.team.team import Team
from products.product_analytics.backend.hogql_queries.trends.display import TrendsDisplay
diff --git a/products/product_analytics/backend/hogql_queries/trends/calendar_heatmap_query_runner.py b/products/product_analytics/backend/hogql_queries/trends/calendar_heatmap_query_runner.py
index 97693ed7d466..6d347b85fa27 100644
--- a/products/product_analytics/backend/hogql_queries/trends/calendar_heatmap_query_runner.py
+++ b/products/product_analytics/backend/hogql_queries/trends/calendar_heatmap_query_runner.py
@@ -1,4 +1,5 @@
from datetime import datetime, timedelta
+from functools import cached_property
from math import ceil
from typing import Any, Optional, Union
@@ -38,7 +39,6 @@ from posthog.caching.insights_api import (
from posthog.hogql_queries.query_runner import AnalyticsQueryRunner
from posthog.hogql_queries.utils.query_date_range import QueryDateRange
from posthog.models import Team
-from posthog.models.filters.mixins.utils import cached_property
from posthog.models.user import User
from products.actions.backend.models.action import Action
diff --git a/products/product_analytics/backend/hogql_queries/trends/trends_query_builder.py b/products/product_analytics/backend/hogql_queries/trends/trends_query_builder.py
index 89850c907814..e2ba01af0ac6 100644
--- a/products/product_analytics/backend/hogql_queries/trends/trends_query_builder.py
+++ b/products/product_analytics/backend/hogql_queries/trends/trends_query_builder.py
@@ -1,3 +1,4 @@
+from functools import cached_property
from typing import Any, cast
from posthog.schema import (
@@ -20,7 +21,6 @@ from posthog.hogql.timings import HogQLTimings
from posthog.hogql_queries.data_warehouse_mixin import DataWarehouseInsightQueryMixin
from posthog.hogql_queries.utils.breakdowns import BREAKDOWN_NULL_STRING_LABEL, BREAKDOWN_OTHER_STRING_LABEL
from posthog.hogql_queries.utils.query_date_range import QueryDateRange
-from posthog.models.filters.mixins.utils import cached_property
from posthog.models.team.team import Team
from posthog.ph_client import feature_enabled_or_false
diff --git a/products/product_analytics/backend/hogql_queries/trends/trends_query_runner.py b/products/product_analytics/backend/hogql_queries/trends/trends_query_runner.py
index ec351fdae81a..10798a2da471 100644
--- a/products/product_analytics/backend/hogql_queries/trends/trends_query_runner.py
+++ b/products/product_analytics/backend/hogql_queries/trends/trends_query_runner.py
@@ -1,7 +1,7 @@
from collections.abc import Sequence
from copy import deepcopy
from datetime import date, datetime, timedelta
-from functools import partial
+from functools import cached_property, partial
from math import ceil
from operator import itemgetter
from typing import Any, Optional, Union
@@ -77,7 +77,6 @@ from posthog.hogql_queries.validation.rules import (
)
from posthog.hogql_queries.validation.validation import QueryValidationRule
from posthog.models import Team
-from posthog.models.filters.mixins.utils import cached_property
from posthog.models.user import User
from posthog.ph_client import feature_enabled_or_false
from posthog.utils import multisort
diff --git a/products/tracing/backend/aggregation_query_runner.py b/products/tracing/backend/aggregation_query_runner.py
index 6deab9bb29ff..d917c3019019 100644
--- a/products/tracing/backend/aggregation_query_runner.py
+++ b/products/tracing/backend/aggregation_query_runner.py
@@ -18,6 +18,7 @@ windows in parallel when set.
import datetime as dt
import contextvars
from concurrent.futures import ThreadPoolExecutor
+from functools import cached_property
from typing import TYPE_CHECKING, cast
from zoneinfo import ZoneInfo
@@ -51,7 +52,6 @@ from posthog.hogql_queries.query_runner import AnalyticsQueryRunner
from posthog.hogql_queries.utils.query_compare_to_date_range import QueryCompareToDateRange
from posthog.hogql_queries.utils.query_date_range import QueryDateRange
from posthog.hogql_queries.utils.query_previous_period_date_range import QueryPreviousPeriodDateRange
-from posthog.models.filters.mixins.utils import cached_property
# _ROW_LIMIT lives in logic.py so the presentation layer can reach it through the
# facade-allowed `logic` module; imported here (and re-exported) for the sibling runners.
diff --git a/products/tracing/backend/logic.py b/products/tracing/backend/logic.py
index 1e5388814b8b..e487b63e22a6 100644
--- a/products/tracing/backend/logic.py
+++ b/products/tracing/backend/logic.py
@@ -9,6 +9,7 @@ import json
import base64
import decimal
import datetime as dt
+from functools import cached_property
from typing import TYPE_CHECKING, cast
from zoneinfo import ZoneInfo
@@ -44,7 +45,6 @@ from posthog.clickhouse.client.connection import Workload
from posthog.hogql_queries.paginators import HogQLHasMorePaginator
from posthog.hogql_queries.query_runner import AnalyticsQueryRunner, ExecutionMode, QueryRunner
from posthog.hogql_queries.utils.query_date_range import QueryDateRange
-from posthog.models.filters.mixins.utils import cached_property
if TYPE_CHECKING:
from posthog.models import Team, User
diff --git a/products/tracing/backend/symbol_stats_query_runner.py b/products/tracing/backend/symbol_stats_query_runner.py
index c842c34999e3..d38d69f3c90d 100644
--- a/products/tracing/backend/symbol_stats_query_runner.py
+++ b/products/tracing/backend/symbol_stats_query_runner.py
@@ -22,6 +22,7 @@ and a per-span `is_current` flag drives conditional aggregates for each bucket.
import math
import datetime as dt
+from functools import cached_property
from typing import TYPE_CHECKING
from zoneinfo import ZoneInfo
@@ -47,7 +48,6 @@ from posthog.clickhouse.client.connection import Workload
from posthog.hogql_queries.query_runner import AnalyticsQueryRunner, ExecutionMode
from posthog.hogql_queries.utils.query_date_range import QueryDateRange
from posthog.hogql_queries.utils.query_previous_period_date_range import QueryPreviousPeriodDateRange
-from posthog.models.filters.mixins.utils import cached_property
from products.tracing.backend.logic import TIME_BUCKET_DATE_RANGE_WHERE
from products.tracing.backend.span_identity import str_attr_field
diff --git a/products/web_analytics/backend/hogql_queries/external/summary_query_runner.py b/products/web_analytics/backend/hogql_queries/external/summary_query_runner.py
index bdce604a0ff8..b79d4df3c15e 100644
--- a/products/web_analytics/backend/hogql_queries/external/summary_query_runner.py
+++ b/products/web_analytics/backend/hogql_queries/external/summary_query_runner.py
@@ -1,6 +1,7 @@
import csv
from dataclasses import dataclass
from datetime import datetime
+from functools import cached_property
from io import StringIO
from typing import Any
@@ -21,7 +22,6 @@ from posthog.hogql.database.schema.web_analytics_s3 import create_s3_web_bounces
from posthog.hogql_queries.query_runner import QueryRunner
from posthog.hogql_queries.utils.query_date_range import QueryDateRange
-from posthog.models.filters.mixins.utils import cached_property
@dataclass
diff --git a/products/web_analytics/backend/hogql_queries/stats_table.py b/products/web_analytics/backend/hogql_queries/stats_table.py
index cd2628ea9f18..6b4dcf6c69f1 100644
--- a/products/web_analytics/backend/hogql_queries/stats_table.py
+++ b/products/web_analytics/backend/hogql_queries/stats_table.py
@@ -1,6 +1,7 @@
import math
from collections.abc import Callable
from dataclasses import dataclass
+from functools import cached_property
from typing import Literal, Optional, Union, cast
from posthog.schema import (
@@ -30,7 +31,6 @@ from posthog.hogql.visitor import TraversingVisitor
from posthog.clickhouse.query_tagging import clear_tag, get_query_tag_value
from posthog.hogql_queries.paginators import HogQLHasMorePaginator
-from posthog.models.filters.mixins.utils import cached_property
from products.web_analytics.backend.hogql_queries.first_pageview_attribution import (
FIRST_PAGEVIEW_BREAKDOWNS,
diff --git a/products/web_analytics/backend/hogql_queries/web_agent_analytics.py b/products/web_analytics/backend/hogql_queries/web_agent_analytics.py
index 1d8a4546d629..7c89013b519d 100644
--- a/products/web_analytics/backend/hogql_queries/web_agent_analytics.py
+++ b/products/web_analytics/backend/hogql_queries/web_agent_analytics.py
@@ -1,4 +1,5 @@
import urllib.parse as urlparse
+from functools import cached_property
from posthog.schema import (
CachedWebAgentAnalyticsQueryResponse,
@@ -16,7 +17,6 @@ from posthog.hogql.parser import parse_expr, parse_select
from posthog.hogql.query import execute_hogql_query
from posthog.hogql_queries.paginators import HogQLHasMorePaginator
-from posthog.models.filters.mixins.utils import cached_property
from products.web_analytics.backend.hogql_queries.agent_analytics_definitions import (
AGENT_CATEGORIES,
diff --git a/products/web_analytics/backend/hogql_queries/web_analytics_query_runner.py b/products/web_analytics/backend/hogql_queries/web_analytics_query_runner.py
index 6e3c2054101d..b659ec104edb 100644
--- a/products/web_analytics/backend/hogql_queries/web_analytics_query_runner.py
+++ b/products/web_analytics/backend/hogql_queries/web_analytics_query_runner.py
@@ -1,6 +1,7 @@
import typing
from abc import ABC
from datetime import datetime, timedelta
+from functools import cached_property
from math import ceil
from time import perf_counter
from typing import Any, Optional, Union
@@ -43,7 +44,6 @@ from posthog.hogql_queries.utils.query_compare_to_date_range import QueryCompare
from posthog.hogql_queries.utils.query_date_range import QueryDateRange
from posthog.hogql_queries.utils.query_previous_period_date_range import QueryPreviousPeriodDateRange
from posthog.models import User
-from posthog.models.filters.mixins.utils import cached_property
from products.access_control.backend.facade.user_access_control import UserAccessControl
from products.actions.backend.models.action import Action
diff --git a/products/web_analytics/backend/hogql_queries/web_overview.py b/products/web_analytics/backend/hogql_queries/web_overview.py
index f208f5df3644..f9cb48eca76f 100644
--- a/products/web_analytics/backend/hogql_queries/web_overview.py
+++ b/products/web_analytics/backend/hogql_queries/web_overview.py
@@ -1,4 +1,5 @@
import math
+from functools import cached_property
from typing import Optional, Union
import structlog
@@ -19,8 +20,6 @@ from posthog.hogql.parser import parse_expr, parse_select
from posthog.hogql.property import property_to_expr
from posthog.hogql.query import execute_hogql_query
-from posthog.models.filters.mixins.utils import cached_property
-
from products.web_analytics.backend.hogql_queries.web_analytics_query_runner import (
WEB_ANALYTICS_NO_JOIN_SERVED,
WebAnalyticsQueryRunner,