pysfi 0.1.12__py3-none-any.whl → 0.1.13__py3-none-any.whl

sfi/llmserver/llmserver.py

@@ -6,8 +6,8 @@ import logging
 import os
 import pathlib
 import sys
+from dataclasses import dataclass
 from pathlib import Path
-from types import SimpleNamespace
 from typing import ClassVar
 
 from PySide2.QtCore import QProcess, QTextStream, QUrl
@@ -36,36 +36,61 @@ from PySide2.QtWidgets import (
     QWidget,
 )
 
-CONFIG_FILE = Path.home() / ".sfi" / "llmserver.json"
+CONFIG_FILE = Path.home() / ".pysfi" / "llmserver.json"
 logging.basicConfig(level="INFO", format="%(message)s")
 logger = logging.getLogger(__name__)
 
 
-class LLMServerConfig(SimpleNamespace):
+@dataclass
+class LLMServerConfig:
     """Llama local model server configuration."""
 
     TITLE: str = "Llama Local Model Server"
     WIN_SIZE: ClassVar[list[int]] = [800, 800]
     WIN_POS: ClassVar[list[int]] = [200, 200]
     MODEL_PATH: str = ""
-
     URL: str = "http://127.0.0.1"
     LISTEN_PORT: int = 8080
     LISTEN_PORT_RNG: ClassVar[list[int]] = [1024, 65535]
     THREAD_COUNT_RNG: ClassVar[list[int]] = [1, 24]
     THREAD_COUNT: int = 4
 
-    def __init__(self) -> None:
+    _loaded_from_file: bool = False
+
+    def __post_init__(self) -> None:
         if CONFIG_FILE.exists():
             logger.info("Loading configuration from %s", CONFIG_FILE)
-            self.__dict__.update(json.loads(CONFIG_FILE.read_text()))
+            try:
+                config_data = json.loads(CONFIG_FILE.read_text())
+                # Update instance attributes with loaded values
+                for key, value in config_data.items():
+                    if hasattr(self, key):
+                        setattr(self, key, value)
+                self._loaded_from_file = True
+            except (json.JSONDecodeError, TypeError, AttributeError) as e:
+                logger.error(f"Error loading config from {CONFIG_FILE}: {e}")
         else:
             logger.info("Using default configuration")
 
     def save(self) -> None:
         """Save configuration."""
-        CONFIG_FILE.parent.mkdir(parents=True, exist_ok=True)
-        CONFIG_FILE.write_text(json.dumps(vars(self), indent=4))
+        try:
+            CONFIG_FILE.parent.mkdir(parents=True, exist_ok=True)
+            # Convert dataclass to dict for JSON serialization
+            config_dict = {}
+            for attr_name in dir(self):
+                if not attr_name.startswith("_"):
+                    try:
+                        attr_value = getattr(self, attr_name)
+                        if not callable(attr_value):
+                            config_dict[attr_name] = attr_value
+                    except AttributeError:
+                        continue
+            CONFIG_FILE.write_text(json.dumps(config_dict, indent=4))
+            logger.info(f"Configuration saved to {CONFIG_FILE}")
+        except Exception as e:
+            logger.error(f"Failed to save configuration: {e}")
+            raise
 
 
 conf = LLMServerConfig()
@@ -92,11 +117,8 @@ class LlamaServerGUI(QMainWindow):
         self.init_ui()
         self.setup_process()
 
-        model_path = conf.MODEL_PATH
-        if model_path:
-            self.model_path_input.setText(str(model_path))
-        else:
-            self.model_path_input.setPlaceholderText("Choose model file...")
+        # Apply loaded configuration to UI controls
+        self.apply_config_to_ui()
 
     def init_ui(self) -> None:
         """Initialize user interface."""
@@ -191,6 +213,19 @@ class LlamaServerGUI(QMainWindow):
         self.process.readyReadStandardError.connect(self.handle_stderr)  # type: ignore
         self.process.finished.connect(self.on_process_finished)  # type: ignore
 
+    def apply_config_to_ui(self) -> None:
+        """Apply loaded configuration to UI controls."""
+        # Set model path
+        model_path = conf.MODEL_PATH
+        if model_path:
+            self.model_path_input.setText(str(model_path))
+        else:
+            self.model_path_input.setPlaceholderText("Choose model file...")
+
+        # Set port and thread values
+        self.port_spin.setValue(conf.LISTEN_PORT)
+        self.threads_spin.setValue(conf.THREAD_COUNT)
+
     def on_config_changed(self) -> None:
         """Configuration changed."""
         conf.MODEL_PATH = self.model_path_input.text().strip()
@@ -325,6 +360,21 @@ class LlamaServerGUI(QMainWindow):
         conf.WIN_SIZE = [geometry.width(), geometry.height()]
         return super().resizeEvent(event)
 
+    def closeEvent(self, event) -> None:  # noqa: N802
+        """Handle window close event to ensure configuration is saved."""
+        try:
+            # Save current configuration
+            conf.save()
+            logger.info("Configuration saved successfully on exit")
+        except Exception as e:
+            logger.error(f"Failed to save configuration on exit: {e}")
+        finally:
+            # Also stop server if running
+            if hasattr(self, "process") and self.process.state() == QProcess.Running:
+                self.process.terminate()
+                self.process.waitForFinished(2000)  # Wait up to 2 seconds
+            event.accept()
+
 
 def main() -> None:
     """Main entry point."""