serverwatcher 5.9.dev4__tar.gz → 5.9.dev6__tar.gz

{serverwatcher-5.9.dev4/src/serverwatcher.egg-info → serverwatcher-5.9.dev6}/PKG-INFO

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

{serverwatcher-5.9.dev4 → serverwatcher-5.9.dev6}/pyproject.toml

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

serverwatcher-5.9.dev6/src/serverwatcher/configclasses/messages.py

@@ -0,0 +1,57 @@
+from hungerlib import datamap, datamap_api
+
+@datamap(syntax=datamap_api.braces, mode="config")
+class MessagesConfig:
+    prefix: str = "prefix"
+    bullet: str = "bullet"
+
+    broadcast_restart_at: str = "broadcast_restart_at"
+
+    minute_120: str = "broadcast_minutes.120"
+    minute_60: str = "broadcast_minutes.60"
+    minute_45: str = "broadcast_minutes.45"
+    minute_30: str = "broadcast_minutes.30"
+    minute_15: str = "broadcast_minutes.15"
+    minute_5:  str = "broadcast_minutes.5"
+    minute_1:  str = "broadcast_minutes.1"
+
+    second_10: str = "broadcast_seconds.10"
+    second_9:  str = "broadcast_seconds.9"
+    second_8:  str = "broadcast_seconds.8"
+    second_7:  str = "broadcast_seconds.7"
+    second_6:  str = "broadcast_seconds.6"
+    second_5:  str = "broadcast_seconds.5"
+    second_4:  str = "broadcast_seconds.4"
+    second_3:  str = "broadcast_seconds.3"
+    second_2:  str = "broadcast_seconds.2"
+    second_1:  str = "broadcast_seconds.1"
+
+    startup: str = "logging.startup"
+    status_check: str = "logging.status_check"
+    validation_fail: str = "logging.validation_fail"
+    validation_ok: str = "logging.validation_ok"
+    shutdown: str = "logging.shutdown"
+    immediate_restart: str = "logging.immediate_restart"
+    no_restart: str = "logging.no_restart"
+    scheduled: str = "logging.scheduled"
+    gap_low: str = "logging.gap_low"
+    gap_high: str = "logging.gap_high"
+
+    pro_restart_splash: str = "reasons.pro_splash"
+    anti_restart_splash: str = "reasons.anti_splash"
+
+    reason_restart_soon: str = "reasons.restart_soon"
+    reason_ram: str = "reasons.ram"
+    reason_cpu: str = "reasons.cpu"
+    reason_uptime: str = "reasons.uptime"
+    reason_tps: str = "reasons.tps"
+    reason_low_uptime: str = "reasons.low_uptime"
+    reason_players: str = "reasons.players"
+
+    pro_restart_number: str = "reasons.pro_restart_number"
+    anti_restart_number: str = "reasons.anti_restart_number"
+
+    restart_action_sent: str = "restarts.restart_action_sent"
+    server_back_online: str = "restarts.back_online"
+    server_back_online_broadcast: str = "restarts.back_online_broadcast"
+    server_failed_restart: str = "restarts.failed_restart"

serverwatcher-5.9.dev6/src/serverwatcher/configclasses/watcher.py

@@ -0,0 +1,28 @@
+from hungerlib import datamap, datamap_api
+
+@datamap(syntax=datamap_api.braces, mode="config")
+class WatcherConfig:
+    watch_interval: int = "watch_interval"
+    schedule_control: bool = "schedule_control.enabled"
+    restart_soon_id: int = "schedule_control.restart_soon_id"
+
+    threshold_ram: int = "thresholds.ram"
+    threshold_cpu: int = "thresholds.cpu"
+    threshold_uptime: int = "thresholds.uptime"
+    threshold_tps: float = "thresholds.tps"
+
+    weight_restart_soon: int = "weights.restart_soon"
+    weight_ram: int = "weights.ram"
+    weight_cpu: int = "weights.cpu"
+    weight_uptime: int = "weights.uptime"
+    weight_tps: int = "weights.tps"
+
+    weight_low_uptime: int = "weights.low_uptime"
+    weight_per_player: int = "weights.per_player"
+
+    low_gap_minutes: int = "gaps.low_gap_minutes"
+    high_gap_minutes: int = "gaps.high_gap_minutes"
+
+    restart_wait_seconds: int = "restart.wait_seconds"
+    restart_timeout: int = "restart.online_timeout"
+    restart_online_interval: int = "restart.online_interval"

{serverwatcher-5.9.dev4 → serverwatcher-5.9.dev6}/src/serverwatcher/watcher.py

@@ -127,7 +127,7 @@ class ServerWatcher:
                 lambda msg=mapit(getattr(self.messages, k)):
                     self.router.broadcast(msg)
             )
-            for k in vars(self.messages)
+            for k in vars(self.messages.__dataclass_fields__)
             if k.startswith("minute_")
         }
 
@@ -136,7 +136,7 @@ class ServerWatcher:
                 lambda msg=mapit(getattr(self.messages, k)):
                     self.router.broadcast(msg)
             )
-            for k in vars(self.messages)
+            for k in vars(self.messages.__dataclass_fields__)
             if k.startswith("second_")
         }
 

{serverwatcher-5.9.dev4 → serverwatcher-5.9.dev6/src/serverwatcher.egg-info}/PKG-INFO

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

serverwatcher-5.9.dev4/src/serverwatcher/configclasses/messages.py

@@ -1,61 +0,0 @@
-from dataclasses import field
-from hungerlib import datamap, datamap_api
-
-def yaml_key(path: str, default=None):
-    return field(default=default, metadata={"yaml_key": path})
-
-@datamap(syntax=datamap_api.braces)
-class MessagesConfig:
-    prefix: str = yaml_key("prefix", "<aqua>[Server Watcher]")
-    bullet: str = yaml_key("bullet")
-
-    broadcast_restart_at: str = yaml_key("broadcast_restart_at")
-
-    minute_120: str = yaml_key("broadcast_minutes.120", "{prefix} Restart in 2 hours!")
-    minute_60: str = yaml_key("broadcast_minutes.60", "{prefix} Restart in 1 hour!")
-    minute_45: str = yaml_key("broadcast_minutes.45", "{prefix} Restart in 45 minutes!")
-    minute_30: str = yaml_key("broadcast_minutes.30", "{prefix} Restart in 30 minutes!")
-    minute_15: str = yaml_key("broadcast_minutes.15", "{prefix} Restart in 15 minutes!")
-    minute_5: str = yaml_key("broadcast_minutes.5", "{prefix} Restart in 5 minutes!")
-    minute_1: str = yaml_key("broadcast_minutes.1", "{prefix} Restart in 1 minute!")
-
-    second_10: str = yaml_key("broadcast_seconds.10", "{prefix} Restart in 10 seconds!")
-    second_9:  str = yaml_key("broadcast_seconds.9",  "{prefix} Restart in 9 seconds!")
-    second_8:  str = yaml_key("broadcast_seconds.8",  "{prefix} Restart in 8 seconds!")
-    second_7:  str = yaml_key("broadcast_seconds.7",  "{prefix} Restart in 7 seconds!")
-    second_6:  str = yaml_key("broadcast_seconds.6",  "{prefix} Restart in 6 seconds!")
-    second_5:  str = yaml_key("broadcast_seconds.5",  "{prefix} Restart in 5 seconds!")
-    second_4:  str = yaml_key("broadcast_seconds.4",  "{prefix} Restart in 4 seconds!")
-    second_3:  str = yaml_key("broadcast_seconds.3",  "{prefix} Restart in 3 seconds!")
-    second_2:  str = yaml_key("broadcast_seconds.2",  "{prefix} Restart in 2 seconds!")
-    second_1:  str = yaml_key("broadcast_seconds.1",  "{prefix} Restart in 1 second!")
-
-    startup: str = yaml_key("logging.startup")
-    status_check: str = yaml_key("logging.status_check")
-    validation_fail: str = yaml_key("logging.validation_fail")
-    validation_ok: str = yaml_key("logging.validation_ok")
-    shutdown: str = yaml_key("logging.shutdown")
-    immediate_restart: str = yaml_key("logging.immediate_restart")
-    no_restart: str = yaml_key("logging.no_restart")
-    scheduled: str = yaml_key("logging.scheduled")
-    gap_low: str = yaml_key("logging.gap_low")
-    gap_high: str = yaml_key("logging.gap_high")
-
-    pro_restart_splash: str = yaml_key("reasons.pro_splash")
-    anti_restart_splash: str = yaml_key("reasons.anti_splash")
-
-    reason_restart_soon: str = yaml_key("reasons.restart_soon")
-    reason_ram: str = yaml_key("reasons.ram")
-    reason_cpu: str = yaml_key("reasons.cpu")
-    reason_uptime: str = yaml_key("reasons.uptime")
-    reason_tps: str = yaml_key("reasons.tps")
-    reason_low_uptime: str = yaml_key("reasons.low_uptime")
-    reason_players: str = yaml_key("reasons.players")
-
-    pro_restart_number: str = yaml_key("reasons.pro_restart_number")
-    anti_restart_number: str = yaml_key("reasons.anti_restart_number")
-
-    restart_action_sent: str = yaml_key("restarts.restart_action_sent")
-    server_back_online: str = yaml_key("restarts.back_online")
-    server_back_online_broadcast: str = yaml_key("restarts.back_online_broadcast")
-    server_failed_restart: str = yaml_key("restarts.failed_restart")

serverwatcher-5.9.dev4/src/serverwatcher/configclasses/watcher.py

@@ -1,32 +0,0 @@
-from dataclasses import field
-from hungerlib import datamap, datamap_api
-
-def yaml_key(path: str, default=None):
-    return field(default=default, metadata={"yaml_key": path})
-
-@datamap(syntax=datamap_api.braces)
-class WatcherConfig:
-    watch_interval: int = yaml_key("watch_interval")
-    schedule_control: bool = yaml_key("schedule_control.enabled")
-    restart_soon_id: int = yaml_key("schedule_control.restart_soon_id")
-
-    threshold_ram: int = yaml_key("thresholds.ram")
-    threshold_cpu: int = yaml_key("thresholds.cpu")
-    threshold_uptime: int = yaml_key("thresholds.uptime")
-    threshold_tps: float = yaml_key("thresholds.tps")
-
-    weight_restart_soon: int = yaml_key("weights.restart_soon")
-    weight_ram: int = yaml_key("weights.ram")
-    weight_cpu: int = yaml_key("weights.cpu")
-    weight_uptime: int = yaml_key("weights.uptime")
-    weight_tps: int = yaml_key("weights.tps")
-
-    weight_low_uptime: int = yaml_key("weights.low_uptime")
-    weight_per_player: int = yaml_key("weights.per_player")
-
-    low_gap_minutes: int = yaml_key("gaps.low_gap_minutes")
-    high_gap_minutes: int = yaml_key("gaps.high_gap_minutes")
-
-    restart_wait_seconds: int = yaml_key("restart.wait_seconds")
-    restart_timeout: int = yaml_key("restart.online_timeout")
-    restart_online_interval: int = yaml_key("restart.online_interval")