serverwatcher 3.4__tar.gz → 3.5.1__tar.gz

{serverwatcher-3.4/src/serverwatcher.egg-info → serverwatcher-3.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: serverwatcher
-Version: 3.4
+Version: 3.5.1
 Summary: A HungerLib-powered Minecraft server automation engine.
 Author: iFamished
 License: GPL-3.0

{serverwatcher-3.4 → serverwatcher-3.5.1}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "serverwatcher"
-version = "3.4"
+version = "3.5.1"
 description = "A HungerLib-powered Minecraft server automation engine."
 readme = "README.md"
 requires-python = ">=3.10"

{serverwatcher-3.4 → serverwatcher-3.5.1}/src/serverwatcher/__init__.py

@@ -7,7 +7,7 @@ except PackageNotFoundError:
     __version__ = '0.0.0'
 
 from .watcher import ServerWatcher
-from .schema import validate_config_schema, validate_messages_schema
+from .schema import validate_config_schema, validate_messages_schema, flatten_nested
 
 
 __all__ = [
@@ -15,4 +15,5 @@ __all__ = [
     'ServerWatcher',
     'validate_config_schema',
     'validate_messages_schema',
+    'flatten_nested',
 ]

serverwatcher-3.5.1/src/serverwatcher/defaultconfigs/watcher.yaml

@@ -0,0 +1,39 @@
+logging:
+  logger_name_template: "Server Watcher"
+  log_path: "/home/container/logs/"
+  timezone: "America/Chicago"
+
+terminal_settings:
+  console_backspaces: 8
+  clear_terminal: True
+
+schedules:
+  restart_soon_schedule_id: 0     # replace this with real schedule id
+  origin_disable_schedule_id: 0   # replace this with real schedule id
+
+thresolds:
+  ram_threshold: 6
+  cpu_threshold: 150
+  uptime_hours_threshold: 12
+  tps_threshold: 19.5
+
+weights:
+  weight_restart_soon: 3
+  weight_ram: 1
+  weight_cpu: 1
+  weight_uptime: 1
+  weight_tps: 1
+  weight_low_uptime: 5
+  weight_per_player: 1
+
+gaps:
+  low_gap_minutes: 120
+  high_gap_minutes: 60
+
+restart_intervals:
+  restart_wait_seconds: 45
+  restart_online_timeout: 120
+  restart_online_interval: 2
+
+watcher_intervals:
+  watch_interval: 60 

{serverwatcher-3.4 → serverwatcher-3.5.1}/src/serverwatcher/schema.py

@@ -43,3 +43,28 @@ def validate_messages_schema(raw: Dict[str, Any]) -> list[str]:
     if "prefix" not in raw:
         errors.append("[messages] Missing required key: 'prefix'")
     return errors
+
+def flatten_nested(raw: dict) -> dict:
+    """
+    Recursively flattens a nested YAML dict into a single-level dict.
+    Section names are ignored; only leaf keys matter.
+    """
+    flat = {}
+
+    def walk(node):
+        if isinstance(node, dict):
+            for v in node.values():
+                walk(v)
+        else:
+            # ignore non-dict nodes at this level
+            pass
+
+    def collect(node):
+        for key, value in node.items():
+            if isinstance(value, dict):
+                collect(value)
+            else:
+                flat[key] = value
+
+    collect(raw)
+    return flat

{serverwatcher-3.4 → serverwatcher-3.5.1}/src/serverwatcher/watcher.py

@@ -15,6 +15,7 @@ from hungerlib.addons import (
     map_to_dataclass,
 )
 
+from serverwatcher.schema import flatten_nested
 from serverwatcher.config import GlobalConfig, MessagesConfig, WatcherConfig
 
 # Set directory
@@ -37,7 +38,9 @@ def load_or_default(path: str, default_path: str, schema):
             dst.write(src.read())
 
     raw = load_yaml(abs_path)
+    raw = flatten_nested(raw)
     return map_to_dataclass(raw, schema)
+    
 
 
 # Main watcher
@@ -192,7 +195,7 @@ class ServerWatcher:
             restart_reasons.append(
                 self.fmt(self.messages.reason_ram, ram=snap.ram, threshold=self.cfg.ram_threshold)
             )
-            pro += round(snap.ram, 0) - 5
+            pro += int(round(snap.ram, 0) - 5)
 
         if snap.cpu >= self.cfg.cpu_threshold:
             restart_reasons.append(

{serverwatcher-3.4 → serverwatcher-3.5.1/src/serverwatcher.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: serverwatcher
-Version: 3.4
+Version: 3.5.1
 Summary: A HungerLib-powered Minecraft server automation engine.
 Author: iFamished
 License: GPL-3.0

serverwatcher-3.4/src/serverwatcher/defaultconfigs/watcher.yaml

@@ -1,32 +0,0 @@
-restart_soon_schedule_id: 13
-origin_disable_schedule_id: 11
-
-ram_threshold: 6
-cpu_threshold: 150
-uptime_hours_threshold: 12
-tps_threshold: 19.5
-
-weight_restart_soon: 3
-weight_ram: 1
-weight_cpu: 1
-weight_uptime: 1
-weight_tps: 1
-
-weight_low_uptime: 5
-weight_per_player: 1
-
-low_gap_minutes: 120
-high_gap_minutes: 60
-
-restart_wait_seconds: 45
-restart_online_timeout: 120
-restart_online_interval: 2
-
-logger_name_template: "Server Watcher"
-log_path: "/home/container/logs/"
-console_backspaces: 8
-timezone: "America/Chicago"
-
-# New values (will reorder later)
-watch_interval: 60
-clear_terminal: True