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
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div id="<%= message_variable_name %>_<%%= message.id %>" class="w-full sm:w-auto my-5 space-y-3 rounded-md px-3 py-2 bg-gray-50 border border-gray-200">
<div id="<%= message_variable_name %>_tool_call_<%%= tool_call.id %>" class="w-full sm:w-auto my-5 space-y-3 rounded-md px-3 py-2 bg-gray-50 border border-gray-200">
<div>
<span class="inline-block rounded px-2 py-0.5 text-xs font-medium bg-gray-200 text-gray-700">
Tool Call
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
title: "Tool Result Error",
error_message: error_message %>
<%% else %>
<div id="<%= message_variable_name %>_<%%= tool.id %>" class="w-full sm:w-auto my-5 space-y-3 rounded-md px-3 py-2 bg-gray-50 border border-gray-200">
<div id="<%= message_variable_name %>_tool_result_<%%= tool.id %>" class="w-full sm:w-auto my-5 space-y-3 rounded-md px-3 py-2 bg-gray-50 border border-gray-200">
<div>
<span class="inline-block rounded px-2 py-0.5 text-xs font-medium bg-gray-200 text-gray-700">
Tool
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div id="<%= message_variable_name %>_<%%= message.id %>" class="<%= message_variable_name %>"
<div id="<%= message_variable_name %>_tool_call_<%%= tool_call.id %>" class="<%= message_variable_name %>"
style="margin-bottom: 20px; padding: 10px; border-left: 3px solid #6b7280; background: #f9fafb;">
<div style="font-weight: bold; margin-bottom: 5px;">Tool Call</div>
<pre style="white-space: pre-wrap; margin: 0;"><%%= tool_call.name %>(<%%= tool_call.arguments.map { |k, v| "#{k}: #{v.inspect}" }.join(", ") %>)</pre>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
title: "Tool Result Error",
error_message: error_message %>
<%% else %>
<div id="<%= message_variable_name %>_<%%= tool.id %>" class="<%= message_variable_name %>"
<div id="<%= message_variable_name %>_tool_result_<%%= tool.id %>" class="<%= message_variable_name %>"
style="margin-bottom: 20px; padding: 10px; border-left: 3px solid #6b7280; background: #f9fafb;">
<div style="font-weight: bold; margin-bottom: 5px;">Tool</div>
<pre style="white-space: pre-wrap; margin: 0;"><%%= tool.content.presence || "(no output)" %></pre>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<%% if tool_call_error.present? %>
<%%= render "messages/error", message: message, title: "Tool Call Error", error_message: tool_call_error %>
<%% else %>
<div id="message_<%%= message.id %>" class="message"
<div id="message_tool_call_<%%= tool_call.id %>" class="message"
style="margin-bottom: 20px; padding: 10px; border-left: 3px solid #6b7280; background: #f9fafb;">
<div style="font-weight: bold; margin-bottom: 5px;"><%= tool_display_name %> Call</div>
<pre style="white-space: pre-wrap; margin: 0;"><%%= tool_call.name %>(<%%= tool_call.arguments.map { |k, v| "#{k}: #{v.inspect}" }.join(", ") %>)</pre>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<%% if error_message.present? %>
<%%= render "messages/error", message: tool, title: "Tool Result Error", error_message: error_message %>
<%% else %>
<div id="message_<%%= tool.id %>" class="message"
<div id="message_tool_result_<%%= tool.id %>" class="message"
style="margin-bottom: 20px; padding: 10px; border-left: 3px solid #6b7280; background: #f9fafb;">
<div style="font-weight: bold; margin-bottom: 5px;"><%= tool_display_name %> Result</div>
<pre style="white-space: pre-wrap; margin: 0;"><%%= tool.content.presence || "(no output)" %></pre>
Expand Down
3 changes: 3 additions & 0 deletions spec/ruby_llm/generators/chat_ui_generator_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,11 @@ def expect_generated_view_set( # rubocop:disable Metrics/AbcSize
tool_calls_partial = File.read(File.join(base_path, 'messages/_tool_calls.html.erb'))
expect(tool_calls_partial).to include('message: message, tool_call: tool_call')
expect(tool_calls_partial).to include('local_assigns[:message]')
tool_calls_default = File.read(File.join(base_path, 'messages/tool_calls/_default.html.erb'))
expect(tool_calls_default).to include('message_tool_call_<%= tool_call.id %>')
tool_results_default = File.read(File.join(base_path, 'messages/tool_results/_default.html.erb'))
expect(tool_results_default).to include('tool.tool_error_message')
expect(tool_results_default).to include('message_tool_result_<%= tool.id %>')
chat_form = File.read(File.join(base_path, 'chats/_form.html.erb'))
expect(chat_form).to include('@chat_models.map')
expect(chat_form).to include('[model.label, model.id]')
Expand Down
2 changes: 2 additions & 0 deletions spec/ruby_llm/generators/tool_generator_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,15 @@ def run_rails_generate(*args)
expect(tool_call_partial).to include('message: message')
expect(tool_call_partial).to include('Weather Call')
expect(tool_call_partial).to include('tool_call.arguments.map')
expect(tool_call_partial).to include('message_tool_call_<%= tool_call.id %>')
expect(tool_call_partial).not_to include('render "messages/tool_calls/default"')
expect(tool_call_partial).not_to include('<%%')

tool_result_partial = File.read('app/views/messages/tool_results/_weather.html.erb')
expect(tool_result_partial).to include('tool.tool_error_message')
expect(tool_result_partial).to include('Weather Result')
expect(tool_result_partial).to include('tool.content.presence || "(no output)"')
expect(tool_result_partial).to include('message_tool_result_<%= tool.id %>')
expect(tool_result_partial).not_to include('render "messages/tool_results/default", tool: tool')
expect(tool_result_partial).not_to include('<%%')
end
Expand Down
Loading