python-saga-orchestrator 0.2.3.dev0__py3-none-any.whl → 0.2.4__py3-none-any.whl

{python_saga_orchestrator-0.2.3.dev0.dist-info → python_saga_orchestrator-0.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-saga-orchestrator
-Version: 0.2.3.dev0
+Version: 0.2.4
 Summary: Lightweight embedded saga orchestrator for asyncio Python services
 Author-email: Maxim Vasilyev <mayxis@inbox.ru>
 License-Expression: MIT

{python_saga_orchestrator-0.2.3.dev0.dist-info → python_saga_orchestrator-0.2.4.dist-info}/RECORD

@@ -1,6 +1,6 @@
-python_saga_orchestrator-0.2.3.dev0.dist-info/licenses/LICENSE,sha256=ESYyLizI0WWtxMeS7rGVcX3ivMezm-HOd5WdeOh-9oU,1056
+python_saga_orchestrator-0.2.4.dist-info/licenses/LICENSE,sha256=ESYyLizI0WWtxMeS7rGVcX3ivMezm-HOd5WdeOh-9oU,1056
 saga_orchestrator/__init__.py,sha256=FG7zoYhCzpZC_JEsy3ebDraH2ZZ9q3IGIjTGKqBzcF4,2836
-saga_orchestrator/_version.py,sha256=b8lE-OZpo51B0ODVlQA6zcNoIpJ5YIH4JrzxWeFFTE0,533
+saga_orchestrator/_version.py,sha256=oIZQE-4i_2bThWVLsbnRskxqsRwrfcev8lVgZK6VSzM,520
 saga_orchestrator/admin/__init__.py,sha256=TKwKTM7IieI4nlMAbJ0O0OI0KPKfwbclVffNjRtIyAg,80
 saga_orchestrator/admin/api.py,sha256=u_eLELUlaHpEiuHqweNHzBwSYCtotERAiOxyVtUMe2I,1715
 saga_orchestrator/core/__init__.py,sha256=EsUqhbO_CgCYZz0yBnf6OUXH3N-_uxMod4A7yGzvbMY,264
@@ -17,11 +17,11 @@ saga_orchestrator/domain/mixins/saga_step_histrory.py,sha256=phB_oue8ksMMtDiNSER
 saga_orchestrator/domain/mixins/types.py,sha256=FlKee4yNq6y1lXX3W_SeE385udNNg-oZqMxqVXZoEpo,2526
 saga_orchestrator/domain/models/__init__.py,sha256=vgUSmwVdPhKNijFZsfmZ7mQZD8DJgCV4s4hMVQZNlwE,853
 saga_orchestrator/domain/models/builder.py,sha256=D3mVYEJT7QJ0e2dNrR2UNHT5xhRK4te6s5WchU57EIA,816
-saga_orchestrator/domain/models/context.py,sha256=a0nNYTW0S73Qk5ln85Ji9_siEe38qlb9GPH8XpL0Gi8,3886
+saga_orchestrator/domain/models/context.py,sha256=LF-6sjB70J3adrLQFz_zgEfRaErJA9Ci5TxIfYfkePA,3885
 saga_orchestrator/domain/models/notify.py,sha256=SuZILSFNAWcUQtjL-I_c4K6VFJXXhD5LLLC2KoMq8dw,837
 saga_orchestrator/domain/models/retry.py,sha256=UM2ZrSGKDZRiPMj0qOGp36xiTr78CVKsceXFFxtiOug,1362
 saga_orchestrator/domain/models/saga_snapshot.py,sha256=ysnBVB2rw059pC07Py_xzAA-Bv7d1h6ZZuubM_Fv0_4,867
-saga_orchestrator/domain/models/step.py,sha256=-4hWbH2xZpGSI-xFQYHI1SoucXe4Xyq5vQ3t0DH0rQ4,4854
+saga_orchestrator/domain/models/step.py,sha256=GxVQ4Qi0RKTkGt-9P8tIz54WG8VHmEnghiShUT2mW-E,6947
 saga_orchestrator/domain/models/enums/__init__.py,sha256=IFgCFvhHiQl1MSCN_I_w3O8yR94tZvN5Az8M3V3bXEQ,234
 saga_orchestrator/domain/models/enums/saga_status.py,sha256=Evz7Uy4-KrqGWFkb6RHhONCWLePd5Gjezw5u-FLmxw0,397
 saga_orchestrator/domain/models/enums/saga_step_phase.py,sha256=L73jg8q-IdDXPpMjuMRwhfVZbAMYW_42FkdXNKqwiqI,129
@@ -29,7 +29,7 @@ saga_orchestrator/domain/models/enums/saga_step_status.py,sha256=DZN5qgDorhdFbhI
 saga_orchestrator/inbox/__init__.py,sha256=uoLytCCT-2-zr369ZpGmQOB_D63fmwjV9T6sCHYGk64,656
 saga_orchestrator/inbox/contracts.py,sha256=unV7h1Eqil6sZhmpGVE_-9c_voRQhYA3KdE63T79s4U,1768
 saga_orchestrator/inbox/dispatcher.py,sha256=O4Zzi5fRAZIUQqlk3oJof6rl7_CPzvqSVQ_Un-1WkOY,4323
-saga_orchestrator/inbox/models.py,sha256=i6ANKTqDTanmpA2hp5V5pky06u5DoHfo2oCWCsTVQUI,2654
+saga_orchestrator/inbox/models.py,sha256=MBID-3wBepnIetwMMAU22sD9olG_LpNu9K0LyOo_m5c,2632
 saga_orchestrator/inbox/repository.py,sha256=BdcVlBW9zvM7WrsL2S3Rmihmn-Ri6gr69L8ji7qqip8,5286
 saga_orchestrator/inbox/retry.py,sha256=jTxg6tZBl7Vllt89Yw-QdOSObYWXrZWjAyW36mCJHdg,590
 saga_orchestrator/outbox/__init__.py,sha256=g-isr2D737wMV1Mf_vEPFoS34YE6n6l09iKLLAL86uU,917
@@ -37,11 +37,11 @@ saga_orchestrator/outbox/contracts.py,sha256=KhqIDIDvwA26xu4VQJpU6qg2ySmsRAORest
 saga_orchestrator/outbox/dispatcher.py,sha256=BX9WTuTLx1gfu-5jV8_ejpi9nnEilnKLYY_BljJkxC8,3196
 saga_orchestrator/outbox/event.py,sha256=Kj-u_JO55jx3YMTpA9arIvmTgKEAxhH2-WQE1eTi4KU,273
 saga_orchestrator/outbox/factory.py,sha256=_p7XT_ulouBhl9J9fcgWsZkhkjmzkpfIs9m6E55UPdA,1743
-saga_orchestrator/outbox/models.py,sha256=ei8Q1b9NnjAWq5qm0vAIeuj22yWVOFx0UsqGszZA0Q0,2355
+saga_orchestrator/outbox/models.py,sha256=BZRAxfKXPun_qpOG3rzG3QI6AxsW0cVrio6ec-yZjFI,2333
 saga_orchestrator/outbox/repository.py,sha256=A3nCi5UOwQT9mlEY03BrLidyO2sFOQGgYcE4pFeY-pA,4786
 saga_orchestrator/outbox/retry.py,sha256=9Ygz3I0HK0r9imTYevBgz14TkAZphKiOSf0grJpH99c,599
 saga_orchestrator/outbox/serialization.py,sha256=CDicJS95CHhLP47XukJAgfm0baZ83daWXQQF3MyczDo,1687
-python_saga_orchestrator-0.2.3.dev0.dist-info/METADATA,sha256=TKDQ42mOx7sTrACtJtxs60bcDE0AhWQNH8JZz-6c7Lo,10293
-python_saga_orchestrator-0.2.3.dev0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-python_saga_orchestrator-0.2.3.dev0.dist-info/top_level.txt,sha256=XBp_2J8dacJGCoVxIDaUYhSEuOusCN3BD_uhEjBEEBA,18
-python_saga_orchestrator-0.2.3.dev0.dist-info/RECORD,,
+python_saga_orchestrator-0.2.4.dist-info/METADATA,sha256=DC0H0aUU0o7iFem4Mu3FZ7erw8WN460xugFT4DmDqUQ,10288
+python_saga_orchestrator-0.2.4.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+python_saga_orchestrator-0.2.4.dist-info/top_level.txt,sha256=XBp_2J8dacJGCoVxIDaUYhSEuOusCN3BD_uhEjBEEBA,18
+python_saga_orchestrator-0.2.4.dist-info/RECORD,,

saga_orchestrator/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.2.3.dev0'
-__version_tuple__ = version_tuple = (0, 2, 3, 'dev0')
+__version__ = version = '0.2.4'
+__version_tuple__ = version_tuple = (0, 2, 4)
 
 __commit_id__ = commit_id = None

saga_orchestrator/domain/models/context.py

@@ -55,7 +55,6 @@ class SagaStepHistoryEntry(BaseModel):
 
 
 class SagaContext(BaseModel):
-
     model_config = ConfigDict(from_attributes=True, validate_assignment=True)
 
     # -- Core data --

saga_orchestrator/domain/models/step.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import contextlib
 import inspect
 from collections.abc import Callable
 from dataclasses import dataclass
@@ -8,6 +7,7 @@ from datetime import timedelta
 from typing import (
     Any,
     Generic,
+    Mapping,
     TypeAlias,
     TypeVar,
     get_args,
@@ -60,16 +60,16 @@ class InputContext:
         """
         Возвращает тип ('event_type') последнего полученного события.
         """
-        with contextlib.suppress(KeyError, TypeError):
-            return self.context["latest_event_meta"]["event_type"]
-        return None
+        if not isinstance(self.context.latest_event_meta, Mapping):
+            return None
+        return self.context.latest_event_meta.get("event_type")
 
     @property
     def latest_event_payload(self) -> Any | None:
         """
         Возвращает "сырую" полезную нагрузку (payload) последнего полученного события.
         """
-        return self.context.get("latest_event")
+        return self.context.latest_event
 
 
 RootInputMap: TypeAlias = Callable[[InputContext], InputModelT | dict[str, Any]]
@@ -102,16 +102,49 @@ class BaseStep(Generic[InputModelT, OutputModelT]):
 
     def __init_subclass__(cls) -> None:
         super().__init_subclass__()
-        if cls is BaseStep:
+        if cls is BaseStep or inspect.isabstract(cls):
             return
+        generic_base = None
+        for base in getattr(cls, "__orig_bases__", []):
+            origin = get_origin(base)
+            if origin and issubclass(origin, BaseStep):
+                generic_base = base
+                break
+
+        if not generic_base:
+            raise TypeValidationError(
+                f"Could not find generic parameters for {cls.__name__}. "
+                f"Ensure it inherits from a parameterized BaseStep, e.g., BaseStep[MyInput, MyOutput]"
+            )
+
+        concrete_args = get_args(generic_base)
+        if not concrete_args or any(isinstance(arg, TypeVar) for arg in concrete_args):
+            raise TypeValidationError(f"Step '{cls.__name__}' inherits from a generic Step "
+                                      "but was not parameterized with concrete Input/Output models.")
+
+        concrete_input_model, concrete_output_model = concrete_args
+        try:
+            hints = get_type_hints(cls.execute, globalns=inspect.getmodule(cls).__dict__, include_extras=True)
+        except (AttributeError, NameError) as e:
+             raise TypeValidationError(
+                f"Could not resolve type hints for '{cls.__name__}.execute'. "
+                f"Ensure all types are correctly imported. Original error: {e}"
+            )
+
 
-        hints = get_type_hints(cls.execute)
         if "inp" not in hints or "return" not in hints:
             raise TypeValidationError(
                 f"Step '{cls.__name__}' must type annotate execute(inp) and return type"
             )
-        input_model = hints["inp"]
-        output_model = cls._resolve_output_model(hints["return"])
+
+        input_annotation = hints["inp"]
+        if isinstance(input_annotation, TypeVar):
+            input_model = concrete_input_model
+        else:
+            input_model = input_annotation
+
+        return_annotation = hints["return"]
+        output_model = cls._resolve_output_model(return_annotation, concrete_output_model)
         if not (inspect.isclass(input_model) and issubclass(input_model, BaseModel)):
             raise TypeValidationError(
                 f"Step '{cls.__name__}' input must inherit from pydantic BaseModel"
@@ -120,22 +153,36 @@ class BaseStep(Generic[InputModelT, OutputModelT]):
         cls.output_model = output_model
 
     @staticmethod
-    def _resolve_output_model(annotation: Any) -> type[BaseModel]:
+    def _resolve_output_model(annotation: Any, concrete_model: type[BaseModel] | None = None) -> type[BaseModel]:
+        def find_model_in_args(args_tuple: tuple) -> list[type[BaseModel]]:
+            candidates = []
+            for arg in args_tuple:
+                if isinstance(arg, TypeVar) and concrete_model:
+                    candidates.append(concrete_model)
+                elif inspect.isclass(arg) and issubclass(arg, BaseModel):
+                    candidates.append(arg)
+            return list(dict.fromkeys(candidates))
+
         if inspect.isclass(annotation) and issubclass(annotation, BaseModel):
             return annotation
 
         origin = get_origin(annotation)
         if origin is None:
+            if isinstance(annotation, TypeVar) and concrete_model:
+                return concrete_model
             raise TypeValidationError("Step execute return type must include BaseModel")
-        args = tuple(arg for arg in get_args(annotation) if arg is not type(None))
-        model_candidates = [
-            arg for arg in args if inspect.isclass(arg) and issubclass(arg, BaseModel)
-        ]
+
+        args = get_args(annotation)
+        model_candidates = find_model_in_args(args)
         await_candidates = [arg for arg in args if arg is StepAwaitEvent]
+
         if len(model_candidates) == 1 and len(await_candidates) <= 1:
             return model_candidates[0]
+
         raise TypeValidationError(
-            "Step execute return type must be BaseModel or BaseModel | StepAwaitEvent"
+            f"Step execute return type must be BaseModel or BaseModel | StepAwaitEvent. "
+            f"Found models: {[m.__name__ for m in model_candidates]}, "
+            f"Found await events: {len(await_candidates)}."
         )
 
     async def execute(self, inp: InputModelT) -> OutputModelT | StepAwaitEvent:

saga_orchestrator/inbox/models.py

@@ -5,9 +5,8 @@ from datetime import datetime
 from enum import Enum
 from typing import Any
 
-from sqlalchemy import JSON, DateTime
+from sqlalchemy import JSON, DateTime, Integer, String, Text, UniqueConstraint, func
 from sqlalchemy import Enum as SqlEnum
-from sqlalchemy import Integer, String, Text, UniqueConstraint, func
 from sqlalchemy.dialects.postgresql import JSONB, UUID
 from sqlalchemy.ext.mutable import MutableDict
 from sqlalchemy.orm import Mapped, declarative_mixin, mapped_column

saga_orchestrator/outbox/models.py

@@ -5,9 +5,8 @@ from datetime import datetime
 from enum import Enum
 from typing import Any
 
-from sqlalchemy import JSON, DateTime
+from sqlalchemy import JSON, DateTime, Integer, String, Text, func
 from sqlalchemy import Enum as SqlEnum
-from sqlalchemy import Integer, String, Text, func
 from sqlalchemy.dialects.postgresql import JSONB, UUID
 from sqlalchemy.ext.mutable import MutableDict
 from sqlalchemy.orm import Mapped, declarative_mixin, mapped_column