Merge pull request #361 from Capsize-Games/develop

Develop

src/airunner/aihandler/auto_pipeline.py

@@ -1,5 +1,5 @@
 from airunner.aihandler.logger import Logger as logger
-from airunner.aihandler.settings_manager import SettingsManager
+from airunner.data.managers import SettingsManager
 
 
 class AutoImport:

src/airunner/aihandler/engine.py

@@ -6,7 +6,7 @@
 from airunner.aihandler.llm import LLM
 from airunner.aihandler.logger import Logger as logger
 from airunner.aihandler.runner import SDRunner
-from airunner.aihandler.settings_manager import SettingsManager
+from airunner.data.managers import SettingsManager
 from airunner.aihandler.tts import TTS
 
 
@@ -104,9 +104,9 @@ def unload_llm(self):
         VRAM to keep the LLM loaded while
         using other models.
         """
-        do_unload_model = self.settings_manager.unload_unused_model
-        do_move_to_cpu = not do_unload_model and self.settings_manager.move_unused_model_to_cpu
-        dtype = self.settings_manager.llm_generator_setting.dtype
+        do_unload_model = self.settings_manager.settings.unload_unused_model
+        do_move_to_cpu = not do_unload_model and self.settings_manager.settings.move_unused_model_to_cpu
+        dtype = self.settings_manager.llm_generator_settings.dtype
         if dtype in ["2bit", "4bit", "8bit"]:
             do_unload_model = True
             do_move_to_cpu = False

src/airunner/aihandler/runner.py

@@ -28,7 +28,7 @@
 from airunner.aihandler.mixins.scheduler_mixin import SchedulerMixin
 from airunner.aihandler.mixins.txttovideo_mixin import TexttovideoMixin
 from airunner.aihandler.settings import LOG_LEVEL, AIRUNNER_ENVIRONMENT
-from airunner.aihandler.settings_manager import SettingsManager
+from airunner.data.managers import SettingsManager
 from airunner.prompt_builder.prompt_data import PromptData
 from airunner.scripts.realesrgan.main import RealESRGAN
 from airunner.aihandler.logger import Logger

src/airunner/aihandler/transformer_runner.py

@@ -10,9 +10,9 @@
 from transformers import InstructBlipForConditionalGeneration
 from transformers import InstructBlipProcessor
 
-from airunner.aihandler.settings_manager import SettingsManager
+from airunner.data.managers import SettingsManager
 from airunner.data.models import LLMGenerator
-from airunner.utils import get_session
+from airunner.data.session_scope import session_scope
 from airunner.aihandler.logger import Logger
 
 
@@ -66,10 +66,10 @@ class TransformerRunner(QObject):
     @property
     def generator(self):
         try:
-            session = get_session()
             if not self._generator or self.current_generator_name != self.requested_generator_name:
                 self.current_generator_name = self.requested_generator_name
-                self._generator = session.query(LLMGenerator).filter_by(name=self.current_generator_name).first()
+                with session_scope() as session:
+                    self._generator = session.query(LLMGenerator).filter_by(name=self.current_generator_name).first()
             return self._generator
         except Exception as e:
             Logger.error(e)