Skip to content

Commit b32f562

Browse files
jsonbaileyclaude
andcommitted
fix: resolve lint errors from rebase onto main
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent be26d6d commit b32f562

9 files changed

Lines changed: 41 additions & 27 deletions

File tree

packages/ai-providers/server-ai-langchain/src/ldai_langchain/langchain_runner_factory.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ def create_agent_graph(self, graph_def: Any, tools: ToolRegistry) -> Any:
1818
:param tools: Registry mapping tool names to callables (langchain-compatible)
1919
:return: LangGraphAgentGraphRunner ready to execute the graph
2020
"""
21-
from ldai_langchain.langgraph_agent_graph_runner import LangGraphAgentGraphRunner
21+
from ldai_langchain.langgraph_agent_graph_runner import (
22+
LangGraphAgentGraphRunner,
23+
)
2224
return LangGraphAgentGraphRunner(graph_def, tools)
2325

2426
def create_model(self, config: AIConfigKind) -> LangChainModelRunner:

packages/ai-providers/server-ai-langchain/src/ldai_langchain/langgraph_agent_graph_runner.py

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,15 @@
66

77
from ldai import log
88
from ldai.agent_graph import AgentGraphDefinition, AgentGraphNode
9+
from ldai.providers import AgentGraphResult, AgentGraphRunner, ToolRegistry
910
from ldai.providers.types import LDAIMetrics
10-
from ldai.runners.agent_graph_runner import AgentGraphRunner
11-
from ldai.runners.types import AgentGraphResult, ToolRegistry
1211

13-
from ldai_langchain.langchain_helper import LangChainHelper
12+
from ldai_langchain.langchain_helper import (
13+
get_ai_metrics_from_response,
14+
get_ai_usage_from_response,
15+
get_tool_calls_from_response,
16+
sum_token_usage_from_messages,
17+
)
1418

1519

1620
class LangGraphAgentGraphRunner(AgentGraphRunner):
@@ -53,7 +57,7 @@ async def run(self, input: Any) -> AgentGraphResult:
5357
from typing_extensions import TypedDict
5458

5559
class WorkflowState(TypedDict):
56-
messages: Annotated[List[AnyMessage], operator.add]
60+
messages: Annotated[List[Any], operator.add]
5761

5862
agent_builder: StateGraph = StateGraph(WorkflowState)
5963
root_node = self._graph.root()
@@ -87,11 +91,11 @@ def invoke(state: WorkflowState) -> WorkflowState:
8791
if node_tracker:
8892
response = node_tracker.track_metrics_of(
8993
lambda: model.invoke(state['messages']),
90-
LangChainHelper.get_ai_metrics_from_response,
94+
get_ai_metrics_from_response,
9195
graph_key=gk,
9296
)
9397
node_tracker.track_tool_calls(
94-
LangChainHelper.get_tool_calls_from_response(response),
98+
get_tool_calls_from_response(response),
9599
graph_key=tracker.graph_key if tracker is not None else None,
96100
)
97101
else:
@@ -101,7 +105,7 @@ def invoke(state: WorkflowState) -> WorkflowState:
101105

102106
invoke.__name__ = node_key
103107

104-
agent_builder.add_node(name=node_key, node=invoke)
108+
agent_builder.add_node(node_key, invoke)
105109

106110
if node_key == root_key:
107111
agent_builder.add_edge(START, node_key)
@@ -134,7 +138,7 @@ def invoke(state: WorkflowState) -> WorkflowState:
134138
tracker.track_latency(duration)
135139
tracker.track_invocation_success()
136140
tracker.track_total_tokens(
137-
LangChainHelper.sum_token_usage_from_messages(messages)
141+
sum_token_usage_from_messages(messages)
138142
)
139143

140144
return AgentGraphResult(

packages/ai-providers/server-ai-langchain/tests/test_langgraph_agent_graph_runner.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
from ldai.agent_graph import AgentGraphDefinition
77
from ldai.models import AIAgentGraphConfig, AIAgentConfig, ModelConfig, ProviderConfig
8-
from ldai.runners.types import AgentGraphResult, ToolRegistry
8+
from ldai.providers import AgentGraphResult, ToolRegistry
99
from ldai_langchain.langgraph_agent_graph_runner import LangGraphAgentGraphRunner
1010
from ldai_langchain.langchain_runner_factory import LangChainRunnerFactory
1111

packages/ai-providers/server-ai-openai/src/ldai_openai/openai_agent_graph_runner.py

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55

66
from ldai import log
77
from ldai.agent_graph import AgentGraphDefinition, AgentGraphNode
8+
from ldai.providers import AgentGraphResult, AgentGraphRunner, ToolRegistry
89
from ldai.providers.types import LDAIMetrics
9-
from ldai.runners.agent_graph_runner import AgentGraphRunner
10-
from ldai.runners.types import AgentGraphResult, ToolRegistry
1110
from ldai.tracker import TokenUsage
1211

1312

@@ -35,7 +34,12 @@ def _log_run_result_shape(result: Any) -> None:
3534

3635
def _build_native_tool_map() -> dict:
3736
try:
38-
from agents import CodeInterpreterTool, FileSearchTool, ImageGenerationTool, WebSearchTool
37+
from agents import (
38+
CodeInterpreterTool,
39+
FileSearchTool,
40+
ImageGenerationTool,
41+
WebSearchTool,
42+
)
3943
return {
4044
'web_search_tool': lambda _: WebSearchTool(),
4145
'file_search_tool': lambda _: FileSearchTool(),
@@ -190,7 +194,14 @@ def _build_agents(self, path: List[str]) -> Any:
190194
:return: The root Agent instance
191195
"""
192196
try:
193-
from agents import Agent, FunctionTool, Handoff, RunContextWrapper, Tool, handoff
197+
from agents import (
198+
Agent,
199+
FunctionTool,
200+
Handoff,
201+
RunContextWrapper,
202+
Tool,
203+
handoff,
204+
)
194205
from agents.extensions.handoff_prompt import RECOMMENDED_PROMPT_PREFIX
195206
from agents.tool_context import ToolContext
196207
except ImportError as exc:

packages/ai-providers/server-ai-openai/src/ldai_openai/openai_runner_factory.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
from typing import Any, Optional
33

44
from ldai.models import AIConfigKind
5-
from ldai.providers import AIProvider
6-
from ldai.runners.types import ToolRegistry
5+
from ldai.providers import AIProvider, ToolRegistry
76
from openai import AsyncOpenAI
87

98
from ldai_openai.openai_model_runner import OpenAIModelRunner

packages/ai-providers/server-ai-openai/tests/test_openai_agent_graph_runner.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
from ldai.agent_graph import AgentGraphDefinition
77
from ldai.models import AIAgentGraphConfig, AIAgentConfig, Edge, ModelConfig, ProviderConfig
8-
from ldai.runners.types import AgentGraphResult, ToolRegistry
8+
from ldai.providers import AgentGraphResult, ToolRegistry
99
from ldai_openai.openai_agent_graph_runner import OpenAIAgentGraphRunner
1010
from ldai_openai.openai_runner_factory import OpenAIRunnerFactory
1111

packages/sdk/server-ai/src/ldai/client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
ModelConfig,
2626
ProviderConfig,
2727
)
28+
from ldai.providers import ToolRegistry
2829
from ldai.providers.runner_factory import RunnerFactory
29-
from ldai.runners.types import ToolRegistry
3030
from ldai.sdk_info import AI_SDK_LANGUAGE, AI_SDK_NAME, AI_SDK_VERSION
3131
from ldai.tracker import AIGraphTracker, LDAIConfigTracker
3232

@@ -653,7 +653,7 @@ async def create_agent_graph(
653653
if not graph.enabled:
654654
return None
655655

656-
runner = await RunnerFactory.create_agent_graph(
656+
runner = RunnerFactory.create_agent_graph(
657657
graph, tools or {}, default_ai_provider
658658
)
659659
if not runner:

packages/sdk/server-ai/src/ldai/managed_agent_graph.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
from typing import Any, Optional
44

5-
from ldai.runners.agent_graph_runner import AgentGraphRunner
6-
from ldai.runners.types import AgentGraphResult
5+
from ldai.providers import AgentGraphResult, AgentGraphRunner
76
from ldai.tracker import AIGraphTracker
87

98

packages/sdk/server-ai/tests/test_managed_agent_graph.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77

88
from ldai import LDAIClient, ManagedAgentGraph
99
from ldai.providers.types import LDAIMetrics
10-
from ldai.runners.agent_graph_runner import AgentGraphRunner
11-
from ldai.runners.types import AgentGraphResult, ToolRegistry
10+
from ldai.providers import AgentGraphResult, AgentGraphRunner, ToolRegistry
1211
from ldai.tracker import AIGraphTracker
1312

1413

@@ -125,7 +124,7 @@ async def test_create_agent_graph_returns_managed_agent_graph(ldai_client: LDAIC
125124

126125
with patch(
127126
'ldai.providers.runner_factory.RunnerFactory.create_agent_graph',
128-
new=AsyncMock(return_value=stub_runner),
127+
new=MagicMock(return_value=stub_runner),
129128
):
130129
managed = await ldai_client.create_agent_graph('travel-graph', context)
131130

@@ -147,7 +146,7 @@ async def test_create_agent_graph_returns_none_when_runner_factory_fails(ldai_cl
147146

148147
with patch(
149148
'ldai.providers.runner_factory.RunnerFactory.create_agent_graph',
150-
new=AsyncMock(return_value=None),
149+
new=MagicMock(return_value=None),
151150
):
152151
managed = await ldai_client.create_agent_graph('travel-graph', context)
153152

@@ -160,7 +159,7 @@ async def test_create_agent_graph_passes_tools_to_factory(ldai_client: LDAIClien
160159
tools: ToolRegistry = {'search': lambda q: f'results for {q}'}
161160
captured = {}
162161

163-
async def fake_create_agent_graph(graph_def, tools_arg, default_ai_provider=None):
162+
def fake_create_agent_graph(graph_def, tools_arg, default_ai_provider=None):
164163
captured['tools'] = tools_arg
165164
return StubAgentGraphRunner()
166165

@@ -179,7 +178,7 @@ async def test_create_agent_graph_run_produces_result(ldai_client: LDAIClient):
179178

180179
with patch(
181180
'ldai.providers.runner_factory.RunnerFactory.create_agent_graph',
182-
new=AsyncMock(return_value=StubAgentGraphRunner("final answer")),
181+
new=MagicMock(return_value=StubAgentGraphRunner("final answer")),
183182
):
184183
managed = await ldai_client.create_agent_graph('travel-graph', context)
185184

0 commit comments

Comments
 (0)