Add type hints to generated constructors

src/amulet_editor/application/_splash/_splash.py

@@ -7,12 +7,14 @@
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
 from PySide6.QtCore import QCoreApplication, QMetaObject, Qt, QEvent
-from PySide6.QtWidgets import QDialog, QLabel, QVBoxLayout
+from PySide6.QtWidgets import QDialog, QLabel, QVBoxLayout, QWidget
 
 
 class Ui_Splash(QDialog):
-    def __init__(self, *args, **kwargs) -> None:
-        super().__init__(*args, **kwargs)
+    def __init__(
+        self, parent: QWidget | None = None, f: Qt.WindowType = Qt.WindowType.Dialog
+    ) -> None:
+        super().__init__(parent, f)
         if not self.objectName():
             self.setObjectName("Splash")
         self.resize(400, 300)

src/amulet_editor/application/windows_/_amulet_landing_window/_landing_window.py

@@ -6,15 +6,17 @@
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
-from PySide6.QtCore import QCoreApplication, QMetaObject, QEvent
+from PySide6.QtCore import QCoreApplication, QMetaObject, Qt, QEvent
 from PySide6.QtWidgets import QFrame, QHBoxLayout, QMainWindow, QWidget
 from amulet_editor.application.windows._amulet_landing_window._view import ViewContainer
 from amulet_editor.models.widgets._toolbar import AToolBar
 
 
 class Ui_AmuletLandingWindow(QMainWindow):
-    def __init__(self, *args, **kwargs) -> None:
-        super().__init__(*args, **kwargs)
+    def __init__(
+        self, parent: QWidget | None = None, flags: Qt.WindowType = Qt.WindowType.Window
+    ) -> None:
+        super().__init__(parent, f)
         if not self.objectName():
             self.setObjectName("AmuletLandingWindow")
         self.resize(800, 600)

src/amulet_editor/application/windows_/_amulet_landing_window/views/home/home/_home.py

@@ -21,8 +21,10 @@
 
 
 class Ui_HomePage(QWidget):
-    def __init__(self, *args, **kwargs) -> None:
-        super().__init__(*args, **kwargs)
+    def __init__(
+        self, parent: QWidget | None = None, f: Qt.WindowType = Qt.WindowType.Widget
+    ) -> None:
+        super().__init__(parent, f)
         if not self.objectName():
             self.setObjectName("HomePage")
         self.resize(748, 788)

src/amulet_editor/application/windows_/_amulet_landing_window/views/home/open_world/_open_world.py

@@ -21,8 +21,10 @@
 
 
 class Ui_OpenWorldPage(QWidget):
-    def __init__(self, *args, **kwargs) -> None:
-        super().__init__(*args, **kwargs)
+    def __init__(
+        self, parent: QWidget | None = None, f: Qt.WindowType = Qt.WindowType.Widget
+    ) -> None:
+        super().__init__(parent, f)
         if not self.objectName():
             self.setObjectName("OpenWorldPage")
         self.resize(264, 247)

src/amulet_editor/models/widgets/traceback_dialog/_traceback_dialog.py

@@ -17,12 +17,15 @@
     QSpacerItem,
     QTextEdit,
     QVBoxLayout,
+    QWidget,
 )
 
 
 class Ui_AmuletTracebackDialog(QDialog):
-    def __init__(self, *args, **kwargs) -> None:
-        super().__init__(*args, **kwargs)
+    def __init__(
+        self, parent: QWidget | None = None, f: Qt.WindowType = Qt.WindowType.Dialog
+    ) -> None:
+        super().__init__(parent, f)
         if not self.objectName():
             self.setObjectName("AmuletTracebackDialog")
         self.resize(400, 300)

src/builtin_plugins/amulet_team_home_page/home/home/_home.py

@@ -21,8 +21,10 @@
 
 
 class Ui_HomePage(QWidget):
-    def __init__(self, *args, **kwargs) -> None:
-        super().__init__(*args, **kwargs)
+    def __init__(
+        self, parent: QWidget | None = None, f: Qt.WindowType = Qt.WindowType.Widget
+    ) -> None:
+        super().__init__(parent, f)
         if not self.objectName():
             self.setObjectName("HomePage")
         self.resize(748, 788)

src/builtin_plugins/amulet_team_home_page/home/open_world/_open_world.py

@@ -20,8 +20,10 @@
 
 
 class Ui_OpenWorldPage(QWidget):
-    def __init__(self, *args, **kwargs) -> None:
-        super().__init__(*args, **kwargs)
+    def __init__(
+        self, parent: QWidget | None = None, f: Qt.WindowType = Qt.WindowType.Widget
+    ) -> None:
+        super().__init__(parent, f)
         if not self.objectName():
             self.setObjectName("OpenWorldPage")
         self.resize(264, 247)

src/builtin_plugins/amulet_team_inspector/_inspector/_inspector.py

@@ -6,7 +6,7 @@
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
-from PySide6.QtCore import QCoreApplication, QMetaObject, QEvent
+from PySide6.QtCore import QCoreApplication, QMetaObject, Qt, QEvent
 from PySide6.QtWidgets import (
     QHBoxLayout,
     QPlainTextEdit,
@@ -19,8 +19,10 @@
 
 
 class Ui_InspectionTool(QWidget):
-    def __init__(self, *args, **kwargs) -> None:
-        super().__init__(*args, **kwargs)
+    def __init__(
+        self, parent: QWidget | None = None, f: Qt.WindowType = Qt.WindowType.Widget
+    ) -> None:
+        super().__init__(parent, f)
         if not self.objectName():
             self.setObjectName("InspectionTool")
         self.resize(264, 247)

src/builtin_plugins/amulet_team_main_window/application/windows/main_window/_landing_window.py

@@ -6,15 +6,17 @@
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
-from PySide6.QtCore import QCoreApplication, QMetaObject, QEvent
+from PySide6.QtCore import QCoreApplication, QMetaObject, Qt, QEvent
 from PySide6.QtWidgets import QFrame, QHBoxLayout, QMainWindow, QWidget
 from ._view import ViewContainer
 from amulet_editor.models.widgets._toolbar import AToolBar
 
 
 class Ui_AmuletLandingWindow(QMainWindow):
-    def __init__(self, *args, **kwargs) -> None:
-        super().__init__(*args, **kwargs)
+    def __init__(
+        self, parent: QWidget | None = None, flags: Qt.WindowType = Qt.WindowType.Window
+    ) -> None:
+        super().__init__(parent, f)
         if not self.objectName():
             self.setObjectName("AmuletLandingWindow")
         self.resize(800, 600)

src/builtin_plugins/amulet_team_main_window2/_application/windows/main_window/main_window.py

@@ -6,7 +6,7 @@
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
-from PySide6.QtCore import QCoreApplication, QMetaObject, QEvent
+from PySide6.QtCore import QCoreApplication, QMetaObject, Qt, QEvent
 from PySide6.QtWidgets import (
     QComboBox,
     QHBoxLayout,
@@ -21,8 +21,10 @@
 
 
 class Ui_AmuletMainWindow(QMainWindow):
-    def __init__(self, *args, **kwargs) -> None:
-        super().__init__(*args, **kwargs)
+    def __init__(
+        self, parent: QWidget | None = None, flags: Qt.WindowType = Qt.WindowType.Window
+    ) -> None:
+        super().__init__(parent, f)
         if not self.objectName():
             self.setObjectName("AmuletMainWindow")
         self.resize(1129, 792)

src/builtin_plugins/amulet_team_main_window2/_application/windows/sub_window/sub_window.py

@@ -6,14 +6,16 @@
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
-from PySide6.QtCore import QCoreApplication, QMetaObject, QEvent
-from PySide6.QtWidgets import QMainWindow
+from PySide6.QtCore import QCoreApplication, QMetaObject, Qt, QEvent
+from PySide6.QtWidgets import QMainWindow, QWidget
 from amulet_team_main_window2._application.tab_engine import RecursiveSplitter
 
 
 class Ui_AmuletSubWindow(QMainWindow):
-    def __init__(self, *args, **kwargs) -> None:
-        super().__init__(*args, **kwargs)
+    def __init__(
+        self, parent: QWidget | None = None, flags: Qt.WindowType = Qt.WindowType.Window
+    ) -> None:
+        super().__init__(parent, f)
         if not self.objectName():
             self.setObjectName("AmuletSubWindow")
         self.resize(1129, 792)

src/builtin_plugins/amulet_team_settings/settings/_settings.py

@@ -6,7 +6,7 @@
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
-from PySide6.QtCore import QCoreApplication, QMetaObject, QEvent
+from PySide6.QtCore import QCoreApplication, QMetaObject, Qt, QEvent
 from PySide6.QtWidgets import (
     QHBoxLayout,
     QLabel,
@@ -18,8 +18,10 @@
 
 
 class Ui_SettingsPage(QWidget):
-    def __init__(self, *args, **kwargs) -> None:
-        super().__init__(*args, **kwargs)
+    def __init__(
+        self, parent: QWidget | None = None, f: Qt.WindowType = Qt.WindowType.Widget
+    ) -> None:
+        super().__init__(parent, f)
         if not self.objectName():
             self.setObjectName("SettingsPage")
         self.resize(748, 788)

tools/compile_ui.py

@@ -36,6 +36,13 @@ def _get_enums(obj: Any) -> list[EnumType]:
 ]
 
 
+InitArgs: dict[str, str] = {
+    "QWidget": "def __init__(self, parent: QWidget | None = None, f: Qt.WindowType = Qt.WindowType.Widget) -> None:\n        super().__init__(parent, f)",
+    "QDialog": "def __init__(self, parent: QWidget | None = None, f: Qt.WindowType = Qt.WindowType.Dialog) -> None:\n        super().__init__(parent, f)",
+    "QMainWindow": "def __init__(self, parent: QWidget | None = None, flags: Qt.WindowType = Qt.WindowType.Window) -> None:\n        super().__init__(parent, f)",
+}
+
+
 def _compile_ui_file(ui_path: str) -> str | None:
     py_path = ui_path[:-2] + "py"
 
@@ -56,8 +63,11 @@ def _compile_ui_file(ui_path: str) -> str | None:
         py = pyf.read()
 
     ui = ET.parse(ui_path)
-    class_name = ui.find("class").text
-    super_name = ui.find("widget").attrib["class"]
+    class_element = ui.find("class")
+    super_element = ui.find("widget")
+    assert class_element is not None and super_element is not None
+    class_name = class_element.text
+    super_name = super_element.attrib["class"]
 
     # Run some postprocessing
     # Remove comments. The ones generated do not add anything
@@ -69,7 +79,10 @@ def _compile_ui_file(ui_path: str) -> str | None:
     # Replace setupUi with constructor
     py = re.sub(
         f"def setupUi\\(self, {class_name}\\):",
-        "def __init__(self, *args, **kwargs) -> None:\n        super().__init__(*args, **kwargs)",
+        InitArgs.get(
+            super_name,
+            "def __init__(self, *args, **kwargs) -> None:\n        super().__init__(*args, **kwargs)"
+        ),
         py,
     )
 
@@ -125,6 +138,7 @@ def _try_compile_ui_file(ui_path: str) -> str | None:
         return _compile_ui_file(ui_path)
     except Exception:
         print(traceback.format_exc())
+    return None
 
 
 def main() -> None:
@@ -136,7 +150,11 @@ def main() -> None:
         ):
             futures.append(executor.submit(_try_compile_ui_file, ui_path))
 
-    paths = [f.result() for f in futures]
+    paths: list[str] = []
+    for f in futures:
+        result = f.result()
+        if result is not None:
+            paths.append(result)
     if paths:
         subprocess.run([sys.executable, "-m", "black", *paths])