trainerbase 4.1.0__tar.gz → 4.1.2__tar.gz

{trainerbase-4.1.0 → trainerbase-4.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: trainerbase
-Version: 4.1.0
+Version: 4.1.2
 Summary: Framework for creating game trainers/mods
 Home-page: https://gitlab.com/python-trainers/trainer-base
 License: MIT
@@ -16,7 +16,7 @@ Requires-Dist: keyboard (>=0.13.5,<0.14.0)
 Requires-Dist: mouse (>=0.7.1,<0.8.0)
 Requires-Dist: psutil (>=6.1.0,<7.0.0)
 Requires-Dist: pyinjector (>=1.3.0,<2.0.0)
-Requires-Dist: pymem (>=1.13.3,<2.0.0)
+Requires-Dist: pymem (>=1.14.0,<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.1.0 → trainerbase-4.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "trainerbase"
-version = "4.1.0"
+version = "4.1.2"
 description = "Framework for creating game trainers/mods"
 authors = ["v01d <v01d@v01d.ru>", "doomayka <zd@doomayka.ru>"]
 license = "MIT"
@@ -48,7 +48,7 @@ line-ending = "lf"
 
 [tool.poetry.dependencies]
 python = "^3.12"
-pymem = "^1.13.3"
+pymem = "^1.14.0"
 keyboard = "^0.13.5"
 pyttsx3 = "^2.98"
 pyinjector = "^1.3.0"

trainerbase-4.1.2/trainerbase/config.py

@@ -0,0 +1,30 @@
+from pathlib import Path
+from typing import Final
+
+from tomllib import load as load_toml
+
+
+CONFIG_FILE: Final[Path] = Path("./trainerbase.toml")
+
+
+with CONFIG_FILE.resolve().open("rb") as trainerbase_toml:
+    trainerbase_config = load_toml(trainerbase_toml)
+
+
+config_warnings = []
+
+
+try:
+    process_config = trainerbase_config["process"]
+except KeyError:
+    # Legacy section support
+    process_config = trainerbase_config["pymem"]
+    process_config["names"] = process_config["process_names"]
+    del trainerbase_config["pymem"]
+
+    config_warnings.append(
+        "Deprecated config! Use [process] section with field `name` instead of [pymem] with `process_names`"
+    )
+
+
+logging_config = trainerbase_config.get("logging")

{trainerbase-4.1.0 → trainerbase-4.1.2}/trainerbase/logger.py

@@ -1,7 +1,7 @@
 from logging import ERROR, getLogger
 from logging.config import dictConfig
 
-from trainerbase.config import CONFIG_FILE, logging_config
+from trainerbase.config import CONFIG_FILE, config_warnings, logging_config
 
 
 if logging_config is None:
@@ -38,3 +38,6 @@ logger = getLogger("TrainerBase")
 
 if using_default_config:
     logger.debug(f"No logging config in {CONFIG_FILE}! Using default one.")
+
+for warning_message in config_warnings:
+    logger.warning(warning_message)

{trainerbase-4.1.0 → trainerbase-4.1.2}/trainerbase/memory.py

@@ -82,7 +82,7 @@ class AOBScan(AbstractAddress):
 
             find_aob = partial(pattern_scan_module, pm.process_handle, module, return_multiple=return_multiple)
 
-        scan_result: list[int] | int | None = find_aob(self.aob)
+        scan_result: list[int] | int | None = find_aob(self.aob, check_memory_protection=False)
 
         if not scan_result:
             raise ValueError(f"AOB not found: {self.aob}")

{trainerbase-4.1.0 → trainerbase-4.1.2}/trainerbase/process.py

@@ -7,7 +7,7 @@ from typing import cast
 from psutil import Process, pid_exists, process_iter
 from pymem import Pymem
 
-from trainerbase.config import pymem_config
+from trainerbase.config import process_config
 from trainerbase.logger import logger
 
 
@@ -59,9 +59,9 @@ def get_target_pid(process_names: Iterable[str], *, exact_match: bool, ignore_ca
 
 
 def attach_to_process() -> Pymem:
-    process_names = pymem_config["process_names"]
-    exact_match = pymem_config["exact_match"]
-    ignore_case = pymem_config["ignore_case"]
+    process_names = process_config["names"]
+    exact_match = process_config["exact_match"]
+    ignore_case = process_config["ignore_case"]
 
     if not process_names:
         raise ValueError("Empty process name list")

trainerbase-4.1.0/trainerbase/config.py

@@ -1,15 +0,0 @@
-from pathlib import Path
-from typing import Final
-
-from tomllib import load as load_toml
-
-
-CONFIG_FILE: Final[Path] = Path("./trainerbase.toml")
-
-
-with CONFIG_FILE.resolve().open("rb") as trainerbase_toml:
-    trainerbase_config = load_toml(trainerbase_toml)
-
-
-pymem_config = trainerbase_config["pymem"]
-logging_config = trainerbase_config.get("logging")