From 178985ec8afea76159bae2f247d4929502c80b16 Mon Sep 17 00:00:00 2001
From: filipi87 <filipi87@gmail.com>
Date: Thu, 9 Apr 2026 10:24:22 -0300
Subject: [PATCH] Refactoring the frame queue to avoid overhead.

---
 src/pipecat/utils/frame_queue.py | 46 +++++++++++++++++---------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/pipecat/utils/frame_queue.py b/src/pipecat/utils/frame_queue.py
index f1e14b923..64617f770 100644
--- a/src/pipecat/utils/frame_queue.py
+++ b/src/pipecat/utils/frame_queue.py
@@ -7,17 +7,17 @@
 """Frame queue utilities for Pipecat pipeline processors."""
 
 import asyncio
-from typing import Any, Callable, Dict, Type, Union
+from typing import Any, Callable, Type, Union
 
 from pipecat.frames.frames import Frame, UninterruptibleFrame
 
 
 class FrameQueue(asyncio.Queue):
-    """An asyncio.Queue that tracks the types of frames currently enqueued.
+    """An asyncio.Queue that tracks whether any UninterruptibleFrame is enqueued.
 
-    Extends ``asyncio.Queue`` and maintains an internal per-type counter so
-    callers can check whether a frame of a given type (or any subclass) is
-    present without scanning the queue.
+    Extends ``asyncio.Queue`` and maintains an O(1) ``has_uninterruptible``
+    flag so interrupt-handling code can decide whether to cancel a task or
+    merely drain non-uninterruptible items without scanning the queue.
 
     Items may be raw ``Frame`` objects or tuples whose first element is a
     ``Frame`` (e.g. ``(frame, direction, callback)``).  Pass a ``frame_getter``
@@ -39,41 +39,43 @@ class FrameQueue(asyncio.Queue):
         """
         super().__init__()
         self._frame_getter = frame_getter
-        self._frame_counts: Dict[type, int] = {}
-
-    @property
-    def has_uninterruptible(self) -> bool:
-        """Return True if any UninterruptibleFrame is currently in the queue."""
-        return self.has_frame(UninterruptibleFrame)
+        self._uninterruptible_count: int = 0
 
     def has_frame(self, frame_type: Union[Type[Frame], Type[UninterruptibleFrame]]) -> bool:
-        """Return True if any frame of the given type (or a subclass) is in the queue.
+        """Return True if any frame of the given type is in the queue.
 
         ``frame_type`` may be ``Frame``, ``UninterruptibleFrame`` (a mixin, not a
         ``Frame`` subclass), or any concrete frame type.
 
+        Note:
+            This inspects the internal `_queue` (deque) of asyncio.Queue.
+            This is not part of the public API but is stable in CPython.
+
         Args:
             frame_type: The frame class to check for.
 
         Returns:
             True if at least one enqueued frame is an instance of ``frame_type``.
         """
-        return any(
-            count > 0 and issubclass(concrete, frame_type)
-            for concrete, count in self._frame_counts.items()
-        )
+        for item in self._queue:
+            if isinstance(self._frame_getter(item), frame_type):
+                return True
+        return False
+
+    @property
+    def has_uninterruptible(self) -> bool:
+        """Return True if any UninterruptibleFrame is currently in the queue."""
+        return self._uninterruptible_count > 0
 
     def _put(self, item: Any) -> None:
-        frame_type = type(self._frame_getter(item))
-        self._frame_counts[frame_type] = self._frame_counts.get(frame_type, 0) + 1
+        if isinstance(self._frame_getter(item), UninterruptibleFrame):
+            self._uninterruptible_count += 1
         super()._put(item)
 
     def _get(self) -> Any:
         item = super()._get()
-        frame_type = type(self._frame_getter(item))
-        self._frame_counts[frame_type] -= 1
-        if self._frame_counts[frame_type] == 0:
-            del self._frame_counts[frame_type]
+        if isinstance(self._frame_getter(item), UninterruptibleFrame):
+            self._uninterruptible_count -= 1
         return item
 
     def reset(self) -> None: