ox-ai-workers 1.1.0.2 → 1.1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4afc56ab5707889f6c7f49b2efbc78d7506d9b15fed6ecdd3532fe5be830d3f9
-  data.tar.gz: 1adf7f70b822a9abb734a0f79b4ae08424649c8e8ce18d38bdf03295a75b169f
+  metadata.gz: 88cf2322e5e5f9f67360a09801767f58b5a926411e24a53fd03887e035c2c2d7
+  data.tar.gz: 0da9e2585f0e347cc193aee650fcec6b6458a091869f9bd4af6e857cc9c30aec
 SHA512:
-  metadata.gz: 55bae419790315cd87157cce6c96fa533baa55f54f8c2d8fb06026c23d871103d6e00d05259e626dfbf59df380e61e004f4e2db56ded769887f87dd6ea40fe78
-  data.tar.gz: fe625123a64b4707698028514b68078587b4a849fe84cc1e8b68dcd66f60ccee7342ca94ecb15d0fc511b5bfc666705ad78f9cb0bcc6107dce73907744e619a9
+  metadata.gz: 3f060a38af2fca2f37a01cc44cc19e573565852b735571882a53c9376d4b81d37f77b848fbd6ebd5cf42e71ba3a68045ea021ab967cd140af2a83c22872e6056
+  data.tar.gz: 7cdd9fc305a3e2498a14cf81949abfc38fafa6845378f42c431c65591259f4cd931fa21dbaefda72156ee0dc3644ecc98b2673d15d3676a65a405b61f019ac76

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [1.1.1] - 2025-05-26
+
+- Removed task appending in `Iterator`
+
 ## [1.1.0] - 2025-05-21
 
 - Added `add_base64` and `add_url` for Models

data/lib/oxaiworkers/iterator.rb

@@ -264,15 +264,15 @@ module OxAiWorkers
       add_raw_context({ role:, content: text })
     end
 
-    def add_file(pdf:, filename:, text:, role: :user)
-      content = @worker.model.add_base64(binary: pdf, filename:, text:, mime_type: 'application/pdf')
+    def add_file(pdf:, text:, role: :user)
+      content = @worker.model.add_base64(binary: pdf, text:, mime_type: 'application/pdf')
       add_raw_context({ role:, content: })
     end
 
     def add_image(text:, url: nil, binary: nil, role: :user, detail: 'auto', mime_type: 'image/png')
       content = []
       if binary.present?
-        content = @worker.model.add_base64(binary:, filename:, text:, mime_type:, detail:)
+        content = @worker.model.add_base64(binary:, text:, mime_type:, detail:)
       elsif url.present?
         content = @worker.model.add_url(url:, text:, detail:, mime_type:)
       end

data/lib/oxaiworkers/models/anthropic_max.rb

@@ -70,7 +70,7 @@ module OxAiWorkers
         ]
       end
 
-      def add_base64(binary:, filename:, text:, mime_type:)
+      def add_base64(binary:, text:, mime_type:, detail:)
         content = []
         content << { type: 'text', text: } if text.present?
         content << {

data/lib/oxaiworkers/models/gemini_pro.rb

@@ -0,0 +1,151 @@
+# frozen_string_literal: true
+
+module OxAiWorkers
+  module Models
+    class GeminiPro < LLMBase
+      def initialize(uri_base: nil, api_key: nil, model: nil, max_tokens: nil, temperature: nil, frequency_penalty: nil)
+        @model = model || 'gemini-pro'
+        @uri_base = uri_base # || 'https://api.anthropic.com/v1/'
+        @api_key = api_key || OxAiWorkers.configuration.access_token_gemini
+        super(uri_base: @uri_base, api_key: @api_key, model: @model, max_tokens:, temperature:, frequency_penalty:)
+      end
+
+      def client
+        Gemini.new(
+          credentials: {
+            service: 'generative-language-api',
+            api_key: ENV['GOOGLE_API_KEY']
+          },
+          options: { model: 'gemini-pro', server_sent_events: true }
+        )
+      end
+
+      def request(parameters)
+        client.messages(parameters:)
+      end
+
+      def build_parameters(messages:, tools: [], filtered_functions: [], tool_choice: nil)
+        parameters = {
+          model: @model,
+          system: messages.select { |m| m[:role] == :system }.map { |m| m[:content] }.join("\n\n"),
+          messages: messages.reject { |m| m[:role] == :system },
+          temperature: @temperature,
+          max_tokens: @max_tokens
+        }
+        if tools.present?
+          functions = tools.map(&:to_anthropic_format).flatten
+
+          @names = functions.map { |f| f[:name] }
+
+          parameters[:tools] = functions.reject { |f| filtered_functions.include?(f[:name]) }
+
+          parameters[:tool_choice] =
+            tool_choice.nil? ? { type: 'any' } : { type: 'tool', name: tool_choice }
+        end
+        parameters
+      end
+
+      def tool_call(name:, args:, call_id:, out:)
+        [
+          {
+            role: :assistant,
+            content: [
+              {
+                type: 'tool_use',
+                id: "call_#{call_id}",
+                name:,
+                input: args
+              }
+            ]
+          },
+          {
+            role: :user,
+            content: [
+              {
+                type: 'tool_result',
+                tool_use_id: "call_#{call_id}",
+                content: out.present? ? out : "Tool call #{name} successful."
+              }
+            ]
+          }
+        ]
+      end
+
+      def add_base64(binary:, filename:, text:, mime_type:)
+        content = []
+        content << { type: 'text', text: } if text.present?
+        content << {
+                      type: mime_type.include?('image') ? 'image' : 'document',
+                      source: {
+                        type: 'base64',
+                        media_type: mime_type,
+                        data: Base64.strict_encode64(binary)
+                      }
+                    }
+        content
+      end
+
+      def add_url(url:, text:, mime_type:)
+        content = []
+        content << { type: 'text', text: } if text.present?
+        content << {
+                      type: mime_type.include?('image') ? 'image' : 'document',
+                      source: {
+                        type: 'url',
+                        url: url
+                      }
+                    }
+        content
+      end
+
+      def parse_response(response, &)
+        choices = response['content']
+        @is_truncated = (response['stop_reason'] == 'max_tokens')
+        return if choices.nil? || choices.empty?
+
+        choices.each do |choice|
+          result, tool_calls = parse_one_choice(choice)
+          yield(result, @is_truncated, tool_calls)
+        end
+      end
+
+      def parse_one_choice(choice)
+        return unless choice # Skip if there's no choice
+
+        # Initialize result variables
+        @result = nil
+        @tool_calls = []
+
+        # Process content item
+        if choice['type'] == 'tool_use'
+          # Handle tool use
+          begin
+            # Attempt to parse arguments, handle potential JSON errors
+            args = JSON.parse(choice['input'].to_json, symbolize_names: true)
+          rescue JSON::ParserError => e
+            OxAiWorkers.logger.error("Failed to parse tool call arguments: #{e.message}", for: self.class)
+            OxAiWorkers.logger.debug("Raw arguments: #{choice['input']}", for: self.class)
+          end
+
+          fname = @names.find { |n| n.end_with?(choice['name']) }
+          if fname != choice['name']
+            OxAiWorkers.logger.error("Tool call name #{choice['name']} not found. Using #{fname} instead.",
+                                     for: self.class)
+          end
+
+          tool_call = {
+            class: fname.split('__').first,
+            name: fname.split('__').last,
+            args:
+          }
+          @tool_calls << tool_call
+        elsif choice['type'] == 'text'
+          # Handle text content
+          @result = choice['text']
+        end
+
+        [@result, @tool_calls]
+      end
+    end
+  end
+end

data/lib/oxaiworkers/models/llm_base.rb

@@ -66,7 +66,7 @@ module OxAiWorkers
         ]
       end
 
-      def add_base64(binary:, filename:, text:, mime_type:, detail: 'auto')
+      def add_base64(binary:, text:, mime_type:, detail: 'auto')
         content = []
         content << { type: 'text', text: } if text.present?
         content << if mime_type.include?('image')
@@ -80,7 +80,7 @@ module OxAiWorkers
                      {
                        type: 'file',
                        file: {
-                         filename:,
+                         filename: "file.#{mime_type.split('/').last}",
                          file_data: "data:#{mime_type};base64,#{Base64.strict_encode64(binary)}"
                        }
                      }

data/lib/oxaiworkers/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OxAiWorkers
-  VERSION = '1.1.0.2'
+  VERSION = '1.1.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ox-ai-workers
 version: !ruby/object:Gem::Version
-  version: 1.1.0.2
+  version: 1.1.1.2
 platform: ruby
 authors:
 - Denis Smolev
@@ -159,6 +159,7 @@ files:
 - lib/oxaiworkers/load_i18n.rb
 - lib/oxaiworkers/models/anthropic_max.rb
 - lib/oxaiworkers/models/deepseek_max.rb
+- lib/oxaiworkers/models/gemini_pro.rb
 - lib/oxaiworkers/models/images_base.rb
 - lib/oxaiworkers/models/llm_base.rb
 - lib/oxaiworkers/models/openai_dalle3.rb