Final set of flake8 code cleanups

Author: zquestz

.flake8

@@ -0,0 +1,19 @@
+[flake8]
+max-line-length = 79
+ignore = E402
+exclude =
+    __pycache__,
+    *.pyc,
+    .git,
+    .tox,
+    .pytest_cache,
+    build,
+    dist,
+    *.egg-info
+
+# E402: module level import not at top of file
+# This is ignored because gi.require_version() calls must come before gi imports
+# which is a required pattern for GTK/GObject applications
+
+per-file-ignores =
+    models/factory.py:F401

api.py

@@ -19,7 +19,6 @@
 
 import integrator
 from i18n import _
-from models import BaseModel
 from models.factory import get_default_model, get_model_by_name
 
 PROGRESS_COMPLETE = 1.0
@@ -287,9 +286,9 @@ def _execute_api_call(self, model_input: dict) -> Union[object, str]:
 
         except ModelError as e:
             error_msg = _("Model error: {error}").format(error=str(e))
-            if (hasattr(e, 'prediction') and e.prediction and
-                hasattr(e.prediction, 'logs') and e.prediction.logs):
-                error_msg += f"\n{_('Logs')}: {e.prediction.logs}"
+            if hasattr(e, 'prediction') and e.prediction:
+                if hasattr(e.prediction, 'logs') and e.prediction.logs:
+                    error_msg += f"\n{_('Logs')}: {e.prediction.logs}"
             return error_msg
 
         except ReplicateError as e:

dialog.py

@@ -51,7 +51,8 @@ def get_api_key_visible(self):
 
     def get_current_mode(self):
         """Get the currently selected mode"""
-        if self.ui.generate_mode_radio and self.ui.generate_mode_radio.get_active():
+        generate_radio = self.ui.generate_mode_radio
+        if generate_radio and generate_radio.get_active():
             return "generate"
         return "edit"
 
@@ -60,7 +61,9 @@ def get_prompt(self):
         if self.ui.prompt_buffer:
             start_iter = self.ui.prompt_buffer.get_start_iter()
             end_iter = self.ui.prompt_buffer.get_end_iter()
-            return self.ui.prompt_buffer.get_text(start_iter, end_iter, False).strip()
+            return self.ui.prompt_buffer.get_text(
+                start_iter, end_iter, False
+            ).strip()
         return ""
 
     def _initialize(self):

dialog_events.py

@@ -6,8 +6,6 @@
 Handles all user interactions and UI events
 """
 
-import threading
-
 from gi.repository import Gtk, GLib
 
 from dialog_threads import DreamPrompterThreads
@@ -62,10 +60,14 @@ def connect_all_signals(self):
         if self.ui.edit_mode_radio:
             self.ui.edit_mode_radio.connect("toggled", self.on_mode_changed)
         if self.ui.generate_mode_radio:
-            self.ui.generate_mode_radio.connect("toggled", self.on_mode_changed)
+            self.ui.generate_mode_radio.connect(
+                "toggled", self.on_mode_changed
+            )
 
         if self.ui.toggle_visibility_btn:
-            self.ui.toggle_visibility_btn.connect("toggled", self.on_toggle_visibility)
+            self.ui.toggle_visibility_btn.connect(
+                "toggled", self.on_toggle_visibility
+            )
 
         if self.ui.file_chooser_btn:
             self.ui.file_chooser_btn.connect("clicked", self.on_select_files)
@@ -111,8 +113,8 @@ def on_generate(self, _button):
             self.show_error(_("Please enter a prompt"))
             return
 
-        edit_active = (self.ui.edit_mode_radio and
-                       self.ui.edit_mode_radio.get_active())
+        edit_radio = self.ui.edit_mode_radio
+        edit_active = (edit_radio and edit_radio.get_active())
         if edit_active and not self.drawable:
             self.show_error(_("Edit mode requires a selected layer"))
             return
@@ -128,11 +130,13 @@ def on_generate(self, _button):
 
         if mode == "edit":
             self.threads.start_edit_thread(
-                api_key, prompt_text, self.ui.selected_files, selected_model_name
+                api_key, prompt_text, self.ui.selected_files,
+                selected_model_name
             )
         else:
             self.threads.start_generate_thread(
-                api_key, prompt_text, self.ui.selected_files, selected_model_name
+                api_key, prompt_text, self.ui.selected_files,
+                selected_model_name
             )
 
     def on_model_changed(self, combo_box):
@@ -154,11 +158,12 @@ def on_mode_changed(self, _radio_button):
         if self.ui.edit_mode_radio.get_active():
             max_edit_files = self.model.max_reference_images_edit
             if len(self.ui.selected_files) > max_edit_files:
-                self.ui.selected_files = self.ui.selected_files[:max_edit_files]
+                self.ui.selected_files = (
+                    self.ui.selected_files[:max_edit_files]
+                )
                 self.ui.update_files_display()
-                print(_("Reduced to {max} reference images for edit mode").format(
-                    max=max_edit_files
-                ))
+                message = _("Reduced to {max} reference images for edit mode")
+                print(message.format(max=max_edit_files))
 
             if self.ui.generate_btn:
                 self.ui.generate_btn.set_label(_("Generate Edit"))
@@ -221,16 +226,14 @@ def on_select_files(self, _button):
             elif files:
                 if current_mode == "edit":
                     max_refs = self.model.max_reference_images_edit
-                    print(_("Cannot add {count} files. Maximum {max} reference "
-                            "images allowed in edit mode.").format(
-                        count=len(files), max=max_refs
-                    ))
+                    message = _("Cannot add {count} files. Maximum {max} "
+                                "reference images allowed in edit mode.")
+                    print(message.format(count=len(files), max=max_refs))
                 else:
                     max_refs = self.model.max_reference_images
-                    print(_("Cannot add {count} files. Maximum {max} reference "
-                            "images allowed.").format(
-                        count=len(files), max=max_refs
-                    ))
+                    message = _("Cannot add {count} files. Maximum {max} "
+                                "reference images allowed.")
+                    print(message.format(count=len(files), max=max_refs))
 
         dialog.destroy()
 
@@ -300,12 +303,16 @@ def update_ui_limits(self):
         if current_mode == "edit":
             if self.ui.images_help_label:
                 max_imgs = self.model.max_reference_images_edit
-                text = _("Select up to {max} additional images").format(max=max_imgs)
+                text = _("Select up to {max} additional images").format(
+                    max=max_imgs
+                )
                 markup = f'<small>{text}</small>'
                 self.ui.images_help_label.set_markup(markup)
         else:
             if self.ui.images_help_label:
                 max_imgs = self.model.max_reference_images
-                text = _("Select up to {max} additional images").format(max=max_imgs)
+                text = _("Select up to {max} additional images").format(
+                    max=max_imgs
+                )
                 markup = f'<small>{text}</small>'
                 self.ui.images_help_label.set_markup(markup)