v15.18.0

.circleci/config.yml

@@ -115,6 +115,7 @@ commands:
 workflows:
   version: 2
   build_and_test:
+    max_auto_reruns: 1
     jobs:
       #- build
       - all

.eslintignore

@@ -1,2 +1,3 @@
 hacks.d.ts
 .eslintrc.js
+frontend/wizard/step.tsx

.ruby-version

@@ -1 +1 @@
-3.4.4
+3.4.5

Gemfile

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
-ruby "~> 3.4.4"
+ruby "~> 3.4.5"
 
 gem "rails", "~> 6"
 gem "active_model_serializers"
@@ -32,6 +32,7 @@ gem "drb"
 gem "benchmark"
 gem "ostruct"
 gem "bigdecimal"
+gem "mutex_m"
 
 group :development, :test do
   gem "climate_control"

Gemfile.lock

@@ -68,10 +68,10 @@ GEM
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     amq-protocol (2.3.4)
-    base64 (0.2.0)
+    base64 (0.3.0)
     bcrypt (3.1.20)
-    benchmark (0.4.0)
-    bigdecimal (3.1.9)
+    benchmark (0.4.1)
+    bigdecimal (3.2.2)
     builder (3.3.0)
     bunny (2.24.0)
       amq-protocol (~> 2.3)
@@ -87,9 +87,9 @@ GEM
     crass (1.0.6)
     database_cleaner (2.1.0)
       database_cleaner-active_record (>= 2, < 3)
-    database_cleaner-active_record (2.2.1)
+    database_cleaner-active_record (2.2.2)
       activerecord (>= 5.a)
-      database_cleaner-core (~> 2.0.0)
+      database_cleaner-core (~> 2.0)
     database_cleaner-core (2.0.1)
     date (3.4.1)
     declarative (0.0.20)
@@ -113,34 +113,34 @@ GEM
     drb (2.2.3)
     e2mmap (0.1.0)
     erubi (1.13.1)
-    factory_bot (6.5.1)
+    factory_bot (6.5.5)
       activesupport (>= 6.1.0)
-    factory_bot_rails (6.4.4)
+    factory_bot_rails (6.5.0)
       factory_bot (~> 6.5)
-      railties (>= 5.0.0)
-    faker (3.5.1)
+      railties (>= 6.1.0)
+    faker (3.5.2)
       i18n (>= 1.8.11, < 2)
-    faraday (2.13.1)
+    faraday (2.13.4)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
     faraday-follow_redirects (0.3.0)
       faraday (>= 1, < 3)
-    faraday-net_http (3.4.0)
+    faraday-net_http (3.4.1)
       net-http (>= 0.5.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    google-apis-core (0.18.0)
-      addressable (~> 2.5, >= 2.5.1)
-      googleauth (~> 1.9)
-      httpclient (>= 2.8.3, < 3.a)
-      mini_mime (~> 1.0)
-      mutex_m
+    google-apis-core (1.0.1)
+      addressable (~> 2.8, >= 2.8.7)
+      faraday (~> 2.13)
+      faraday-follow_redirects (~> 0.3)
+      googleauth (~> 1.14)
+      mini_mime (~> 1.1)
       representable (~> 3.0)
-      retriable (>= 2.0, < 4.a)
+      retriable (~> 3.1)
     google-apis-iamcredentials_v1 (0.24.0)
       google-apis-core (>= 0.15.0, < 2.a)
-    google-apis-storage_v1 (0.51.0)
+    google-apis-storage_v1 (0.56.0)
       google-apis-core (>= 0.15.0, < 2.a)
     google-cloud-core (1.8.0)
       google-cloud-env (>= 1.0, < 3.a)
@@ -149,33 +149,31 @@ GEM
       base64 (~> 0.2)
       faraday (>= 1.0, < 3.a)
     google-cloud-errors (1.5.0)
-    google-cloud-storage (1.56.0)
+    google-cloud-storage (1.57.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
-      google-apis-core (~> 0.13)
+      google-apis-core (>= 0.18, < 2)
       google-apis-iamcredentials_v1 (~> 0.18)
       google-apis-storage_v1 (>= 0.42)
       google-cloud-core (~> 1.6)
       googleauth (~> 1.9)
       mini_mime (~> 1.0)
     google-logging-utils (0.2.0)
-    googleauth (1.14.0)
+    googleauth (1.15.0)
       faraday (>= 1.0, < 3.a)
       google-cloud-env (~> 2.2)
       google-logging-utils (~> 0.1)
-      jwt (>= 1.4, < 3.0)
+      jwt (>= 1.4, < 4.0)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     hashdiff (1.2.0)
     hashie (4.1.0)
-    httpclient (2.9.0)
-      mutex_m
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.12.2)
+    json (2.13.2)
     jsonapi-renderer (0.2.2)
-    jwt (2.10.1)
+    jwt (3.1.2)
       base64
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
@@ -207,13 +205,13 @@ GEM
     method_source (1.1.0)
     mini_mime (1.1.5)
     minitest (5.25.5)
-    multi_json (1.15.0)
+    multi_json (1.17.0)
     mutations (0.9.1)
       activesupport
     mutex_m (0.3.0)
     net-http (0.6.0)
       uri
-    net-imap (0.5.8)
+    net-imap (0.5.10)
       date
       net-protocol
     net-pop (0.1.2)
@@ -223,18 +221,19 @@ GEM
     net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.4)
-    nokogiri (1.18.8-aarch64-linux-gnu)
+    nokogiri (1.18.9-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-linux-gnu)
+    nokogiri (1.18.9-x86_64-linux-gnu)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     os (1.1.4)
-    ostruct (0.6.1)
+    ostruct (0.6.3)
     passenger (6.0.27)
       rack (>= 1.6.13)
       rackup (>= 1.0.1)
       rake (>= 12.3.3)
-    pg (1.5.9)
+    pg (1.6.2-aarch64-linux)
+    pg (1.6.2-x86_64-linux)
     pry (0.15.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -248,7 +247,7 @@ GEM
       hashie (~> 4.1)
       multi_json (~> 1.15)
     racc (1.8.1)
-    rack (2.2.16)
+    rack (2.2.17)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
     rack-cors (2.0.2)
@@ -291,7 +290,7 @@ GEM
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
-    rake (13.2.1)
+    rake (13.3.0)
     rbtree (0.4.6)
     redis (4.8.1)
     representable (3.2.0)
@@ -304,18 +303,18 @@ GEM
       actionpack (>= 5.2)
       railties (>= 5.2)
     retriable (3.1.2)
-    rexml (3.4.1)
+    rexml (3.4.2)
     rollbar (3.6.2)
-    rspec (3.13.0)
+    rspec (3.13.1)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.3)
+    rspec-core (3.13.5)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.4)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.4)
+    rspec-mocks (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-rails (6.1.5)
@@ -326,27 +325,27 @@ GEM
       rspec-expectations (~> 3.13)
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
-    rspec-support (3.13.3)
+    rspec-support (3.13.5)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    scenic (1.8.0)
+    scenic (1.9.0)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
     secure_headers (7.1.0)
     set (1.1.2)
-    signet (0.20.0)
+    signet (0.21.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
-      jwt (>= 1.5, < 3.0)
+      jwt (>= 1.5, < 4.0)
       multi_json (~> 1.10)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-cobertura (2.1.0)
+    simplecov-cobertura (3.1.0)
       rexml
       simplecov (~> 0.19)
-    simplecov-html (0.13.1)
+    simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
     sorted_set (1.0.3)
       rbtree
@@ -359,7 +358,7 @@ GEM
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
-    thor (1.3.2)
+    thor (1.4.0)
     thwait (0.2.0)
       e2mmap
     timeout (0.4.3)
@@ -411,6 +410,7 @@ DEPENDENCIES
   logger
   lograge
   mutations
+  mutex_m
   ostruct
   passenger
   pg
@@ -438,7 +438,7 @@ DEPENDENCIES
   webmock
 
 RUBY VERSION
-   ruby 3.4.4p34
+   ruby 3.4.5p51
 
 BUNDLED WITH
-   2.6.9
+   2.7.1

app/controllers/api/ais_controller.rb

@@ -147,6 +147,15 @@ def make_request(system_prompt, user_prompt, stream)
               missed = true
             end
             boundary = buffer.index("\n\n")
+            begin
+              err_msg = JSON.parse(buffer)["error"]
+              puts "AI #{context_key} error:" \
+                  " (#{err_msg})" unless Rails.env.test?
+              current_device.tell("Please try again", ["toast"], "error")
+              return {"error" => {"message" => err_msg}}
+            rescue JSON::ParserError
+              nil
+            end
             while not boundary.nil?
               data_str = buffer.slice(0, boundary)
               buffer = buffer.slice(boundary + 2, buffer.length)

app/controllers/dashboard_controller.rb

@@ -1,5 +1,6 @@
 class DashboardController < ApplicationController
   before_action :set_global_config
+  skip_before_action :verify_authenticity_token, only: [:csp_reports]
   layout "dashboard"
 
   # === THESE CONSTANTS ARE CONFIGURABLE: ===
@@ -102,10 +103,16 @@
     payload = request.body.read || ""
     begin
       report = JSON.parse(payload)
-    rescue
-      report = { problem: "Crashed while parsing report" }
+    rescue JSON::ParserError => e
+      report = {
+        error: "CSP report parse error",
+        exception: e.message,
+        raw: payload,
+      }
     end
-    render json: report
+
+    Rollbar.info("CSP Violation Report", report)
+    head :no_content
   end
 
   # (for self hosted users) Direct image upload endpoint.

app/models/celery_script_settings_bag.rb

@@ -24,6 +24,10 @@ def self.exists?(id)
 
   ALLOWED_ASSERTION_TYPES = %w(abort recover abort_recover continue)
   ALLOWED_AXIS = %w(x y z all)
+  ALLOWED_GROUPING = %w(xyz x,yz yz,x y,xz xz,y z,xy xy,z
+                        x,y,z x,z,y y,x,z y,z,x z,x,y z,y,x
+                        xy x,y y,x xz x,z z,x yz y,z z,y x y z)
+  ALLOWED_ROUTE = %w(high low in_order)
   ALLOWED_CHANGES = %w(add remove update)
   ALLOWED_CHANNEL_NAMES = %w(ticker toast email espeak)
   ALLOWED_LHS_STRINGS = [*(0..69)].map { |x| "pin#{x}" }.concat(%w(x y z))
@@ -56,6 +60,8 @@ def self.exists?(id)
   BAD_ASSERTION_TYPE = '"%s" is not a valid assertion type. ' \
                        "Try these instead: %s"
   BAD_AXIS = '"%s" is not a valid axis. Allowed values: %s'
+  BAD_GROUPING = '"%s" is not a valid grouping. Allowed values: %s'
+  BAD_ROUTE = '"%s" is not a valid route. Allowed values: %s'
   BAD_CHANNEL_NAME = '"%s" is not a valid channel_name. Allowed values: %s'
   BAD_LHS = 'Can not put "%s" into a left hand side (LHS) argument. ' \
             "Allowed values: %s"
@@ -112,6 +118,8 @@ def self.exists?(id)
 
   CORPUS_ENUM = {
     ALLOWED_AXIS: [ALLOWED_AXIS, BAD_AXIS],
+    ALLOWED_GROUPING: [ALLOWED_GROUPING, BAD_GROUPING],
+    ALLOWED_ROUTE: [ALLOWED_ROUTE, BAD_ROUTE],
     ALLOWED_SPECIAL_VALUE: [ALLOWED_SPECIAL_VALUE, BAD_SPECIAL_VALUE],
     ALLOWED_CHANNEL_NAMES: [ALLOWED_CHANNEL_NAMES, BAD_CHANNEL_NAME],
     ALLOWED_MESSAGE_TYPES: [ALLOWED_MESSAGE_TYPES, BAD_MESSAGE_TYPE],
@@ -206,6 +214,8 @@ def self.v(symbol)
     url: { defn: [v(:string)] },
     value: { defn: [v(:string), v(:integer), v(:boolean)] },
     variance: { defn: [v(:integer)] },
+    grouping: { defn: [e(:ALLOWED_GROUPING)] },
+    route: { defn: [e(:ALLOWED_ROUTE)] },
     version: { defn: [v(:integer)] },
     x: { defn: [v(:integer), v(:float)] },
     y: { defn: [v(:integer), v(:float)] },
@@ -557,6 +567,10 @@ def self.v(symbol)
       args: [],
       tags: [:data],
     },
+    axis_order: {
+      args: [:grouping, :route],
+      tags: [:data],
+    },
     random: {
       args: [:variance],
       tags: [:data],
@@ -566,6 +580,7 @@ def self.v(symbol)
         :axis_overwrite,
         :axis_addition,
         :speed_overwrite,
+        :axis_order,
         :safe_z,
       ],
       tags: [:function, :firmware_user],

app/mutations/auth/create_token_from_credentials.rb

@@ -19,7 +19,7 @@ def validate
         whoops! unless maybe_user
         @user = maybe_user
       end
-    rescue OpenSSL::PKey::RSAError => e
+    rescue OpenSSL::PKey::RSAError, JSON::ParserError
       whoops!(BAD_KEY)
     end