Stricter type annotations

.gitignore

@@ -11,6 +11,7 @@ __pycache__/
 build/
 develop-eggs/
 dist/
+dist_js/
 downloads/
 eggs/
 .eggs/
@@ -151,11 +152,17 @@ cython_debug/
 # VSCode
 .vscode/
 
-# SPECIFIC TO THIS PROJECT
+# Node modules
+node_modules/
+
+## SPECIFIC TO THIS PROJECT
+
 # Art input folder
 /art
 # Render output folder
 /out
+# Temporary files
+/tmp
 # Temporary logging directory
 /logs
 # For personal testing
@@ -166,6 +173,8 @@ cython_debug/
 /src/data/versions.yml
 # User defined environment
 /src/data/env.yml
+# User preferences
+/src/data/preferences
 # Generated new release
 /release
 # Environmental variables
@@ -175,6 +184,7 @@ cython_debug/
 !/plugins/Investigamer
 !/plugins/SilvanMTG
 /plugins/*/config_ini
+/plugins/*/__init__.py
 # PSD templates directories
 /templates/*
 !/templates/tools
@@ -191,3 +201,12 @@ cython_debug/
 /src/data/hexproof
 # Allow the internal build tools
 !src/data/build/
+# Backups
+/backup
+# Built executable
+proxyshop.exe
+# Autogenerated Qt files
+src/gui/qml/models/*.json
+src/gui/qml/models/*.cpp
+src/gui/qml/models/*.qmltypes
+src/gui/qml/models/qmldir

main.py

@@ -1,68 +1,133 @@
 """
 * Proxyshop Application Launcher
 """
-# Standard Library Imports
-import os
-import sys
 
-"""
-* Launcher Funcs
-"""
+from pathlib import Path
 
+from PySide6.QtGui import QIcon
 
-def launch_cli():
-    """Launch the app in CLI mode."""
+from src import APP, CFG, CON, ENV
+from src._loader import (
+    AppPlugin,
+    TemplateLibrary,
+    get_all_plugins,
+    get_template_file_versions,
+)
+from src.startup import run_startup_checks
 
-    # Enable headless mode, remove cli marker
-    os.environ['PROXYSHOP_HEADLESS'] = '1'
-    if 'cli' in sys.argv:
-        sys.argv.remove('cli')
 
-    # Local Imports
-    from src.commands import ProxyshopCLI
+def launch_gui(template_library: TemplateLibrary, plugins: dict[str, AppPlugin]):
+    """Launch the app in GUI mode."""
 
-    # Run the CLI application
-    ProxyshopCLI.main()
+    from PySide6 import QtAsyncio
+    from PySide6.QtGui import QGuiApplication
+    from PySide6.QtQml import QQmlApplicationEngine
+    from PySide6.QtQuickControls2 import QQuickStyle
 
+    from src.gui.qml.models.batch_rendering_model import BatchRenderingModel
+    from src.gui.qml.models.console_model import ConsoleModel
+    from src.gui.qml.models.file_dialog_model import FileDialogModel
+    from src.gui.qml.models.file_path_model import FilePathModel
+    from src.gui.qml.models.image_transform_model import ImageTransformModel
+    from src.gui.qml.models.message_dialog_content_model import (
+        MessageDialogContentModel,
+    )
+    from src.gui.qml.models.render_operations_model import RenderOperationsModel
+    from src.gui.qml.models.settings_model import SettingsModel
+    from src.gui.qml.models.settings_tree_model import SettingsTreeModel
+    from src.gui.qml.models.template_list_model import TemplateListModel
+    from src.gui.qml.models.template_updater_model import TemplateUpdaterModel
+    from src.gui.qml.models.test_renders_model import TestRendersModel
+    from src.render.render_queue import RenderQueue
 
-def launch_gui():
-    """Launch the app in GUI mode."""
+    app = QGuiApplication(applicationDisplayName="Proxyshop")
+    app.setWindowIcon(QIcon("src/img/favicon.ico"))
+    engine = QQmlApplicationEngine()
 
-    # Local Imports
-    os.environ['PROXYSHOP_HEADLESS'] = '0'
-    from src import (
-        APP, CFG, CON, CONSOLE, ENV,
-        PLUGINS, TEMPLATES, TEMPLATE_MAP, TEMPLATE_DEFAULTS)
-    from src.gui._state import register_kv_classes, load_kv_config
-    from src.gui.app import ProxyshopGUIApp
+    file_path_model = FilePathModel()
+    render_queue = RenderQueue()
+    file_dialog_model = FileDialogModel()
+    console_model = ConsoleModel()
+    render_message_dialog_content_model = MessageDialogContentModel()
+    render_operations_model = RenderOperationsModel(
+        render_queue, render_message_dialog_content_model
+    )
+    template_updater_model = TemplateUpdaterModel(
+        app_env=ENV, template_library=template_library
+    )
+    test_renders_model = TestRendersModel(
+        render_queue,
+        template_library,
+        file_dialog_model,
+        render_message_dialog_content_model,
+        CFG,
+    )
+    template_list_model = TemplateListModel(
+        render_queue,
+        file_dialog_model,
+        render_message_dialog_content_model,
+        template_library,
+        test_renders_model,
+        CFG,
+    )
+    batch_render_model = BatchRenderingModel(
+        file_dialog_model,
+        render_message_dialog_content_model,
+        render_queue,
+        plugins,
+        template_library,
+        test_renders_model,
+        CFG,
+    )
+    settings_tree_model = SettingsTreeModel(
+        app_config=CFG, template_library=template_library
+    )
+    settings_model = SettingsModel(settings_tree_model)
+    image_transform_model = ImageTransformModel(file_dialog_model=file_dialog_model)
 
-    # Kivy Imported Last
-    from kivy.resources import resource_add_path
+    root_context = engine.rootContext()
+    root_context.setContextProperty("filePathModel", file_path_model)
+    root_context.setContextProperty("fileDialogModel", file_dialog_model)
+    root_context.setContextProperty("consoleModel", console_model)
+    root_context.setContextProperty(
+        "renderMessageDialogContentModel", render_message_dialog_content_model
+    )
+    root_context.setContextProperty("renderOperationsModel", render_operations_model)
+    root_context.setContextProperty("testRendersModel", test_renders_model)
+    root_context.setContextProperty("templateUpdaterModel", template_updater_model)
+    root_context.setContextProperty("templateListModel", template_list_model)
+    root_context.setContextProperty("batchRenderModel", batch_render_model)
+    root_context.setContextProperty("settingsTreeModel", settings_tree_model)
+    root_context.setContextProperty("settingsModel", settings_model)
+    root_context.setContextProperty("imageTransformModel", image_transform_model)
+    root_context.setContextProperty(
+        "github_url", f"https://github.com/{ENV.APP_UPDATES_REPO}"
+    )
 
-    # Kivy packaging for PyInstaller
-    if hasattr(sys, '_MEIPASS'):
-        resource_add_path(os.path.join(sys._MEIPASS))
+    # This points to the extracted bundle directory in a distributable build
+    engine.addImportPath(Path(__file__).parent / "src" / "gui")
+    QQuickStyle.setStyle("Fusion")
+    QQuickStyle.setFallbackStyle("Basic")
+    engine.loadFromModule("qml", "App")
 
-    # Load KV files and utilities
-    load_kv_config()
-    register_kv_classes()
+    # Ensure that the root context is available at QML destruction
+    app.aboutToQuit.connect(engine.deleteLater)
 
-    # Run the GUI application
-    ProxyshopGUIApp(
-        app=APP,
+    run_startup_checks(APP)
+
+    QtAsyncio.run(handle_sigint=True)
+
+
+if __name__ == "__main__":
+    initial_versions = get_template_file_versions()
+    versions = initial_versions.model_copy(deep=True)
+    plugins = get_all_plugins(con=CON, env=ENV, template_file_versions=versions.root)
+    template_library = TemplateLibrary(
         con=CON,
-        cfg=CFG,
         env=ENV,
-        console=CONSOLE,
-        plugins=PLUGINS,
-        templates=TEMPLATES,
-        template_map=TEMPLATE_MAP,
-        templates_default=TEMPLATE_DEFAULTS,
-    ).run()
-
-
-if __name__ == '__main__':
-    """Route to a qualified launcher."""
-    if 'cli' in sys.argv:
-        sys.exit(launch_cli())
-    launch_gui()
+        plugins=plugins,
+        initial_template_file_versions=initial_versions,
+        template_file_versions=versions,
+    )
+
+    launch_gui(template_library, plugins)

package.json

@@ -0,0 +1,14 @@
+{
+  "type": "module",
+  "scripts": {
+    "build": "tsc && node --experimental-transform-types scripts_js/build.ts",
+    "type-check": "pyright ./plugins/** ./src/** ./tests/** ./scripts/** && tsc --noEmit && npx tsc --project tsconfig.tools.json --noEmit"
+  },
+  "devDependencies": {
+    "@types/node": "^25.9.1",
+    "@types/photoshop": "^25.0.4",
+    "prettier": "^3.8.3",
+    "pyright": "^1.1.409",
+    "typescript": "^6.0.3"
+  }
+}