python-statemachine 2.3.6__py3-none-any.whl → 2.4.0__py3-none-any.whl

statemachine/locale/en/LC_MESSAGES/statemachine.po

@@ -3,7 +3,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.3.0\n"
+"Project-Id-Version: 2.4.0\n"
 "Report-Msgid-Bugs-To: fgmacedo@gmail.com\n"
 "POT-Creation-Date: 2023-03-04 16:10-0300\n"
 "PO-Revision-Date: 2024-06-07 17:41-0300\n"
@@ -13,68 +13,80 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.12.1\n"
 
-#: statemachine/callbacks.py:289
+#: statemachine/callbacks.py:165
+msgid "Failed to parse boolean expression '{}'"
+msgstr ""
+
+#: statemachine/callbacks.py:407 statemachine/callbacks.py:412
 msgid "Did not found name '{}' from model or statemachine"
 msgstr ""
 
-#: statemachine/exceptions.py:23
+#: statemachine/exceptions.py:24
 msgid "{!r} is not a valid state value."
 msgstr ""
 
-#: statemachine/exceptions.py:37
+#: statemachine/exceptions.py:38
 msgid "Can't {} when in {}."
 msgstr ""
 
-#: statemachine/factory.py:73
+#: statemachine/factory.py:74
 msgid "There are no states."
 msgstr ""
 
-#: statemachine/factory.py:76
+#: statemachine/factory.py:77
 msgid "There are no events."
 msgstr ""
 
-#: statemachine/factory.py:88
+#: statemachine/factory.py:89
 msgid ""
 "There should be one and only one initial state. You currently have these:"
 " {!r}"
 msgstr ""
 
-#: statemachine/factory.py:101
+#: statemachine/factory.py:102
 msgid "Cannot declare transitions from final state. Invalid state(s): {}"
 msgstr ""
 
-#: statemachine/factory.py:109
+#: statemachine/factory.py:110
 msgid ""
 "All non-final states should have at least one outgoing transition. These "
 "states have no outgoing transition: {!r}"
 msgstr ""
 
-#: statemachine/factory.py:123
+#: statemachine/factory.py:124
 msgid ""
 "All non-final states should have at least one path to a final state. "
 "These states have no path to a final state: {!r}"
 msgstr ""
 
-#: statemachine/factory.py:147
+#: statemachine/factory.py:148
 msgid ""
 "There are unreachable states. The statemachine graph should have a single"
 " component. Disconnected states: {}"
 msgstr ""
 
-#: statemachine/mixins.py:23
+#: statemachine/factory.py:257
+msgid "An event in the '{}' has no id."
+msgstr ""
+
+#: statemachine/mixins.py:26
 msgid "{!r} is not a valid state machine name."
 msgstr ""
 
-#: statemachine/state.py:152
+#: statemachine/state.py:155
 msgid "State overriding is not allowed. Trying to add '{}' to {}"
 msgstr ""
 
-#: statemachine/statemachine.py:86
+#: statemachine/statemachine.py:94
 msgid "There are no states or transitions."
 msgstr ""
 
-#: statemachine/statemachine.py:249
+#: statemachine/statemachine.py:285
 msgid ""
 "There's no current state set. In async code, did you activate the initial"
 " state? (e.g., `await sm.activate_initial_state()`)"
 msgstr ""
+
+#: statemachine/engines/async_.py:22
+msgid "Only RTC is supported on async engine"
+msgstr ""

statemachine/locale/hi_IN/LC_MESSAGES/statemachine.po

@@ -0,0 +1,93 @@
+# This file is distributed under the same license as the  project.
+# Fernando Macedo <fgmacedo@gmail.com>, 2024.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version:  2.4.0\n"
+"Report-Msgid-Bugs-To: fgmacedo@gmail.com\n"
+"POT-Creation-Date: 2023-03-04 16:10-0300\n"
+"PO-Revision-Date: 2024-06-07 17:41-0300\n"
+"Last-Translator: Fernando Macedo <fgmacedo@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.14.0\n"
+
+#: statemachine/callbacks.py:165
+msgid "Failed to parse boolean expression '{}'"
+msgstr "बूलियन अभिव्यक्ति '{}' को पार्स करने में विफल रहा"
+
+#: statemachine/callbacks.py:407 statemachine/callbacks.py:412
+msgid "Did not found name '{}' from model or statemachine"
+msgstr "मॉडल या स्टेटमशीन में नाम '{}' नहीं मिला"
+
+#: statemachine/exceptions.py:24
+msgid "{!r} is not a valid state value."
+msgstr "{!r} एक मान्य स्टेट मान नहीं है।"
+
+#: statemachine/exceptions.py:38
+msgid "Can't {} when in {}."
+msgstr "{} स्थिति में {} नहीं कर सकते।"
+
+#: statemachine/factory.py:74
+msgid "There are no states."
+msgstr "कोई स्टेट नहीं है।"
+
+#: statemachine/factory.py:77
+msgid "There are no events."
+msgstr "कोई इवेंट नहीं है।"
+
+#: statemachine/factory.py:89
+msgid ""
+"There should be one and only one initial state. You currently have these:"
+" {!r}"
+msgstr "एक और केवल एक प्रारंभिक स्टेट होना चाहिए। वर्तमान में आपके पास ये हैं: {!r}"
+
+#: statemachine/factory.py:102
+msgid "Cannot declare transitions from final state. Invalid state(s): {}"
+msgstr "अंतिम स्टेट से ट्रांज़िशन घोषित नहीं कर सकते। अमान्य स्टेट: {}"
+
+#: statemachine/factory.py:110
+msgid ""
+"All non-final states should have at least one outgoing transition. These "
+"states have no outgoing transition: {!r}"
+msgstr "सभी गैर-अंतिम स्टेट में कम से कम एक आउटगोइंग ट्रांज़िशन होना चाहिए। इन स्टेट में कोई आउटगोइंग ट्रांज़िशन नहीं है: {!r}"
+
+#: statemachine/factory.py:124
+msgid ""
+"All non-final states should have at least one path to a final state. "
+"These states have no path to a final state: {!r}"
+msgstr "सभी गैर-अंतिम स्टेट में अंतिम स्टेट तक कम से कम एक पथ होना चाहिए। इन स्टेट में अंतिम स्टेट तक कोई पथ नहीं है: {!r}"
+
+#: statemachine/factory.py:148
+msgid ""
+"There are unreachable states. The statemachine graph should have a single"
+" component. Disconnected states: {}"
+msgstr "कुछ स्टेट पहुंच योग्य नहीं हैं। स्टेटमशीन ग्राफ में एक ही घटक होना चाहिए। डिस्कनेक्टेड स्टेट: {}"
+
+#: statemachine/factory.py:257
+msgid "An event in the '{}' has no id."
+msgstr "'{}' में एक इवेंट का आईडी नहीं है।"
+
+#: statemachine/mixins.py:26
+msgid "{!r} is not a valid state machine name."
+msgstr "{!r} एक मान्य स्टेटमशीन नाम नहीं है।"
+
+#: statemachine/state.py:155
+msgid "State overriding is not allowed. Trying to add '{}' to {}"
+msgstr "स्टेट ओवरराइड करना अनुमति नहीं है। '{}' को {} में जोड़ने की कोशिश कर रहे हैं"
+
+#: statemachine/statemachine.py:94
+msgid "There are no states or transitions."
+msgstr "कोई स्टेट या ट्रांज़िशन नहीं हैं।"
+
+#: statemachine/statemachine.py:285
+msgid ""
+"There's no current state set. In async code, did you activate the initial"
+" state? (e.g., `await sm.activate_initial_state()`)"
+msgstr "कोई वर्तमान स्टेट सेट नहीं है। असिंक्रोनस कोड में, क्या आपने प्रारंभिक स्टेट को सक्रिय किया? (उदाहरण: `await sm.activate_initial_state()`)"
+
+#: statemachine/engines/async_.py:22
+msgid "Only RTC is supported on async engine"
+msgstr "असिंक्रोनस इंजन पर केवल RTC समर्थित है"

statemachine/locale/pt_BR/LC_MESSAGES/statemachine.po

@@ -3,7 +3,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version:  2.3.0\n"
+"Project-Id-Version:  2.4.0\n"
 "Report-Msgid-Bugs-To: fgmacedo@gmail.com\n"
 "POT-Creation-Date: 2023-03-04 16:10-0300\n"
 "PO-Revision-Date: 2024-06-07 17:41-0300\n"
@@ -14,78 +14,80 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: statemachine/callbacks.py:289
+#: statemachine/callbacks.py:165
+msgid "Failed to parse boolean expression '{}'"
+msgstr "Falha ao interpretar a expressão booleana '{}'"
+
+#: statemachine/callbacks.py:407 statemachine/callbacks.py:412
 msgid "Did not found name '{}' from model or statemachine"
-msgstr "Não encontrou o nome '{}' no modelo ou na máquina de estados"
+msgstr "Nome '{}' não encontrado no modelo ou na máquina de estados"
 
-#: statemachine/exceptions.py:23
+#: statemachine/exceptions.py:24
 msgid "{!r} is not a valid state value."
 msgstr "{!r} não é um valor de estado válido."
 
-#: statemachine/exceptions.py:37
+#: statemachine/exceptions.py:38
 msgid "Can't {} when in {}."
-msgstr "Não é possível {} quando está em {}."
+msgstr "Não é possível {} quando em {}."
 
-#: statemachine/factory.py:73
+#: statemachine/factory.py:74
 msgid "There are no states."
 msgstr "Não há estados."
 
-#: statemachine/factory.py:76
+#: statemachine/factory.py:77
 msgid "There are no events."
 msgstr "Não há eventos."
 
-#: statemachine/factory.py:88
+#: statemachine/factory.py:89
 msgid ""
 "There should be one and only one initial state. You currently have these:"
 " {!r}"
-msgstr "Deve haver um e apenas um estado inicial. Você atualmente tem estes: {!r}"
+msgstr "Deve haver um e apenas um estado inicial. Atualmente, você possui estes: {!r}"
 
-#: statemachine/factory.py:101
+#: statemachine/factory.py:102
 msgid "Cannot declare transitions from final state. Invalid state(s): {}"
-msgstr ""
-"Não é possível declarar transições a partir do estado final. Estado(s) "
-"inválido(s): {}"
+msgstr "Não é possível declarar transições a partir de um estado final. Estado(s) inválido(s): {}"
 
-#: statemachine/factory.py:109
+#: statemachine/factory.py:110
 msgid ""
 "All non-final states should have at least one outgoing transition. These "
 "states have no outgoing transition: {!r}"
-msgstr ""
-"Todos os estados não finais devem ter pelo menos uma transição de saída. "
-"Esses estados não têm transição de saída: {!r}"
+msgstr "Todos os estados não finais devem ter pelo menos uma transição de saída. Estes estados não possuem transição de saída: {!r}"
 
-#: statemachine/factory.py:123
+#: statemachine/factory.py:124
 msgid ""
 "All non-final states should have at least one path to a final state. "
 "These states have no path to a final state: {!r}"
-msgstr ""
-"Todos os estados não finais devem ter pelo menos um caminho para um "
-"estado final. Esses estados não têm caminho para um estado final: {!r}"
+msgstr "Todos os estados não finais devem ter pelo menos um caminho para um estado final. Estes estados não possuem caminho para um estado final: {!r}"
 
-#: statemachine/factory.py:147
+#: statemachine/factory.py:148
 msgid ""
 "There are unreachable states. The statemachine graph should have a single"
 " component. Disconnected states: {}"
-msgstr ""
-"Há estados inacessíveis. O gráfico da máquina de estados deve ter um "
-"único componente. Estados desconectados: {}"
+msgstr "Há estados inacessíveis. O grafo da máquina de estados deve ter um único componente. Estados desconectados: {}"
+
+#: statemachine/factory.py:257
+msgid "An event in the '{}' has no id."
+msgstr "Um evento em '{}' não possui id."
 
-#: statemachine/mixins.py:23
+#: statemachine/mixins.py:26
 msgid "{!r} is not a valid state machine name."
-msgstr "{!r} não é um nome válido para uma máquina de estados."
+msgstr "{!r} não é um nome de máquina de estados válido."
 
-#: statemachine/state.py:152
+#: statemachine/state.py:155
 msgid "State overriding is not allowed. Trying to add '{}' to {}"
 msgstr "Sobrescrever estados não é permitido. Tentando adicionar '{}' a {}"
 
-#: statemachine/statemachine.py:86
+#: statemachine/statemachine.py:94
 msgid "There are no states or transitions."
 msgstr "Não há estados ou transições."
 
-#: statemachine/statemachine.py:249
+#: statemachine/statemachine.py:285
 msgid ""
 "There's no current state set. In async code, did you activate the initial"
 " state? (e.g., `await sm.activate_initial_state()`)"
-msgstr ""
-"Não há estado atual definido. No código assíncrono, você ativou o estado"
-" inicial? (por exemplo, `await sm.activate_initial_state()`)"
+msgstr "Nenhum estado atual definido. Em código assíncrono, você ativou o estado inicial? (ex.: `await sm.activate_initial_state()`)"
+
+#: statemachine/engines/async_.py:22
+msgid "Only RTC is supported on async engine"
+msgstr "Apenas RTC é suportado no motor assíncrono"

statemachine/locale/zh_CN/LC_MESSAGES/statemachine.po

@@ -0,0 +1,93 @@
+# This file is distributed under the same license as the  project.
+# Fernando Macedo <fgmacedo@gmail.com>, 2024.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version:  2.4.0\n"
+"Report-Msgid-Bugs-To: fgmacedo@gmail.com\n"
+"POT-Creation-Date: 2023-03-04 16:10-0300\n"
+"PO-Revision-Date: 2024-06-07 17:41-0300\n"
+"Last-Translator: Fernando Macedo <fgmacedo@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.14.0\n"
+
+#: statemachine/callbacks.py:165
+msgid "Failed to parse boolean expression '{}'"
+msgstr "无法解析布尔表达式 '{}'"
+
+#: statemachine/callbacks.py:407 statemachine/callbacks.py:412
+msgid "Did not found name '{}' from model or statemachine"
+msgstr "在模型或状态机中未找到名称 '{}'"
+
+#: statemachine/exceptions.py:24
+msgid "{!r} is not a valid state value."
+msgstr "{!r} 不是有效的状态值。"
+
+#: statemachine/exceptions.py:38
+msgid "Can't {} when in {}."
+msgstr "在 {} 时无法 {}。"
+
+#: statemachine/factory.py:74
+msgid "There are no states."
+msgstr "没有状态。"
+
+#: statemachine/factory.py:77
+msgid "There are no events."
+msgstr "没有事件。"
+
+#: statemachine/factory.py:89
+msgid ""
+"There should be one and only one initial state. You currently have these:"
+" {!r}"
+msgstr "应有且仅有一个初始状态。当前您有这些：{!r}"
+
+#: statemachine/factory.py:102
+msgid "Cannot declare transitions from final state. Invalid state(s): {}"
+msgstr "无法从终止状态声明转换。无效状态：{}"
+
+#: statemachine/factory.py:110
+msgid ""
+"All non-final states should have at least one outgoing transition. These "
+"states have no outgoing transition: {!r}"
+msgstr "所有非终止状态都应至少有一个外部转换。这些状态没有外部转换：{!r}"
+
+#: statemachine/factory.py:124
+msgid ""
+"All non-final states should have at least one path to a final state. "
+"These states have no path to a final state: {!r}"
+msgstr "所有非终止状态应至少有一个到终止状态的路径。这些状态没有到终止状态的路径：{!r}"
+
+#: statemachine/factory.py:148
+msgid ""
+"There are unreachable states. The statemachine graph should have a single"
+" component. Disconnected states: {}"
+msgstr "存在不可到达的状态。状态机图应具有单个组件。断开的状态：{}"
+
+#: statemachine/factory.py:257
+msgid "An event in the '{}' has no id."
+msgstr "'{}' 中的事件没有 ID。"
+
+#: statemachine/mixins.py:26
+msgid "{!r} is not a valid state machine name."
+msgstr "{!r} 不是有效的状态机名称。"
+
+#: statemachine/state.py:155
+msgid "State overriding is not allowed. Trying to add '{}' to {}"
+msgstr "不允许覆盖状态。尝试将 '{}' 添加到 {}"
+
+#: statemachine/statemachine.py:94
+msgid "There are no states or transitions."
+msgstr "没有状态或转换。"
+
+#: statemachine/statemachine.py:285
+msgid ""
+"There's no current state set. In async code, did you activate the initial"
+" state? (e.g., `await sm.activate_initial_state()`)"
+msgstr "没有设置当前状态。在异步代码中，您是否激活了初始状态？（例如，`await sm.activate_initial_state()`）"
+
+#: statemachine/engines/async_.py:22
+msgid "Only RTC is supported on async engine"
+msgstr "异步引擎仅支持 RTC"

statemachine/spec_parser.py

@@ -0,0 +1,79 @@
+import ast
+import re
+from typing import Callable
+
+replacements = {"!": "not ", "^": " and ", "v": " or "}
+
+pattern = re.compile(r"\!|\^|\bv\b")
+
+
+def replace_operators(expr: str) -> str:
+    # preprocess the expression adding support for classical logical operators
+    def match_func(match):
+        return replacements[match.group(0)]
+
+    return pattern.sub(match_func, expr)
+
+
+def custom_not(predicate: Callable) -> Callable:
+    def decorated(*args, **kwargs) -> bool:
+        return not predicate(*args, **kwargs)
+
+    decorated.__name__ = f"not({predicate.__name__})"
+    unique_key = getattr(predicate, "unique_key", "")
+    decorated.unique_key = f"not({unique_key})"  # type: ignore[attr-defined]
+    return decorated
+
+
+def _unique_key(left, right, operator) -> str:
+    left_key = getattr(left, "unique_key", "")
+    right_key = getattr(right, "unique_key", "")
+    return f"{left_key} {operator} {right_key}"
+
+
+def custom_and(left: Callable, right: Callable) -> Callable:
+    def decorated(*args, **kwargs) -> bool:
+        return left(*args, **kwargs) and right(*args, **kwargs)  # type: ignore[no-any-return]
+
+    decorated.__name__ = f"({left.__name__} and {right.__name__})"
+    decorated.unique_key = _unique_key(left, right, "and")  # type: ignore[attr-defined]
+    return decorated
+
+
+def custom_or(left: Callable, right: Callable) -> Callable:
+    def decorated(*args, **kwargs) -> bool:
+        return left(*args, **kwargs) or right(*args, **kwargs)  # type: ignore[no-any-return]
+
+    decorated.__name__ = f"({left.__name__} or {right.__name__})"
+    decorated.unique_key = _unique_key(left, right, "or")  # type: ignore[attr-defined]
+    return decorated
+
+
+def build_expression(node, variable_hook, operator_mapping):
+    if isinstance(node, ast.BoolOp):
+        # Handle `and` / `or` operations
+        operator_fn = operator_mapping[type(node.op)]
+        left_expr = build_expression(node.values[0], variable_hook, operator_mapping)
+        for right in node.values[1:]:
+            right_expr = build_expression(right, variable_hook, operator_mapping)
+            left_expr = operator_fn(left_expr, right_expr)
+        return left_expr
+    elif isinstance(node, ast.UnaryOp) and isinstance(node.op, ast.Not):
+        # Handle `not` operation
+        operand_expr = build_expression(node.operand, variable_hook, operator_mapping)
+        return operator_mapping[type(node.op)](operand_expr)
+    elif isinstance(node, ast.Name):
+        # Handle variables by calling the variable_hook
+        return variable_hook(node.id)
+    else:
+        raise ValueError(f"Unsupported expression structure: {node.__class__.__name__}")
+
+
+def parse_boolean_expr(expr, variable_hook, operator_mapping):
+    """Parses the expression into an AST and build a custom expression tree"""
+    expr = replace_operators(expr)
+    tree = ast.parse(expr, mode="eval")
+    return build_expression(tree.body, variable_hook, operator_mapping)
+
+
+operator_mapping = {ast.Or: custom_or, ast.And: custom_and, ast.Not: custom_not}

statemachine/state.py

@@ -92,6 +92,13 @@ class State:
     >>> [(t.source.name, t.target.name) for t in transitions]
     [('Draft', 'Draft'), ('Draft', 'Producing'), ('Draft', 'Closed')]
 
+    Sometimes it's easier to use the :func:`State.from_` method:
+
+    >>> transitions = closed.from_(draft, producing, closed)
+
+    >>> [(t.source.name, t.target.name) for t in transitions]
+    [('Draft', 'Closed'), ('Producing', 'Closed'), ('Closed', 'Closed')]
+
     """
 
     def __init__(

statemachine/statemachine.py

@@ -18,7 +18,7 @@ from .dispatcher import Listener
 from .dispatcher import Listeners
 from .engines.async_ import AsyncEngine
 from .engines.sync import SyncEngine
-from .event import Event
+from .event import BoundEvent
 from .event_data import TriggerData
 from .exceptions import InvalidDefinition
 from .exceptions import InvalidStateValue
@@ -101,7 +101,7 @@ class StateMachine(metaclass=StateMachineMetaclass):
         if self.current_state_value is None:
             trigger_data = TriggerData(
                 machine=self,
-                event="__initial__",
+                event=BoundEvent("__initial__", _sm=self),
             )
             self._put_nonblocking(trigger_data)
 
@@ -168,17 +168,16 @@ class StateMachine(metaclass=StateMachineMetaclass):
         """Bind the state machine events to the target objects."""
 
         for event in self.events:
-            trigger = getattr(self, event.name)
+            trigger = getattr(self, event)
             for target in targets:
-                if hasattr(target, event.name):
+                if hasattr(target, event):
                     warnings.warn(
-                        f"Attribute {event.name!r} already exists on {target!r}. "
-                        f"Skipping binding.",
+                        f"Attribute '{event}' already exists on {target!r}. Skipping binding.",
                         UserWarning,
                         stacklevel=2,
                     )
                     continue
-                setattr(target, event.name, trigger)
+                setattr(target, event, trigger)
 
     def _add_listener(self, listeners: "Listeners", allowed_references: SpecReference = SPECS_ALL):
         register = partial(
@@ -316,21 +315,13 @@ class StateMachine(metaclass=StateMachineMetaclass):
             See: :ref:`triggering events`.
 
         """
-        result = self._async_send(event, *args, **kwargs)
+        event_instance: BoundEvent = getattr(
+            self, event, BoundEvent(id=event, name=event, _sm=self)
+        )
+        result = event_instance(*args, **kwargs)
         if not isawaitable(result):
             return result
         return run_async_from_sync(result)
 
-    def _async_send(self, event: str, *args, **kwargs):
-        """Send an :ref:`Event` to the state machine.
-
-        .. seealso::
-
-            See: :ref:`triggering events`.
-
-        """
-        event_instance: Event = Event(event)
-        return event_instance.trigger(self, *args, **kwargs)
-
     def _get_callbacks(self, key) -> CallbacksExecutor:
         return self._callbacks_registry[key]

statemachine/states.py

@@ -136,14 +136,14 @@ class States:
 
         .. deprecated:: 2.3.3
 
-            On the next major release, the ``use_enum_instance=True`` will be the default.
+            On the next major release, ``use_enum_instance=True`` will be the default.
 
         Args:
             enum_type: An enumeration containing the states of the machine.
             initial: The initial state of the machine.
             final: A set of final states of the machine.
             use_enum_instance: If ``True``, the value of the state will be the enum item instance,
-                otherwise the enum item value.
+                otherwise the enum item value. Defaults to ``False``.
 
         Returns:
             A new instance of the :ref:`States (class)`.

statemachine/transition.py

@@ -1,7 +1,6 @@
 from .callbacks import CallbackGroup
 from .callbacks import CallbackPriority
 from .callbacks import CallbackSpecList
-from .event import same_event_cond_builder
 from .events import Events
 from .exceptions import InvalidDefinition
 
@@ -87,7 +86,7 @@ class Transition:
         on("on_transition", priority=CallbackPriority.GENERIC, is_convention=True)
 
         for event in self._events:
-            same_event_cond = same_event_cond_builder(event)
+            same_event_cond = event.is_same_event
             before(
                 f"before_{event}",
                 priority=CallbackPriority.NAMING,

statemachine/transition_list.py

@@ -1,3 +1,4 @@
+from typing import TYPE_CHECKING
 from typing import Callable
 from typing import Iterable
 from typing import List
@@ -5,6 +6,9 @@ from typing import List
 from .transition import Transition
 from .utils import ensure_iterable
 
+if TYPE_CHECKING:
+    from .events import Event
+
 
 class TransitionList:
     """A list-like container of :ref:`transitions` with callback functions."""
@@ -170,7 +174,7 @@ class TransitionList:
             transition.add_event(event)
 
     @property
-    def unique_events(self) -> List[str]:
+    def unique_events(self) -> List["Event"]:
         """
         Returns a list of unique event names across all transitions in the :ref:`TransitionList`
         instance.

python_statemachine-2.3.6.dist-info/RECORD

@@ -1,32 +0,0 @@
-statemachine/__init__.py,sha256=_tQlx-C4SHRysuQwRTIU3c9C8MJrDlvIVCG0kfuWFBk,192
-statemachine/callbacks.py,sha256=5_WaILrjUvZOYX_LQe4Gd8nsCvkErjw9DaHYG_ggvxs,11101
-statemachine/contrib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-statemachine/contrib/diagram.py,sha256=eK3unncEXNq3e_yfBTZmvgdWWWDZq69r7gsHvCHr5Ys,7208
-statemachine/dispatcher.py,sha256=2DtjCj_kiDF2uk_EEvXxs5NTABOvCr4paxVz77s6mXA,5365
-statemachine/engines/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-statemachine/engines/async_.py,sha256=deZ5oYeoIYX9zOsFEOCT4KXsz5V1F9fbaMDOBATnTkE,5572
-statemachine/engines/sync.py,sha256=cGy23Ivx0Ul4NWSix8E8PNA1Ji4V9qvOd3K_yodD_UI,5523
-statemachine/event.py,sha256=LfvO-imBVyVX6krBK0Pz7q-iTRudo_5OjTFaYJpc6IQ,1556
-statemachine/event_data.py,sha256=x9m9Q2q-78kVFnJVJmOAwq6lo9zgSVxko3q4Omwjqxk,2228
-statemachine/events.py,sha256=QgXcxu25WkUaxJvonh0K7hOlYYSQlV0jbhTCAi_gpwc,736
-statemachine/exceptions.py,sha256=RWq1vTjajxt8CzfYCD4DfI2nrgkfCPBL0DjRDOzKkQI,1086
-statemachine/factory.py,sha256=8rRvDXWGjEX6v6mP7YiXOJPTCcm-GhDmuTvyotw1zoc,7948
-statemachine/graph.py,sha256=KtwB1CYckaLjTgQD9tEeuaEzJje9q3fPVpBViW5TgSk,487
-statemachine/i18n.py,sha256=NLvGseaORmQ0G-V_J8tkjoxh_piWMOm2CI6mBQpLamc,362
-statemachine/locale/en/LC_MESSAGES/statemachine.po,sha256=zJYaV2DxrHdPngDOt1bji8-lPOZMSDjWG83Ypru5DOI,2126
-statemachine/locale/pt_BR/LC_MESSAGES/statemachine.po,sha256=SPrt-KaCBCKQq7PoOMtyyqU1bihrw_3MPL_NbqZzTVs,3214
-statemachine/mixins.py,sha256=Y1fa52Cj20JaGkyNk3P7Gpqkt4cGTjJ0YyV_VQyCl0M,1231
-statemachine/model.py,sha256=OylI3FjMiHpYyDl9mtK1zEJMeSvemaN4giQDonpc8kI,211
-statemachine/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-statemachine/registry.py,sha256=HmV9sUGkYVrNUZxJYoZo-trSUis7dIun_WcGktblgc8,922
-statemachine/signature.py,sha256=HwuyWX3p_GZwKKrGbt9wk4-bHpymqs_pgqW7OlDgGRc,7877
-statemachine/state.py,sha256=IKdkMBkXCgcvswMKQZ-hn0-739Hhf6z6q8mSEoevV7o,8262
-statemachine/statemachine.py,sha256=IvvQ9NKQAdfMXD5xc7Henvy3YrLd5vjN1APG-WnhmlM,11574
-statemachine/states.py,sha256=vpRNjiGmTDHvE0fn0gwdq8-WcG32n4ZiPTU-kgZ73rc,4870
-statemachine/transition.py,sha256=R7gfSZjqR59OIdpKePgdr66zTp5azow-tDqqYJsECR4,4711
-statemachine/transition_list.py,sha256=_tdFD1O7hw8xVAU6nRYmGrj6TCAM0SD-Sa0_DYKa88Y,6034
-statemachine/utils.py,sha256=DpcrGqlbrnT-ogh-BogG0L07EG3KirHOsKORHlspDlI,1041
-python_statemachine-2.3.6.dist-info/LICENSE,sha256=zcP7TsJMqaFxuTvLRZPT7nJl3_ppjxR9Z76BE9pL5zc,1074
-python_statemachine-2.3.6.dist-info/METADATA,sha256=Ozs8cZly2wGdAlvS144fRCe_umkG6lbqGpJHZxgpihc,14036
-python_statemachine-2.3.6.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-python_statemachine-2.3.6.dist-info/RECORD,,