diff --git a/src/chore/GenerationContext.py b/src/chore/GenerationContext.py index ae9c489..fbb7a98 100644 --- a/src/chore/GenerationContext.py +++ b/src/chore/GenerationContext.py @@ -2,10 +2,12 @@ import os import time from datetime import datetime +import gradio as gr import moviepy.editor as mp from .. import engines from ..models import Video, SessionLocal +from ..utils.prompting import get_prompt class GenerationContext: diff --git a/src/engines/AssetsEngine/BaseAssetsEngine.py b/src/engines/AssetsEngine/BaseAssetsEngine.py index 0e6e24d..1b69a9b 100644 --- a/src/engines/AssetsEngine/BaseAssetsEngine.py +++ b/src/engines/AssetsEngine/BaseAssetsEngine.py @@ -1,4 +1,7 @@ -from abc import abstractmethod +from abc import ABC, abstractmethod +from typing import TypedDict + +from moviepy.editor import ImageClip, VideoFileClip from ..BaseEngine import BaseEngine diff --git a/src/engines/AssetsEngine/DallEAssetsEngine.py b/src/engines/AssetsEngine/DallEAssetsEngine.py index 1c70102..14922c2 100644 --- a/src/engines/AssetsEngine/DallEAssetsEngine.py +++ b/src/engines/AssetsEngine/DallEAssetsEngine.py @@ -1,4 +1,7 @@ +import base64 +import io import os +import time from typing import Literal, TypedDict import gradio as gr diff --git a/src/engines/AssetsEngine/GoogleAssetsEngine.py b/src/engines/AssetsEngine/GoogleAssetsEngine.py index ed0d2ac..281b9a4 100644 --- a/src/engines/AssetsEngine/GoogleAssetsEngine.py +++ b/src/engines/AssetsEngine/GoogleAssetsEngine.py @@ -1,10 +1,13 @@ -import os +import base64 +import io import os import shutil -from typing import TypedDict +import time +from typing import Literal, TypedDict import gradio as gr import moviepy.editor as mp +import requests from google_images_search import GoogleImagesSearch from moviepy.video.fx.resize import resize diff --git a/src/engines/BackgroundEngine/BaseBackgroundEngine.py b/src/engines/BackgroundEngine/BaseBackgroundEngine.py index 6ef6a74..1639c73 100644 --- a/src/engines/BackgroundEngine/BaseBackgroundEngine.py +++ b/src/engines/BackgroundEngine/BaseBackgroundEngine.py @@ -1,4 +1,6 @@ -from abc import abstractmethod +from abc import ABC, abstractmethod + +from moviepy.editor import VideoClip from ..BaseEngine import BaseEngine diff --git a/src/engines/BackgroundEngine/VideoBackgroundEngine.py b/src/engines/BackgroundEngine/VideoBackgroundEngine.py index 089eabb..74ff072 100644 --- a/src/engines/BackgroundEngine/VideoBackgroundEngine.py +++ b/src/engines/BackgroundEngine/VideoBackgroundEngine.py @@ -6,6 +6,7 @@ import time import gradio as gr import moviepy.editor as mp from moviepy.video.fx.crop import crop +from moviepy.video.fx.resize import resize from . import BaseBackgroundEngine diff --git a/src/engines/BaseEngine.py b/src/engines/BaseEngine.py index b862d11..8c591a3 100644 --- a/src/engines/BaseEngine.py +++ b/src/engines/BaseEngine.py @@ -1,5 +1,6 @@ from abc import ABC, abstractmethod +import gradio as gr import moviepy.editor as mp from sqlalchemy.future import select diff --git a/src/engines/CaptioningEngine/BaseCaptioningEngine.py b/src/engines/CaptioningEngine/BaseCaptioningEngine.py index be80b92..7887628 100644 --- a/src/engines/CaptioningEngine/BaseCaptioningEngine.py +++ b/src/engines/CaptioningEngine/BaseCaptioningEngine.py @@ -1,4 +1,6 @@ -from abc import abstractmethod +from abc import ABC, abstractmethod + +from moviepy.editor import TextClip from ..BaseEngine import BaseEngine diff --git a/src/engines/CaptioningEngine/SimpleCaptioningEngine.py b/src/engines/CaptioningEngine/SimpleCaptioningEngine.py index 2d0cf65..3340eb7 100644 --- a/src/engines/CaptioningEngine/SimpleCaptioningEngine.py +++ b/src/engines/CaptioningEngine/SimpleCaptioningEngine.py @@ -1,4 +1,5 @@ import gradio as gr +from PIL import ImageFont from moviepy.editor import TextClip from . import BaseCaptioningEngine diff --git a/src/engines/LLMEngine/BaseLLMEngine.py b/src/engines/LLMEngine/BaseLLMEngine.py index 850cae5..8e6175e 100644 --- a/src/engines/LLMEngine/BaseLLMEngine.py +++ b/src/engines/LLMEngine/BaseLLMEngine.py @@ -1,4 +1,6 @@ -from abc import abstractmethod +from abc import ABC, abstractmethod + +import openai from ..BaseEngine import BaseEngine diff --git a/src/engines/LLMEngine/OpenaiLLMEngine.py b/src/engines/LLMEngine/OpenaiLLMEngine.py index 8751f9a..31bfd4f 100644 --- a/src/engines/LLMEngine/OpenaiLLMEngine.py +++ b/src/engines/LLMEngine/OpenaiLLMEngine.py @@ -1,3 +1,5 @@ +from abc import ABC, abstractmethod + import gradio as gr import openai import orjson diff --git a/src/engines/MetadataEngine/BaseMetadataEngine.py b/src/engines/MetadataEngine/BaseMetadataEngine.py index af3bdf8..5317909 100644 --- a/src/engines/MetadataEngine/BaseMetadataEngine.py +++ b/src/engines/MetadataEngine/BaseMetadataEngine.py @@ -1,4 +1,5 @@ from abc import abstractmethod +from typing import TypedDict from .. import BaseEngine diff --git a/src/engines/ScriptEngine/BaseScriptEngine.py b/src/engines/ScriptEngine/BaseScriptEngine.py index 2309156..cc44f47 100644 --- a/src/engines/ScriptEngine/BaseScriptEngine.py +++ b/src/engines/ScriptEngine/BaseScriptEngine.py @@ -1,4 +1,4 @@ -from abc import abstractmethod +from abc import ABC, abstractmethod from ..BaseEngine import BaseEngine diff --git a/src/engines/SettingsEngine/SettingsEngine.py b/src/engines/SettingsEngine/SettingsEngine.py index 9346209..2dcc771 100644 --- a/src/engines/SettingsEngine/SettingsEngine.py +++ b/src/engines/SettingsEngine/SettingsEngine.py @@ -1,3 +1,5 @@ +from abc import ABC, abstractmethod + import gradio as gr from ..BaseEngine import BaseEngine diff --git a/src/engines/TTSEngine/BaseTTSEngine.py b/src/engines/TTSEngine/BaseTTSEngine.py index 49fde68..dbb5c65 100644 --- a/src/engines/TTSEngine/BaseTTSEngine.py +++ b/src/engines/TTSEngine/BaseTTSEngine.py @@ -1,4 +1,4 @@ -from abc import abstractmethod +from abc import ABC, abstractmethod from typing import TypedDict import moviepy.editor as mp diff --git a/src/engines/TTSEngine/CoquiTTSEngine.py b/src/engines/TTSEngine/CoquiTTSEngine.py index 2914ddb..ca10dea 100644 --- a/src/engines/TTSEngine/CoquiTTSEngine.py +++ b/src/engines/TTSEngine/CoquiTTSEngine.py @@ -4,7 +4,8 @@ import gradio as gr import torch from TTS.api import TTS -from .BaseTTSEngine import BaseTTSEngine +from .BaseTTSEngine import BaseTTSEngine, Word +from ...utils.prompting import get_prompt class CoquiTTSEngine(BaseTTSEngine): diff --git a/src/engines/engines.json b/src/engines/engines.json index 7fed7be..6d08a1c 100644 --- a/src/engines/engines.json +++ b/src/engines/engines.json @@ -1,6 +1,6 @@ { - "TTSEngine": [ - "CoquiTTSEngine", - "ElevenLabsTTSEngine" - ] + "TTSEngine": [ + "CoquiTTSEngine", + "ElevenLabsTTSEngine" + ] } \ No newline at end of file diff --git a/src/models/DatabaseManager.py b/src/models/DatabaseManager.py index 85d205d..f02b099 100644 --- a/src/models/DatabaseManager.py +++ b/src/models/DatabaseManager.py @@ -1,5 +1,7 @@ +import os + from sqlalchemy import create_engine -from sqlalchemy.orm import sessionmaker +from sqlalchemy.orm import Session, sessionmaker from . import Base diff --git a/src/models/File.py b/src/models/File.py index 7fd7d45..50ff1e6 100644 --- a/src/models/File.py +++ b/src/models/File.py @@ -1,3 +1,5 @@ +from typing import Optional + from sqlalchemy import String, Column, JSON, Integer from sqlalchemy.ext.mutable import MutableDict diff --git a/src/models/Setting.py b/src/models/Setting.py index ba8bffd..5929f19 100644 --- a/src/models/Setting.py +++ b/src/models/Setting.py @@ -1,3 +1,5 @@ +from typing import Optional + from sqlalchemy import String, Column, JSON, Integer from sqlalchemy.ext.mutable import MutableDict diff --git a/src/models/Video.py b/src/models/Video.py index f4eedd1..771dc15 100644 --- a/src/models/Video.py +++ b/src/models/Video.py @@ -1,4 +1,5 @@ from datetime import datetime +from typing import Optional from sqlalchemy import String, Column, JSON, Integer, DateTime from sqlalchemy.ext.mutable import MutableList diff --git a/ui/__init__.py b/ui/__init__.py index 1ec2ce4..f8a2755 100644 --- a/ui/__init__.py +++ b/ui/__init__.py @@ -1,2 +1,2 @@ from .gradio_ui import GenerateUI -from .launcher import launch +from .launcher import launch \ No newline at end of file diff --git a/ui/gradio_ui.py b/ui/gradio_ui.py index b27e607..d6276fb 100644 --- a/ui/gradio_ui.py +++ b/ui/gradio_ui.py @@ -1,12 +1,10 @@ import os -import sys - import gradio as gr import orjson +import sys -from src.chore import GenerationContext from src.engines import ENGINES, BaseEngine - +from src.chore import GenerationContext class GenerateUI: def __init__(self): @@ -14,7 +12,6 @@ class GenerateUI: font-size: 5rem !important } """ - def get_presets(self): with open("local/presets.json", "r") as f: return orjson.loads(f.read()) @@ -56,7 +53,6 @@ class GenerateUI: def get_settings_interface(self) -> gr.Blocks: with gr.Blocks() as interface: reload_ui = gr.Button("Reload UI", variant="primary") - def reload(): self.ui.close() sys.exit("Reload") @@ -119,13 +115,12 @@ class GenerateUI: value=None ) preset_button = gr.Button("Load") - def load_preset(preset_name, *inputs) -> list[gr.update]: with open("local/presets.json", "r") as f: presets = orjson.loads(f.read()) returnable = [] if preset_name in presets.keys(): - # If the preset exists + # If the preset exists preset = presets[preset_name] for engine_type, engines in ENGINES.items(): engines = engines["classes"] @@ -133,8 +128,7 @@ class GenerateUI: for engine in engines: if engine.name in preset.get(engine_type, {}).keys(): values[0].append(engine.name) - values.extend( - gr.update(value=value) for value in preset[engine_type][engine.name]) + values.extend(gr.update(value=value) for value in preset[engine_type][engine.name]) else: values.extend(gr.update() for _ in range(engine.num_options)) returnable.extend(values) @@ -159,8 +153,7 @@ class GenerateUI: presets[preset_name] = new_preset f.write(orjson.dumps(presets)) return [gr.update(value=presets.keys()), *returnable] - preset_button.click(load_preset, inputs=[preset_dropdown, *inputs], - outputs=[preset_dropdown, *inputs]) + preset_button.click(load_preset, inputs=[preset_dropdown, *inputs], outputs=[preset_dropdown,*inputs]) output_gallery = gr.Markdown("aaa", render=False) button.click( self.run_generate_interface, @@ -204,8 +197,8 @@ class GenerateUI: options[engine_type].append( engine(options=args[: engine.num_options]) ) - args = args[engine.num_options:] + args = args[engine.num_options :] else: # we don't care about this, it's not the selected engine, we throw it away - args = args[engine.num_options:] - return options + args = args[engine.num_options :] + return options \ No newline at end of file