merge

libs/core/langchain_core/runnables/fallbacks.py

@@ -155,31 +155,32 @@ class RunnableWithFallbacks(RunnableSerializable[Input, Output]):
         run_manager = callback_manager.on_chain_start(
             dumpd(self), input, name=config.get("run_name")
         )
-        first_error = None
+        curr_error: Optional[BaseException] = None
-        last_error = None
         for runnable in self.runnables:
             try:
-                if self.exception_key and last_error is not None:
+                if self.exception_key and curr_error is not None:
-                    input[self.exception_key] = last_error
+                    input[self.exception_key] = curr_error
                 output = runnable.invoke(
                     input,
                     patch_config(config, callbacks=run_manager.get_child()),
                     **kwargs,
                 )
             except self.exceptions_to_handle as e:
-                if first_error is None:
+                if curr_error is not None:
-                    first_error = e
+                    e.__cause__ = curr_error
-                last_error = e
+                curr_error = e
             except BaseException as e:
-                run_manager.on_chain_error(e)
+                if curr_error is not None:
-                raise e
+                    e.__cause__ = curr_error
+                curr_error = e
+                break
             else:
                 run_manager.on_chain_end(output)
                 return output
-        if first_error is None:
+        if curr_error is None:
             raise ValueError("No error stored at end of fallbacks.")
-        run_manager.on_chain_error(first_error)
+        run_manager.on_chain_error(curr_error)
-        raise first_error
+        raise curr_error
 
     async def ainvoke(
         self,