refactor(macOS): migrate Optional/Union to modern union syntax

Replace typing.Optional and typing.Union with X | None across the
omlx_app package. Update Callable imports to collections.abc.

Author: lyonsno

packaging/omlx_app/config.py

@@ -4,7 +4,6 @@
 import logging
 from dataclasses import dataclass, asdict
 from pathlib import Path
-from typing import Optional
 
 import requests
 
@@ -79,7 +78,7 @@ def load(cls) -> "ServerConfig":
                 pass
         return cls()
 
-    def get_server_api_key(self) -> Optional[str]:
+    def get_server_api_key(self) -> str | None:
         """Read the API key from the server's settings.json."""
         settings_file = Path(self.base_path).expanduser() / "settings.json"
         if settings_file.exists():

packaging/omlx_app/preferences.py

@@ -4,7 +4,7 @@
 import plistlib
 import shutil
 from pathlib import Path
-from typing import Callable, Optional
+from collections.abc import Callable
 
 import objc
 from AppKit import (
@@ -61,8 +61,8 @@ def initWithConfig_serverManager_onSave_(
             return None
         self.config = config
         self.server_manager = server_manager
-        self.on_save: Optional[Callable] = on_save_callback
-        self.show_welcome: Optional[Callable] = None
+        self.on_save: Callable | None = on_save_callback
+        self.show_welcome: Callable | None = None
         self.window = None
         self.launch_at_login_checkbox = None
         self.auto_start_checkbox = None
@@ -638,7 +638,7 @@ def resetSettings_(self, sender):
             if self.on_save:
                 self.on_save()
 
-    def _get_app_path(self) -> Optional[str]:
+    def _get_app_path(self) -> str | None:
         """Find the oMLX.app bundle path."""
         app_py = Path(__file__)
         for parent in app_py.parents:

packaging/omlx_app/server_manager.py

@@ -11,7 +11,7 @@
 from dataclasses import dataclass
 from enum import Enum
 from pathlib import Path
-from typing import Callable, Optional, Union
+from collections.abc import Callable
 
 import requests
 
@@ -32,7 +32,7 @@ class ServerStatus(Enum):
 @dataclass
 class PortConflict:
     """Returned by start() when the port is already in use."""
-    pid: Optional[int]
+    pid: int | None
     is_omlx: bool
 
 
@@ -58,12 +58,12 @@ class ServerManager:
 
     def __init__(self, config: ServerConfig):
         self.config = config
-        self._process: Optional[subprocess.Popen] = None
+        self._process: subprocess.Popen | None = None
         self._status = ServerStatus.STOPPED
-        self._error_message: Optional[str] = None
+        self._error_message: str | None = None
         self._log_file_handle = None
-        self._status_callback: Optional[Callable[[ServerStatus], None]] = None
-        self._health_check_thread: Optional[threading.Thread] = None
+        self._status_callback: Callable[[ServerStatus], None] | None = None
+        self._health_check_thread: threading.Thread | None = None
         self._stop_health_check = threading.Event()
         self._adopted = False
 
@@ -82,13 +82,13 @@ def status(self) -> ServerStatus:
         return self._status
 
     @property
-    def error_message(self) -> Optional[str]:
+    def error_message(self) -> str | None:
         return self._error_message
 
     def set_status_callback(self, callback: Callable[[ServerStatus], None]) -> None:
         self._status_callback = callback
 
-    def _update_status(self, status: ServerStatus, error: Optional[str] = None) -> None:
+    def _update_status(self, status: ServerStatus, error: str | None = None) -> None:
         self._status = status
         self._error_message = error
         if self._status_callback:
@@ -237,7 +237,7 @@ def _is_omlx_server(self) -> bool:
         except requests.RequestException:
             return False
 
-    def _find_port_owner_pid(self) -> Optional[int]:
+    def _find_port_owner_pid(self) -> int | None:
         """Find the PID of the process listening on the configured port."""
         try:
             result = subprocess.run(
@@ -290,7 +290,7 @@ def adopt(self) -> bool:
         logger.info(f"Adopted external oMLX server on port {self.config.port}")
         return True
 
-    def _do_start(self) -> Union[bool, PortConflict]:
+    def _do_start(self) -> bool | PortConflict:
         """Core start logic shared by start() and auto-restart.
 
         Does NOT check current status or start the health check thread.
@@ -331,7 +331,7 @@ def _do_start(self) -> Union[bool, PortConflict]:
             logger.error(f"Failed to start server: {e}")
             return False
 
-    def start(self) -> Union[bool, PortConflict]:
+    def start(self) -> bool | PortConflict:
         if self._status in (ServerStatus.RUNNING, ServerStatus.STARTING):
             return False
 
@@ -352,7 +352,7 @@ def start(self) -> Union[bool, PortConflict]:
 
         return result
 
-    def force_restart(self) -> Union[bool, PortConflict]:
+    def force_restart(self) -> bool | PortConflict:
         """Force restart: kill process, reset counters, and start fresh."""
         self._cleanup_dead_process()
         self._auto_restart_count = 0
@@ -422,7 +422,7 @@ def stop(self, timeout: float = 10.0) -> bool:
             self._update_status(ServerStatus.ERROR, str(e))
             return False
 
-    def restart(self) -> Union[bool, PortConflict]:
+    def restart(self) -> bool | PortConflict:
         self.stop()
         import time
         time.sleep(1)

packaging/omlx_app/updater.py

@@ -12,7 +12,7 @@
 import tempfile
 import threading
 from pathlib import Path
-from typing import Callable, Optional
+from collections.abc import Callable
 
 import requests
 
@@ -34,9 +34,9 @@ def __init__(
         self,
         dmg_url: str,
         version: str,
-        on_progress: Optional[Callable[[str], None]] = None,
-        on_error: Optional[Callable[[str], None]] = None,
-        on_ready: Optional[Callable[[], None]] = None,
+        on_progress: Callable[[str], None] | None = None,
+        on_error: Callable[[str], None] | None = None,
+        on_ready: Callable[[], None] | None = None,
     ):
         self.dmg_url = dmg_url
         self.version = version

packaging/omlx_app/welcome.py

@@ -3,7 +3,6 @@
 import logging
 import webbrowser
 from pathlib import Path
-from typing import Optional
 
 import objc
 from AppKit import (
@@ -64,7 +63,7 @@ def initWithConfig_serverManager_(self, config, server_manager):
         self.status_check_timer = None
         return self
 
-    def _get_logo_path(self) -> Optional[Path]:
+    def _get_logo_path(self) -> Path | None:
         """Find the logo SVG file."""
         svg_name = "navbar-logo-dark.svg"
         bundle_res = Path(__file__).parent.parent