chore: Misc; Optimization TODO

Author: fgmacedo

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0
+    rev: v4.6.0
     hooks:
     -   id: check-yaml
     -   id: end-of-file-fixer
@@ -9,7 +9,7 @@ repos:
         exclude: docs/auto_examples
 - repo: https://github.com/charliermarsh/ruff-pre-commit
   # Ruff version.
-  rev: v0.3.7
+  rev: v0.8.1
   hooks:
     # Run the linter.
     - id: ruff

docs/guards.md

@@ -77,7 +77,7 @@ The mini-language is based on Python's built-in language and the [`ast`](https:/
      4. `!=` — Not equal.
      5. `<` — Lower than.
      6. `<=` — Lower than or equal.
-  - See the [comparisons](https://docs.python.org/3/reference/expressions.html#comparisons) from Python's.
+   - All comparison operations in Python have the same priority.
 
 3. **Parentheses for precedence**:
    - When operators with the same precedence appear in the expression, evaluation proceeds from left to right, unless parentheses specify a different order.
@@ -100,19 +100,6 @@ Being used on a transition definition:
 start.to(end, cond="frodo_has_ring and gandalf_present or !sauron_alive")
 ```
 
-#### Summary of grammar rules
-
-The mini-language is formally specified as follows:
-
-```
-Name: [A-Za-z_][A-Za-z0-9_]*
-Boolean Expression:
-
-<boolean_expr> ::= <term> | <boolean_expr> 'or' <term> | <boolean_expr> 'v' <term>
-<term> ::= <factor> | <term> 'and' <factor> | <term> '^' <factor>
-<factor> ::= 'not' <factor> | '!' <factor> | '(' <boolean_expr> ')' | <name>
-
-```
 
 ```{seealso}
 See {ref}`sphx_glr_auto_examples_lor_machine.py` for an example of

pyproject.toml

@@ -33,7 +33,7 @@ diagrams = ["pydot >= 2.0.0"]
 
 [dependency-groups]
 dev = [
-    "ruff >=0.4.8",
+    "ruff >=0.8.1",
     "pre-commit",
     "mypy",
     "pytest",
@@ -82,6 +82,7 @@ doctest_optionflags = "ELLIPSIS IGNORE_EXCEPTION_DETAIL NORMALIZE_WHITESPACE IGN
 asyncio_mode = "auto"
 markers = ["""slow: marks tests as slow (deselect with '-m "not slow"')"""]
 python_files = ["tests.py", "test_*.py", "*_tests.py"]
+xfail_strict = true
 
 [tool.coverage.run]
 branch = true
@@ -112,7 +113,7 @@ directory = "tmp/htmlcov"
 show_contexts = true
 
 [tool.mypy]
-python_version = "3.12"
+python_version = "3.13"
 warn_return_any = true
 warn_unused_configs = true
 disable_error_code = "annotation-unchecked"
@@ -126,7 +127,7 @@ ignore_missing_imports = true
 src = ["statemachine"]
 
 line-length = 99
-target-version = "py312"
+target-version = "py313"
 
 # Exclude a variety of commonly ignored directories.
 exclude = [
@@ -178,7 +179,7 @@ dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
 "tests/examples/**.py" = ["B018"]
 
 [tool.ruff.lint.mccabe]
-max-complexity = 6
+max-complexity = 10
 
 [tool.ruff.lint.isort]
 force-single-line = true

statemachine/state.py

@@ -36,7 +36,7 @@ def __call__(self, *states: "State", **kwargs):
 
 class _FromState(_TransitionBuilder):
     def any(self, **kwargs):
-        """Create transitions from all non-finalstates (reversed)."""
+        """Create transitions from all non-final states (reversed)."""
         return self.__call__(AnyState(), **kwargs)
 
     def __call__(self, *states: "State", **kwargs):

tests/test_spec_parser.py

@@ -218,3 +218,44 @@ def variable_hook(var_name):
     parsed_expr = parse_boolean_expr(expr, variable_hook, operator_mapping)
 
     assert parsed_expr is original_callback
+
+
+@pytest.mark.parametrize(
+    ("expression", "expected", "hooks_called"),
+    [
+        ("49 < frodo_age < 51", True, ["frodo_age"]),
+        ("49 < frodo_age > 50", False, ["frodo_age"]),
+        (
+            "aragorn_age < legolas_age < gimli_age",
+            False,
+            ["aragorn_age", "legolas_age", "gimli_age"],
+        ),  # 87 < 2931 and 2931 < 139
+        (
+            "gimli_age > aragorn_age < legolas_age",
+            True,
+            ["gimli_age", "aragorn_age", "legolas_age"],
+        ),  # 139 > 87 and 87 < 2931
+        (
+            "sword_power < ring_power > bow_power",
+            True,
+            ["sword_power", "ring_power", "bow_power"],
+        ),  # 80 < 100 and 100 > 75
+        (
+            "axe_power > sword_power == bow_power",
+            False,
+            ["axe_power", "sword_power", "bow_power"],
+        ),  # 85 > 80 and 80 == 75
+        ("height > 1 and height < 2", True, ["height"]),
+    ],
+)
+@pytest.mark.xfail(reason="TODO: Optimize so that expressios are evaluated only once")
+def test_should_evaluate_values_only_once(expression, expected, caplog, hooks_called):
+    caplog.set_level(logging.DEBUG, logger="tests")
+
+    parsed_expr = parse_boolean_expr(expression, variable_hook, operator_mapping)
+    assert parsed_expr() is expected, expression
+
+    if hooks_called:
+        assert caplog.record_tuples == [
+            ("tests.test_spec_parser", DEBUG, f"variable_hook({hook})") for hook in hooks_called
+        ]