Merge branch 'main' into feature/dalle

.gitignore

@@ -8,6 +8,9 @@
 /.tool-versions
 /node_modules
 
+# Docker Compose override file
+*compose.override.y*ml
+
 # Ignore all environment files (except templates).
 /.env*
 !/.env*.erb

.rubocop.yml

@@ -9,7 +9,7 @@ require:
   - rubocop-performance
 
 AllCops:
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.3
   # RuboCop has a bunch of cops enabled by default. This setting tells RuboCop
   # to ignore them, so only the ones explicitly set in this file are enabled.
   DisabledByDefault: true

.ruby-version

@@ -1 +1 @@
-3.3.5
+3.3.6

.tool-versions

@@ -1 +1 @@
-ruby 3.3.5
+ruby 3.3.6

Dockerfile

@@ -3,7 +3,7 @@
 ### START of FLY ####
 
 # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
-ARG RUBY_VERSION=3.3.5
+ARG RUBY_VERSION=3.3.6
 FROM quay.io/evl.ms/fullstaq-ruby:${RUBY_VERSION}-jemalloc-slim as base-for-fly
 
 LABEL fly_launch_runtime="rails"
@@ -53,7 +53,7 @@ RUN bundle exec bootsnap precompile app/ lib/
 RUN grep -l '#!/usr/bin/env ruby' /rails/bin/* | xargs sed -i '/^#!/aDir.chdir File.expand_path("..", __dir__)'
 
 # Precompiling assets for production without requiring secret RAILS_MASTER_KEY
-RUN SECRET_KEY_BASE_DUMMY=1 VALIDATE_ENV_VARS=0 ./bin/rails assets:precompile
+RUN SECRET_KEY_BASE_DUMMY=1 ./bin/rails assets:precompile
 
 
 # Final stage for app image
@@ -89,7 +89,8 @@ EXPOSE 3000
 #### START of DEV ####
 
 # RUBY_VERSION is the only thing used from anything above
-FROM ruby:${RUBY_VERSION}-alpine AS development
+FROM ruby:${RUBY_VERSION}-alpine@sha256:caeab43b356463e63f87af54a03de1ae4687b36da708e6d37025c557ade450f8 AS development
+# TODO: When we bump to a new version of ruby we'll ahve to unpin from this specific sha
 
 RUN apk add --no-cache bash git build-base postgresql-dev curl-dev gcompat tzdata vips-dev imagemagick
 
@@ -134,7 +135,7 @@ COPY . .
 
 # Precompiling assets for production without requiring secret RAILS_MASTER_KEY
 RUN bundle exec bootsnap precompile --gemfile app/ lib/
-RUN SECRET_KEY_BASE_DUMMY=1 VALIDATE_ENV_VARS=0 ./bin/rails assets:precompile
+RUN SECRET_KEY_BASE_DUMMY=1 ./bin/rails assets:precompile
 
 RUN mkdir -p log tmp bin
 

Gemfile

@@ -13,7 +13,6 @@ gem "turbo-rails", "~> 2.0.5"
 gem "stimulus-rails", "~> 1.3.3"
 gem "tailwindcss-rails", "~> 2.7.2"
 gem "rack-cors"
-gem "ostruct"
 
 # Build JSON APIs with ease [https://github.com/rails/jbuilder]
 # gem "jbuilder"
@@ -42,6 +41,7 @@ gem "amatch", "~> 0.4.1" # enables fuzzy comparison of strings, a tool uses this
 gem "rails_heroicon", "~> 2.2.0"
 gem "ruby-openai", "~> 7.0.1"
 gem "anthropic", "~> 0.1.0" # TODO update to the latest version
+gem "gemini-ai", "~> 4.2.0"
 gem "tiktoken_ruby", "~> 0.0.9"
 gem "solid_queue", "~> 1.0.0"
 gem "name_of_person"
@@ -52,6 +52,7 @@ gem "ostruct"
 
 gem "omniauth", "~> 2.1"
 gem "omniauth-google-oauth2", "~> 1.1"
+gem "omniauth-microsoft_graph", "~> 2.0"
 gem "omniauth-rails_csrf_protection", "~> 1.0.2"
 
 group :development, :test do
@@ -86,4 +87,6 @@ group :test do
   gem "selenium-webdriver"
   gem "minitest-stub_any_instance"
   gem "rails-controller-testing"
+  gem "minitest-retry"
+  gem "webmock"
 end

Gemfile.lock

@@ -122,6 +122,9 @@ GEM
     coderay (1.1.3)
     concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
+    crack (1.0.0)
+      bigdecimal
+      rexml
     crass (1.0.6)
     date (3.3.4)
     debug (1.8.0)
@@ -133,20 +136,41 @@ GEM
     erubi (1.13.0)
     et-orbi (1.2.11)
       tzinfo
+    ethon (0.16.0)
+      ffi (>= 1.15.0)
     event_stream_parser (1.0.0)
-    faraday (2.8.1)
-      base64
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
+    faraday (2.12.1)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
+      logger
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
     faraday-net_http (3.0.2)
+    faraday-typhoeus (1.1.0)
+      faraday (~> 2.0)
+      typhoeus (~> 1.4)
     ffi (1.15.5)
     fugit (1.11.1)
       et-orbi (~> 1, >= 1.2.11)
       raabro (~> 1.4)
+    gemini-ai (4.2.0)
+      event_stream_parser (~> 1.0)
+      faraday (~> 2.10)
+      faraday-typhoeus (~> 1.1)
+      googleauth (~> 1.8)
+      typhoeus (~> 1.4, >= 1.4.1)
     globalid (1.2.1)
       activesupport (>= 6.1)
+    google-cloud-env (2.2.1)
+      faraday (>= 1.0, < 3.a)
+    googleauth (1.11.2)
+      faraday (>= 1.0, < 3.a)
+      google-cloud-env (~> 2.1)
+      jwt (>= 1.4, < 3.0)
+      multi_json (~> 1.11)
+      os (>= 0.9, < 2.0)
+      signet (>= 0.16, < 2.a)
+    hashdiff (1.1.2)
     hashie (5.0.0)
     i18n (1.14.6)
       concurrent-ruby (~> 1.0)
@@ -182,10 +206,13 @@ GEM
     mini_magick (4.13.2)
     mini_mime (1.1.5)
     minitest (5.25.1)
+    minitest-retry (0.2.3)
+      minitest (>= 5.0)
     minitest-stub_any_instance (1.0.3)
     mize (0.4.1)
       protocol (~> 2.0)
     msgpack (1.7.2)
+    multi_json (1.15.0)
     multi_xml (0.7.1)
       bigdecimal (~> 3.1)
     multipart-post (2.3.0)
@@ -201,6 +228,12 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.3)
+    nokogiri (1.16.7-aarch64-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.7-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.7-x86_64-darwin)
+      racc (~> 1.4)
     nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
     oauth2 (2.0.9)
@@ -219,12 +252,17 @@ GEM
       oauth2 (~> 2.0)
       omniauth (~> 2.0)
       omniauth-oauth2 (~> 1.8)
+    omniauth-microsoft_graph (2.0.1)
+      jwt (~> 2.0)
+      omniauth (~> 2.0)
+      omniauth-oauth2 (~> 1.8.0)
     omniauth-oauth2 (1.8.0)
       oauth2 (>= 1.4, < 3)
       omniauth (~> 2.0)
     omniauth-rails_csrf_protection (1.0.2)
       actionpack (>= 4.2)
       omniauth (~> 2.0)
+    os (1.1.4)
     ostruct (0.6.0)
     parallel (1.24.0)
     parser (3.2.2.4)
@@ -351,7 +389,6 @@ GEM
     ruby-vips (2.2.2)
       ffi (~> 1.12)
       logger
-    ruby2_keywords (0.0.5)
     ruby_parser (3.21.0)
       racc (~> 1.5)
       sexp_processor (~> 4.16)
@@ -364,6 +401,11 @@ GEM
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
     sexp_processor (4.17.1)
+    signet (0.19.0)
+      addressable (~> 2.8)
+      faraday (>= 0.17.5, < 3.a)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
     snaky_hash (2.0.1)
       hashie
       version_gem (~> 1.1, >= 1.1.1)
@@ -398,9 +440,18 @@ GEM
       railties (>= 6.0.0)
     stringio (3.1.1)
     sync (0.5.0)
+    tailwindcss-rails (2.7.2-aarch64-linux)
+      railties (>= 7.0.0)
+    tailwindcss-rails (2.7.2-arm64-darwin)
+      railties (>= 7.0.0)
+    tailwindcss-rails (2.7.2-x86_64-darwin)
+      railties (>= 7.0.0)
     tailwindcss-rails (2.7.2-x86_64-linux)
       railties (>= 7.0.0)
     thor (1.3.2)
+    tiktoken_ruby (0.0.9-aarch64-linux)
+    tiktoken_ruby (0.0.9-arm64-darwin)
+    tiktoken_ruby (0.0.9-x86_64-darwin)
     tiktoken_ruby (0.0.9-x86_64-linux)
     timecop (0.9.8)
     timeout (0.4.1)
@@ -411,6 +462,8 @@ GEM
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)
       railties (>= 6.0.0)
+    typhoeus (1.4.1)
+      ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
@@ -421,6 +474,10 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
+    webmock (3.24.0)
+      addressable (>= 2.8.0)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
     webrick (1.8.2)
     websocket (1.2.11)
     websocket-driver (0.7.6)
@@ -431,6 +488,11 @@ GEM
     zeitwerk (2.7.1)
 
 PLATFORMS
+  aarch64-linux-musl
+  arm64-darwin-23
+  arm64-darwin-24
+  x86_64-darwin-22
+  x86_64-darwin-23
   x86_64-linux
 
 DEPENDENCIES
@@ -445,12 +507,15 @@ DEPENDENCIES
   debug
   dockerfile-rails (>= 1.6)
   ffi (~> 1.15.5)
+  gemini-ai (~> 4.2.0)
   image_processing (~> 1.13.0)
   importmap-rails
+  minitest-retry
   minitest-stub_any_instance
   name_of_person
   omniauth (~> 2.1)
   omniauth-google-oauth2 (~> 1.1)
+  omniauth-microsoft_graph (~> 2.0)
   omniauth-rails_csrf_protection (~> 1.0.2)
   ostruct
   pg (~> 1.1)
@@ -479,9 +544,10 @@ DEPENDENCIES
   turbo-rails (~> 2.0.5)
   tzinfo-data
   web-console
+  webmock
 
 RUBY VERSION
-   ruby 3.3.5p100
+   ruby 3.3.6p108
 
 BUNDLED WITH
-   2.5.1
+   2.5.22