From 58849f7a7e1f4dac4dc7b8e286a97533cf044587 Mon Sep 17 00:00:00 2001 From: w4ffl35 <25737761+w4ffl35@users.noreply.github.com> Date: Tue, 8 Oct 2024 19:18:00 -0600 Subject: [PATCH] move location of models folder to data folder --- src/airunner/alembic/env.py | 2 +- .../alembic/versions/72d9134823cb_initial_migration.py | 4 ++-- src/airunner/app.py | 2 +- src/airunner/{handlers => data}/models/__init__.py | 0 src/airunner/{handlers => data}/models/database_handler.py | 2 +- .../{handlers => data}/models/settings_db_handler.py | 4 ++-- src/airunner/{handlers => data}/models/settings_models.py | 0 src/airunner/handlers/stablediffusion/sd_handler.py | 4 ++-- src/airunner/utils/models/scan_path_for_items.py | 5 ++--- src/airunner/utils/os/create_airunner_directory.py | 2 +- src/airunner/utils/snap_to_grid.py | 2 +- src/airunner/widgets/canvas/brush_scene.py | 4 +--- .../widgets/controlnet/controlnet_settings_widget.py | 2 +- src/airunner/widgets/embeddings/embedding_widget.py | 2 +- src/airunner/widgets/generator_form/generator_form_widget.py | 3 +-- .../widgets/keyboard_shortcuts/keyboard_shortcuts_widget.py | 2 +- src/airunner/widgets/llm/bot_preferences.py | 4 ++-- src/airunner/widgets/llm/llm_history_widget.py | 2 +- src/airunner/widgets/lora/lora_widget.py | 2 +- src/airunner/widgets/model_manager/import_widget.py | 2 +- src/airunner/widgets/model_manager/model_manager_widget.py | 2 +- src/airunner/widgets/slider/slider_widget.py | 4 ++-- .../stablediffusion/stable_diffusion_settings_widget.py | 4 +--- src/airunner/windows/filter_window.py | 3 +-- src/airunner/windows/main/main_window.py | 2 +- src/airunner/windows/main/settings_mixin.py | 4 ++-- .../setup_wizard/installation_settings/install_page.py | 5 ++--- src/airunner/workers/model_scanner_worker.py | 3 +-- 28 files changed, 34 insertions(+), 43 deletions(-) rename src/airunner/{handlers => data}/models/__init__.py (100%) rename src/airunner/{handlers => data}/models/database_handler.py (91%) rename src/airunner/{handlers => data}/models/settings_db_handler.py (99%) rename src/airunner/{handlers => data}/models/settings_models.py (100%) diff --git a/src/airunner/alembic/env.py b/src/airunner/alembic/env.py index 5da798305..54983309d 100644 --- a/src/airunner/alembic/env.py +++ b/src/airunner/alembic/env.py @@ -10,7 +10,7 @@ config.set_main_option("sqlalchemy.url", f"sqlite:///{db_path}") # Import your models here -from airunner.handlers.models.settings_models import ( +from airunner.data.models.settings_models import ( Conversation, Message, Summary, ApplicationSettings, ActiveGridSettings, ControlnetSettings, ImageToImageSettings, OutpaintSettings, DrawingPadSettings, MetadataSettings, diff --git a/src/airunner/alembic/versions/72d9134823cb_initial_migration.py b/src/airunner/alembic/versions/72d9134823cb_initial_migration.py index d284d65d4..cb2879a77 100644 --- a/src/airunner/alembic/versions/72d9134823cb_initial_migration.py +++ b/src/airunner/alembic/versions/72d9134823cb_initial_migration.py @@ -11,8 +11,8 @@ from alembic import op import sqlalchemy as sa -from airunner.handlers.models import settings_models -from airunner.handlers.models.settings_models import Base +from airunner.data.models import settings_models +from airunner.data.models.settings_models import Base from airunner.data.bootstrap.controlnet_bootstrap_data import controlnet_bootstrap_data from airunner.data.bootstrap.font_settings_bootstrap_data import font_settings_bootstrap_data from airunner.data.bootstrap.imagefilter_bootstrap_data import imagefilter_bootstrap_data diff --git a/src/airunner/app.py b/src/airunner/app.py index 3e0f21136..4381a5c83 100644 --- a/src/airunner/app.py +++ b/src/airunner/app.py @@ -29,7 +29,7 @@ from airunner.mediator_mixin import MediatorMixin from airunner.plugins.plugin_manager import PluginManager from airunner.windows.main.settings_mixin import SettingsMixin -from airunner.handlers.models.settings_models import ApplicationSettings, AIModels +from airunner.data.models.settings_models import ApplicationSettings, AIModels class App( diff --git a/src/airunner/handlers/models/__init__.py b/src/airunner/data/models/__init__.py similarity index 100% rename from src/airunner/handlers/models/__init__.py rename to src/airunner/data/models/__init__.py diff --git a/src/airunner/handlers/models/database_handler.py b/src/airunner/data/models/database_handler.py similarity index 91% rename from src/airunner/handlers/models/database_handler.py rename to src/airunner/data/models/database_handler.py index cf4d33789..519dd6304 100644 --- a/src/airunner/handlers/models/database_handler.py +++ b/src/airunner/data/models/database_handler.py @@ -1,7 +1,7 @@ import os from sqlalchemy import create_engine from sqlalchemy.orm import sessionmaker -from airunner.handlers.models.settings_models import Base +from airunner.data.models.settings_models import Base class DatabaseHandler: def __init__(self, db_path=os.path.expanduser( diff --git a/src/airunner/handlers/models/settings_db_handler.py b/src/airunner/data/models/settings_db_handler.py similarity index 99% rename from src/airunner/handlers/models/settings_db_handler.py rename to src/airunner/data/models/settings_db_handler.py index 4f030c912..8104d5a6a 100644 --- a/src/airunner/handlers/models/settings_db_handler.py +++ b/src/airunner/data/models/settings_db_handler.py @@ -3,8 +3,8 @@ from sqlalchemy.orm import joinedload -from airunner.handlers.models.database_handler import DatabaseHandler -from airunner.handlers.models.settings_models import Chatbot, AIModels, Schedulers, Lora, PathSettings, SavedPrompt, \ +from airunner.data.models.database_handler import DatabaseHandler +from airunner.data.models.settings_models import Chatbot, AIModels, Schedulers, Lora, PathSettings, SavedPrompt, \ Embedding, PromptTemplate, ControlnetModel, FontSetting, PipelineModel, ShortcutKeys, \ GeneratorSettings, WindowSettings, ApplicationSettings, ActiveGridSettings, ControlnetSettings, \ ImageToImageSettings, OutpaintSettings, DrawingPadSettings, MetadataSettings, \ diff --git a/src/airunner/handlers/models/settings_models.py b/src/airunner/data/models/settings_models.py similarity index 100% rename from src/airunner/handlers/models/settings_models.py rename to src/airunner/data/models/settings_models.py diff --git a/src/airunner/handlers/stablediffusion/sd_handler.py b/src/airunner/handlers/stablediffusion/sd_handler.py index de40786de..410e37709 100644 --- a/src/airunner/handlers/stablediffusion/sd_handler.py +++ b/src/airunner/handlers/stablediffusion/sd_handler.py @@ -23,10 +23,10 @@ StableDiffusionXLInpaintPipeline, StableDiffusionXLControlNetPipeline, StableDiffusionXLControlNetImg2ImgPipeline, \ StableDiffusionXLControlNetInpaintPipeline, ControlNetModel from diffusers.pipelines.stable_diffusion import StableDiffusionSafetyChecker -from transformers import CLIPFeatureExtractor, CLIPTokenizerFast +from transformers import CLIPFeatureExtractor from airunner.handlers.base_handler import BaseHandler -from airunner.handlers.models.settings_models import Schedulers, Lora, Embedding, ControlnetModel, AIModels, \ +from airunner.data.models.settings_models import Schedulers, Lora, Embedding, ControlnetModel, AIModels, \ GeneratorSettings from airunner.enums import ( SDMode, StableDiffusionVersion, GeneratorSection, ModelStatus, ModelType, SignalCode, HandlerState, diff --git a/src/airunner/utils/models/scan_path_for_items.py b/src/airunner/utils/models/scan_path_for_items.py index 01fc78e98..22a82f9fa 100644 --- a/src/airunner/utils/models/scan_path_for_items.py +++ b/src/airunner/utils/models/scan_path_for_items.py @@ -1,8 +1,7 @@ import os -from typing import List, Any -from airunner.handlers.models.settings_db_handler import SettingsDBHandler -from airunner.handlers.models.settings_models import Lora, Embedding +from airunner.data.models.settings_db_handler import SettingsDBHandler +from airunner.data.models.settings_models import Lora, Embedding def scan_path_for_lora(base_path) -> bool: lora_added = False diff --git a/src/airunner/utils/os/create_airunner_directory.py b/src/airunner/utils/os/create_airunner_directory.py index 88882df4e..65b354998 100644 --- a/src/airunner/utils/os/create_airunner_directory.py +++ b/src/airunner/utils/os/create_airunner_directory.py @@ -1,6 +1,6 @@ import os -from airunner.handlers.models.settings_models import PathSettings +from airunner.data.models.settings_models import PathSettings def create_airunner_paths(path_settings: PathSettings): diff --git a/src/airunner/utils/snap_to_grid.py b/src/airunner/utils/snap_to_grid.py index bdf58fb83..9d9db7bef 100644 --- a/src/airunner/utils/snap_to_grid.py +++ b/src/airunner/utils/snap_to_grid.py @@ -1,6 +1,6 @@ import math -from airunner.handlers.models.settings_models import GridSettings +from airunner.data.models.settings_models import GridSettings def snap_to_grid(settings: GridSettings, x: int, y: int, use_floor: bool = True): diff --git a/src/airunner/widgets/canvas/brush_scene.py b/src/airunner/widgets/canvas/brush_scene.py index 606568b04..e20fe686f 100644 --- a/src/airunner/widgets/canvas/brush_scene.py +++ b/src/airunner/widgets/canvas/brush_scene.py @@ -1,5 +1,3 @@ -from typing import Optional - import PIL from PIL import ImageQt from PIL.Image import Image @@ -9,7 +7,7 @@ from PySide6.QtGui import QColor from PySide6.QtWidgets import QGraphicsPixmapItem -from airunner.handlers.models.settings_models import DrawingPadSettings +from airunner.data.models.settings_models import DrawingPadSettings from airunner.enums import SignalCode, CanvasToolName from airunner.utils.convert_base64_to_image import convert_base64_to_image from airunner.utils.convert_image_to_base64 import convert_image_to_base64 diff --git a/src/airunner/widgets/controlnet/controlnet_settings_widget.py b/src/airunner/widgets/controlnet/controlnet_settings_widget.py index da7d20f01..9f7ac2fe2 100644 --- a/src/airunner/widgets/controlnet/controlnet_settings_widget.py +++ b/src/airunner/widgets/controlnet/controlnet_settings_widget.py @@ -1,4 +1,4 @@ -from airunner.handlers.models.settings_models import ControlnetModel +from airunner.data.models.settings_models import ControlnetModel from airunner.enums import SignalCode from airunner.widgets.base_widget import BaseWidget from airunner.widgets.controlnet.templates.controlnet_settings_widget_ui import Ui_controlnet_settings_widget diff --git a/src/airunner/widgets/embeddings/embedding_widget.py b/src/airunner/widgets/embeddings/embedding_widget.py index 57659cd56..8ba4a4ec9 100644 --- a/src/airunner/widgets/embeddings/embedding_widget.py +++ b/src/airunner/widgets/embeddings/embedding_widget.py @@ -1,6 +1,6 @@ from PySide6.QtCore import Slot -from airunner.handlers.models.settings_models import Embedding +from airunner.data.models.settings_models import Embedding from airunner.enums import SignalCode from airunner.widgets.base_widget import BaseWidget from airunner.widgets.embeddings.embedding_trigger_word_widget import EmbeddingTriggerWordWidget diff --git a/src/airunner/widgets/generator_form/generator_form_widget.py b/src/airunner/widgets/generator_form/generator_form_widget.py index b1e28b639..56e48aec4 100644 --- a/src/airunner/widgets/generator_form/generator_form_widget.py +++ b/src/airunner/widgets/generator_form/generator_form_widget.py @@ -1,12 +1,11 @@ import json import re import time -from PIL import Image from PySide6.QtCore import Signal, QRect, QThread, QObject, Slot from PySide6.QtWidgets import QApplication -from airunner.handlers.models.settings_models import ShortcutKeys +from airunner.data.models.settings_models import ShortcutKeys from airunner.enums import SignalCode, GeneratorSection, ImageCategory, ImagePreset, StableDiffusionVersion, \ ModelStatus, ModelType from airunner.mediator_mixin import MediatorMixin diff --git a/src/airunner/widgets/keyboard_shortcuts/keyboard_shortcuts_widget.py b/src/airunner/widgets/keyboard_shortcuts/keyboard_shortcuts_widget.py index f93ffcd84..e3d25ac03 100644 --- a/src/airunner/widgets/keyboard_shortcuts/keyboard_shortcuts_widget.py +++ b/src/airunner/widgets/keyboard_shortcuts/keyboard_shortcuts_widget.py @@ -2,7 +2,7 @@ from PySide6 import QtCore, QtGui from PySide6.QtWidgets import QSpacerItem, QSizePolicy, QWidget -from airunner.handlers.models.settings_models import ShortcutKeys +from airunner.data.models.settings_models import ShortcutKeys from airunner.enums import SignalCode from airunner.widgets.base_widget import BaseWidget from airunner.widgets.keyboard_shortcuts.templates.keyboard_shortcut_widget_ui import Ui_keyboard_shortcut_widget diff --git a/src/airunner/widgets/llm/bot_preferences.py b/src/airunner/widgets/llm/bot_preferences.py index 264f0a20f..7a4675eb5 100644 --- a/src/airunner/widgets/llm/bot_preferences.py +++ b/src/airunner/widgets/llm/bot_preferences.py @@ -1,7 +1,7 @@ from PySide6.QtCore import Slot -from PySide6.QtWidgets import QInputDialog, QMessageBox, QLabel, QPushButton, QHBoxLayout, QWidget +from PySide6.QtWidgets import QInputDialog, QMessageBox -from airunner.handlers.models.settings_models import TargetFiles, Chatbot +from airunner.data.models.settings_models import TargetFiles, Chatbot from airunner.enums import SignalCode from airunner.utils.open_file_path import open_file_path from airunner.utils.toggle_signals import toggle_signals diff --git a/src/airunner/widgets/llm/llm_history_widget.py b/src/airunner/widgets/llm/llm_history_widget.py index 9bb53ffb8..c3b0a4b31 100644 --- a/src/airunner/widgets/llm/llm_history_widget.py +++ b/src/airunner/widgets/llm/llm_history_widget.py @@ -2,7 +2,7 @@ from PySide6.QtWidgets import QVBoxLayout, QPushButton, QSpacerItem, QSizePolicy, QHBoxLayout, QWidget, QLabel -from airunner.handlers.models.settings_models import Message, LLMGeneratorSettings +from airunner.data.models.settings_models import Message, LLMGeneratorSettings from airunner.enums import SignalCode from airunner.widgets.base_widget import BaseWidget from airunner.widgets.llm.templates.llm_history_widget_ui import Ui_llm_history_widget diff --git a/src/airunner/widgets/lora/lora_widget.py b/src/airunner/widgets/lora/lora_widget.py index 53380953d..1965c1fb9 100644 --- a/src/airunner/widgets/lora/lora_widget.py +++ b/src/airunner/widgets/lora/lora_widget.py @@ -1,6 +1,6 @@ from PySide6.QtCore import QTimer, Slot -from airunner.handlers.models.settings_models import Lora +from airunner.data.models.settings_models import Lora from airunner.enums import SignalCode from airunner.widgets.base_widget import BaseWidget from airunner.widgets.lora.lora_trigger_word_widget import LoraTriggerWordWidget diff --git a/src/airunner/widgets/model_manager/import_widget.py b/src/airunner/widgets/model_manager/import_widget.py index 84f7e11cf..b2f1e6d80 100644 --- a/src/airunner/widgets/model_manager/import_widget.py +++ b/src/airunner/widgets/model_manager/import_widget.py @@ -1,7 +1,7 @@ import os from urllib.parse import urlparse -from airunner.handlers.models.settings_models import Lora, AIModels +from airunner.data.models.settings_models import Lora, AIModels from airunner.enums import SignalCode from airunner.widgets.base_widget import BaseWidget from airunner.widgets.model_manager.templates.import_ui import Ui_import_model_widget diff --git a/src/airunner/widgets/model_manager/model_manager_widget.py b/src/airunner/widgets/model_manager/model_manager_widget.py index cc77bf13c..57880fbeb 100644 --- a/src/airunner/widgets/model_manager/model_manager_widget.py +++ b/src/airunner/widgets/model_manager/model_manager_widget.py @@ -1,7 +1,7 @@ from PySide6.QtCore import Slot from PySide6.QtWidgets import QFileDialog -from airunner.handlers.models.settings_models import AIModels +from airunner.data.models.settings_models import AIModels from airunner.enums import SignalCode from airunner.widgets.model_manager.templates.model_manager_ui import Ui_model_manager from airunner.windows.base_window import BaseWindow diff --git a/src/airunner/widgets/slider/slider_widget.py b/src/airunner/widgets/slider/slider_widget.py index e08bd1f9b..c6e207da5 100644 --- a/src/airunner/widgets/slider/slider_widget.py +++ b/src/airunner/widgets/slider/slider_widget.py @@ -1,8 +1,8 @@ -from typing import Any, List +from typing import Any from PySide6.QtCore import Slot from PySide6.QtWidgets import QDoubleSpinBox -from airunner.handlers.models.settings_models import Lora +from airunner.data.models.settings_models import Lora from airunner.widgets.base_widget import BaseWidget from airunner.widgets.slider.templates.slider_ui import Ui_slider_widget diff --git a/src/airunner/widgets/stablediffusion/stable_diffusion_settings_widget.py b/src/airunner/widgets/stablediffusion/stable_diffusion_settings_widget.py index f89654345..300d19f8c 100644 --- a/src/airunner/widgets/stablediffusion/stable_diffusion_settings_widget.py +++ b/src/airunner/widgets/stablediffusion/stable_diffusion_settings_widget.py @@ -1,6 +1,4 @@ -from sqlalchemy import false - -from airunner.handlers.models.settings_models import AIModels, GeneratorSettings +from airunner.data.models.settings_models import AIModels, GeneratorSettings from airunner.enums import SignalCode, GeneratorSection, ImageGenerator from airunner.widgets.base_widget import BaseWidget from airunner.widgets.stablediffusion.templates.stable_diffusion_settings_ui import Ui_stable_diffusion_settings_widget diff --git a/src/airunner/windows/filter_window.py b/src/airunner/windows/filter_window.py index 361a811ed..cca995734 100644 --- a/src/airunner/windows/filter_window.py +++ b/src/airunner/windows/filter_window.py @@ -1,9 +1,8 @@ import importlib -from functools import partial from sqlalchemy.orm import joinedload -from airunner.handlers.models.settings_models import ImageFilter +from airunner.data.models.settings_models import ImageFilter from airunner.enums import SignalCode from airunner.widgets.slider.filter_slider_widget import FilterSliderWidget from airunner.windows.base_window import BaseWindow diff --git a/src/airunner/windows/main/main_window.py b/src/airunner/windows/main/main_window.py index 7fe880a44..e511c4ab4 100644 --- a/src/airunner/windows/main/main_window.py +++ b/src/airunner/windows/main/main_window.py @@ -24,7 +24,7 @@ from airunner.handlers.llm.agent.actions.bash_execute import bash_execute from airunner.handlers.llm.agent.actions.show_path import show_path from airunner.handlers.logger import Logger -from airunner.handlers.models.settings_models import ShortcutKeys, ImageFilter, DrawingPadSettings +from airunner.data.models.settings_models import ShortcutKeys, ImageFilter, DrawingPadSettings from airunner.app_installer import AppInstaller from airunner.settings import ( STATUS_ERROR_COLOR, diff --git a/src/airunner/windows/main/settings_mixin.py b/src/airunner/windows/main/settings_mixin.py index 0b3417eee..7f874c7a7 100644 --- a/src/airunner/windows/main/settings_mixin.py +++ b/src/airunner/windows/main/settings_mixin.py @@ -3,8 +3,8 @@ from sqlalchemy.orm import joinedload -from airunner.handlers.models.settings_db_handler import SettingsDBHandler -from airunner.handlers.models.settings_models import ApplicationSettings, LLMGeneratorSettings, GeneratorSettings, \ +from airunner.data.models.settings_db_handler import SettingsDBHandler +from airunner.data.models.settings_models import ApplicationSettings, LLMGeneratorSettings, GeneratorSettings, \ ControlnetSettings, BrushSettings, DrawingPadSettings, GridSettings, ActiveGridSettings, \ ImageToImageSettings, OutpaintSettings, PathSettings, MemorySettings, Chatbot, \ AIModels, Schedulers, Lora, ShortcutKeys, SavedPrompt, SpeechT5Settings, TTSSettings, EspeakSettings, \ diff --git a/src/airunner/windows/setup_wizard/installation_settings/install_page.py b/src/airunner/windows/setup_wizard/installation_settings/install_page.py index 98c7b24ad..3ce47066f 100644 --- a/src/airunner/windows/setup_wizard/installation_settings/install_page.py +++ b/src/airunner/windows/setup_wizard/installation_settings/install_page.py @@ -4,16 +4,15 @@ from PySide6.QtCore import QObject, QThread, Slot, Signal from sqlalchemy import func -from airunner.handlers.models.settings_models import AIModels, ControlnetModel +from airunner.data.models.settings_models import AIModels, ControlnetModel from airunner.data.bootstrap.controlnet_bootstrap_data import controlnet_bootstrap_data -from airunner.data.bootstrap.model_bootstrap_data import model_bootstrap_data from airunner.data.bootstrap.sd_file_bootstrap_data import SD_FILE_BOOTSTRAP_DATA from airunner.data.bootstrap.llm_file_bootstrap_data import LLM_FILE_BOOTSTRAP_DATA from airunner.data.bootstrap.whisper import WHISPER_FILES from airunner.data.bootstrap.speech_t5 import SPEECH_T5_FILES from airunner.enums import SignalCode from airunner.mediator_mixin import MediatorMixin -from airunner.settings import DEFAULT_LLM_HF_PATH, NLTK_DOWNLOAD_DIR +from airunner.settings import NLTK_DOWNLOAD_DIR from airunner.utils.network.huggingface_downloader import HuggingfaceDownloader from airunner.windows.main.settings_mixin import SettingsMixin from airunner.windows.setup_wizard.base_wizard import BaseWizard diff --git a/src/airunner/workers/model_scanner_worker.py b/src/airunner/workers/model_scanner_worker.py index 298f1325d..323e26a46 100644 --- a/src/airunner/workers/model_scanner_worker.py +++ b/src/airunner/workers/model_scanner_worker.py @@ -1,7 +1,6 @@ import os -from airunner.handlers.logger import Logger -from airunner.handlers.models.settings_models import AIModels +from airunner.data.models.settings_models import AIModels from airunner.enums import SignalCode from airunner.windows.main.pipeline_mixin import PipelineMixin from airunner.workers.worker import Worker