improve error message on exceeding the max number of queries

posthog/api/query.py

@@ -140,8 +140,8 @@ def create(self, request, *args, **kwargs) -> Response:
             return Response(result, status=response_status)
         except (ExposedHogQLError, ExposedCHQueryError) as e:
             raise ValidationError(str(e), getattr(e, "code_name", None))
-        except ConcurrencyLimitExceeded:
-            raise Throttled()
+        except ConcurrencyLimitExceeded as c:
+            raise Throttled(detail=str(c))
         except Exception as e:
             self.handle_column_ch_error(e)
             capture_exception(e)

posthog/clickhouse/client/limit.py

@@ -69,14 +69,13 @@ class RateLimit:
 
     @contextmanager
     def run(self, *args, **kwargs):
-        cleanup = None
-        if not self.applicable or self.applicable(*args, **kwargs):
+        applicable = not self.applicable or self.applicable(*args, **kwargs)
+        if applicable:
             running_task_key, task_id = self.use(*args, **kwargs)
-            cleanup = True
         try:
             yield
         finally:
-            if cleanup:
+            if applicable:
                 self.release(running_task_key, task_id)
 
     def use(self, *args, **kwargs):
@@ -102,7 +101,7 @@ def use(self, *args, **kwargs):
             ).inc()
 
             raise ConcurrencyLimitExceeded(
-                f"Exceeded maximum concurrent tasks limit: {self.max_concurrent_tasks} for key: {task_name} and task: {task_id}"
+                f"Exceeded maximum concurrency limit: {self.max_concurrent_tasks} for key: {task_name} and task: {task_id}"
             )
 
         return running_tasks_key, task_id