katalyst-google-apis 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '068ff7b04cb4fdb9b471bbb8bbd4dcef65de8005a4b1d96675119d3293745782'
-  data.tar.gz: '02933b3e5f96569817fdfdd04d24691bd6970d5515c6ab7ed979f9c84e07e4f4'
+  metadata.gz: f6b30a2c9af798f8d02b09f74e4c9e080daf199723b644ba70e79f2fb7038ac6
+  data.tar.gz: f3936fbcb87a624e5564c882a25871c06426ba6224441c9d5bfb11470d75ff25
 SHA512:
-  metadata.gz: 516aa02ce48141da7ec32d79122f055e1feb6ae7fb3edf6965035e6dac0df840288c6955d615b6729c3cfc131507748bc509bbc8afb993ee251955243d804d56
-  data.tar.gz: 9aa73f7657243263513eaab6ce323823d95b9e8b3661f7e71c6bf5ddafd1d3ad668d1b99dfad6e6a30076a43220a428be9862f69a7c6e3ca35e696dff9f8e26c
+  metadata.gz: bf8944b1d3888a5d25d66e65bd3737602b90b6890a138a7e5a941bdef954054379f10233309e71a354e51d31cc298a10bd21b1e16aada8439d4c146483dec100
+  data.tar.gz: 84d17ab4cea53c9686b4c9c04faa8fcf3ad5031ec5b72ec817dbd9972c8f1e732f7c9c87f606143f60c24534fe98f37dd4e829d9b382890bfa4572b1d91761d3

data/app/services/katalyst/google_apis/gemini/generate_content_service.rb

@@ -7,14 +7,19 @@ module Katalyst
       class GenerateContentService
         attr_reader :response, :result, :error, :content_text
 
-        def self.call(parent:, model:, payload:, credentials: Katalyst::GoogleApis.credentials)
-          new(parent:, model:, credentials:).call(payload:)
+        def self.call(parent:, model:, payload:, credentials: Katalyst::GoogleApis.credentials,
+                      retries: 5,
+                      jitter: 1_000)
+          new(parent:, model:, credentials:, attempt: 0, retries:, jitter:).call(payload:)
         end
 
-        def initialize(credentials:, model:, parent:)
+        def initialize(credentials:, model:, parent:, attempt:, retries:, jitter:)
           @credentials = credentials
           @model = model
           @parent = parent
+          @attempt = attempt
+          @retries = retries
+          @jitter = jitter
         end
 
         def call(payload:)
@@ -34,12 +39,25 @@ module Katalyst
           end
 
           if result[:error].present?
-            @error = GoogleApis::Error.new(**result[:error])
+            raise GoogleApis::Error.new(**result[:error])
           else
             @content_text = result.dig(:candidates, 0, :content, :parts, 0, :text)
           end
 
           self
+        rescue GoogleApis::Error => e
+          @error = e
+          if e.code == 429 && @attempt < @retries
+            Kernel.sleep(backoff)
+
+            @response = nil
+            @result = nil
+            @error = nil
+            @attempt += 1
+            retry
+          else
+            raise e
+          end
         rescue StandardError => e
           @error = e
           raise e
@@ -89,6 +107,21 @@ module Katalyst
             },
           )
         end
+
+        def backoff
+          [@jitter, response_headers.fetch(:retry_after, 0).to_i * 1000].max + (@jitter * rand)
+        end
+
+        def response_headers
+          headers = {}
+          @response.header_str.each_line do |line|
+            key, value = line.split(":", 2)
+            next unless value
+
+            headers[key.underscore.to_sym] = value.strip
+          end
+          headers
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-google-apis
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Katalyst Interactive