Skip to content

:hedgehog: PostHog is the leading platform for building self-driving products. Our developer tools – AI observability, analytics, session replay, flags, experiments, error tracking, logs, and more – capture all the context agents need to diagnose problems, uncover opportunities, and ship fixes. Steer it all from Slack, web, desktop, or the MCP.

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.yml
index 0134253da8db..58c8bf9bdf30 100644
--- a/.github/workflows/ci-mcp.yml
+++ b/.github/workflows/ci-mcp.yml
@@ -731,7 +731,8 @@ jobs:
import django, os
os.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, PropertyDefinition
from posthog.models.personal_api_key import PersonalAPIKey
from posthog.models.utils import hash_key_value
org = Organization.objects.first()
diff --git a/ee/api/ee_event_definition.py b/ee/api/ee_event_definition.py
index 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 serializers
from posthog.api.shared import UserBasicSerializer
from posthog.api.tagged_item import TaggedItemSerializerMixin
from posthog.event_usage import groups
-from posthog.models import EventDefinition, ObjectMediaPreview
+from posthog.models import ObjectMediaPreview
from posthog.models.organization import OrganizationMembership
+from products.event_definitions.backend.models import EventDefinition
+
from ee.models.event_definition import EnterpriseEventDefinition
if TYPE_CHECKING:
diff --git a/ee/api/ee_property_definition.py b/ee/api/ee_property_definition.py
index 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 serializers
from posthog.api.shared import UserBasicSerializer
from posthog.api.tagged_item import TaggedItemSerializerMixin
from posthog.helpers.impersonation import is_impersonated
-from posthog.models import PropertyDefinition
from 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 EnterprisePropertyDefinition
diff --git a/ee/api/test/test_property_definition.py b/ee/api/test/test_property_definition.py
index 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 parameterized
from rest_framework import status
from 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 EventProperty
from products.event_definitions.backend.models.property_definition import PropertyDefinition
from ee.models.license import License, LicenseManager
diff --git a/ee/hogai/tools/execute_sql/test/test_mcp_tool.py b/ee/hogai/tools/execute_sql/test/test_mcp_tool.py
index 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 parameterized
from posthog.schema import HogQLNotice, HogQLQuery
from posthog.event_usage import EventSource
-from posthog.models import EventDefinition, Organization, Team, User
+from posthog.models import Organization, Team, User
from posthog.sync import database_sync_to_async
+from products.event_definitions.backend.models import EventDefinition
from products.product_analytics.backend.facade.models import Insight, InsightVariable
from ee.hogai.context.insight.context import InsightContext
diff --git a/ee/hogai/tools/read_data/test/test_tool.py b/ee/hogai/tools/read_data/test/test_tool.py
index 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 OrganizationMembership
from posthog.models.scoping import team_scope
from 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 PropertyDefinition
from products.experiments.backend.facade.testing import acreate_experiment
from products.feature_flags.backend.models.feature_flag import FeatureFlag
from products.product_analytics.backend.facade.models import Insight
diff --git a/posthog/api/event.py b/posthog/api/event.py
index 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_queries
from posthog.errors import ExposedCHQueryError
from posthog.event_usage import get_request_analytics_properties
from posthog.exceptions_capture import capture_exception
-from posthog.models import Element, Person, PropertyDefinition, User
+from posthog.models import Element, Person, User
from 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_GROUP
from posthog.utils import convert_property_value, flatten, refresh_requested_by_client, relative_date_parse
+from products.event_definitions.backend.models import PropertyDefinition
from products.event_definitions.backend.models.property_definition import effective_project_id_expr
tracer = trace.get_tracer(__name__)
diff --git a/posthog/api/event_definition.py b/posthog/api/event_definition.py
index 28d52f9acd44..c6b4690e20ce 100644
--- a/posthog/api/event_definition.py
+++ b/posthog/api/event_definition.py
@@ -44,7 +44,7 @@ from posthog.constants import EventDefinitionType
from posthog.event_usage import report_user_action
from posthog.filters import TermSearchFilterBackend, term_search_filter_sql
from posthog.helpers.impersonation import is_impersonated
-from posthog.models import EventDefinition, ObjectMediaPreview, TaggedItem, Team
+from posthog.models import ObjectMediaPreview, TaggedItem, Team
from posthog.models.activity_logging.activity_log import Detail, dict_changes_between, log_activity
from posthog.models.tagged_item_registry import content_type_for
from posthog.models.user import User
@@ -67,6 +67,7 @@ from posthog.taxonomy.scout_writes import check_scout_event_definition_write
from posthog.taxonomy.taxonomy import CORE_EVENTS, STALE_EVENT_DAYS
from posthog.utils import get_safe_cache, relative_date_parse
+from products.event_definitions.backend.models import EventDefinition
from products.event_definitions.backend.models.property_definition import effective_project_id_expr
# If EE is enabled, we use ee.api.ee_event_definition.EnterpriseEventDefinitionSerializer
diff --git a/posthog/api/event_definition_generators/base.py b/posthog/api/event_definition_generators/base.py
index 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, QuerySet
import orjson
from posthog.event_usage import report_user_action
-from posthog.models import EventDefinition, EventSchema, SchemaPropertyGroupProperty
from posthog.taxonomy.taxonomy import CORE_EVENTS
+from products.event_definitions.backend.models import EventDefinition, EventSchema, SchemaPropertyGroupProperty
from products.event_definitions.backend.models.property_definition import effective_project_id_expr
diff --git a/posthog/api/event_definition_generators/golang.py b/posthog/api/event_definition_generators/golang.py
index 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 QuerySet
import orjson
-from ...models import EventDefinition, SchemaPropertyGroupProperty
+from products.event_definitions.backend.models import EventDefinition, SchemaPropertyGroupProperty
+
from .base import EventDefinitionGenerator
diff --git a/posthog/api/event_definition_generators/python.py b/posthog/api/event_definition_generators/python.py
index 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 QuerySet
import orjson
-from ...models import EventDefinition, SchemaPropertyGroupProperty
+from products.event_definitions.backend.models import EventDefinition, SchemaPropertyGroupProperty
+
from .base import EventDefinitionGenerator
diff --git a/posthog/api/event_definition_generators/typescript.py b/posthog/api/event_definition_generators/typescript.py
index 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 QuerySet
import orjson
-from ...models import EventDefinition, SchemaPropertyGroupProperty
+from products.event_definitions.backend.models import EventDefinition, SchemaPropertyGroupProperty
+
from .base import EventDefinitionGenerator
diff --git a/posthog/api/event_schema.py b/posthog/api/event_schema.py
index 7b140ca7b662..a3642eab3b17 100644
--- a/posthog/api/event_schema.py
+++ b/posthog/api/event_schema.py
@@ -5,10 +5,11 @@ from rest_framework.request import Request
from posthog.api.routing import TeamAndOrgViewSetMixin
from posthog.api.schema_property_group import SchemaPropertyGroupSerializer
from posthog.api.scoped_related_fields import TeamScopedPrimaryKeyRelatedField
-from posthog.models import EventDefinition, EventSchema, SchemaPropertyGroup
from posthog.permissions import is_scout_sandbox_request
from 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.py
index 200f72205e33..082cdea93b80 100644
--- a/posthog/api/livestream.py
+++ b/posthog/api/livestream.py
@@ -15,7 +15,7 @@ from posthog.hogql.property_access_types import RestrictedProperty
from posthog.auth import refuse_blocked_account
from posthog.jwt import PosthogJwtAudience, decode_jwt
-from posthog.models import OrganizationMembership, PropertyDefinition, Team, User
+from posthog.models import OrganizationMembership, Team, User
from posthog.models.activity_logging.utils import ActivityCredentialMixin
from posthog.models.group_type_mapping import get_group_types_for_project
from posthog.permissions import ActiveOrganizationPermission, VerifiedDomainEnforcementPermission
@@ -24,6 +24,7 @@ from posthog.user_permissions import UserPermissions
from 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.py
index 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 action
from posthog.api.routing import TeamAndOrgViewSetMixin
from posthog.helpers.impersonation import is_impersonated
-from posthog.models import MaterializedColumnSlot, MaterializedColumnSlotState, PropertyDefinition, Team
+from posthog.models import MaterializedColumnSlot, MaterializedColumnSlotState, Team
from posthog.models.activity_logging.activity_log import Change, Detail, log_activity
from posthog.models.materialized_column_slots import MAX_SLOTS_PER_TEAM
from posthog.permissions import IsStaffUserOrImpersonating
from 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_columns
diff --git a/posthog/api/object_media_preview.py b/posthog/api/object_media_preview.py
index 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 Request
from rest_framework.response import Response
from posthog.api.routing import TeamAndOrgViewSetMixin
-from posthog.models import EventDefinition, ObjectMediaPreview, UploadedMedia
+from posthog.models import ObjectMediaPreview, UploadedMedia
from posthog.permissions import is_scout_sandbox_request
from 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.py
index 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 PropertyDefinition
user = self.request.user if self.request.user.is_authenticated else None
context["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 PropertyDefinition
user = request.user if request.user.is_authenticated else None
restricted = 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 PropertyDefinition
user = request.user if request.user.is_authenticated else None
return get_non_writable_property_names(
diff --git a/posthog/api/schema_property_group.py b/posthog/api/schema_property_group.py
index 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 Request
from posthog.api.routing import TeamAndOrgViewSetMixin
from posthog.api.shared import UserBasicSerializer
-from posthog.models import SchemaPropertyGroup, SchemaPropertyGroupProperty
from posthog.permissions import is_scout_sandbox_request
from posthog.taxonomy.scout_writes import refuse_scout_taxonomy_write
+from products.event_definitions.backend.models import SchemaPropertyGroup, SchemaPropertyGroupProperty
+
MAX_PROPERTY_NAME_LENGTH = 200
diff --git a/posthog/api/search.py b/posthog/api/search.py
index 780054052ee4..50d16290a5df 100644
--- a/posthog/api/search.py
+++ b/posthog/api/search.py
@@ -17,7 +17,6 @@ from rest_framework.response import Response
from posthog.api.documentation import _FallbackSerializer
from posthog.api.routing import TeamAndOrgViewSetMixin
from posthog.helpers.full_text_search import build_rank, process_query
-from posthog.models import EventDefinition, PropertyDefinition
from products.access_control.backend.facade.user_access_control import UserAccessControl, model_to_resource
from products.actions.backend.facade.api import search_actions
@@ -26,6 +25,7 @@ from products.dashboards.backend.models.dashboard import Dashboard
from products.data_modeling.backend.facade.models import DataWarehouseSavedQuery, Node
from products.early_access_features.backend.models import EarlyAccessFeature
from products.endpoints.backend.facade.models import Endpoint
+from products.event_definitions.backend.models import EventDefinition, PropertyDefinition
from products.event_definitions.backend.models.property_definition import effective_project_id_expr
from products.experiments.backend.models.experiment import Experiment
from products.feature_flags.backend.models.feature_flag import FeatureFlag
diff --git a/posthog/api/test/test_event.py b/posthog/api/test/test_event.py
index 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 relativedelta
from parameterized import parameterized
from rest_framework import status
-from posthog.models import Element, Organization, PropertyDefinition, User
+from posthog.models import Element, Organization, User
from posthog.models.event.legacy_events_query import _execute_events_list_query
from posthog.models.team.extensions import get_or_create_team_extension
from posthog.models.team.team_revenue_analytics_config import TeamRevenueAnalyticsConfig
@@ -33,6 +33,7 @@ from posthog.test.test_journeys import journeys_for
from products.actions.backend.facade.testing import create_action
from products.cohorts.backend.models.cohort import Cohort
+from products.event_definitions.backend.models import PropertyDefinition
class TestEvents(ClickhouseTestMixin, APIBaseTest):
diff --git a/posthog/api/test/test_event_definition.py b/posthog/api/test/test_event_definition.py
index 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_organization
from posthog.api.test.test_team import create_team
from posthog.api.test.test_user import create_user
from posthog.constants import EventDefinitionType
-from posthog.models import ActivityLog, EventDefinition, Organization, Tag, Team
+from posthog.models import ActivityLog, Organization, Tag, Team
from posthog.models.oauth import OAuthAccessToken, OAuthApplication
from posthog.taxonomy import definition_search
from 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.py
index 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 parameterized
from rest_framework import status
from 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 EnterpriseEventDefinition
diff --git a/posthog/api/test/test_event_definition_python.py b/posthog/api/test/test_event_definition_python.py
index 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 parameterized
from rest_framework import status
from 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.py
index 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 SimpleTestCase
from rest_framework import status
from 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 EnterpriseEventDefinition
diff --git a/posthog/api/test/test_livestream.py b/posthog/api/test/test_livestream.py
index 832ac024c98c..397efad9e01c 100644
--- a/posthog/api/test/test_livestream.py
+++ b/posthog/api/test/test_livestream.py
@@ -10,13 +10,14 @@ from parameterized import parameterized
from posthog.api.livestream import LivestreamAuthentication
from posthog.constants import AvailableFeature
from posthog.jwt import PosthogJwtAudience, encode_jwt
-from posthog.models import OrganizationDomain, OrganizationMembership, PropertyDefinition
+from posthog.models import OrganizationDomain, OrganizationMembership
from posthog.test.authentication_checks import covers_authentication
from posthog.test.persons import create_group_type_mapping
from products.access_control.backend.models.access_control import AccessControl
from products.access_control.backend.models.property_access_control import PropertyAccessControl
from products.access_control.backend.property_access_control import PropertyAccessLevel
+from products.event_definitions.backend.models import PropertyDefinition
class TestLivestreamAuthorization(APIBaseTest):
diff --git a/posthog/api/test/test_materialized_column_activity_logging.py b/posthog/api/test/test_materialized_column_activity_logging.py
index 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 patch
from temporalio.testing import ActivityEnvironment
-from posthog.models import ActivityLog, MaterializedColumnSlot, MaterializedColumnSlotState, PropertyDefinition
+from posthog.models import ActivityLog, MaterializedColumnSlot, MaterializedColumnSlotState
from 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 PropertyDefinition
from products.event_definitions.backend.models.property_definition import PropertyType
diff --git a/posthog/api/test/test_materialized_column_slot.py b/posthog/api/test/test_materialized_column_slot.py
index 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, patch
from parameterized import parameterized
from rest_framework import status
-from posthog.models import MaterializedColumnSlot, MaterializedColumnSlotState, PropertyDefinition
+from posthog.models import MaterializedColumnSlot, MaterializedColumnSlotState
from posthog.models.materialized_column_slots import MAX_SLOTS_PER_TEAM
+from products.event_definitions.backend.models import PropertyDefinition
from products.event_definitions.backend.models.property_definition import PropertyType
diff --git a/posthog/api/test/test_object_media_preview.py b/posthog/api/test/test_object_media_preview.py
index 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 timezone
from rest_framework import status
-from posthog.models import EventDefinition, ObjectMediaPreview, UploadedMedia
+from posthog.models import ObjectMediaPreview, UploadedMedia
+
+from products.event_definitions.backend.models import EventDefinition
class TestObjectMediaPreviewAPI(APIBaseTest):
diff --git a/posthog/api/test/test_person.py b/posthog/api/test/test_person.py
index 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_execute
from posthog.clickhouse.query_tagging import get_query_tag_value, reset_query_tags
from posthog.constants import AvailableFeature
from posthog.hogql_queries.serialized_actors import get_serialized_people
-from posthog.models import Organization, Person, PropertyDefinition, Team
+from posthog.models import Organization, Person, Team
from posthog.models.async_deletion import AsyncDeletion, DeletionType
from posthog.models.person.bulk_delete import PersonDeletionFailure, PersonDeletionStep, PersonProfileDeletionResult
from posthog.models.person.missing_person import uuidFromDistinctId
@@ -51,6 +51,7 @@ from posthog.test.persons import add_distinct_id, create_person, delete_person
from products.access_control.backend.models.property_access_control import PropertyAccessControl
from products.access_control.backend.property_access_control import PropertyAccessLevel
from products.cohorts.backend.models.cohort import Cohort
+from products.event_definitions.backend.models import PropertyDefinition
class TestPerson(ClickhouseTestMixin, APIBaseTest, QueryMatchingTest):
diff --git a/posthog/api/test/test_property_definition.py b/posthog/api/test/test_property_definition.py
index 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 SimpleTestCase
from parameterized import parameterized
from rest_framework import status
-from posthog.models import ActivityLog, EventDefinition, EventProperty, Organization, PropertyDefinition, Team
+from posthog.models import ActivityLog, Organization, Team
from 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.py
index 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 APIBaseTest
from parameterized import parameterized
from 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.py
index 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_leaves
from posthog.auth import SharingPasswordProtectedAuthentication
from posthog.constants import AvailableFeature
from posthog.jwt import PosthogJwtAudience, decode_jwt
-from posthog.models import ActivityLog, OrganizationMembership, PropertyDefinition, Team
+from posthog.models import ActivityLog, OrganizationMembership, Team
from posthog.models.data_color_theme import DataColorTheme
from posthog.models.share_password import SharePassword
from posthog.models.sharing_configuration import SharingConfiguration
@@ -46,6 +46,7 @@ from products.dashboards.backend.models.dashboard import Dashboard
from products.dashboards.backend.models.dashboard_tile import ButtonTile, DashboardTile, Text
from products.dashboards.backend.models.dashboard_widget import DashboardWidget
from products.data_modeling.backend.facade.models import DataWarehouseSavedQuery
+from products.event_definitions.backend.models import PropertyDefinition
from products.exports.backend.models.exported_asset import ExportedAsset, get_render_access_token
from products.notebooks.backend.models import Notebook
from products.product_analytics.backend.facade.models import Insight
diff --git a/posthog/caching/test/test_warming.py b/posthog/caching/test/test_warming.py
index 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 AvailableFeature
from posthog.exceptions import ClickHouseAtCapacity
-from posthog.models import PropertyDefinition, User
+from posthog.models import User
from posthog.query_cache.freshness_index import update_target_age
from posthog.scheduling.jitter import deterministic_offset
@@ -23,6 +23,7 @@ from products.access_control.backend.facade.contracts import PropertyAccessLevel
from products.access_control.backend.models.property_access_control import PropertyAccessControl
from products.dashboards.backend.models.dashboard import Dashboard
from products.dashboards.backend.models.dashboard_tile import DashboardTile
+from products.event_definitions.backend.models import PropertyDefinition
from products.product_analytics.backend.facade.api import record_insight_views
from products.product_analytics.backend.facade.models import Insight, InsightVariable
diff --git a/posthog/hogql/database/schema/test/test_flag_evaluations.py b/posthog/hogql/database/schema/test/test_flag_evaluations.py
index 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_locations
from posthog.clickhouse.client import sync_execute
from posthog.constants import AvailableFeature
from posthog.hogql_queries.events_query_runner import SELECT_STAR_FROM_EVENTS_FIELDS
-from posthog.models import PropertyDefinition, Team
+from posthog.models import Team
from posthog.models.group.util import create_group
from posthog.models.instance_setting import override_instance_config
from posthog.models.property import TableColumn
@@ -69,6 +69,7 @@ from products.cohorts.backend.models.util import insert_static_cohort
from products.data_modeling.backend.facade.models import DataWarehouseSavedQuery
from products.data_tools.backend.facade.models import DataWarehouseJoin
from products.data_tools.backend.models.expression import DataWarehouseExpression
+from products.event_definitions.backend.models import PropertyDefinition
from products.feature_flags.backend.facade.enums import FlagEvaluationsMode
from products.feature_flags.backend.models.organization_feature_flags_config import OrganizationFeatureFlagsConfig
diff --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.py
index 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_select
from posthog.hogql.printer import prepare_and_print_ast, prepare_ast_for_printing
from posthog.hogql.visitor import CloningVisitor, clone_expr
-from posthog.models import PropertyDefinition
+from products.event_definitions.backend.models import PropertyDefinition
def _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.py
index 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_query
from posthog.hogql.resolver import resolve_types
from posthog.hogql.visitor import clone_expr
-from posthog.models import EventDefinition
from posthog.models.utils import uuid7
from 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.py
index 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_select
from posthog.hogql.printer import prepare_ast_for_printing, print_prepared_ast
from posthog.hogql.visitor import clone_expr
-from posthog.models import EventDefinition
+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]:
diff --git a/posthog/hogql/database/test/test_database.py b/posthog/hogql/database/test/test_database.py
index 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_query
from posthog.hogql.test.utils import pretty_print_in_tests
from posthog.constants import AvailableFeature
-from posthog.models import PropertyDefinition
from posthog.models.group_type_mapping import invalidate_group_types_cache
from posthog.models.instance_setting import override_instance_config
from posthog.models.organization import Organization, OrganizationMembership
@@ -101,6 +100,7 @@ from products.access_control.backend.models.access_control import AccessControl
from products.data_modeling.backend.facade.models import DataWarehouseSavedQuery
from products.data_tools.backend.models.expression import DataWarehouseExpression
from products.data_tools.backend.models.join import DataWarehouseJoin
+from products.event_definitions.backend.models import PropertyDefinition
from products.feature_flags.backend.facade.enums import FlagEvaluationsMode
from products.feature_flags.backend.models.organization_feature_flags_config import OrganizationFeatureFlagsConfig
from products.revenue_analytics.backend.views import RevenueAnalyticsChargeView
diff --git a/posthog/hogql/printer/test/test_printer.py b/posthog/hogql/printer/test/test_printer.py
index 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_sql
from posthog.clickhouse.client.execute import sync_execute
from posthog.clickhouse.events_json import TEMPORARY_PROPERTIES_JSON_TYPE
-from posthog.models import PropertyDefinition
from posthog.models.event.sql import EVENTS_JSON_DATA_TABLE, EVENTS_PROPERTIES_JSON_TYPE
from posthog.models.exchange_rate.sql import EXCHANGE_RATE_DICTIONARY_NAME
from posthog.models.instance_setting import override_instance_config
@@ -70,6 +69,7 @@ from posthog.models.team.team import WeekStartDay
from posthog.settings.data_stores import CLICKHOUSE_DATABASE
from products.cohorts.backend.models.cohort import Cohort
+from products.event_definitions.backend.models import PropertyDefinition
from products.event_definitions.backend.models.property_definition import PropertyType
from products.warehouse_sources.backend.facade.models import DataWarehouseCredential, DataWarehouseTable
diff --git a/posthog/hogql/printer/test/test_property_access_control.py b/posthog/hogql/printer/test/test_property_access_control.py
index 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_query
from posthog.hogql.restricted_properties import WEB_DIMENSIONAL_MIRRORED_COLUMNS
from posthog.constants import AvailableFeature
-from posthog.models import PropertyDefinition
from posthog.models.event.util import create_event
from products.access_control.backend.models.property_access_control import PropertyAccessControl
from 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.py
index 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_hogql
from posthog.constants import AUTOCAPTURE_EVENT, TREND_FILTER_TYPE_ACTIONS, PropertyOperatorType
from posthog.dataclasses import frozen
from posthog.interval_specs import get_interval_func
-from posthog.models import Property, PropertyDefinition, Team
+from posthog.models import Property, Team
from posthog.models.element import Element
from posthog.models.event import Selector
from posthog.models.property import BehavioralPropertyType, PropertyGroup, ValueT
@@ -71,6 +71,7 @@ from products.actions.backend.facade.api import get_action
from products.actions.backend.facade.contracts import Action, ActionNotFound, ActionStep
from products.cohorts.backend.models.cohort import Cohort
from products.data_tools.backend.models.join import DataWarehouseJoin
+from products.event_definitions.backend.models import PropertyDefinition
from products.event_definitions.backend.models.property_definition import PropertyType
from products.warehouse_sources.backend.facade.hogql import get_view_or_table_by_name
diff --git a/posthog/hogql/property_metadata.py b/posthog/hogql/property_metadata.py
index 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 Team
from posthog.models.materialized_column_slots import ( # noqa: PLC0415
MaterializedColumnSlot,
MaterializedColumnSlotState,
)
+ from products.event_definitions.backend.models import PropertyDefinition
+
team_id = context.team_id
if 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.py
index 4aea8ff16024..2196d2278184 100644
--- a/posthog/hogql/taxonomy_validation.py
+++ b/posthog/hogql/taxonomy_validation.py
@@ -14,10 +14,11 @@ from posthog.hogql import ast
from posthog.hogql.escape_sql import escape_hogql_identifier, escape_hogql_string
from posthog.hogql.visitor import TraversingVisitor
-from posthog.models import EventDefinition, PropertyDefinition, Team
+from posthog.models import Team
from posthog.taxonomy.dynamic_properties import is_dynamic_property
from posthog.taxonomy.taxonomy import virtual_property_names
+from products.event_definitions.backend.models import EventDefinition, PropertyDefinition
from products.event_definitions.backend.models.property_definition import effective_project_id_expr
logger = getLogger(__name__)
diff --git a/posthog/hogql/test/test_metadata.py b/posthog/hogql/test/test_metadata.py
index 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_select
from posthog.hogql.taxonomy_validation import MAX_SUGGESTED_NAMES
from posthog.api.services.query import process_query_model
-from posthog.models import EventDefinition, PropertyDefinition, Team
+from posthog.models import Team
from posthog.models.scoping import team_scope
from posthog.taxonomy.dynamic_properties import DYNAMIC_PROPERTY_PATTERNS
from products.cohorts.backend.models.cohort import Cohort
from products.data_modeling.backend.facade.models import DataWarehouseSavedQuery
from products.data_tools.backend.models.expression import DataWarehouseExpression
+from products.event_definitions.backend.models import EventDefinition, PropertyDefinition
from products.feature_flags.backend.facade.enums import FlagEvaluationsMode
from products.feature_flags.backend.models.organization_feature_flags_config import OrganizationFeatureFlagsConfig
from products.product_analytics.backend.facade.models import InsightVariable
diff --git a/posthog/hogql/test/test_observability.py b/posthog/hogql/test/test_observability.py
index 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_types
from posthog.hogql.transforms.property_types import build_property_swapper
from posthog.clickhouse.query_tagging import Product
-from posthog.models import PropertyDefinition
+from products.event_definitions.backend.models import PropertyDefinition
from products.event_definitions.backend.models.property_definition import PropertyType as PropertyDefinitionType
diff --git a/posthog/hogql/test/test_property.py b/posthog/hogql/test/test_property.py
index 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_locations
from posthog.clickhouse.client import sync_execute
from posthog.clickhouse.events_json import DISTRIBUTED_EVENTS_JSON_TABLE
from posthog.constants import TREND_FILTER_TYPE_ACTIONS, TREND_FILTER_TYPE_EVENTS, PropertyOperatorType
-from posthog.models import Property, PropertyDefinition, Team
+from posthog.models import Property, Team
from posthog.models.event.sql import EVENTS_PROPERTIES_JSON_TYPE
from posthog.models.property import PropertyGroup
from posthog.models.property.util import get_property_string_expr
@@ -54,6 +54,7 @@ from posthog.utils import relative_date_parse
from products.actions.backend.facade.testing import create_action, update_action
from products.cohorts.backend.models.cohort import Cohort
from products.data_tools.backend.models.join import DataWarehouseJoin
+from products.event_definitions.backend.models import PropertyDefinition
from products.event_definitions.backend.models.property_definition import PropertyType
from products.warehouse_sources.backend.facade.models import DataWarehouseCredential, DataWarehouseTable
diff --git a/posthog/hogql/test/test_property_skip_indexes.py b/posthog/hogql/test/test_property_skip_indexes.py
index 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_expr
from posthog.hogql.query import execute_hogql_query
from 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 PropertyDefinition
from products.event_definitions.backend.models.property_definition import PropertyType
from ee.clickhouse.materialized_columns.columns import (
diff --git a/posthog/hogql/test/test_trino_semantics.py b/posthog/hogql/test/test_trino_semantics.py
index 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 RestrictedProperty
from posthog.hogql.transforms.trino.errors import TrinoLoweringError
from posthog.constants import AvailableFeature
-from posthog.models import PropertyDefinition
from posthog.schema_enums import InCohortVia, InlineCohortCalculation, PersonsOnEventsMode
from products.access_control.backend.models.property_access_control import PropertyAccessControl
from products.access_control.backend.property_access_control import PropertyAccessLevel
from products.actions.backend.facade.testing import create_action
from products.cohorts.backend.models.cohort import Cohort
+from products.event_definitions.backend.models import PropertyDefinition
class TestTrinoSemantics(APIBaseTest):
diff --git a/posthog/hogql/transforms/test/test_events_predicate_pushdown.py b/posthog/hogql/transforms/test/test_events_predicate_pushdown.py
index 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_ac
from posthog.hogql.visitor import TraversingVisitor
from posthog.clickhouse.client import sync_execute
-from posthog.models import MaterializedColumnSlot, MaterializedColumnSlotState, PropertyDefinition
+from posthog.models import MaterializedColumnSlot, MaterializedColumnSlotState
from posthog.uuidt import uuid7
from products.cohorts.backend.models.cohort import Cohort
from products.cohorts.backend.models.util import recalculate_cohortpeople
+from products.event_definitions.backend.models import PropertyDefinition
from products.event_definitions.backend.models.property_definition import PropertyType
diff --git a/posthog/hogql/transforms/test/test_exported_properties.py b/posthog/hogql/transforms/test/test_exported_properties.py
index 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 RestrictedProperty
from posthog.hogql.query import execute_hogql_query
from posthog.clickhouse.client.escape import substitute_params
-from posthog.models import PropertyDefinition
from posthog.models.instance_setting import override_instance_config
from products.data_modeling.backend.facade.models import DataWarehouseSavedQuery
+from products.event_definitions.backend.models import PropertyDefinition
from products.event_definitions.backend.models.property_definition import PropertyType
STAR_EVENTS = "(SELECT * FROM events)"
diff --git a/posthog/hogql/transforms/test/test_lazy_tables.py b/posthog/hogql/transforms/test/test_lazy_tables.py
index 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 PropertyMetadata
from posthog.hogql.query import execute_hogql_query
from posthog.hogql.test.utils import pretty_print_in_tests
-from posthog.models import Organization, PropertyDefinition, Team
+from posthog.models import Organization, Team
from posthog.schema_enums import PersonsArgMaxVersion
from products.data_tools.backend.models.join import DataWarehouseJoin
+from products.event_definitions.backend.models import PropertyDefinition
class TestNamespacedLazyTables(SimpleTestCase):
diff --git a/posthog/hogql/transforms/test/test_negated_person_filters.py b/posthog/hogql/transforms/test/test_negated_person_filters.py
index 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_ast
from posthog.hogql.property import property_to_expr
from posthog.hogql.query import execute_hogql_query
-from posthog.models import PropertyDefinition
from posthog.models.person.util import create_person
+from products.event_definitions.backend.models import PropertyDefinition
from products.event_definitions.backend.models.property_definition import PropertyType
from ee.clickhouse.materialized_columns.columns import MaterializedColumn, MaterializedColumnDetails
diff --git a/posthog/hogql/transforms/test/test_property_types.py b/posthog/hogql/transforms/test/test_property_types.py
index 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 ComparisonCompatibility
from posthog.clickhouse.client import sync_execute
from posthog.clickhouse.events_json import EVENTS_JSON_DATA_TABLE, TEMPORARY_PROPERTIES_JSON_TYPE
from posthog.errors import ExposedCHQueryError
-from posthog.models import PropertyDefinition, Team
+from posthog.models import Team
from posthog.models.event.sql import EVENTS_DATA_TABLE, EVENTS_PROPERTIES_JSON_TYPE, PERSON_PROPERTIES_JSON_TYPE
from posthog.models.group.util import create_group
from posthog.models.property.util import get_property_string_expr
@@ -69,6 +69,7 @@ from posthog.schema_enums import PropertyGroupsMode
from posthog.test.test_utils import create_group_type_mapping_without_created_at
from products.data_tools.backend.models.join import DataWarehouseJoin
+from products.event_definitions.backend.models import PropertyDefinition
from products.warehouse_sources.backend.facade.models import DataWarehouseCredential, DataWarehouseTable
diff --git a/posthog/hogql/transforms/test/test_property_types_dmat.py b/posthog/hogql/transforms/test/test_property_types_dmat.py
index 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_ast
from posthog.hogql.query import execute_hogql_query
from posthog.clickhouse.client import sync_execute
-from posthog.models import MaterializedColumnSlot, MaterializedColumnSlotState, PropertyDefinition
+from posthog.models import MaterializedColumnSlot, MaterializedColumnSlotState
from posthog.temporal.backfill_materialized_property.activities import _generate_property_extraction_sql
+from products.event_definitions.backend.models import PropertyDefinition
from products.event_definitions.backend.models.property_definition import PropertyType
diff --git a/posthog/hogql/transforms/test/test_range_rewrite_observability.py b/posthog/hogql/transforms/test/test_range_rewrite_observability.py
index 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 HogQLTypeObservability
from posthog.hogql.parser import parse_select
from posthog.hogql.printer import prepare_and_print_ast
-from posthog.models import PropertyDefinition
-
+from products.event_definitions.backend.models import PropertyDefinition
from products.event_definitions.backend.models.property_definition import PropertyType
from ee.clickhouse.materialized_columns.columns import materialize
diff --git a/posthog/hogql_queries/actor_strategies.py b/posthog/hogql_queries/actor_strategies.py
index 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_query
from posthog.hogql_queries.paginators import HogQLHasMorePaginator
from posthog.hogql_queries.utils.recordings_helper import RecordingsHelper
-from posthog.models import PropertyDefinition, Team
+from posthog.models import Team
from posthog.models.person.util import _batched_get_distinct_ids_for_persons, _batched_get_persons_by_uuids
from posthog.models.user import User
from posthog.personhog_client.caller_tag import personhog_caller_tag
from posthog.utils import is_anonymous_id
+from products.event_definitions.backend.models import PropertyDefinition
from products.event_definitions.backend.models.property_definition import effective_project_id_expr
logger = 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.py
index 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_settings
from posthog.schema import ActorsPropertyTaxonomyQuery, ActorsPropertyTaxonomyResponse
from posthog.hogql_queries.ai.actors_property_taxonomy_query_runner import ActorsPropertyTaxonomyQueryRunner
-from posthog.models import PropertyDefinition
from posthog.models.group.util import create_group
from posthog.test.test_utils import create_group_type_mapping_without_created_at
+from products.event_definitions.backend.models import PropertyDefinition
from products.event_definitions.backend.models.property_definition import PropertyType
diff --git a/posthog/hogql_queries/ai/test/test_event_taxonomy_query_runner.py b/posthog/hogql_queries/ai/test/test_event_taxonomy_query_runner.py
index 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 HogQLContext
from posthog.hogql.printer import prepare_and_print_ast
from posthog.hogql_queries.ai.event_taxonomy_query_runner import EventTaxonomyQueryRunner
-from posthog.models import PropertyDefinition
from products.actions.backend.facade.testing import create_action
+from products.event_definitions.backend.models import PropertyDefinition
from products.event_definitions.backend.models.property_definition import PropertyType
diff --git a/posthog/hogql_queries/ai/test/test_trace_query_runner.py b/posthog/hogql_queries/ai/test/test_trace_query_runner.py
index 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 SessionQueryRunner
from posthog.hogql_queries.ai.trace_query_runner import TraceQueryRunner
from posthog.hogql_queries.ai.traces_query_runner import TracesQueryRunner
from posthog.hogql_queries.ai.utils import HEAVY_PROPERTY_NAMES
-from posthog.models import PropertyDefinition, Team, User
+from posthog.models import Team, User
from posthog.models.ai_events.test_util import bulk_create_ai_events
from posthog.models.event.util import bulk_create_events
from products.access_control.backend.models.property_access_control import PropertyAccessControl
from products.access_control.backend.property_access_control import PropertyAccessLevel
+from products.event_definitions.backend.models import PropertyDefinition
from products.event_definitions.backend.models.property_definition import PropertyType
diff --git a/posthog/hogql_queries/ai/test/test_traces_query_runner.py b/posthog/hogql_queries/ai/test/test_traces_query_runner.py
index 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_team
from posthog.hogql.printer import prepare_and_print_ast
from 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 PropertyDefinition
from products.event_definitions.backend.models.property_definition import PropertyType
diff --git a/posthog/hogql_queries/events_query_runner.py b/posthog/hogql_queries/events_query_runner.py
index 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 InsightActorsQuery
from posthog.hogql_queries.paginators import HogQLHasMorePaginator
from posthog.hogql_queries.query_runner import AnalyticsQueryRunner, QueryRunner, get_query_runner
from posthog.hogql_queries.utils.person_display_name import person_display_name_property_exprs
-from posthog.models import Person, PropertyDefinition
+from posthog.models import Person
from posthog.models.element import chain_to_elements
from posthog.models.flag_evaluations.sql import FLAG_EVALUATIONS_RETENTION_DAYS, FLAG_EVALUATIONS_SOURCE_EVENT
from posthog.models.person.person import MAX_LIMIT_DISTINCT_IDS, get_distinct_ids_for_subquery
@@ -64,6 +64,7 @@ from posthog.utils import relative_date_parse
from products.actions.backend.facade.api import get_action
from products.actions.backend.facade.contracts import ActionNotFound, ActionStep
+from products.event_definitions.backend.models import PropertyDefinition
from products.feature_flags.backend.facade.enums import FlagEvaluationsMode
from products.feature_flags.backend.facade.flags import get_flag_evaluations_read_mode
diff --git a/posthog/hogql_queries/property_values_query_runner.py b/posthog/hogql_queries/property_values_query_runner.py
index 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 AnalyticsQueryRunner
from posthog.hogql_queries.utils.aggregated_property_values import get_event_property_values_from_aggregated_table
-from posthog.models import PropertyDefinition
from posthog.models.event.new_events_schema import use_new_events_schema
from posthog.utils import convert_property_value, flatten, get_instance_region, relative_date_parse
from products.access_control.backend.property_access_control import get_restricted_property_names
+from products.event_definitions.backend.models import PropertyDefinition
from 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.py
index 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 CompareOperationOp
from posthog.clickhouse.client import sync_execute
from posthog.date_util import start_of_day
from posthog.hogql_queries.events_query_runner import EventsQueryRunner
-from posthog.models import Element, Organization, OrganizationMembership, PropertyDefinition, Team
+from posthog.models import Element, Organization, OrganizationMembership, Team
from posthog.models.event.util import events_only_in_active_schema
from posthog.models.flag_evaluations.sql import FLAG_EVALUATIONS_RETENTION_DAYS
from posthog.models.group.util import create_group
@@ -53,6 +53,7 @@ from posthog.test.persons import create_group_type_mapping
from products.access_control.backend.models.property_access_control import PropertyAccessControl
from products.access_control.backend.property_access_control import PropertyAccessLevel
+from products.event_definitions.backend.models import PropertyDefinition
from products.feature_flags.backend.facade.enums import FlagEvaluationsMode
from 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 PropertyAccessControl
from products.access_control.backend.property_access_control import PropertyAccessLevel
+ from products.event_definitions.backend.models import PropertyDefinition
self._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 PropertyAccessControl
from products.access_control.backend.property_access_control import PropertyAccessLevel
+ from products.event_definitions.backend.models import PropertyDefinition
self._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 PropertyAccessControl
from products.access_control.backend.property_access_control import PropertyAccessLevel
+ from products.event_definitions.backend.models import PropertyDefinition
self._enable_property_access_control()
diff --git a/posthog/management/commands/setup_dev.py b/posthog/management/commands/setup_dev.py
index 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 BaseCommand
from django.db import transaction
from django.utils import timezone
-from posthog.models import EventProperty, PersonalAPIKey, Team, User
+from posthog.models import PersonalAPIKey, Team, User
from posthog.models.utils import hash_key_value
from products.cdp.backend.models.plugin import Plugin, PluginConfig, PluginSourceFile
from products.demo.backend.facade.api import ORGANIZATION_NAME, TEAM_NAME, create_demo_data
+from products.event_definitions.backend.models import EventProperty
from products.event_definitions.backend.models.event_definition import EventDefinition
from products.event_definitions.backend.models.property_definition import PropertyDefinition
diff --git a/posthog/models/__init__.py b/posthog/models/__init__.py
index 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.models
from .event_filter_config import EventFilterConfig, EventFilterPipelineOverride # noqa: F401
-from products.event_definitions.backend.models import EventDefinition
-from products.event_definitions.backend.models import EventProperty
from .file_system.file_system import FileSystem
from .file_system.file_system_home_folder import FileSystemHomeFolder
from .file_system.file_system_view_log import FileSystemViewLog
@@ -56,12 +54,10 @@ from .project_secret_api_key import ProjectSecretAPIKey, RevokedTeamSecretToken
from .product_intent import ProductIntent
from .project import Project
from .property import Property
-from products.event_definitions.backend.models import PropertyDefinition
from .proxy_record import ProxyRecord
from .quick_filter import QuickFilter
from .remote_config import RemoteConfig
from .resource_transfer.resource_transfer import ResourceTransfer
-from products.event_definitions.backend.models import EventSchema, SchemaPropertyGroup, SchemaPropertyGroupProperty
from .scim_provisioned_user import SCIMProvisionedUser
from .scim_request_log import SCIMRequestLog
from .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 compatibility
diff --git a/posthog/models/person/test/test_divergence.py b/posthog/models/person/test/test_divergence.py
index 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 AvailableFeature
from posthog.exceptions import ClickHouseQueryMemoryLimitExceeded, ClickHouseQueryTimeOut
from posthog.kafka_client.client import ClickhouseProducer, ProduceResult
from posthog.kafka_client.topics import KAFKA_PERSON
-from posthog.models import OrganizationMembership, PropertyDefinition, Team, User
+from posthog.models import OrganizationMembership, Team, User
from posthog.models.person import Person
from posthog.models.person.divergence.datatypes import (
DivergentPerson,
@@ -55,6 +55,7 @@ from posthog.test.persons import add_distinct_id, create_person
from products.access_control.backend.models.property_access_control import PropertyAccessControl
from products.access_control.backend.property_access_control import PropertyAccessLevel
+from products.event_definitions.backend.models import PropertyDefinition
PG_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.py
index 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.fixture
def 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 PropertyDefinition
from products.event_definitions.backend.models.property_definition import PropertyType
prop_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.py
index 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 ClickHouseUser
from posthog.clickhouse.query_tagging import Feature, Product, tag_queries
from posthog.constants import TREND_FILTER_TYPE_ACTIONS, TREND_FILTER_TYPE_DATA_WAREHOUSE, TREND_FILTER_TYPE_EVENTS
from posthog.dataclasses import frozen
-from posthog.models import EventProperty, Team
+from posthog.models import Team
from posthog.ph_client import feature_enabled_or_false, get_feature_flag_or_none
from posthog.session_recordings.queries.sub_queries.base_query import SessionRecordingsListingBaseQuery
from 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 AnyPropertyFilter
from 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.py
index 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_class
from posthog.clickhouse.client import sync_execute
from posthog.clickhouse.log_entries import TRUNCATE_LOG_ENTRIES_TABLE_SQL
-from posthog.models import Element, EventProperty
+from posthog.models import Element
from posthog.models.team import Team
from posthog.models.utils import uuid7
from 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_SES
from posthog.test.persons import create_person
from 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.py
index 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_execute
from posthog.constants import AvailableFeature
from posthog.exceptions import ClickHouseQueryMemoryLimitExceeded
from posthog.hogql_queries.paginators import HogQLCursorPaginator
-from posthog.models import EventProperty, User
+from posthog.models import User
from posthog.models.personal_api_key import PersonalAPIKey
from posthog.models.team.extensions import get_or_create_team_extension
from 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 UserAcces
from products.access_control.backend.models.access_control import AccessControl
from products.analytics_platform.backend.lazy_computation.lazy_computation_executor import LazyComputationResult
from products.cohorts.backend.models.cohort import Cohort
+from products.event_definitions.backend.models import EventProperty
from 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.py
index 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 PropertyDefinition
def 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.py
index 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_LIMIT
from posthog.event_usage import report_user_action
from posthog.filters import TermSearchFilterBackend, term_search_filter_sql
from posthog.helpers.impersonation import is_impersonated
-from posthog.models import EventProperty, PropertyDefinition, User
+from posthog.models import User
from posthog.models.activity_logging.activity_log import Detail, log_activity
from posthog.models.utils import UUIDT
from 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, PropertyDefinition
from products.event_definitions.backend.models.property_definition import effective_project_id_expr
tracer = trace.get_tracer(__name__)
diff --git a/posthog/taxonomy/test/test_definition_search.py b/posthog/taxonomy/test/test_definition_search.py
index 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 SimpleSpanProcessor
from opentelemetry.sdk.trace.export.in_memory_span_exporter import InMemorySpanExporter
from parameterized import parameterized
-from posthog.models import EventDefinition, PropertyDefinition
from posthog.taxonomy import definition_search
from 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.py
index 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, Field
from temporalio.common import RetryPolicy
from posthog.llm.gateway_client import GatewayNotConfiguredError, resolve_ai_gateway_config
-from posthog.models import PropertyDefinition
from posthog.models.team import Team
from posthog.sync import database_sync_to_async
from posthog.temporal.common.base import PostHogWorkflow
@@ -39,6 +38,7 @@ from posthog.temporal.common.base import PostHogWorkflow
from products.access_control.backend.models.access_control import AccessControl
from products.access_control.backend.models.property_access_control import PropertyAccessControl
from products.ai_observability.backend.models.evaluation_reports import EvaluationReportRun
+from products.event_definitions.backend.models import PropertyDefinition
from products.signals.backend.facade.llm import call_llm
from products.signals.backend.facade.taxonomy import SignalSourceProduct, SignalSourceType
diff --git a/posthog/temporal/ai_observability/eval_reports/test/test_activities.py b/posthog/temporal/ai_observability/eval_reports/test/test_activities.py
index 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_query
from posthog.hogql.visitor import TraversingVisitor
from posthog.exceptions import ClickHouseQueryTimeOut
-from posthog.models import PropertyDefinition, Team
+from posthog.models import Team
from 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, EvaluationReportRun
from products.ai_observability.backend.models.evaluations import Evaluation
+from products.event_definitions.backend.models import PropertyDefinition
def _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.py
index 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_asyncio
from asgiref.sync import sync_to_async
from posthog.llm.gateway_client import GatewayNotConfiguredError
-from posthog.models import Organization, PropertyDefinition, Team, User
+from posthog.models import Organization, Team, User
from 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 AccessControl
from products.access_control.backend.models.property_access_control import PropertyAccessControl
from products.access_control.backend.models.role import Role
+from products.event_definitions.backend.models import PropertyDefinition
from products.signals.backend.models import SignalSourceConfig
diff --git a/posthog/temporal/ai_observability/test_run_trace_evaluation.py b/posthog/temporal/ai_observability/test_run_trace_evaluation.py
index 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 CaptureInternalError
from posthog.constants import AvailableFeature
from posthog.hogql_queries.ai.session_query_runner import SessionQueryRunner
from posthog.hogql_queries.ai.trace_query_runner import TraceQueryRunner
-from posthog.models import Organization, PropertyDefinition, Team, User
+from posthog.models import Organization, Team, User
from posthog.models.ai_events.test_util import bulk_create_ai_events
from posthog.models.event.util import bulk_create_events
from posthog.temporal.ai_observability.judge_attachments import JudgeAttachments
@@ -36,6 +36,7 @@ from products.ai_observability.backend.models.evaluation_config import Evaluatio
from products.ai_observability.backend.models.evaluations import Evaluation
from products.ai_observability.backend.models.provider_keys import LLMProviderKey
from products.cdp.backend.validation import compile_hog
+from products.event_definitions.backend.models import PropertyDefinition
from .eval_reports.report_agent.tools import _execute_hogql, get_trace_detail
from .evaluation_hog import execute_hog_eval_bytecode
diff --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.py
index 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, patch
from parameterized import parameterized
from posthog.constants import AvailableFeature
-from posthog.models import PropertyDefinition
from posthog.models.ai_events.test_util import bulk_create_ai_events
from 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 FetchAn
from posthog.temporal.ai_observability.trace_summarization.queries import TraceSize
from products.access_control.backend.models.property_access_control import PropertyAccessControl
+from products.event_definitions.backend.models import PropertyDefinition
@asynccontextmanager
diff --git a/posthog/temporal/cleanup_property_definitions/activities.py b/posthog/temporal/cleanup_property_definitions/activities.py
index 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, QuerySet
from structlog.contextvars import bind_contextvars
from temporalio import activity
-from posthog.models import PropertyDefinition, Team
+from posthog.models import Team
from posthog.sync import database_sync_to_async
from 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_client
from 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 EventProperty
LOGGER = get_write_only_logger()
diff --git a/posthog/temporal/experiments/test_cache_warming.py b/posthog/temporal/experiments/test_cache_warming.py
index 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, Experiment
from posthog.constants import AvailableFeature
from posthog.hogql_queries.query_runner import ExecutionMode
-from posthog.models import PropertyDefinition
from posthog.models.organization import OrganizationMembership
from 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 PropertyAccessLevel
from products.access_control.backend.models.property_access_control import PropertyAccessControl
+from products.event_definitions.backend.models import PropertyDefinition
from products.experiments.backend.facade.timeseries import metric_calculation_keys
from products.experiments.backend.hogql_queries.experiment_query_runner import ExperimentQueryRunner
from products.experiments.backend.hogql_queries.test.experiment_query_runner.base import ExperimentQueryRunnerBaseTest
diff --git a/posthog/temporal/tests/backfill_materialized_property/test_batched_activities.py b/posthog/temporal/tests/backfill_materialized_property/test_batched_activities.py
index 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, patch
from django.conf import settings
-from posthog.models import MaterializedColumnSlot, MaterializedColumnSlotState, PropertyDefinition
+from posthog.models import MaterializedColumnSlot, MaterializedColumnSlotState
from 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 PropertyDefinition
from products.event_definitions.backend.models.property_definition import PropertyType
diff --git a/posthog/temporal/tests/cleanup_property_definitions/test_activities.py b/posthog/temporal/tests/cleanup_property_definitions/test_activities.py
index 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 pytest
from asgiref.sync import sync_to_async
from parameterized import parameterized_class
-from posthog.models import Project, PropertyDefinition, Team
+from posthog.models import Project, Team
from 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 PropertyDefinition
from products.event_definitions.backend.models.event_property import EventProperty
diff --git a/posthog/test/test_utils.py b/posthog/test/test_utils.py
index fd96f34a2a36..bb5f451d97e1 100644
--- a/posthog/test/test_utils.py
+++ b/posthog/test/test_utils.py
@@ -26,9 +26,11 @@ from rest_framework import serializers
from rest_framework.request import Request
from posthog.exceptions import RequestParsingError, UnspecifiedCompressionFallbackParsingError
-from posthog.models import EventDefinition, Organization, PropertyDefinition, Team, User
+from posthog.models import Organization, Team, User
from 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 GroupTypeMapping
diff --git a/posthog/utils.py b/posthog/utils.py
index 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 EventDefinition
cache_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 PropertyDefinition
from products.event_definitions.backend.models.property_definition import PERSON_EMAIL_PROPERTY_NAME
cache_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.py
index 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 RestrictedProperty
from posthog.constants import AvailableFeature
from posthog.dataclasses import frozen
-from posthog.models import Organization, OrganizationMembership, PropertyDefinition, Team
+from posthog.models import Organization, OrganizationMembership, Team
from posthog.models.activity_logging.activity_log import LogActivityEntry, bulk_log_activity
from posthog.models.activity_logging.model_activity import get_current_user, get_was_impersonated
from 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, APISco
from products.access_control.backend.activity_logging import get_access_control_log_entry
from 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_expr
from ..models.access_control import AccessControl
from ..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.py
index 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.py
index 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 Response
from rest_framework.viewsets import GenericViewSet
from posthog.api.documentation import OpenApiParameter, extend_schema
-from posthog.models import PropertyDefinition
from posthog.models.organization import OrganizationMembership
from posthog.models.team.team import Team
from 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:
continue
results.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.py
index 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 parameterized
from rest_framework import status
from posthog.constants import AvailableFeature
-from posthog.models import PropertyDefinition
from posthog.models.activity_logging.activity_log import ActivityLog
from posthog.models.organization import Organization, OrganizationMembership
from posthog.models.personal_api_key import PersonalAPIKey
@@ -37,6 +36,7 @@ from products.ai_observability.backend.models.evaluations import Evaluation
from products.cohorts.backend.models.cohort import Cohort
from products.conversations.backend.models import Ticket
from products.dashboards.backend.models.dashboard import Dashboard
+from products.event_definitions.backend.models import PropertyDefinition
from products.feature_flags.backend.models.feature_flag import FeatureFlag
from products.notebooks.backend.models import Notebook
from products.product_analytics.backend.facade.models import Insight
diff --git a/products/access_control/backend/tests/test_property_access_control.py b/products/access_control/backend/tests/test_property_access_control.py
index 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 SimpleTestCase
from parameterized import parameterized
from posthog.constants import AvailableFeature
-from posthog.models import Organization, OrganizationMembership, PropertyDefinition
+from posthog.models import Organization, OrganizationMembership
from products.access_control.backend.models.property_access_control import PropertyAccessControl
from 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 PropertyDefinition
def _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.py
index 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 BaseTest
from parameterized import parameterized
from posthog.constants import AvailableFeature
-from posthog.models import Organization, PropertyDefinition
+from posthog.models import Organization
from posthog.models.event.util import ClickhouseEventSerializer
from 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 PropertyAccessControl
from products.access_control.backend.models.role import Role, RoleMembership
from products.access_control.backend.property_access_control import PropertyAccessLevel
+from products.event_definitions.backend.models import PropertyDefinition
def _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.py
index 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 parameterized
from rest_framework import status
from posthog.constants import AvailableFeature
-from posthog.models import OrganizationMembership, PropertyDefinition, Team, User
+from posthog.models import OrganizationMembership, Team, User
from products.access_control.backend.models.property_access_control import PropertyAccessControl
from products.access_control.backend.models.role import Role
from products.access_control.backend.presentation.serializers import PropertyAccessControlUpdateSerializer
from products.access_control.backend.property_access_control import PropertyAccessLevel, get_restricted_property_names
+from products.event_definitions.backend.models import PropertyDefinition
class TestPropertyAccessControlViewSet(APIBaseTest):
diff --git a/products/ai_observability/backend/api/test/test_summarization.py b/products/ai_observability/backend/api/test/test_summarization.py
index 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 parameterized
from rest_framework import status
from posthog.constants import AvailableFeature
-from posthog.models import PropertyDefinition
from posthog.models.ai_events.test_util import bulk_create_ai_events
from 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 PropertyDefinition
TEST_TEXT_REPR_BUDGET = 4000
diff --git a/products/ai_observability/backend/api/test/test_taggers.py b/products/ai_observability/backend/api/test/test_taggers.py
index 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 parameterized
from rest_framework import status
from posthog.constants import AvailableFeature
-from posthog.models import Organization, OrganizationMembership, Project, PropertyDefinition, Team, User
+from posthog.models import Organization, OrganizationMembership, Project, Team, User
from posthog.models.event.util import bulk_create_events
from products.access_control.backend.facade.contracts import PropertyAccessLevel
@@ -16,6 +16,7 @@ from products.access_control.backend.models.access_control import AccessControl
from products.access_control.backend.models.property_access_control import PropertyAccessControl
from products.ai_observability.backend.models.provider_keys import LLMProvider
from products.ai_observability.backend.models.taggers import Tagger, TaggerType
+from products.event_definitions.backend.models import PropertyDefinition
def _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.py
index 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, Worker
from posthog.constants import AvailableFeature
from posthog.exceptions import ClickHouseQueryTimeOut
-from posthog.models import Organization, OrganizationMembership, PropertyDefinition
+from posthog.models import Organization, OrganizationMembership
from posthog.models.event.util import bulk_create_events
from posthog.models.scoping import team_scope
from 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, WORKFLOWS
from products.batch_exports.backend.tests.temporal.destinations.s3.utils import has_valid_credentials
+from products.event_definitions.backend.models import PropertyDefinition
pytestmark = [
pytest.mark.asyncio,
diff --git a/products/batch_exports/backend/tests/temporal/test_filters.py b/products/batch_exports/backend/tests/temporal/test_filters.py
index 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 pytest
from django.test import override_settings
from posthog.clickhouse.client import sync_execute
-from posthog.models import PropertyDefinition
from posthog.sync import database_sync_to_async
from products.batch_exports.backend.temporal.filters import InvalidFilterError, compose_filters_clause
+from products.event_definitions.backend.models import PropertyDefinition
pytestmark = [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.py
index 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_ast
from posthog.constants import AvailableFeature
from posthog.credentials import AWSKeyPair
-from posthog.models import OrganizationMembership, PropertyDefinition, User
+from posthog.models import OrganizationMembership, User
from posthog.models.event.sql import EVENTS_PROPERTIES_JSON_TYPE, PERSON_PROPERTIES_JSON_TYPE
from posthog.models.utils import uuid7
from 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_DAYS
from products.batch_exports.backend.tests.temporal.utils.clickhouse import truncate_events, truncate_sessions
from products.data_modeling.backend.facade.models import DataWarehouseSavedQuery
+from products.event_definitions.backend.models import PropertyDefinition
if TYPE_CHECKING:
from posthog.models import Organization, Team
diff --git a/products/batch_exports/backend/tests/test_custom_events_schema.py b/products/batch_exports/backend/tests/test_custom_events_schema.py
index 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 parameterized
from posthog.hogql import ast
from 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_schema
from products.batch_exports.backend.facade.contracts import UnsupportedHogQLQueryError
+from products.event_definitions.backend.models import PropertyDefinition
def 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.py
index 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 timezone
from parameterized import parameterized
-from posthog.models import PropertyDefinition
from posthog.paging import PageRequest
from products.customer_analytics.backend.facade import api
from products.customer_analytics.backend.models import CustomPropertySource, CustomPropertySyncRun, TargetType
from products.customer_analytics.backend.models.team_scoped_test_base import TeamScopedTestMixin
from products.customer_analytics.backend.test.factories import create_custom_property_definition, create_saved_query
+from products.event_definitions.backend.models import PropertyDefinition
from products.warehouse_sources.backend.models.credential import DataWarehouseCredential
from products.warehouse_sources.backend.models.external_data_schema import ExternalDataSchema
from products.warehouse_sources.backend.models.external_data_source import ExternalDataSource
diff --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.py
index 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 AvailableFeature
from posthog.hogql_queries.actors_query_runner import ActorsQueryRunner
from posthog.hogql_queries.paginators import HogQLHasMorePaginator
from 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, User
from posthog.models.personal_api_key import PersonalAPIKey
from posthog.models.utils import generate_random_token_personal, hash_key_value
from posthog.test.persons import create_person, update_person
@@ -36,6 +36,7 @@ from products.customer_analytics.backend.logic.account_persons import AccountPer
from products.customer_analytics.backend.models import TeamCustomerAnalyticsConfig
from products.customer_analytics.backend.presentation.views.account_persons import AccountPersonsQuerySerializer
from products.customer_analytics.backend.test.factories import create_account
+from products.event_definitions.backend.models import PropertyDefinition
FLAG_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.py
index 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 parameterized
from posthog.constants import AvailableFeature
from posthog.hogql_queries.query_runner import ExecutionMode
-from posthog.models import PropertyDefinition
from posthog.test.persons import create_person
from products.access_control.backend.facade.api import upsert_property_access_control
from products.access_control.backend.facade.contracts import PropertyAccessLevel, UpsertPropertyAccessControlInput
from products.customer_analytics.backend.facade.api import get_key_metrics
from products.customer_analytics.backend.logic import key_metrics as key_metrics_logic
+from products.event_definitions.backend.models import PropertyDefinition
class TestKeyMetrics(ClickhouseTestMixin, BaseTest):
diff --git a/products/customer_analytics/backend/test/test_views.py b/products/customer_analytics/backend/test/test_views.py
index 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 status
from posthog.auth import MCP_USER_AGENT_MARKER
from posthog.constants import AvailableFeature
-from posthog.models import PropertyDefinition, Tag, TaggedItem
+from posthog.models import Tag, TaggedItem
from posthog.models.activity_logging.activity_log import ActivityLog
from posthog.models.comment import Comment
from 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 PropertyDefinition
from products.notebooks.backend.facade.content import build_markdown_notebook_content
from products.notebooks.backend.models import Notebook, ResourceNotebook
from products.product_analytics.backend.facade.models import Insight
diff --git a/products/dashboards/backend/widgets/activity_events_list.py b/products/dashboards/backend/widgets/activity_events_list.py
index 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 EventsQuery
from posthog.clickhouse.query_tagging import Feature, Product, tags_context
from posthog.hogql_queries.events_query_runner import EventsQueryRunner
-from posthog.models import PropertyDefinition
from posthog.models.team import Team
from posthog.models.user import User
from posthog.taxonomy.property_access import restricted_property_names
@@ -19,6 +18,7 @@ from products.dashboards.backend.widget_specs.registry import validate_widget_co
from products.dashboards.backend.widgets.config import resolve_filter_test_accounts
from products.dashboards.backend.widgets.list_widget import ListWidgetPage, run_list_widget
from products.dashboards.backend.widgets.widget_filters import build_event_property_filters_from_widget_filters
+from products.event_definitions.backend.models import PropertyDefinition
ValidatedActivityEventsListWidgetConfig = 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.py
index 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 QueryError
from posthog.hogql.property_access_types import RestrictedProperty
from posthog.hogql.query import execute_hogql_query
-from posthog.models import PropertyDefinition
-
from products.data_modeling.backend.logic import view_column_refresh
from products.data_modeling.backend.logic.saved_query_dag_sync import sync_saved_query_to_dag
from products.data_modeling.backend.logic.view_column_refresh import refresh_view_columns
from products.data_modeling.backend.models.datawarehouse_saved_query import DataWarehouseSavedQuery
+from products.event_definitions.backend.models import PropertyDefinition
class TestViewColumnRefresh(ClickhouseTestMixin, BaseTest):
diff --git a/products/demo/backend/logic/legacy/app_data_generator.py b/products/demo/backend/logic/legacy/app_data_generator.py
index 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 relativedelta
from posthog.schema import ActionsNode, DateRange, EventPropertyFilter, FunnelsQuery, InsightVizNode, PropertyOperator
-from posthog.models import EventDefinition, Person, PropertyDefinition
+from posthog.models import Person
from products.actions.backend.facade.api import create_action
from products.dashboards.backend.models.dashboard import Dashboard
from products.dashboards.backend.models.dashboard_tile import DashboardTile
+from products.event_definitions.backend.models import EventDefinition, PropertyDefinition
from products.product_analytics.backend.facade.models import Insight
from .data_generator import DataGenerator
diff --git a/products/demo/backend/logic/legacy/revenue_data_generator.py b/products/demo/backend/logic/legacy/revenue_data_generator.py
index 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 Person
from products.actions.backend.facade.api import create_action
from products.dashboards.backend.models.dashboard import Dashboard
from products.dashboards.backend.models.dashboard_tile import DashboardTile
+from products.event_definitions.backend.models import EventDefinition, PropertyDefinition
from products.product_analytics.backend.facade.models import Insight
from .data_generator import DataGenerator
diff --git a/products/demo/backend/logic/legacy/web_data_generator.py b/products/demo/backend/logic/legacy/web_data_generator.py
index 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 relativedelta
from posthog.schema import ActionsNode, FunnelsQuery, InsightVizNode
-from posthog.models import Person, PropertyDefinition
+from posthog.models import Person
from posthog.models.utils import UUIDT
from products.actions.backend.facade.api import create_action
from products.dashboards.backend.models.dashboard import Dashboard
from products.dashboards.backend.models.dashboard_tile import DashboardTile
+from products.event_definitions.backend.models import PropertyDefinition
from products.product_analytics.backend.facade.models import Insight
from .data_generator import DataGenerator
diff --git a/products/demo/backend/logic/matrix/taxonomy_inference.py b/products/demo/backend/logic/matrix/taxonomy_inference.py
index 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 json
import datetime
from typing import Optional
-from posthog.models import EventDefinition, EventProperty, PropertyDefinition
from posthog.models.group.sql import GROUPS_TABLE
from posthog.models.person.sql import PERSONS_TABLE
+from products.event_definitions.backend.models import EventDefinition, EventProperty, PropertyDefinition
from products.event_definitions.backend.models.property_definition import PropertyType
COMMON_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.py
index 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_query
from posthog.clickhouse.client import sync_execute
from posthog.constants import AvailableFeature
-from posthog.models import PropertyDefinition, Team
+from posthog.models import Team
from posthog.models.utils import uuid7
from 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 PropertyDefinition
from products.event_definitions.backend.property_type import PropertyType
diff --git a/products/error_tracking/backend/tests/api/test_query_api.py b/products/error_tracking/backend/tests/api/test_query_api.py
index 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 parameterized
from posthog.clickhouse.query_tagging import Feature, Product, get_query_tags
from posthog.constants import AvailableFeature
-from posthog.models import PropertyDefinition
from posthog.models.personal_api_key import PersonalAPIKey
from 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 PropertyDefinition
class FakeQueryResponse:
diff --git a/products/error_tracking/backend/tests/api/test_recommendations.py b/products/error_tracking/backend/tests/api/test_recommendations.py
index 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 parameterized
from rest_framework import status
from posthog.constants import AvailableFeature
-from posthog.models import PropertyDefinition, Team
+from posthog.models import Team
from products.access_control.backend.facade.api import upsert_property_access_control
from 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 PropertyDefinition
MOCK_ALERTS_META = {
"alerts": [
diff --git a/products/error_tracking/backend/tests/test_issue_summaries.py b/products/error_tracking/backend/tests/test_issue_summaries.py
index 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 REGISTRY
from redis.exceptions import RedisError
from posthog.constants import AvailableFeature
-from posthog.models import PropertyDefinition, User
+from posthog.models import User
from posthog.redis import TEST_clear_clients
from posthog.temporal.common.errors import NonReportableApplicationError
from posthog.token_bucket import BucketUnavailable, Budget, TEST_reset_scripts, consume
@@ -57,6 +57,7 @@ from products.error_tracking.backend.temporal.lifecycle.issue_created.types impo
IssueCreatedSnapshot,
IssueCreatedWorkflowInputs,
)
+from products.event_definitions.backend.models import PropertyDefinition
SUMMARY_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.py
index 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_context
from posthog.constants import AvailableFeature
from posthog.exceptions import ClickHouseQueryTimeOut
from posthog.hogql_queries.utils.breakdowns import BREAKDOWN_OTHER_STRING_LABEL
-from posthog.models import PropertyDefinition
from posthog.models.activity_logging.activity_log import ActivityLog
from posthog.models.user import User
from posthog.test.persons import create_group_type_mapping
@@ -43,6 +42,7 @@ from products.access_control.backend.facade.api import upsert_property_access_co
from products.access_control.backend.facade.contracts import PropertyAccessLevel, UpsertPropertyAccessControlInput
from products.access_control.backend.models.access_control import AccessControl
from products.actions.backend.facade.testing import create_action
+from products.event_definitions.backend.models import PropertyDefinition
from products.experiments.backend.hogql_queries import MULTIPLE_VARIANT_KEY
from products.experiments.backend.hogql_queries.experiment_exposures_query_runner import ExperimentExposuresQueryRunner
from products.experiments.backend.hogql_queries.exposure_query_logic import (
diff --git a/products/experiments/backend/session_exposure.py b/products/experiments/backend/session_exposure.py
index 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 Coalesce
from posthog.hogql import ast
-from posthog.models import EventProperty
from posthog.models.team.team import Team
+from products.event_definitions.backend.models import EventProperty
from 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.py
index 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, PersonalAPIKeyAuthentication
from posthog.constants import AvailableFeature
-from posthog.models import Organization, OrganizationMembership, PropertyDefinition, Team
+from posthog.models import Organization, OrganizationMembership, Team
from posthog.models.activity_logging.activity_log import ActivityLog
from posthog.models.oauth import OAuthAccessToken, OAuthApplication
from posthog.models.personal_api_key import PersonalAPIKey
@@ -45,6 +45,7 @@ from products.access_control.backend.models.access_control import AccessControl
from products.actions.backend.facade.contracts import Action
from products.actions.backend.facade.testing import create_action, update_action
from products.cohorts.backend.models.cohort import Cohort
+from products.event_definitions.backend.models import PropertyDefinition
from products.event_definitions.backend.models.event_definition import EventDefinition
from products.experiments.backend.experiment_service import ExperimentService
from products.experiments.backend.health.context import ConditionSetTraffic
diff --git a/products/experiments/backend/test/test_session_buckets_api.py b/products/experiments/backend/test/test_session_buckets_api.py
index 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_module
from posthog.clickhouse.query_tagging import Product, get_query_tags
from posthog.constants import AvailableFeature
-from posthog.models import EventProperty, Team, User
+from posthog.models import Team, User
from posthog.models.team.extensions import get_or_create_team_extension
from posthog.models.utils import uuid7
from posthog.session_recordings.models.session_recording import SessionRecording
@@ -22,6 +22,7 @@ from posthog.session_recordings.queries.test.session_replay_sql import produce_r
from products.access_control.backend.models.access_control import AccessControl
from products.actions.backend.facade.testing import create_action
+from products.event_definitions.backend.models import EventProperty
from products.experiments.backend import session_buckets
from 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.py
index 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, TableNode
from posthog.clickhouse.query_tagging import Product, get_query_tags
from posthog.constants import AvailableFeature
-from posthog.models import PropertyDefinition, Team, User
+from posthog.models import Team, User
from posthog.models.personal_api_key import PersonalAPIKey
from posthog.models.utils import generate_random_token_personal, hash_key_value, uuid7
from posthog.rate_limit import SessionContextsBurstRateThrottle
@@ -30,6 +30,7 @@ from products.access_control.backend.facade.contracts import PropertyAccessLevel
from products.access_control.backend.models.access_control import AccessControl
from products.actions.backend.facade.testing import create_action
from products.cohorts.backend.models.cohort import Cohort
+from products.event_definitions.backend.models import PropertyDefinition
from products.experiments.backend.models.experiment import Experiment, ExperimentSavedMetric, ExperimentToSavedMetric
from 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.py
index 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 SimpleTestCase
from parameterized import parameterized
from rest_framework import status
-from posthog.models import EventProperty, Team, User
+from posthog.models import Team, User
from posthog.models.team.extensions import get_or_create_team_extension
from posthog.models.utils import uuid7
from posthog.session_recordings.models.session_recording import SessionRecording
from posthog.session_recordings.queries.test.session_replay_sql import produce_replay_summary
from products.actions.backend.facade.testing import create_action
+from products.event_definitions.backend.models import EventProperty
from products.experiments.backend import session_event_deltas
from products.experiments.backend.hogql_queries.experiment_exposure_query_builder import ExposureQueryBuilder
from products.experiments.backend.models.experiment import Experiment
diff --git a/products/experiments/backend/test/test_session_exposure.py b/products/experiments/backend/test/test_session_exposure.py
index 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 ValidationError
from posthog.hogql import ast
-from posthog.models import EventProperty
from posthog.models.team import Team
+from products.event_definitions.backend.models import EventProperty
from products.experiments.backend.facade import replay as facade_replay
from products.experiments.backend.facade.contracts import InSessionExposureSemantics
from products.experiments.backend.hogql_queries import MULTIPLE_VARIANT_KEY
diff --git a/products/feature_flags/backend/api/test/test_feature_flag.py b/products/feature_flags/backend/api/test/test_feature_flag.py
index 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, PropertyMatchingVersionConflictError
from posthog.api.utils import ServiceRequest
from posthog.constants import AvailableFeature
-from posthog.models import PropertyDefinition, TaggedItem, User
+from posthog.models import TaggedItem, User
from posthog.models.group.util import create_group, raw_create_group_ch
from posthog.models.organization import Organization, OrganizationMembership
from posthog.models.personal_api_key import PersonalAPIKey
@@ -64,6 +64,7 @@ from products.cohorts.backend.models.cohort import Cohort, CohortType
from products.cohorts.backend.models.util import CohortErrorCode, get_friendly_error_message
from products.dashboards.backend.models.dashboard import Dashboard
from products.early_access_features.backend.models import EarlyAccessFeature
+from products.event_definitions.backend.models import PropertyDefinition
from products.experiments.backend.facade.api import experiment_flag_ids
from products.experiments.backend.facade.testing import create_experiment, update_experiment
from 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.py
index 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.py
index 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_query
from posthog.constants import AvailableFeature, GroupTypeIndex
from posthog.helpers.dashboard_templates import create_group_type_mapping_detail_dashboard
-from posthog.models import PropertyDefinition
from posthog.models.group.group import Group
from posthog.models.group.util import ListGroupsResult, create_group, list_groups, raw_create_group_ch
from posthog.models.group_type_mapping import (
@@ -48,6 +47,7 @@ from posthog.test.persons import create_group_type_mapping, create_person
from posthog.test.test_utils import create_group_type_mapping_without_created_at
from products.access_control.backend.models.access_control import AccessControl
+from products.event_definitions.backend.models import PropertyDefinition
from products.groups.backend.presentation.views import _decode_groups_cursor, _encode_groups_cursor
from products.notebooks.backend.facade.content import convert_notebook_content_to_markdown, is_markdown_notebook_content
from products.notebooks.backend.models import Notebook, ResourceNotebook
diff --git a/products/managed_warehouse/backend/tests/test_member_teams.py b/products/managed_warehouse/backend/tests/test_member_teams.py
index 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_settings
import requests
from posthog.constants import AvailableFeature
-from posthog.models import Organization, OrganizationMembership, PropertyDefinition, Team, User
+from posthog.models import Organization, OrganizationMembership, Team, User
from products.access_control.backend.facade import testing as access_testing
+from products.event_definitions.backend.models import PropertyDefinition
from products.managed_warehouse.backend import member_teams, signals
from products.managed_warehouse.backend.models import DuckgresServer
diff --git a/products/marketing_analytics/backend/hogql_queries/conversion_goal_processor.py b/products/marketing_analytics/backend/hogql_queries/conversion_goal_processor.py
index 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_expr
from posthog.hogql.timings import HogQLTimings
from posthog.dataclasses import frozen
-from posthog.models import PropertyDefinition, Team, User
+from posthog.models import Team, User
from 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_execu
LazyComputationResult,
LazyComputationTable,
)
+from products.event_definitions.backend.models import PropertyDefinition
from .adapters.factory import MarketingSourceFactory
from .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.py
index 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 RestrictedProperty
from posthog.hogql.test.utils import pretty_print_in_tests
from posthog.hogql.visitor import TraversingVisitor
-from posthog.models import PropertyDefinition
from posthog.models.team.team_marketing_analytics_config import MAX_ATTRIBUTION_WINDOW_DAYS
from posthog.models.utils import uuid7
from posthog.test.persons import create_person
from products.actions.backend.facade.testing import create_action
from products.cohorts.backend.models.cohort import Cohort
+from products.event_definitions.backend.models import PropertyDefinition
from 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.py
index 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 HogQLContext
from posthog.hogql.printer import prepare_and_print_ast
from 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 PropertyDefinition
from products.marketing_analytics.backend.hogql_queries.conversion_goal_processor import ConversionGoalProcessor
from products.marketing_analytics.backend.hogql_queries.marketing_analytics_config import MarketingAnalyticsConfig
diff --git a/products/mcp_analytics/backend/tests/test_api.py b/products/mcp_analytics/backend/tests/test_api.py
index 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 Database
from posthog.constants import AvailableFeature
-from posthog.models import PropertyDefinition
from posthog.models.utils import uuid7
from posthog.test.persons import create_person
from posthog.utils import generate_cache_key
from products.access_control.backend.models.property_access_control import PropertyAccessControl
from products.access_control.backend.property_access_control import PropertyAccessLevel
+from products.event_definitions.backend.models import PropertyDefinition
from products.mcp_analytics.backend import intent_generation, logic, mcp_harness
from products.mcp_analytics.backend.facade import api, contracts, enums
from products.mcp_analytics.backend.models import MCPAnalyticsSubmission, MCPCustomHarness, MCPSession
diff --git a/products/mcp_analytics/backend/tests/test_protocol_version_breakdown.py b/products/mcp_analytics/backend/tests/test_protocol_version_breakdown.py
index 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 parameterized
from posthog.schema import DateRange, MCPProtocolVersionBreakdownQuery
-from posthog.models import PropertyDefinition
-
+from products.event_definitions.backend.models import PropertyDefinition
from 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.py
index 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_value
from posthog.constants import AvailableFeature
from posthog.errors import CHQueryErrorQueryWasCancelled, ExposedCHQueryError
from posthog.exceptions import APIQueriesBudgetExceeded
-from posthog.models import PersonalAPIKey, PropertyDefinition
+from posthog.models import PersonalAPIKey
from posthog.models.organization import OrganizationMembership
from posthog.models.organization_domain import OrganizationDomain
from posthog.models.team import Team
@@ -37,6 +37,7 @@ from products.access_control.backend.facade.api import upsert_property_access_co
from products.access_control.backend.facade.contracts import PropertyAccessLevel, UpsertPropertyAccessControlInput
from products.access_control.backend.models.access_control import AccessControl
from products.cohorts.backend.models.cohort import Cohort
+from products.event_definitions.backend.models import PropertyDefinition
from 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.py
index 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_tags
from posthog.hogql_queries.utils.parallel import run_in_parallel_threads
from posthog.llm.semantic_enrichment import get_team_business_context
-from posthog.models import EventDefinition
from posthog.models.team import Team
from posthog.models.user import User
from posthog.scopes import APIScopeObject
from products.access_control.backend.facade.user_access_control import UserAccessControl
+from products.event_definitions.backend.models import EventDefinition
from products.experiments.backend.facade.replay import targetable_experiments
from products.replay_vision.backend.billing import observation_credits_for_model
from products.replay_vision.backend.gemini_client import gemini_text_models
diff --git a/products/replay_vision/backend/tests/test_scanner_draft.py b/products/replay_vision/backend/tests/test_scanner_draft.py
index 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 status
from posthog.schema import RecordingsQuery
-from posthog.models import EventDefinition, PersonalAPIKey
+from posthog.models import PersonalAPIKey
from posthog.models.utils import generate_random_token_personal, hash_key_value
from posthog.rate_limit import AIBurstRateThrottle
from products.actions.backend.facade.testing import create_action
from products.cohorts.backend.models.cohort import Cohort
+from products.event_definitions.backend.models import EventDefinition
from products.experiments.backend.models.experiment import Experiment
from products.feature_flags.backend.models.feature_flag import FeatureFlag
from products.posthog_ai.backend.models.assistant import CoreMemory
diff --git a/products/signals/backend/test/test_report_checks.py b/products/signals/backend/test/test_report_checks.py
index 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_authenticate
from posthog.clickhouse.client.connection import ClickHouseUser
from posthog.clickhouse.workload import Workload
from posthog.constants import AvailableFeature
-from posthog.models import Organization, PropertyDefinition, Team
+from posthog.models import Organization, Team
from posthog.models.personal_api_key import PersonalAPIKey
from posthog.models.utils import generate_random_token_personal, hash_key_value
from products.access_control.backend.facade.contracts import PropertyAccessLevel
from products.access_control.backend.models.property_access_control import PropertyAccessControl
+from products.event_definitions.backend.models import PropertyDefinition
from products.product_analytics.backend.facade.contracts import TrendsQueryRunResult
from products.signals.backend.artefact_attribution import ArtefactAttribution
from products.signals.backend.artefact_schemas import CheckResult, Dismissal, NoteArtefact
diff --git a/products/signals/backend/test/test_signal_report_api.py b/products/signals/backend/test/test_signal_report_api.py
index 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 UserSocialAuth
from posthog.constants import AvailableFeature
from posthog.egress.github.transport import GitHubEgressBudgetExhausted, GitHubRateLimitError
from posthog.egress.limiter.policies import Priority
-from posthog.models import EventDefinition, OAuthApplication, Organization, User
+from posthog.models import OAuthApplication, Organization, User
from posthog.models.integration import GitHubIntegration
from posthog.models.team.team import Team
from posthog.models.user_integration import UserIntegration
@@ -41,6 +41,7 @@ from products.access_control.backend.facade.contracts import PropertyAccessLevel
from products.access_control.backend.models.access_control import AccessControl
from products.access_control.backend.models.property_access_control import PropertyAccessControl
from products.actions.backend.facade.testing import create_action
+from products.event_definitions.backend.models import EventDefinition
from products.event_definitions.backend.models.property_definition import PropertyDefinition
from 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.py
index 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 TraversingVisitor
from posthog.hogql_queries.ai.team_taxonomy_query_runner import TeamTaxonomyQueryRunner
from posthog.hogql_queries.query_runner import ExecutionMode
-from posthog.models import EventDefinition, EventProperty, PropertyDefinition, Team, User
+from posthog.models import Team, User
from posthog.models.group_type_mapping import get_group_types_for_project
from posthog.security.llm_prompt_sanitization import sanitize_core_memory_text, sanitize_user_text
+from products.event_definitions.backend.models import EventDefinition, EventProperty, PropertyDefinition
from products.posthog_ai.backend.models.assistant import CoreMemory
from products.subscriptions.backend.facade.contracts import PromptRejectedError
from products.subscriptions.backend.models.subscription import AIQueryPlanStatus, Subscription
diff --git a/products/subscriptions/backend/temporal/ai_subscription/test/test_spec_generator.py b/products/subscriptions/backend/temporal/ai_subscription/test/test_spec_generator.py
index 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, Te
from posthog.hogql.functions.mapping import HOGQL_CLICKHOUSE_FUNCTIONS
from 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, PropertyDefinition
from products.subscriptions.backend.facade.contracts import PromptRejectedError
from products.subscriptions.backend.models.subscription import AIQueryPlanStatus, Subscription
from products.subscriptions.backend.temporal.ai_subscription.schemas import QueryPlan, QueryPlanStep, RelevantEvents
diff --git a/products/tasks/backend/tests/test_max_tools.py b/products/tasks/backend/tests/test_max_tools.py
index 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 RunnableConfig
from parameterized import parameterized_class
from posthog.constants import AvailableFeature
-from posthog.models import PropertyDefinition
from products.access_control.backend.models.property_access_control import PropertyAccessControl
from products.access_control.backend.property_access_control import PropertyAccessLevel
+from products.event_definitions.backend.models import PropertyDefinition
from 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.py
index 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 Iterable
from django.db.models import BigIntegerField
from django.db.models.functions import Coalesce
-from posthog.models import PropertyDefinition
-
+from products.event_definitions.backend.models import PropertyDefinition
from 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.py
index 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 KafkaError
from parameterized import parameterized
from 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 PropertyDefinition
from 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.py
index 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_execute
from posthog.hogql_queries.query_runner import get_query_runner
-from posthog.models import EventDefinition
from posthog.models.utils import uuid7
from products.analytics_platform.backend.models.preaggregation_job import PreaggregationJob
+from products.event_definitions.backend.models import EventDefinition
from products.product_analytics.backend.facade.queries import CalendarHeatmapTrendsQueryRunner
from products.web_analytics.backend.hogql_queries.web_calendar_heatmap import WebCalendarHeatmapTrendsQueryRunner
diff --git a/products/web_analytics/backend/hogql_queries/web_calendar_heatmap.py b/products/web_analytics/backend/hogql_queries/web_calendar_heatmap.py
index 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 EventDefinition
from products.product_analytics.backend.facade.queries import CalendarHeatmapTrendsQueryRunner
from 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.py
index 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, IntegerField
from django.db.models.functions import Coalesce
from posthog.integrations import IntegrationManager
-from posthog.models import EventProperty, PropertyDefinition, Team
+from posthog.models import Team
from products.access_control.backend.facade.api import person_property_names_with_access_rules
+from products.event_definitions.backend.models import EventProperty, PropertyDefinition
from products.messaging.backend.facade.api import EmailTemplateSummary, list_email_templates
from products.workflows.backend.models.hog_flow.hog_flow import HogFlow
from products.workflows.backend.models.team_workflows_config import TeamWorkflowsConfig
diff --git a/products/workflows/backend/services/people_import.py b/products/workflows/backend/services/people_import.py
index 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_query
from posthog.clickhouse.client.connection import Workload
from posthog.clickhouse.query_tagging import Feature, Product, tag_queries
from posthog.dataclasses import frozen
-from posthog.models import PropertyDefinition
from 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_storage
from products.access_control.backend.property_access_control import get_non_writable_property_names
from products.cohorts.backend.models.cohort import Cohort
+from products.event_definitions.backend.models import PropertyDefinition
from products.workflows.backend.facade.contracts import PeopleImportInvalid, PeopleImportSummary
logger = get_logger(__name__)
diff --git a/products/workflows/backend/test/test_people_import.py b/products/workflows/backend/test/test_people_import.py
index 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 status
from posthog.api.capture import CaptureInternalResult
from posthog.constants import AvailableFeature
-from posthog.models import PersonalAPIKey, PropertyDefinition
+from posthog.models import PersonalAPIKey
from posthog.models.utils import generate_random_token_personal, hash_key_value
from products.access_control.backend.facade.contracts import PropertyAccessLevel
from products.access_control.backend.models.access_control import AccessControl
from products.access_control.backend.models.property_access_control import PropertyAccessControl
from products.cohorts.backend.models.cohort import Cohort
+from products.event_definitions.backend.models import PropertyDefinition
from products.workflows.backend.facade.contracts import PeopleImportInvalid
from products.workflows.backend.services import people_import
from products.workflows.backend.services.people_import import start_people_import
diff --git a/products/workflows/backend/tests/api/test_broadcast_audience_suggestions.py b/products/workflows/backend/tests/api/test_broadcast_audience_suggestions.py
index 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 parameterized
from posthog.constants import AvailableFeature
from posthog.exceptions import ClickHouseQueryTimeOut
-from posthog.models import PropertyDefinition
from posthog.test.persons import create_person
from products.access_control.backend.models.property_access_control import PropertyAccessControl
from products.access_control.backend.property_access_control import PropertyAccessLevel
from products.cohorts.backend.models.cohort import Cohort
+from products.event_definitions.backend.models import PropertyDefinition
from products.workflows.backend.facade.contracts import AudienceKind, AudienceSuggestion
from products.workflows.backend.services.audience_suggestions.audience import cohort_filters, reachable_counts
from products.workflows.backend.services.audience_suggestions.planner import AudienceIdea
diff --git a/products/workflows/backend/tests/api/test_message_assets.py b/products/workflows/backend/tests/api/test_message_assets.py
index 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 status
from posthog.clickhouse.client.execute import sync_execute
from posthog.constants import AvailableFeature
-from posthog.models import OrganizationMembership, PropertyDefinition
+from posthog.models import OrganizationMembership
from posthog.models.personal_api_key import PersonalAPIKey
from posthog.models.utils import generate_random_token_personal, hash_key_value
from posthog.test.persons import create_person
from products.access_control.backend.models.property_access_control import PropertyAccessControl
from products.access_control.backend.property_access_control import PropertyAccessLevel
+from products.event_definitions.backend.models import PropertyDefinition
from products.workflows.backend.models.hog_flow.hog_flow import HogFlow
from products.workflows.backend.models.message_assets_sql import INSERT_MESSAGE_ASSET_SQL
diff --git a/products/workflows/backend/tests/api/test_workflow_data_suggestions.py b/products/workflows/backend/tests/api/test_workflow_data_suggestions.py
index 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 parameterized
from posthog.errors import InternalCHQueryError
from posthog.event_usage import EventSource
from posthog.exceptions import ClickHouseQueryTimeOut
-from posthog.models import PropertyDefinition
from posthog.models.integration import Integration
from posthog.models.organization import OrganizationMembership
from posthog.models.personal_api_key import PersonalAPIKey, hash_key_value
@@ -28,6 +27,7 @@ from posthog.models.utils import generate_random_token_personal
from products.access_control.backend.facade.contracts import PropertyAccessLevel
from products.access_control.backend.models.property_access_control import PropertyAccessControl
from products.cdp.backend.templates.hog_function_template import sync_template_to_db
+from products.event_definitions.backend.models import PropertyDefinition
from products.messaging.backend.facade.testing import create_message_template_for_test
from products.workflows.backend.facade.contracts import DataSuggestionsResult
from products.workflows.backend.models import WorkflowIdea as WorkflowIdeaModel
diff --git a/tach.toml b/tach.toml
index 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",