fix(insights): Use lru_cache to reduce queries to instance settings

posthog/api/test/__snapshots__/test_api_docs.ambr

@@ -91,8 +91,8 @@
     '/home/runner/work/posthog/posthog/posthog/api/survey.py: Warning [SurveyViewSet]: could not derive type of path parameter "project_id" because model "posthog.models.feedback.survey.Survey" contained no such field. Consider annotating parameter with @extend_schema. Defaulting to "string".',
     'Warning: encountered multiple names for the same choice set (HrefMatchingEnum). This may be unwanted even though the generated schema is technically correct. Add an entry to ENUM_NAME_OVERRIDES to fix the naming.',
     'Warning: enum naming encountered a non-optimally resolvable collision for fields named "type". The same name has been used for multiple choice sets in multiple components. The collision was resolved with "Type7baEnum". add an entry to ENUM_NAME_OVERRIDES to fix the naming.',
-    'Warning: enum naming encountered a non-optimally resolvable collision for fields named "level". The same name has been used for multiple choice sets in multiple components. The collision was resolved with "LevelD7eEnum". add an entry to ENUM_NAME_OVERRIDES to fix the naming.',
     'Warning: enum naming encountered a non-optimally resolvable collision for fields named "level". The same name has been used for multiple choice sets in multiple components. The collision was resolved with "Level998Enum". add an entry to ENUM_NAME_OVERRIDES to fix the naming.',
+    'Warning: enum naming encountered a non-optimally resolvable collision for fields named "level". The same name has been used for multiple choice sets in multiple components. The collision was resolved with "LevelD7eEnum". add an entry to ENUM_NAME_OVERRIDES to fix the naming.',
     'Warning: encountered multiple names for the same choice set (RestrictionLevelEnum). This may be unwanted even though the generated schema is technically correct. Add an entry to ENUM_NAME_OVERRIDES to fix the naming.',
     'Warning: encountered multiple names for the same choice set (EffectivePrivilegeLevelEnum). This may be unwanted even though the generated schema is technically correct. Add an entry to ENUM_NAME_OVERRIDES to fix the naming.',
     'Warning: encountered multiple names for the same choice set (MembershipLevelEnum). This may be unwanted even though the generated schema is technically correct. Add an entry to ENUM_NAME_OVERRIDES to fix the naming.',

posthog/api/test/test_event.py

@@ -96,8 +96,8 @@ def test_filter_events_by_event_name(self):
         flush_persons_and_events()
 
         # Django session, PostHog user, PostHog team, PostHog org membership,
-        # 4x instance setting check, person and distinct id
-        with self.assertNumQueries(10):
+        # instance setting check, person and distinct id
+        with self.assertNumQueries(7):
             response = self.client.get(f"/api/projects/{self.team.id}/events/?event=event_name").json()
             self.assertEqual(response["results"][0]["event"], "event_name")
 
@@ -123,9 +123,9 @@ def test_filter_events_by_properties(self):
         flush_persons_and_events()
 
         # Django session, PostHog user, PostHog team, PostHog org membership,
-        # look up if rate limit is enabled (cached after first lookup), 5x non-cached instance
+        # look up if rate limit is enabled (cached after first lookup), instance
         # setting (poe, rate limit), person and distinct id
-        expected_queries = 12
+        expected_queries = 8
 
         with self.assertNumQueries(expected_queries):
             response = self.client.get(

posthog/api/test/test_person.py

@@ -792,7 +792,7 @@ def test_pagination_limit(self):
         create_person(team_id=self.team.pk, version=0)
 
         returned_ids = []
-        with self.assertNumQueries(10):
+        with self.assertNumQueries(7):
             response = self.client.get("/api/person/?limit=10").json()
         self.assertEqual(len(response["results"]), 9)
         returned_ids += [x["distinct_ids"][0] for x in response["results"]]
@@ -803,7 +803,7 @@ def test_pagination_limit(self):
         created_ids.reverse()  # ids are returned in desc order
         self.assertEqual(returned_ids, created_ids, returned_ids)
 
-        with self.assertNumQueries(9):
+        with self.assertNumQueries(6):
             response_include_total = self.client.get("/api/person/?limit=10&include_total").json()
         self.assertEqual(response_include_total["count"], 20)  #  With `include_total`, the total count is returned too
 

posthog/models/instance_setting.py

@@ -1,5 +1,6 @@
 import json
 from contextlib import contextmanager
+from functools import lru_cache
 from typing import Any
 
 from django.db import models
@@ -19,6 +20,7 @@ def value(self):
         return json.loads(self.raw_value)
 
 
+@lru_cache
 def get_instance_setting(key: str) -> Any:
     assert key in CONSTANCE_CONFIG, f"Unknown dynamic setting: {repr(key)}"
 
@@ -47,6 +49,7 @@ def set_instance_setting(key: str, value: Any):
     InstanceSetting.objects.update_or_create(
         key=CONSTANCE_DATABASE_PREFIX + key, defaults={"raw_value": json.dumps(value)}
     )
+    get_instance_setting.cache_clear()
 
 
 @contextmanager

posthog/session_recordings/test/test_session_recordings.py

@@ -184,7 +184,7 @@ def test_listing_recordings_is_not_nplus1_for_persons(self):
             self.client.get(f"/api/projects/{self.team.id}/session_recordings")
 
             base_time = (now() - relativedelta(days=1)).replace(microsecond=0)
-            num_queries = FuzzyInt(12, 26)  # PoE on or off adds queries here :shrug:
+            num_queries = FuzzyInt(7, 26)  # PoE on or off adds queries here :shrug:
 
             # loop from 1 to 10
             for i in range(1, 11):

posthog/test/base.py

@@ -225,6 +225,8 @@ def setUpTestData(cls):
             _setup_test_data(cls)
 
     def setUp(self):
+        get_instance_setting.cache_clear()
+
         if get_instance_setting("PERSON_ON_EVENTS_ENABLED"):
             from posthog.models.team import util
 

posthog/test/test_middleware.py

@@ -124,7 +124,7 @@ class TestAutoProjectMiddleware(APIBaseTest):
     @classmethod
     def setUpTestData(cls):
         super().setUpTestData()
-        cls.base_app_num_queries = 43
+        cls.base_app_num_queries = 41
         # Create another team that the user does have access to
         cls.second_team = create_team(organization=cls.organization, name="Second Life")