Anthropic tool use is always accompanied with text content. We should…

… be sending it back as well. (#869) * Anthropic tool use is always accompanied with text content. We should be sending it back as well. * changelog entry
patterns-ai-core · Nov 11, 2024 · 2406166 · 2406166
1 parent 195e4ef
commit 2406166
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@
 - [FEATURE] [https://github.com/patterns-ai-core/langchainrb/pull/849] Langchain::Assistant now works with AWS Bedrock-hosted Anthropic models
 - [OPTIM] [https://github.com/patterns-ai-core/langchainrb/pull/867] Refactor `GoogleGeminiMessage#to_hash` and `OpenAIMessage#to_hash` methods.
 - [OPTIM] [https://github.com/patterns-ai-core/langchainrb/pull/849] Simplify Langchain::LLM::AwsBedrock class
+- [BUGFIX] [https://github.com/patterns-ai-core/langchainrb/pull/869] AnthropicMessage now correctly handles tool calls with content.
 
 ## [0.19.0] - 2024-10-23
 - [BREAKING] [https://github.com/patterns-ai-core/langchainrb/pull/840] Rename `chat_completion_model_name` parameter to `chat_model` in Langchain::LLM parameters.

diff --git a/lib/langchain/assistant/messages/anthropic_message.rb b/lib/langchain/assistant/messages/anthropic_message.rb
@@ -55,11 +55,12 @@ def to_hash
         def assistant_hash
           {
             role: "assistant",
-            content: if tool_calls.any?
-                       tool_calls
-                     else
-                       content
-                     end
+            content: [
+              {
+                type: "text",
+                text: content
+              }
+            ].concat(tool_calls)
           }
         end
 

diff --git a/spec/langchain/assistant/assistant_spec.rb b/spec/langchain/assistant/assistant_spec.rb
@@ -1109,6 +1109,10 @@
             "output_tokens" => 55
           },
           "content" => [
+            {
+              "type" => "text",
+              "text" => "Sure, let's calculate it!"
+            },
             {
               "type" => "tool_use",
               "id" => "toolu_014eSx9oBA5DMe8gZqaqcJ3H",
@@ -1159,7 +1163,7 @@
           subject.run(auto_tool_execution: false)
 
           expect(subject.messages.last.role).to eq("assistant")
-          expect(subject.messages.last.tool_calls).to eq([raw_anthropic_response["content"].first])
+          expect(subject.messages.last.tool_calls).to eq([raw_anthropic_response["content"].last])
         end
 
         it "adds a system param to chat when instructions are given" do
@@ -1193,6 +1197,10 @@
               messages: [
                 {role: "user", content: [{text: "Please calculate 2+2", type: "text"}]},
                 {role: "assistant", content: [
+                  {
+                    type: "text",
+                    text: "Sure, let's calculate it!"
+                  },
                   {
                     "type" => "tool_use",
                     "id" => "toolu_014eSx9oBA5DMe8gZqaqcJ3H",
@@ -1215,7 +1223,11 @@
           ).and_return("4.0")
 
           subject.add_message(role: "user", content: "Please calculate 2+2")
-          subject.add_message(role: "assistant", tool_calls: raw_anthropic_response["content"])
+          subject.add_message(
+            role: "assistant",
+            content: raw_anthropic_response["content"].first["text"],
+            tool_calls: [raw_anthropic_response["content"].last]
+          )
 
           subject.run(auto_tool_execution: true)
 

diff --git a/spec/langchain/assistant/messages/anthropic_message_spec.rb b/spec/langchain/assistant/messages/anthropic_message_spec.rb
@@ -14,13 +14,19 @@
         expect(message).to receive(:assistant_hash).and_call_original
         expect(message.to_hash).to eq(
           role: role,
-          content: "Hello, how can I help you?"
+          content: [
+            {
+              type: "text",
+              text: "Hello, how can I help you?"
+            }
+          ]
         )
       end
 
       it "returns assistant_hash with tool_calls" do
         message = described_class.new(
           role: role,
+          content: "Okay, let's fetch the news",
           tool_calls: [
             {
               "type" => "tool_use",
@@ -37,6 +43,10 @@
         expect(message.to_hash).to eq(
           role: role,
           content: [
+            {
+              type: "text",
+              text: "Okay, let's fetch the news"
+            },
             {
               "type" => "tool_use",
               "id" => "toolu_01UEciZACvRZ6S4rqAwD1syH",