Fix bug in streaming associated with additive chunks

langserve/client.py

@@ -35,7 +35,7 @@
     get_async_callback_manager_for_config,
     get_callback_manager_for_config,
 )
-from langchain.schema.runnable.utils import Input, Output
+from langchain.schema.runnable.utils import AddableDict, Input, Output
 
 from langserve.callbacks import CallbackEventDict, ahandle_callbacks, handle_callbacks
 from langserve.serialization import (
@@ -453,6 +453,7 @@ def stream(
         callback_manager = get_callback_manager_for_config(config)
 
         final_output: Optional[Output] = None
+        final_output_supported = True
 
         run_manager = callback_manager.on_chain_start(
             dumpd(self),
@@ -481,12 +482,19 @@ def stream(
                 for sse in event_source.iter_sse():
                     if sse.event == "data":
                         chunk = self._lc_serializer.loads(sse.data)
+                        if isinstance(chunk, dict):
+                            chunk = AddableDict(chunk)
                         yield chunk
 
-                        if final_output:
-                            final_output += chunk
-                        else:
-                            final_output = chunk
+                        if final_output_supported:
+                            if final_output is None:
+                                final_output = chunk
+                            else:
+                                try:
+                                    final_output = final_output + chunk
+                                except TypeError:
+                                    final_output = None
+                                    final_output_supported = False
                     elif sse.event == "error":
                         # This can only be a server side error
                         _raise_exception_from_data(
@@ -516,6 +524,7 @@ async def astream(
         callback_manager = get_async_callback_manager_for_config(config)
 
         final_output: Optional[Output] = None
+        final_output_supported = True
 
         run_manager = await callback_manager.on_chain_start(
             dumpd(self),
@@ -541,12 +550,19 @@ async def astream(
                 async for sse in event_source.aiter_sse():
                     if sse.event == "data":
                         chunk = self._lc_serializer.loads(sse.data)
+                        if isinstance(chunk, dict):
+                            chunk = AddableDict(chunk)
                         yield chunk
 
-                        if final_output:
-                            final_output += chunk
-                        else:
-                            final_output = chunk
+                        if final_output_supported:
+                            if final_output is None:
+                                final_output = chunk
+                            else:
+                                try:
+                                    final_output = final_output + chunk
+                                except TypeError:
+                                    final_output = None
+                                    final_output_supported = False
 
                     elif sse.event == "error":
                         # This can only be a server side error

tests/unit_tests/test_server_client.py

@@ -4,7 +4,7 @@
 import uuid
 from asyncio import AbstractEventLoop
 from contextlib import asynccontextmanager, contextmanager
-from typing import Any, Dict, Iterator, List, Optional, Union
+from typing import Any, Dict, Iterable, Iterator, List, Optional, Union
 
 import httpx
 import pytest
@@ -1263,8 +1263,14 @@ async def passthrough_dict(d: Any) -> Any:
         }
 
 
-class ErroringRunnable(Runnable):
-    """A custom runnable for testing errors are raised server side."""
+class StreamingRunnable(Runnable):
+    """A custom runnable used for testing purposes"""
+
+    iterable: Iterable[Any]
+
+    def __init__(self, iterable: Iterable[Any]) -> None:
+        """Initialize the runnable."""
+        self.iterable = iterable
 
     def invoke(self, input: Input, config: Optional[RunnableConfig] = None) -> Output:
         """Invoke the runnable."""
@@ -1276,27 +1282,64 @@ def stream(
         config: Optional[RunnableConfig] = None,
         **kwargs: Optional[Any],
     ) -> Iterator[Output]:
-        yield 1
-        yield 2
-        raise ValueError("An exception occurred")
+        raise NotImplementedError()
 
     async def astream(
         self,
         input: Iterator[Input],
         config: Optional[RunnableConfig] = None,
         **kwargs: Optional[Any],
     ) -> Iterator[Output]:
-        yield 1
-        yield 2
-        raise ValueError("An exception occurred")
+        for element in self.iterable:
+            if isinstance(element, BaseException):
+                raise element
+            yield element
+
+
+# Have not figured out how to test sync stream yet
+# def test_streaming_dict_sync() -> None:
+#     """Test streaming different types of items."""
+#     app = FastAPI()
+#
+#     stream_dict = StreamingRunnable(iterable=[{"a": "1"}, {"a": "2"}])
+#
+#     add_routes(app, stream_dict)
+#
+#     # Invoke request
+#     with get_sync_remote_runnable(app) as runnable:
+#         chunks = []
+#         for chunk in runnable.stream("input ignored"):
+#             chunks.append(chunk)
+#
+#     assert chunks == [{"a": "1"}, {"a": "2"}]
+
+
+@pytest.mark.asyncio
+async def test_streaming_dict_async() -> None:
+    """Test streaming different types of items."""
+    app = FastAPI()
+
+    stream_dict = StreamingRunnable(iterable=[{"a": "1"}, {"a": "2"}])
+
+    add_routes(app, stream_dict)
+
+    # Invoke request
+    async with get_async_remote_runnable(app, raise_app_exceptions=False) as runnable:
+        chunks = []
+        async for chunk in runnable.astream("input ignored"):
+            chunks.append(chunk)
+
+        assert chunks == [{"a": "1"}, {"a": "2"}]
 
 
 @pytest.mark.asyncio
 async def test_server_side_error() -> None:
     """Test server side error handling."""
 
     app = FastAPI()
-    add_routes(app, ErroringRunnable())
+
+    erroring_stream = StreamingRunnable(iterable=[1, 2, ValueError("An error")])
+    add_routes(app, erroring_stream)
 
     # Invoke request
     async with get_async_remote_runnable(app, raise_app_exceptions=False) as runnable:
@@ -1346,11 +1389,12 @@ async def test_server_side_error() -> None:
         #     assert e.response.text == "Internal Server Error"
 
 
-def test_server_side_error_sync() -> None:
+def test_server_side_error_sync(event_loop: AbstractEventLoop) -> None:
     """Test server side error handling."""
 
     app = FastAPI()
-    add_routes(app, ErroringRunnable())
+    erroring_stream = StreamingRunnable(iterable=[1, 2, ValueError("An error")])
+    add_routes(app, erroring_stream)
 
     # Invoke request
     with get_sync_remote_runnable(app, raise_server_exceptions=False) as runnable: