add LLMUserAggregatorParams and LLMAssistantAggregatorParams

tests/test_context_aggregators.py

@@ -26,7 +26,11 @@ from pipecat.frames.frames import (
     UserStartedSpeakingFrame,
     UserStoppedSpeakingFrame,
 )
-from pipecat.processors.aggregators.llm_response import LLMUserContextAggregator
+from pipecat.processors.aggregators.llm_response import (
+    LLMAssistantAggregatorParams,
+    LLMUserAggregatorParams,
+    LLMUserContextAggregator,
+)
 from pipecat.processors.aggregators.openai_llm_context import (
     OpenAILLMContext,
     OpenAILLMContextFrame,
@@ -163,7 +167,9 @@ class BaseTestUserContextAggregator:
         assert self.AGGREGATOR_CLASS is not None, "AGGREGATOR_CLASS must be set in a subclass"
 
         context = self.CONTEXT_CLASS()
-        aggregator = self.AGGREGATOR_CLASS(context, aggregation_timeout=AGGREGATION_TIMEOUT)
+        aggregator = self.AGGREGATOR_CLASS(
+            context, params=LLMUserAggregatorParams(aggregation_timeout=AGGREGATION_TIMEOUT)
+        )
         frames_to_send = [
             UserStartedSpeakingFrame(),
             InterimTranscriptionFrame(text="How ", user_id="cat", timestamp=""),
@@ -189,7 +195,9 @@ class BaseTestUserContextAggregator:
         assert self.AGGREGATOR_CLASS is not None, "AGGREGATOR_CLASS must be set in a subclass"
 
         context = self.CONTEXT_CLASS()
-        aggregator = self.AGGREGATOR_CLASS(context, aggregation_timeout=AGGREGATION_TIMEOUT)
+        aggregator = self.AGGREGATOR_CLASS(
+            context, params=LLMUserAggregatorParams(aggregation_timeout=AGGREGATION_TIMEOUT)
+        )
         frames_to_send = [
             UserStartedSpeakingFrame(),
             InterimTranscriptionFrame(text="How ", user_id="cat", timestamp=""),
@@ -216,7 +224,9 @@ class BaseTestUserContextAggregator:
         assert self.AGGREGATOR_CLASS is not None, "AGGREGATOR_CLASS must be set in a subclass"
 
         context = self.CONTEXT_CLASS()
-        aggregator = self.AGGREGATOR_CLASS(context, aggregation_timeout=AGGREGATION_TIMEOUT)
+        aggregator = self.AGGREGATOR_CLASS(
+            context, params=LLMUserAggregatorParams(aggregation_timeout=AGGREGATION_TIMEOUT)
+        )
         frames_to_send = [
             UserStartedSpeakingFrame(),
             UserStoppedSpeakingFrame(),
@@ -240,7 +250,9 @@ class BaseTestUserContextAggregator:
         assert self.AGGREGATOR_CLASS is not None, "AGGREGATOR_CLASS must be set in a subclass"
 
         context = self.CONTEXT_CLASS()
-        aggregator = self.AGGREGATOR_CLASS(context, aggregation_timeout=AGGREGATION_TIMEOUT)
+        aggregator = self.AGGREGATOR_CLASS(
+            context, params=LLMUserAggregatorParams(aggregation_timeout=AGGREGATION_TIMEOUT)
+        )
         frames_to_send = [
             UserStartedSpeakingFrame(),
             UserStoppedSpeakingFrame(),
@@ -265,7 +277,9 @@ class BaseTestUserContextAggregator:
         assert self.AGGREGATOR_CLASS is not None, "AGGREGATOR_CLASS must be set in a subclass"
 
         context = self.CONTEXT_CLASS()
-        aggregator = self.AGGREGATOR_CLASS(context, aggregation_timeout=AGGREGATION_TIMEOUT)
+        aggregator = self.AGGREGATOR_CLASS(
+            context, params=LLMUserAggregatorParams(aggregation_timeout=AGGREGATION_TIMEOUT)
+        )
         frames_to_send = [
             UserStartedSpeakingFrame(),
             TranscriptionFrame(text="Hello Pipecat!", user_id="cat", timestamp=""),
@@ -293,7 +307,9 @@ class BaseTestUserContextAggregator:
         assert self.AGGREGATOR_CLASS is not None, "AGGREGATOR_CLASS must be set in a subclass"
 
         context = self.CONTEXT_CLASS()
-        aggregator = self.AGGREGATOR_CLASS(context, aggregation_timeout=AGGREGATION_TIMEOUT)
+        aggregator = self.AGGREGATOR_CLASS(
+            context, params=LLMUserAggregatorParams(aggregation_timeout=AGGREGATION_TIMEOUT)
+        )
         frames_to_send = [
             UserStartedSpeakingFrame(),
             UserStoppedSpeakingFrame(),
@@ -318,7 +334,9 @@ class BaseTestUserContextAggregator:
         assert self.AGGREGATOR_CLASS is not None, "AGGREGATOR_CLASS must be set in a subclass"
 
         context = self.CONTEXT_CLASS()
-        aggregator = self.AGGREGATOR_CLASS(context, aggregation_timeout=AGGREGATION_TIMEOUT)
+        aggregator = self.AGGREGATOR_CLASS(
+            context, params=LLMUserAggregatorParams(aggregation_timeout=AGGREGATION_TIMEOUT)
+        )
         frames_to_send = [
             UserStartedSpeakingFrame(),
             InterimTranscriptionFrame(text="Hello ", user_id="cat", timestamp=""),
@@ -346,7 +364,9 @@ class BaseTestUserContextAggregator:
         assert self.AGGREGATOR_CLASS is not None, "AGGREGATOR_CLASS must be set in a subclass"
 
         context = self.CONTEXT_CLASS()
-        aggregator = self.AGGREGATOR_CLASS(context, aggregation_timeout=AGGREGATION_TIMEOUT)
+        aggregator = self.AGGREGATOR_CLASS(
+            context, params=LLMUserAggregatorParams(aggregation_timeout=AGGREGATION_TIMEOUT)
+        )
         frames_to_send = [
             TranscriptionFrame(text="Hello!", user_id="cat", timestamp=""),
             SleepFrame(sleep=AGGREGATION_SLEEP),
@@ -366,7 +386,9 @@ class BaseTestUserContextAggregator:
         assert self.AGGREGATOR_CLASS is not None, "AGGREGATOR_CLASS must be set in a subclass"
 
         context = self.CONTEXT_CLASS()
-        aggregator = self.AGGREGATOR_CLASS(context, aggregation_timeout=AGGREGATION_TIMEOUT)
+        aggregator = self.AGGREGATOR_CLASS(
+            context, params=LLMUserAggregatorParams(aggregation_timeout=AGGREGATION_TIMEOUT)
+        )
         frames_to_send = [
             InterimTranscriptionFrame(text="Hello ", user_id="cat", timestamp=""),
             SleepFrame(),
@@ -389,8 +411,7 @@ class BaseTestUserContextAggregator:
 
         context = self.CONTEXT_CLASS()
         aggregator = self.AGGREGATOR_CLASS(
-            context,
-            aggregation_timeout=AGGREGATION_TIMEOUT,
+            context, params=LLMUserAggregatorParams(aggregation_timeout=AGGREGATION_TIMEOUT)
         )
         frames_to_send = [
             UserStartedSpeakingFrame(),
@@ -469,7 +490,9 @@ class BaseTestAssistantContextAggreagator:
         assert self.AGGREGATOR_CLASS is not None, "AGGREGATOR_CLASS must be set in a subclass"
 
         context = self.CONTEXT_CLASS()
-        aggregator = self.AGGREGATOR_CLASS(context, expect_stripped_words=False)
+        aggregator = self.AGGREGATOR_CLASS(
+            context, params=LLMAssistantAggregatorParams(expect_stripped_words=False)
+        )
         frames_to_send = [
             LLMFullResponseStartFrame(),
             TextFrame(text="Hello "),
@@ -513,7 +536,9 @@ class BaseTestAssistantContextAggreagator:
         assert self.AGGREGATOR_CLASS is not None, "AGGREGATOR_CLASS must be set in a subclass"
 
         context = self.CONTEXT_CLASS()
-        aggregator = self.AGGREGATOR_CLASS(context, expect_stripped_words=False)
+        aggregator = self.AGGREGATOR_CLASS(
+            context, params=LLMAssistantAggregatorParams(expect_stripped_words=False)
+        )
         frames_to_send = [
             LLMFullResponseStartFrame(),
             TextFrame(text="Hello "),
@@ -538,7 +563,9 @@ class BaseTestAssistantContextAggreagator:
         assert self.AGGREGATOR_CLASS is not None, "AGGREGATOR_CLASS must be set in a subclass"
 
         context = self.CONTEXT_CLASS()
-        aggregator = self.AGGREGATOR_CLASS(context, expect_stripped_words=False)
+        aggregator = self.AGGREGATOR_CLASS(
+            context, params=LLMAssistantAggregatorParams(expect_stripped_words=False)
+        )
         frames_to_send = [
             LLMFullResponseStartFrame(),
             TextFrame(text="Hello "),