omniai-anthropic 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40dd84f42676e7000caed3c06c942ab1bca0d3d10763c279e084e5d378930946
-  data.tar.gz: 2233860b1769b297af92fe5c1156fb08ffb61a88452ba39d8ad79e131ae861be
+  metadata.gz: 692299f3cf52f0f131202156f1fc5d0f973ec0488eff51f1e0186d3e88befa5d
+  data.tar.gz: 2d77787b55f8aa59acc9a33c92627451089fc63c988723963f0bf967dc30df40
 SHA512:
-  metadata.gz: d4c99af8092f169086859edf43d6a9164d410caa0166a43fd2ff0b76156fb28cedca8fbbd84251e3405406336a371a068fd00968d93dc723050950dae4da7c80
-  data.tar.gz: f022585d04e3983ed15ec31cfc3b125bc5e6396be2d417a9cc10af0e827e32a0a19c324062987a83be5cfd306c4659d5e702ae7c931511189518c546b4e31489
+  metadata.gz: 97364e1f0f92ac5984dadaa4ff3e19b71463f2bc8acccc939b2f215e3d28daad8f4032d0b251f9253932134dc4c6808e71c80ab796f5c325c6108e4d76535019
+  data.tar.gz: 5697f26b5817a949aa4d5cf9e760de598a48c4ed298f9822bd659738ed3e0631b1cbaa98d8bad019e66501f6b331896e637a9f13608a07aa433be64749e54fff

data/lib/omniai/anthropic/chat/message_serializer.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module OmniAI
+  module Anthropic
+    class Chat
+      # Overrides message serialize / deserialize.
+      module MessageSerializer
+        # @param message [OmniAI::Chat::Message]
+        # @param context [OmniAI::Context]
+        # @return [Hash]
+        def self.serialize(message, context:)
+          role = message.role
+          parts = arrayify(message.content) + arrayify(message.tool_call_list)
+          content = parts.map do |part|
+            case part
+            when String then { type: 'text', text: part }
+            else part.serialize(context:)
+            end
+          end
+
+          { role:, content: }
+        end
+
+        # @param data [Hash]
+        # @param context [OmniAI::Context]
+        # @return [OmniAI::Chat::Message]
+        def self.deserialize(data, context:)
+          role = data['role']
+          parts = arrayify(data['content']).map do |content|
+            ContentSerializer.deserialize(content, context:)
+          end
+
+          tool_call_list = parts.select { |part| part.is_a?(OmniAI::Chat::ToolCall) }
+          content = parts.reject { |part| part.is_a?(OmniAI::Chat::ToolCall) }
+
+          OmniAI::Chat::Message.new(content:, role:, tool_call_list:)
+        end
+
+        # @param content [Object]
+        # @return [Array<Object>]
+        def self.arrayify(content)
+          return [] if content.nil?
+
+          content.is_a?(Array) ? content : [content]
+        end
+      end
+    end
+  end
+end

data/lib/omniai/anthropic/chat/tool_call_result_serializer.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module OmniAI
+  module Anthropic
+    class Chat
+      # Overrides tool-call response serialize / deserialize.
+      module ToolCallResultSerializer
+        # @param tool_call_result [OmniAI::Chat::ToolCallResult]
+        # @return [Hash]
+        def self.serialize(tool_call_result, *)
+          {
+            type: 'tool_result',
+            tool_use_id: tool_call_result.tool_call_id,
+            content: tool_call_result.content,
+          }
+        end
+
+        # @param data [Hash]
+        # @return [OmniAI::Chat::ToolCallResult]
+        def self.deserialize(data, *)
+          tool_call_id = data['tool_use_id']
+          content = data['content']
+
+          OmniAI::Chat::ToolCallResult.new(content:, tool_call_id:)
+        end
+      end
+    end
+  end
+end

data/lib/omniai/anthropic/chat/tool_serializer.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module OmniAI
+  module Anthropic
+    class Chat
+      # Overrides tool serialize / deserialize.
+      module ToolSerializer
+        # @param tool [OmniAI::Tool]
+        # @return [Hash]
+        def self.serialize(tool, *)
+          {
+            name: tool.name,
+            description: tool.description,
+            input_schema: tool.parameters.is_a?(Tool::Parameters) ? tool.parameters.serialize : tool.parameters,
+          }.compact
+        end
+      end
+    end
+  end
+end

data/lib/omniai/anthropic/chat.rb

@@ -29,6 +29,8 @@ module OmniAI
 
       # @return [Context]
       CONTEXT = Context.build do |context|
+        context.serializers[:tool] = ToolSerializer.method(:serialize)
+
         context.serializers[:file] = MediaSerializer.method(:serialize)
         context.serializers[:url] = MediaSerializer.method(:serialize)
 
@@ -38,9 +40,15 @@ module OmniAI
         context.serializers[:tool_call] = ToolCallSerializer.method(:serialize)
         context.deserializers[:tool_call] = ToolCallSerializer.method(:deserialize)
 
+        context.serializers[:tool_call_result] = ToolCallResultSerializer.method(:serialize)
+        context.deserializers[:tool_call_result] = ToolCallResultSerializer.method(:deserialize)
+
         context.serializers[:function] = FunctionSerializer.method(:serialize)
         context.deserializers[:function] = FunctionSerializer.method(:deserialize)
 
+        context.serializers[:message] = MessageSerializer.method(:serialize)
+        context.deserializers[:message] = MessageSerializer.method(:deserialize)
+
         context.deserializers[:content] = ContentSerializer.method(:deserialize)
         context.deserializers[:payload] = PayloadSerializer.method(:deserialize)
       end
@@ -83,17 +91,20 @@ module OmniAI
         CONTEXT
       end
 
+      # @return [Array<Message>]
+      def build_tool_call_messages(tool_call_list)
+        content = tool_call_list.map do |tool_call|
+          ToolCallResult.new(tool_call_id: tool_call.id, content: execute_tool_call(tool_call))
+        end
+
+        [Message.new(role: OmniAI::Chat::Role::USER, content:)]
+      end
+
       private
 
       # @return [Array<Hash>, nil]
       def tools_payload
-        @tools&.map do |tool|
-          {
-            name: tool.name,
-            description: tool.description,
-            input_schema: tool.parameters&.prepare,
-          }.compact
-        end
+        @tools.map { |tool| tool.serialize(context:) } if @tools&.any?
       end
     end
   end

data/lib/omniai/anthropic/version.rb

@@ -2,6 +2,6 @@
 
 module OmniAI
   module Anthropic
-    VERSION = '1.8.0'
+    VERSION = '1.8.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniai-anthropic
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Kevin Sylvestre
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-16 00:00:00.000000000 Z
+date: 2024-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: event_stream_parser
@@ -67,10 +67,13 @@ files:
 - lib/omniai/anthropic/chat/content_serializer.rb
 - lib/omniai/anthropic/chat/function_serializer.rb
 - lib/omniai/anthropic/chat/media_serializer.rb
+- lib/omniai/anthropic/chat/message_serializer.rb
 - lib/omniai/anthropic/chat/payload_serializer.rb
 - lib/omniai/anthropic/chat/stream.rb
 - lib/omniai/anthropic/chat/text_serializer.rb
+- lib/omniai/anthropic/chat/tool_call_result_serializer.rb
 - lib/omniai/anthropic/chat/tool_call_serializer.rb
+- lib/omniai/anthropic/chat/tool_serializer.rb
 - lib/omniai/anthropic/client.rb
 - lib/omniai/anthropic/config.rb
 - lib/omniai/anthropic/version.rb