Simplify, undoing the change allowing controlling ServiceSwitcher with immediate frames (SystemFrames). Service switcher frames are ControlFrames, which are easier to reason about. We can always build the immediate option later if needed (i.e. if there's sufficient user pull for it)

src/pipecat/frames/frames.py

@@ -1603,46 +1603,17 @@ class MixerEnableFrame(MixerControlFrame):
 
 
 @dataclass
-class ManuallySwitchServiceBaseFrame:
-    """Base class for frames that request a manual service switch from a ServiceSwitcher.
+class ServiceSwitcherFrame(ControlFrame):
+    """A base class for frames that affect ServiceSwitcher behavior."""
 
-    Must be inherited alongside either ServiceSwitcherFrame or ServiceSwitcherControlFrame.
+    pass
+
+
+@dataclass
+class ManuallySwitchServiceFrame(ServiceSwitcherFrame):
+    """A frame to request a manual switch in the active service in a ServiceSwitcher.
+
+    Handled by ServiceSwitcherStrategyManual to switch the active service.
     """
 
     service: "FrameProcessor"
-
-
-@dataclass
-class ServiceSwitcherFrame(SystemFrame):
-    """A base class for frames that affect ServiceSwitcher behavior immediately."""
-
-    pass
-
-
-@dataclass
-class ManuallySwitchServiceFrame(ServiceSwitcherFrame, ManuallySwitchServiceBaseFrame):
-    """A frame to request an immediate manual switch in the active service in a ServiceSwitcher.
-
-    Handled by ServiceSwitcherStrategyManual to switch the active service.
-    """
-
-    pass
-
-
-@dataclass
-class ServiceSwitcherControlFrame(ControlFrame):
-    """A base class for frames that affect ServiceSwitcher behavior, in order."""
-
-    pass
-
-
-@dataclass
-class ManuallySwitchServiceControlFrame(
-    ServiceSwitcherControlFrame, ManuallySwitchServiceBaseFrame
-):
-    """A frame to request a manual switch in the active service in a ServiceSwitcher, in order.
-
-    Handled by ServiceSwitcherStrategyManual to switch the active service.
-    """
-
-    pass