diff --git a/src/daily-ai/storage/search.py b/src/daily-ai/storage/search.py deleted file mode 100644 index cb924b244..000000000 --- a/src/daily-ai/storage/search.py +++ /dev/null @@ -1,50 +0,0 @@ -import os -import random -import time - -""" -from algoliasearch.configs import SearchConfig -from algoliasearch.search_client import SearchClient -""" - -class SearchIndexer(): - def __init__(self, story_id): - pass - - def index_text(self, text): - pass - - def index_image(self, text): - pass -""" -class AlgoliaSearchIndexer(SearchIndexer): - def __init__(self, story_id): - self.index = None - self.story_id = story_id - - self.search_enabled = os.getenv('ALGOLIA_APP_ID') and os.getenv('ALGOLIA_API_KEY') - if self.search_enabled: - config = SearchConfig(os.getenv('ALGOLIA_APP_ID'), os.getenv('ALGOLIA_API_KEY')) - self.algolia = SearchClient.create_with_config(config) - self.index = self.algolia.init_index('daily-llm-conversations') - - def index_text(self, text): - if self.index: - res = self.index.save_object({ - "objectID": hex(random.getrandbits(128))[2:], - "storyID": self.story_id, - "type": "text", - "text": text, - "createdAt": int(time.time()) - }).wait() - - def index_image(self, url): - if self.index: - self.index.save_object({ - "objectID": hex(random.getrandbits(128))[2:], - "storyID": self.story_id, - "type": "image", - "image": url, - "createdAt": int(time.time()) - }).wait() -""" diff --git a/src/daily-ai/__init__.py b/src/dailyai/__init__.py similarity index 100% rename from src/daily-ai/__init__.py rename to src/dailyai/__init__.py diff --git a/src/dailyai/async_processor/__init__.py b/src/dailyai/async_processor/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/src/daily-ai/async_processor/async_processor.py b/src/dailyai/async_processor/async_processor.py similarity index 98% rename from src/daily-ai/async_processor/async_processor.py rename to src/dailyai/async_processor/async_processor.py index 64c0b2efb..fa8d9866d 100644 --- a/src/daily-ai/async_processor/async_processor.py +++ b/src/dailyai/async_processor/async_processor.py @@ -9,12 +9,11 @@ from threading import Event, Semaphore, Thread from typing import Iterator, Optional, Type, TypedDict from typing_extensions import Unpack -from services.ai_services import AIServiceConfig -from message_handler.message_handler import MessageHandler +from dailyai.services.ai_services import AIServiceConfig +from dailyai.message_handler.message_handler import MessageHandler frame_idx = 0 - class AsyncProcessorState: # Setting class variables, other synchronous activities INIT = 0 diff --git a/src/daily-ai/daily_ai.egg-info/PKG-INFO b/src/dailyai/daily_ai.egg-info/PKG-INFO similarity index 95% rename from src/daily-ai/daily_ai.egg-info/PKG-INFO rename to src/dailyai/daily_ai.egg-info/PKG-INFO index 3816610f7..85e24ed55 100644 --- a/src/daily-ai/daily_ai.egg-info/PKG-INFO +++ b/src/dailyai/daily_ai.egg-info/PKG-INFO @@ -1,5 +1,5 @@ Metadata-Version: 2.1 -Name: daily_ai +Name: dailyai Version: 0.0.1 Summary: Orchestrator for AI bots with Daily Requires-Dist: daily-python diff --git a/src/daily-ai/daily_ai.egg-info/SOURCES.txt b/src/dailyai/daily_ai.egg-info/SOURCES.txt similarity index 70% rename from src/daily-ai/daily_ai.egg-info/SOURCES.txt rename to src/dailyai/daily_ai.egg-info/SOURCES.txt index 96779c71c..63643e11c 100644 --- a/src/daily-ai/daily_ai.egg-info/SOURCES.txt +++ b/src/dailyai/daily_ai.egg-info/SOURCES.txt @@ -1,11 +1,11 @@ README.md pyproject.toml src/daily-ai/async_processor/async_processor.py -src/daily-ai/daily_ai.egg-info/PKG-INFO -src/daily-ai/daily_ai.egg-info/SOURCES.txt -src/daily-ai/daily_ai.egg-info/dependency_links.txt -src/daily-ai/daily_ai.egg-info/requires.txt -src/daily-ai/daily_ai.egg-info/top_level.txt +src/daily-ai/dailyai.egg-info/PKG-INFO +src/daily-ai/dailyai.egg-info/SOURCES.txt +src/daily-ai/dailyai.egg-info/dependency_links.txt +src/daily-ai/dailyai.egg-info/requires.txt +src/daily-ai/dailyai.egg-info/top_level.txt src/daily-ai/message_handler/message_handler.py src/daily-ai/services/ai_services.py src/daily-ai/services/azure_ai_services.py @@ -19,4 +19,4 @@ src/daily-ai/services/open_ai_service.py src/daily-ai/services/playht_ai_service.py src/daily-ai/storage/search.py src/daily-ai/tests/test_asyncprocessor.py -src/daily-ai/tests/test_message_handler.py \ No newline at end of file +src/daily-ai/tests/test_message_handler.py diff --git a/src/daily-ai/daily_ai.egg-info/dependency_links.txt b/src/dailyai/daily_ai.egg-info/dependency_links.txt similarity index 100% rename from src/daily-ai/daily_ai.egg-info/dependency_links.txt rename to src/dailyai/daily_ai.egg-info/dependency_links.txt diff --git a/src/daily-ai/daily_ai.egg-info/requires.txt b/src/dailyai/daily_ai.egg-info/requires.txt similarity index 100% rename from src/daily-ai/daily_ai.egg-info/requires.txt rename to src/dailyai/daily_ai.egg-info/requires.txt diff --git a/src/daily-ai/daily_ai.egg-info/top_level.txt b/src/dailyai/daily_ai.egg-info/top_level.txt similarity index 100% rename from src/daily-ai/daily_ai.egg-info/top_level.txt rename to src/dailyai/daily_ai.egg-info/top_level.txt diff --git a/src/dailyai/message_handler/__init__.py b/src/dailyai/message_handler/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/src/daily-ai/message_handler/message_handler.py b/src/dailyai/message_handler/message_handler.py similarity index 97% rename from src/daily-ai/message_handler/message_handler.py rename to src/dailyai/message_handler/message_handler.py index 232adf8bc..e6689bd16 100644 --- a/src/daily-ai/message_handler/message_handler.py +++ b/src/dailyai/message_handler/message_handler.py @@ -5,8 +5,8 @@ from dataclasses import dataclass from queue import Queue, Empty from threading import Thread -from storage.search import SearchIndexer -from services.ai_services import AIServiceConfig +from dailyai.storage.search import SearchIndexer +from dailyai.services.ai_services import AIServiceConfig @dataclass diff --git a/src/daily-ai/orchestrator.py b/src/dailyai/orchestrator.py similarity index 98% rename from src/daily-ai/orchestrator.py rename to src/dailyai/orchestrator.py index 84ece2667..45423526d 100644 --- a/src/daily-ai/orchestrator.py +++ b/src/dailyai/orchestrator.py @@ -6,14 +6,14 @@ import wave from dataclasses import dataclass from queue import Queue, Empty -from daily_ai.async_processor import ( +from dailyai.async_processor.async_processor import ( AsyncProcessor, AsyncProcessorState, ConversationProcessorCollection, Response, ) -from daily_ai.services.ai_services import AIServiceConfig -from daily_ai.message_handler import MessageHandler +from dailyai.services.ai_services import AIServiceConfig +from dailyai.message_handler.message_handler import MessageHandler from threading import Thread, Semaphore, Event, Timer diff --git a/src/daily-ai/requirements.txt b/src/dailyai/requirements.txt similarity index 100% rename from src/daily-ai/requirements.txt rename to src/dailyai/requirements.txt diff --git a/src/dailyai/services/__init__.py b/src/dailyai/services/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/src/daily-ai/services/ai_services.py b/src/dailyai/services/ai_services.py similarity index 100% rename from src/daily-ai/services/ai_services.py rename to src/dailyai/services/ai_services.py diff --git a/src/daily-ai/services/azure_ai_services.py b/src/dailyai/services/azure_ai_services.py similarity index 98% rename from src/daily-ai/services/azure_ai_services.py rename to src/dailyai/services/azure_ai_services.py index f0ab18fb1..2c9e7785a 100644 --- a/src/daily-ai/services/azure_ai_services.py +++ b/src/dailyai/services/azure_ai_services.py @@ -6,7 +6,7 @@ import requests from typing import Generator -from daily_ai.services.ai_services import LLMService, TTSService, ImageGenService +from dailyai.services.ai_services import LLMService, TTSService, ImageGenService from PIL import Image # See .env.example for Azure configuration needed diff --git a/src/daily-ai/services/cloudflare_ai_service.py b/src/dailyai/services/cloudflare_ai_service.py similarity index 100% rename from src/daily-ai/services/cloudflare_ai_service.py rename to src/dailyai/services/cloudflare_ai_service.py diff --git a/src/daily-ai/services/deepgram_ai_service.py b/src/dailyai/services/deepgram_ai_service.py similarity index 100% rename from src/daily-ai/services/deepgram_ai_service.py rename to src/dailyai/services/deepgram_ai_service.py diff --git a/src/daily-ai/services/elevenlabs_ai_service.py b/src/dailyai/services/elevenlabs_ai_service.py similarity index 95% rename from src/daily-ai/services/elevenlabs_ai_service.py rename to src/dailyai/services/elevenlabs_ai_service.py index 180927760..41e8754c9 100644 --- a/src/daily-ai/services/elevenlabs_ai_service.py +++ b/src/dailyai/services/elevenlabs_ai_service.py @@ -4,7 +4,7 @@ import time from typing import Generator -from daily_ai.services.ai_services import TTSService +from ..services.ai_services import TTSService class ElevenLabsTTSService(TTSService): diff --git a/src/daily-ai/services/google_ai_service.py b/src/dailyai/services/google_ai_service.py similarity index 100% rename from src/daily-ai/services/google_ai_service.py rename to src/dailyai/services/google_ai_service.py diff --git a/src/daily-ai/services/huggingface_ai_service.py b/src/dailyai/services/huggingface_ai_service.py similarity index 100% rename from src/daily-ai/services/huggingface_ai_service.py rename to src/dailyai/services/huggingface_ai_service.py diff --git a/src/daily-ai/services/mock_ai_service.py b/src/dailyai/services/mock_ai_service.py similarity index 100% rename from src/daily-ai/services/mock_ai_service.py rename to src/dailyai/services/mock_ai_service.py diff --git a/src/daily-ai/services/open_ai_service.py b/src/dailyai/services/open_ai_service.py similarity index 100% rename from src/daily-ai/services/open_ai_service.py rename to src/dailyai/services/open_ai_service.py diff --git a/src/daily-ai/services/playht_ai_service.py b/src/dailyai/services/playht_ai_service.py similarity index 100% rename from src/daily-ai/services/playht_ai_service.py rename to src/dailyai/services/playht_ai_service.py diff --git a/src/dailyai/storage/__init__.py b/src/dailyai/storage/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/src/dailyai/storage/search.py b/src/dailyai/storage/search.py new file mode 100644 index 000000000..5740d1cae --- /dev/null +++ b/src/dailyai/storage/search.py @@ -0,0 +1,9 @@ +class SearchIndexer(): + def __init__(self, story_id): + pass + + def index_text(self, text): + pass + + def index_image(self, text): + pass diff --git a/src/dailyai/tests/__init__.py b/src/dailyai/tests/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/src/daily-ai/tests/test_asyncprocessor.py b/src/dailyai/tests/test_asyncprocessor.py similarity index 96% rename from src/daily-ai/tests/test_asyncprocessor.py rename to src/dailyai/tests/test_asyncprocessor.py index 60d2206d9..5e4886ece 100644 --- a/src/daily-ai/tests/test_asyncprocessor.py +++ b/src/dailyai/tests/test_asyncprocessor.py @@ -5,13 +5,17 @@ from queue import Queue, Empty from threading import Thread, Event from typing import Generator -from services.ai_services import LLMService, TTSService, ImageGenService -from message_handler.message_handler import MessageHandler -from async_processor.async_processor import ( - AsyncProcessor, +from dailyai.services.ai_services import ( AIServiceConfig, + ImageGenService, + LLMService, + TTSService +) +from dailyai.message_handler.message_handler import MessageHandler +from dailyai.async_processor.async_processor import ( + AsyncProcessor, AsyncProcessorState, - Response + Response, ) class MockTTSService(TTSService): diff --git a/src/daily-ai/tests/test_message_handler.py b/src/dailyai/tests/test_message_handler.py similarity index 94% rename from src/daily-ai/tests/test_message_handler.py rename to src/dailyai/tests/test_message_handler.py index f4642bc5b..35633752a 100644 --- a/src/daily-ai/tests/test_message_handler.py +++ b/src/dailyai/tests/test_message_handler.py @@ -3,9 +3,14 @@ import unittest from unittest.mock import MagicMock, call -from message_handler.message_handler import MessageHandler, IndexingMessageHandler -from services.ai_services import AIService, AIServiceConfig, TTSService, LLMService, ImageGenService -from storage.search import SearchIndexer +from dailyai.message_handler.message_handler import MessageHandler, IndexingMessageHandler +from dailyai.services.ai_services import ( + AIServiceConfig, + TTSService, + LLMService, + ImageGenService, +) +from ..storage.search import SearchIndexer class TestMessageHandler(unittest.TestCase):