From 42e25ccd13825e73369e8e4b8af979dc7440af83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleix=20Conchillo=20Flaqu=C3=A9?= Date: Wed, 20 Mar 2024 14:41:39 -0700 Subject: [PATCH 1/2] create missing __init__.py --- src/dailyai/pipeline/__init__.py | 0 src/dailyai/services/__init__.py | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/dailyai/pipeline/__init__.py create mode 100644 src/dailyai/services/__init__.py diff --git a/src/dailyai/pipeline/__init__.py b/src/dailyai/pipeline/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/src/dailyai/services/__init__.py b/src/dailyai/services/__init__.py new file mode 100644 index 000000000..e69de29bb From 0666dd1194427d3bd8e7959221a119283a861574 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleix=20Conchillo=20Flaqu=C3=A9?= Date: Wed, 20 Mar 2024 14:42:05 -0700 Subject: [PATCH 2/2] remove unused imports --- examples/foundational/03-still-frame.py | 2 +- examples/foundational/04-utterance-and-speech.py | 2 +- examples/foundational/05-sync-speech-and-image.py | 1 - examples/foundational/06a-image-sync.py | 4 ---- examples/foundational/07-interruptible.py | 2 -- examples/foundational/11-sound-effects.py | 1 - examples/foundational/13a-whisper-local.py | 1 - examples/server/daily-bot-manager.py | 2 +- examples/starter-apps/patient-intake.py | 5 +---- examples/starter-apps/storybot.py | 8 -------- examples/starter-apps/translator.py | 5 ----- src/dailyai/pipeline/aggregators.py | 8 +++----- src/dailyai/pipeline/opeanai_llm_aggregator.py | 2 +- src/dailyai/services/ai_services.py | 6 ------ src/dailyai/services/anthropic_llm_service.py | 2 -- src/dailyai/services/azure_ai_services.py | 7 +------ src/dailyai/services/deepgram_ai_service.py | 2 -- src/dailyai/services/deepgram_ai_services.py | 6 ------ src/dailyai/services/elevenlabs_ai_service.py | 3 --- src/dailyai/services/local_transport_service.py | 1 - src/dailyai/services/open_ai_services.py | 6 +----- tests/test_ai_services.py | 2 +- tests/test_daily_transport_service.py | 6 ------ 23 files changed, 11 insertions(+), 73 deletions(-) diff --git a/examples/foundational/03-still-frame.py b/examples/foundational/03-still-frame.py index fe89ca1df..e1be8f57c 100644 --- a/examples/foundational/03-still-frame.py +++ b/examples/foundational/03-still-frame.py @@ -3,7 +3,7 @@ import aiohttp import logging import os -from dailyai.pipeline.frames import EndFrame, TextFrame +from dailyai.pipeline.frames import TextFrame from dailyai.pipeline.pipeline import Pipeline from dailyai.services.daily_transport_service import DailyTransportService from dailyai.services.fal_ai_services import FalImageGenService diff --git a/examples/foundational/04-utterance-and-speech.py b/examples/foundational/04-utterance-and-speech.py index 86d401b87..7a57cc0e6 100644 --- a/examples/foundational/04-utterance-and-speech.py +++ b/examples/foundational/04-utterance-and-speech.py @@ -9,7 +9,7 @@ from dailyai.pipeline.pipeline import Pipeline from dailyai.services.daily_transport_service import DailyTransportService from dailyai.services.azure_ai_services import AzureLLMService, AzureTTSService from dailyai.services.deepgram_ai_services import DeepgramTTSService -from dailyai.pipeline.frames import EndFrame, EndPipeFrame, LLMMessagesQueueFrame, TextFrame +from dailyai.pipeline.frames import EndPipeFrame, LLMMessagesQueueFrame, TextFrame from dailyai.services.elevenlabs_ai_service import ElevenLabsTTSService from runner import configure diff --git a/examples/foundational/05-sync-speech-and-image.py b/examples/foundational/05-sync-speech-and-image.py index 306aa54d2..cd0488a12 100644 --- a/examples/foundational/05-sync-speech-and-image.py +++ b/examples/foundational/05-sync-speech-and-image.py @@ -1,5 +1,4 @@ import asyncio -from re import S import aiohttp import os import logging diff --git a/examples/foundational/06a-image-sync.py b/examples/foundational/06a-image-sync.py index 3b5efdd32..1b1e6db2d 100644 --- a/examples/foundational/06a-image-sync.py +++ b/examples/foundational/06a-image-sync.py @@ -1,12 +1,8 @@ -import argparse import asyncio import os import logging from typing import AsyncGenerator import aiohttp -import requests -import time -import urllib.parse from PIL import Image from dailyai.pipeline.frames import ImageFrame, Frame diff --git a/examples/foundational/07-interruptible.py b/examples/foundational/07-interruptible.py index f0df4d73f..3bdce6c01 100644 --- a/examples/foundational/07-interruptible.py +++ b/examples/foundational/07-interruptible.py @@ -3,9 +3,7 @@ import aiohttp import logging import os from dailyai.pipeline.aggregators import ( - LLMAssistantContextAggregator, LLMResponseAggregator, - LLMUserContextAggregator, UserResponseAggregator, ) diff --git a/examples/foundational/11-sound-effects.py b/examples/foundational/11-sound-effects.py index 50f98c610..f5047ee14 100644 --- a/examples/foundational/11-sound-effects.py +++ b/examples/foundational/11-sound-effects.py @@ -8,7 +8,6 @@ from dailyai.services.daily_transport_service import DailyTransportService from dailyai.services.open_ai_services import OpenAILLMService from dailyai.services.elevenlabs_ai_service import ElevenLabsTTSService from dailyai.pipeline.aggregators import ( - LLMContextAggregator, LLMUserContextAggregator, LLMAssistantContextAggregator, ) diff --git a/examples/foundational/13a-whisper-local.py b/examples/foundational/13a-whisper-local.py index d86c7483c..cbe751766 100644 --- a/examples/foundational/13a-whisper-local.py +++ b/examples/foundational/13a-whisper-local.py @@ -1,7 +1,6 @@ import argparse import asyncio import logging -import wave from dailyai.pipeline.frames import EndFrame, TranscriptionQueueFrame from dailyai.services.local_transport_service import LocalTransportService diff --git a/examples/server/daily-bot-manager.py b/examples/server/daily-bot-manager.py index 5c2f6f60f..5ad7f72cd 100644 --- a/examples/server/daily-bot-manager.py +++ b/examples/server/daily-bot-manager.py @@ -3,7 +3,7 @@ import requests import subprocess import time -from flask import Flask, jsonify, request, redirect +from flask import Flask, jsonify, redirect from flask_cors import CORS from auth import get_meeting_token diff --git a/examples/starter-apps/patient-intake.py b/examples/starter-apps/patient-intake.py index 49cb09765..1e2fa3c86 100644 --- a/examples/starter-apps/patient-intake.py +++ b/examples/starter-apps/patient-intake.py @@ -2,13 +2,11 @@ import copy import aiohttp import asyncio import json -import random import logging import os import re import wave from typing import AsyncGenerator, List -from PIL import Image from dailyai.pipeline.opeanai_llm_aggregator import ( OpenAIAssistantContextAggregator, OpenAIUserContextAggregator, @@ -18,11 +16,10 @@ from dailyai.pipeline.pipeline import Pipeline from dailyai.services.daily_transport_service import DailyTransportService from dailyai.services.openai_llm_context import OpenAILLMContext from dailyai.services.open_ai_services import OpenAILLMService -from dailyai.services.deepgram_ai_services import DeepgramTTSService +# from dailyai.services.deepgram_ai_services import DeepgramTTSService from dailyai.services.elevenlabs_ai_service import ElevenLabsTTSService from dailyai.pipeline.frames import ( OpenAILLMContextFrame, - TranscriptionQueueFrame, Frame, LLMFunctionCallFrame, LLMFunctionStartFrame, diff --git a/examples/starter-apps/storybot.py b/examples/starter-apps/storybot.py index 681ece607..770730d0a 100644 --- a/examples/starter-apps/storybot.py +++ b/examples/starter-apps/storybot.py @@ -19,24 +19,16 @@ from dailyai.services.deepgram_ai_services import DeepgramTTSService from dailyai.services.elevenlabs_ai_service import ElevenLabsTTSService from dailyai.pipeline.aggregators import ( LLMAssistantContextAggregator, - LLMContextAggregator, - LLMUserContextAggregator, - ParallelPipeline, UserResponseAggregator, LLMResponseAggregator, ) from dailyai.pipeline.frames import ( EndPipeFrame, LLMMessagesQueueFrame, - TranscriptionQueueFrame, Frame, TextFrame, - LLMFunctionCallFrame, - LLMFunctionStartFrame, LLMResponseEndFrame, - StartFrame, AudioFrame, - SpriteFrame, ImageFrame, UserStoppedSpeakingFrame, ) diff --git a/examples/starter-apps/translator.py b/examples/starter-apps/translator.py index 7274b3209..ae1aafac0 100644 --- a/examples/starter-apps/translator.py +++ b/examples/starter-apps/translator.py @@ -2,22 +2,17 @@ import asyncio import aiohttp import logging import os -from PIL import Image from typing import AsyncGenerator from dailyai.pipeline.aggregators import ( - LLMResponseAggregator, - UserResponseAggregator, SentenceAggregator, ) from dailyai.pipeline.frames import Frame, LLMMessagesQueueFrame, TextFrame from dailyai.pipeline.frame_processor import FrameProcessor -from dailyai.services.ai_services import AIService, FrameLogger from dailyai.pipeline.pipeline import Pipeline from dailyai.services.daily_transport_service import DailyTransportService from dailyai.services.azure_ai_services import AzureTTSService from dailyai.services.open_ai_services import OpenAILLMService -from dailyai.services.elevenlabs_ai_service import ElevenLabsTTSService from runner import configure diff --git a/src/dailyai/pipeline/aggregators.py b/src/dailyai/pipeline/aggregators.py index f9bcaca13..d8d2c64ba 100644 --- a/src/dailyai/pipeline/aggregators.py +++ b/src/dailyai/pipeline/aggregators.py @@ -5,10 +5,8 @@ from dailyai.pipeline.frame_processor import FrameProcessor from dailyai.pipeline.frames import ( EndFrame, - AudioFrame, EndPipeFrame, Frame, - ImageFrame, LLMMessagesQueueFrame, LLMResponseEndFrame, LLMResponseStartFrame, @@ -20,9 +18,7 @@ from dailyai.pipeline.frames import ( from dailyai.pipeline.pipeline import Pipeline from dailyai.services.ai_services import AIService -from typing import AsyncGenerator, Callable, Coroutine, List - -from dailyai.services.openai_llm_context import OpenAILLMContext +from typing import AsyncGenerator, Coroutine, List class ResponseAggregator(FrameProcessor): @@ -349,6 +345,8 @@ class GatedAggregator(FrameProcessor): Yields gate-opening frame before any accumulated frames, then ensuing frames until and not including the gate-closed frame. + >>> from dailyai.pipeline.frames import ImageFrame + >>> async def print_frames(aggregator, frame): ... async for frame in aggregator.process_frame(frame): ... if isinstance(frame, TextFrame): diff --git a/src/dailyai/pipeline/opeanai_llm_aggregator.py b/src/dailyai/pipeline/opeanai_llm_aggregator.py index a9d95f0e3..ead258f68 100644 --- a/src/dailyai/pipeline/opeanai_llm_aggregator.py +++ b/src/dailyai/pipeline/opeanai_llm_aggregator.py @@ -1,4 +1,4 @@ -from typing import Any, AsyncGenerator, Callable +from typing import AsyncGenerator, Callable from dailyai.pipeline.frame_processor import FrameProcessor from dailyai.pipeline.frames import ( Frame, diff --git a/src/dailyai/services/ai_services.py b/src/dailyai/services/ai_services.py index 0afe8412f..5db115e9a 100644 --- a/src/dailyai/services/ai_services.py +++ b/src/dailyai/services/ai_services.py @@ -1,4 +1,3 @@ -import asyncio import io import logging import time @@ -10,11 +9,6 @@ from dailyai.pipeline.frames import ( EndFrame, EndPipeFrame, ImageFrame, - LLMMessagesQueueFrame, - LLMResponseEndFrame, - LLMResponseStartFrame, - LLMFunctionStartFrame, - LLMFunctionCallFrame, Frame, TextFrame, TranscriptionQueueFrame, diff --git a/src/dailyai/services/anthropic_llm_service.py b/src/dailyai/services/anthropic_llm_service.py index 9e8ce0db4..69e332a01 100644 --- a/src/dailyai/services/anthropic_llm_service.py +++ b/src/dailyai/services/anthropic_llm_service.py @@ -1,5 +1,3 @@ -import asyncio -import os from typing import AsyncGenerator from anthropic import AsyncAnthropic from dailyai.pipeline.frames import Frame, LLMMessagesQueueFrame, TextFrame diff --git a/src/dailyai/services/azure_ai_services.py b/src/dailyai/services/azure_ai_services.py index c677ffff5..b6ca1e4fd 100644 --- a/src/dailyai/services/azure_ai_services.py +++ b/src/dailyai/services/azure_ai_services.py @@ -1,16 +1,11 @@ import aiohttp import asyncio import io -import json -import time from openai import AsyncAzureOpenAI -import os -import requests - from collections.abc import AsyncGenerator -from dailyai.services.ai_services import LLMService, TTSService, ImageGenService +from dailyai.services.ai_services import TTSService, ImageGenService from PIL import Image # See .env.example for Azure configuration needed diff --git a/src/dailyai/services/deepgram_ai_service.py b/src/dailyai/services/deepgram_ai_service.py index a8c58e734..4b552927e 100644 --- a/src/dailyai/services/deepgram_ai_service.py +++ b/src/dailyai/services/deepgram_ai_service.py @@ -1,6 +1,4 @@ -import os import aiohttp -import requests from dailyai.services.ai_services import TTSService diff --git a/src/dailyai/services/deepgram_ai_services.py b/src/dailyai/services/deepgram_ai_services.py index f04dec01c..c6aaa55d1 100644 --- a/src/dailyai/services/deepgram_ai_services.py +++ b/src/dailyai/services/deepgram_ai_services.py @@ -1,9 +1,3 @@ -import aiohttp -import asyncio -import os - -import requests - from collections.abc import AsyncGenerator from dailyai.services.ai_services import TTSService diff --git a/src/dailyai/services/elevenlabs_ai_service.py b/src/dailyai/services/elevenlabs_ai_service.py index 3edaa71c5..c31d50bed 100644 --- a/src/dailyai/services/elevenlabs_ai_service.py +++ b/src/dailyai/services/elevenlabs_ai_service.py @@ -1,7 +1,4 @@ import aiohttp -import os -import requests -import time from typing import AsyncGenerator diff --git a/src/dailyai/services/local_transport_service.py b/src/dailyai/services/local_transport_service.py index f6ab43da7..2d334e7cd 100644 --- a/src/dailyai/services/local_transport_service.py +++ b/src/dailyai/services/local_transport_service.py @@ -1,5 +1,4 @@ import asyncio -import time import numpy as np import tkinter as tk import pyaudio diff --git a/src/dailyai/services/open_ai_services.py b/src/dailyai/services/open_ai_services.py index b2eb3872c..61963769a 100644 --- a/src/dailyai/services/open_ai_services.py +++ b/src/dailyai/services/open_ai_services.py @@ -1,13 +1,9 @@ import aiohttp from PIL import Image import io -import time from openai import AsyncOpenAI -import json -from collections.abc import AsyncGenerator - -from dailyai.services.ai_services import LLMService, ImageGenService +from dailyai.services.ai_services import ImageGenService from dailyai.services.openai_api_llm_service import BaseOpenAILLMService diff --git a/tests/test_ai_services.py b/tests/test_ai_services.py index bb185c3f2..0bc9231d8 100644 --- a/tests/test_ai_services.py +++ b/tests/test_ai_services.py @@ -1,6 +1,6 @@ import unittest -from typing import AsyncGenerator, Generator +from typing import AsyncGenerator from dailyai.services.ai_services import AIService from dailyai.pipeline.frames import EndFrame, Frame, TextFrame diff --git a/tests/test_daily_transport_service.py b/tests/test_daily_transport_service.py index 81bb11eee..fb748cc97 100644 --- a/tests/test_daily_transport_service.py +++ b/tests/test_daily_transport_service.py @@ -1,11 +1,5 @@ -import asyncio -import threading import unittest -from unittest.mock import MagicMock, patch - -from dailyai.pipeline.frames import AudioFrame, ImageFrame - class TestDailyTransport(unittest.IsolatedAsyncioTestCase):