refactor: move the ClickHouse and HogQL query exception handling to t…

…he SessionRecordingViewSet level

posthog/errors.py

@@ -81,19 +81,10 @@ class CHQueryErrorTooManySimultaneousQueries(InternalCHQueryError):
     pass
 
 
-class CHQueryErrorTypeMismatch(ExposedCHQueryError):
-    pass
-
-
 CLICKHOUSE_SPECIFIC_ERROR_LOOKUP = {
     "TOO_MANY_SIMULTANEOUS_QUERIES": CHQueryErrorTooManySimultaneousQueries(
         "Too many simultaneous queries. Try again later.", code=202
     ),
-    "TYPE_MISMATCH": CHQueryErrorTypeMismatch(
-        "One or more property values in your filters are in an incorrect format."
-        " Please check and adjust them to match the required data types.",
-        code=53,
-    ),
 }
 
 
@@ -161,7 +152,11 @@ class CHQueryErrorTypeMismatch(ExposedCHQueryError):
     50: ErrorCodeMeta("UNKNOWN_TYPE"),
     51: ErrorCodeMeta("EMPTY_LIST_OF_COLUMNS_QUERIED"),
     52: ErrorCodeMeta("COLUMN_QUERIED_MORE_THAN_ONCE"),
-    53: ErrorCodeMeta("TYPE_MISMATCH", user_safe=True),
+    53: ErrorCodeMeta(
+        "TYPE_MISMATCH",
+        user_safe="One or more property values in your filters are in an incorrect format."
+        " Please check and adjust them to match the required data types.",
+    ),
     55: ErrorCodeMeta("STORAGE_REQUIRES_PARAMETER"),
     56: ErrorCodeMeta("UNKNOWN_STORAGE"),
     57: ErrorCodeMeta("TABLE_ALREADY_EXISTS"),

posthog/hogql/query.py

@@ -1,8 +1,6 @@
 import dataclasses
 from typing import Optional, Union, cast
 
-from rest_framework.exceptions import ValidationError
-
 from posthog.clickhouse.client.connection import Workload
 from posthog.errors import ExposedCHQueryError
 from posthog.hogql import ast
@@ -202,8 +200,6 @@ def execute_hogql_query(
                     team_id=team.pk,
                     readonly=True,
                 )
-            except (ExposedHogQLError, ExposedCHQueryError) as e:
-                raise ValidationError(str(e), getattr(e, "code_name", None))
             except Exception as e:
                 if debug:
                     results = []

posthog/session_recordings/session_recording_api.py

@@ -21,13 +21,16 @@
 from rest_framework.renderers import JSONRenderer
 from rest_framework.response import Response
 from rest_framework.utils.encoders import JSONEncoder
+from rest_framework.exceptions import ValidationError
 
 from posthog.api.person import MinimalPersonSerializer
 from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.api.utils import safe_clickhouse_string
 from posthog.auth import SharingAccessTokenAuthentication
 from posthog.cloud_utils import is_cloud
 from posthog.constants import SESSION_RECORDINGS_FILTER_IDS
+from posthog.errors import ExposedCHQueryError
+from posthog.hogql.errors import ExposedHogQLError
 from posthog.models import User, Team
 from posthog.models.filters.session_recordings_filter import SessionRecordingsFilter
 from posthog.models.person.person import PersonDistinctId
@@ -276,7 +279,10 @@ def safely_get_object(self, queryset) -> SessionRecording:
 
     def list(self, request: request.Request, *args: Any, **kwargs: Any) -> Response:
         filter = SessionRecordingsFilter(request=request, team=self.team)
-        return list_recordings_response(filter, request, self.get_serializer_context())
+        try:
+            return list_recordings_response(filter, request, self.get_serializer_context())
+        except (ExposedHogQLError, ExposedCHQueryError) as e:
+            raise ValidationError(str(e), getattr(e, "code_name", None))
 
     @extend_schema(
         description="""