Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions lib/hermes/server/handlers/tools.ex
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@ defmodule Hermes.Server.Handlers.Tools do
{:reply, Response.to_protocol(resp), frame}
end

defp maybe_validate_output_schema(_tool, %Response{isError: true} = resp, frame) do
{:reply, Response.to_protocol(resp), frame}
end

defp maybe_validate_output_schema(%Tool{} = tool, %Response{structured_content: nil}, frame) do
metadata = %{tool_name: tool.name}
{:error, Error.execution(@output_schema_err, metadata), frame}
Expand Down
20 changes: 20 additions & 0 deletions test/hermes/server/component/tool_annotations_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,10 @@ defmodule Hermes.Server.Component.ToolAnnotationsTest do
end

@impl true
def execute(%{query: "tool error"}, frame) do
{:reply, Response.error(Response.tool(), "Tool error"), frame}
end

def execute(%{query: query}, frame) do
results = %{
results: [
Expand Down Expand Up @@ -392,6 +396,22 @@ defmodule Hermes.Server.Component.ToolAnnotationsTest do
assert result["isError"] == false
end

test "tool error response skips output schema validation", %{
server: server,
session_id: session_id
} do
request =
build_request("tools/call", %{
"name" => "tool_with_output_schema",
"arguments" => %{"query" => "tool error"}
})

{:ok, response_string} =
GenServer.call(server, {:request, request, session_id, %{}})

assert {:ok, [%{"result" => %{"isError" => true}}]} = Message.decode(response_string)
end

test "tool without output schema works normally", %{
server: server,
session_id: session_id
Expand Down