xml tools are back now

Author: SamSaffron

lib/completions/anthropic_message_processor.rb

@@ -70,7 +70,8 @@ def process_streamed_message(parsed)
 
   def process_message(payload)
     result = ""
-    parsed = JSON.parse(payload, symbolize_names: true)
+    parsed = payload
+    parsed = JSON.parse(payload, symbolize_names: true) if payload.is_a?(String)
 
     content = parsed.dig(:content)
     if content.is_a?(Array)

lib/completions/endpoints/anthropic.rb

@@ -119,10 +119,6 @@ def final_log_update(log)
           log.response_tokens = processor.output_tokens if processor.output_tokens
         end
 
-        def native_tool_support?
-          @native_tool_support
-        end
-
         def partials_from(decoded_chunk)
           decoded_chunk.split("\n").map { |line| line.split("data: ", 2)[1] }.compact
         end

lib/completions/endpoints/aws_bedrock.rb

@@ -117,7 +117,22 @@ def prepare_request(payload)
             end
         end
 
-        def decode(chunk)
+        def decode_chunk(partial_data)
+          bedrock_decode(partial_data).map do |decoded_partial_data|
+            @raw_response ||= +""
+            @raw_response << decoded_partial_data
+            @raw_response << "\n"
+
+            parsed_json = JSON.parse(decoded_partial_data, symbolize_names: true)
+            processor.process_streamed_message(parsed_json)
+          end.compact
+        end
+
+        def decode(response_data)
+          processor.process_message(response_data)
+        end
+
+        def bedrock_decode(chunk)
           @decoder ||= Aws::EventStream::Decoder.new
 
           decoded, _done = @decoder.decode_chunk(chunk)
@@ -147,12 +162,13 @@ def decode(chunk)
                Aws::EventStream::Errors::MessageChecksumError,
                Aws::EventStream::Errors::PreludeChecksumError => e
           Rails.logger.error("#{self.class.name}: #{e.message}")
-          nil
+          []
         end
 
         def final_log_update(log)
           log.request_tokens = processor.input_tokens if processor.input_tokens
           log.response_tokens = processor.output_tokens if processor.output_tokens
+          log.raw_response_payload = @raw_response
         end
 
         def processor
@@ -164,20 +180,13 @@ def add_to_function_buffer(function_buffer, partial: nil, payload: nil)
           processor.to_xml_tool_calls(function_buffer) if !partial
         end
 
-        def extract_completion_from(response_raw)
-          processor.process_message(response_raw)
-        end
 
         def has_tool?(_response_data)
           processor.tool_calls.present?
         end
 
-        def partials_from(decoded_chunks)
-          decoded_chunks
-        end
-
-        def native_tool_support?
-          @native_tool_support
+        def xml_tools_enabled?
+          !@native_tool_support
         end
 
         def chunk_to_string(chunk)