merge

langchain-ai · Jun 21, 2023 · ea78fb1 · ea78fb1
1 parent b42804b
commit ea78fb1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/langchain/callbacks/tracers/langchain.py b/langchain/callbacks/tracers/langchain.py
@@ -21,11 +21,7 @@
 
 logger = logging.getLogger(__name__)
 _LOGGED = set()
-<<<<<<< Updated upstream
-_TRACERS = []
-=======
 _TRACERS: List[LangChainTracer] = []
->>>>>>> Stashed changes
 
 
 def log_error_once(method: str, exception: Exception) -> None:

diff --git a/langchain/client/runner_utils.py b/langchain/client/runner_utils.py
@@ -228,7 +228,10 @@ async def run_coroutine_with_semaphore(
         *(run_coroutine_with_semaphore(function) for function in async_funcs)
     )
     while tracer_queue:
-        tracer = tracer_queue.get_nowait()
+        try:
+            tracer = tracer_queue.get_nowait()
+        except asyncio.QueueEmpty:
+            break
         if tracer:
             tracer.wait_for_futures()
     return results