diff --git a/Dockerfile b/Dockerfile index 133dda0..9ef8c1a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ FROM python:3.11-slim-bullseye AS python ENV PYTHONUNBUFFERED 1 WORKDIR /app -COPY app app +COPY logos logos COPY pyproject.toml pyproject.toml COPY README.md README.md COPY requirements.lock requirements.txt @@ -13,4 +13,4 @@ RUN apt-get update \ && apt-get install -y git ffmpeg wget \ && pip install -r requirements.txt -ENTRYPOINT ["uvicorn", "app.server:app", "--host", "0.0.0.0"] +ENTRYPOINT ["uvicorn", "logos.server:app", "--host", "0.0.0.0"] diff --git a/README.md b/README.md index e239fb5..d82f3f0 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ rye run pre-commit install Run - `rye run uvicorn app.server:app --reload` + `rye run uvicorn logos.server:app --reload` Send a command to the server diff --git a/app/__init__.py b/logos/__init__.py similarity index 100% rename from app/__init__.py rename to logos/__init__.py diff --git a/app/animations/__init__.py b/logos/animations/__init__.py similarity index 100% rename from app/animations/__init__.py rename to logos/animations/__init__.py diff --git a/app/animations/animation.py b/logos/animations/animation.py similarity index 100% rename from app/animations/animation.py rename to logos/animations/animation.py diff --git a/app/animations/comic.py b/logos/animations/comic.py similarity index 100% rename from app/animations/comic.py rename to logos/animations/comic.py diff --git a/app/animations/dialogue.py b/logos/animations/dialogue.py similarity index 100% rename from app/animations/dialogue.py rename to logos/animations/dialogue.py diff --git a/app/animations/little_martians.py b/logos/animations/little_martians.py similarity index 100% rename from app/animations/little_martians.py rename to logos/animations/little_martians.py diff --git a/app/animations/monologue.py b/logos/animations/monologue.py similarity index 100% rename from app/animations/monologue.py rename to logos/animations/monologue.py diff --git a/app/animations/reel.py b/logos/animations/reel.py similarity index 100% rename from app/animations/reel.py rename to logos/animations/reel.py diff --git a/app/animations/story.py b/logos/animations/story.py similarity index 100% rename from app/animations/story.py rename to logos/animations/story.py diff --git a/app/character.py b/logos/character.py similarity index 100% rename from app/character.py rename to logos/character.py diff --git a/app/creation_interfaces/__init__.py b/logos/creation_interfaces/__init__.py similarity index 100% rename from app/creation_interfaces/__init__.py rename to logos/creation_interfaces/__init__.py diff --git a/app/creation_interfaces/kojii_chebel.py b/logos/creation_interfaces/kojii_chebel.py similarity index 100% rename from app/creation_interfaces/kojii_chebel.py rename to logos/creation_interfaces/kojii_chebel.py diff --git a/app/creation_interfaces/kojii_huemin.py b/logos/creation_interfaces/kojii_huemin.py similarity index 100% rename from app/creation_interfaces/kojii_huemin.py rename to logos/creation_interfaces/kojii_huemin.py diff --git a/app/creation_interfaces/kojii_makeitrad.py b/logos/creation_interfaces/kojii_makeitrad.py similarity index 100% rename from app/creation_interfaces/kojii_makeitrad.py rename to logos/creation_interfaces/kojii_makeitrad.py diff --git a/app/creation_interfaces/kojii_untitledxyz.py b/logos/creation_interfaces/kojii_untitledxyz.py similarity index 100% rename from app/creation_interfaces/kojii_untitledxyz.py rename to logos/creation_interfaces/kojii_untitledxyz.py diff --git a/app/creation_interfaces/kojii_violetforest.py b/logos/creation_interfaces/kojii_violetforest.py similarity index 100% rename from app/creation_interfaces/kojii_violetforest.py rename to logos/creation_interfaces/kojii_violetforest.py diff --git a/app/fonts/Arial.ttf b/logos/fonts/Arial.ttf similarity index 100% rename from app/fonts/Arial.ttf rename to logos/fonts/Arial.ttf diff --git a/app/fonts/Raleway-Light.ttf b/logos/fonts/Raleway-Light.ttf similarity index 100% rename from app/fonts/Raleway-Light.ttf rename to logos/fonts/Raleway-Light.ttf diff --git a/app/fonts/Roboto-Regular.ttf b/logos/fonts/Roboto-Regular.ttf similarity index 100% rename from app/fonts/Roboto-Regular.ttf rename to logos/fonts/Roboto-Regular.ttf diff --git a/app/generator.py b/logos/generator.py similarity index 100% rename from app/generator.py rename to logos/generator.py diff --git a/app/livecoder.py b/logos/livecoder.py similarity index 100% rename from app/livecoder.py rename to logos/livecoder.py diff --git a/app/llm/__init__.py b/logos/llm/__init__.py similarity index 100% rename from app/llm/__init__.py rename to logos/llm/__init__.py diff --git a/app/llm/llm.py b/logos/llm/llm.py similarity index 100% rename from app/llm/llm.py rename to logos/llm/llm.py diff --git a/app/llm/session.py b/logos/llm/session.py similarity index 100% rename from app/llm/session.py rename to logos/llm/session.py diff --git a/app/models/__init__.py b/logos/models/__init__.py similarity index 100% rename from app/models/__init__.py rename to logos/models/__init__.py diff --git a/app/models/characters.py b/logos/models/characters.py similarity index 100% rename from app/models/characters.py rename to logos/models/characters.py diff --git a/app/models/creator.py b/logos/models/creator.py similarity index 100% rename from app/models/creator.py rename to logos/models/creator.py diff --git a/app/models/little_martians.py b/logos/models/little_martians.py similarity index 100% rename from app/models/little_martians.py rename to logos/models/little_martians.py diff --git a/app/models/livecode.py b/logos/models/livecode.py similarity index 100% rename from app/models/livecode.py rename to logos/models/livecode.py diff --git a/app/models/scenarios.py b/logos/models/scenarios.py similarity index 100% rename from app/models/scenarios.py rename to logos/models/scenarios.py diff --git a/app/models/tasks.py b/logos/models/tasks.py similarity index 100% rename from app/models/tasks.py rename to logos/models/tasks.py diff --git a/app/mongo.py b/logos/mongo.py similarity index 100% rename from app/mongo.py rename to logos/mongo.py diff --git a/app/plugins/eden.py b/logos/plugins/eden.py similarity index 100% rename from app/plugins/eden.py rename to logos/plugins/eden.py diff --git a/app/plugins/elevenlabs.py b/logos/plugins/elevenlabs.py similarity index 100% rename from app/plugins/elevenlabs.py rename to logos/plugins/elevenlabs.py diff --git a/app/plugins/replicate.py b/logos/plugins/replicate.py similarity index 100% rename from app/plugins/replicate.py rename to logos/plugins/replicate.py diff --git a/app/plugins/s3.py b/logos/plugins/s3.py similarity index 100% rename from app/plugins/s3.py rename to logos/plugins/s3.py diff --git a/app/prompt_templates/__init__.py b/logos/prompt_templates/__init__.py similarity index 100% rename from app/prompt_templates/__init__.py rename to logos/prompt_templates/__init__.py diff --git a/app/prompt_templates/assistant/__init__.py b/logos/prompt_templates/assistant/__init__.py similarity index 100% rename from app/prompt_templates/assistant/__init__.py rename to logos/prompt_templates/assistant/__init__.py diff --git a/app/prompt_templates/assistant/chat.txt b/logos/prompt_templates/assistant/chat.txt similarity index 100% rename from app/prompt_templates/assistant/chat.txt rename to logos/prompt_templates/assistant/chat.txt diff --git a/app/prompt_templates/assistant/creator.txt b/logos/prompt_templates/assistant/creator.txt similarity index 100% rename from app/prompt_templates/assistant/creator.txt rename to logos/prompt_templates/assistant/creator.txt diff --git a/app/prompt_templates/assistant/identity.txt b/logos/prompt_templates/assistant/identity.txt similarity index 100% rename from app/prompt_templates/assistant/identity.txt rename to logos/prompt_templates/assistant/identity.txt diff --git a/app/prompt_templates/assistant/livecoder_prompt.txt b/logos/prompt_templates/assistant/livecoder_prompt.txt similarity index 100% rename from app/prompt_templates/assistant/livecoder_prompt.txt rename to logos/prompt_templates/assistant/livecoder_prompt.txt diff --git a/app/prompt_templates/assistant/livecoder_system.txt b/logos/prompt_templates/assistant/livecoder_system.txt similarity index 100% rename from app/prompt_templates/assistant/livecoder_system.txt rename to logos/prompt_templates/assistant/livecoder_system.txt diff --git a/app/prompt_templates/assistant/qa.txt b/logos/prompt_templates/assistant/qa.txt similarity index 100% rename from app/prompt_templates/assistant/qa.txt rename to logos/prompt_templates/assistant/qa.txt diff --git a/app/prompt_templates/assistant/reply.txt b/logos/prompt_templates/assistant/reply.txt similarity index 100% rename from app/prompt_templates/assistant/reply.txt rename to logos/prompt_templates/assistant/reply.txt diff --git a/app/prompt_templates/assistant/router.txt b/logos/prompt_templates/assistant/router.txt similarity index 100% rename from app/prompt_templates/assistant/router.txt rename to logos/prompt_templates/assistant/router.txt diff --git a/app/prompt_templates/assistant/story_context_prompt.txt b/logos/prompt_templates/assistant/story_context_prompt.txt similarity index 100% rename from app/prompt_templates/assistant/story_context_prompt.txt rename to logos/prompt_templates/assistant/story_context_prompt.txt diff --git a/app/prompt_templates/assistant/story_context_system.txt b/logos/prompt_templates/assistant/story_context_system.txt similarity index 100% rename from app/prompt_templates/assistant/story_context_system.txt rename to logos/prompt_templates/assistant/story_context_system.txt diff --git a/app/prompt_templates/assistant/story_editor_prompt.txt b/logos/prompt_templates/assistant/story_editor_prompt.txt similarity index 100% rename from app/prompt_templates/assistant/story_editor_prompt.txt rename to logos/prompt_templates/assistant/story_editor_prompt.txt diff --git a/app/prompt_templates/assistant/story_editor_system.txt b/logos/prompt_templates/assistant/story_editor_system.txt similarity index 100% rename from app/prompt_templates/assistant/story_editor_system.txt rename to logos/prompt_templates/assistant/story_editor_system.txt diff --git a/app/prompt_templates/cinema/__init__.py b/logos/prompt_templates/cinema/__init__.py similarity index 100% rename from app/prompt_templates/cinema/__init__.py rename to logos/prompt_templates/cinema/__init__.py diff --git a/app/prompt_templates/cinema/cinematographer.txt b/logos/prompt_templates/cinema/cinematographer.txt similarity index 100% rename from app/prompt_templates/cinema/cinematographer.txt rename to logos/prompt_templates/cinema/cinematographer.txt diff --git a/app/prompt_templates/cinema/director.txt b/logos/prompt_templates/cinema/director.txt similarity index 100% rename from app/prompt_templates/cinema/director.txt rename to logos/prompt_templates/cinema/director.txt diff --git a/app/prompt_templates/cinema/reelwriter_prompt.txt b/logos/prompt_templates/cinema/reelwriter_prompt.txt similarity index 100% rename from app/prompt_templates/cinema/reelwriter_prompt.txt rename to logos/prompt_templates/cinema/reelwriter_prompt.txt diff --git a/app/prompt_templates/cinema/reelwriter_system.txt b/logos/prompt_templates/cinema/reelwriter_system.txt similarity index 100% rename from app/prompt_templates/cinema/reelwriter_system.txt rename to logos/prompt_templates/cinema/reelwriter_system.txt diff --git a/app/prompt_templates/cinema/screenwriter_prompt.txt b/logos/prompt_templates/cinema/screenwriter_prompt.txt similarity index 100% rename from app/prompt_templates/cinema/screenwriter_prompt.txt rename to logos/prompt_templates/cinema/screenwriter_prompt.txt diff --git a/app/prompt_templates/cinema/screenwriter_system.txt b/logos/prompt_templates/cinema/screenwriter_system.txt similarity index 100% rename from app/prompt_templates/cinema/screenwriter_system.txt rename to logos/prompt_templates/cinema/screenwriter_system.txt diff --git a/app/prompt_templates/comic/__init__.py b/logos/prompt_templates/comic/__init__.py similarity index 100% rename from app/prompt_templates/comic/__init__.py rename to logos/prompt_templates/comic/__init__.py diff --git a/app/prompt_templates/comic/comicwriter_system.txt b/logos/prompt_templates/comic/comicwriter_system.txt similarity index 100% rename from app/prompt_templates/comic/comicwriter_system.txt rename to logos/prompt_templates/comic/comicwriter_system.txt diff --git a/app/prompt_templates/dialogue.txt b/logos/prompt_templates/dialogue.txt similarity index 100% rename from app/prompt_templates/dialogue.txt rename to logos/prompt_templates/dialogue.txt diff --git a/app/prompt_templates/identity.txt b/logos/prompt_templates/identity.txt similarity index 100% rename from app/prompt_templates/identity.txt rename to logos/prompt_templates/identity.txt diff --git a/app/prompt_templates/little_martians/__init__.py b/logos/prompt_templates/little_martians/__init__.py similarity index 100% rename from app/prompt_templates/little_martians/__init__.py rename to logos/prompt_templates/little_martians/__init__.py diff --git a/app/prompt_templates/little_martians/littlemartians_data.json b/logos/prompt_templates/little_martians/littlemartians_data.json similarity index 100% rename from app/prompt_templates/little_martians/littlemartians_data.json rename to logos/prompt_templates/little_martians/littlemartians_data.json diff --git a/app/prompt_templates/little_martians/littlemartians_poster_prompt.txt b/logos/prompt_templates/little_martians/littlemartians_poster_prompt.txt similarity index 100% rename from app/prompt_templates/little_martians/littlemartians_poster_prompt.txt rename to logos/prompt_templates/little_martians/littlemartians_poster_prompt.txt diff --git a/app/prompt_templates/little_martians/littlemartians_poster_system.txt b/logos/prompt_templates/little_martians/littlemartians_poster_system.txt similarity index 100% rename from app/prompt_templates/little_martians/littlemartians_poster_system.txt rename to logos/prompt_templates/little_martians/littlemartians_poster_system.txt diff --git a/app/prompt_templates/moderation.txt b/logos/prompt_templates/moderation.txt similarity index 100% rename from app/prompt_templates/moderation.txt rename to logos/prompt_templates/moderation.txt diff --git a/app/prompt_templates/monologue.txt b/logos/prompt_templates/monologue.txt similarity index 100% rename from app/prompt_templates/monologue.txt rename to logos/prompt_templates/monologue.txt diff --git a/app/prompt_templates/summary.txt b/logos/prompt_templates/summary.txt similarity index 100% rename from app/prompt_templates/summary.txt rename to logos/prompt_templates/summary.txt diff --git a/app/scenarios/__init__.py b/logos/scenarios/__init__.py similarity index 100% rename from app/scenarios/__init__.py rename to logos/scenarios/__init__.py diff --git a/app/scenarios/chat.py b/logos/scenarios/chat.py similarity index 100% rename from app/scenarios/chat.py rename to logos/scenarios/chat.py diff --git a/app/scenarios/dialogue.py b/logos/scenarios/dialogue.py similarity index 100% rename from app/scenarios/dialogue.py rename to logos/scenarios/dialogue.py diff --git a/app/scenarios/livecode.py b/logos/scenarios/livecode.py similarity index 100% rename from app/scenarios/livecode.py rename to logos/scenarios/livecode.py diff --git a/app/scenarios/monologue.py b/logos/scenarios/monologue.py similarity index 100% rename from app/scenarios/monologue.py rename to logos/scenarios/monologue.py diff --git a/app/scenarios/reel.py b/logos/scenarios/reel.py similarity index 100% rename from app/scenarios/reel.py rename to logos/scenarios/reel.py diff --git a/app/scenarios/story.py b/logos/scenarios/story.py similarity index 100% rename from app/scenarios/story.py rename to logos/scenarios/story.py diff --git a/app/scenarios/tasks.py b/logos/scenarios/tasks.py similarity index 100% rename from app/scenarios/tasks.py rename to logos/scenarios/tasks.py diff --git a/app/server.py b/logos/server.py similarity index 100% rename from app/server.py rename to logos/server.py diff --git a/app/utils.py b/logos/utils.py similarity index 100% rename from app/utils.py rename to logos/utils.py diff --git a/pyproject.toml b/pyproject.toml index 1eb510a..02cad58 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -46,4 +46,4 @@ dev-dependencies = [ allow-direct-references = true [tool.hatch.build.targets.wheel] -packages = ["app"] +packages = ["logos"] diff --git a/scripts/moderation.py b/scripts/moderation.py index 31acdc9..6b4eda2 100644 --- a/scripts/moderation.py +++ b/scripts/moderation.py @@ -10,7 +10,7 @@ from dotenv import load_dotenv from fastapi.testclient import TestClient -from app.server import app +from logos.server import app client = TestClient(app) diff --git a/tests/test.py b/tests/test.py index c346ec5..4ff4772 100644 --- a/tests/test.py +++ b/tests/test.py @@ -4,13 +4,13 @@ from pydantic import BaseModel, Field from fastapi.testclient import TestClient -from app.server import app -from app import mongo -from app.character import EdenCharacter -from app.models.tasks import SimpleAssistantRequest -from app.scenarios.tasks import general_assistant -from app.utils import create_dynamic_model -from app.plugins import elevenlabs +from logos.server import app +from logos import mongo +from logos.character import EdenCharacter +from logos.models.tasks import SimpleAssistantRequest +from logos.scenarios.tasks import general_assistant +from logos.utils import create_dynamic_model +from logos.plugins import elevenlabs client = TestClient(app) diff --git a/tests/test_animation.py b/tests/test_animation.py index fe3b8d8..ea564c3 100644 --- a/tests/test_animation.py +++ b/tests/test_animation.py @@ -1,5 +1,5 @@ from fastapi.testclient import TestClient -from app.server import app +from logos.server import app client = TestClient(app) diff --git a/tests/test_chat.py b/tests/test_chat.py index aef25cf..5687f54 100644 --- a/tests/test_chat.py +++ b/tests/test_chat.py @@ -1,5 +1,5 @@ from fastapi.testclient import TestClient -from app.server import app +from logos.server import app client = TestClient(app) diff --git a/tests/test_comic.py b/tests/test_comic.py index 318e40b..9ee10db 100644 --- a/tests/test_comic.py +++ b/tests/test_comic.py @@ -1,5 +1,5 @@ from fastapi.testclient import TestClient -from app.server import app +from logos.server import app client = TestClient(app) diff --git a/tests/test_creation_interfaces.py b/tests/test_creation_interfaces.py index 63caedb..e0db52c 100644 --- a/tests/test_creation_interfaces.py +++ b/tests/test_creation_interfaces.py @@ -1,6 +1,6 @@ import random from fastapi.testclient import TestClient -from app.server import app +from logos.server import app client = TestClient(app) diff --git a/tests/test_generator.py b/tests/test_generator.py index e6f490d..80e1593 100644 --- a/tests/test_generator.py +++ b/tests/test_generator.py @@ -1,5 +1,5 @@ from fastapi.testclient import TestClient -from app.server import app +from logos.server import app client = TestClient(app) diff --git a/tests/test_littlemartians.py b/tests/test_littlemartians.py index 63b5522..85b6c25 100644 --- a/tests/test_littlemartians.py +++ b/tests/test_littlemartians.py @@ -1,6 +1,6 @@ import random from fastapi.testclient import TestClient -from app.server import app +from logos.server import app client = TestClient(app) diff --git a/tests/test_livecoder.py b/tests/test_livecoder.py index acb7311..553e501 100644 --- a/tests/test_livecoder.py +++ b/tests/test_livecoder.py @@ -1,5 +1,5 @@ from fastapi.testclient import TestClient -from app.server import app +from logos.server import app client = TestClient(app) diff --git a/tests/test_providers.py b/tests/test_providers.py index e06d177..d5c2b7b 100644 --- a/tests/test_providers.py +++ b/tests/test_providers.py @@ -1,4 +1,4 @@ -from app.plugins import replicate, elevenlabs, s3 +from logos.plugins import replicate, elevenlabs, s3 def test_elevenlabs(): diff --git a/tests/test_scenarios.py b/tests/test_scenarios.py index 15033e3..3c0c750 100644 --- a/tests/test_scenarios.py +++ b/tests/test_scenarios.py @@ -1,5 +1,5 @@ from fastapi.testclient import TestClient -from app.server import app +from logos.server import app client = TestClient(app) diff --git a/tests/test_server.py b/tests/test_server.py index 00a62c8..15e2f36 100644 --- a/tests/test_server.py +++ b/tests/test_server.py @@ -1,5 +1,5 @@ from fastapi.testclient import TestClient -from app.server import app +from logos.server import app client = TestClient(app) diff --git a/tests/test_stories.py b/tests/test_stories.py index 308fccb..dce795b 100644 --- a/tests/test_stories.py +++ b/tests/test_stories.py @@ -1,5 +1,5 @@ from fastapi.testclient import TestClient -from app.server import app +from logos.server import app client = TestClient(app) diff --git a/tests/test_tasks.py b/tests/test_tasks.py index d65cf6c..de7098e 100644 --- a/tests/test_tasks.py +++ b/tests/test_tasks.py @@ -1,5 +1,5 @@ from fastapi.testclient import TestClient -from app.server import app +from logos.server import app client = TestClient(app) @@ -8,7 +8,7 @@ def test_summary(): """ Test summarization of a document """ - from app.prompt_templates.assistant import creator_template + from logos.prompt_templates.assistant import creator_template text = creator_template.substitute(name="Eden", identity="")