trainerbase 4.0.6__tar.gz → 4.0.8__tar.gz

{trainerbase-4.0.6 → trainerbase-4.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: trainerbase
-Version: 4.0.6
+Version: 4.0.8
 Summary: Framework for creating game trainers/mods
 Home-page: https://gitlab.com/python-trainers/trainer-base
 License: MIT
@@ -13,9 +13,9 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: dearpygui (>=2.0.0,<3.0.0)
 Requires-Dist: keyboard (>=0.13.5,<0.14.0)
 Requires-Dist: mouse (>=0.7.1,<0.8.0)
-Requires-Dist: psutil (>=6.0.0,<7.0.0)
+Requires-Dist: psutil (>=6.1.0,<7.0.0)
 Requires-Dist: pyinjector (>=1.3.0,<2.0.0)
-Requires-Dist: pymem (>=1.13.1,<2.0.0)
+Requires-Dist: pymem (>=1.13.3,<2.0.0)
 Requires-Dist: pyttsx3 (>=2.98,<3.0)
 Project-URL: Repository, https://gitlab.com/python-trainers/trainer-base
 Description-Content-Type: text/markdown

{trainerbase-4.0.6 → trainerbase-4.0.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "trainerbase"
-version = "4.0.6"
+version = "4.0.8"
 description = "Framework for creating game trainers/mods"
 authors = ["v01d <v01d@v01d.ru>", "doomayka <zd@doomayka.ru>"]
 license = "MIT"
@@ -17,7 +17,7 @@ include = [
 ]
 
 [tool.poetry.group.dev.dependencies]
-ruff = "^0.6.9"
+ruff = "^0.7.0"
 
 [tool.ruff]
 src = ["trainerbase"]
@@ -48,11 +48,11 @@ line-ending = "lf"
 
 [tool.poetry.dependencies]
 python = ">=3.12,<3.14"
-pymem = "^1.13.1"
+pymem = "^1.13.3"
 keyboard = "^0.13.5"
 pyttsx3 = "^2.98"
 pyinjector = "^1.3.0"
-psutil = "^6.0.0"
+psutil = "^6.1.0"
 mouse = "^0.7.1"
 dearpygui = "^2.0.0"
 

{trainerbase-4.0.6 → trainerbase-4.0.8}/trainerbase/gui/misc.py

@@ -1,3 +1,4 @@
+from collections.abc import Callable
 from typing import override
 
 from dearpygui import dearpygui as dpg
@@ -54,8 +55,26 @@ class HotkeyHandlerUI(AbstractUIComponent):
             case ReleaseHotkeySwitch():
                 dpg.add_text(f"[{self.handler.hotkey}] Toggle {self.label}")
             case SimpleHotkeyHandler():
-                dpg.add_button(label=f"[{self.handler.hotkey}] {self.label}", callback=self.handler.callback)
+                dpg.add_button(
+                    label=f"[{self.handler.hotkey}] {self.label}",
+                    callback=self._ensure_callable_has_dunder_code(self.handler.callback),
+                )
             case _:
                 dpg.add_text(f"[{self.handler.hotkey}] {self.label}")
 
         self.handler.handle()
+
+    @staticmethod
+    def _ensure_callable_has_dunder_code(callable_object: Callable[[], None]) -> Callable[[], None]:
+        """
+        DPG add_button has `callback` arg. In this case `callback.__code__` is required.
+        """
+
+        if hasattr(callable, "__code__"):
+            callback_with_dunder_code = callable_object
+        else:
+
+            def callback_with_dunder_code():
+                callable_object()
+
+        return callback_with_dunder_code

{trainerbase-4.0.6 → trainerbase-4.0.8}/trainerbase/tts.py

@@ -3,22 +3,12 @@ from typing import override
 
 from pyttsx3 import init as init_tts_engine
 
-from trainerbase.logger import logger
 from trainerbase.scriptengine import AbstractBaseScript
 
 
 class TTSManager(AbstractBaseScript):
     def __init__(self, queue_length_limit: int = 5):
-        try:
-            self.__engine = init_tts_engine()
-        except NameError:
-            self.__engine = None
-            logger.error(
-                "Failed to initialize TTS Engine. Installed version of pyttsx3 does not support Python 3.13 yet."
-                " Consider using Python 3.12 or continue with Python 3.13 without TTS."
-                " Also there is maybe new TrainerBase version with fixed pyttsx3."
-            )
-
+        self.__engine = init_tts_engine()
         self.__queue = deque(maxlen=queue_length_limit)
 
     @override
@@ -34,10 +24,6 @@ class TTSManager(AbstractBaseScript):
         self.__queue.popleft()
 
     def __say_sync(self, text: str, rate: int = 210, volume: float = 1.0):
-        if self.__engine is None:
-            logger.debug(f"TTS should say: {text}. But TTS Engine is not initialized!")
-            return
-
         self.__engine.setProperty("rate", rate)
         self.__engine.setProperty("volume", volume)
         self.__engine.say(text)