rach 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d38fee5588b8410bd344b1848429f4cd5534dbfc46bdb3c7c55193156b3f78b5
-  data.tar.gz: 8a8b353426c367c4b0a7663d66a0a82a91c594a23384f12ed17f3484513aa105
+  metadata.gz: b9479cf41fe01b10e9c117939304120042337fa3a3ce8bc27fc1649e69894bcc
+  data.tar.gz: ea441f9a3978f58bc40284cfa5cefe49533f9a53275c8c85aca3761247dcf91b
 SHA512:
-  metadata.gz: 0c963bd5389c85b39ac2f2fb8ef94f3e35167bd265e2dfa77c6a63642ae42d156954e9d151fbea994b3c12fe5d5a7db15f2671501449a74df17e4e26a1e3383d
-  data.tar.gz: 8f3e9700244b3fc29414a512b1cbf84818b72d73cc44d60a6dc581835a77d680f0616008477bbaf54f68e2fcf2dbfa540fc104aa346cd3882c47826c578a90d9
+  metadata.gz: 8e185fa5b250d9433a71af3e31089b046ed4087ace488e608e54184f444bc152f9e02f0a5515a2a878ff7d07c56537a53906b111c39c8ee9cd42edc39b2014b8
+  data.tar.gz: ee0e72f793aee837570acfddc55da33aee2b9a13161e813121de6abe6955877828ee7c20638a0731a40367a9c40ce1aacdda2edaa548f3c4fd0ac0a59b7ce31c

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/provider/google.rb

@@ -30,12 +30,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 +81,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.10"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rach
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 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