From 1ea503c1e61423446711cef10ecb21ac8774b3a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleix=20Conchillo=20Flaqu=C3=A9?= Date: Thu, 4 Apr 2024 15:35:58 -0700 Subject: [PATCH] examples: fix 03a-image-local --- .../{to_be_updated => }/03a-image-local.py | 26 ++++++++++--------- src/dailyai/services/fal_ai_services.py | 3 --- src/dailyai/transports/daily_transport.py | 1 - src/dailyai/transports/threaded_transport.py | 1 - 4 files changed, 14 insertions(+), 17 deletions(-) rename examples/foundational/{to_be_updated => }/03a-image-local.py (70%) diff --git a/examples/foundational/to_be_updated/03a-image-local.py b/examples/foundational/03a-image-local.py similarity index 70% rename from examples/foundational/to_be_updated/03a-image-local.py rename to examples/foundational/03a-image-local.py index eba208970..46f811471 100644 --- a/examples/foundational/to_be_updated/03a-image-local.py +++ b/examples/foundational/03a-image-local.py @@ -5,26 +5,29 @@ import os import tkinter as tk -from dailyai.pipeline.frames import TextFrame +from dailyai.pipeline.frames import TextFrame, EndFrame +from dailyai.pipeline.pipeline import Pipeline from dailyai.services.fal_ai_services import FalImageGenService from dailyai.transports.local_transport import LocalTransport +from dotenv import load_dotenv +load_dotenv(override=True) + logging.basicConfig(format=f"%(levelno)s %(asctime)s %(message)s") logger = logging.getLogger("dailyai") logger.setLevel(logging.DEBUG) -local_joined = False -participant_joined = False - async def main(): async with aiohttp.ClientSession() as session: meeting_duration_minutes = 2 + tk_root = tk.Tk() - tk_root.title("Calendar") + tk_root.title("dailyai") + transport = LocalTransport( tk_root=tk_root, - mic_enabled=True, + mic_enabled=False, camera_enabled=True, camera_width=1024, camera_height=1024, @@ -32,15 +35,14 @@ async def main(): ) imagegen = FalImageGenService( - image_size="1024x1024", + image_size="square_hd", aiohttp_session=session, key_id=os.getenv("FAL_KEY_ID"), key_secret=os.getenv("FAL_KEY_SECRET"), ) - image_task = asyncio.create_task( - imagegen.run_to_queue( - transport.send_queue, [ - TextFrame("a cat in the style of picasso")])) + + pipeline = Pipeline([imagegen]) + await pipeline.queue_frames([TextFrame("a cat in the style of picasso")]) async def run_tk(): while not transport._stop_threads.is_set(): @@ -48,7 +50,7 @@ async def main(): tk_root.update_idletasks() await asyncio.sleep(0.1) - await asyncio.gather(transport.run(), image_task, run_tk()) + await asyncio.gather(transport.run(pipeline, override_pipeline_source_queue=False), run_tk()) if __name__ == "__main__": diff --git a/src/dailyai/services/fal_ai_services.py b/src/dailyai/services/fal_ai_services.py index 9130b062b..1f97db598 100644 --- a/src/dailyai/services/fal_ai_services.py +++ b/src/dailyai/services/fal_ai_services.py @@ -4,9 +4,6 @@ import io import os from PIL import Image -from dailyai.services.ai_services import ImageGenService - - from dailyai.services.ai_services import ImageGenService try: diff --git a/src/dailyai/transports/daily_transport.py b/src/dailyai/transports/daily_transport.py index 254b35629..50a2af124 100644 --- a/src/dailyai/transports/daily_transport.py +++ b/src/dailyai/transports/daily_transport.py @@ -5,7 +5,6 @@ import signal import threading import types -from enum import Enum from functools import partial from typing import Any diff --git a/src/dailyai/transports/threaded_transport.py b/src/dailyai/transports/threaded_transport.py index 9b2530efd..361e56f40 100644 --- a/src/dailyai/transports/threaded_transport.py +++ b/src/dailyai/transports/threaded_transport.py @@ -182,7 +182,6 @@ class ThreadedTransport(AbstractTransport): pipeline.set_sink(self.send_queue) source_queue = asyncio.Queue() pipeline.set_source(source_queue) - pipeline.set_sink(self.send_queue) pipeline_task = asyncio.create_task(pipeline.run_pipeline()) async def yield_frame(frame: Frame) -> AsyncGenerator[Frame, None]: