chore: Add Pyupgrade rules (#21714)

* Add Pyupgrade rules
* Set correct Python version

bin/migrate_kafka_data.py

@@ -21,7 +21,6 @@
 
 import argparse
 import sys
-from typing import List
 
 from kafka import KafkaAdminClient, KafkaConsumer, KafkaProducer
 from kafka.errors import KafkaError
@@ -192,7 +191,7 @@ def handle(**options):
             print("Polling for messages")  # noqa: T201
             messages_by_topic = consumer.poll(timeout_ms=timeout_ms)
 
-            futures: List[FutureRecordMetadata] = []
+            futures: list[FutureRecordMetadata] = []
 
             if not messages_by_topic:
                 break

ee/api/authentication.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, List, Union
+from typing import Any, Union
 
 from django.core.exceptions import ValidationError as DjangoValidationError
 from django.http.response import HttpResponse
@@ -91,8 +91,8 @@ def auth_url(self):
 
     def _get_attr(
         self,
-        response_attributes: Dict[str, Any],
-        attribute_names: List[str],
+        response_attributes: dict[str, Any],
+        attribute_names: list[str],
         optional: bool = False,
     ) -> str:
         """

ee/api/dashboard_collaborator.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, cast
+from typing import Any, cast
 
 from django.db import IntegrityError
 from rest_framework import exceptions, mixins, serializers, viewsets
@@ -45,7 +45,7 @@ class Meta:
         ]
         read_only_fields = ["id", "dashboard_id", "user", "user"]
 
-    def validate(self, attrs: Dict[str, Any]) -> Dict[str, Any]:
+    def validate(self, attrs: dict[str, Any]) -> dict[str, Any]:
         dashboard: Dashboard = self.context["dashboard"]
         dashboard_permissions = self.user_permissions.dashboard(dashboard)
         if dashboard_permissions.effective_restriction_level <= Dashboard.RestrictionLevel.EVERYONE_IN_PROJECT_CAN_EDIT:
@@ -96,7 +96,7 @@ class DashboardCollaboratorViewSet(
     serializer_class = DashboardCollaboratorSerializer
     filter_rewrite_rules = {"team_id": "dashboard__team_id"}
 
-    def get_serializer_context(self) -> Dict[str, Any]:
+    def get_serializer_context(self) -> dict[str, Any]:
         context = super().get_serializer_context()
         try:
             context["dashboard"] = Dashboard.objects.get(id=context["dashboard_id"])

ee/api/role.py

@@ -1,4 +1,4 @@
-from typing import List, cast
+from typing import cast
 
 from django.db import IntegrityError
 from rest_framework import mixins, serializers, viewsets
@@ -76,7 +76,7 @@ def get_members(self, role: Role):
         return RoleMembershipSerializer(members, many=True).data
 
     def get_associated_flags(self, role: Role):
-        associated_flags: List[dict] = []
+        associated_flags: list[dict] = []
 
         role_access_objects = FeatureFlagRoleAccess.objects.filter(role=role).values_list("feature_flag_id")
         flags = FeatureFlag.objects.filter(id__in=role_access_objects)

ee/api/sentry_stats.py

@@ -1,5 +1,5 @@
 from datetime import datetime, timedelta
-from typing import Any, Dict, List, Optional, Tuple, Union
+from typing import Any, Optional, Union
 
 import requests
 from django.http import HttpRequest, JsonResponse
@@ -9,8 +9,8 @@
 from posthog.models.instance_setting import get_instance_settings
 
 
-def get_sentry_stats(start_time: str, end_time: str) -> Tuple[dict, int]:
-    sentry_config: Dict[str, str] = get_instance_settings(["SENTRY_AUTH_TOKEN", "SENTRY_ORGANIZATION"])
+def get_sentry_stats(start_time: str, end_time: str) -> tuple[dict, int]:
+    sentry_config: dict[str, str] = get_instance_settings(["SENTRY_AUTH_TOKEN", "SENTRY_ORGANIZATION"])
 
     org_slug = sentry_config.get("SENTRY_ORGANIZATION")
     token = sentry_config.get("SENTRY_AUTH_TOKEN")
@@ -41,9 +41,9 @@ def get_sentry_stats(start_time: str, end_time: str) -> Tuple[dict, int]:
 
 
 def get_tagged_issues_stats(
-    start_time: str, end_time: str, tags: Dict[str, str], target_issues: List[str]
-) -> Dict[str, Any]:
-    sentry_config: Dict[str, str] = get_instance_settings(["SENTRY_AUTH_TOKEN", "SENTRY_ORGANIZATION"])
+    start_time: str, end_time: str, tags: dict[str, str], target_issues: list[str]
+) -> dict[str, Any]:
+    sentry_config: dict[str, str] = get_instance_settings(["SENTRY_AUTH_TOKEN", "SENTRY_ORGANIZATION"])
 
     org_slug = sentry_config.get("SENTRY_ORGANIZATION")
     token = sentry_config.get("SENTRY_AUTH_TOKEN")
@@ -58,7 +58,7 @@ def get_tagged_issues_stats(
     for tag, value in tags.items():
         query += f" {tag}:{value}"
 
-    params: Dict[str, Union[list, str]] = {
+    params: dict[str, Union[list, str]] = {
         "start": start_time,
         "end": end_time,
         "sort": "freq",
@@ -89,8 +89,8 @@ def get_stats_for_timerange(
     base_end_time: str,
     target_start_time: str,
     target_end_time: str,
-    tags: Optional[Dict[str, str]] = None,
-) -> Tuple[int, int]:
+    tags: Optional[dict[str, str]] = None,
+) -> tuple[int, int]:
     base_counts, base_total_count = get_sentry_stats(base_start_time, base_end_time)
     target_counts, target_total_count = get_sentry_stats(target_start_time, target_end_time)
 

ee/api/subscription.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict
+from typing import Any
 
 import jwt
 from django.db.models import QuerySet
@@ -67,7 +67,7 @@ def validate(self, attrs):
 
         return attrs
 
-    def create(self, validated_data: Dict, *args: Any, **kwargs: Any) -> Subscription:
+    def create(self, validated_data: dict, *args: Any, **kwargs: Any) -> Subscription:
         request = self.context["request"]
         validated_data["team_id"] = self.context["team_id"]
         validated_data["created_by"] = request.user

ee/api/test/base.py

@@ -1,5 +1,5 @@
 import datetime
-from typing import Dict, Optional, cast
+from typing import Optional, cast
 
 from zoneinfo import ZoneInfo
 
@@ -20,7 +20,7 @@ class LicensedTestMixin:
     def license_required_response(
         self,
         message: str = "This feature is part of the premium PostHog offering. Self-hosted licenses are no longer available for purchase. Please contact [email protected] to discuss options.",
-    ) -> Dict[str, Optional[str]]:
+    ) -> dict[str, Optional[str]]:
         return {
             "type": "server_error",
             "code": "payment_required",

ee/api/test/fixtures/available_product_features.py

@@ -1,6 +1,6 @@
-from typing import Any, Dict, List
+from typing import Any
 
-AVAILABLE_PRODUCT_FEATURES: List[Dict[str, Any]] = [
+AVAILABLE_PRODUCT_FEATURES: list[dict[str, Any]] = [
     {
         "description": "Create playlists of certain session recordings to easily find and watch them again in the future.",
         "key": "recordings_playlists",

ee/api/test/test_authentication.py

@@ -364,7 +364,6 @@ def test_can_login_with_saml(self):
 
         with open(
             os.path.join(CURRENT_FOLDER, "fixtures/saml_login_response"),
-            "r",
             encoding="utf_8",
         ) as f:
             saml_response = f.read()
@@ -407,7 +406,6 @@ def test_saml_jit_provisioning_and_assertion_with_different_attribute_names(self
 
         with open(
             os.path.join(CURRENT_FOLDER, "fixtures/saml_login_response_alt_attribute_names"),
-            "r",
             encoding="utf_8",
         ) as f:
             saml_response = f.read()
@@ -474,7 +472,6 @@ def test_cannot_login_with_improperly_signed_payload(self):
 
         with open(
             os.path.join(CURRENT_FOLDER, "fixtures/saml_login_response"),
-            "r",
             encoding="utf_8",
         ) as f:
             saml_response = f.read()
@@ -514,7 +511,6 @@ def test_cannot_signup_with_saml_if_jit_provisioning_is_disabled(self):
 
         with open(
             os.path.join(CURRENT_FOLDER, "fixtures/saml_login_response"),
-            "r",
             encoding="utf_8",
         ) as f:
             saml_response = f.read()
@@ -552,7 +548,6 @@ def test_cannot_create_account_without_first_name_in_payload(self):
 
         with open(
             os.path.join(CURRENT_FOLDER, "fixtures/saml_login_response_no_first_name"),
-            "r",
             encoding="utf_8",
         ) as f:
             saml_response = f.read()
@@ -594,7 +589,6 @@ def test_cannot_login_with_saml_on_unverified_domain(self):
 
         with open(
             os.path.join(CURRENT_FOLDER, "fixtures/saml_login_response"),
-            "r",
             encoding="utf_8",
         ) as f:
             saml_response = f.read()
@@ -683,7 +677,6 @@ def test_cannot_use_saml_without_enterprise_license(self):
 
         with open(
             os.path.join(CURRENT_FOLDER, "fixtures/saml_login_response"),
-            "r",
             encoding="utf_8",
         ) as f:
             saml_response = f.read()

ee/api/test/test_billing.py

@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import Any, Dict, List
+from typing import Any
 from unittest.mock import MagicMock, patch
 from uuid import uuid4
 from zoneinfo import ZoneInfo
@@ -22,7 +22,7 @@
 from posthog.test.base import APIBaseTest, _create_event, flush_persons_and_events
 
 
-def create_billing_response(**kwargs) -> Dict[str, Any]:
+def create_billing_response(**kwargs) -> dict[str, Any]:
     data: Any = {"license": {"type": "cloud"}}
     data.update(kwargs)
     return data
@@ -106,7 +106,7 @@ def create_billing_customer(**kwargs) -> CustomerInfo:
     return data
 
 
-def create_billing_products_response(**kwargs) -> Dict[str, List[CustomerProduct]]:
+def create_billing_products_response(**kwargs) -> dict[str, list[CustomerProduct]]:
     data: Any = {
         "products": [
             CustomerProduct(

ee/api/test/test_capture.py

@@ -68,26 +68,26 @@ def test_produce_to_kafka(self, kafka_produce):
         self.assertEqual(event2_data["properties"]["distinct_id"], "id2")
 
         # Make sure we're producing data correctly in the way the plugin server expects
-        self.assertEquals(type(kafka_produce_call1["data"]["distinct_id"]), str)
-        self.assertEquals(type(kafka_produce_call2["data"]["distinct_id"]), str)
+        self.assertEqual(type(kafka_produce_call1["data"]["distinct_id"]), str)
+        self.assertEqual(type(kafka_produce_call2["data"]["distinct_id"]), str)
 
         self.assertIn(type(kafka_produce_call1["data"]["ip"]), [str, type(None)])
         self.assertIn(type(kafka_produce_call2["data"]["ip"]), [str, type(None)])
 
-        self.assertEquals(type(kafka_produce_call1["data"]["site_url"]), str)
-        self.assertEquals(type(kafka_produce_call2["data"]["site_url"]), str)
+        self.assertEqual(type(kafka_produce_call1["data"]["site_url"]), str)
+        self.assertEqual(type(kafka_produce_call2["data"]["site_url"]), str)
 
-        self.assertEquals(type(kafka_produce_call1["data"]["token"]), str)
-        self.assertEquals(type(kafka_produce_call2["data"]["token"]), str)
+        self.assertEqual(type(kafka_produce_call1["data"]["token"]), str)
+        self.assertEqual(type(kafka_produce_call2["data"]["token"]), str)
 
-        self.assertEquals(type(kafka_produce_call1["data"]["sent_at"]), str)
-        self.assertEquals(type(kafka_produce_call2["data"]["sent_at"]), str)
+        self.assertEqual(type(kafka_produce_call1["data"]["sent_at"]), str)
+        self.assertEqual(type(kafka_produce_call2["data"]["sent_at"]), str)
 
-        self.assertEquals(type(event1_data["properties"]), dict)
-        self.assertEquals(type(event2_data["properties"]), dict)
+        self.assertEqual(type(event1_data["properties"]), dict)
+        self.assertEqual(type(event2_data["properties"]), dict)
 
-        self.assertEquals(type(kafka_produce_call1["data"]["uuid"]), str)
-        self.assertEquals(type(kafka_produce_call2["data"]["uuid"]), str)
+        self.assertEqual(type(kafka_produce_call1["data"]["uuid"]), str)
+        self.assertEqual(type(kafka_produce_call2["data"]["uuid"]), str)
 
     @patch("posthog.kafka_client.client._KafkaProducer.produce")
     def test_capture_event_with_uuid_in_payload(self, kafka_produce):

ee/api/test/test_dashboard.py

@@ -106,7 +106,7 @@ def test_cannot_set_dashboard_to_restrict_editing_as_other_user_who_is_project_m
         response_data = response.json()
 
         self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
-        self.assertEquals(
+        self.assertEqual(
             response_data,
             self.permission_denied_response(
                 "Only the dashboard owner and project admins have the restriction rights required to change the dashboard's restriction level."
@@ -178,7 +178,7 @@ def test_cannot_edit_restricted_dashboard_as_other_user_who_is_project_member(se
         response_data = response.json()
 
         self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
-        self.assertEquals(
+        self.assertEqual(
             response_data,
             self.permission_denied_response("You don't have edit permissions for this dashboard."),
         )
@@ -262,7 +262,7 @@ def test_sharing_edits_limited_to_collaborators(self):
         response_data = response.json()
 
         self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
-        self.assertEquals(
+        self.assertEqual(
             response_data,
             self.permission_denied_response("You don't have edit permissions for this dashboard."),
         )

ee/api/test/test_event_definition.py

@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import cast, Optional, List, Dict, Any
+from typing import cast, Optional, Any
 
 import dateutil.parser
 from django.utils import timezone
@@ -26,7 +26,7 @@ class TestEventDefinitionEnterpriseAPI(APIBaseTest):
     Ignoring the verified field we'd expect ordering purchase, watched_movie, entered_free_trial, $pageview
     With it we expect watched_movie, entered_free_trial, purchase, $pageview
     """
-    EXPECTED_EVENT_DEFINITIONS: List[Dict[str, Any]] = [
+    EXPECTED_EVENT_DEFINITIONS: list[dict[str, Any]] = [
         {"name": "purchase", "verified": None},
         {"name": "entered_free_trial", "verified": True},
         {"name": "watched_movie", "verified": True},

ee/api/test/test_insight.py

@@ -1,6 +1,6 @@
 import json
 from datetime import timedelta
-from typing import cast, Optional, List, Dict
+from typing import cast, Optional
 from django.test import override_settings
 from django.utils import timezone
 from freezegun import freeze_time
@@ -305,7 +305,7 @@ def test_cannot_update_restricted_insight_as_other_user_who_is_project_member(se
         dashboard.refresh_from_db()
 
         self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
-        self.assertEquals(
+        self.assertEqual(
             response_data,
             self.permission_denied_response(
                 "This insight is on a dashboard that can only be edited by its owner, team members invited to editing the dashboard, and project admins."
@@ -547,7 +547,7 @@ def test_an_insight_on_restricted_dashboard_does_not_restrict_admin(self) -> Non
         @override_settings(PERSON_ON_EVENTS_OVERRIDE=False, PERSON_ON_EVENTS_V2_OVERRIDE=False)
         @snapshot_postgres_queries
         def test_listing_insights_does_not_nplus1(self) -> None:
-            query_counts: List[int] = []
+            query_counts: list[int] = []
             queries = []
 
             for i in range(5):
@@ -587,10 +587,10 @@ def test_listing_insights_does_not_nplus1(self) -> None:
                 f"received query counts\n\n{query_counts}",
             )
 
-    def assert_insight_activity(self, insight_id: Optional[int], expected: List[Dict]):
+    def assert_insight_activity(self, insight_id: Optional[int], expected: list[dict]):
         activity_response = self.dashboard_api.get_insight_activity(insight_id)
 
-        activity: List[Dict] = activity_response["results"]
+        activity: list[dict] = activity_response["results"]
 
         self.maxDiff = None
         assert activity == expected

ee/api/test/test_integration.py

@@ -25,7 +25,7 @@ def _headers_for_payload(self, payload: Any):
         signature = (
             "v0="
             + hmac.new(
-                "not-so-secret".encode("utf-8"),
+                b"not-so-secret",
                 sig_basestring.encode("utf-8"),
                 digestmod=hashlib.sha256,
             ).hexdigest()

ee/api/test/test_property_definition.py

@@ -1,4 +1,4 @@
-from typing import cast, Optional, List, Dict
+from typing import cast, Optional
 from freezegun import freeze_time
 import pytest
 from django.db.utils import IntegrityError
@@ -450,7 +450,7 @@ def test_list_property_definitions(self):
             plan="enterprise", valid_until=timezone.datetime(2500, 1, 19, 3, 14, 7)
         )
 
-        properties: List[Dict] = [
+        properties: list[dict] = [
             {"name": "1_when_verified", "verified": True},
             {"name": "2_when_verified", "verified": True},
             {"name": "3_when_verified", "verified": True},