katalyst-google-apis 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '068ff7b04cb4fdb9b471bbb8bbd4dcef65de8005a4b1d96675119d3293745782'
-  data.tar.gz: '02933b3e5f96569817fdfdd04d24691bd6970d5515c6ab7ed979f9c84e07e4f4'
+  metadata.gz: 249511e97a7e28426cbf5ad750c3c77c1dc5f882c885a37868537bfea975a9e7
+  data.tar.gz: 86758221a5cdc2a554d767a7e126b1acd48d3034b87100e23dd88876e291e713
 SHA512:
-  metadata.gz: 516aa02ce48141da7ec32d79122f055e1feb6ae7fb3edf6965035e6dac0df840288c6955d615b6729c3cfc131507748bc509bbc8afb993ee251955243d804d56
-  data.tar.gz: 9aa73f7657243263513eaab6ce323823d95b9e8b3661f7e71c6bf5ddafd1d3ad668d1b99dfad6e6a30076a43220a428be9862f69a7c6e3ca35e696dff9f8e26c
+  metadata.gz: da31ead0972e8152ab79e04c2a18ed875dcc367187f8ee03a60f7d89337d85956f95f944f524852eddd8fbe940da4e45884bd39dae471d499134a19faaccea59
+  data.tar.gz: ece80e3217d17d22c28f8b787c10ad843200b3c322b6dd1427b2a13ef3bdcbd4df484adeccef53ef83c5d12d104bbfc012fd0a49e39a5834e4a7dda7b71e393a

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

@@ -7,14 +7,20 @@ 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,7 +40,7 @@ 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
@@ -42,7 +48,7 @@ module Katalyst
           self
         rescue StandardError => e
           @error = e
-          raise e
+          retry?(e) ? retry : raise
         ensure
           report_error
         end
@@ -84,11 +90,40 @@ module Katalyst
             data:     {
               url:,
               method:      "POST",
-              status_code: error.code,
+              status_code: error.try(:code),
               reason:      error.message,
             },
           )
         end
+
+        def retry?(error)
+          if error.is_a?(GoogleApis::Error) && error.code == 429 && @attempt < @retries
+            Kernel.sleep(backoff)
+
+            @response = nil
+            @result = nil
+            @error = nil
+            @attempt += 1
+            true
+          else
+            false
+          end
+        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

data/app/services/katalyst/google_apis/geocoding/reverse_service.rb

@@ -0,0 +1,119 @@
+# frozen_string_literal: true
+
+require "curb"
+
+module Katalyst
+  module GoogleApis
+    module Geocoding
+      # Use Google Maps Geocoding API to find a location from lat/lng.
+      class ReverseService
+        attr_reader :response, :result, :error
+
+        def self.scope
+          "https://www.googleapis.com/auth/maps-platform.geocode.location"
+        end
+
+        def self.call(latlng:, credentials: Katalyst::GoogleApis.credentials(scope:))
+          new(credentials:).call(latlng:)
+        end
+
+        def initialize(credentials:)
+          @credentials = credentials
+        end
+
+        def call(latlng:)
+          @latlng = latlng
+
+          @response = Curl.get(url) do |http|
+            http.headers["Content-Type"] = "application/json; UTF-8"
+            @credentials.apply!(http.headers)
+          end
+
+          if %r{^application/json}.match?(@response.content_type)
+            @result = JSON.parse(response.body, symbolize_names: true)
+          else
+            raise GoogleApis::Error.new(
+              code:    response.response_code,
+              status:  Rack::Utils::HTTP_STATUS_CODES[response.response_code],
+              message: "Unexpected HTTP response received (#{response.response_code}, #{@response.content_type})",
+            )
+          end
+
+          if result[:error].present?
+            api_error = result.fetch(:error)
+
+            raise GoogleApis::Error.new(
+              code:    api_error.fetch(:code, response.response_code),
+              status:  api_error.fetch(:status, Rack::Utils::HTTP_STATUS_CODES[response.response_code]),
+              message: api_error.fetch(:message, "Unexpected API error"),
+              details: api_error.fetch(:details, nil),
+            )
+          end
+
+          self
+        rescue StandardError => e
+          @error = e
+          raise
+        ensure
+          report_error
+        end
+
+        def locations
+          @result&.fetch(:results, nil)
+        end
+
+        def first_location
+          locations&.first
+        end
+
+        def formatted_address
+          first_location&.dig(:formattedAddress)
+        end
+
+        def latlng
+          location = first_location&.dig(:location)
+          return if location.blank?
+
+          latitude = location[:latitude]
+          longitude = location[:longitude]
+          return if latitude.nil? || longitude.nil?
+
+          [latitude, longitude].join(",")
+        end
+
+        def inspect
+          "#<#{self.class.name} result: #{@result.inspect} error: #{@error.inspect}>"
+        end
+
+        private
+
+        def url
+          "https://geocode.googleapis.com/v4beta/geocode/location/#{@latlng}"
+        end
+
+        def report_error
+          return if error.nil?
+
+          if defined?(Sentry)
+            Sentry.add_breadcrumb(sentry_breadcrumb(error))
+          else
+            Rails.logger.error(error)
+          end
+        end
+
+        def sentry_breadcrumb(error)
+          Sentry::Breadcrumb.new(
+            type:     "http",
+            category: "geocode",
+            data:     {
+              url:,
+              method:      "GET",
+              status_code: error.try(:code),
+              reason:      error.message,
+            },
+          )
+        end
+      end
+    end
+  end
+end

data/app/services/katalyst/google_apis/geocoding/search_service.rb

@@ -0,0 +1,134 @@
+# frozen_string_literal: true
+
+require "curb"
+
+module Katalyst
+  module GoogleApis
+    module Geocoding
+      # Use Google Maps Geocoding API to find a location from an address.
+      class SearchService
+        attr_reader :response, :result, :error
+
+        def self.scope
+          "https://www.googleapis.com/auth/maps-platform.geocode.address"
+        end
+
+        def self.call(address:, bounds:, credentials: Katalyst::GoogleApis.credentials(scope:))
+          new(credentials:).call(address:, bounds:)
+        end
+
+        def initialize(credentials:)
+          @credentials = credentials
+        end
+
+        def call(address:, bounds:)
+          @address = address
+          @bounds = bounds
+
+          @response = Curl.get(url, **params) do |http|
+            http.headers["Content-Type"] = "application/json; UTF-8"
+            @credentials.apply!(http.headers)
+          end
+
+          if %r{^application/json}.match?(@response.content_type)
+            @result = JSON.parse(response.body, symbolize_names: true)
+          else
+            raise GoogleApis::Error.new(
+              code:    response.response_code,
+              status:  Rack::Utils::HTTP_STATUS_CODES[response.response_code],
+              message: "Unexpected HTTP response received (#{response.response_code}, #{@response.content_type})",
+            )
+          end
+
+          if result[:error].present?
+            api_error = result.fetch(:error)
+
+            raise GoogleApis::Error.new(
+              code:    api_error.fetch(:code, response.response_code),
+              status:  api_error.fetch(:status, Rack::Utils::HTTP_STATUS_CODES[response.response_code]),
+              message: api_error.fetch(:message, "Unexpected API error"),
+              details: api_error.fetch(:details, nil),
+            )
+          end
+
+          self
+        rescue StandardError => e
+          @error = e
+          raise
+        ensure
+          report_error
+        end
+
+        def locations
+          @result&.fetch(:results, nil)
+        end
+
+        def first_location
+          locations&.first
+        end
+
+        def formatted_address
+          first_location&.dig(:formattedAddress)
+        end
+
+        def latlng
+          location = first_location&.dig(:location)
+          return if location.blank?
+
+          latitude = location[:latitude]
+          longitude = location[:longitude]
+          return if latitude.nil? || longitude.nil?
+
+          [latitude, longitude].join(",")
+        end
+
+        def inspect
+          "#<#{self.class.name} result: #{@result.inspect} error: #{@error.inspect}>"
+        end
+
+        private
+
+        def url
+          "https://geocode.googleapis.com/v4beta/geocode/address/#{URI.encode_uri_component(@address)}"
+        end
+
+        def params
+          low, high = @bounds.split("|")
+
+          low_lat, low_lng = low.split(",")
+          high_lat, high_lng = high.split(",")
+
+          {
+            "locationBias.rectangle.low.latitude"   => low_lat,
+            "locationBias.rectangle.low.longitude"  => low_lng,
+            "locationBias.rectangle.high.latitude"  => high_lat,
+            "locationBias.rectangle.high.longitude" => high_lng,
+          }
+        end
+
+        def report_error
+          return if error.nil?
+
+          if defined?(Sentry)
+            Sentry.add_breadcrumb(sentry_breadcrumb(error))
+          else
+            Rails.logger.error(error)
+          end
+        end
+
+        def sentry_breadcrumb(error)
+          Sentry::Breadcrumb.new(
+            type:     "http",
+            category: "geocode",
+            data:     {
+              url:,
+              method:      "GET",
+              status_code: error.try(:code),
+              reason:      error.message,
+            },
+          )
+        end
+      end
+    end
+  end
+end

data/app/services/katalyst/google_apis/recaptcha/assessment_service.rb

@@ -14,7 +14,7 @@ module Katalyst
 
         def initialize(credentials:, parent:)
           @credentials = credentials
-          @parent      = parent
+          @parent = parent
         end
 
         def call(assessment:)
@@ -84,7 +84,7 @@ module Katalyst
             data:     {
               url:,
               method:      "POST",
-              status_code: error.code,
+              status_code: error.try(:code),
               reason:      error.message,
             },
           )

data/config/boot.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+
+require "bundler/setup" # Set up gems listed in the Gemfile.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-google-apis
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Katalyst Interactive
@@ -79,8 +79,11 @@ files:
 - app/services/katalyst/google_apis/credentials.rb
 - app/services/katalyst/google_apis/error.rb
 - app/services/katalyst/google_apis/gemini/generate_content_service.rb
+- app/services/katalyst/google_apis/geocoding/reverse_service.rb
+- app/services/katalyst/google_apis/geocoding/search_service.rb
 - app/services/katalyst/google_apis/recaptcha/assessment_service.rb
 - app/validators/recaptcha_validator.rb
+- config/boot.rb
 - config/ci.rb
 - config/importmap.rb
 - config/locales/en.yml