edda-framework 0.9.0__py3-none-any.whl → 0.9.1__py3-none-any.whl

edda/app.py

@@ -709,7 +709,6 @@ class EddaApp:
             instance_id = subscription["instance_id"]
             channel = subscription["channel"]
             timeout_at = subscription["timeout_at"]
-            created_at = subscription["created_at"]
 
             # Lock-First pattern: Try to acquire the lock before processing
             # If we can't get the lock, another worker is processing this workflow
@@ -777,48 +776,28 @@ class EddaApp:
                 # 2. Remove message subscription
                 await self.storage.remove_message_subscription(instance_id, channel)
 
-                # 3. Fail the workflow with TimeoutError
-                import traceback
-
-                # Get timeout_seconds from timeout_at and created_at
-                # Handle both datetime objects and ISO strings
-                try:
-                    timeout_dt = (
-                        timeout_at
-                        if isinstance(timeout_at, dt_type)
-                        else dt_type.fromisoformat(str(timeout_at))
-                    )
-                    created_dt = (
-                        created_at
-                        if isinstance(created_at, dt_type)
-                        else dt_type.fromisoformat(str(created_at))
+                # 3. Resume workflow (lock already held - distributed coroutine pattern)
+                # The workflow will replay and receive() will raise TimeoutError from cached history
+                workflow_name = subscription.get("workflow_name")
+                if not workflow_name:
+                    logger.warning(
+                        "No workflow_name in subscription for %s, skipping",
+                        instance_id,
                     )
-                    # Calculate the original timeout duration (timeout_at - created_at)
-                    timeout_seconds = int((timeout_dt - created_dt).total_seconds())
-                except Exception:
-                    timeout_seconds = 0  # Fallback
+                    continue
 
-                error = TimeoutError(
-                    f"Message on channel '{channel}' did not arrive within {timeout_seconds} seconds"
-                )
-                stack_trace = "".join(
-                    traceback.format_exception(type(error), error, error.__traceback__)
-                )
+                if self.replay_engine is None:
+                    logger.error("Replay engine not initialized")
+                    continue
 
-                # Update workflow status to failed with error details
-                await self.storage.update_instance_status(
-                    instance_id,
-                    "failed",
-                    {
-                        "error_message": str(error),
-                        "error_type": "TimeoutError",
-                        "stack_trace": stack_trace,
-                    },
+                await self.replay_engine.resume_by_name(
+                    instance_id, workflow_name, already_locked=True
                 )
 
                 logger.debug(
-                    "Marked workflow %s as failed due to message timeout",
+                    "Resumed workflow %s after message timeout on channel '%s'",
                     instance_id,
+                    channel,
                 )
 
             except Exception as e:

edda/context.py

@@ -217,6 +217,14 @@ class WorkflowContext:
                 # Cache the timer result for wait_timer replay
                 # Timer returns None, so we cache the result field
                 self._history_cache[activity_id] = event_data.get("result")
+            elif event_type == "MessageTimeout":
+                # Cache the timeout error for receive() replay
+                # This allows TimeoutError to be raised and caught in workflow code
+                self._history_cache[activity_id] = {
+                    "_error": True,
+                    "error_type": event_data.get("error_type", "TimeoutError"),
+                    "error_message": event_data.get("error_message", "Message timeout"),
+                }
 
         self._history_loaded = True
 

{edda_framework-0.9.0.dist-info → edda_framework-0.9.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: edda-framework
-Version: 0.9.0
+Version: 0.9.1
 Summary: Lightweight Durable Execution Framework
 Project-URL: Homepage, https://github.com/i2y/edda
 Project-URL: Documentation, https://github.com/i2y/edda#readme

{edda_framework-0.9.0.dist-info → edda_framework-0.9.1.dist-info}/RECORD

@@ -1,9 +1,9 @@
 edda/__init__.py,sha256=hGC6WR2R36M8LWC97F-0Rw4Ln0QUUT_1xC-7acOy_Fk,2237
 edda/activity.py,sha256=nRm9eBrr0lFe4ZRQ2whyZ6mo5xd171ITIVhqytUhOpw,21025
-edda/app.py,sha256=kZ-VEvjIe3GjUA8RhT6OimuezNyPf2IhrvQ2kL44zJs,45201
+edda/app.py,sha256=11-IczlJpCR_G-jWUvV1DIr_Zwm6bDJnFiNBQsZ79Zo,44306
 edda/channels.py,sha256=Budi0FyxalmcAMwj50mX3WzRce5OuLKXGws0Hp_snfw,34745
 edda/compensation.py,sha256=iKLlnTxiF1YSatmYQW84EkPB1yMKUEZBtgjuGnghLtY,11824
-edda/context.py,sha256=IavmrbCdTAozP4QWlQ5-rCHR9yJAT-aohqyrOnbVLBU,20858
+edda/context.py,sha256=pPn98-G5HgaOGDRzEhma58TzBulwsiTvmNEMLIu0XwI,21330
 edda/exceptions.py,sha256=-ntBLGpVQgPFG5N1o8m_7weejAYkNrUdxTkOP38vsHk,1766
 edda/hooks.py,sha256=HUZ6FTM__DZjwuomDfTDEroQ3mugEPuJHcGm7CTQNvg,8193
 edda/locking.py,sha256=NAFJmw-JaSVsXn4Y4czJyv_s9bWG8cdrzDBWIEag5X8,13661
@@ -36,8 +36,8 @@ edda/viewer_ui/theme.py,sha256=mrXoXLRzgSnvE2a58LuMcPJkhlvHEDMWVa8Smqtk4l0,8118
 edda/visualizer/__init__.py,sha256=DOpDstNhR0VcXAs_eMKxaL30p_0u4PKZ4o2ndnYhiRo,343
 edda/visualizer/ast_analyzer.py,sha256=plmx7C9X_X35xLY80jxOL3ljg3afXxBePRZubqUIkxY,13663
 edda/visualizer/mermaid_generator.py,sha256=XWa2egoOTNDfJEjPcwoxwQmblUqXf7YInWFjFRI1QGo,12457
-edda_framework-0.9.0.dist-info/METADATA,sha256=esgoKFgUTWqAZWIHxgtKGl5j8VTaWiJw_oz93Dtm064,35741
-edda_framework-0.9.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-edda_framework-0.9.0.dist-info/entry_points.txt,sha256=dPH47s6UoJgUZxHoeSMqZsQkLaSE-SGLi-gh88k2WrU,48
-edda_framework-0.9.0.dist-info/licenses/LICENSE,sha256=udxb-V7_cYKTHqW7lNm48rxJ-Zpf0WAY_PyGDK9BPCo,1069
-edda_framework-0.9.0.dist-info/RECORD,,
+edda_framework-0.9.1.dist-info/METADATA,sha256=8m1LKjz9cWbmwsa7V-FAEIQdgM3_63wan3Yml58KToE,35741
+edda_framework-0.9.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+edda_framework-0.9.1.dist-info/entry_points.txt,sha256=dPH47s6UoJgUZxHoeSMqZsQkLaSE-SGLi-gh88k2WrU,48
+edda_framework-0.9.1.dist-info/licenses/LICENSE,sha256=udxb-V7_cYKTHqW7lNm48rxJ-Zpf0WAY_PyGDK9BPCo,1069
+edda_framework-0.9.1.dist-info/RECORD,,