v15.26.0

.github/workflows/render.yml

@@ -139,6 +139,11 @@ jobs:
             bun scripts/metric_plot.js "$csv"
           done
 
+      - name: Combine plots
+        if: always()
+        run: |
+          bun scripts/ci/combine-render-images
+
       - name: Save FPS metrics
         uses: actions/cache/save@v5
         with:
@@ -163,7 +168,6 @@ jobs:
           name: images
           path: |
             /tmp/*.png
-            /tmp/${{ env.FE_COVERAGE_NAME }}.png
           if-no-files-found: warn
 
       - name: Upload csv artifacts

.ruby-version

@@ -1 +1 @@
-4.0.3
+4.0.5

Gemfile

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
-ruby "~> 4.0.3"
+ruby "~> 4.0.5"
 
 gem "rails", "~> 8"
 gem "active_model_serializers"

Gemfile.lock

@@ -128,8 +128,8 @@ GEM
     diff-lcs (1.6.2)
     digest-crc (0.7.0)
       rake (>= 12.0.0, < 14.0.0)
-    discard (1.4.0)
-      activerecord (>= 4.2, < 9.0)
+    discard (2.0.0)
+      activerecord (>= 7.0, < 9.0)
     docile (1.4.1)
     drb (2.2.3)
     e2mmap (0.1.0)
@@ -200,7 +200,7 @@ GEM
       prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.19.5)
+    json (2.19.7)
     jsonapi-renderer (0.2.2)
     jwt (3.2.0)
       base64
@@ -357,7 +357,7 @@ GEM
     responders (3.2.0)
       actionpack (>= 7.0)
       railties (>= 7.0)
-    retriable (3.5.0)
+    retriable (3.8.0)
     rexml (3.4.4)
     rollbar (3.8.0)
     rspec (3.13.2)
@@ -397,7 +397,7 @@ GEM
     rubocop-ast (1.49.1)
       parser (>= 3.3.7.2)
       prism (~> 1.7)
-    rubocop-rails (2.35.2)
+    rubocop-rails (2.35.3)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
@@ -511,7 +511,7 @@ DEPENDENCIES
   webmock
 
 RUBY VERSION
-  ruby 4.0.3
+  ruby 4.0.5
 
 BUNDLED WITH
-  4.0.10
+  4.0.12

Procfile

@@ -2,4 +2,4 @@ worker:         bundle exec rake jobs:work
 rabbit_workers: bin/rails r lib/rabbit_workers.rb
 web:            bundle exec passenger start -p $PORT -e $RAILS_ENV --max-pool-size ${MAX_POOL_SIZE:-1} --max-requests ${MAX_REQUESTS:-1000}
 # This will perform a hard refresh on all connected browsers.
-release:        rails r "User.refresh_everyones_ui" && rails db:migrate && (bundle exec rake hook:release_info || true)
+release:        rails db:migrate && rails r "User.refresh_everyones_ui" && (bundle exec rake hook:release_info || true)

app/models/farmware_env.rb

@@ -3,4 +3,13 @@ class FarmwareEnv < ApplicationRecord
   belongs_to :device
   serialize :value, coder: YAML
   validates :key, uniqueness: { scope: :device }
+  validate :value_is_string
+
+  private
+
+  def value_is_string
+    return if value_before_type_cast.is_a?(String)
+
+    errors.add(:value, "must be a string")
+  end
 end

app/mutations/devices/create_seed_data.rb

@@ -61,7 +61,7 @@ def seeder
 
     def run_seeds!
       if demo
-        Devices::Seeders::DemoAccountSeeder.new(device).before_product_line_seeder
+        Devices::Seeders::DemoAccountSeeder.new(device).before_product_line_seeder(product_line)
       end
 
       seeder.class::COMMAND_ORDER.map do |cmd|

app/mutations/devices/seeders/demo_account_seeder.rb

@@ -170,13 +170,14 @@ def marketing_bulletin
       #    tester FBOS version `1000.0.0`.
       READ_COMMENT_ABOVE = "100.0.0"
 
-      def before_product_line_seeder
+      def before_product_line_seeder(product_line)
         device
           .web_app_config
           .update!(
             discard_unsaved: true,
             three_d_garden: true,
           )
+        stress_data(product_line)&.update_demo_settings
         device
           .fbos_config
           .update!(
@@ -187,9 +188,8 @@ def before_product_line_seeder
 
       def after_product_line_seeder(product_line)
         create_webcam_feed(product_line)
-        stress_count = Devices::Seeders::StressData.count_for(product_line)
-        if stress_count
-          Devices::Seeders::StressData.new(device, stress_count).seed!
+        if (data = stress_data(product_line))
+          data.seed!
         else
           add_plants(product_line)
           add_soil_height_points(product_line)
@@ -210,6 +210,11 @@ def after_product_line_seeder(product_line)
         device
           .update!(fbos_version: READ_COMMENT_ABOVE)
       end
+
+      def stress_data(product_line)
+        stress_count = Devices::Seeders::StressData.count_for(product_line)
+        Devices::Seeders::StressData.new(device, stress_count) if stress_count
+      end
     end
   end
 end

app/mutations/devices/seeders/stress_data.rb

@@ -41,7 +41,20 @@ def seed!
           attach_images(result.rows.flatten)
         end
         SensorReading.insert_all!(sensor_reading_rows)
-        update_demo_settings
+      end
+
+      def update_demo_settings
+        device.update!(max_images_count: count)
+        device.web_app_config.update!(
+          show_images: true,
+          show_points: true,
+          show_plants: true,
+          show_sensor_readings: true,
+          show_moisture_interpolation_map: true,
+          show_weeds: true,
+          show_spread: true,
+          three_d_garden: true,
+        )
       end
 
       private
@@ -118,7 +131,7 @@ def image_rows
             updated_at: timestamp,
             device_id: device.id,
             attachment_processed_at: timestamp,
-            meta: { x: x, y: y, z: 0, name: "Stress Image #{i + 1}" }.to_yaml,
+            meta: { x: x, y: y, z: 0, name: "Stress Image #{i + 1}" },
           }
         end
       end
@@ -162,20 +175,6 @@ def attach_images(image_ids)
         ActiveStorage::Attachment.insert_all!(rows)
       end
 
-      def update_demo_settings
-        device.update!(max_images_count: count)
-        device.web_app_config.update!(
-          show_images: true,
-          show_points: true,
-          show_plants: true,
-          show_sensor_readings: true,
-          show_moisture_interpolation_map: true,
-          show_weeds: true,
-          show_spread: true,
-          three_d_garden: true,
-        )
-      end
-
       def coordinate(index, x_offset: 0, y_offset: 0)
         col_count = Math.sqrt(count).ceil
         row_count = (count.to_f / col_count).ceil

app/mutations/farmware_envs/create.rb

@@ -5,7 +5,7 @@ class Create < Mutations::Command
     required do
       model :device, class: Device
       string :key
-      duck :value, methods: [:to_json]
+      string :value
     end
 
     def validate

app/mutations/farmware_envs/update.rb

@@ -6,7 +6,7 @@ class Update < Mutations::Command
 
     optional do
       string :key
-      duck :value, methods: [:to_json]
+      string :value
     end
 
     def execute

docker_configs/api.Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:4.0.3
+FROM ruby:4.0.5
 RUN curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg > /dev/null
 RUN sh -c '. /etc/os-release; echo $VERSION_CODENAME; echo "deb http://apt.postgresql.org/pub/repos/apt/ $VERSION_CODENAME-pgdg main" >> /etc/apt/sources.list.d/pgdg.list'
 RUN apt-get update -qq && apt-get install -y build-essential libpq-dev postgresql postgresql-contrib lcov