Skip to content

Building AI agents, atomically

Propagate caller context into forge tool thread pools

Eigenwiseec13749cec4c
diff --git a/atomic-forge/tools/arxiv_search/tool/arxiv_search.py b/atomic-forge/tools/arxiv_search/tool/arxiv_search.py
index 08c1e20..54b6db6 100644
--- a/atomic-forge/tools/arxiv_search/tool/arxiv_search.py
+++ b/atomic-forge/tools/arxiv_search/tool/arxiv_search.py
@@ -1,4 +1,5 @@
import asyncio
+import contextvars
import logging
import xml.etree.ElementTree as ET
from concurrent.futures import ThreadPoolExecutor
@@ -226,7 +227,7 @@ class ArxivSearchTool(BaseTool[ArxivSearchToolInputSchema, ArxivSearchToolOutput
def run(self, params: ArxivSearchToolInputSchema) -> ArxivSearchToolOutputSchema:
with ThreadPoolExecutor() as executor:
- return executor.submit(asyncio.run, self.run_async(params)).result()
+ return executor.submit(contextvars.copy_context().run, asyncio.run, self.run_async(params)).result()
#################
diff --git a/atomic-forge/tools/bocha_search/tool/bocha_search.py b/atomic-forge/tools/bocha_search/tool/bocha_search.py
index 8b7e762..62d6223 100644
--- a/atomic-forge/tools/bocha_search/tool/bocha_search.py
+++ b/atomic-forge/tools/bocha_search/tool/bocha_search.py
@@ -1,6 +1,7 @@
import os
from typing import List, Optional, Literal
import asyncio
+import contextvars
from concurrent.futures import ThreadPoolExecutor
import logging
import aiohttp
@@ -167,6 +168,7 @@ class BoChaSearchTool(BaseTool[BoChaSearchToolInputSchema, BoChaSearchToolOutput
"""
with ThreadPoolExecutor() as executor:
result = executor.submit(
+ contextvars.copy_context().run,
asyncio.run,
self.run_async(
params,
diff --git a/atomic-forge/tools/firecrawl_search/tool/firecrawl_search.py b/atomic-forge/tools/firecrawl_search/tool/firecrawl_search.py
index f811b50..f4141da 100644
--- a/atomic-forge/tools/firecrawl_search/tool/firecrawl_search.py
+++ b/atomic-forge/tools/firecrawl_search/tool/firecrawl_search.py
@@ -1,4 +1,5 @@
import asyncio
+import contextvars
import ipaddress
import logging
import os
@@ -353,7 +354,7 @@ class FirecrawlSearchTool(BaseTool[FirecrawlSearchToolInputSchema, FirecrawlSear
def run(self, params: FirecrawlSearchToolInputSchema) -> FirecrawlSearchToolOutputSchema:
with ThreadPoolExecutor() as executor:
- return executor.submit(asyncio.run, self.run_async(params)).result()
+ return executor.submit(contextvars.copy_context().run, asyncio.run, self.run_async(params)).result()
#################
diff --git a/atomic-forge/tools/hackernews_search/tool/hackernews_search.py b/atomic-forge/tools/hackernews_search/tool/hackernews_search.py
index 482905a..51f1212 100644
--- a/atomic-forge/tools/hackernews_search/tool/hackernews_search.py
+++ b/atomic-forge/tools/hackernews_search/tool/hackernews_search.py
@@ -1,4 +1,5 @@
import asyncio
+import contextvars
import logging
from concurrent.futures import ThreadPoolExecutor
from typing import List, Literal, Optional
@@ -174,7 +175,7 @@ class HackerNewsSearchTool(BaseTool[HackerNewsSearchToolInputSchema, HackerNewsS
def run(self, params: HackerNewsSearchToolInputSchema) -> HackerNewsSearchToolOutputSchema:
with ThreadPoolExecutor() as executor:
- return executor.submit(asyncio.run, self.run_async(params)).result()
+ return executor.submit(contextvars.copy_context().run, asyncio.run, self.run_async(params)).result()
#################
diff --git a/atomic-forge/tools/searxng_search/tool/searxng_search.py b/atomic-forge/tools/searxng_search/tool/searxng_search.py
index f093616..e2ecedb 100644
--- a/atomic-forge/tools/searxng_search/tool/searxng_search.py
+++ b/atomic-forge/tools/searxng_search/tool/searxng_search.py
@@ -1,6 +1,7 @@
import os
from typing import List, Literal, Optional
import asyncio
+import contextvars
from concurrent.futures import ThreadPoolExecutor
import aiohttp
@@ -188,7 +189,7 @@ class SearXNGSearchTool(BaseTool[SearXNGSearchToolInputSchema, SearXNGSearchTool
Exception: If the request to SearXNG fails.
"""
with ThreadPoolExecutor() as executor:
- return executor.submit(asyncio.run, self.run_async(params, max_results)).result()
+ return executor.submit(contextvars.copy_context().run, asyncio.run, self.run_async(params, max_results)).result()
#################
diff --git a/atomic-forge/tools/serply_search/tool/serply_search.py b/atomic-forge/tools/serply_search/tool/serply_search.py
index 378205b..c0eecad 100644
--- a/atomic-forge/tools/serply_search/tool/serply_search.py
+++ b/atomic-forge/tools/serply_search/tool/serply_search.py
@@ -1,4 +1,5 @@
import asyncio
+import contextvars
import logging
import os
from concurrent.futures import ThreadPoolExecutor
@@ -157,7 +158,7 @@ class SerplySearchTool(BaseTool[SerplySearchToolInputSchema, SerplySearchToolOut
def run(self, params: SerplySearchToolInputSchema) -> SerplySearchToolOutputSchema:
with ThreadPoolExecutor() as executor:
- return executor.submit(asyncio.run, self.run_async(params)).result()
+ return executor.submit(contextvars.copy_context().run, asyncio.run, self.run_async(params)).result()
#################
diff --git a/atomic-forge/tools/tavily_search/tool/tavily_search.py b/atomic-forge/tools/tavily_search/tool/tavily_search.py
index 571a577..5dc5845 100644
--- a/atomic-forge/tools/tavily_search/tool/tavily_search.py
+++ b/atomic-forge/tools/tavily_search/tool/tavily_search.py
@@ -1,6 +1,7 @@
import os
from typing import List, Literal, Optional
import asyncio
+import contextvars
from concurrent.futures import ThreadPoolExecutor
import aiohttp
@@ -174,6 +175,7 @@ class TavilySearchTool(BaseTool[TavilySearchToolInputSchema, TavilySearchToolOut
"""
with ThreadPoolExecutor() as executor:
result = executor.submit(
+ contextvars.copy_context().run,
asyncio.run,
self.run_async(
params,
diff --git a/atomic-forge/tools/wikipedia_search/tool/wikipedia_search.py b/atomic-forge/tools/wikipedia_search/tool/wikipedia_search.py
index ead79e2..79ffca8 100644
--- a/atomic-forge/tools/wikipedia_search/tool/wikipedia_search.py
+++ b/atomic-forge/tools/wikipedia_search/tool/wikipedia_search.py
@@ -1,4 +1,5 @@
import asyncio
+import contextvars
import logging
from concurrent.futures import ThreadPoolExecutor
from typing import List, Optional
@@ -205,7 +206,7 @@ class WikipediaSearchTool(BaseTool[WikipediaSearchToolInputSchema, WikipediaSear
def run(self, params: WikipediaSearchToolInputSchema) -> WikipediaSearchToolOutputSchema:
with ThreadPoolExecutor() as executor:
- return executor.submit(asyncio.run, self.run_async(params)).result()
+ return executor.submit(contextvars.copy_context().run, asyncio.run, self.run_async(params)).result()
#################