Handle error; add CallError.original_error

inngest · Nov 3, 2023 · 6c51879 · 6c51879
1 parent 996bf1c
commit 6c51879
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/inngest/_internal/comm.py b/inngest/_internal/comm.py
@@ -338,7 +338,16 @@ def call_function_sync(
                 if isinstance(call_res, execution.FunctionCallResponse):
                     # Only call this hook if we get a return at the function
                     # level.
-                    middleware.after_execution_sync()
+                    match middleware.after_execution_sync():
+                        case result.Ok(_):
+                            pass
+                        case result.Err(err):
+                            middleware.before_response_sync()
+                            return CommResponse.from_error(
+                                self._client.logger,
+                                self._framework,
+                                err,
+                            )
 
                 comm_res = CommResponse.from_call_result(
                     self._client.logger,

diff --git a/inngest/_internal/execution.py b/inngest/_internal/execution.py
@@ -4,6 +4,8 @@
 import enum
 import typing
 
+import pydantic
+
 from . import errors, event_lib, transforms, types
 
 
@@ -39,6 +41,7 @@ class CallError(types.BaseModel):
     is_retriable: bool
     message: str
     name: str
+    original_error: object = pydantic.Field(exclude=True)
     stack: str
 
     @classmethod
@@ -48,6 +51,7 @@ def from_error(cls, err: Exception) -> CallError:
             is_retriable=isinstance(err, errors.NonRetriableError) is False,
             message=str(err),
             name=type(err).__name__,
+            original_error=err,
             stack=transforms.get_traceback(err),
         )
 

diff --git a/inngest/_internal/net.py b/inngest/_internal/net.py
@@ -14,8 +14,8 @@ def create_headers(
 ) -> dict[str, str]:
     headers = {
         const.HeaderKey.CONTENT_TYPE.value: "application/json",
-        const.HeaderKey.USER_AGENT.value: f"inngest-{const.LANGUAGE}:v{const.VERSION}",
         const.HeaderKey.SDK.value: f"inngest-{const.LANGUAGE}:v{const.VERSION}",
+        const.HeaderKey.USER_AGENT.value: f"inngest-{const.LANGUAGE}:v{const.VERSION}",
     }
 
     if framework is not None: