: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(devex): import event definition models from their product (#128210)
Julian Bez5f2118438648
diff --git a/.github/workflows/ci-mcp.yml b/.github/workflows/ci-mcp.ymlindex 0134253da8db..58c8bf9bdf30 100644--- a/.github/workflows/ci-mcp.yml+++ b/.github/workflows/ci-mcp.yml@@ -731,7 +731,8 @@ jobs:import django, osos.environ['DJANGO_SETTINGS_MODULE'] = 'posthog.settings'django.setup()- from posthog.models import Organization, Team, User, EventDefinition, PropertyDefinition+ from posthog.models import Organization, Team, User+ from products.event_definitions.backend.models import EventDefinition, PropertyDefinitionfrom posthog.models.personal_api_key import PersonalAPIKeyfrom posthog.models.utils import hash_key_valueorg = Organization.objects.first()diff --git a/ee/api/ee_event_definition.py b/ee/api/ee_event_definition.pyindex 7e0e4dd8a84c..c1ac17299eab 100644--- a/ee/api/ee_event_definition.py+++ b/ee/api/ee_event_definition.py@@ -9,9 +9,11 @@ from rest_framework import serializersfrom posthog.api.shared import UserBasicSerializerfrom posthog.api.tagged_item import TaggedItemSerializerMixinfrom posthog.event_usage import groups-from posthog.models import EventDefinition, ObjectMediaPreview+from posthog.models import ObjectMediaPreviewfrom posthog.models.organization import OrganizationMembership+from products.event_definitions.backend.models import EventDefinition+from ee.models.event_definition import EnterpriseEventDefinitionif TYPE_CHECKING:diff --git a/ee/api/ee_property_definition.py b/ee/api/ee_property_definition.pyindex c128e62aa80c..5f217c40769c 100644--- a/ee/api/ee_property_definition.py+++ b/ee/api/ee_property_definition.py@@ -5,9 +5,10 @@ from rest_framework import serializersfrom posthog.api.shared import UserBasicSerializerfrom posthog.api.tagged_item import TaggedItemSerializerMixinfrom posthog.helpers.impersonation import is_impersonated-from posthog.models import PropertyDefinitionfrom posthog.models.activity_logging.activity_log import Detail, dict_changes_between, log_activity+from products.event_definitions.backend.models import PropertyDefinition+from ee.models.property_definition import EnterprisePropertyDefinitiondiff --git a/ee/api/test/test_property_definition.py b/ee/api/test/test_property_definition.pyindex 6678afa5acfe..8ac42a59a00a 100644--- a/ee/api/test/test_property_definition.py+++ b/ee/api/test/test_property_definition.py@@ -13,8 +13,9 @@ from parameterized import parameterizedfrom rest_framework import statusfrom posthog.api.test.test_property_definition import exclude_virtual_properties-from posthog.models import ActivityLog, EventProperty, Tag+from posthog.models import ActivityLog, Tag+from products.event_definitions.backend.models import EventPropertyfrom products.event_definitions.backend.models.property_definition import PropertyDefinitionfrom ee.models.license import License, LicenseManagerdiff --git a/ee/hogai/tools/execute_sql/test/test_mcp_tool.py b/ee/hogai/tools/execute_sql/test/test_mcp_tool.pyindex 405cf17f7ad4..f56c4c738eaf 100644--- a/ee/hogai/tools/execute_sql/test/test_mcp_tool.py+++ b/ee/hogai/tools/execute_sql/test/test_mcp_tool.py@@ -9,9 +9,10 @@ from parameterized import parameterizedfrom posthog.schema import HogQLNotice, HogQLQueryfrom posthog.event_usage import EventSource-from posthog.models import EventDefinition, Organization, Team, User+from posthog.models import Organization, Team, Userfrom posthog.sync import database_sync_to_async+from products.event_definitions.backend.models import EventDefinitionfrom products.product_analytics.backend.facade.models import Insight, InsightVariablefrom ee.hogai.context.insight.context import InsightContextdiff --git a/ee/hogai/tools/read_data/test/test_tool.py b/ee/hogai/tools/read_data/test/test_tool.pyindex 7dbf951a1358..8639dc1dd983 100644--- a/ee/hogai/tools/read_data/test/test_tool.py+++ b/ee/hogai/tools/read_data/test/test_tool.py@@ -21,7 +21,7 @@ from posthog.schema import ()from posthog.constants import AvailableFeature-from posthog.models import OrganizationMembership, PropertyDefinition+from posthog.models import OrganizationMembershipfrom posthog.models.scoping import team_scopefrom products.access_control.backend.facade.contracts import ObjectAccessRef@@ -39,6 +39,7 @@ from products.data_modeling.backend.facade.models import (DataWarehouseSavedQuery,DataWarehouseSavedQueryColumnAnnotation,)+from products.event_definitions.backend.models import PropertyDefinitionfrom products.experiments.backend.facade.testing import acreate_experimentfrom products.feature_flags.backend.models.feature_flag import FeatureFlagfrom products.product_analytics.backend.facade.models import Insightdiff --git a/posthog/api/event.py b/posthog/api/event.pyindex 48c382dc2a82..1e11a48ddb57 100644--- a/posthog/api/event.py+++ b/posthog/api/event.py@@ -38,7 +38,7 @@ from posthog.clickhouse.query_tagging import Feature, tag_queriesfrom posthog.errors import ExposedCHQueryErrorfrom posthog.event_usage import get_request_analytics_propertiesfrom posthog.exceptions_capture import capture_exception-from posthog.models import Element, Person, PropertyDefinition, User+from posthog.models import Element, Person, Userfrom posthog.models.event.legacy_events_query import (EVENT_LIST_DEFAULT_AFTER_WINDOW,LegacyEventsListQuery,@@ -59,6 +59,7 @@ from posthog.rate_limit import (from posthog.taxonomy.taxonomy import CORE_FILTER_DEFINITIONS_BY_GROUPfrom posthog.utils import convert_property_value, flatten, refresh_requested_by_client, relative_date_parse+from products.event_definitions.backend.models import PropertyDefinitionfrom products.event_definitions.backend.models.property_definition import effective_project_id_exprtracer = trace.get_tracer(__name__)diff --git a/posthog/api/event_definition.py b/posthog/api/event_definition.pyindex 28d52f9acd44..c6b4690e20ce 100644--- a/posthog/api/event_definition.py+++ b/posthog/api/event_definition.py@@ -44,7 +44,7 @@ from posthog.constants import EventDefinitionTypefrom posthog.event_usage import report_user_actionfrom posthog.filters import TermSearchFilterBackend, term_search_filter_sqlfrom posthog.helpers.impersonation import is_impersonated-from posthog.models import EventDefinition, ObjectMediaPreview, TaggedItem, Team+from posthog.models import ObjectMediaPreview, TaggedItem, Teamfrom posthog.models.activity_logging.activity_log import Detail, dict_changes_between, log_activityfrom posthog.models.tagged_item_registry import content_type_forfrom posthog.models.user import User@@ -67,6 +67,7 @@ from posthog.taxonomy.scout_writes import check_scout_event_definition_writefrom posthog.taxonomy.taxonomy import CORE_EVENTS, STALE_EVENT_DAYSfrom posthog.utils import get_safe_cache, relative_date_parse+from products.event_definitions.backend.models import EventDefinitionfrom products.event_definitions.backend.models.property_definition import effective_project_id_expr# If EE is enabled, we use ee.api.ee_event_definition.EnterpriseEventDefinitionSerializerdiff --git a/posthog/api/event_definition_generators/base.py b/posthog/api/event_definition_generators/base.pyindex e3bd8d4a2c3e..460121329f24 100644--- a/posthog/api/event_definition_generators/base.py+++ b/posthog/api/event_definition_generators/base.py@@ -6,9 +6,9 @@ from django.db.models import Exists, OuterRef, Q, QuerySetimport orjsonfrom posthog.event_usage import report_user_action-from posthog.models import EventDefinition, EventSchema, SchemaPropertyGroupPropertyfrom posthog.taxonomy.taxonomy import CORE_EVENTS+from products.event_definitions.backend.models import EventDefinition, EventSchema, SchemaPropertyGroupPropertyfrom products.event_definitions.backend.models.property_definition import effective_project_id_exprdiff --git a/posthog/api/event_definition_generators/golang.py b/posthog/api/event_definition_generators/golang.pyindex 609346c168e8..08c9c326e09b 100644--- a/posthog/api/event_definition_generators/golang.py+++ b/posthog/api/event_definition_generators/golang.py@@ -5,7 +5,8 @@ from django.db.models import QuerySetimport orjson-from ...models import EventDefinition, SchemaPropertyGroupProperty+from products.event_definitions.backend.models import EventDefinition, SchemaPropertyGroupProperty+from .base import EventDefinitionGeneratordiff --git a/posthog/api/event_definition_generators/python.py b/posthog/api/event_definition_generators/python.pyindex 8e8762ed5246..13f3dbb0cede 100644--- a/posthog/api/event_definition_generators/python.py+++ b/posthog/api/event_definition_generators/python.py@@ -5,7 +5,8 @@ from django.db.models import QuerySetimport orjson-from ...models import EventDefinition, SchemaPropertyGroupProperty+from products.event_definitions.backend.models import EventDefinition, SchemaPropertyGroupProperty+from .base import EventDefinitionGeneratordiff --git a/posthog/api/event_definition_generators/typescript.py b/posthog/api/event_definition_generators/typescript.pyindex 9cc1de3556aa..fabe0fd8b44c 100644--- a/posthog/api/event_definition_generators/typescript.py+++ b/posthog/api/event_definition_generators/typescript.py@@ -4,7 +4,8 @@ from django.db.models import QuerySetimport orjson-from ...models import EventDefinition, SchemaPropertyGroupProperty+from products.event_definitions.backend.models import EventDefinition, SchemaPropertyGroupProperty+from .base import EventDefinitionGeneratordiff --git a/posthog/api/event_schema.py b/posthog/api/event_schema.pyindex 7b140ca7b662..a3642eab3b17 100644--- a/posthog/api/event_schema.py+++ b/posthog/api/event_schema.py@@ -5,10 +5,11 @@ from rest_framework.request import Requestfrom posthog.api.routing import TeamAndOrgViewSetMixinfrom posthog.api.schema_property_group import SchemaPropertyGroupSerializerfrom posthog.api.scoped_related_fields import TeamScopedPrimaryKeyRelatedField-from posthog.models import EventDefinition, EventSchema, SchemaPropertyGroupfrom posthog.permissions import is_scout_sandbox_requestfrom posthog.taxonomy.scout_writes import refuse_scout_taxonomy_write+from products.event_definitions.backend.models import EventDefinition, EventSchema, SchemaPropertyGroup+class EventSchemaSerializer(serializers.ModelSerializer):property_group = SchemaPropertyGroupSerializer(read_only=True)diff --git a/posthog/api/livestream.py b/posthog/api/livestream.pyindex 200f72205e33..082cdea93b80 100644--- a/posthog/api/livestream.py+++ b/posthog/api/livestream.py@@ -15,7 +15,7 @@ from posthog.hogql.property_access_types import RestrictedPropertyfrom posthog.auth import refuse_blocked_accountfrom posthog.jwt import PosthogJwtAudience, decode_jwt-from posthog.models import OrganizationMembership, PropertyDefinition, Team, User+from posthog.models import OrganizationMembership, Team, Userfrom posthog.models.activity_logging.utils import ActivityCredentialMixinfrom posthog.models.group_type_mapping import get_group_types_for_projectfrom posthog.permissions import ActiveOrganizationPermission, VerifiedDomainEnforcementPermission@@ -24,6 +24,7 @@ from posthog.user_permissions import UserPermissionsfrom products.access_control.backend.property_access_control import (get_restricted_properties_with_group_type_index_for_team,)+from products.event_definitions.backend.models import PropertyDefinition# Mirrors AnyGroupType in the livestream service.ANY_GROUP_TYPE = "*"diff --git a/posthog/api/materialized_column_slot.py b/posthog/api/materialized_column_slot.pyindex 35d161093d94..fd5d4f0f4a70 100644--- a/posthog/api/materialized_column_slot.py+++ b/posthog/api/materialized_column_slot.py@@ -11,12 +11,14 @@ from rest_framework.decorators import actionfrom posthog.api.routing import TeamAndOrgViewSetMixinfrom posthog.helpers.impersonation import is_impersonated-from posthog.models import MaterializedColumnSlot, MaterializedColumnSlotState, PropertyDefinition, Team+from posthog.models import MaterializedColumnSlot, MaterializedColumnSlotState, Teamfrom posthog.models.activity_logging.activity_log import Change, Detail, log_activityfrom posthog.models.materialized_column_slots import MAX_SLOTS_PER_TEAMfrom posthog.permissions import IsStaffUserOrImpersonatingfrom posthog.settings import EE_AVAILABLE+from products.event_definitions.backend.models import PropertyDefinition+if EE_AVAILABLE:from ee.clickhouse.materialized_columns.columns import get_materialized_columnsdiff --git a/posthog/api/object_media_preview.py b/posthog/api/object_media_preview.pyindex 223184cab8c6..a5d8b8707b16 100644--- a/posthog/api/object_media_preview.py+++ b/posthog/api/object_media_preview.py@@ -6,10 +6,12 @@ from rest_framework.request import Requestfrom rest_framework.response import Responsefrom posthog.api.routing import TeamAndOrgViewSetMixin-from posthog.models import EventDefinition, ObjectMediaPreview, UploadedMedia+from posthog.models import ObjectMediaPreview, UploadedMediafrom posthog.permissions import is_scout_sandbox_requestfrom posthog.taxonomy.scout_writes import refuse_scout_taxonomy_write+from products.event_definitions.backend.models import EventDefinition+class ObjectMediaPreviewSerializer(serializers.ModelSerializer):media_url = serializers.SerializerMethodField()diff --git a/posthog/api/person.py b/posthog/api/person.pyindex 49e283016f40..ddd59e690e39 100644--- a/posthog/api/person.py+++ b/posthog/api/person.py@@ -742,9 +742,8 @@ class PersonViewSet(TeamAndOrgViewSetMixin, viewsets.ModelViewSet):def get_serializer_context(self) -> dict[str, Any]:context = super().get_serializer_context()- from posthog.models import PropertyDefinition-from products.access_control.backend.property_access_control import get_restricted_property_names+ from products.event_definitions.backend.models import PropertyDefinitionuser = self.request.user if self.request.user.is_authenticated else Nonecontext["restricted_person_properties"] = get_restricted_property_names(@@ -1341,9 +1340,8 @@ class PersonViewSet(TeamAndOrgViewSetMixin, viewsets.ModelViewSet):tag_queries(product=ProductKey.PRODUCT_ANALYTICS, feature=Feature.QUERY)# Check field-level access control: return empty results for restricted properties- from posthog.models import PropertyDefinition-from products.access_control.backend.property_access_control import get_restricted_property_names+ from products.event_definitions.backend.models import PropertyDefinitionuser = request.user if request.user.is_authenticated else Nonerestricted = get_restricted_property_names(@@ -1698,9 +1696,8 @@ class PersonViewSet(TeamAndOrgViewSetMixin, viewsets.ModelViewSet):)def _get_non_writable_person_properties(self, request: request.Request) -> set[str]:- from posthog.models import PropertyDefinition-from products.access_control.backend.property_access_control import get_non_writable_property_names+ from products.event_definitions.backend.models import PropertyDefinitionuser = request.user if request.user.is_authenticated else Nonereturn get_non_writable_property_names(diff --git a/posthog/api/schema_property_group.py b/posthog/api/schema_property_group.pyindex 79748c412b8f..65a4f7d5ecce 100644--- a/posthog/api/schema_property_group.py+++ b/posthog/api/schema_property_group.py@@ -9,10 +9,11 @@ from rest_framework.request import Requestfrom posthog.api.routing import TeamAndOrgViewSetMixinfrom posthog.api.shared import UserBasicSerializer-from posthog.models import SchemaPropertyGroup, SchemaPropertyGroupPropertyfrom posthog.permissions import is_scout_sandbox_requestfrom posthog.taxonomy.scout_writes import refuse_scout_taxonomy_write+from products.event_definitions.backend.models import SchemaPropertyGroup, SchemaPropertyGroupProperty+MAX_PROPERTY_NAME_LENGTH = 200diff --git a/posthog/api/search.py b/posthog/api/search.pyindex 780054052ee4..50d16290a5df 100644--- a/posthog/api/search.py+++ b/posthog/api/search.py@@ -17,7 +17,6 @@ from rest_framework.response import Responsefrom posthog.api.documentation import _FallbackSerializerfrom posthog.api.routing import TeamAndOrgViewSetMixinfrom posthog.helpers.full_text_search import build_rank, process_query-from posthog.models import EventDefinition, PropertyDefinitionfrom products.access_control.backend.facade.user_access_control import UserAccessControl, model_to_resourcefrom products.actions.backend.facade.api import search_actions@@ -26,6 +25,7 @@ from products.dashboards.backend.models.dashboard import Dashboardfrom products.data_modeling.backend.facade.models import DataWarehouseSavedQuery, Nodefrom products.early_access_features.backend.models import EarlyAccessFeaturefrom products.endpoints.backend.facade.models import Endpoint+from products.event_definitions.backend.models import EventDefinition, PropertyDefinitionfrom products.event_definitions.backend.models.property_definition import effective_project_id_exprfrom products.experiments.backend.models.experiment import Experimentfrom products.feature_flags.backend.models.feature_flag import FeatureFlagdiff --git a/posthog/api/test/test_event.py b/posthog/api/test/test_event.pyindex 1d29087748be..ce107e2771ef 100644--- a/posthog/api/test/test_event.py+++ b/posthog/api/test/test_event.py@@ -24,7 +24,7 @@ from dateutil.relativedelta import relativedeltafrom parameterized import parameterizedfrom rest_framework import status-from posthog.models import Element, Organization, PropertyDefinition, User+from posthog.models import Element, Organization, Userfrom posthog.models.event.legacy_events_query import _execute_events_list_queryfrom posthog.models.team.extensions import get_or_create_team_extensionfrom posthog.models.team.team_revenue_analytics_config import TeamRevenueAnalyticsConfig@@ -33,6 +33,7 @@ from posthog.test.test_journeys import journeys_forfrom products.actions.backend.facade.testing import create_actionfrom products.cohorts.backend.models.cohort import Cohort+from products.event_definitions.backend.models import PropertyDefinitionclass TestEvents(ClickhouseTestMixin, APIBaseTest):diff --git a/posthog/api/test/test_event_definition.py b/posthog/api/test/test_event_definition.pyindex 3736ce226d46..3bb3a8f9aa42 100644--- a/posthog/api/test/test_event_definition.py+++ b/posthog/api/test/test_event_definition.py@@ -22,11 +22,12 @@ from posthog.api.test.test_organization import create_organizationfrom posthog.api.test.test_team import create_teamfrom posthog.api.test.test_user import create_userfrom posthog.constants import EventDefinitionType-from posthog.models import ActivityLog, EventDefinition, Organization, Tag, Team+from posthog.models import ActivityLog, Organization, Tag, Teamfrom posthog.models.oauth import OAuthAccessToken, OAuthApplicationfrom posthog.taxonomy import definition_searchfrom products.actions.backend.facade.testing import create_action+from products.event_definitions.backend.models import EventDefinition@time_machine.travel("2020-01-02", tick=False)diff --git a/posthog/api/test/test_event_definition_golang.py b/posthog/api/test/test_event_definition_golang.pyindex 68fc0136c5fb..589245c1964f 100644--- a/posthog/api/test/test_event_definition_golang.py+++ b/posthog/api/test/test_event_definition_golang.py@@ -10,7 +10,13 @@ from parameterized import parameterizedfrom rest_framework import statusfrom posthog.api.event_definition_generators.golang import GolangGenerator-from posthog.models import EventDefinition, EventSchema, SchemaPropertyGroup, SchemaPropertyGroupProperty++from products.event_definitions.backend.models import (+ EventDefinition,+ EventSchema,+ SchemaPropertyGroup,+ SchemaPropertyGroupProperty,+)from ee.models.event_definition import EnterpriseEventDefinitiondiff --git a/posthog/api/test/test_event_definition_python.py b/posthog/api/test/test_event_definition_python.pyindex 8a49c43b9fa3..aa441f56c3c9 100644--- a/posthog/api/test/test_event_definition_python.py+++ b/posthog/api/test/test_event_definition_python.py@@ -9,7 +9,13 @@ from parameterized import parameterizedfrom rest_framework import statusfrom posthog.api.event_definition_generators.python import PythonGenerator-from posthog.models import EventDefinition, EventSchema, SchemaPropertyGroup, SchemaPropertyGroupProperty++from products.event_definitions.backend.models import (+ EventDefinition,+ EventSchema,+ SchemaPropertyGroup,+ SchemaPropertyGroupProperty,+)class TestPythonGenerator(APIBaseTest):diff --git a/posthog/api/test/test_event_definition_typescript.py b/posthog/api/test/test_event_definition_typescript.pyindex a6b8c15646a2..0d01d2ede931 100644--- a/posthog/api/test/test_event_definition_typescript.py+++ b/posthog/api/test/test_event_definition_typescript.py@@ -23,7 +23,13 @@ from django.test import SimpleTestCasefrom rest_framework import statusfrom posthog.api.event_definition_generators.typescript import TypeScriptGenerator-from posthog.models import EventDefinition, EventSchema, SchemaPropertyGroup, SchemaPropertyGroupProperty++from products.event_definitions.backend.models import (+ EventDefinition,+ EventSchema,+ SchemaPropertyGroup,+ SchemaPropertyGroupProperty,+)from ee.models.event_definition import EnterpriseEventDefinitiondiff --git a/posthog/api/test/test_livestream.py b/posthog/api/test/test_livestream.pyindex 832ac024c98c..397efad9e01c 100644--- a/posthog/api/test/test_livestream.py+++ b/posthog/api/test/test_livestream.py@@ -10,13 +10,14 @@ from parameterized import parameterizedfrom posthog.api.livestream import LivestreamAuthenticationfrom posthog.constants import AvailableFeaturefrom posthog.jwt import PosthogJwtAudience, encode_jwt-from posthog.models import OrganizationDomain, OrganizationMembership, PropertyDefinition+from posthog.models import OrganizationDomain, OrganizationMembershipfrom posthog.test.authentication_checks import covers_authenticationfrom posthog.test.persons import create_group_type_mappingfrom products.access_control.backend.models.access_control import AccessControlfrom products.access_control.backend.models.property_access_control import PropertyAccessControlfrom products.access_control.backend.property_access_control import PropertyAccessLevel+from products.event_definitions.backend.models import PropertyDefinitionclass TestLivestreamAuthorization(APIBaseTest):diff --git a/posthog/api/test/test_materialized_column_activity_logging.py b/posthog/api/test/test_materialized_column_activity_logging.pyindex 8ca19806ed06..8525230cca60 100644--- a/posthog/api/test/test_materialized_column_activity_logging.py+++ b/posthog/api/test/test_materialized_column_activity_logging.py@@ -5,7 +5,7 @@ from unittest.mock import patchfrom temporalio.testing import ActivityEnvironment-from posthog.models import ActivityLog, MaterializedColumnSlot, MaterializedColumnSlotState, PropertyDefinition+from posthog.models import ActivityLog, MaterializedColumnSlot, MaterializedColumnSlotStatefrom posthog.temporal.backfill_materialized_property.activities import (ActivateSlotsInputs,FailSlotsInputs,@@ -13,6 +13,7 @@ from posthog.temporal.backfill_materialized_property.activities import (fail_slots,)+from products.event_definitions.backend.models import PropertyDefinitionfrom products.event_definitions.backend.models.property_definition import PropertyTypediff --git a/posthog/api/test/test_materialized_column_slot.py b/posthog/api/test/test_materialized_column_slot.pyindex 8fddf34f3cbf..a52a4176e3c1 100644--- a/posthog/api/test/test_materialized_column_slot.py+++ b/posthog/api/test/test_materialized_column_slot.py@@ -6,9 +6,10 @@ from unittest.mock import MagicMock, patchfrom parameterized import parameterizedfrom rest_framework import status-from posthog.models import MaterializedColumnSlot, MaterializedColumnSlotState, PropertyDefinition+from posthog.models import MaterializedColumnSlot, MaterializedColumnSlotStatefrom posthog.models.materialized_column_slots import MAX_SLOTS_PER_TEAM+from products.event_definitions.backend.models import PropertyDefinitionfrom products.event_definitions.backend.models.property_definition import PropertyTypediff --git a/posthog/api/test/test_object_media_preview.py b/posthog/api/test/test_object_media_preview.pyindex 3daea3fb15ff..2d5f3fda9cfd 100644--- a/posthog/api/test/test_object_media_preview.py+++ b/posthog/api/test/test_object_media_preview.py@@ -4,7 +4,9 @@ from django.utils import timezonefrom rest_framework import status-from posthog.models import EventDefinition, ObjectMediaPreview, UploadedMedia+from posthog.models import ObjectMediaPreview, UploadedMedia++from products.event_definitions.backend.models import EventDefinitionclass TestObjectMediaPreviewAPI(APIBaseTest):diff --git a/posthog/api/test/test_person.py b/posthog/api/test/test_person.pyindex 7a09f7b37e73..3cda8093028f 100644--- a/posthog/api/test/test_person.py+++ b/posthog/api/test/test_person.py@@ -32,7 +32,7 @@ from posthog.clickhouse.client import sync_executefrom posthog.clickhouse.query_tagging import get_query_tag_value, reset_query_tagsfrom posthog.constants import AvailableFeaturefrom posthog.hogql_queries.serialized_actors import get_serialized_people-from posthog.models import Organization, Person, PropertyDefinition, Team+from posthog.models import Organization, Person, Teamfrom posthog.models.async_deletion import AsyncDeletion, DeletionTypefrom posthog.models.person.bulk_delete import PersonDeletionFailure, PersonDeletionStep, PersonProfileDeletionResultfrom posthog.models.person.missing_person import uuidFromDistinctId@@ -51,6 +51,7 @@ from posthog.test.persons import add_distinct_id, create_person, delete_personfrom products.access_control.backend.models.property_access_control import PropertyAccessControlfrom products.access_control.backend.property_access_control import PropertyAccessLevelfrom products.cohorts.backend.models.cohort import Cohort+from products.event_definitions.backend.models import PropertyDefinitionclass TestPerson(ClickhouseTestMixin, APIBaseTest, QueryMatchingTest):diff --git a/posthog/api/test/test_property_definition.py b/posthog/api/test/test_property_definition.pyindex ddcfc8ea9778..79e109e7ad20 100644--- a/posthog/api/test/test_property_definition.py+++ b/posthog/api/test/test_property_definition.py@@ -9,13 +9,15 @@ from django.test import SimpleTestCasefrom parameterized import parameterizedfrom rest_framework import status-from posthog.models import ActivityLog, EventDefinition, EventProperty, Organization, PropertyDefinition, Team+from posthog.models import ActivityLog, Organization, Teamfrom posthog.taxonomy.property_definition_api import (PropertyDefinitionQuerySerializer,PropertyDefinitionViewSet,QueryContext,)+from products.event_definitions.backend.models import EventDefinition, EventProperty, PropertyDefinition+def exclude_virtual_properties(results: list) -> list:return [r for r in results if not r.get("name", "").startswith("$virt_")]diff --git a/posthog/api/test/test_schema_property_group.py b/posthog/api/test/test_schema_property_group.pyindex 3bced5e919f3..923d1caa64b6 100644--- a/posthog/api/test/test_schema_property_group.py+++ b/posthog/api/test/test_schema_property_group.py@@ -3,7 +3,14 @@ from posthog.test.base import APIBaseTestfrom parameterized import parameterizedfrom rest_framework import status-from posthog.models import EventDefinition, EventSchema, Project, SchemaPropertyGroup, SchemaPropertyGroupProperty+from posthog.models import Project++from products.event_definitions.backend.models import (+ EventDefinition,+ EventSchema,+ SchemaPropertyGroup,+ SchemaPropertyGroupProperty,+)class TestSchemaPropertyGroupAPI(APIBaseTest):diff --git a/posthog/api/test/test_sharing.py b/posthog/api/test/test_sharing.pyindex d585f9fe0359..09b803f43ff9 100644--- a/posthog/api/test/test_sharing.py+++ b/posthog/api/test/test_sharing.py@@ -29,7 +29,7 @@ from posthog.api.sharing_publish_gate import dashboard_filter_leavesfrom posthog.auth import SharingPasswordProtectedAuthenticationfrom posthog.constants import AvailableFeaturefrom posthog.jwt import PosthogJwtAudience, decode_jwt-from posthog.models import ActivityLog, OrganizationMembership, PropertyDefinition, Team+from posthog.models import ActivityLog, OrganizationMembership, Teamfrom posthog.models.data_color_theme import DataColorThemefrom posthog.models.share_password import SharePasswordfrom posthog.models.sharing_configuration import SharingConfiguration@@ -46,6 +46,7 @@ from products.dashboards.backend.models.dashboard import Dashboardfrom products.dashboards.backend.models.dashboard_tile import ButtonTile, DashboardTile, Textfrom products.dashboards.backend.models.dashboard_widget import DashboardWidgetfrom products.data_modeling.backend.facade.models import DataWarehouseSavedQuery+from products.event_definitions.backend.models import PropertyDefinitionfrom products.exports.backend.models.exported_asset import ExportedAsset, get_render_access_tokenfrom products.notebooks.backend.models import Notebookfrom products.product_analytics.backend.facade.models import Insightdiff --git a/posthog/caching/test/test_warming.py b/posthog/caching/test/test_warming.pyindex 6509b1ae8159..ccdb2faf8cba 100644--- a/posthog/caching/test/test_warming.py+++ b/posthog/caching/test/test_warming.py@@ -15,7 +15,7 @@ from posthog.caching.warming import ()from posthog.constants import AvailableFeaturefrom posthog.exceptions import ClickHouseAtCapacity-from posthog.models import PropertyDefinition, User+from posthog.models import Userfrom posthog.query_cache.freshness_index import update_target_agefrom posthog.scheduling.jitter import deterministic_offset@@ -23,6 +23,7 @@ from products.access_control.backend.facade.contracts import PropertyAccessLevelfrom products.access_control.backend.models.property_access_control import PropertyAccessControlfrom products.dashboards.backend.models.dashboard import Dashboardfrom products.dashboards.backend.models.dashboard_tile import DashboardTile+from products.event_definitions.backend.models import PropertyDefinitionfrom products.product_analytics.backend.facade.api import record_insight_viewsfrom products.product_analytics.backend.facade.models import Insight, InsightVariablediff --git a/posthog/hogql/database/schema/test/test_flag_evaluations.py b/posthog/hogql/database/schema/test/test_flag_evaluations.pyindex 24577a06cb63..ff4b71b63d20 100644--- a/posthog/hogql/database/schema/test/test_flag_evaluations.py+++ b/posthog/hogql/database/schema/test/test_flag_evaluations.py@@ -54,7 +54,7 @@ from posthog.hogql.visitor import clear_locationsfrom posthog.clickhouse.client import sync_executefrom posthog.constants import AvailableFeaturefrom posthog.hogql_queries.events_query_runner import SELECT_STAR_FROM_EVENTS_FIELDS-from posthog.models import PropertyDefinition, Team+from posthog.models import Teamfrom posthog.models.group.util import create_groupfrom posthog.models.instance_setting import override_instance_configfrom posthog.models.property import TableColumn@@ -69,6 +69,7 @@ from products.cohorts.backend.models.util import insert_static_cohortfrom products.data_modeling.backend.facade.models import DataWarehouseSavedQueryfrom products.data_tools.backend.facade.models import DataWarehouseJoinfrom products.data_tools.backend.models.expression import DataWarehouseExpression+from products.event_definitions.backend.models import PropertyDefinitionfrom products.feature_flags.backend.facade.enums import FlagEvaluationsModefrom products.feature_flags.backend.models.organization_feature_flags_config import OrganizationFeatureFlagsConfigdiff --git a/posthog/hogql/database/schema/util/test/test_person_where_clause_extractor.py b/posthog/hogql/database/schema/util/test/test_person_where_clause_extractor.pyindex 57d5e33e0055..acef5452c5cf 100644--- a/posthog/hogql/database/schema/util/test/test_person_where_clause_extractor.py+++ b/posthog/hogql/database/schema/util/test/test_person_where_clause_extractor.py@@ -11,7 +11,7 @@ from posthog.hogql.parser import parse_expr, parse_selectfrom posthog.hogql.printer import prepare_and_print_ast, prepare_ast_for_printingfrom posthog.hogql.visitor import CloningVisitor, clone_expr-from posthog.models import PropertyDefinition+from products.event_definitions.backend.models import PropertyDefinitiondef _expr(s: Union[str, ast.Expr, None], placeholders: Optional[dict[str, ast.Expr]] = None) -> Union[ast.Expr, None]:diff --git a/posthog/hogql/database/schema/util/test/test_session_v2_where_clause_extractor.py b/posthog/hogql/database/schema/util/test/test_session_v2_where_clause_extractor.pyindex 5f874780636e..61ccf5a5a79e 100644--- a/posthog/hogql/database/schema/util/test/test_session_v2_where_clause_extractor.py+++ b/posthog/hogql/database/schema/util/test/test_session_v2_where_clause_extractor.py@@ -25,10 +25,11 @@ from posthog.hogql.query import execute_hogql_queryfrom posthog.hogql.resolver import resolve_typesfrom posthog.hogql.visitor import clone_expr-from posthog.models import EventDefinitionfrom posthog.models.utils import uuid7from posthog.schema_enums import SessionsV2JoinMode+from products.event_definitions.backend.models import EventDefinition+def f(s: Union[str, ast.Expr, None], placeholders: Optional[dict[str, ast.Expr]] = None) -> Union[ast.Expr, None]:if s is None:diff --git a/posthog/hogql/database/schema/util/test/test_session_v3_where_clause_extractor.py b/posthog/hogql/database/schema/util/test/test_session_v3_where_clause_extractor.pyindex 1f7adfbad654..5bf320a2843e 100644--- a/posthog/hogql/database/schema/util/test/test_session_v3_where_clause_extractor.py+++ b/posthog/hogql/database/schema/util/test/test_session_v3_where_clause_extractor.py@@ -19,7 +19,7 @@ from posthog.hogql.parser import parse_expr, parse_selectfrom posthog.hogql.printer import prepare_ast_for_printing, print_prepared_astfrom posthog.hogql.visitor import clone_expr-from posthog.models import EventDefinition+from products.event_definitions.backend.models import EventDefinitiondef f(s: Union[str, ast.Expr, None], placeholders: Optional[dict[str, ast.Expr]] = None) -> Union[ast.Expr, None]:diff --git a/posthog/hogql/database/test/test_database.py b/posthog/hogql/database/test/test_database.pyindex eebb2541eb74..35082a0a118f 100644--- a/posthog/hogql/database/test/test_database.py+++ b/posthog/hogql/database/test/test_database.py@@ -84,7 +84,6 @@ from posthog.hogql.query import execute_hogql_queryfrom posthog.hogql.test.utils import pretty_print_in_testsfrom posthog.constants import AvailableFeature-from posthog.models import PropertyDefinitionfrom posthog.models.group_type_mapping import invalidate_group_types_cachefrom posthog.models.instance_setting import override_instance_configfrom posthog.models.organization import Organization, OrganizationMembership@@ -101,6 +100,7 @@ from products.access_control.backend.models.access_control import AccessControlfrom products.data_modeling.backend.facade.models import DataWarehouseSavedQueryfrom products.data_tools.backend.models.expression import DataWarehouseExpressionfrom products.data_tools.backend.models.join import DataWarehouseJoin+from products.event_definitions.backend.models import PropertyDefinitionfrom products.feature_flags.backend.facade.enums import FlagEvaluationsModefrom products.feature_flags.backend.models.organization_feature_flags_config import OrganizationFeatureFlagsConfigfrom products.revenue_analytics.backend.views import RevenueAnalyticsChargeViewdiff --git a/posthog/hogql/printer/test/test_printer.py b/posthog/hogql/printer/test/test_printer.pyindex ba02f06e7875..9cd54be0bfac 100644--- a/posthog/hogql/printer/test/test_printer.py+++ b/posthog/hogql/printer/test/test_printer.py@@ -62,7 +62,6 @@ from posthog.hogql.test.utils import json_dynamic_read_sqlfrom posthog.clickhouse.client.execute import sync_executefrom posthog.clickhouse.events_json import TEMPORARY_PROPERTIES_JSON_TYPE-from posthog.models import PropertyDefinitionfrom posthog.models.event.sql import EVENTS_JSON_DATA_TABLE, EVENTS_PROPERTIES_JSON_TYPEfrom posthog.models.exchange_rate.sql import EXCHANGE_RATE_DICTIONARY_NAMEfrom posthog.models.instance_setting import override_instance_config@@ -70,6 +69,7 @@ from posthog.models.team.team import WeekStartDayfrom posthog.settings.data_stores import CLICKHOUSE_DATABASEfrom products.cohorts.backend.models.cohort import Cohort+from products.event_definitions.backend.models import PropertyDefinitionfrom products.event_definitions.backend.models.property_definition import PropertyTypefrom products.warehouse_sources.backend.facade.models import DataWarehouseCredential, DataWarehouseTablediff --git a/posthog/hogql/printer/test/test_property_access_control.py b/posthog/hogql/printer/test/test_property_access_control.pyindex 23239ae103f5..ea7a428b3beb 100644--- a/posthog/hogql/printer/test/test_property_access_control.py+++ b/posthog/hogql/printer/test/test_property_access_control.py@@ -19,11 +19,11 @@ from posthog.hogql.query import execute_hogql_queryfrom posthog.hogql.restricted_properties import WEB_DIMENSIONAL_MIRRORED_COLUMNSfrom posthog.constants import AvailableFeature-from posthog.models import PropertyDefinitionfrom posthog.models.event.util import create_eventfrom products.access_control.backend.models.property_access_control import PropertyAccessControlfrom products.access_control.backend.property_access_control import PropertyAccessLevel+from products.event_definitions.backend.models import PropertyDefinition# Columns that hold no event or session property value: keys and aggregate states._WEB_DIMENSIONAL_UNMIRRORED_COLUMNS = frozenset(diff --git a/posthog/hogql/property.py b/posthog/hogql/property.pyindex b16ed04a71f3..7da7533f1a9c 100644--- a/posthog/hogql/property.py+++ b/posthog/hogql/property.py@@ -60,7 +60,7 @@ from posthog.clickhouse.query_tagging import tag_contains_user_hogqlfrom posthog.constants import AUTOCAPTURE_EVENT, TREND_FILTER_TYPE_ACTIONS, PropertyOperatorTypefrom posthog.dataclasses import frozenfrom posthog.interval_specs import get_interval_func-from posthog.models import Property, PropertyDefinition, Team+from posthog.models import Property, Teamfrom posthog.models.element import Elementfrom posthog.models.event import Selectorfrom posthog.models.property import BehavioralPropertyType, PropertyGroup, ValueT@@ -71,6 +71,7 @@ from products.actions.backend.facade.api import get_actionfrom products.actions.backend.facade.contracts import Action, ActionNotFound, ActionStepfrom products.cohorts.backend.models.cohort import Cohortfrom products.data_tools.backend.models.join import DataWarehouseJoin+from products.event_definitions.backend.models import PropertyDefinitionfrom products.event_definitions.backend.models.property_definition import PropertyTypefrom products.warehouse_sources.backend.facade.hogql import get_view_or_table_by_namediff --git a/posthog/hogql/property_metadata.py b/posthog/hogql/property_metadata.pyindex 6b34834ad496..1d85c0a32e40 100644--- a/posthog/hogql/property_metadata.py+++ b/posthog/hogql/property_metadata.py@@ -79,12 +79,14 @@ def load_property_metadata(DMAT_STRING_COLUMN_NAME_PREFIX,get_enabled_materialized_columns_by_table,)- from posthog.models import PropertyDefinition, Team # noqa: PLC0415+ from posthog.models import Teamfrom posthog.models.materialized_column_slots import ( # noqa: PLC0415MaterializedColumnSlot,MaterializedColumnSlotState,)+ from products.event_definitions.backend.models import PropertyDefinition+team_id = context.team_idif team_id is None:raise ValueError("load_property_metadata requires a context with team_id set")diff --git a/posthog/hogql/taxonomy_validation.py b/posthog/hogql/taxonomy_validation.pyindex 4aea8ff16024..2196d2278184 100644--- a/posthog/hogql/taxonomy_validation.py+++ b/posthog/hogql/taxonomy_validation.py@@ -14,10 +14,11 @@ from posthog.hogql import astfrom posthog.hogql.escape_sql import escape_hogql_identifier, escape_hogql_stringfrom posthog.hogql.visitor import TraversingVisitor-from posthog.models import EventDefinition, PropertyDefinition, Team+from posthog.models import Teamfrom posthog.taxonomy.dynamic_properties import is_dynamic_propertyfrom posthog.taxonomy.taxonomy import virtual_property_names+from products.event_definitions.backend.models import EventDefinition, PropertyDefinitionfrom products.event_definitions.backend.models.property_definition import effective_project_id_exprlogger = getLogger(__name__)diff --git a/posthog/hogql/test/test_metadata.py b/posthog/hogql/test/test_metadata.pyindex be8068c75094..d3647a9d12cc 100644--- a/posthog/hogql/test/test_metadata.py+++ b/posthog/hogql/test/test_metadata.py@@ -35,13 +35,14 @@ from posthog.hogql.parser import parse_selectfrom posthog.hogql.taxonomy_validation import MAX_SUGGESTED_NAMESfrom posthog.api.services.query import process_query_model-from posthog.models import EventDefinition, PropertyDefinition, Team+from posthog.models import Teamfrom posthog.models.scoping import team_scopefrom posthog.taxonomy.dynamic_properties import DYNAMIC_PROPERTY_PATTERNSfrom products.cohorts.backend.models.cohort import Cohortfrom products.data_modeling.backend.facade.models import DataWarehouseSavedQueryfrom products.data_tools.backend.models.expression import DataWarehouseExpression+from products.event_definitions.backend.models import EventDefinition, PropertyDefinitionfrom products.feature_flags.backend.facade.enums import FlagEvaluationsModefrom products.feature_flags.backend.models.organization_feature_flags_config import OrganizationFeatureFlagsConfigfrom products.product_analytics.backend.facade.models import InsightVariablediff --git a/posthog/hogql/test/test_observability.py b/posthog/hogql/test/test_observability.pyindex 7ab03665965d..833715e0336a 100644--- a/posthog/hogql/test/test_observability.py+++ b/posthog/hogql/test/test_observability.py@@ -24,8 +24,8 @@ from posthog.hogql.resolver import resolve_typesfrom posthog.hogql.transforms.property_types import build_property_swapperfrom posthog.clickhouse.query_tagging import Product-from posthog.models import PropertyDefinition+from products.event_definitions.backend.models import PropertyDefinitionfrom products.event_definitions.backend.models.property_definition import PropertyType as PropertyDefinitionTypediff --git a/posthog/hogql/test/test_property.py b/posthog/hogql/test/test_property.pyindex 6158807e6f26..cd05abff8439 100644--- a/posthog/hogql/test/test_property.py+++ b/posthog/hogql/test/test_property.py@@ -45,7 +45,7 @@ from posthog.hogql.visitor import TraversingVisitor, clear_locationsfrom posthog.clickhouse.client import sync_executefrom posthog.clickhouse.events_json import DISTRIBUTED_EVENTS_JSON_TABLEfrom posthog.constants import TREND_FILTER_TYPE_ACTIONS, TREND_FILTER_TYPE_EVENTS, PropertyOperatorType-from posthog.models import Property, PropertyDefinition, Team+from posthog.models import Property, Teamfrom posthog.models.event.sql import EVENTS_PROPERTIES_JSON_TYPEfrom posthog.models.property import PropertyGroupfrom posthog.models.property.util import get_property_string_expr@@ -54,6 +54,7 @@ from posthog.utils import relative_date_parsefrom products.actions.backend.facade.testing import create_action, update_actionfrom products.cohorts.backend.models.cohort import Cohortfrom products.data_tools.backend.models.join import DataWarehouseJoin+from products.event_definitions.backend.models import PropertyDefinitionfrom products.event_definitions.backend.models.property_definition import PropertyTypefrom products.warehouse_sources.backend.facade.models import DataWarehouseCredential, DataWarehouseTablediff --git a/posthog/hogql/test/test_property_skip_indexes.py b/posthog/hogql/test/test_property_skip_indexes.pyindex e96319d70006..91e2c730a381 100644--- a/posthog/hogql/test/test_property_skip_indexes.py+++ b/posthog/hogql/test/test_property_skip_indexes.py@@ -40,8 +40,9 @@ from posthog.hogql.property import property_to_exprfrom posthog.hogql.query import execute_hogql_queryfrom posthog.clickhouse.client.execute import sync_execute-from posthog.models import MaterializedColumnSlot, MaterializedColumnSlotState, PropertyDefinition+from posthog.models import MaterializedColumnSlot, MaterializedColumnSlotState+from products.event_definitions.backend.models import PropertyDefinitionfrom products.event_definitions.backend.models.property_definition import PropertyTypefrom ee.clickhouse.materialized_columns.columns import (diff --git a/posthog/hogql/test/test_trino_semantics.py b/posthog/hogql/test/test_trino_semantics.pyindex 5bdd062a86e1..bdf706b426d2 100644--- a/posthog/hogql/test/test_trino_semantics.py+++ b/posthog/hogql/test/test_trino_semantics.py@@ -14,13 +14,13 @@ from posthog.hogql.property_access_types import RestrictedPropertyfrom posthog.hogql.transforms.trino.errors import TrinoLoweringErrorfrom posthog.constants import AvailableFeature-from posthog.models import PropertyDefinitionfrom posthog.schema_enums import InCohortVia, InlineCohortCalculation, PersonsOnEventsModefrom products.access_control.backend.models.property_access_control import PropertyAccessControlfrom products.access_control.backend.property_access_control import PropertyAccessLevelfrom products.actions.backend.facade.testing import create_actionfrom products.cohorts.backend.models.cohort import Cohort+from products.event_definitions.backend.models import PropertyDefinitionclass TestTrinoSemantics(APIBaseTest):diff --git a/posthog/hogql/transforms/test/test_events_predicate_pushdown.py b/posthog/hogql/transforms/test/test_events_predicate_pushdown.pyindex 437469bd8e18..e1144502b6a6 100644--- a/posthog/hogql/transforms/test/test_events_predicate_pushdown.py+++ b/posthog/hogql/transforms/test/test_events_predicate_pushdown.py@@ -50,11 +50,12 @@ from posthog.hogql.transforms.logical_property_lowering import lower_property_acfrom posthog.hogql.visitor import TraversingVisitorfrom posthog.clickhouse.client import sync_execute-from posthog.models import MaterializedColumnSlot, MaterializedColumnSlotState, PropertyDefinition+from posthog.models import MaterializedColumnSlot, MaterializedColumnSlotStatefrom posthog.uuidt import uuid7from products.cohorts.backend.models.cohort import Cohortfrom products.cohorts.backend.models.util import recalculate_cohortpeople+from products.event_definitions.backend.models import PropertyDefinitionfrom products.event_definitions.backend.models.property_definition import PropertyTypediff --git a/posthog/hogql/transforms/test/test_exported_properties.py b/posthog/hogql/transforms/test/test_exported_properties.pyindex 818ab1749e03..7644a570ef67 100644--- a/posthog/hogql/transforms/test/test_exported_properties.py+++ b/posthog/hogql/transforms/test/test_exported_properties.py@@ -19,10 +19,10 @@ from posthog.hogql.property_access_types import RestrictedPropertyfrom posthog.hogql.query import execute_hogql_queryfrom posthog.clickhouse.client.escape import substitute_params-from posthog.models import PropertyDefinitionfrom posthog.models.instance_setting import override_instance_configfrom products.data_modeling.backend.facade.models import DataWarehouseSavedQuery+from products.event_definitions.backend.models import PropertyDefinitionfrom products.event_definitions.backend.models.property_definition import PropertyTypeSTAR_EVENTS = "(SELECT * FROM events)"diff --git a/posthog/hogql/transforms/test/test_lazy_tables.py b/posthog/hogql/transforms/test/test_lazy_tables.pyindex 0892c7e32066..9653dd05eeb5 100644--- a/posthog/hogql/transforms/test/test_lazy_tables.py+++ b/posthog/hogql/transforms/test/test_lazy_tables.py@@ -38,10 +38,11 @@ from posthog.hogql.property_metadata import PropertyMetadatafrom posthog.hogql.query import execute_hogql_queryfrom posthog.hogql.test.utils import pretty_print_in_tests-from posthog.models import Organization, PropertyDefinition, Team+from posthog.models import Organization, Teamfrom posthog.schema_enums import PersonsArgMaxVersionfrom products.data_tools.backend.models.join import DataWarehouseJoin+from products.event_definitions.backend.models import PropertyDefinitionclass TestNamespacedLazyTables(SimpleTestCase):diff --git a/posthog/hogql/transforms/test/test_negated_person_filters.py b/posthog/hogql/transforms/test/test_negated_person_filters.pyindex 9070d78ab7a7..6eff0427aab9 100644--- a/posthog/hogql/transforms/test/test_negated_person_filters.py+++ b/posthog/hogql/transforms/test/test_negated_person_filters.py@@ -25,9 +25,9 @@ from posthog.hogql.printer import prepare_and_print_astfrom posthog.hogql.property import property_to_exprfrom posthog.hogql.query import execute_hogql_query-from posthog.models import PropertyDefinitionfrom posthog.models.person.util import create_person+from products.event_definitions.backend.models import PropertyDefinitionfrom products.event_definitions.backend.models.property_definition import PropertyTypefrom ee.clickhouse.materialized_columns.columns import MaterializedColumn, MaterializedColumnDetailsdiff --git a/posthog/hogql/transforms/test/test_property_types.py b/posthog/hogql/transforms/test/test_property_types.pyindex 28e155bc9d7b..1f7dc2caaa3d 100644--- a/posthog/hogql/transforms/test/test_property_types.py+++ b/posthog/hogql/transforms/test/test_property_types.py@@ -60,7 +60,7 @@ from posthog.hogql.type_system import ComparisonCompatibilityfrom posthog.clickhouse.client import sync_executefrom posthog.clickhouse.events_json import EVENTS_JSON_DATA_TABLE, TEMPORARY_PROPERTIES_JSON_TYPEfrom posthog.errors import ExposedCHQueryError-from posthog.models import PropertyDefinition, Team+from posthog.models import Teamfrom posthog.models.event.sql import EVENTS_DATA_TABLE, EVENTS_PROPERTIES_JSON_TYPE, PERSON_PROPERTIES_JSON_TYPEfrom posthog.models.group.util import create_groupfrom posthog.models.property.util import get_property_string_expr@@ -69,6 +69,7 @@ from posthog.schema_enums import PropertyGroupsModefrom posthog.test.test_utils import create_group_type_mapping_without_created_atfrom products.data_tools.backend.models.join import DataWarehouseJoin+from products.event_definitions.backend.models import PropertyDefinitionfrom products.warehouse_sources.backend.facade.models import DataWarehouseCredential, DataWarehouseTablediff --git a/posthog/hogql/transforms/test/test_property_types_dmat.py b/posthog/hogql/transforms/test/test_property_types_dmat.pyindex f9776714384c..d75d0f14d3c9 100644--- a/posthog/hogql/transforms/test/test_property_types_dmat.py+++ b/posthog/hogql/transforms/test/test_property_types_dmat.py@@ -16,9 +16,10 @@ from posthog.hogql.printer import prepare_and_print_astfrom posthog.hogql.query import execute_hogql_queryfrom posthog.clickhouse.client import sync_execute-from posthog.models import MaterializedColumnSlot, MaterializedColumnSlotState, PropertyDefinition+from posthog.models import MaterializedColumnSlot, MaterializedColumnSlotStatefrom posthog.temporal.backfill_materialized_property.activities import _generate_property_extraction_sql+from products.event_definitions.backend.models import PropertyDefinitionfrom products.event_definitions.backend.models.property_definition import PropertyTypediff --git a/posthog/hogql/transforms/test/test_range_rewrite_observability.py b/posthog/hogql/transforms/test/test_range_rewrite_observability.pyindex 7b7b56ed6106..c5a0ec6dbc14 100644--- a/posthog/hogql/transforms/test/test_range_rewrite_observability.py+++ b/posthog/hogql/transforms/test/test_range_rewrite_observability.py@@ -21,8 +21,7 @@ from posthog.hogql.observability import HogQLTypeObservabilityfrom posthog.hogql.parser import parse_selectfrom posthog.hogql.printer import prepare_and_print_ast-from posthog.models import PropertyDefinition-+from products.event_definitions.backend.models import PropertyDefinitionfrom products.event_definitions.backend.models.property_definition import PropertyTypefrom ee.clickhouse.materialized_columns.columns import materializediff --git a/posthog/hogql_queries/actor_strategies.py b/posthog/hogql_queries/actor_strategies.pyindex 85b1550a8804..d50e0ffba1ad 100644--- a/posthog/hogql_queries/actor_strategies.py+++ b/posthog/hogql_queries/actor_strategies.py@@ -14,12 +14,13 @@ from posthog.hogql.query import execute_hogql_queryfrom posthog.hogql_queries.paginators import HogQLHasMorePaginatorfrom posthog.hogql_queries.utils.recordings_helper import RecordingsHelper-from posthog.models import PropertyDefinition, Team+from posthog.models import Teamfrom posthog.models.person.util import _batched_get_distinct_ids_for_persons, _batched_get_persons_by_uuidsfrom posthog.models.user import Userfrom posthog.personhog_client.caller_tag import personhog_caller_tagfrom posthog.utils import is_anonymous_id+from products.event_definitions.backend.models import PropertyDefinitionfrom products.event_definitions.backend.models.property_definition import effective_project_id_exprlogger = structlog.get_logger(__name__)diff --git a/posthog/hogql_queries/ai/test/test_actors_property_taxonomy_query_runner.py b/posthog/hogql_queries/ai/test/test_actors_property_taxonomy_query_runner.pyindex 199a99240605..70d835eb76c7 100644--- a/posthog/hogql_queries/ai/test/test_actors_property_taxonomy_query_runner.py+++ b/posthog/hogql_queries/ai/test/test_actors_property_taxonomy_query_runner.py@@ -5,10 +5,10 @@ from django.test import override_settingsfrom posthog.schema import ActorsPropertyTaxonomyQuery, ActorsPropertyTaxonomyResponsefrom posthog.hogql_queries.ai.actors_property_taxonomy_query_runner import ActorsPropertyTaxonomyQueryRunner-from posthog.models import PropertyDefinitionfrom posthog.models.group.util import create_groupfrom posthog.test.test_utils import create_group_type_mapping_without_created_at+from products.event_definitions.backend.models import PropertyDefinitionfrom products.event_definitions.backend.models.property_definition import PropertyTypediff --git a/posthog/hogql_queries/ai/test/test_event_taxonomy_query_runner.py b/posthog/hogql_queries/ai/test/test_event_taxonomy_query_runner.pyindex 6c1d1617e4c1..71fc16e0a06c 100644--- a/posthog/hogql_queries/ai/test/test_event_taxonomy_query_runner.py+++ b/posthog/hogql_queries/ai/test/test_event_taxonomy_query_runner.py@@ -19,9 +19,9 @@ from posthog.hogql.context import HogQLContextfrom posthog.hogql.printer import prepare_and_print_astfrom posthog.hogql_queries.ai.event_taxonomy_query_runner import EventTaxonomyQueryRunner-from posthog.models import PropertyDefinitionfrom products.actions.backend.facade.testing import create_action+from products.event_definitions.backend.models import PropertyDefinitionfrom products.event_definitions.backend.models.property_definition import PropertyTypediff --git a/posthog/hogql_queries/ai/test/test_trace_query_runner.py b/posthog/hogql_queries/ai/test/test_trace_query_runner.pyindex 3e56098783a9..f463c65e4090 100644--- a/posthog/hogql_queries/ai/test/test_trace_query_runner.py+++ b/posthog/hogql_queries/ai/test/test_trace_query_runner.py@@ -34,12 +34,13 @@ from posthog.hogql_queries.ai.session_query_runner import SessionQueryRunnerfrom posthog.hogql_queries.ai.trace_query_runner import TraceQueryRunnerfrom posthog.hogql_queries.ai.traces_query_runner import TracesQueryRunnerfrom posthog.hogql_queries.ai.utils import HEAVY_PROPERTY_NAMES-from posthog.models import PropertyDefinition, Team, User+from posthog.models import Team, Userfrom posthog.models.ai_events.test_util import bulk_create_ai_eventsfrom posthog.models.event.util import bulk_create_eventsfrom products.access_control.backend.models.property_access_control import PropertyAccessControlfrom products.access_control.backend.property_access_control import PropertyAccessLevel+from products.event_definitions.backend.models import PropertyDefinitionfrom products.event_definitions.backend.models.property_definition import PropertyTypediff --git a/posthog/hogql_queries/ai/test/test_traces_query_runner.py b/posthog/hogql_queries/ai/test/test_traces_query_runner.pyindex ff145d50324f..b6e7c8c7b38c 100644--- a/posthog/hogql_queries/ai/test/test_traces_query_runner.py+++ b/posthog/hogql_queries/ai/test/test_traces_query_runner.py@@ -26,8 +26,9 @@ from posthog.hogql.modifiers import create_default_modifiers_for_teamfrom posthog.hogql.printer import prepare_and_print_astfrom posthog.hogql_queries.ai.traces_query_runner import TracesQueryRunner-from posthog.models import PropertyDefinition, Team+from posthog.models import Team+from products.event_definitions.backend.models import PropertyDefinitionfrom products.event_definitions.backend.models.property_definition import PropertyTypediff --git a/posthog/hogql_queries/events_query_runner.py b/posthog/hogql_queries/events_query_runner.pyindex d75dfa34d050..5413531802c7 100644--- a/posthog/hogql_queries/events_query_runner.py+++ b/posthog/hogql_queries/events_query_runner.py@@ -54,7 +54,7 @@ from posthog.hogql_queries.insight_actors_query_runner import InsightActorsQueryfrom posthog.hogql_queries.paginators import HogQLHasMorePaginatorfrom posthog.hogql_queries.query_runner import AnalyticsQueryRunner, QueryRunner, get_query_runnerfrom posthog.hogql_queries.utils.person_display_name import person_display_name_property_exprs-from posthog.models import Person, PropertyDefinition+from posthog.models import Personfrom posthog.models.element import chain_to_elementsfrom posthog.models.flag_evaluations.sql import FLAG_EVALUATIONS_RETENTION_DAYS, FLAG_EVALUATIONS_SOURCE_EVENTfrom posthog.models.person.person import MAX_LIMIT_DISTINCT_IDS, get_distinct_ids_for_subquery@@ -64,6 +64,7 @@ from posthog.utils import relative_date_parsefrom products.actions.backend.facade.api import get_actionfrom products.actions.backend.facade.contracts import ActionNotFound, ActionStep+from products.event_definitions.backend.models import PropertyDefinitionfrom products.feature_flags.backend.facade.enums import FlagEvaluationsModefrom products.feature_flags.backend.facade.flags import get_flag_evaluations_read_modediff --git a/posthog/hogql_queries/property_values_query_runner.py b/posthog/hogql_queries/property_values_query_runner.pyindex 8995bb380443..c2dea7e8e9d4 100644--- a/posthog/hogql_queries/property_values_query_runner.py+++ b/posthog/hogql_queries/property_values_query_runner.py@@ -27,11 +27,11 @@ from posthog.caching.utils import ()from posthog.hogql_queries.query_runner import AnalyticsQueryRunnerfrom posthog.hogql_queries.utils.aggregated_property_values import get_event_property_values_from_aggregated_table-from posthog.models import PropertyDefinitionfrom posthog.models.event.new_events_schema import use_new_events_schemafrom posthog.utils import convert_property_value, flatten, get_instance_region, relative_date_parsefrom products.access_control.backend.property_access_control import get_restricted_property_names+from products.event_definitions.backend.models import PropertyDefinitionfrom products.feature_flags.backend.facade.property_values import (flag_property_values_revision,get_flag_property_values,diff --git a/posthog/hogql_queries/test/test_events_query_runner.py b/posthog/hogql_queries/test/test_events_query_runner.pyindex 30d01adca9d7..21e8739d72a0 100644--- a/posthog/hogql_queries/test/test_events_query_runner.py+++ b/posthog/hogql_queries/test/test_events_query_runner.py@@ -43,7 +43,7 @@ from posthog.hogql.ast import CompareOperationOpfrom posthog.clickhouse.client import sync_executefrom posthog.date_util import start_of_dayfrom posthog.hogql_queries.events_query_runner import EventsQueryRunner-from posthog.models import Element, Organization, OrganizationMembership, PropertyDefinition, Team+from posthog.models import Element, Organization, OrganizationMembership, Teamfrom posthog.models.event.util import events_only_in_active_schemafrom posthog.models.flag_evaluations.sql import FLAG_EVALUATIONS_RETENTION_DAYSfrom posthog.models.group.util import create_group@@ -53,6 +53,7 @@ from posthog.test.persons import create_group_type_mappingfrom products.access_control.backend.models.property_access_control import PropertyAccessControlfrom products.access_control.backend.property_access_control import PropertyAccessLevel+from products.event_definitions.backend.models import PropertyDefinitionfrom products.feature_flags.backend.facade.enums import FlagEvaluationsModefrom products.feature_flags.backend.models.organization_feature_flags_config import OrganizationFeatureFlagsConfig@@ -1740,10 +1741,9 @@ class TestEventsQueryRunner(ClickhouseTestMixin, APIBaseTest):@time_machine.travel("2020-01-11T12:00:05Z", tick=False)def test_restricted_person_properties_stripped_from_person_column(self):- from posthog.models import PropertyDefinition-from products.access_control.backend.models.property_access_control import PropertyAccessControlfrom products.access_control.backend.property_access_control import PropertyAccessLevel+ from products.event_definitions.backend.models import PropertyDefinitionself._enable_property_access_control()@@ -1827,10 +1827,9 @@ class TestEventsQueryRunner(ClickhouseTestMixin, APIBaseTest):@time_machine.travel("2020-01-11T12:00:05Z", tick=False)def test_restricted_display_property_does_not_break_person_display_name(self):- from posthog.models import PropertyDefinition-from products.access_control.backend.models.property_access_control import PropertyAccessControlfrom products.access_control.backend.property_access_control import PropertyAccessLevel+ from products.event_definitions.backend.models import PropertyDefinitionself._enable_property_access_control()@@ -1980,10 +1979,9 @@ class TestEventsQueryRunner(ClickhouseTestMixin, APIBaseTest):@time_machine.travel("2020-01-11T12:00:05Z", tick=False)def test_cached_results_not_served_across_restriction_boundaries(self):- from posthog.models import PropertyDefinition-from products.access_control.backend.models.property_access_control import PropertyAccessControlfrom products.access_control.backend.property_access_control import PropertyAccessLevel+ from products.event_definitions.backend.models import PropertyDefinitionself._enable_property_access_control()diff --git a/posthog/management/commands/setup_dev.py b/posthog/management/commands/setup_dev.pyindex 8128f6e5ef99..f7c7f23f8511 100644--- a/posthog/management/commands/setup_dev.py+++ b/posthog/management/commands/setup_dev.py@@ -2,11 +2,12 @@ from django.core.management.base import BaseCommandfrom django.db import transactionfrom django.utils import timezone-from posthog.models import EventProperty, PersonalAPIKey, Team, User+from posthog.models import PersonalAPIKey, Team, Userfrom posthog.models.utils import hash_key_valuefrom products.cdp.backend.models.plugin import Plugin, PluginConfig, PluginSourceFilefrom products.demo.backend.facade.api import ORGANIZATION_NAME, TEAM_NAME, create_demo_data+from products.event_definitions.backend.models import EventPropertyfrom products.event_definitions.backend.models.event_definition import EventDefinitionfrom products.event_definitions.backend.models.property_definition import PropertyDefinitiondiff --git a/posthog/models/__init__.py b/posthog/models/__init__.pyindex 88e878df0282..b7cd9be7114e 100644--- a/posthog/models/__init__.py+++ b/posthog/models/__init__.py@@ -25,8 +25,6 @@ from .event_buffer import EventBuffer# TODO: remove noqa once the event filters API imports from posthog.modelsfrom .event_filter_config import EventFilterConfig, EventFilterPipelineOverride # noqa: F401-from products.event_definitions.backend.models import EventDefinition-from products.event_definitions.backend.models import EventPropertyfrom .file_system.file_system import FileSystemfrom .file_system.file_system_home_folder import FileSystemHomeFolderfrom .file_system.file_system_view_log import FileSystemViewLog@@ -56,12 +54,10 @@ from .project_secret_api_key import ProjectSecretAPIKey, RevokedTeamSecretTokenfrom .product_intent import ProductIntentfrom .project import Projectfrom .property import Property-from products.event_definitions.backend.models import PropertyDefinitionfrom .proxy_record import ProxyRecordfrom .quick_filter import QuickFilterfrom .remote_config import RemoteConfigfrom .resource_transfer.resource_transfer import ResourceTransfer-from products.event_definitions.backend.models import EventSchema, SchemaPropertyGroup, SchemaPropertyGroupPropertyfrom .scim_provisioned_user import SCIMProvisionedUserfrom .scim_request_log import SCIMRequestLogfrom .share_password import SharePassword@@ -102,18 +98,13 @@ __all__ = ["CIMDVerificationToken","ColumnConfiguration","CoreEvent",- "Dashboard","DataDeletionRequest",- "DashboardTile",- "DashboardTemplate","DataColorTheme","DeletionType","Element","ElementGroup","Event","EventBuffer",- "EventDefinition",- "EventProperty","FileSystem","FileSystemHomeFolder","FileSystemViewLog",@@ -130,7 +121,6 @@ __all__ = ["MaterializedColumnSlot","MaterializedColumnSlotState","MessagingRecord",- "Notebook","MigrationStatus","NotificationViewed","ObjectMediaPreview",@@ -158,14 +148,10 @@ __all__ = ["ProductIntent","Project","Property",- "PropertyDefinition","ProxyRecord","QuickFilter","RemoteConfig","ResourceTransfer",- "EventSchema",- "SchemaPropertyGroup",- "SchemaPropertyGroupProperty","SCIMProvisionedUser","SCIMRequestLog","SessionRecording",@@ -197,9 +183,6 @@ __all__ = ["GitHubInstallRequest","UserIntegration","UserPushToken",- "DataWarehouseTable",- "WebAnalyticsFilterPreset",- "ScheduledChange","Comment","CommentSlackThread",# Deprecated models here for backwards compatibilitydiff --git a/posthog/models/person/test/test_divergence.py b/posthog/models/person/test/test_divergence.pyindex eff234635979..7fa0068d82f2 100644--- a/posthog/models/person/test/test_divergence.py+++ b/posthog/models/person/test/test_divergence.py@@ -19,7 +19,7 @@ from posthog.constants import AvailableFeaturefrom posthog.exceptions import ClickHouseQueryMemoryLimitExceeded, ClickHouseQueryTimeOutfrom posthog.kafka_client.client import ClickhouseProducer, ProduceResultfrom posthog.kafka_client.topics import KAFKA_PERSON-from posthog.models import OrganizationMembership, PropertyDefinition, Team, User+from posthog.models import OrganizationMembership, Team, Userfrom posthog.models.person import Personfrom posthog.models.person.divergence.datatypes import (DivergentPerson,@@ -55,6 +55,7 @@ from posthog.test.persons import add_distinct_id, create_personfrom products.access_control.backend.models.property_access_control import PropertyAccessControlfrom products.access_control.backend.property_access_control import PropertyAccessLevel+from products.event_definitions.backend.models import PropertyDefinitionPG_PROPERTIES = {"email": "[email protected]"}CH_PROPERTIES = {"email": "[email protected]"}diff --git a/posthog/models/test/test_data_deletion_request.py b/posthog/models/test/test_data_deletion_request.pyindex f035490dfa0f..c5bfa7effeb1 100644--- a/posthog/models/test/test_data_deletion_request.py+++ b/posthog/models/test/test_data_deletion_request.py@@ -378,8 +378,9 @@ def materialized_browser():@pytest.fixturedef dmat_slot_for_plan(team):- from posthog.models import MaterializedColumnSlot, MaterializedColumnSlotState, PropertyDefinition+ from posthog.models import MaterializedColumnSlot, MaterializedColumnSlotState+ from products.event_definitions.backend.models import PropertyDefinitionfrom products.event_definitions.backend.models.property_definition import PropertyTypeprop_def = PropertyDefinition.objects.create(diff --git a/posthog/session_recordings/queries/sub_queries/events_subquery.py b/posthog/session_recordings/queries/sub_queries/events_subquery.pyindex aadc8b9fab6e..dca59110e202 100644--- a/posthog/session_recordings/queries/sub_queries/events_subquery.py+++ b/posthog/session_recordings/queries/sub_queries/events_subquery.py@@ -28,7 +28,7 @@ from posthog.clickhouse.client.connection import ClickHouseUserfrom posthog.clickhouse.query_tagging import Feature, Product, tag_queriesfrom posthog.constants import TREND_FILTER_TYPE_ACTIONS, TREND_FILTER_TYPE_DATA_WAREHOUSE, TREND_FILTER_TYPE_EVENTSfrom posthog.dataclasses import frozen-from posthog.models import EventProperty, Team+from posthog.models import Teamfrom posthog.ph_client import feature_enabled_or_false, get_feature_flag_or_nonefrom posthog.session_recordings.queries.sub_queries.base_query import SessionRecordingsListingBaseQueryfrom posthog.session_recordings.queries.sub_queries.group_key_resolver import resolved_group_key_expr@@ -47,6 +47,8 @@ from posthog.session_recordings.queries.utils import (from posthog.types import AnyPropertyFilterfrom posthog.utils import get_instance_region+from products.event_definitions.backend.models import EventProperty+ENTITY_TYPES_WITH_NODES = frozenset({TREND_FILTER_TYPE_ACTIONS, TREND_FILTER_TYPE_DATA_WAREHOUSE, TREND_FILTER_TYPE_EVENTS})diff --git a/posthog/session_recordings/queries/test/listing_recordings/test_session_recording_list_by_top_level_event_property.py b/posthog/session_recordings/queries/test/listing_recordings/test_session_recording_list_by_top_level_event_property.pyindex 1c0364b8d0f8..ba022b2c33f7 100644--- a/posthog/session_recordings/queries/test/listing_recordings/test_session_recording_list_by_top_level_event_property.py+++ b/posthog/session_recordings/queries/test/listing_recordings/test_session_recording_list_by_top_level_event_property.py@@ -10,7 +10,7 @@ from parameterized import parameterized, parameterized_classfrom posthog.clickhouse.client import sync_executefrom posthog.clickhouse.log_entries import TRUNCATE_LOG_ENTRIES_TABLE_SQL-from posthog.models import Element, EventProperty+from posthog.models import Elementfrom posthog.models.team import Teamfrom posthog.models.utils import uuid7from posthog.session_recordings.queries.session_recording_list_from_query import SessionRecordingQueryResult@@ -24,6 +24,7 @@ from posthog.session_recordings.sql.session_replay_event_sql import TRUNCATE_SESfrom posthog.test.persons import create_personfrom products.actions.backend.facade.testing import create_action+from products.event_definitions.backend.models import EventProperty@parameterized_class([{"allow_event_property_expansion": True}, {"allow_event_property_expansion": False}])diff --git a/posthog/session_recordings/queries/test/listing_recordings/test_session_recordings_list_by_experiment_exposure.py b/posthog/session_recordings/queries/test/listing_recordings/test_session_recordings_list_by_experiment_exposure.pyindex 167680893df7..9ea91009227c 100644--- a/posthog/session_recordings/queries/test/listing_recordings/test_session_recordings_list_by_experiment_exposure.py+++ b/posthog/session_recordings/queries/test/listing_recordings/test_session_recordings_list_by_experiment_exposure.py@@ -17,7 +17,7 @@ from posthog.clickhouse.client import sync_executefrom posthog.constants import AvailableFeaturefrom posthog.exceptions import ClickHouseQueryMemoryLimitExceededfrom posthog.hogql_queries.paginators import HogQLCursorPaginator-from posthog.models import EventProperty, User+from posthog.models import Userfrom posthog.models.personal_api_key import PersonalAPIKeyfrom posthog.models.team.extensions import get_or_create_team_extensionfrom posthog.models.utils import generate_random_token_personal, hash_key_value@@ -36,6 +36,7 @@ from products.access_control.backend.facade.user_access_control import UserAccesfrom products.access_control.backend.models.access_control import AccessControlfrom products.analytics_platform.backend.lazy_computation.lazy_computation_executor import LazyComputationResultfrom products.cohorts.backend.models.cohort import Cohort+from products.event_definitions.backend.models import EventPropertyfrom products.experiments.backend.facade.replay import (ACTIVATION_LIVE_SCAN_MAX_MEMORY_BYTES,IN_SESSION_EVIDENCE_SCAN_MAX_MEMORY_BYTES,diff --git a/posthog/taxonomy/property_access.py b/posthog/taxonomy/property_access.pyindex d12d8c0d242a..11ffc8e034db 100644--- a/posthog/taxonomy/property_access.py+++ b/posthog/taxonomy/property_access.py@@ -1,4 +1,6 @@-from posthog.models import PropertyDefinition, Team, User+from posthog.models import Team, User++from products.event_definitions.backend.models import PropertyDefinitiondef restricted_property_names(team: Team, user: User | None, property_type: PropertyDefinition.Type) -> set[str]:diff --git a/posthog/taxonomy/property_definition_api.py b/posthog/taxonomy/property_definition_api.pyindex 6ef861ef3ab7..ad491f444ae0 100644--- a/posthog/taxonomy/property_definition_api.py+++ b/posthog/taxonomy/property_definition_api.py@@ -24,7 +24,7 @@ from posthog.constants import GROUP_TYPES_LIMITfrom posthog.event_usage import report_user_actionfrom posthog.filters import TermSearchFilterBackend, term_search_filter_sqlfrom posthog.helpers.impersonation import is_impersonated-from posthog.models import EventProperty, PropertyDefinition, User+from posthog.models import Userfrom posthog.models.activity_logging.activity_log import Detail, log_activityfrom posthog.models.utils import UUIDTfrom posthog.settings import EE_AVAILABLE@@ -41,6 +41,7 @@ from posthog.taxonomy.taxonomy import (QUERY_DEPRECATED_EVENT_PROPERTIES,)+from products.event_definitions.backend.models import EventProperty, PropertyDefinitionfrom products.event_definitions.backend.models.property_definition import effective_project_id_exprtracer = trace.get_tracer(__name__)diff --git a/posthog/taxonomy/test/test_definition_search.py b/posthog/taxonomy/test/test_definition_search.pyindex 3bf5852f0820..fe3caadb7470 100644--- a/posthog/taxonomy/test/test_definition_search.py+++ b/posthog/taxonomy/test/test_definition_search.py@@ -12,10 +12,11 @@ from opentelemetry.sdk.trace.export import SimpleSpanProcessorfrom opentelemetry.sdk.trace.export.in_memory_span_exporter import InMemorySpanExporterfrom parameterized import parameterized-from posthog.models import EventDefinition, PropertyDefinitionfrom posthog.taxonomy import definition_searchfrom posthog.taxonomy.definition_search import project_definition_scale, search_plan+from products.event_definitions.backend.models import EventDefinition, PropertyDefinition+class TestSearchPlan(BaseTest):def setUp(self) -> None:diff --git a/posthog/temporal/ai_observability/eval_reports/emit_signal.py b/posthog/temporal/ai_observability/eval_reports/emit_signal.pyindex 5c8795fe6d4e..63deaaf51045 100644--- a/posthog/temporal/ai_observability/eval_reports/emit_signal.py+++ b/posthog/temporal/ai_observability/eval_reports/emit_signal.py@@ -31,7 +31,6 @@ from pydantic import BaseModel, Fieldfrom temporalio.common import RetryPolicyfrom posthog.llm.gateway_client import GatewayNotConfiguredError, resolve_ai_gateway_config-from posthog.models import PropertyDefinitionfrom posthog.models.team import Teamfrom posthog.sync import database_sync_to_asyncfrom posthog.temporal.common.base import PostHogWorkflow@@ -39,6 +38,7 @@ from posthog.temporal.common.base import PostHogWorkflowfrom products.access_control.backend.models.access_control import AccessControlfrom products.access_control.backend.models.property_access_control import PropertyAccessControlfrom products.ai_observability.backend.models.evaluation_reports import EvaluationReportRun+from products.event_definitions.backend.models import PropertyDefinitionfrom products.signals.backend.facade.llm import call_llmfrom products.signals.backend.facade.taxonomy import SignalSourceProduct, SignalSourceTypediff --git a/posthog/temporal/ai_observability/eval_reports/test/test_activities.py b/posthog/temporal/ai_observability/eval_reports/test/test_activities.pyindex fdc8fda8b0ef..3d25ca0b14ff 100644--- a/posthog/temporal/ai_observability/eval_reports/test/test_activities.py+++ b/posthog/temporal/ai_observability/eval_reports/test/test_activities.py@@ -16,7 +16,7 @@ from posthog.hogql.query import execute_hogql_queryfrom posthog.hogql.visitor import TraversingVisitorfrom posthog.exceptions import ClickHouseQueryTimeOut-from posthog.models import PropertyDefinition, Team+from posthog.models import Teamfrom posthog.temporal.ai_observability.eval_reports.activities import (_check_count_triggered_eval_report_sync,_check_count_triggered_eval_reports_batch,@@ -48,6 +48,7 @@ from posthog.temporal.ai_observability.eval_reports.types import (from products.ai_observability.backend.models.evaluation_reports import EvaluationReport, EvaluationReportRunfrom products.ai_observability.backend.models.evaluations import Evaluation+from products.event_definitions.backend.models import PropertyDefinitiondef _scanned_window(query: ast.SelectQuery) -> list[dt.datetime]:diff --git a/posthog/temporal/ai_observability/eval_reports/test/test_emit_signal.py b/posthog/temporal/ai_observability/eval_reports/test/test_emit_signal.pyindex c46a9f552352..6ce92d6f8c52 100644--- a/posthog/temporal/ai_observability/eval_reports/test/test_emit_signal.py+++ b/posthog/temporal/ai_observability/eval_reports/test/test_emit_signal.py@@ -9,7 +9,7 @@ import pytest_asynciofrom asgiref.sync import sync_to_asyncfrom posthog.llm.gateway_client import GatewayNotConfiguredError-from posthog.models import Organization, PropertyDefinition, Team, User+from posthog.models import Organization, Team, Userfrom posthog.temporal.ai_observability.eval_reports.emit_signal import (EmitEvalReportSignalInputs,EvalReportSignalSummary,@@ -21,6 +21,7 @@ from posthog.temporal.ai_observability.eval_reports.emit_signal import (from products.access_control.backend.models.access_control import AccessControlfrom products.access_control.backend.models.property_access_control import PropertyAccessControlfrom products.access_control.backend.models.role import Role+from products.event_definitions.backend.models import PropertyDefinitionfrom products.signals.backend.models import SignalSourceConfigdiff --git a/posthog/temporal/ai_observability/test_run_trace_evaluation.py b/posthog/temporal/ai_observability/test_run_trace_evaluation.pyindex 4267993810d6..a031d79aff03 100644--- a/posthog/temporal/ai_observability/test_run_trace_evaluation.py+++ b/posthog/temporal/ai_observability/test_run_trace_evaluation.py@@ -20,7 +20,7 @@ from posthog.api.capture import CaptureInternalErrorfrom posthog.constants import AvailableFeaturefrom posthog.hogql_queries.ai.session_query_runner import SessionQueryRunnerfrom posthog.hogql_queries.ai.trace_query_runner import TraceQueryRunner-from posthog.models import Organization, PropertyDefinition, Team, User+from posthog.models import Organization, Team, Userfrom posthog.models.ai_events.test_util import bulk_create_ai_eventsfrom posthog.models.event.util import bulk_create_eventsfrom posthog.temporal.ai_observability.judge_attachments import JudgeAttachments@@ -36,6 +36,7 @@ from products.ai_observability.backend.models.evaluation_config import Evaluatiofrom products.ai_observability.backend.models.evaluations import Evaluationfrom products.ai_observability.backend.models.provider_keys import LLMProviderKeyfrom products.cdp.backend.validation import compile_hog+from products.event_definitions.backend.models import PropertyDefinitionfrom .eval_reports.report_agent.tools import _execute_hogql, get_trace_detailfrom .evaluation_hog import execute_hog_eval_bytecodediff --git a/posthog/temporal/ai_observability/trace_summarization/tests/test_fetch_and_format.py b/posthog/temporal/ai_observability/trace_summarization/tests/test_fetch_and_format.pyindex 1bff55b5e9ce..b9b4209a5636 100644--- a/posthog/temporal/ai_observability/trace_summarization/tests/test_fetch_and_format.py+++ b/posthog/temporal/ai_observability/trace_summarization/tests/test_fetch_and_format.py@@ -11,7 +11,6 @@ from unittest.mock import MagicMock, patchfrom parameterized import parameterizedfrom posthog.constants import AvailableFeature-from posthog.models import PropertyDefinitionfrom posthog.models.ai_events.test_util import bulk_create_ai_eventsfrom posthog.temporal.ai_observability.trace_summarization.fetch_and_format import (_fetch_and_format_trace,@@ -22,6 +21,7 @@ from posthog.temporal.ai_observability.trace_summarization.models import FetchAnfrom posthog.temporal.ai_observability.trace_summarization.queries import TraceSizefrom products.access_control.backend.models.property_access_control import PropertyAccessControl+from products.event_definitions.backend.models import PropertyDefinition@asynccontextmanagerdiff --git a/posthog/temporal/cleanup_property_definitions/activities.py b/posthog/temporal/cleanup_property_definitions/activities.pyindex 252b7fc1b1e6..b795cfc35ddf 100644--- a/posthog/temporal/cleanup_property_definitions/activities.py+++ b/posthog/temporal/cleanup_property_definitions/activities.py@@ -7,7 +7,7 @@ from django.db.models import F, QuerySetfrom structlog.contextvars import bind_contextvarsfrom temporalio import activity-from posthog.models import PropertyDefinition, Team+from posthog.models import Teamfrom posthog.sync import database_sync_to_asyncfrom posthog.temporal.cleanup_property_definitions.types import (CleanupPropertyDefinitionsError,@@ -18,7 +18,11 @@ from posthog.temporal.cleanup_property_definitions.types import (from posthog.temporal.common.clickhouse import get_clientfrom posthog.temporal.common.logger import get_write_only_logger-from products.event_definitions.backend.models import effective_project_id_expr, group_type_index_key_expr+from products.event_definitions.backend.models import (+ PropertyDefinition,+ effective_project_id_expr,+ group_type_index_key_expr,+)from products.event_definitions.backend.models.event_property import EventPropertyLOGGER = get_write_only_logger()diff --git a/posthog/temporal/experiments/test_cache_warming.py b/posthog/temporal/experiments/test_cache_warming.pyindex 7e623f3323f1..9f8f444fce9d 100644--- a/posthog/temporal/experiments/test_cache_warming.py+++ b/posthog/temporal/experiments/test_cache_warming.py@@ -14,7 +14,6 @@ from posthog.schema import CachedExperimentQueryResponse, EventsNode, Experimentfrom posthog.constants import AvailableFeaturefrom posthog.hogql_queries.query_runner import ExecutionMode-from posthog.models import PropertyDefinitionfrom posthog.models.organization import OrganizationMembershipfrom posthog.temporal.experiments.activities import (_calculate_experiment_regular_metric_sync,@@ -23,6 +22,7 @@ from posthog.temporal.experiments.activities import (from products.access_control.backend.facade.contracts import PropertyAccessLevelfrom products.access_control.backend.models.property_access_control import PropertyAccessControl+from products.event_definitions.backend.models import PropertyDefinitionfrom products.experiments.backend.facade.timeseries import metric_calculation_keysfrom products.experiments.backend.hogql_queries.experiment_query_runner import ExperimentQueryRunnerfrom products.experiments.backend.hogql_queries.test.experiment_query_runner.base import ExperimentQueryRunnerBaseTestdiff --git a/posthog/temporal/tests/backfill_materialized_property/test_batched_activities.py b/posthog/temporal/tests/backfill_materialized_property/test_batched_activities.pyindex b77944c32ef0..e66077df18b2 100644--- a/posthog/temporal/tests/backfill_materialized_property/test_batched_activities.py+++ b/posthog/temporal/tests/backfill_materialized_property/test_batched_activities.py@@ -5,7 +5,7 @@ from unittest.mock import MagicMock, patchfrom django.conf import settings-from posthog.models import MaterializedColumnSlot, MaterializedColumnSlotState, PropertyDefinition+from posthog.models import MaterializedColumnSlot, MaterializedColumnSlotStatefrom posthog.temporal.backfill_materialized_property.activities import (ActivateSlotsInputs,AssignPendingColumnsInputs,@@ -24,6 +24,7 @@ from posthog.temporal.backfill_materialized_property.activities import (run_batched_mutation,)+from products.event_definitions.backend.models import PropertyDefinitionfrom products.event_definitions.backend.models.property_definition import PropertyTypediff --git a/posthog/temporal/tests/cleanup_property_definitions/test_activities.py b/posthog/temporal/tests/cleanup_property_definitions/test_activities.pyindex c7a5fd5917a8..28513f3a1f9a 100644--- a/posthog/temporal/tests/cleanup_property_definitions/test_activities.py+++ b/posthog/temporal/tests/cleanup_property_definitions/test_activities.py@@ -5,7 +5,7 @@ import pytestfrom asgiref.sync import sync_to_asyncfrom parameterized import parameterized_class-from posthog.models import Project, PropertyDefinition, Team+from posthog.models import Project, Teamfrom posthog.temporal.cleanup_property_definitions.activities import (delete_property_definitions_from_clickhouse,delete_property_definitions_from_postgres,@@ -21,6 +21,7 @@ from posthog.temporal.tests.cleanup_property_definitions.conftest import (insert_property_definition_to_ch,)+from products.event_definitions.backend.models import PropertyDefinitionfrom products.event_definitions.backend.models.event_property import EventPropertydiff --git a/posthog/test/test_utils.py b/posthog/test/test_utils.pyindex fd96f34a2a36..bb5f451d97e1 100644--- a/posthog/test/test_utils.py+++ b/posthog/test/test_utils.py@@ -26,9 +26,11 @@ from rest_framework import serializersfrom rest_framework.request import Requestfrom posthog.exceptions import RequestParsingError, UnspecifiedCompressionFallbackParsingError-from posthog.models import EventDefinition, Organization, PropertyDefinition, Team, User+from posthog.models import Organization, Team, Userfrom posthog.settings.utils import get_from_env+from products.event_definitions.backend.models import EventDefinition, PropertyDefinition+if TYPE_CHECKING:from posthog.models.group_type_mapping import GroupTypeMappingdiff --git a/posthog/utils.py b/posthog/utils.pyindex 7038255cf427..77feb7a92425 100644--- a/posthog/utils.py+++ b/posthog/utils.py@@ -1241,7 +1241,7 @@ def _default_event_info_cache_key(team_id: int) -> str:@tracer.start_as_current_span("template.default_event_info")def get_default_event_info(team: "Team") -> dict:- from posthog.models import EventDefinition+ from products.event_definitions.backend.models import EventDefinitioncache_key = _default_event_info_cache_key(team.id)cached = get_safe_cache(cache_key)@@ -1320,8 +1320,7 @@ def _has_person_email_ttl(team: "Team", has_person_email: bool) -> int:@tracer.start_as_current_span("template.has_person_email")def get_has_person_email(team: "Team") -> bool:- from posthog.models import PropertyDefinition-+ from products.event_definitions.backend.models import PropertyDefinitionfrom products.event_definitions.backend.models.property_definition import PERSON_EMAIL_PROPERTY_NAMEcache_key = _has_person_email_cache_key(team.project_id)diff --git a/products/access_control/backend/facade/api.py b/products/access_control/backend/facade/api.pyindex 5395d1005939..2da8d950f0a0 100644--- a/products/access_control/backend/facade/api.py+++ b/products/access_control/backend/facade/api.py@@ -35,7 +35,7 @@ from posthog.hogql.property_access_types import RestrictedPropertyfrom posthog.constants import AvailableFeaturefrom posthog.dataclasses import frozen-from posthog.models import Organization, OrganizationMembership, PropertyDefinition, Team+from posthog.models import Organization, OrganizationMembership, Teamfrom posthog.models.activity_logging.activity_log import LogActivityEntry, bulk_log_activityfrom posthog.models.activity_logging.model_activity import get_current_user, get_was_impersonatedfrom posthog.models.team.extensions import get_or_create_team_extension@@ -44,7 +44,7 @@ from posthog.scopes import API_SCOPE_OBJECTS, INTERNAL_API_SCOPE_OBJECTS, APIScofrom products.access_control.backend.activity_logging import get_access_control_log_entryfrom products.access_control.backend.models.role import Role, RoleMembership-from products.event_definitions.backend.models import effective_project_id_expr+from products.event_definitions.backend.models import PropertyDefinition, effective_project_id_exprfrom ..models.access_control import AccessControlfrom ..models.property_access_control import PropertyAccessControl@@ -105,6 +105,19 @@ def _to_rule(rule: PropertyAccessControl) -> contracts.PropertyAccessControlRule)+def get_property_definition_labels(+ *, team_id: int, property_definition_ids: list[UUID]+) -> dict[UUID, contracts.PropertyDefinitionLabel]:+ return {+ definition.id: contracts.PropertyDefinitionLabel(+ id=definition.id,+ name=definition.name,+ is_person=definition.type == PropertyDefinition.Type.PERSON,+ )+ for definition in PropertyDefinition.objects.filter(team_id=team_id, id__in=property_definition_ids)+ }++def _get_property_definition(property_definition_id: str, team_id: int) -> PropertyDefinition:# Callers often send the property name. The pk is a UUID, and Django raises its own# ValidationError for any other string, which the API would turn into a 500.diff --git a/products/access_control/backend/facade/contracts.py b/products/access_control/backend/facade/contracts.pyindex d76157418adf..fb62bdfaf87d 100644--- a/products/access_control/backend/facade/contracts.py+++ b/products/access_control/backend/facade/contracts.py@@ -64,6 +64,15 @@ class PropertyAccessControlState:default_access_level: PropertyAccessLevel = PropertyAccessLevel.READ_WRITE+@frozen+class PropertyDefinitionLabel:+ """How a property access control rule names its property definition."""++ id: UUID+ name: str+ is_person: bool++# --- Input DTOs ---diff --git a/products/access_control/backend/presentation/access_control_settings.py b/products/access_control/backend/presentation/access_control_settings.pyindex 5fecc9598797..4cabb5c31c98 100644--- a/products/access_control/backend/presentation/access_control_settings.py+++ b/products/access_control/backend/presentation/access_control_settings.py@@ -26,7 +26,6 @@ from rest_framework.response import Responsefrom rest_framework.viewsets import GenericViewSetfrom posthog.api.documentation import OpenApiParameter, extend_schema-from posthog.models import PropertyDefinitionfrom posthog.models.organization import OrganizationMembershipfrom posthog.models.team.team import Teamfrom posthog.models.user import User@@ -593,23 +592,20 @@ class AccessControlSettingsViewSetMixin(_GenericViewSet):organization_member_id=organization_member.id if organization_member else None,role_id=role.id if role else None,)- definitions_by_id = {- str(pd.id): pd- for pd in PropertyDefinition.objects.filter(- team_id=team.id, id__in=[rule.property_definition_id for rule in rules]- )- }+ labels = access_control_api.get_property_definition_labels(+ team_id=team.id, property_definition_ids=[rule.property_definition_id for rule in rules]+ )results = []for rule in rules:- pd = definitions_by_id.get(str(rule.property_definition_id))- if pd is None:+ label = labels.get(rule.property_definition_id)+ if label is None:continueresults.append({- "property_definition_id": str(pd.id),- "property": pd.name,- "property_type": "person" if pd.type == pd.Type.PERSON else "event",+ "property_definition_id": str(label.id),+ "property": label.name,+ "property_type": "person" if label.is_person else "event","access_level": rule.access_level.value,})diff --git a/products/access_control/backend/tests/test_access_control.py b/products/access_control/backend/tests/test_access_control.pyindex a71c91b0e3a3..e62934f99059 100644--- a/products/access_control/backend/tests/test_access_control.py+++ b/products/access_control/backend/tests/test_access_control.py@@ -14,7 +14,6 @@ from parameterized import parameterizedfrom rest_framework import statusfrom posthog.constants import AvailableFeature-from posthog.models import PropertyDefinitionfrom posthog.models.activity_logging.activity_log import ActivityLogfrom posthog.models.organization import Organization, OrganizationMembershipfrom posthog.models.personal_api_key import PersonalAPIKey@@ -37,6 +36,7 @@ from products.ai_observability.backend.models.evaluations import Evaluationfrom products.cohorts.backend.models.cohort import Cohortfrom products.conversations.backend.models import Ticketfrom products.dashboards.backend.models.dashboard import Dashboard+from products.event_definitions.backend.models import PropertyDefinitionfrom products.feature_flags.backend.models.feature_flag import FeatureFlagfrom products.notebooks.backend.models import Notebookfrom products.product_analytics.backend.facade.models import Insightdiff --git a/products/access_control/backend/tests/test_property_access_control.py b/products/access_control/backend/tests/test_property_access_control.pyindex 5c5fdac68bca..28aa6f668c09 100644--- a/products/access_control/backend/tests/test_property_access_control.py+++ b/products/access_control/backend/tests/test_property_access_control.py@@ -6,7 +6,7 @@ from django.test import SimpleTestCasefrom parameterized import parameterizedfrom posthog.constants import AvailableFeature-from posthog.models import Organization, OrganizationMembership, PropertyDefinition+from posthog.models import Organization, OrganizationMembershipfrom products.access_control.backend.models.property_access_control import PropertyAccessControlfrom products.access_control.backend.models.role import Role, RoleMembership@@ -18,6 +18,7 @@ from products.access_control.backend.property_access_control import (get_restricted_properties_for_team,restriction_cache_scope,)+from products.event_definitions.backend.models import PropertyDefinitiondef _enable_property_access_control(organization: Organization, *, role_based_access: bool = True) -> None:diff --git a/products/access_control/backend/tests/test_property_access_control_api.py b/products/access_control/backend/tests/test_property_access_control_api.pyindex b5e2dd87acb5..6d187acd8d14 100644--- a/products/access_control/backend/tests/test_property_access_control_api.py+++ b/products/access_control/backend/tests/test_property_access_control_api.py@@ -3,7 +3,7 @@ from posthog.test.base import BaseTestfrom parameterized import parameterizedfrom posthog.constants import AvailableFeature-from posthog.models import Organization, PropertyDefinition+from posthog.models import Organizationfrom posthog.models.event.util import ClickhouseEventSerializerfrom posthog.test.persons import create_person@@ -11,6 +11,7 @@ from products.access_control.backend.facade.api import team_has_property_access_from products.access_control.backend.models.property_access_control import PropertyAccessControlfrom products.access_control.backend.models.role import Role, RoleMembershipfrom products.access_control.backend.property_access_control import PropertyAccessLevel+from products.event_definitions.backend.models import PropertyDefinitiondef _enable_property_access_control(organization: Organization, *, role_based_access: bool = False) -> None:diff --git a/products/access_control/backend/tests/test_property_access_control_viewset.py b/products/access_control/backend/tests/test_property_access_control_viewset.pyindex c3c0ba6521eb..0d23bcbf3fcd 100644--- a/products/access_control/backend/tests/test_property_access_control_viewset.py+++ b/products/access_control/backend/tests/test_property_access_control_viewset.py@@ -8,12 +8,13 @@ from parameterized import parameterizedfrom rest_framework import statusfrom posthog.constants import AvailableFeature-from posthog.models import OrganizationMembership, PropertyDefinition, Team, User+from posthog.models import OrganizationMembership, Team, Userfrom products.access_control.backend.models.property_access_control import PropertyAccessControlfrom products.access_control.backend.models.role import Rolefrom products.access_control.backend.presentation.serializers import PropertyAccessControlUpdateSerializerfrom products.access_control.backend.property_access_control import PropertyAccessLevel, get_restricted_property_names+from products.event_definitions.backend.models import PropertyDefinitionclass TestPropertyAccessControlViewSet(APIBaseTest):diff --git a/products/ai_observability/backend/api/test/test_summarization.py b/products/ai_observability/backend/api/test/test_summarization.pyindex bdad4d0f2f83..dae11f7599a3 100644--- a/products/ai_observability/backend/api/test/test_summarization.py+++ b/products/ai_observability/backend/api/test/test_summarization.py@@ -17,7 +17,6 @@ from parameterized import parameterizedfrom rest_framework import statusfrom posthog.constants import AvailableFeature-from posthog.models import PropertyDefinitionfrom posthog.models.ai_events.test_util import bulk_create_ai_eventsfrom posthog.models.event.util import bulk_create_events@@ -28,6 +27,7 @@ from products.ai_observability.backend.summarization.llm.schema import (SummarizationResponse,SummaryBullet,)+from products.event_definitions.backend.models import PropertyDefinitionTEST_TEXT_REPR_BUDGET = 4000diff --git a/products/ai_observability/backend/api/test/test_taggers.py b/products/ai_observability/backend/api/test/test_taggers.pyindex e2ccf6a60401..a453ead09a78 100644--- a/products/ai_observability/backend/api/test/test_taggers.py+++ b/products/ai_observability/backend/api/test/test_taggers.py@@ -8,7 +8,7 @@ from parameterized import parameterizedfrom rest_framework import statusfrom posthog.constants import AvailableFeature-from posthog.models import Organization, OrganizationMembership, Project, PropertyDefinition, Team, User+from posthog.models import Organization, OrganizationMembership, Project, Team, Userfrom posthog.models.event.util import bulk_create_eventsfrom products.access_control.backend.facade.contracts import PropertyAccessLevel@@ -16,6 +16,7 @@ from products.access_control.backend.models.access_control import AccessControlfrom products.access_control.backend.models.property_access_control import PropertyAccessControlfrom products.ai_observability.backend.models.provider_keys import LLMProviderfrom products.ai_observability.backend.models.taggers import Tagger, TaggerType+from products.event_definitions.backend.models import PropertyDefinitiondef _setup_team():diff --git a/products/batch_exports/backend/tests/temporal/destinations/file_download/test_file_download_api.py b/products/batch_exports/backend/tests/temporal/destinations/file_download/test_file_download_api.pyindex 6361d200aeb4..144a81509d0c 100644--- a/products/batch_exports/backend/tests/temporal/destinations/file_download/test_file_download_api.py+++ b/products/batch_exports/backend/tests/temporal/destinations/file_download/test_file_download_api.py@@ -21,7 +21,7 @@ from temporalio.worker import UnsandboxedWorkflowRunner, Workerfrom posthog.constants import AvailableFeaturefrom posthog.exceptions import ClickHouseQueryTimeOut-from posthog.models import Organization, OrganizationMembership, PropertyDefinition+from posthog.models import Organization, OrganizationMembershipfrom posthog.models.event.util import bulk_create_eventsfrom posthog.models.scoping import team_scopefrom posthog.temporal.tests.utils.events import generate_test_events@@ -45,6 +45,7 @@ from products.batch_exports.backend.presentation.views.file_download import ()from products.batch_exports.backend.temporal import ACTIVITIES, WORKFLOWSfrom products.batch_exports.backend.tests.temporal.destinations.s3.utils import has_valid_credentials+from products.event_definitions.backend.models import PropertyDefinitionpytestmark = [pytest.mark.asyncio,diff --git a/products/batch_exports/backend/tests/temporal/test_filters.py b/products/batch_exports/backend/tests/temporal/test_filters.pyindex 4ae05a3ea94c..ed9b9e916018 100644--- a/products/batch_exports/backend/tests/temporal/test_filters.py+++ b/products/batch_exports/backend/tests/temporal/test_filters.py@@ -7,10 +7,10 @@ import pytestfrom django.test import override_settingsfrom posthog.clickhouse.client import sync_execute-from posthog.models import PropertyDefinitionfrom posthog.sync import database_sync_to_asyncfrom products.batch_exports.backend.temporal.filters import InvalidFilterError, compose_filters_clause+from products.event_definitions.backend.models import PropertyDefinitionpytestmark = [pytest.mark.asyncio, pytest.mark.django_db]diff --git a/products/batch_exports/backend/tests/temporal/test_record_batch_model.py b/products/batch_exports/backend/tests/temporal/test_record_batch_model.pyindex a914cb2d5307..7b6589852e63 100644--- a/products/batch_exports/backend/tests/temporal/test_record_batch_model.py+++ b/products/batch_exports/backend/tests/temporal/test_record_batch_model.py@@ -15,7 +15,7 @@ from posthog.hogql.printer import prepare_ast_for_printing, print_prepared_astfrom posthog.constants import AvailableFeaturefrom posthog.credentials import AWSKeyPair-from posthog.models import OrganizationMembership, PropertyDefinition, User+from posthog.models import OrganizationMembership, Userfrom posthog.models.event.sql import EVENTS_PROPERTIES_JSON_TYPE, PERSON_PROPERTIES_JSON_TYPEfrom posthog.models.utils import uuid7from posthog.sync import database_sync_to_async@@ -45,6 +45,7 @@ from products.batch_exports.backend.temporal.record_batch_model import (from products.batch_exports.backend.temporal.sql.sessions import SESSIONS_LOOKBACK_DAYSfrom products.batch_exports.backend.tests.temporal.utils.clickhouse import truncate_events, truncate_sessionsfrom products.data_modeling.backend.facade.models import DataWarehouseSavedQuery+from products.event_definitions.backend.models import PropertyDefinitionif TYPE_CHECKING:from posthog.models import Organization, Teamdiff --git a/products/batch_exports/backend/tests/test_custom_events_schema.py b/products/batch_exports/backend/tests/test_custom_events_schema.pyindex 63413cfb299c..067fea74267f 100644--- a/products/batch_exports/backend/tests/test_custom_events_schema.py+++ b/products/batch_exports/backend/tests/test_custom_events_schema.py@@ -10,10 +10,9 @@ from parameterized import parameterizedfrom posthog.hogql import astfrom posthog.hogql.property_access_types import RestrictedProperty-from posthog.models import PropertyDefinition-from products.batch_exports.backend.custom_events_schema import parse_events_hogql_query, serialize_events_query_schemafrom products.batch_exports.backend.facade.contracts import UnsupportedHogQLQueryError+from products.event_definitions.backend.models import PropertyDefinitiondef prepare_query(query: str, team_id: int) -> ast.SelectQuery:diff --git a/products/customer_analytics/backend/facade/custom_property_source_person_test.py b/products/customer_analytics/backend/facade/custom_property_source_person_test.pyindex 8c77d39d0606..383974550fbb 100644--- a/products/customer_analytics/backend/facade/custom_property_source_person_test.py+++ b/products/customer_analytics/backend/facade/custom_property_source_person_test.py@@ -8,13 +8,13 @@ from django.utils import timezonefrom parameterized import parameterized-from posthog.models import PropertyDefinitionfrom posthog.paging import PageRequestfrom products.customer_analytics.backend.facade import apifrom products.customer_analytics.backend.models import CustomPropertySource, CustomPropertySyncRun, TargetTypefrom products.customer_analytics.backend.models.team_scoped_test_base import TeamScopedTestMixinfrom products.customer_analytics.backend.test.factories import create_custom_property_definition, create_saved_query+from products.event_definitions.backend.models import PropertyDefinitionfrom products.warehouse_sources.backend.models.credential import DataWarehouseCredentialfrom products.warehouse_sources.backend.models.external_data_schema import ExternalDataSchemafrom products.warehouse_sources.backend.models.external_data_source import ExternalDataSourcediff --git a/products/customer_analytics/backend/hogql_queries/test/test_account_users_query_runner.py b/products/customer_analytics/backend/hogql_queries/test/test_account_users_query_runner.pyindex 230c792d5d0f..7902aaec318b 100644--- a/products/customer_analytics/backend/hogql_queries/test/test_account_users_query_runner.py+++ b/products/customer_analytics/backend/hogql_queries/test/test_account_users_query_runner.py@@ -25,7 +25,7 @@ from posthog.constants import AvailableFeaturefrom posthog.hogql_queries.actors_query_runner import ActorsQueryRunnerfrom posthog.hogql_queries.paginators import HogQLHasMorePaginatorfrom posthog.hogql_queries.query_runner import API_QUERIES_BUDGET_ENFORCEMENT_FLAG, ExecutionMode, get_query_runner-from posthog.models import OrganizationMembership, PropertyDefinition, Team, User+from posthog.models import OrganizationMembership, Team, Userfrom posthog.models.personal_api_key import PersonalAPIKeyfrom posthog.models.utils import generate_random_token_personal, hash_key_valuefrom posthog.test.persons import create_person, update_person@@ -36,6 +36,7 @@ from products.customer_analytics.backend.logic.account_persons import AccountPerfrom products.customer_analytics.backend.models import TeamCustomerAnalyticsConfigfrom products.customer_analytics.backend.presentation.views.account_persons import AccountPersonsQuerySerializerfrom products.customer_analytics.backend.test.factories import create_account+from products.event_definitions.backend.models import PropertyDefinitionFLAG_CHECK = "products.customer_analytics.backend.logic.account_persons.posthog_feature_flag_enabled"diff --git a/products/customer_analytics/backend/test/test_key_metrics.py b/products/customer_analytics/backend/test/test_key_metrics.pyindex 2e7511b55364..948f4c5fafd1 100644--- a/products/customer_analytics/backend/test/test_key_metrics.py+++ b/products/customer_analytics/backend/test/test_key_metrics.py@@ -10,13 +10,13 @@ from parameterized import parameterizedfrom posthog.constants import AvailableFeaturefrom posthog.hogql_queries.query_runner import ExecutionMode-from posthog.models import PropertyDefinitionfrom posthog.test.persons import create_personfrom products.access_control.backend.facade.api import upsert_property_access_controlfrom products.access_control.backend.facade.contracts import PropertyAccessLevel, UpsertPropertyAccessControlInputfrom products.customer_analytics.backend.facade.api import get_key_metricsfrom products.customer_analytics.backend.logic import key_metrics as key_metrics_logic+from products.event_definitions.backend.models import PropertyDefinitionclass TestKeyMetrics(ClickhouseTestMixin, BaseTest):diff --git a/products/customer_analytics/backend/test/test_views.py b/products/customer_analytics/backend/test/test_views.pyindex 1037b6a3d587..598cf6c16f3f 100644--- a/products/customer_analytics/backend/test/test_views.py+++ b/products/customer_analytics/backend/test/test_views.py@@ -16,7 +16,7 @@ from rest_framework import statusfrom posthog.auth import MCP_USER_AGENT_MARKERfrom posthog.constants import AvailableFeature-from posthog.models import PropertyDefinition, Tag, TaggedItem+from posthog.models import Tag, TaggedItemfrom posthog.models.activity_logging.activity_log import ActivityLogfrom posthog.models.comment import Commentfrom posthog.models.integration import Integration@@ -60,6 +60,7 @@ from products.customer_analytics.backend.test.factories import (create_custom_property_definition,enroll_account,)+from products.event_definitions.backend.models import PropertyDefinitionfrom products.notebooks.backend.facade.content import build_markdown_notebook_contentfrom products.notebooks.backend.models import Notebook, ResourceNotebookfrom products.product_analytics.backend.facade.models import Insightdiff --git a/products/dashboards/backend/widgets/activity_events_list.py b/products/dashboards/backend/widgets/activity_events_list.pyindex 8aba0714cb70..1b1c56d17023 100644--- a/products/dashboards/backend/widgets/activity_events_list.py+++ b/products/dashboards/backend/widgets/activity_events_list.py@@ -8,7 +8,6 @@ from posthog.schema import EventsQueryfrom posthog.clickhouse.query_tagging import Feature, Product, tags_contextfrom posthog.hogql_queries.events_query_runner import EventsQueryRunner-from posthog.models import PropertyDefinitionfrom posthog.models.team import Teamfrom posthog.models.user import Userfrom posthog.taxonomy.property_access import restricted_property_names@@ -19,6 +18,7 @@ from products.dashboards.backend.widget_specs.registry import validate_widget_cofrom products.dashboards.backend.widgets.config import resolve_filter_test_accountsfrom products.dashboards.backend.widgets.list_widget import ListWidgetPage, run_list_widgetfrom products.dashboards.backend.widgets.widget_filters import build_event_property_filters_from_widget_filters+from products.event_definitions.backend.models import PropertyDefinitionValidatedActivityEventsListWidgetConfig = dict[str, Any]diff --git a/products/data_modeling/backend/test/test_view_column_refresh.py b/products/data_modeling/backend/test/test_view_column_refresh.pyindex d59ccdeb7e37..c54f3c44e248 100644--- a/products/data_modeling/backend/test/test_view_column_refresh.py+++ b/products/data_modeling/backend/test/test_view_column_refresh.py@@ -12,12 +12,11 @@ from posthog.hogql.errors import QueryErrorfrom posthog.hogql.property_access_types import RestrictedPropertyfrom posthog.hogql.query import execute_hogql_query-from posthog.models import PropertyDefinition-from products.data_modeling.backend.logic import view_column_refreshfrom products.data_modeling.backend.logic.saved_query_dag_sync import sync_saved_query_to_dagfrom products.data_modeling.backend.logic.view_column_refresh import refresh_view_columnsfrom products.data_modeling.backend.models.datawarehouse_saved_query import DataWarehouseSavedQuery+from products.event_definitions.backend.models import PropertyDefinitionclass TestViewColumnRefresh(ClickhouseTestMixin, BaseTest):diff --git a/products/demo/backend/logic/legacy/app_data_generator.py b/products/demo/backend/logic/legacy/app_data_generator.pyindex a07715a1cfc6..8348e82604f8 100644--- a/products/demo/backend/logic/legacy/app_data_generator.py+++ b/products/demo/backend/logic/legacy/app_data_generator.py@@ -6,11 +6,12 @@ from dateutil.relativedelta import relativedeltafrom posthog.schema import ActionsNode, DateRange, EventPropertyFilter, FunnelsQuery, InsightVizNode, PropertyOperator-from posthog.models import EventDefinition, Person, PropertyDefinition+from posthog.models import Personfrom products.actions.backend.facade.api import create_actionfrom products.dashboards.backend.models.dashboard import Dashboardfrom products.dashboards.backend.models.dashboard_tile import DashboardTile+from products.event_definitions.backend.models import EventDefinition, PropertyDefinitionfrom products.product_analytics.backend.facade.models import Insightfrom .data_generator import DataGeneratordiff --git a/products/demo/backend/logic/legacy/revenue_data_generator.py b/products/demo/backend/logic/legacy/revenue_data_generator.pyindex 84c270175611..125b10deba42 100644--- a/products/demo/backend/logic/legacy/revenue_data_generator.py+++ b/products/demo/backend/logic/legacy/revenue_data_generator.py@@ -14,11 +14,12 @@ from posthog.schema import (PropertyOperator,)-from posthog.models import EventDefinition, Person, PropertyDefinition+from posthog.models import Personfrom products.actions.backend.facade.api import create_actionfrom products.dashboards.backend.models.dashboard import Dashboardfrom products.dashboards.backend.models.dashboard_tile import DashboardTile+from products.event_definitions.backend.models import EventDefinition, PropertyDefinitionfrom products.product_analytics.backend.facade.models import Insightfrom .data_generator import DataGeneratordiff --git a/products/demo/backend/logic/legacy/web_data_generator.py b/products/demo/backend/logic/legacy/web_data_generator.pyindex c39db42fb781..62071508525e 100644--- a/products/demo/backend/logic/legacy/web_data_generator.py+++ b/products/demo/backend/logic/legacy/web_data_generator.py@@ -11,12 +11,13 @@ from dateutil.relativedelta import relativedeltafrom posthog.schema import ActionsNode, FunnelsQuery, InsightVizNode-from posthog.models import Person, PropertyDefinition+from posthog.models import Personfrom posthog.models.utils import UUIDTfrom products.actions.backend.facade.api import create_actionfrom products.dashboards.backend.models.dashboard import Dashboardfrom products.dashboards.backend.models.dashboard_tile import DashboardTile+from products.event_definitions.backend.models import PropertyDefinitionfrom products.product_analytics.backend.facade.models import Insightfrom .data_generator import DataGeneratordiff --git a/products/demo/backend/logic/matrix/taxonomy_inference.py b/products/demo/backend/logic/matrix/taxonomy_inference.pyindex 98242c25c968..c5979ae6df8b 100644--- a/products/demo/backend/logic/matrix/taxonomy_inference.py+++ b/products/demo/backend/logic/matrix/taxonomy_inference.py@@ -2,10 +2,10 @@ import jsonimport datetimefrom typing import Optional-from posthog.models import EventDefinition, EventProperty, PropertyDefinitionfrom posthog.models.group.sql import GROUPS_TABLEfrom posthog.models.person.sql import PERSONS_TABLE+from products.event_definitions.backend.models import EventDefinition, EventProperty, PropertyDefinitionfrom products.event_definitions.backend.models.property_definition import PropertyTypeCOMMON_EVENTS = ["$pageview", "$pageleave", "$autocapture", "$screen"]diff --git a/products/error_tracking/backend/hogql_queries/test/test_error_tracking_query_runner.py b/products/error_tracking/backend/hogql_queries/test/test_error_tracking_query_runner.pyindex ab6133a48e59..7e5b4cf72a0e 100644--- a/products/error_tracking/backend/hogql_queries/test/test_error_tracking_query_runner.py+++ b/products/error_tracking/backend/hogql_queries/test/test_error_tracking_query_runner.py@@ -41,7 +41,7 @@ from posthog.hogql.query import execute_hogql_queryfrom posthog.clickhouse.client import sync_executefrom posthog.constants import AvailableFeature-from posthog.models import PropertyDefinition, Team+from posthog.models import Teamfrom posthog.models.utils import uuid7from products.access_control.backend.facade.testing import create_access_control, create_role@@ -79,6 +79,7 @@ from products.error_tracking.backend.models import (sync_issues_to_clickhouse,update_error_tracking_issue_fingerprints,)+from products.event_definitions.backend.models import PropertyDefinitionfrom products.event_definitions.backend.property_type import PropertyTypediff --git a/products/error_tracking/backend/tests/api/test_query_api.py b/products/error_tracking/backend/tests/api/test_query_api.pyindex fab35624ccb1..97bb3fd38737 100644--- a/products/error_tracking/backend/tests/api/test_query_api.py+++ b/products/error_tracking/backend/tests/api/test_query_api.py@@ -16,7 +16,6 @@ from parameterized import parameterizedfrom posthog.clickhouse.query_tagging import Feature, Product, get_query_tagsfrom posthog.constants import AvailableFeature-from posthog.models import PropertyDefinitionfrom posthog.models.personal_api_key import PersonalAPIKeyfrom posthog.models.utils import generate_random_token_personal, hash_key_value@@ -50,6 +49,7 @@ from products.error_tracking.backend.tests.api.issue_summary_states import (lock_held,summary_state,)+from products.event_definitions.backend.models import PropertyDefinitionclass FakeQueryResponse:diff --git a/products/error_tracking/backend/tests/api/test_recommendations.py b/products/error_tracking/backend/tests/api/test_recommendations.pyindex 4df48fa9f215..94f26fc7571e 100644--- a/products/error_tracking/backend/tests/api/test_recommendations.py+++ b/products/error_tracking/backend/tests/api/test_recommendations.py@@ -11,7 +11,7 @@ from parameterized import parameterizedfrom rest_framework import statusfrom posthog.constants import AvailableFeature-from posthog.models import PropertyDefinition, Team+from posthog.models import Teamfrom products.access_control.backend.facade.api import upsert_property_access_controlfrom products.access_control.backend.facade.contracts import PropertyAccessLevel, UpsertPropertyAccessControlInput@@ -27,6 +27,7 @@ from products.error_tracking.backend.models import (ErrorTrackingStackFrame,ErrorTrackingSymbolSet,)+from products.event_definitions.backend.models import PropertyDefinitionMOCK_ALERTS_META = {"alerts": [diff --git a/products/error_tracking/backend/tests/test_issue_summaries.py b/products/error_tracking/backend/tests/test_issue_summaries.pyindex efecfe689678..c3a7600e6f20 100644--- a/products/error_tracking/backend/tests/test_issue_summaries.py+++ b/products/error_tracking/backend/tests/test_issue_summaries.py@@ -17,7 +17,7 @@ from prometheus_client import REGISTRYfrom redis.exceptions import RedisErrorfrom posthog.constants import AvailableFeature-from posthog.models import PropertyDefinition, User+from posthog.models import Userfrom posthog.redis import TEST_clear_clientsfrom posthog.temporal.common.errors import NonReportableApplicationErrorfrom posthog.token_bucket import BucketUnavailable, Budget, TEST_reset_scripts, consume@@ -57,6 +57,7 @@ from products.error_tracking.backend.temporal.lifecycle.issue_created.types impoIssueCreatedSnapshot,IssueCreatedWorkflowInputs,)+from products.event_definitions.backend.models import PropertyDefinitionSUMMARY_REPLY = {"what_happened": "Checkout throws when the cart is empty.",diff --git a/products/experiments/backend/hogql_queries/test/experiment_query_runner/test_experiment_exposures_query_runner.py b/products/experiments/backend/hogql_queries/test/experiment_query_runner/test_experiment_exposures_query_runner.pyindex bb398d05dcdb..79cec75492e3 100644--- a/products/experiments/backend/hogql_queries/test/experiment_query_runner/test_experiment_exposures_query_runner.py+++ b/products/experiments/backend/hogql_queries/test/experiment_query_runner/test_experiment_exposures_query_runner.py@@ -33,7 +33,6 @@ from posthog.clickhouse.query_tagging import AccessMethod, tags_contextfrom posthog.constants import AvailableFeaturefrom posthog.exceptions import ClickHouseQueryTimeOutfrom posthog.hogql_queries.utils.breakdowns import BREAKDOWN_OTHER_STRING_LABEL-from posthog.models import PropertyDefinitionfrom posthog.models.activity_logging.activity_log import ActivityLogfrom posthog.models.user import Userfrom posthog.test.persons import create_group_type_mapping@@ -43,6 +42,7 @@ from products.access_control.backend.facade.api import upsert_property_access_cofrom products.access_control.backend.facade.contracts import PropertyAccessLevel, UpsertPropertyAccessControlInputfrom products.access_control.backend.models.access_control import AccessControlfrom products.actions.backend.facade.testing import create_action+from products.event_definitions.backend.models import PropertyDefinitionfrom products.experiments.backend.hogql_queries import MULTIPLE_VARIANT_KEYfrom products.experiments.backend.hogql_queries.experiment_exposures_query_runner import ExperimentExposuresQueryRunnerfrom products.experiments.backend.hogql_queries.exposure_query_logic import (diff --git a/products/experiments/backend/session_exposure.py b/products/experiments/backend/session_exposure.pyindex 9aad7fed5733..b29e56c7bb1d 100644--- a/products/experiments/backend/session_exposure.py+++ b/products/experiments/backend/session_exposure.py@@ -18,9 +18,9 @@ from django.db.models.functions import Coalescefrom posthog.hogql import ast-from posthog.models import EventPropertyfrom posthog.models.team.team import Team+from products.event_definitions.backend.models import EventPropertyfrom products.experiments.backend.hogql_queries.exposure_query_logic import (DEFAULT_EXPOSURE_EVENT,EXPERIMENT_EXPOSURE_EVENT,diff --git a/products/experiments/backend/test/test_presentation_api.py b/products/experiments/backend/test/test_presentation_api.pyindex ada5e8e367a6..191c13cd7cb8 100644--- a/products/experiments/backend/test/test_presentation_api.py+++ b/products/experiments/backend/test/test_presentation_api.py@@ -30,7 +30,7 @@ from posthog.schema import (from posthog.auth import IDJagAccessTokenAuthentication, OAuthAccessTokenAuthentication, PersonalAPIKeyAuthenticationfrom posthog.constants import AvailableFeature-from posthog.models import Organization, OrganizationMembership, PropertyDefinition, Team+from posthog.models import Organization, OrganizationMembership, Teamfrom posthog.models.activity_logging.activity_log import ActivityLogfrom posthog.models.oauth import OAuthAccessToken, OAuthApplicationfrom posthog.models.personal_api_key import PersonalAPIKey@@ -45,6 +45,7 @@ from products.access_control.backend.models.access_control import AccessControlfrom products.actions.backend.facade.contracts import Actionfrom products.actions.backend.facade.testing import create_action, update_actionfrom products.cohorts.backend.models.cohort import Cohort+from products.event_definitions.backend.models import PropertyDefinitionfrom products.event_definitions.backend.models.event_definition import EventDefinitionfrom products.experiments.backend.experiment_service import ExperimentServicefrom products.experiments.backend.health.context import ConditionSetTrafficdiff --git a/products/experiments/backend/test/test_session_buckets_api.py b/products/experiments/backend/test/test_session_buckets_api.pyindex b371a2e67fd5..7bb4980dd0a9 100644--- a/products/experiments/backend/test/test_session_buckets_api.py+++ b/products/experiments/backend/test/test_session_buckets_api.py@@ -14,7 +14,7 @@ import posthog.hogql.query as hogql_query_modulefrom posthog.clickhouse.query_tagging import Product, get_query_tagsfrom posthog.constants import AvailableFeature-from posthog.models import EventProperty, Team, User+from posthog.models import Team, Userfrom posthog.models.team.extensions import get_or_create_team_extensionfrom posthog.models.utils import uuid7from posthog.session_recordings.models.session_recording import SessionRecording@@ -22,6 +22,7 @@ from posthog.session_recordings.queries.test.session_replay_sql import produce_rfrom products.access_control.backend.models.access_control import AccessControlfrom products.actions.backend.facade.testing import create_action+from products.event_definitions.backend.models import EventPropertyfrom products.experiments.backend import session_bucketsfrom products.experiments.backend.hogql_queries.exposure_query_logic import (EXPERIMENT_EXPOSURE_EVENT,diff --git a/products/experiments/backend/test/test_session_context_api.py b/products/experiments/backend/test/test_session_context_api.pyindex d00e9d5dc915..6fcc6f8065e9 100644--- a/products/experiments/backend/test/test_session_context_api.py+++ b/products/experiments/backend/test/test_session_context_api.py@@ -17,7 +17,7 @@ from posthog.hogql.database.models import Table, TableNodefrom posthog.clickhouse.query_tagging import Product, get_query_tagsfrom posthog.constants import AvailableFeature-from posthog.models import PropertyDefinition, Team, User+from posthog.models import Team, Userfrom posthog.models.personal_api_key import PersonalAPIKeyfrom posthog.models.utils import generate_random_token_personal, hash_key_value, uuid7from posthog.rate_limit import SessionContextsBurstRateThrottle@@ -30,6 +30,7 @@ from products.access_control.backend.facade.contracts import PropertyAccessLevelfrom products.access_control.backend.models.access_control import AccessControlfrom products.actions.backend.facade.testing import create_actionfrom products.cohorts.backend.models.cohort import Cohort+from products.event_definitions.backend.models import PropertyDefinitionfrom products.experiments.backend.models.experiment import Experiment, ExperimentSavedMetric, ExperimentToSavedMetricfrom products.experiments.backend.session_context import (MAX_SESSION_CONTEXT_BATCH,diff --git a/products/experiments/backend/test/test_session_event_deltas_api.py b/products/experiments/backend/test/test_session_event_deltas_api.pyindex 0301ef8ea32c..21da487fb999 100644--- a/products/experiments/backend/test/test_session_event_deltas_api.py+++ b/products/experiments/backend/test/test_session_event_deltas_api.py@@ -11,13 +11,14 @@ from django.test import SimpleTestCasefrom parameterized import parameterizedfrom rest_framework import status-from posthog.models import EventProperty, Team, User+from posthog.models import Team, Userfrom posthog.models.team.extensions import get_or_create_team_extensionfrom posthog.models.utils import uuid7from posthog.session_recordings.models.session_recording import SessionRecordingfrom posthog.session_recordings.queries.test.session_replay_sql import produce_replay_summaryfrom products.actions.backend.facade.testing import create_action+from products.event_definitions.backend.models import EventPropertyfrom products.experiments.backend import session_event_deltasfrom products.experiments.backend.hogql_queries.experiment_exposure_query_builder import ExposureQueryBuilderfrom products.experiments.backend.models.experiment import Experimentdiff --git a/products/experiments/backend/test/test_session_exposure.py b/products/experiments/backend/test/test_session_exposure.pyindex 4d13c4e725c2..bbbd97f64e9a 100644--- a/products/experiments/backend/test/test_session_exposure.py+++ b/products/experiments/backend/test/test_session_exposure.py@@ -8,9 +8,9 @@ from rest_framework.exceptions import ValidationErrorfrom posthog.hogql import ast-from posthog.models import EventPropertyfrom posthog.models.team import Team+from products.event_definitions.backend.models import EventPropertyfrom products.experiments.backend.facade import replay as facade_replayfrom products.experiments.backend.facade.contracts import InSessionExposureSemanticsfrom products.experiments.backend.hogql_queries import MULTIPLE_VARIANT_KEYdiff --git a/products/feature_flags/backend/api/test/test_feature_flag.py b/products/feature_flags/backend/api/test/test_feature_flag.pyindex 643c4b080759..9b3cf4cdc3bb 100644--- a/products/feature_flags/backend/api/test/test_feature_flag.py+++ b/products/feature_flags/backend/api/test/test_feature_flag.py@@ -41,7 +41,7 @@ from posthog.api.cohort import (from posthog.api.services.flags_service import FlagVersionConflictError, PropertyMatchingVersionConflictErrorfrom posthog.api.utils import ServiceRequestfrom posthog.constants import AvailableFeature-from posthog.models import PropertyDefinition, TaggedItem, User+from posthog.models import TaggedItem, Userfrom posthog.models.group.util import create_group, raw_create_group_chfrom posthog.models.organization import Organization, OrganizationMembershipfrom posthog.models.personal_api_key import PersonalAPIKey@@ -64,6 +64,7 @@ from products.cohorts.backend.models.cohort import Cohort, CohortTypefrom products.cohorts.backend.models.util import CohortErrorCode, get_friendly_error_messagefrom products.dashboards.backend.models.dashboard import Dashboardfrom products.early_access_features.backend.models import EarlyAccessFeature+from products.event_definitions.backend.models import PropertyDefinitionfrom products.experiments.backend.facade.api import experiment_flag_idsfrom products.experiments.backend.facade.testing import create_experiment, update_experimentfrom products.feature_flags.backend.api.feature_flag import (diff --git a/products/groups/backend/logic/property_definitions.py b/products/groups/backend/logic/property_definitions.pyindex 044535d71af5..78b2eb37fcac 100644--- a/products/groups/backend/logic/property_definitions.py+++ b/products/groups/backend/logic/property_definitions.py@@ -1,6 +1,9 @@-from posthog.models import PropertyDefinition--from products.event_definitions.backend.models import PropertyType, effective_project_id_expr, group_type_index_key_expr+from products.event_definitions.backend.models import (+ PropertyDefinition,+ PropertyType,+ effective_project_id_expr,+ group_type_index_key_expr,+)def detect_group_property_type(value: object) -> PropertyType:diff --git a/products/groups/backend/tests/test_clickhouse_groups.py b/products/groups/backend/tests/test_clickhouse_groups.pyindex 1845c04c1b44..3c5a1b4350ab 100644--- a/products/groups/backend/tests/test_clickhouse_groups.py+++ b/products/groups/backend/tests/test_clickhouse_groups.py@@ -30,7 +30,6 @@ from posthog.hogql.query import execute_hogql_queryfrom posthog.constants import AvailableFeature, GroupTypeIndexfrom posthog.helpers.dashboard_templates import create_group_type_mapping_detail_dashboard-from posthog.models import PropertyDefinitionfrom posthog.models.group.group import Groupfrom posthog.models.group.util import ListGroupsResult, create_group, list_groups, raw_create_group_chfrom posthog.models.group_type_mapping import (@@ -48,6 +47,7 @@ from posthog.test.persons import create_group_type_mapping, create_personfrom posthog.test.test_utils import create_group_type_mapping_without_created_atfrom products.access_control.backend.models.access_control import AccessControl+from products.event_definitions.backend.models import PropertyDefinitionfrom products.groups.backend.presentation.views import _decode_groups_cursor, _encode_groups_cursorfrom products.notebooks.backend.facade.content import convert_notebook_content_to_markdown, is_markdown_notebook_contentfrom products.notebooks.backend.models import Notebook, ResourceNotebookdiff --git a/products/managed_warehouse/backend/tests/test_member_teams.py b/products/managed_warehouse/backend/tests/test_member_teams.pyindex e664ba8da165..14fca1206787 100644--- a/products/managed_warehouse/backend/tests/test_member_teams.py+++ b/products/managed_warehouse/backend/tests/test_member_teams.py@@ -10,9 +10,10 @@ from django.test import override_settingsimport requestsfrom posthog.constants import AvailableFeature-from posthog.models import Organization, OrganizationMembership, PropertyDefinition, Team, User+from posthog.models import Organization, OrganizationMembership, Team, Userfrom products.access_control.backend.facade import testing as access_testing+from products.event_definitions.backend.models import PropertyDefinitionfrom products.managed_warehouse.backend import member_teams, signalsfrom products.managed_warehouse.backend.models import DuckgresServerdiff --git a/products/marketing_analytics/backend/hogql_queries/conversion_goal_processor.py b/products/marketing_analytics/backend/hogql_queries/conversion_goal_processor.pyindex 5795460e59f5..63f048dac25f 100644--- a/products/marketing_analytics/backend/hogql_queries/conversion_goal_processor.py+++ b/products/marketing_analytics/backend/hogql_queries/conversion_goal_processor.py@@ -29,7 +29,7 @@ from posthog.hogql.parser import parse_exprfrom posthog.hogql.timings import HogQLTimingsfrom posthog.dataclasses import frozen-from posthog.models import PropertyDefinition, Team, User+from posthog.models import Team, Userfrom products.access_control.backend.property_access_control import (get_restricted_properties_for_team,@@ -39,6 +39,7 @@ from products.analytics_platform.backend.lazy_computation.lazy_computation_execuLazyComputationResult,LazyComputationTable,)+from products.event_definitions.backend.models import PropertyDefinitionfrom .adapters.factory import MarketingSourceFactoryfrom .attribution_weights import (diff --git a/products/marketing_analytics/backend/hogql_queries/test_attribution_table_query_runner.py b/products/marketing_analytics/backend/hogql_queries/test_attribution_table_query_runner.pyindex 76dcf6829e43..880e39abbabf 100644--- a/products/marketing_analytics/backend/hogql_queries/test_attribution_table_query_runner.py+++ b/products/marketing_analytics/backend/hogql_queries/test_attribution_table_query_runner.py@@ -23,13 +23,13 @@ from posthog.hogql.property_access_types import RestrictedPropertyfrom posthog.hogql.test.utils import pretty_print_in_testsfrom posthog.hogql.visitor import TraversingVisitor-from posthog.models import PropertyDefinitionfrom posthog.models.team.team_marketing_analytics_config import MAX_ATTRIBUTION_WINDOW_DAYSfrom posthog.models.utils import uuid7from posthog.test.persons import create_personfrom products.actions.backend.facade.testing import create_actionfrom products.cohorts.backend.models.cohort import Cohort+from products.event_definitions.backend.models import PropertyDefinitionfrom products.marketing_analytics.backend.hogql_queries.attribution_table_query_runner import (MarketingAnalyticsAttributionQueryRunner,)diff --git a/products/marketing_analytics/backend/hogql_queries/test_conversion_goal_processor_refactor.py b/products/marketing_analytics/backend/hogql_queries/test_conversion_goal_processor_refactor.pyindex a3b2a914d334..e89dd1405090 100644--- a/products/marketing_analytics/backend/hogql_queries/test_conversion_goal_processor_refactor.py+++ b/products/marketing_analytics/backend/hogql_queries/test_conversion_goal_processor_refactor.py@@ -23,9 +23,8 @@ from posthog.hogql.context import HogQLContextfrom posthog.hogql.printer import prepare_and_print_astfrom posthog.hogql.test.utils import pretty_print_in_tests-from posthog.models import PropertyDefinition-from products.actions.backend.facade.testing import create_action+from products.event_definitions.backend.models import PropertyDefinitionfrom products.marketing_analytics.backend.hogql_queries.conversion_goal_processor import ConversionGoalProcessorfrom products.marketing_analytics.backend.hogql_queries.marketing_analytics_config import MarketingAnalyticsConfigdiff --git a/products/mcp_analytics/backend/tests/test_api.py b/products/mcp_analytics/backend/tests/test_api.pyindex 7a387c79f7e6..0a6dff1f728f 100644--- a/products/mcp_analytics/backend/tests/test_api.py+++ b/products/mcp_analytics/backend/tests/test_api.py@@ -16,13 +16,13 @@ from posthog.schema import AnyPropertyFilterDiscriminated, EventPropertyFilter,from posthog.hogql.database.database import Databasefrom posthog.constants import AvailableFeature-from posthog.models import PropertyDefinitionfrom posthog.models.utils import uuid7from posthog.test.persons import create_personfrom posthog.utils import generate_cache_keyfrom products.access_control.backend.models.property_access_control import PropertyAccessControlfrom products.access_control.backend.property_access_control import PropertyAccessLevel+from products.event_definitions.backend.models import PropertyDefinitionfrom products.mcp_analytics.backend import intent_generation, logic, mcp_harnessfrom products.mcp_analytics.backend.facade import api, contracts, enumsfrom products.mcp_analytics.backend.models import MCPAnalyticsSubmission, MCPCustomHarness, MCPSessiondiff --git a/products/mcp_analytics/backend/tests/test_protocol_version_breakdown.py b/products/mcp_analytics/backend/tests/test_protocol_version_breakdown.pyindex 6865df7dd6c9..b550b53e0ee2 100644--- a/products/mcp_analytics/backend/tests/test_protocol_version_breakdown.py+++ b/products/mcp_analytics/backend/tests/test_protocol_version_breakdown.py@@ -7,8 +7,7 @@ from parameterized import parameterizedfrom posthog.schema import DateRange, MCPProtocolVersionBreakdownQuery-from posthog.models import PropertyDefinition-+from products.event_definitions.backend.models import PropertyDefinitionfrom products.mcp_analytics.backend.hogql_queries.protocol_version_breakdown import (PROTOCOL_VERSION_SERIES_LIMIT,MCPProtocolVersionBreakdownQueryRunner,diff --git a/products/product_analytics/backend/tests/test_insight_data_checks.py b/products/product_analytics/backend/tests/test_insight_data_checks.pyindex 936bef5313ea..d130b45bb8a7 100644--- a/products/product_analytics/backend/tests/test_insight_data_checks.py+++ b/products/product_analytics/backend/tests/test_insight_data_checks.py@@ -28,7 +28,7 @@ from posthog.clickhouse.query_tagging import get_query_tag_valuefrom posthog.constants import AvailableFeaturefrom posthog.errors import CHQueryErrorQueryWasCancelled, ExposedCHQueryErrorfrom posthog.exceptions import APIQueriesBudgetExceeded-from posthog.models import PersonalAPIKey, PropertyDefinition+from posthog.models import PersonalAPIKeyfrom posthog.models.organization import OrganizationMembershipfrom posthog.models.organization_domain import OrganizationDomainfrom posthog.models.team import Team@@ -37,6 +37,7 @@ from products.access_control.backend.facade.api import upsert_property_access_cofrom products.access_control.backend.facade.contracts import PropertyAccessLevel, UpsertPropertyAccessControlInputfrom products.access_control.backend.models.access_control import AccessControlfrom products.cohorts.backend.models.cohort import Cohort+from products.event_definitions.backend.models import PropertyDefinitionfrom products.product_analytics.backend.facade.contracts import (InsightDataCheck,InsightDataChecks,diff --git a/products/replay_vision/backend/scanner_draft.py b/products/replay_vision/backend/scanner_draft.pyindex 7e615f5158b1..3a292125a3bf 100644--- a/products/replay_vision/backend/scanner_draft.py+++ b/products/replay_vision/backend/scanner_draft.py@@ -43,12 +43,12 @@ from posthog.api.search import (from posthog.clickhouse.query_tagging import get_query_tags, query_tagsfrom posthog.hogql_queries.utils.parallel import run_in_parallel_threadsfrom posthog.llm.semantic_enrichment import get_team_business_context-from posthog.models import EventDefinitionfrom posthog.models.team import Teamfrom posthog.models.user import Userfrom posthog.scopes import APIScopeObjectfrom products.access_control.backend.facade.user_access_control import UserAccessControl+from products.event_definitions.backend.models import EventDefinitionfrom products.experiments.backend.facade.replay import targetable_experimentsfrom products.replay_vision.backend.billing import observation_credits_for_modelfrom products.replay_vision.backend.gemini_client import gemini_text_modelsdiff --git a/products/replay_vision/backend/tests/test_scanner_draft.py b/products/replay_vision/backend/tests/test_scanner_draft.pyindex 164ec1ff7162..e629a03f72d9 100644--- a/products/replay_vision/backend/tests/test_scanner_draft.py+++ b/products/replay_vision/backend/tests/test_scanner_draft.py@@ -14,12 +14,13 @@ from rest_framework import statusfrom posthog.schema import RecordingsQuery-from posthog.models import EventDefinition, PersonalAPIKey+from posthog.models import PersonalAPIKeyfrom posthog.models.utils import generate_random_token_personal, hash_key_valuefrom posthog.rate_limit import AIBurstRateThrottlefrom products.actions.backend.facade.testing import create_actionfrom products.cohorts.backend.models.cohort import Cohort+from products.event_definitions.backend.models import EventDefinitionfrom products.experiments.backend.models.experiment import Experimentfrom products.feature_flags.backend.models.feature_flag import FeatureFlagfrom products.posthog_ai.backend.models.assistant import CoreMemorydiff --git a/products/signals/backend/test/test_report_checks.py b/products/signals/backend/test/test_report_checks.pyindex 9b4e9206496a..2490b8f444f9 100644--- a/products/signals/backend/test/test_report_checks.py+++ b/products/signals/backend/test/test_report_checks.py@@ -20,12 +20,13 @@ from rest_framework.test import APIRequestFactory, force_authenticatefrom posthog.clickhouse.client.connection import ClickHouseUserfrom posthog.clickhouse.workload import Workloadfrom posthog.constants import AvailableFeature-from posthog.models import Organization, PropertyDefinition, Team+from posthog.models import Organization, Teamfrom posthog.models.personal_api_key import PersonalAPIKeyfrom posthog.models.utils import generate_random_token_personal, hash_key_valuefrom products.access_control.backend.facade.contracts import PropertyAccessLevelfrom products.access_control.backend.models.property_access_control import PropertyAccessControl+from products.event_definitions.backend.models import PropertyDefinitionfrom products.product_analytics.backend.facade.contracts import TrendsQueryRunResultfrom products.signals.backend.artefact_attribution import ArtefactAttributionfrom products.signals.backend.artefact_schemas import CheckResult, Dismissal, NoteArtefactdiff --git a/products/signals/backend/test/test_signal_report_api.py b/products/signals/backend/test/test_signal_report_api.pyindex 43d4ab348de8..f74afd51595a 100644--- a/products/signals/backend/test/test_signal_report_api.py+++ b/products/signals/backend/test/test_signal_report_api.py@@ -25,7 +25,7 @@ from social_django.models import UserSocialAuthfrom posthog.constants import AvailableFeaturefrom posthog.egress.github.transport import GitHubEgressBudgetExhausted, GitHubRateLimitErrorfrom posthog.egress.limiter.policies import Priority-from posthog.models import EventDefinition, OAuthApplication, Organization, User+from posthog.models import OAuthApplication, Organization, Userfrom posthog.models.integration import GitHubIntegrationfrom posthog.models.team.team import Teamfrom posthog.models.user_integration import UserIntegration@@ -41,6 +41,7 @@ from products.access_control.backend.facade.contracts import PropertyAccessLevelfrom products.access_control.backend.models.access_control import AccessControlfrom products.access_control.backend.models.property_access_control import PropertyAccessControlfrom products.actions.backend.facade.testing import create_action+from products.event_definitions.backend.models import EventDefinitionfrom products.event_definitions.backend.models.property_definition import PropertyDefinitionfrom products.signals.backend.artefact_schemas import (ChannelAssignment,diff --git a/products/subscriptions/backend/temporal/ai_subscription/spec_generator.py b/products/subscriptions/backend/temporal/ai_subscription/spec_generator.pyindex 733369d7a013..4395fc9e804a 100644--- a/products/subscriptions/backend/temporal/ai_subscription/spec_generator.py+++ b/products/subscriptions/backend/temporal/ai_subscription/spec_generator.py@@ -20,10 +20,11 @@ from posthog.hogql.visitor import TraversingVisitorfrom posthog.hogql_queries.ai.team_taxonomy_query_runner import TeamTaxonomyQueryRunnerfrom posthog.hogql_queries.query_runner import ExecutionMode-from posthog.models import EventDefinition, EventProperty, PropertyDefinition, Team, User+from posthog.models import Team, Userfrom 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.event_definitions.backend.models import EventDefinition, EventProperty, PropertyDefinitionfrom products.posthog_ai.backend.models.assistant import CoreMemoryfrom products.subscriptions.backend.facade.contracts import PromptRejectedErrorfrom products.subscriptions.backend.models.subscription import AIQueryPlanStatus, Subscriptiondiff --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 dba3d61782e8..f1883bc16d53 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@@ -13,8 +13,9 @@ from posthog.schema import CachedTeamTaxonomyQueryResponse, TeamTaxonomyItem, Tefrom posthog.hogql.functions.mapping import HOGQL_CLICKHOUSE_FUNCTIONSfrom posthog.exceptions import ClickHouseQueryTimeOut-from posthog.models import EventDefinition, EventProperty, PropertyDefinition, Team+from posthog.models import Team+from products.event_definitions.backend.models import EventDefinition, EventProperty, PropertyDefinitionfrom products.subscriptions.backend.facade.contracts import PromptRejectedErrorfrom products.subscriptions.backend.models.subscription import AIQueryPlanStatus, Subscriptionfrom products.subscriptions.backend.temporal.ai_subscription.schemas import QueryPlan, QueryPlanStep, RelevantEventsdiff --git a/products/tasks/backend/tests/test_max_tools.py b/products/tasks/backend/tests/test_max_tools.pyindex 4f6fb2d490f1..543d47edeb8c 100644--- a/products/tasks/backend/tests/test_max_tools.py+++ b/products/tasks/backend/tests/test_max_tools.py@@ -9,10 +9,10 @@ from langchain_core.runnables import RunnableConfigfrom parameterized import parameterized_classfrom posthog.constants import AvailableFeature-from posthog.models import PropertyDefinitionfrom products.access_control.backend.models.property_access_control import PropertyAccessControlfrom products.access_control.backend.property_access_control import PropertyAccessLevel+from products.event_definitions.backend.models import PropertyDefinitionfrom products.tasks.backend.max_tools import (CreateTaskTool,GetTaskRunLogsTool,diff --git a/products/warehouse_sources/backend/facade/person_property_provenance.py b/products/warehouse_sources/backend/facade/person_property_provenance.pyindex 23773c7d7917..a6792873de12 100644--- a/products/warehouse_sources/backend/facade/person_property_provenance.py+++ b/products/warehouse_sources/backend/facade/person_property_provenance.py@@ -9,8 +9,7 @@ from collections.abc import Iterablefrom django.db.models import BigIntegerFieldfrom django.db.models.functions import Coalesce-from posthog.models import PropertyDefinition-+from products.event_definitions.backend.models import PropertyDefinitionfrom products.warehouse_sources.backend.facade.hooks import WarehouseBinding_GROUP_TARGET = "group"diff --git a/products/warehouse_sources/backend/temporal/data_imports/pipelines/core/person_property_sync_test.py b/products/warehouse_sources/backend/temporal/data_imports/pipelines/core/person_property_sync_test.pyindex bea18a872bce..f48262330d1b 100644--- a/products/warehouse_sources/backend/temporal/data_imports/pipelines/core/person_property_sync_test.py+++ b/products/warehouse_sources/backend/temporal/data_imports/pipelines/core/person_property_sync_test.py@@ -18,8 +18,9 @@ from confluent_kafka import KafkaErrorfrom parameterized import parameterizedfrom posthog.kafka_client.client import ProduceResult-from posthog.models import Organization, PropertyDefinition, Team+from posthog.models import Organization, Team+from products.event_definitions.backend.models import PropertyDefinitionfrom products.warehouse_sources.backend.temporal.data_imports.external_product_hooks import (PersonPropertySyncSource,saved_query_binding,diff --git a/products/web_analytics/backend/hogql_queries/test/test_web_calendar_heatmap_lazy_precompute.py b/products/web_analytics/backend/hogql_queries/test/test_web_calendar_heatmap_lazy_precompute.pyindex 2b2a1d67b464..d13dbe695c6c 100644--- a/products/web_analytics/backend/hogql_queries/test/test_web_calendar_heatmap_lazy_precompute.py+++ b/products/web_analytics/backend/hogql_queries/test/test_web_calendar_heatmap_lazy_precompute.py@@ -21,10 +21,10 @@ from posthog.schema import (from posthog.clickhouse.client import sync_executefrom posthog.hogql_queries.query_runner import get_query_runner-from posthog.models import EventDefinitionfrom posthog.models.utils import uuid7from products.analytics_platform.backend.models.preaggregation_job import PreaggregationJob+from products.event_definitions.backend.models import EventDefinitionfrom products.product_analytics.backend.facade.queries import CalendarHeatmapTrendsQueryRunnerfrom products.web_analytics.backend.hogql_queries.web_calendar_heatmap import WebCalendarHeatmapTrendsQueryRunnerdiff --git a/products/web_analytics/backend/hogql_queries/web_calendar_heatmap.py b/products/web_analytics/backend/hogql_queries/web_calendar_heatmap.pyindex 0fbe72d9a133..4ea0e3bc672b 100644--- a/products/web_analytics/backend/hogql_queries/web_calendar_heatmap.py+++ b/products/web_analytics/backend/hogql_queries/web_calendar_heatmap.py@@ -20,8 +20,8 @@ from posthog.clickhouse.preaggregation.web_overview_preaggregated_sql import (DISTRIBUTED_WEB_OVERVIEW_PREAGGREGATED_TABLE,)from posthog.clickhouse.query_tagging import Feature, Product, tag_queries-from posthog.models import EventDefinition+from products.event_definitions.backend.models import EventDefinitionfrom products.product_analytics.backend.facade.queries import CalendarHeatmapTrendsQueryRunnerfrom products.web_analytics.backend.hogql_queries.web_analytics_lazy_precompute import (WEB_ANALYTICS_LAZY_PRECOMPUTE_FALLBACK,diff --git a/products/workflows/backend/services/data_suggestions/team_context.py b/products/workflows/backend/services/data_suggestions/team_context.pyindex b7edc1cf37e5..e61d6c8b2142 100644--- a/products/workflows/backend/services/data_suggestions/team_context.py+++ b/products/workflows/backend/services/data_suggestions/team_context.py@@ -7,9 +7,10 @@ from django.db.models import BigIntegerField, F, IntegerFieldfrom django.db.models.functions import Coalescefrom posthog.integrations import IntegrationManager-from posthog.models import EventProperty, PropertyDefinition, Team+from posthog.models import Teamfrom products.access_control.backend.facade.api import person_property_names_with_access_rules+from products.event_definitions.backend.models import EventProperty, PropertyDefinitionfrom products.messaging.backend.facade.api import EmailTemplateSummary, list_email_templatesfrom products.workflows.backend.models.hog_flow.hog_flow import HogFlowfrom products.workflows.backend.models.team_workflows_config import TeamWorkflowsConfigdiff --git a/products/workflows/backend/services/people_import.py b/products/workflows/backend/services/people_import.pyindex 138c2b514940..78e4334d7865 100644--- a/products/workflows/backend/services/people_import.py+++ b/products/workflows/backend/services/people_import.py@@ -20,7 +20,6 @@ from posthog.hogql.query import execute_hogql_queryfrom posthog.clickhouse.client.connection import Workloadfrom posthog.clickhouse.query_tagging import Feature, Product, tag_queriesfrom posthog.dataclasses import frozen-from posthog.models import PropertyDefinitionfrom posthog.models.person.util import (get_distinct_ids_for_persons,get_person_ids_and_uuids_by_uuids,@@ -32,6 +31,7 @@ from posthog.storage import object_storagefrom products.access_control.backend.property_access_control import get_non_writable_property_namesfrom products.cohorts.backend.models.cohort import Cohort+from products.event_definitions.backend.models import PropertyDefinitionfrom products.workflows.backend.facade.contracts import PeopleImportInvalid, PeopleImportSummarylogger = get_logger(__name__)diff --git a/products/workflows/backend/test/test_people_import.py b/products/workflows/backend/test/test_people_import.pyindex 25fc870c791d..fdc3c1280ae1 100644--- a/products/workflows/backend/test/test_people_import.py+++ b/products/workflows/backend/test/test_people_import.py@@ -10,13 +10,14 @@ from rest_framework import statusfrom posthog.api.capture import CaptureInternalResultfrom posthog.constants import AvailableFeature-from posthog.models import PersonalAPIKey, PropertyDefinition+from posthog.models import PersonalAPIKeyfrom posthog.models.utils import generate_random_token_personal, hash_key_valuefrom products.access_control.backend.facade.contracts import PropertyAccessLevelfrom products.access_control.backend.models.access_control import AccessControlfrom products.access_control.backend.models.property_access_control import PropertyAccessControlfrom products.cohorts.backend.models.cohort import Cohort+from products.event_definitions.backend.models import PropertyDefinitionfrom products.workflows.backend.facade.contracts import PeopleImportInvalidfrom products.workflows.backend.services import people_importfrom products.workflows.backend.services.people_import import start_people_importdiff --git a/products/workflows/backend/tests/api/test_broadcast_audience_suggestions.py b/products/workflows/backend/tests/api/test_broadcast_audience_suggestions.pyindex 6e3e9e3acd7a..6794083777ad 100644--- a/products/workflows/backend/tests/api/test_broadcast_audience_suggestions.py+++ b/products/workflows/backend/tests/api/test_broadcast_audience_suggestions.py@@ -10,12 +10,12 @@ from parameterized import parameterizedfrom posthog.constants import AvailableFeaturefrom posthog.exceptions import ClickHouseQueryTimeOut-from posthog.models import PropertyDefinitionfrom posthog.test.persons import create_personfrom products.access_control.backend.models.property_access_control import PropertyAccessControlfrom products.access_control.backend.property_access_control import PropertyAccessLevelfrom products.cohorts.backend.models.cohort import Cohort+from products.event_definitions.backend.models import PropertyDefinitionfrom products.workflows.backend.facade.contracts import AudienceKind, AudienceSuggestionfrom products.workflows.backend.services.audience_suggestions.audience import cohort_filters, reachable_countsfrom products.workflows.backend.services.audience_suggestions.planner import AudienceIdeadiff --git a/products/workflows/backend/tests/api/test_message_assets.py b/products/workflows/backend/tests/api/test_message_assets.pyindex 57aff93f1c60..a919c2a89758 100644--- a/products/workflows/backend/tests/api/test_message_assets.py+++ b/products/workflows/backend/tests/api/test_message_assets.py@@ -8,13 +8,14 @@ from rest_framework import statusfrom posthog.clickhouse.client.execute import sync_executefrom posthog.constants import AvailableFeature-from posthog.models import OrganizationMembership, PropertyDefinition+from posthog.models import OrganizationMembershipfrom posthog.models.personal_api_key import PersonalAPIKeyfrom posthog.models.utils import generate_random_token_personal, hash_key_valuefrom posthog.test.persons import create_personfrom products.access_control.backend.models.property_access_control import PropertyAccessControlfrom products.access_control.backend.property_access_control import PropertyAccessLevel+from products.event_definitions.backend.models import PropertyDefinitionfrom products.workflows.backend.models.hog_flow.hog_flow import HogFlowfrom products.workflows.backend.models.message_assets_sql import INSERT_MESSAGE_ASSET_SQLdiff --git a/products/workflows/backend/tests/api/test_workflow_data_suggestions.py b/products/workflows/backend/tests/api/test_workflow_data_suggestions.pyindex 15e3cb64f05e..092e2882a686 100644--- a/products/workflows/backend/tests/api/test_workflow_data_suggestions.py+++ b/products/workflows/backend/tests/api/test_workflow_data_suggestions.py@@ -17,7 +17,6 @@ from parameterized import parameterizedfrom posthog.errors import InternalCHQueryErrorfrom posthog.event_usage import EventSourcefrom posthog.exceptions import ClickHouseQueryTimeOut-from posthog.models import PropertyDefinitionfrom posthog.models.integration import Integrationfrom posthog.models.organization import OrganizationMembershipfrom posthog.models.personal_api_key import PersonalAPIKey, hash_key_value@@ -28,6 +27,7 @@ from posthog.models.utils import generate_random_token_personalfrom products.access_control.backend.facade.contracts import PropertyAccessLevelfrom products.access_control.backend.models.property_access_control import PropertyAccessControlfrom products.cdp.backend.templates.hog_function_template import sync_template_to_db+from products.event_definitions.backend.models import PropertyDefinitionfrom products.messaging.backend.facade.testing import create_message_template_for_testfrom products.workflows.backend.facade.contracts import DataSuggestionsResultfrom products.workflows.backend.models import WorkflowIdea as WorkflowIdeaModeldiff --git a/tach.toml b/tach.tomlindex 5eb29c8533dd..75d5aacd6663 100644--- a/tach.toml+++ b/tach.toml@@ -328,6 +328,7 @@ layer = "modules"[[modules]]path = "products.dashboards"depends_on = [+ "products.event_definitions","products.notebooks","ee","posthog",@@ -418,6 +419,7 @@ depends_on = ["products.ai_observability","products.annotations","products.dashboards",+ "products.event_definitions","products.exports","products.notifications","products.posthog_ai",@@ -449,6 +451,7 @@ depends_on = ["products.data_modeling","products.data_tools","products.data_warehouse",+ "products.event_definitions","products.notifications","products.posthog_ai","products.revenue_analytics",@@ -1178,6 +1181,7 @@ depends_on = ["posthog","products.actions","products.analytics_platform",+ "products.event_definitions","products.notifications",# The web trends, web vitals and calendar heatmap runners subclass product analytics' trends runners."products.product_analytics",@@ -1199,6 +1203,7 @@ depends_on = ["products.cdp","products.early_access_features","products.error_tracking",+ "products.event_definitions","products.feature_flags","products.surveys","products.messaging",