fix: Fix UUID typing issues (#24815)

ee/billing/quota_limiting.py

@@ -134,7 +134,7 @@ def org_quota_limited_until(
 
     if posthoganalytics.feature_enabled(
         QUOTA_LIMIT_DATA_RETENTION_FLAG,
-        organization.id,
+        str(organization.id),
         groups={"organization": str(organization.id)},
         group_properties={"organization": {"id": str(organization.id)}},
     ):

ee/billing/test/test_quota_limiting.py

@@ -69,9 +69,9 @@ def test_quota_limiting_feature_flag_enabled(self, patch_feature_enabled, patch_
         quota_limited_orgs, quota_limiting_suspended_orgs = update_all_org_billing_quotas()
         patch_feature_enabled.assert_called_with(
             QUOTA_LIMIT_DATA_RETENTION_FLAG,
-            self.organization.id,
+            str(self.organization.id),
             groups={"organization": org_id},
-            group_properties={"organization": {"id": org_id}},
+            group_properties={"organization": {"id": str(org_id)}},
         )
         patch_capture.assert_called_once_with(
             org_id,
@@ -101,7 +101,7 @@ def test_quota_limiting_feature_flag_enabled(self, patch_feature_enabled, patch_
         quota_limited_orgs, quota_limiting_suspended_orgs = update_all_org_billing_quotas()
         patch_feature_enabled.assert_called_with(
             QUOTA_LIMIT_DATA_RETENTION_FLAG,
-            self.organization.id,
+            str(self.organization.id),
             groups={"organization": org_id},
             group_properties={"organization": {"id": org_id}},
         )

ee/session_recordings/session_recording_playlist.py

@@ -258,7 +258,7 @@ def modify_recordings(
             return response.Response({"success": True})
 
         if request.method == "DELETE":
-            playlist_item = SessionRecordingPlaylistItem.objects.get(playlist=playlist, recording=session_recording_id)  # type: ignore
+            playlist_item = SessionRecordingPlaylistItem.objects.get(playlist=playlist, recording=session_recording_id)
 
             if playlist_item:
                 playlist_item.delete()

posthog/api/email_verification.py

@@ -14,7 +14,7 @@ def is_email_verification_disabled(user: User) -> bool:
     # using disabled here so that the default state (if no flag exists) is that verification defaults to ON.
     return user.organization is not None and posthoganalytics.feature_enabled(
         VERIFICATION_DISABLED_FLAG,
-        user.organization.id,
+        str(user.organization.id),
         groups={"organization": str(user.organization.id)},
         group_properties={"organization": {"id": str(user.organization.id)}},
     )

posthog/api/test/batch_exports/operations.py

@@ -1,5 +1,6 @@
 from django.test.client import Client as TestClient
 from rest_framework import status
+from posthog.models.utils import UUIDT
 
 
 def create_batch_export(client: TestClient, team_id: int, batch_export_data: dict | str):
@@ -16,35 +17,35 @@ def create_batch_export_ok(client: TestClient, team_id: int, batch_export_data:
     return response.json()
 
 
-def pause_batch_export(client: TestClient, team_id: int, batch_export_id: int):
+def pause_batch_export(client: TestClient, team_id: int, batch_export_id: UUIDT):
     return client.post(f"/api/projects/{team_id}/batch_exports/{batch_export_id}/pause")
 
 
-def pause_batch_export_ok(client: TestClient, team_id: int, batch_export_id: int):
+def pause_batch_export_ok(client: TestClient, team_id: int, batch_export_id: UUIDT):
     response = pause_batch_export(client, team_id, batch_export_id)
     assert response.status_code == status.HTTP_200_OK, response.json()
     return response.json()
 
 
-def unpause_batch_export(client: TestClient, team_id: int, batch_export_id: int, backfill: bool = False):
+def unpause_batch_export(client: TestClient, team_id: int, batch_export_id: UUIDT, backfill: bool = False):
     return client.post(
         f"/api/projects/{team_id}/batch_exports/{batch_export_id}/unpause",
         {"backfill": backfill},
         content_type="application/json",
     )
 
 
-def unpause_batch_export_ok(client: TestClient, team_id: int, batch_export_id: int, backfill: bool = False):
+def unpause_batch_export_ok(client: TestClient, team_id: int, batch_export_id: UUIDT, backfill: bool = False):
     response = unpause_batch_export(client, team_id, batch_export_id, backfill)
     assert response.status_code == status.HTTP_200_OK, response.json()
     return response.json()
 
 
-def get_batch_export(client: TestClient, team_id: int, batch_export_id: int):
+def get_batch_export(client: TestClient, team_id: int, batch_export_id: UUIDT):
     return client.get(f"/api/projects/{team_id}/batch_exports/{batch_export_id}")
 
 
-def get_batch_export_ok(client: TestClient, team_id: int, batch_export_id: int):
+def get_batch_export_ok(client: TestClient, team_id: int, batch_export_id: UUIDT):
     response = get_batch_export(client, team_id, batch_export_id)
     assert response.status_code == status.HTTP_200_OK, response.json()
     return response.json()
@@ -63,11 +64,11 @@ def get_batch_export_runs_ok(client: TestClient, team_id: int, batch_export_id:
     return response.json()
 
 
-def delete_batch_export(client: TestClient, team_id: int, batch_export_id: int):
+def delete_batch_export(client: TestClient, team_id: int, batch_export_id: UUIDT):
     return client.delete(f"/api/projects/{team_id}/batch_exports/{batch_export_id}")
 
 
-def delete_batch_export_ok(client: TestClient, team_id: int, batch_export_id: int):
+def delete_batch_export_ok(client: TestClient, team_id: int, batch_export_id: UUIDT):
     response = delete_batch_export(client, team_id, batch_export_id)
     assert response.status_code == status.HTTP_204_NO_CONTENT, response
     return response

posthog/models/utils.py

@@ -164,7 +164,7 @@ class Meta:
 class UUIDModel(models.Model):
     """Base Django Model with default autoincremented ID field replaced with UUIDT."""
 
-    id = models.UUIDField(primary_key=True, default=UUIDT, editable=False)
+    id: models.UUIDField = models.UUIDField(primary_key=True, default=UUIDT, editable=False)
 
     class Meta:
         abstract = True

posthog/plugins/plugin_server_api.py

@@ -4,6 +4,7 @@
 import structlog
 from posthog.redis import get_client
 from posthog.settings import CDP_FUNCTION_EXECUTOR_API_URL, PLUGINS_RELOAD_PUBSUB_CHANNEL, PLUGINS_RELOAD_REDIS_URL
+from posthog.models.utils import UUIDT
 
 
 logger = structlog.get_logger(__name__)
@@ -62,7 +63,7 @@ def populate_plugin_capabilities_on_workers(plugin_id: str):
 
 def create_hog_invocation_test(
     team_id: int,
-    hog_function_id: str,
+    hog_function_id: UUIDT,
     globals: dict,
     configuration: dict,
     mock_async_functions: bool,
@@ -78,13 +79,13 @@ def create_hog_invocation_test(
     )
 
 
-def get_hog_function_status(team_id: int, hog_function_id: str) -> requests.Response:
+def get_hog_function_status(team_id: int, hog_function_id: UUIDT) -> requests.Response:
     return requests.get(
         CDP_FUNCTION_EXECUTOR_API_URL + f"/api/projects/{team_id}/hog_functions/{hog_function_id}/status"
     )
 
 
-def patch_hog_function_status(team_id: int, hog_function_id: str, state: int) -> requests.Response:
+def patch_hog_function_status(team_id: int, hog_function_id: UUIDT, state: int) -> requests.Response:
     return requests.patch(
         CDP_FUNCTION_EXECUTOR_API_URL + f"/api/projects/{team_id}/hog_functions/{hog_function_id}/status",
         json={"state": state},

posthog/tasks/email.py

@@ -20,6 +20,7 @@
     Team,
     User,
 )
+from posthog.models.utils import UUIDT
 from posthog.user_permissions import UserPermissions
 
 logger = structlog.get_logger(__name__)
@@ -159,7 +160,7 @@ def send_fatal_plugin_error(
 
 
 def send_batch_export_run_failure(
-    batch_export_run_id: str,
+    batch_export_run_id: UUIDT,
 ) -> None:
     logger = structlog.get_logger(__name__)
 

posthog/tasks/stop_surveys_reached_target.py

@@ -1,16 +1,16 @@
 from itertools import groupby
 from django.db.models import Q
 from django.utils import timezone
-from uuid import UUID
 from datetime import datetime
 
 from posthog.clickhouse.client.connection import Workload
 from posthog.client import sync_execute
 from posthog.models import Survey
+from posthog.models.utils import UUIDT
 
 
 def _get_surveys_response_counts(
-    surveys_ids: list[UUID], team_id: int, earliest_survey_creation_date: datetime
+    surveys_ids: list[UUIDT], team_id: int, earliest_survey_creation_date: datetime
 ) -> dict[str, int]:
     data = sync_execute(
         """

posthog/tasks/update_survey_iteration.py

@@ -58,7 +58,7 @@ def _get_targeting_flag(survey: Survey) -> ForeignKey | ForeignKey | Any:
             team=survey.team,
             created_by=survey.created_by,
             active=True,
-            key=survey.id,
+            key=str(survey.id),
             filters=user_submitted_dismissed_filter,
         )
         new_flag.save()