From 9778d8660791644c1c105b7eda41ebc7ed7f7b1a Mon Sep 17 00:00:00 2001 From: Chad Bailey Date: Thu, 30 May 2024 16:06:27 +0000 Subject: [PATCH] everything but audioframe and endpipeframe --- examples/foundational/08-bots-arguing.py | 4 ++-- examples/foundational/websocket-server/sample.py | 4 ++-- src/pipecat/pipeline/merge_pipeline.py | 2 +- src/pipecat/processors/aggregators/gated.py | 2 +- .../processors/aggregators/vision_image_frame.py | 2 +- .../serializers/abstract_frame_serializer.py | 2 +- src/pipecat/serializers/protobuf_serializer.py | 4 ++-- tests/integration/integration_azure_llm.py | 6 +++--- tests/integration/integration_ollama_llm.py | 5 ++--- tests/integration/integration_openai_llm.py | 1 + tests/test_aggregators.py | 13 ++++++------- tests/test_ai_services.py | 2 +- tests/test_pipeline.py | 7 ++++--- tests/test_protobuf_serializer.py | 2 +- tests/test_websocket_transport.py | 2 +- 15 files changed, 29 insertions(+), 29 deletions(-) diff --git a/examples/foundational/08-bots-arguing.py b/examples/foundational/08-bots-arguing.py index 3be829ba5..6e53234ad 100644 --- a/examples/foundational/08-bots-arguing.py +++ b/examples/foundational/08-bots-arguing.py @@ -3,14 +3,14 @@ import aiohttp import asyncio import logging import os -from pipecat.pipeline.aggregators import SentenceAggregator +from pipeline.processors.aggregators import SentenceAggregator from pipecat.pipeline.pipeline import Pipeline from pipecat.transports.daily_transport import DailyTransport from pipecat.services.azure_ai_services import AzureLLMService, AzureTTSService from pipecat.services.elevenlabs_ai_services import ElevenLabsTTSService from pipecat.services.fal_ai_services import FalImageGenService -from pipecat.pipeline.frames import AudioFrame, EndFrame, ImageFrame, LLMMessagesFrame, TextFrame +from pipecat.frames.frames import AudioFrame, EndFrame, ImageFrame, LLMMessagesFrame, TextFrame from runner import configure diff --git a/examples/foundational/websocket-server/sample.py b/examples/foundational/websocket-server/sample.py index b3a4a731d..104452ba8 100644 --- a/examples/foundational/websocket-server/sample.py +++ b/examples/foundational/websocket-server/sample.py @@ -2,8 +2,8 @@ import asyncio import aiohttp import logging import os -from pipecat.pipeline.frame_processor import FrameProcessor -from pipecat.pipeline.frames import TextFrame, TranscriptionFrame +from pipeline.processors.frame_processor import FrameProcessor +from pipecat.frames.frames import TextFrame, TranscriptionFrame from pipecat.pipeline.pipeline import Pipeline from pipecat.services.elevenlabs_ai_services import ElevenLabsTTSService from pipecat.transports.websocket_transport import WebsocketTransport diff --git a/src/pipecat/pipeline/merge_pipeline.py b/src/pipecat/pipeline/merge_pipeline.py index 019db55e1..f6f9a5ebd 100644 --- a/src/pipecat/pipeline/merge_pipeline.py +++ b/src/pipecat/pipeline/merge_pipeline.py @@ -1,5 +1,5 @@ from typing import List -from pipecat.pipeline.frames import EndFrame, EndPipeFrame +from pipecat.frames.frames import EndFrame, EndPipeFrame from pipecat.pipeline.pipeline import Pipeline diff --git a/src/pipecat/processors/aggregators/gated.py b/src/pipecat/processors/aggregators/gated.py index 3c80e4641..a3c8d3469 100644 --- a/src/pipecat/processors/aggregators/gated.py +++ b/src/pipecat/processors/aggregators/gated.py @@ -17,7 +17,7 @@ class GatedAggregator(FrameProcessor): Yields gate-opening frame before any accumulated frames, then ensuing frames until and not including the gate-closed frame. - >>> from pipecat.pipeline.frames import ImageFrame + >>> from pipecat.frames.frames import ImageFrame >>> async def print_frames(aggregator, frame): ... async for frame in aggregator.process_frame(frame): diff --git a/src/pipecat/processors/aggregators/vision_image_frame.py b/src/pipecat/processors/aggregators/vision_image_frame.py index 45fd6756b..ed79f6e36 100644 --- a/src/pipecat/processors/aggregators/vision_image_frame.py +++ b/src/pipecat/processors/aggregators/vision_image_frame.py @@ -12,7 +12,7 @@ class VisionImageFrameAggregator(FrameProcessor): """This aggregator waits for a consecutive TextFrame and an ImageFrame. After the ImageFrame arrives it will output a VisionImageFrame. - >>> from pipecat.pipeline.frames import ImageFrame + >>> from pipecat.frames.frames import ImageFrame >>> async def print_frames(aggregator, frame): ... async for frame in aggregator.process_frame(frame): diff --git a/src/pipecat/serializers/abstract_frame_serializer.py b/src/pipecat/serializers/abstract_frame_serializer.py index 8da0bd11d..d50c71818 100644 --- a/src/pipecat/serializers/abstract_frame_serializer.py +++ b/src/pipecat/serializers/abstract_frame_serializer.py @@ -1,6 +1,6 @@ from abc import abstractmethod -from pipecat.pipeline.frames import Frame +from pipecat.frames.frames import Frame class FrameSerializer: diff --git a/src/pipecat/serializers/protobuf_serializer.py b/src/pipecat/serializers/protobuf_serializer.py index 04b348b86..e41080607 100644 --- a/src/pipecat/serializers/protobuf_serializer.py +++ b/src/pipecat/serializers/protobuf_serializer.py @@ -1,7 +1,7 @@ import dataclasses from typing import Text -from pipecat.pipeline.frames import AudioFrame, Frame, TextFrame, TranscriptionFrame -import pipecat.pipeline.protobufs.frames_pb2 as frame_protos +from pipecat.frames.frames import AudioFrame, Frame, TextFrame, TranscriptionFrame +import pipecat.frames.protobufs.frames_pb2 as frame_protos from pipecat.serializers.abstract_frame_serializer import FrameSerializer diff --git a/tests/integration/integration_azure_llm.py b/tests/integration/integration_azure_llm.py index 62527baa2..70109cb2d 100644 --- a/tests/integration/integration_azure_llm.py +++ b/tests/integration/integration_azure_llm.py @@ -1,8 +1,8 @@ import asyncio import os -from pipecat.pipeline.openai_frames import OpenAILLMContextFrame -from pipecat.services.azure_ai_services import AzureLLMService -from pipecat.services.openai_llm_context import OpenAILLMContext +from pipecat.processors.aggregators.openai_llm_context import OpenAILLMContextFrame +from pipecat.services.azure import AzureLLMService +from pipecat.services.openai import OpenAILLMContext from openai.types.chat import ( ChatCompletionSystemMessageParam, diff --git a/tests/integration/integration_ollama_llm.py b/tests/integration/integration_ollama_llm.py index e85425f8e..1c5692ce2 100644 --- a/tests/integration/integration_ollama_llm.py +++ b/tests/integration/integration_ollama_llm.py @@ -1,11 +1,10 @@ import asyncio -from pipecat.pipeline.openai_frames import OpenAILLMContextFrame -from pipecat.services.openai_llm_context import OpenAILLMContext +from pipecat.processors.aggregators.openai_llm_context import OpenAILLMContextFrame, OpenAILLMContext from openai.types.chat import ( ChatCompletionSystemMessageParam, ) -from pipecat.services.ollama_ai_services import OLLamaLLMService +from pipecat.services.ollama import OLLamaLLMService if __name__ == "__main__": async def test_chat(): diff --git a/tests/integration/integration_openai_llm.py b/tests/integration/integration_openai_llm.py index c993a9adb..76163a1b4 100644 --- a/tests/integration/integration_openai_llm.py +++ b/tests/integration/integration_openai_llm.py @@ -3,6 +3,7 @@ import json import os from typing import List + from pipecat.services.openai import OpenAILLMContextFrame, OpenAILLMContext from pipecat.processors.frame_processor import FrameDirection, FrameProcessor from pipecat.frames.frames import ( diff --git a/tests/test_aggregators.py b/tests/test_aggregators.py index 47f65c90a..5675547e2 100644 --- a/tests/test_aggregators.py +++ b/tests/test_aggregators.py @@ -3,13 +3,12 @@ import doctest import functools import unittest -from pipecat.pipeline.aggregators import ( - GatedAggregator, - ParallelPipeline, - SentenceAggregator, - StatelessTextTransformer, -) -from pipecat.pipeline.frames import ( +from pipecat.processors.aggregators.sentence import SentenceAggregator +from pipecat.processors.text_transformer import StatelessTextTransformer +from pipecat.processors.aggregators.gated import GatedAggregator +from pipecat.pipeline.parallel_pipeline import ParallelPipeline + +from pipecat.frames.frames import ( AudioFrame, EndFrame, ImageFrame, diff --git a/tests/test_ai_services.py b/tests/test_ai_services.py index ec44d5625..2365f0b8f 100644 --- a/tests/test_ai_services.py +++ b/tests/test_ai_services.py @@ -3,7 +3,7 @@ import unittest from typing import AsyncGenerator from pipecat.services.ai_services import AIService -from pipecat.pipeline.frames import EndFrame, Frame, TextFrame +from pipecat.frames.frames import EndFrame, Frame, TextFrame class SimpleAIService(AIService): diff --git a/tests/test_pipeline.py b/tests/test_pipeline.py index c116b2c8f..0b1f277ac 100644 --- a/tests/test_pipeline.py +++ b/tests/test_pipeline.py @@ -2,9 +2,10 @@ import asyncio import unittest from unittest.mock import Mock -from pipecat.pipeline.aggregators import SentenceAggregator, StatelessTextTransformer -from pipecat.pipeline.frame_processor import FrameProcessor -from pipecat.pipeline.frames import EndFrame, TextFrame +from pipecat.processors.text_transformer import StatelessTextTransformer +from pipecat.processors.aggregators.sentence import SentenceAggregator +from pipecat.processors.frame_processor import FrameProcessor +from pipecat.frames.frames import EndFrame, TextFrame from pipecat.pipeline.pipeline import Pipeline diff --git a/tests/test_protobuf_serializer.py b/tests/test_protobuf_serializer.py index 7109d7284..5a6a95cea 100644 --- a/tests/test_protobuf_serializer.py +++ b/tests/test_protobuf_serializer.py @@ -1,6 +1,6 @@ import unittest -from pipecat.pipeline.frames import AudioFrame, TextFrame, TranscriptionFrame +from pipecat.frames.frames import AudioFrame, TextFrame, TranscriptionFrame from pipecat.serializers.protobuf_serializer import ProtobufFrameSerializer diff --git a/tests/test_websocket_transport.py b/tests/test_websocket_transport.py index 601ba21ae..56c5df16c 100644 --- a/tests/test_websocket_transport.py +++ b/tests/test_websocket_transport.py @@ -2,7 +2,7 @@ import asyncio import unittest from unittest.mock import AsyncMock, patch, Mock -from pipecat.pipeline.frames import AudioFrame, EndFrame, TextFrame, TTSEndFrame, TTSStartFrame +from pipecat.frames.frames import AudioFrame, EndFrame, TextFrame, TTSEndFrame, TTSStartFrame from pipecat.pipeline.pipeline import Pipeline from pipecat.transports.websocket_transport import WebSocketFrameProcessor, WebsocketTransport