Merge pull request #86 from daily-co/transport-refactor

Starting refactor of transports into their own directory
pipecat-ai · Mar 28, 2024 · 565acfa · 565acfa
2 parents a2295b6 + 4ce140b
commit 565acfa
Show file tree

Hide file tree

Showing 31 changed files with 106 additions and 80 deletions.
diff --git a/examples/foundational/01-say-one-thing.py b/examples/foundational/01-say-one-thing.py
@@ -5,7 +5,7 @@
 from dailyai.pipeline.frames import EndFrame, TextFrame
 from dailyai.pipeline.pipeline import Pipeline
 
-from dailyai.services.daily_transport_service import DailyTransportService
+from dailyai.transports.daily_transport import DailyTransport
 from dailyai.services.elevenlabs_ai_service import ElevenLabsTTSService
 
 from runner import configure
@@ -20,7 +20,7 @@
 
 async def main(room_url):
     async with aiohttp.ClientSession() as session:
-        transport = DailyTransportService(
+        transport = DailyTransport(
             room_url,
             None,
             "Say One Thing",

diff --git a/examples/foundational/01a-local-transport.py b/examples/foundational/01a-local-transport.py
@@ -4,7 +4,7 @@
 import os
 
 from dailyai.services.elevenlabs_ai_service import ElevenLabsTTSService
-from dailyai.services.local_transport_service import LocalTransportService
+from dailyai.transports.local_transport import LocalTransport
 
 logging.basicConfig(format=f"%(levelno)s %(asctime)s %(message)s")
 logger = logging.getLogger("dailyai")
@@ -14,7 +14,7 @@
 async def main():
     async with aiohttp.ClientSession() as session:
         meeting_duration_minutes = 1
-        transport = LocalTransportService(
+        transport = LocalTransport(
             duration_minutes=meeting_duration_minutes, mic_enabled=True
         )
         tts = ElevenLabsTTSService(

diff --git a/examples/foundational/02-llm-say-one-thing.py b/examples/foundational/02-llm-say-one-thing.py
@@ -6,7 +6,7 @@
 
 from dailyai.pipeline.frames import EndFrame, LLMMessagesQueueFrame
 from dailyai.pipeline.pipeline import Pipeline
-from dailyai.services.daily_transport_service import DailyTransportService
+from dailyai.transports.daily_transport import DailyTransport
 from dailyai.services.elevenlabs_ai_service import ElevenLabsTTSService
 from dailyai.services.open_ai_services import OpenAILLMService
 
@@ -22,7 +22,7 @@
 
 async def main(room_url):
     async with aiohttp.ClientSession() as session:
-        transport = DailyTransportService(
+        transport = DailyTransport(
             room_url,
             None,
             "Say One Thing From an LLM",

diff --git a/examples/foundational/03-still-frame.py b/examples/foundational/03-still-frame.py
@@ -5,7 +5,7 @@
 
 from dailyai.pipeline.frames import TextFrame
 from dailyai.pipeline.pipeline import Pipeline
-from dailyai.services.daily_transport_service import DailyTransportService
+from dailyai.transports.daily_transport import DailyTransport
 from dailyai.services.fal_ai_services import FalImageGenService
 
 from runner import configure
@@ -20,7 +20,7 @@
 
 async def main(room_url):
     async with aiohttp.ClientSession() as session:
-        transport = DailyTransportService(
+        transport = DailyTransport(
             room_url,
             None,
             "Show a still frame image",

diff --git a/examples/foundational/03a-image-local.py b/examples/foundational/03a-image-local.py
@@ -7,7 +7,7 @@
 
 from dailyai.pipeline.frames import TextFrame
 from dailyai.services.fal_ai_services import FalImageGenService
-from dailyai.services.local_transport_service import LocalTransportService
+from dailyai.transports.local_transport import LocalTransport
 
 logging.basicConfig(format=f"%(levelno)s %(asctime)s %(message)s")
 logger = logging.getLogger("dailyai")
@@ -22,7 +22,7 @@ async def main():
         meeting_duration_minutes = 2
         tk_root = tk.Tk()
         tk_root.title("Calendar")
-        transport = LocalTransportService(
+        transport = LocalTransport(
             tk_root=tk_root,
             mic_enabled=True,
             camera_enabled=True,

diff --git a/examples/foundational/04-utterance-and-speech.py b/examples/foundational/04-utterance-and-speech.py
@@ -6,7 +6,7 @@
 from dailyai.pipeline.merge_pipeline import SequentialMergePipeline
 from dailyai.pipeline.pipeline import Pipeline
 
-from dailyai.services.daily_transport_service import DailyTransportService
+from dailyai.transports.daily_transport import DailyTransport
 from dailyai.services.azure_ai_services import AzureLLMService, AzureTTSService
 from dailyai.services.deepgram_ai_services import DeepgramTTSService
 from dailyai.pipeline.frames import EndPipeFrame, LLMMessagesQueueFrame, TextFrame
@@ -24,7 +24,7 @@
 
 async def main(room_url: str):
     async with aiohttp.ClientSession() as session:
-        transport = DailyTransportService(
+        transport = DailyTransport(
             room_url,
             None,
             "Static And Dynamic Speech",

diff --git a/examples/foundational/05-sync-speech-and-image.py b/examples/foundational/05-sync-speech-and-image.py
@@ -23,7 +23,7 @@
 from dailyai.pipeline.frame_processor import FrameProcessor
 
 from dailyai.pipeline.pipeline import Pipeline
-from dailyai.services.daily_transport_service import DailyTransportService
+from dailyai.transports.daily_transport import DailyTransport
 from dailyai.services.open_ai_services import OpenAILLMService
 from dailyai.services.elevenlabs_ai_service import ElevenLabsTTSService
 from dailyai.services.fal_ai_services import FalImageGenService
@@ -63,7 +63,7 @@ async def process_frame(self, frame: Frame) -> AsyncGenerator[Frame, None]:
 
 async def main(room_url):
     async with aiohttp.ClientSession() as session:
-        transport = DailyTransportService(
+        transport = DailyTransport(
             room_url,
             None,
             "Month Narration Bot",

diff --git a/examples/foundational/05a-local-sync-speech-and-text.py b/examples/foundational/05a-local-sync-speech-and-text.py
@@ -9,7 +9,7 @@
 from dailyai.services.open_ai_services import OpenAILLMService
 from dailyai.services.elevenlabs_ai_service import ElevenLabsTTSService
 from dailyai.services.fal_ai_services import FalImageGenService
-from dailyai.services.local_transport_service import LocalTransportService
+from dailyai.transports.local_transport import LocalTransport
 
 logging.basicConfig(format=f"%(levelno)s %(asctime)s %(message)s")
 logger = logging.getLogger("dailyai")
@@ -22,7 +22,7 @@ async def main(room_url):
         tk_root = tk.Tk()
         tk_root.title("Calendar")
 
-        transport = LocalTransportService(
+        transport = LocalTransport(
             mic_enabled=True,
             camera_enabled=True,
             camera_width=1024,

diff --git a/examples/foundational/06-listen-and-respond.py b/examples/foundational/06-listen-and-respond.py
@@ -5,7 +5,7 @@
 from dailyai.pipeline.frames import LLMMessagesQueueFrame
 from dailyai.pipeline.pipeline import Pipeline
 
-from dailyai.services.daily_transport_service import DailyTransportService
+from dailyai.transports.daily_transport import DailyTransport
 from dailyai.services.elevenlabs_ai_service import ElevenLabsTTSService
 from dailyai.services.open_ai_services import OpenAILLMService
 from dailyai.services.ai_services import FrameLogger
@@ -25,7 +25,7 @@
 
 async def main(room_url: str, token):
     async with aiohttp.ClientSession() as session:
-        transport = DailyTransportService(
+        transport = DailyTransport(
             room_url,
             token,
             "Respond bot",

diff --git a/examples/foundational/06a-image-sync.py b/examples/foundational/06a-image-sync.py
@@ -6,7 +6,7 @@
 from PIL import Image
 
 from dailyai.pipeline.frames import ImageFrame, Frame
-from dailyai.services.daily_transport_service import DailyTransportService
+from dailyai.transports.daily_transport import DailyTransport
 from dailyai.services.ai_services import AIService
 from dailyai.pipeline.aggregators import (
     LLMAssistantContextAggregator,
@@ -42,7 +42,7 @@ async def process_frame(self, frame: Frame) -> AsyncGenerator[Frame, None]:
 
 async def main(room_url: str, token):
     async with aiohttp.ClientSession() as session:
-        transport = DailyTransportService(
+        transport = DailyTransport(
             room_url,
             token,
             "Respond bot",

diff --git a/examples/foundational/07-interruptible.py b/examples/foundational/07-interruptible.py
@@ -9,7 +9,7 @@
 
 from dailyai.pipeline.pipeline import Pipeline
 from dailyai.services.ai_services import FrameLogger
-from dailyai.services.daily_transport_service import DailyTransportService
+from dailyai.transports.daily_transport import DailyTransport
 from dailyai.services.open_ai_services import OpenAILLMService
 from dailyai.services.elevenlabs_ai_service import ElevenLabsTTSService
 
@@ -25,7 +25,7 @@
 
 async def main(room_url: str, token):
     async with aiohttp.ClientSession() as session:
-        transport = DailyTransportService(
+        transport = DailyTransport(
             room_url,
             token,
             "Respond bot",

diff --git a/examples/foundational/08-bots-arguing.py b/examples/foundational/08-bots-arguing.py
@@ -6,7 +6,7 @@
 from dailyai.pipeline.aggregators import SentenceAggregator
 from dailyai.pipeline.pipeline import Pipeline
 
-from dailyai.services.daily_transport_service import DailyTransportService
+from dailyai.transports.daily_transport import DailyTransport
 from dailyai.services.azure_ai_services import AzureLLMService, AzureTTSService
 from dailyai.services.elevenlabs_ai_service import ElevenLabsTTSService
 from dailyai.services.fal_ai_services import FalImageGenService
@@ -24,7 +24,7 @@
 
 async def main(room_url: str):
     async with aiohttp.ClientSession() as session:
-        transport = DailyTransportService(
+        transport = DailyTransport(
             room_url,
             None,
             "Respond bot",

diff --git a/examples/foundational/10-wake-word.py b/examples/foundational/10-wake-word.py
@@ -6,7 +6,7 @@
 from typing import AsyncGenerator
 from PIL import Image
 
-from dailyai.services.daily_transport_service import DailyTransportService
+from dailyai.transports.daily_transport import DailyTransport
 from dailyai.services.open_ai_services import OpenAILLMService
 from dailyai.services.elevenlabs_ai_service import ElevenLabsTTSService
 from dailyai.pipeline.aggregators import (
@@ -116,7 +116,7 @@ async def process_frame(self, frame: Frame) -> AsyncGenerator[Frame, None]:
 
 async def main(room_url: str, token):
     async with aiohttp.ClientSession() as session:
-        transport = DailyTransportService(
+        transport = DailyTransport(
             room_url,
             token,
             "Santa Cat",

diff --git a/examples/foundational/11-sound-effects.py b/examples/foundational/11-sound-effects.py
@@ -4,7 +4,7 @@
 import os
 import wave
 
-from dailyai.services.daily_transport_service import DailyTransportService
+from dailyai.transports.daily_transport import DailyTransport
 from dailyai.services.open_ai_services import OpenAILLMService
 from dailyai.services.elevenlabs_ai_service import ElevenLabsTTSService
 from dailyai.pipeline.aggregators import (
@@ -72,7 +72,7 @@ async def process_frame(self, frame: Frame) -> AsyncGenerator[Frame, None]:
 
 async def main(room_url: str, token):
     async with aiohttp.ClientSession() as session:
-        transport = DailyTransportService(
+        transport = DailyTransport(
             room_url,
             token,
             "Respond bot",

diff --git a/examples/foundational/13-whisper-transcription.py b/examples/foundational/13-whisper-transcription.py
@@ -1,7 +1,7 @@
 import asyncio
 import logging
 
-from dailyai.services.daily_transport_service import DailyTransportService
+from dailyai.transports.daily_transport import DailyTransport
 from dailyai.services.whisper_ai_services import WhisperSTTService
 
 from runner import configure
@@ -15,7 +15,7 @@
 
 
 async def main(room_url: str):
-    transport = DailyTransportService(
+    transport = DailyTransport(
         room_url,
         None,
         "Transcription bot",

diff --git a/examples/foundational/13a-whisper-local.py b/examples/foundational/13a-whisper-local.py
@@ -3,7 +3,7 @@
 import logging
 from dailyai.pipeline.frames import EndFrame, TranscriptionQueueFrame
 
-from dailyai.services.local_transport_service import LocalTransportService
+from dailyai.transports.local_transport import LocalTransport
 from dailyai.services.whisper_ai_services import WhisperSTTService
 
 logging.basicConfig(format=f"%(levelno)s %(asctime)s %(message)s")
@@ -16,7 +16,7 @@ async def main(room_url: str):
     global stt
 
     meeting_duration_minutes = 1
-    transport = LocalTransportService(
+    transport = LocalTransport(
         mic_enabled=True,
         camera_enabled=False,
         speaker_enabled=True,

diff --git a/examples/foundational/websocket-server/sample.py b/examples/foundational/websocket-server/sample.py
@@ -6,7 +6,7 @@
 from dailyai.pipeline.frames import TextFrame, TranscriptionQueueFrame
 from dailyai.pipeline.pipeline import Pipeline
 from dailyai.services.elevenlabs_ai_service import ElevenLabsTTSService
-from dailyai.services.websocket_transport_service import WebsocketTransport
+from dailyai.transports.websocket_transport import WebsocketTransport
 from dailyai.services.whisper_ai_services import WhisperSTTService
 
 logging.basicConfig(format="%(levelno)s %(asctime)s %(message)s")

diff --git a/examples/image-gen.py b/examples/image-gen.py
@@ -5,7 +5,7 @@
 import urllib.parse
 import random
 
-from dailyai.services.daily_transport_service import DailyTransportService
+from dailyai.transports.daily_transport import DailyTransport
 from dailyai.services.azure_ai_services import AzureLLMService, AzureTTSService
 from dailyai.pipeline.frames import Frame, FrameType
 from dailyai.services.fal_ai_services import FalImageGenService
@@ -17,7 +17,7 @@ async def main(room_url: str, token):
     global llm
     global tts
 
-    transport = DailyTransportService(
+    transport = DailyTransport(
         room_url,
         token,
         "Imagebot",

diff --git a/examples/internal/11a-dial-out.py b/examples/internal/11a-dial-out.py
@@ -3,7 +3,7 @@
 import os
 import wave
 
-from dailyai.services.daily_transport_service import DailyTransportService
+from dailyai.transports.daily_transport import DailyTransport
 from dailyai.services.azure_ai_services import AzureLLMService, AzureTTSService
 from dailyai.pipeline.aggregators import LLMContextAggregator
 from dailyai.services.ai_services import AIService, FrameLogger
@@ -66,7 +66,7 @@ async def main(room_url: str, token, phone):
         global llm
         global tts
 
-        transport = DailyTransportService(
+        transport = DailyTransport(
             room_url,
             token,
             "Respond bot",

diff --git a/examples/starter-apps/chatbot.py b/examples/starter-apps/chatbot.py
@@ -20,7 +20,7 @@
 )
 from dailyai.services.ai_services import AIService
 from dailyai.pipeline.pipeline import Pipeline
-from dailyai.services.daily_transport_service import DailyTransportService
+from dailyai.transports.daily_transport import DailyTransport
 from dailyai.services.open_ai_services import OpenAILLMService
 from dailyai.services.elevenlabs_ai_service import ElevenLabsTTSService
 
@@ -92,7 +92,7 @@ async def process_frame(self, frame: Frame) -> AsyncGenerator[Frame, None]:
 
 async def main(room_url: str, token):
     async with aiohttp.ClientSession() as session:
-        transport = DailyTransportService(
+        transport = DailyTransport(
             room_url,
             token,
             "Chatbot",

diff --git a/examples/starter-apps/patient-intake.py b/examples/starter-apps/patient-intake.py
@@ -13,7 +13,7 @@
 )
 
 from dailyai.pipeline.pipeline import Pipeline
-from dailyai.services.daily_transport_service import DailyTransportService
+from dailyai.transports.daily_transport import DailyTransport
 from dailyai.services.openai_llm_context import OpenAILLMContext
 from dailyai.services.open_ai_services import OpenAILLMService
 # from dailyai.services.deepgram_ai_services import DeepgramTTSService
@@ -292,7 +292,7 @@ async def main(room_url: str, token):
         global llm
         global tts
 
-        transport = DailyTransportService(
+        transport = DailyTransport(
             room_url,
             token,
             "Intake Bot",

diff --git a/examples/starter-apps/storybot.py b/examples/starter-apps/storybot.py
@@ -11,7 +11,7 @@
 
 from dailyai.pipeline.pipeline import Pipeline
 from dailyai.pipeline.frame_processor import FrameProcessor
-from dailyai.services.daily_transport_service import DailyTransportService
+from dailyai.transports.daily_transport import DailyTransport
 from dailyai.services.azure_ai_services import AzureLLMService, AzureTTSService
 from dailyai.services.fal_ai_services import FalImageGenService
 from dailyai.services.open_ai_services import OpenAILLMService
@@ -214,7 +214,7 @@ async def main(room_url: str, token):
         sp = StoryProcessor(messages, story)
         sig = StoryImageGenerator(story, llm, img)
 
-        transport = DailyTransportService(
+        transport = DailyTransport(
             room_url,
             token,
             "Storybot",