katalyst-google-apis 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9802ce92e121059dcd7f6871d7959851db21471739bbd3489769731fbd84bf3c
-  data.tar.gz: f759a549e162e91258481274c603f594e59553e6f9b5dc2186912e1adc8f1149
+  metadata.gz: 9811888c443080f2c6e2107db38c63738cfebe5bbcb912779792924401301db1
+  data.tar.gz: c247d6f9e6587a57d7375766e3db44f20c6278236016a44eab54a988f3449a23
 SHA512:
-  metadata.gz: 23c8f9427fd91bfecd9b087a4251e5af53fd95eaedee09d46ff6c3ab3881d54f442e22b12e3e2565100050af61aea95152f1dd298fab3bdb2bb0ebd057ebc057
-  data.tar.gz: c82a3865797c7c22f575847bccf42b53ac7b2edf9d85577328a7d4b5c23dceafa364a59186bb0fa6dcafd8051016ea854ebfb19734142b3e830682c293bed751
+  metadata.gz: 1db1c91469d9628497630629ea4a4d2fa96da7051fc5716bd59a661f01c2fbad7c4ace74094f0e46d880bcf3e2762e0c8dc904098d5cdf151fc90a647b5f7cf4
+  data.tar.gz: 0d6829ce0f4164179d7b2b6f1d871b9eba78498e7cf9ccb67f9a362d3e1ab3617bd2d5c7848427234e654e03786191b029b0749b24dc11055cad27c6252c1b98

data/app/assets/javascripts/controllers/recaptcha_controller.js

@@ -10,25 +10,6 @@ enterprise.ready = (f) => {
   (config["fns"] ||= []).push(f);
 };
 
-/**
- * Inject recaptcha enterprise script into the head, unless it is already there.
- */
-function injectRecaptchaScripts() {
-  if (document.head.querySelector("script[src*='recaptcha/enterprise']")) {
-    return;
-  }
-
-  const script = document.createElement("script");
-  script.setAttribute(
-    "src",
-    "https://www.google.com/recaptcha/enterprise.js?render=explicit",
-  );
-  script.toggleAttribute("async", true);
-  script.toggleAttribute("defer", true);
-
-  document.head.appendChild(script);
-}
-
 export default class RecaptchaController extends Controller {
   static values = {
     siteKey: String,
@@ -122,3 +103,43 @@ export default class RecaptchaController extends Controller {
     return this.element.nextElementSibling;
   }
 }
+
+function getMetaElement(name) {
+  return document.querySelector(`meta[name="${name}"]`);
+}
+
+function getCspNonce() {
+  const element = getMetaElement("csp-nonce");
+  if (element) {
+    const { nonce: nonce, content: content } = element;
+    return nonce === "" ? content : nonce;
+  }
+}
+
+function createRecaptchaScriptElement() {
+  const element = document.createElement("script");
+  element.src =
+    "https://www.google.com/recaptcha/enterprise.js?render=explicit";
+  const cspNonce = getCspNonce();
+  if (cspNonce) {
+    element.setAttribute("nonce", cspNonce);
+  }
+  element.async = true;
+  element.defer = true;
+
+  return element;
+}
+
+/**
+ * Inject recaptcha enterprise script into the head, unless it is already there.
+ */
+function injectRecaptchaScripts() {
+  let element = document.head.querySelector(
+    "script[src*='recaptcha/enterprise']",
+  );
+  if (!element) {
+    element = createRecaptchaScriptElement();
+    document.head.appendChild(element);
+  }
+  return element;
+}

data/app/services/katalyst/google_apis/error.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Katalyst
+  module GoogleApis
+    class Error < StandardError
+      attr_reader :code, :status
+
+      def initialize(code:, status:, message:)
+        super(message)
+
+        @code = code
+        @status = status
+      end
+
+      def inspect
+        "#<#{self.class.name} code=#{code.inspect} status=#{status.inspect} message=#{message.inspect}>"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+
+module Katalyst
+  module GoogleApis
+    module Gemini
+      # Use Gemini GPT to generate a response to a prompt.
+      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:)
+        end
+
+        def initialize(credentials:, model:, parent:)
+          @credentials = credentials
+          @model = model
+          @parent = parent
+        end
+
+        def call(payload:)
+          @response = Curl.post(url, payload.to_json) do |http|
+            http.headers["Content-Type"] = "application/json; UTF-8"
+            @credentials.apply!(http.headers)
+          end
+
+          if @response.content_type == "application/json"
+            @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?
+            @error = GoogleApis::Error.new(**result[:error])
+          else
+            @content_text = result.dig(:candidates, 0, :content, :parts, 0, :text)
+          end
+
+          self
+        rescue StandardError => e
+          @error = e
+          raise e
+        ensure
+          report_error
+        end
+
+        def success?
+          result.present? && content_text.present?
+        end
+
+        def content_json
+          return @content_json if instance_variable_defined?(:@content_json)
+
+          @content_json = JSON.parse(content_text, symbolize_names: true)
+        end
+
+        def inspect
+          "#<#{self.class.name} result: #{@result.inspect} error: #{@error.inspect}>"
+        end
+
+        private
+
+        def url
+          "https://aiplatform.googleapis.com/v1#{@parent}#{@model}:generateContent"
+        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: "gemini",
+            data:     {
+              url:,
+              method:      "POST",
+              status_code: error.code,
+              reason:      error.message,
+            },
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -8,8 +8,8 @@ module Katalyst
       class AssessmentService
         attr_accessor :response, :result, :error
 
-        def self.call(parent:, credentials: GoogleApis.credentials, **)
-          new(credentials:, parent:).call(**)
+        def self.call(assessment:, parent:, credentials: GoogleApis.credentials)
+          new(credentials:, parent:).call(assessment:)
         end
 
         def initialize(credentials:, parent:)
@@ -23,18 +23,22 @@ module Katalyst
             @credentials.apply!(http.headers)
           end
 
-          @result = JSON.parse(@response.body, symbolize_names: true)
-
-          self
-        rescue Curl::Easy::Error => e
-          if defined?(Sentry)
-            Sentry.add_breadcrumb(sentry_breadcrumb(e))
+          if @response.content_type == "application/json"
+            @result = JSON.parse(response.body, symbolize_names: true)
           else
-            Rails.logger.error(e)
+            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
 
-          @error = e
           self
+        rescue StandardError => e
+          @error = e
+          raise e
+        ensure
+          report_error
         end
 
         def valid?
@@ -63,14 +67,26 @@ module Katalyst
           "https://recaptchaenterprise.googleapis.com/v1/#{@parent}/assessments"
         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:    "recaptcha",
-            url:,
-            method:      "POST",
-            status_code: error.code,
-            reason:      error.message,
+            type:     "http",
+            category: "recaptcha",
+            data:     {
+              url:,
+              method:      "POST",
+              status_code: error.code,
+              reason:      error.message,
+            },
           )
         end
       end

data/config/ci.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+# Run using bin/ci
+
+CI.run do
+  step "Setup", "bin/setup"
+
+  step "Style: Ruby", "bundle exec rubocop --no-server"
+
+  step "Style: JS/CSS", "bundle exec rake prettier:lint"
+
+  step "Security: Brakeman vulnerability audit", "bundle exec brakeman -q -w2"
+
+  step "Tests: rspec", "bundle exec rspec"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-google-apis
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Katalyst Interactive
@@ -77,8 +77,11 @@ files:
 - app/helpers/katalyst/google_apis/form_builder.rb
 - app/helpers/katalyst/google_apis/govuk_form_builder.rb
 - 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/recaptcha/assessment_service.rb
 - app/validators/recaptcha_validator.rb
+- config/ci.rb
 - config/importmap.rb
 - config/locales/en.yml
 - lib/katalyst-google-apis.rb
@@ -106,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Google REST APIs for use in Rails projects
 test_files: []