Your lightweight open-source personal agent.
Python agent-frameworkai-agentai-agentschatbotchatopsdiscord-botllm-agentsllmslocal-llmmcpmodel-context-protocolmulti-agentopenai-compatibleopenclawpersonal-ai-assistantpythonself-hostedtelegram-bot-ai-assistantwebuiworkflow-automation
fix(sdk): use contextvars for per-call hooks to prevent concurrent run() race
michaelxer0bb1b0b3c2b5
diff --git a/nanobot/agent/loop.py b/nanobot/agent/loop.pyindex 059770b15..bb671d29e 100644--- a/nanobot/agent/loop.py+++ b/nanobot/agent/loop.py@@ -3,6 +3,7 @@from __future__ import annotationsimport asyncio+import contextvarsimport dataclassesimport osimport time@@ -75,6 +76,12 @@ if TYPE_CHECKING:)from nanobot.cron.service import CronService+# Per-call hooks for SDK Nanobot.run() — avoids mutating shared _extra_hooks+# when multiple run() calls execute concurrently on the same AgentLoop.+_per_call_hooks: contextvars.ContextVar[list[AgentHook] | None] = contextvars.ContextVar(+ "_per_call_hooks", default=None,+)+class TurnState(Enum):RESTORE = auto()@@ -720,8 +727,10 @@ class AgentLoop:on_iteration=lambda iteration: setattr(self, "_current_iteration", iteration),)hook: AgentHook = loop_hook- if not ephemeral and self._extra_hooks:- hook = CompositeHook([loop_hook] + self._extra_hooks)+ per_call = _per_call_hooks.get()+ extra_hooks = per_call if per_call is not None else (self._extra_hooks if not ephemeral else None)+ if extra_hooks:+ hook = CompositeHook([loop_hook] + extra_hooks)async def _checkpoint(payload: dict[str, Any]) -> None:if session is None:diff --git a/nanobot/nanobot.py b/nanobot/nanobot.pyindex ace49ac0c..8a9cfc1ee 100644--- a/nanobot/nanobot.py+++ b/nanobot/nanobot.py@@ -7,7 +7,7 @@ from pathlib import Pathfrom typing import Anyfrom nanobot.agent.hook import AgentHook, SDKCaptureHook-from nanobot.agent.loop import AgentLoop+from nanobot.agent.loop import AgentLoop, _per_call_hooksfrom nanobot.providers.image_generation import image_gen_provider_configs@@ -84,15 +84,14 @@ class Nanobot:hooks: Optional lifecycle hooks for this run."""capture = SDKCaptureHook()- prev = self._loop._extra_hooks- base_hooks = list(hooks) if hooks is not None else list(prev or [])- self._loop._extra_hooks = [capture, *base_hooks]+ base_hooks = list(hooks) if hooks is not None else list(self._loop._extra_hooks or [])+ token = _per_call_hooks.set([capture, *base_hooks])try:response = await self._loop.process_direct(message, session_key=session_key,)finally:- self._loop._extra_hooks = prev+ _per_call_hooks.reset(token)content = (response.content if response else None) or ""return RunResult(