rach 0.2.9 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d38fee5588b8410bd344b1848429f4cd5534dbfc46bdb3c7c55193156b3f78b5
-  data.tar.gz: 8a8b353426c367c4b0a7663d66a0a82a91c594a23384f12ed17f3484513aa105
+  metadata.gz: abe9277687df73a293f283e8f5f0b0740046f10a8fa94c9734afdf1d401cd166
+  data.tar.gz: 6b66d2598552b7bfaff52a8bca9dbd8dbd3420417de5e05d26d981852010fe00
 SHA512:
-  metadata.gz: 0c963bd5389c85b39ac2f2fb8ef94f3e35167bd265e2dfa77c6a63642ae42d156954e9d151fbea994b3c12fe5d5a7db15f2671501449a74df17e4e26a1e3383d
-  data.tar.gz: 8f3e9700244b3fc29414a512b1cbf84818b72d73cc44d60a6dc581835a77d680f0616008477bbaf54f68e2fcf2dbfa540fc104aa346cd3882c47826c578a90d9
+  metadata.gz: ac70abf3662cd65d303a5ee1ef112315e0029a003c3df302fe35cd74a745ad29d2d6c99e642a76afdc6764dd7a8814bd4fc74575bff67a907ccce41f4f65e536
+  data.tar.gz: 90159e32b77b0699e600b1b8f57156df56990a0eabf23c7b83b430347c31c9babf69ca14456c4e178198fe82d63847a40a2c652341bef8b24c8d26b81b77c635

data/lib/rach/client.rb

@@ -13,7 +13,7 @@ module Rach
         setup_providers(providers)
       elsif access_token && model
         provider = Provider.for(model)
-        setup_providers({ provider.key => { access_token: access_token } })
+        setup_providers({ provider.key => { access_token: access_token, model: model } })
       else
         raise ArgumentError, "Either (providers) or (access_token AND model) must be provided"
       end

data/lib/rach/initializers/google_client.rb

@@ -0,0 +1,15 @@
+module Gemini
+  module Controllers
+    class Client
+      attr_accessor :model_address
+
+      def model
+        @model_address.split('models/').last
+      end
+
+      def model=(new_model)
+        @model_address = "models/#{new_model}"
+      end
+    end
+  end
+end

data/lib/rach/provider/google.rb

@@ -10,6 +10,12 @@ module Rach
       end
 
       def chat(**parameters)
+        # Update the client's model if it differs from the request
+        if parameters.dig(:parameters, :model) != @client.model
+          @client.model = parameters.dig(:parameters, :model)
+          # @client = create_client(@client.credentials[:api_key], model: parameters.dig(:parameters, :model))
+        end
+
         messages = parameters.dig(:parameters, :messages) || []
         system_message = messages.find { |msg| msg[:role] == "system" }
         messages = messages.reject { |msg| msg[:role] == "system" } if system_message
@@ -30,12 +36,27 @@ module Rach
           end
         end
 
+        request_params = { contents: contents }
+
+        # Handle response format if provided
+        if response_format = parameters.dig(:parameters, :response_format)
+          request_params[:generation_config] = {
+            response_mime_type: 'application/json',
+            response_schema: convert_response_format(response_format)
+          }
+        end
+
+        if request_params.dig(:generation_config, :response_schema)
+          request_params[:generation_config][:response_schema].delete(:additionalProperties)
+          request_params[:generation_config][:response_schema].delete(:required)
+        end
+
         if @logger
           @logger.info("Making API call to Google Gemini")
-          @logger.info("Request parameters: #{contents.inspect}")
+          @logger.info("Request parameters: #{request_params.inspect}")
         end
 
-        raw_response = @client.generate_content({ contents: contents })
+        raw_response = @client.generate_content(request_params)
 
         if @logger
           @logger.info("Response: #{raw_response.inspect}")
@@ -66,11 +87,24 @@ module Rach
             service: 'generative-language-api',
             api_key: access_token
           },
-          options: { model: 'gemini-pro' }
+          options: { model: config[:model] }
         }
-        client_config[:options].merge!(config)
+        
+        # Only merge additional options that aren't already set
+        client_config[:options].merge!(config.except(:model))
+
+        # Function calling and structured output are broken in this gem
+        gemini = ::Gemini.new(**client_config)
+        base_address = gemini.instance_variable_get(:@base_address)
+        base_address.gsub!('v1', 'v1beta') if base_address
+        gemini
+      end
+
+      def convert_response_format(format)
+        return unless format[:type] == "json_schema"
 
-        ::Gemini.new(**client_config)
+        schema = format.dig(:json_schema, :schema)
+        schema.deep_symbolize_keys
       end
     end
   end

data/lib/rach/version.rb

@@ -1,4 +1,4 @@
 module Rach
-  VERSION = "0.2.9"
+  VERSION = "0.2.11"
 end
 

data/lib/rach.rb

@@ -11,6 +11,7 @@ require_relative "rach/response_format"
 require_relative "rach/conversation"
 require_relative "rach/usage_tracker"
 require_relative "rach/function"
+require_relative "rach/initializers/google_client"
 require_relative "rach/provider/base"
 require_relative "rach/provider/openai"
 require_relative "rach/provider/anthropic"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rach
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.11
 platform: ruby
 authors:
 - Roger Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-05 00:00:00.000000000 Z
+date: 2025-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -127,6 +127,7 @@ files:
 - lib/rach/conversation.rb
 - lib/rach/errors.rb
 - lib/rach/function.rb
+- lib/rach/initializers/google_client.rb
 - lib/rach/message.rb
 - lib/rach/message_template.rb
 - lib/rach/prompt.rb