Skip to content

CubeLoop — a Pythonic, async-native agent harness core designed for high performance, readability, and production-grade persistence.

style: ruff format

xf gongf615803c6548
diff --git a/cubepi/deferred/_catalog.py b/cubepi/deferred/_catalog.py
index 54ac624..30ae867 100644
--- a/cubepi/deferred/_catalog.py
+++ b/cubepi/deferred/_catalog.py
@@ -40,7 +40,11 @@ def render_catalog(
continue
count = len(remaining)
- count_label = f"{count} remaining tools" if group.group_id in expanded else f"{count} tools"
+ count_label = (
+ f"{count} remaining tools"
+ if group.group_id in expanded
+ else f"{count} tools"
+ )
lines.append(
f"- `{group.group_id}` — {group.display_name}: {group.description} ({count_label})"
)
diff --git a/cubepi/deferred/middleware.py b/cubepi/deferred/middleware.py
index 7cc07a9..ccc2d0b 100644
--- a/cubepi/deferred/middleware.py
+++ b/cubepi/deferred/middleware.py
@@ -60,9 +60,7 @@ class DeferredToolsMiddleware(Middleware):
catalog_header: str = DEFAULT_CATALOG_HEADER,
resumed_schemas: list[tuple[str, list[ToolSchema]]] | None = None,
) -> None:
- self._groups: dict[str, DeferredToolGroup] = {
- g.group_id: g for g in groups
- }
+ self._groups: dict[str, DeferredToolGroup] = {g.group_id: g for g in groups}
self._extra_ref = extra_ref
self._catalog_header = catalog_header
@@ -119,7 +117,8 @@ class DeferredToolsMiddleware(Middleware):
# Determine what is already expanded.
expanded_groups: dict[str, list[str] | None] = extra.get(
- "expanded_groups", {},
+ "expanded_groups",
+ {},
)
already_val = expanded_groups.get(group_id)
if group_id in expanded_groups and already_val is None:
@@ -159,9 +158,7 @@ class DeferredToolsMiddleware(Middleware):
# Record schemas for expanded tools (append-only).
if newly_expanded:
- new_schemas = [
- t.to_definition().model_dump() for t in newly_expanded
- ]
+ new_schemas = [t.to_definition().model_dump() for t in newly_expanded]
existing_idx = next(
(
i
@@ -261,7 +258,8 @@ class DeferredToolsMiddleware(Middleware):
del signal
extra = self._extra_ref()
expanded: dict[str, list[str] | None] = extra.get(
- "expanded_groups", {},
+ "expanded_groups",
+ {},
)
catalog = render_catalog(
@@ -313,19 +311,23 @@ class DeferredToolsMiddleware(Middleware):
if exp is None:
# Fully expanded (None sentinel) — load all, drop from remaining.
pre_loaded.extend(loaded)
- schemas.append((
- group.group_id,
- [t.to_definition().model_dump() for t in loaded],
- ))
+ schemas.append(
+ (
+ group.group_id,
+ [t.to_definition().model_dump() for t in loaded],
+ )
+ )
else:
# Partially expanded — load selected, keep in remaining.
name_set = set(exp)
selected = [t for t in loaded if t.name in name_set]
pre_loaded.extend(selected)
- schemas.append((
- group.group_id,
- [t.to_definition().model_dump() for t in selected],
- ))
+ schemas.append(
+ (
+ group.group_id,
+ [t.to_definition().model_dump() for t in selected],
+ )
+ )
remaining.append(group)
return ResumedState(
diff --git a/tests/deferred/test_agent_wiring.py b/tests/deferred/test_agent_wiring.py
index 29afe1d..4a681f9 100644
--- a/tests/deferred/test_agent_wiring.py
+++ b/tests/deferred/test_agent_wiring.py
@@ -112,15 +112,11 @@ class TestAgentDeferredToolGroups:
deferred_tool_groups=[group],
)
assert agent._middleware[0] is marker
- assert any(
- isinstance(mw, DeferredToolsMiddleware)
- for mw in agent._middleware
- )
+ assert any(isinstance(mw, DeferredToolsMiddleware) for mw in agent._middleware)
def test_empty_deferred_groups_no_middleware(self) -> None:
model = _make_faux_model()
agent = Agent(model=model, deferred_tool_groups=[])
assert not any(
- isinstance(mw, DeferredToolsMiddleware)
- for mw in agent._middleware
+ isinstance(mw, DeferredToolsMiddleware) for mw in agent._middleware
)
diff --git a/tests/deferred/test_catalog.py b/tests/deferred/test_catalog.py
index b6d4f5d..da1d53a 100644
--- a/tests/deferred/test_catalog.py
+++ b/tests/deferred/test_catalog.py
@@ -47,7 +47,11 @@ class TestRenderCatalog:
assert result == ""
def test_single_group_no_expansion(self) -> None:
- groups = [_make_group("mcp:github", "GitHub", "Code hosting", ["create_issue", "search_repos"])]
+ groups = [
+ _make_group(
+ "mcp:github", "GitHub", "Code hosting", ["create_issue", "search_repos"]
+ )
+ ]
result = render_catalog(groups=groups, expanded={})
assert "mcp:github" in result
assert "GitHub" in result
@@ -75,7 +79,9 @@ class TestRenderCatalog:
def test_fully_expanded_group_omitted(self) -> None:
groups = [
- _make_group("mcp:github", "GitHub", "Code hosting", ["create_issue", "search_repos"]),
+ _make_group(
+ "mcp:github", "GitHub", "Code hosting", ["create_issue", "search_repos"]
+ ),
_make_group("mcp:linear", "Linear", "Issues", ["create_issue"]),
]
expanded: dict[str, list[str] | None] = {"mcp:github": None}
@@ -86,7 +92,10 @@ class TestRenderCatalog:
def test_partially_expanded_shows_remaining(self) -> None:
groups = [
_make_group(
- "mcp:github", "GitHub", "Code hosting", ["create_issue", "search_repos", "create_pr"]
+ "mcp:github",
+ "GitHub",
+ "Code hosting",
+ ["create_issue", "search_repos", "create_pr"],
)
]
expanded: dict[str, list[str] | None] = {"mcp:github": ["create_issue"]}
@@ -142,7 +151,9 @@ class TestRenderExpandedSchemas:
assert linear_pos < github_pos
def test_append_only_prefix_stable(self) -> None:
- schemas_v1 = [("mcp:linear", [{"name": "t1", "description": "d1", "parameters": {}}])]
+ schemas_v1 = [
+ ("mcp:linear", [{"name": "t1", "description": "d1", "parameters": {}}])
+ ]
schemas_v2 = [
("mcp:linear", [{"name": "t1", "description": "d1", "parameters": {}}]),
("mcp:github", [{"name": "t2", "description": "d2", "parameters": {}}]),
diff --git a/tests/deferred/test_expand_tool.py b/tests/deferred/test_expand_tool.py
index 17b1e8c..6c6b858 100644
--- a/tests/deferred/test_expand_tool.py
+++ b/tests/deferred/test_expand_tool.py
@@ -58,7 +58,9 @@ class TestMakeExpandTools:
async def test_execute_calls_callback(self) -> None:
calls: list[tuple[str, list[str] | None]] = []
- async def _callback(group_id: str, tool_names: list[str] | None) -> ExpandToolsOutput:
+ async def _callback(
+ group_id: str, tool_names: list[str] | None
+ ) -> ExpandToolsOutput:
calls.append((group_id, tool_names))
return ExpandToolsOutput(
group_id=group_id,
@@ -76,7 +78,9 @@ class TestMakeExpandTools:
async def test_execute_with_tool_names(self) -> None:
calls: list[tuple[str, list[str] | None]] = []
- async def _callback(group_id: str, tool_names: list[str] | None) -> ExpandToolsOutput:
+ async def _callback(
+ group_id: str, tool_names: list[str] | None
+ ) -> ExpandToolsOutput:
calls.append((group_id, tool_names))
return ExpandToolsOutput(
group_id=group_id,
@@ -93,7 +97,9 @@ class TestMakeExpandTools:
assert calls[0] == ("mcp:github", ["create_issue"])
async def test_execute_error_sets_is_error(self) -> None:
- async def _err_callback(group_id: str, tool_names: list[str] | None) -> ExpandToolsOutput:
+ async def _err_callback(
+ group_id: str, tool_names: list[str] | None
+ ) -> ExpandToolsOutput:
return ExpandToolsOutput(
group_id=group_id,
expanded=False,
@@ -107,5 +113,9 @@ class TestMakeExpandTools:
assert result.is_error is True
-async def _noop_callback(group_id: str, tool_names: list[str] | None) -> ExpandToolsOutput:
- return ExpandToolsOutput(group_id=group_id, expanded=True, tool_names=[], remaining=0)
+async def _noop_callback(
+ group_id: str, tool_names: list[str] | None
+) -> ExpandToolsOutput:
+ return ExpandToolsOutput(
+ group_id=group_id, expanded=True, tool_names=[], remaining=0
+ )
diff --git a/tests/deferred/test_middleware.py b/tests/deferred/test_middleware.py
index 06152d2..df2e05f 100644
--- a/tests/deferred/test_middleware.py
+++ b/tests/deferred/test_middleware.py
@@ -15,7 +15,9 @@ def _dummy_tool(name: str, description: str = "dummy") -> AgentTool:
async def _exec(tool_call_id, args, *, signal=None, on_update=None):
return AgentToolResult(content=[TextContent(text="ok")])
- return AgentTool(name=name, description=description, parameters=_Empty, execute=_exec)
+ return AgentTool(
+ name=name, description=description, parameters=_Empty, execute=_exec
+ )
def _make_group(
@@ -92,11 +94,16 @@ class TestAfterToolCallExpansion:
context_tools: list[AgentTool] = [mw.tools[0]]
ctx = AgentContext(
- system_prompt="", messages=[], tools=context_tools, extra=extra,
+ system_prompt="",
+ messages=[],
+ tools=context_tools,
+ extra=extra,
)
output = await mw._expand(
- group_id="mcp:github", tool_names=None, context=ctx,
+ group_id="mcp:github",
+ tool_names=None,
+ context=ctx,
)
assert output.expanded is True
assert len(output.tool_names) == 2
@@ -107,17 +114,23 @@ class TestAfterToolCallExpansion:
async def test_expand_selective_injects_only_requested(self) -> None:
extra: dict = {}
group = _make_group(
- "mcp:github", ["create_issue", "search_repos", "create_pr"],
+ "mcp:github",
+ ["create_issue", "search_repos", "create_pr"],
)
mw = DeferredToolsMiddleware(groups=[group], extra_ref=lambda: extra)
context_tools: list[AgentTool] = [mw.tools[0]]
ctx = AgentContext(
- system_prompt="", messages=[], tools=context_tools, extra=extra,
+ system_prompt="",
+ messages=[],
+ tools=context_tools,
+ extra=extra,
)
output = await mw._expand(
- group_id="mcp:github", tool_names=["create_issue"], context=ctx,
+ group_id="mcp:github",
+ tool_names=["create_issue"],
+ context=ctx,
)
assert output.expanded is True
assert output.tool_names == ["create_issue"]
@@ -129,13 +142,18 @@ class TestAfterToolCallExpansion:
extra: dict = {}
call_count = [0]
group = _make_group(
- "mcp:github", ["t1", "t2", "t3"], loader_call_count=call_count,
+ "mcp:github",
+ ["t1", "t2", "t3"],
+ loader_call_count=call_count,
)
mw = DeferredToolsMiddleware(groups=[group], extra_ref=lambda: extra)
context_tools: list[AgentTool] = [mw.tools[0]]
ctx = AgentContext(
- system_prompt="", messages=[], tools=context_tools, extra=extra,
+ system_prompt="",
+ messages=[],
+ tools=context_tools,
+ extra=extra,
)
await mw._expand(group_id="mcp:github", tool_names=["t1"], context=ctx)
@@ -152,11 +170,16 @@ class TestAfterToolCallExpansion:
extra: dict = {}
mw = DeferredToolsMiddleware(groups=[], extra_ref=lambda: extra)
ctx = AgentContext(
- system_prompt="", messages=[], tools=[], extra=extra,
+ system_prompt="",
+ messages=[],
+ tools=[],
+ extra=extra,
)
output = await mw._expand(
- group_id="bad:id", tool_names=None, context=ctx,
+ group_id="bad:id",
+ tool_names=None,
+ context=ctx,
)
assert output.expanded is False
assert output.error is not None
@@ -169,16 +192,23 @@ class TestAfterToolCallExpansion:
context_tools: list[AgentTool] = [mw.tools[0]]
ctx = AgentContext(
- system_prompt="", messages=[], tools=context_tools, extra=extra,
+ system_prompt="",
+ messages=[],
+ tools=context_tools,
+ extra=extra,
)
await mw._expand(
- group_id="mcp:github", tool_names=None, context=ctx,
+ group_id="mcp:github",
+ tool_names=None,
+ context=ctx,
)
assert len(context_tools) == 2
await mw._expand(
- group_id="mcp:github", tool_names=None, context=ctx,
+ group_id="mcp:github",
+ tool_names=None,
+ context=ctx,
)
assert len(context_tools) == 2
@@ -196,11 +226,16 @@ class TestAfterToolCallExpansion:
extra: dict = {}
mw = DeferredToolsMiddleware(groups=[group], extra_ref=lambda: extra)
ctx = AgentContext(
- system_prompt="", messages=[], tools=[], extra=extra,
+ system_prompt="",
+ messages=[],
+ tools=[],
+ extra=extra,
)
output = await mw._expand(
- group_id="mcp:broken", tool_names=None, context=ctx,
+ group_id="mcp:broken",
+ tool_names=None,
+ context=ctx,
)
assert output.expanded is False
assert "connection refused" in (output.error or "")
@@ -235,7 +270,8 @@ class TestPrepareResumedState:
group = _make_group("mcp:github", ["t1", "t2"])
expanded: dict[str, list[str] | None] = {"mcp:github": None}
resumed = await DeferredToolsMiddleware.prepare_resumed_state(
- groups=[group], expanded=expanded,
+ groups=[group],
+ expanded=expanded,
)
assert len(resumed.pre_loaded_tools) == 2
assert len(resumed.remaining_groups) == 0
@@ -247,7 +283,8 @@ class TestPrepareResumedState:
group = _make_group("mcp:github", ["t1", "t2", "t3"])
expanded: dict[str, list[str] | None] = {"mcp:github": ["t1"]}
resumed = await DeferredToolsMiddleware.prepare_resumed_state(
- groups=[group], expanded=expanded,
+ groups=[group],
+ expanded=expanded,
)
assert len(resumed.pre_loaded_tools) == 1
assert resumed.pre_loaded_tools[0].name == "t1"
@@ -259,7 +296,8 @@ class TestPrepareResumedState:
group = _make_group("mcp:github", ["t1"])
expanded: dict[str, list[str] | None] = {}
resumed = await DeferredToolsMiddleware.prepare_resumed_state(
- groups=[group], expanded=expanded,
+ groups=[group],
+ expanded=expanded,
)
assert len(resumed.pre_loaded_tools) == 0
assert len(resumed.remaining_groups) == 1
@@ -273,7 +311,8 @@ class TestPrepareResumedState:
"mcp:slack": ["s1"],
}
resumed = await DeferredToolsMiddleware.prepare_resumed_state(
- groups=[group_a, group_b], expanded=expanded,
+ groups=[group_a, group_b],
+ expanded=expanded,
)
extra: dict[str, object] = {"expanded_groups": dict(expanded)}
mw = DeferredToolsMiddleware(