openc3 5.7.0 → 5.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9233a93be94c8a50cf561413812f9ae718edb25838cefe5fedf6bcb6efdd5ade
-  data.tar.gz: 9a7a7e09b815c0f5c077c9987dadad5da1fcd986f7bf6c3db213b528ff2a293a
+  metadata.gz: 4ff64c4ea935a504f12164ff90107fbe35e10b31f0628ca21a8be8f411711e8f
+  data.tar.gz: 243be1e6c1e5f61cfc7789bcb6319db6cae3cd733e186ae33a1e8de08fa3a6e1
 SHA512:
-  metadata.gz: 86bdc47e5dec0e3ca71de24ae2e4ce4e2fca4824696f214d37bacbbff1f914380e50e414ac270c6b52f64d965bf8eaa2ca22733993df261c42510480731b66ff
-  data.tar.gz: 8e813eb9fb74aae5da6ffd11e196e974be2e9ca9718e7a6ef08eedba8668078f3ea18bd9968f431ec7562de7772888f28e4e05e366f4226a808225571b447574
+  metadata.gz: a379ce7d179aff5f45edd1413d7d10a19a49034685affda022e7cf1ad45285bcd496a522c3aa786f9325d591e9c5ff65201f5ba9486ffae8743c0c2b1b52052a
+  data.tar.gz: 991a47c1deb6d78415bf3e77d1569a8d6279f629d8ac8169491ebfd4dbd85652e422747d28d52fef49b1db02b04c6c2cc5164aa291a2946be4f6c4daccb67352

data/Gemfile

@@ -9,7 +9,7 @@ gemspec :name => 'openc3'
 # Include the rails gems for the convenience of custom microservice plugins
 gem 'rails', '~> 7.0.0'
 gem 'bootsnap', '>= 1.9.3', require: false
-gem 'rack-cors', '~> 1.1'
+gem 'rack-cors', '~> 2.0'
 gem 'tzinfo-data'
 gem 'rspec-rails', '~> 6.0'
 gem 'simplecov', '~> 0.20'

data/data/config/widgets.yaml

@@ -12,7 +12,7 @@ Layout Widgets:
       parameters:
         - name: Margin
           required: false
-          description: Margin between widgets (default = 1px)
+          description: Margin between widgets (default = 0px)
           values: .*
       example: |
         VERTICAL 5px
@@ -30,7 +30,7 @@ Layout Widgets:
           values: .*
         - name: Margin
           required: false
-          description: Margin between widgets (default = 1px)
+          description: Margin between widgets (default = 0px)
           values: .*
       example: |
         VERTICALBOX Info
@@ -43,7 +43,7 @@ Layout Widgets:
       parameters:
         - name: Margin
           required: false
-          description: Margin between widgets (default = 1px)
+          description: Margin between widgets (default = 0px)
           values: .*
       example: |
         HORIZONTAL 100
@@ -60,7 +60,7 @@ Layout Widgets:
           values: .*
         - name: Margin
           required: false
-          description: Margin between widgets (default = 1px)
+          description: Margin between widgets (default = 0px)
           values: .*
       example: |
         HORIZONTALBOX Info 10
@@ -77,7 +77,7 @@ Layout Widgets:
           values: .*
         - name: Margin
           required: false
-          description: Margin between widgets (default = 1px)
+          description: Margin between widgets (default = 0px)
           values: .*
       example: |
         MATRIXBYCOLUMNS 3 10
@@ -98,7 +98,7 @@ Layout Widgets:
           values: .*
         - name: Margin
           required: false
-          description: Margin between widgets (default = 1px)
+          description: Margin between widgets (default = 0px)
           values: .*
       example: |
         SCROLLWINDOW 100 10

data/lib/openc3/api/cmd_api.rb

@@ -23,6 +23,7 @@
 require 'openc3/models/target_model'
 require 'openc3/topics/command_topic'
 require 'openc3/topics/command_decom_topic'
+require 'openc3/topics/decom_interface_topic'
 require 'openc3/topics/interface_topic'
 require 'openc3/script/extract'
 
@@ -38,6 +39,7 @@ module OpenC3
                        'cmd_raw_no_range_check',
                        'cmd_raw_no_hazardous_check',
                        'cmd_raw_no_checks',
+                       'build_command',
                        'send_raw',
                        'get_all_commands',
                        'get_all_command_names',
@@ -95,6 +97,33 @@ module OpenC3
       cmd_implementation('cmd_raw_no_checks', *args, range_check: false, hazardous_check: false, raw: true, **kwargs)
     end
 
+    # Build a command binary
+    #
+    # @since 5.8.0
+    def build_command(*args, range_check: true, raw: false, scope: $openc3_scope, token: $openc3_token, **kwargs)
+      extract_string_kwargs_to_args(args, kwargs)
+      case args.length
+      when 1
+        target_name, cmd_name, cmd_params = extract_fields_from_cmd_text(args[0], scope: scope)
+      when 2, 3
+        target_name  = args[0]
+        cmd_name     = args[1]
+        if args.length == 2
+          cmd_params = {}
+        else
+          cmd_params = args[2]
+        end
+      else
+        # Invalid number of arguments
+        raise "ERROR: Invalid number of arguments (#{args.length}) passed to build_command()"
+      end
+      target_name = target_name.upcase
+      cmd_name = cmd_name.upcase
+      cmd_params = cmd_params.transform_keys(&:upcase)
+      authorize(permission: 'cmd_info', target_name: target_name, scope: scope, token: token)
+      DecomInterfaceTopic.build_cmd(target_name, cmd_name, cmd_params, range_check, raw, scope: scope)
+    end
+
     # Send a raw binary string to the specified interface.
     #
     # @param interface_name [String] The interface to send the raw binary

data/lib/openc3/api/limits_api.rb

@@ -21,6 +21,7 @@
 # if purchased from OpenC3, Inc.
 
 require 'openc3/api/target_api'
+require 'openc3/models/cvt_model'
 
 module OpenC3
   module Api
@@ -191,7 +192,7 @@ module OpenC3
     def get_limits(target_name, packet_name, item_name, scope: $openc3_scope, token: $openc3_token)
       authorize(permission: 'tlm', target_name: target_name, packet_name: packet_name, scope: scope, token: token)
       limits = {}
-      item = TargetModel.packet_item(target_name, packet_name, item_name, scope: scope)
+      item = _get_item(target_name, packet_name, item_name, scope: scope)
       item['limits'].each do |key, vals|
         next unless vals.is_a?(Hash)
 
@@ -364,5 +365,34 @@ module OpenC3
         TargetModel.set_packet(last_target_name, last_packet_name, packet, scope: scope)
       end
     end
+
+    # Gets an item. The code below is mostly duplicated from tlm_process_args in tlm_api.rb.
+    #
+    # @param target_name [String] target name
+    # @param packet_name [String] packet name
+    # @param item_name [String] item name
+    # @param scope [String] scope
+    # @return Hash The requested item based on the packet name
+    def _get_item(target_name, packet_name, item_name, scope:)
+      requested_item = nil
+      if packet_name == 'LATEST'
+        latest = -1
+        TargetModel.packets(target_name, scope: scope).each do |packet|
+          item = packet['items'].find { |item| item['name'] == item_name }
+          if item
+            hash = CvtModel.get(target_name: target_name, packet_name: packet['packet_name'], scope: scope)
+            if hash['PACKET_TIMESECONDS'] && hash['PACKET_TIMESECONDS'] > latest
+              latest = hash['PACKET_TIMESECONDS']
+              requested_item = item
+            end
+          end
+        end
+        raise "Item '#{target_name} LATEST #{item_name}' does not exist" if latest == -1
+      else
+        # Determine if this item exists, it will raise appropriate errors if not
+        requested_item = TargetModel.packet_item(target_name, packet_name, item_name, scope: scope)
+      end
+      return requested_item
+    end
   end
 end

data/lib/openc3/api/tlm_api.rb

@@ -25,7 +25,7 @@ require 'openc3/models/cvt_model'
 require 'openc3/packets/packet'
 require 'openc3/topics/telemetry_topic'
 require 'openc3/topics/interface_topic'
-require 'openc3/topics/telemetry_decom_topic'
+require 'openc3/topics/decom_interface_topic'
 
 module OpenC3
   module Api
@@ -150,7 +150,7 @@ module OpenC3
       if interface_name
         InterfaceTopic.inject_tlm(interface_name, target_name, packet_name, item_hash, type: type, scope: scope)
       else
-        TelemetryDecomTopic.inject_tlm(target_name, packet_name, item_hash, type: type, scope: scope)
+        DecomInterfaceTopic.inject_tlm(target_name, packet_name, item_hash, type: type, scope: scope)
       end
     end
 
@@ -449,12 +449,10 @@ module OpenC3
         TargetModel.packets(target_name, scope: scope).each do |packet|
           item = packet['items'].find { |item| item['name'] == item_name }
           if item
-            # TODO: Fixme: This should be using the CVT not topics - Will possibly choose wrong packet if mixed with stored
-            _, msg_hash = Topic.get_newest_message("#{scope}__DECOM__{#{target_name}}__#{packet['packet_name']}")
-            packet_name = packet['packet_name'] if packet_name == 'LATEST'
-            if msg_hash && msg_hash['time'] && msg_hash['time'].to_i > latest
+            hash = CvtModel.get(target_name: target_name, packet_name: packet['packet_name'], scope: scope)
+            if hash['PACKET_TIMESECONDS'] && hash['PACKET_TIMESECONDS'] > latest
+              latest = hash['PACKET_TIMESECONDS']
               packet_name = packet['packet_name']
-              latest = msg_hash['time'].to_i
             end
           end
         end

data/lib/openc3/core_ext/faraday.rb

@@ -0,0 +1,8 @@
+require 'faraday'
+
+module Faraday
+  class Response
+    # Add an alias of status to code to feel more like httpclient
+    alias code status
+  end
+end

data/lib/openc3/core_ext.rb

@@ -23,9 +23,9 @@
 require 'openc3/core_ext/array'
 require 'openc3/core_ext/binding'
 require 'openc3/core_ext/class'
-require 'openc3/core_ext/httpclient'
 require 'openc3/core_ext/openc3_io'
 require 'openc3/core_ext/exception'
+require 'openc3/core_ext/faraday'
 require 'openc3/core_ext/file'
 require 'openc3/core_ext/hash'
 require 'openc3/core_ext/io'

data/lib/openc3/io/json_api_object.rb

@@ -14,7 +14,7 @@
 # GNU Affero General Public License for more details.
 
 # Modified by OpenC3, Inc.
-# All changes Copyright 2022, OpenC3, Inc.
+# All changes Copyright 2023, OpenC3, Inc.
 # All Rights Reserved
 #
 # This file may also be used under the terms of a commercial license
@@ -30,7 +30,7 @@ require 'json'
 # require 'drb/acl'
 require 'drb/drb'
 require 'uri'
-require 'httpclient'
+require 'faraday'
 
 
 module OpenC3
@@ -101,7 +101,7 @@ module OpenC3
 
     # Disconnects from http server
     def disconnect
-      @http.reset_all() if @http
+      @http.close if @http
       @http = nil
     end
 
@@ -115,9 +115,14 @@ module OpenC3
 
     def connect
       begin
-        @http = HTTPClient.new
-        @http.connect_timeout = @timeout
-        @http.receive_timeout = nil # Allow long polling
+        # Per https://github.com/lostisland/faraday/blob/main/lib/faraday/options/env.rb
+        # :timeout       - time limit for the entire request (Integer in seconds)
+        # :open_timeout  - time limit for just the connection phase (e.g. handshake) (Integer in seconds)
+        # :read_timeout  - time limit for the first response byte received from the server (Integer in seconds)
+        # :write_timeout - time limit for the client to send the request to the server (Integer in seconds)
+        @http = Faraday.new(request: { open_timeout: @timeout.to_i, read_timeout: nil }) do |f|
+          f.adapter :net_http # adds the adapter to the connection, defaults to `Faraday.default_adapter`
+        end
       rescue => e
         raise JsonApiError, e.message
       end
@@ -216,17 +221,24 @@ module OpenC3
     def _http_request(method:, uri:, kwargs:)
       case method
       when 'get', :get
-        return @http.get(uri, :header => kwargs[:headers], :query => kwargs[:query])
+        return @http.get(uri, kwargs[:query], kwargs[:headers])
       when 'post', :post
-        return @http.post(uri, :header => kwargs[:headers], :query => kwargs[:query], :body => kwargs[:data])
+        return @http.post(uri) do |req|
+          req.params = kwargs[:query]
+          req.headers = kwargs[:headers]
+          req.body = kwargs[:data]
+        end
       when 'put', :put
-        return @http.put(uri, :header => kwargs[:headers], :query => kwargs[:query], :body => kwargs[:data])
+        return @http.put(uri) do |req|
+          req.params = kwargs[:query]
+          req.headers = kwargs[:headers]
+          req.body = kwargs[:data]
+        end
       when 'delete', :delete
-        return @http.delete(uri, :header => kwargs[:headers], :query => kwargs[:query])
+        return @http.delete(uri, kwargs[:query], kwargs[:headers])
       else
         raise JsonApiError, "no method found: '#{method}'"
       end
     end
-
-  end # class JsonApiObject
+  end
 end

data/lib/openc3/io/json_drb_object.rb

@@ -14,7 +14,7 @@
 # GNU Affero General Public License for more details.
 
 # Modified by OpenC3, Inc.
-# All changes Copyright 2022, OpenC3, Inc.
+# All changes Copyright 2023, OpenC3, Inc.
 # All Rights Reserved
 #
 # This file may also be used under the terms of a commercial license
@@ -24,7 +24,6 @@ require 'openc3'
 require 'openc3/io/json_api_object'
 
 module OpenC3
-
   class JsonDRbError < JsonApiError; end
 
   # Used to forward all method calls to the remote server object. Before using
@@ -39,7 +38,6 @@ module OpenC3
   #   server.cmd(*args)
   #
   class JsonDRbObject < JsonApiObject
-
     USER_AGENT = 'OpenC3 / v5 (ruby/openc3/lib/io/json_drb_object)'
 
     # @param url [String] The url of openc3-cosmos-cmd-tlm-api http://openc3-cosmos-cmd-tlm-api:2901
@@ -80,7 +78,6 @@ module OpenC3
 
     private
 
-    #
     def make_request(data:, token: nil)
       token = @authentication.token if @authentication and not token
       if token
@@ -98,7 +95,7 @@ module OpenC3
       begin
         @log[0] = "Request: #{@uri.to_s} #{USER_AGENT} #{data.to_s}"
         STDOUT.puts @log[0] if JsonDRb.debug?
-        resp = @http.post(@uri, :body => data, :header => headers)
+        resp = @http.post(@uri, data, headers)
         @log[1] = "Response: #{resp.status} #{resp.headers} #{resp.body}"
         @response_data = resp.body
         STDOUT.puts @log[1] if JsonDRb.debug?
@@ -109,7 +106,6 @@ module OpenC3
       end
     end
 
-    #
     def handle_response(response:)
       # The code below will always either raise or return breaking out of the loop
       if JsonRpcErrorResponse === response
@@ -122,5 +118,5 @@ module OpenC3
         return response.result
       end
     end
-  end # class JsonDRbObject
+  end
 end

data/lib/openc3/logs/buffered_packet_log_writer.rb

@@ -96,23 +96,31 @@ module OpenC3
       return nil
     end
 
-    def start_new_file(empty_buffer = false)
-      write_buffer() if empty_buffer
-      super()
+    def close_file(take_mutex = true)
+      @mutex.lock if take_mutex
+      begin
+        # Need to write out the buffer before closing out the file
+        if @buffer.length > 0
+          start_new_file() unless @file
+          write_buffer()
+        end
+        return super(false) # Someone has already taken mutex here
+      ensure
+        @mutex.unlock if take_mutex
+      end
     end
 
+    # Mutex is already taken when this is called so we need to adjust
+    # prepare_write and write accordingly
     def write_buffer
-      @buffer.each do |entry|
-        write(*entry)
+      begin
+        @buffer.each do |entry|
+          write(*entry, allow_new_file: false, take_mutex: false)
+        end
+      rescue => err
+        Logger.instance.error "Error writing out buffer : #{err.formatted}"
       end
       @buffer = []
     end
-
-    # Need to write out all remaining buffer entries and then shutdown
-    # Returns thread that moves final log to bucket
-    def shutdown
-      write_buffer()
-      return super()
-    end
   end
 end

data/lib/openc3/logs/log_writer.rb

@@ -130,6 +130,7 @@ module OpenC3
       @cleanup_offsets = []
       @cleanup_times = []
       @previous_time_nsec_since_epoch = nil
+      @tmp_dir = Dir.mktmpdir
 
       # This is an optimization to avoid creating a new entry object
       # each time we create an entry which we do a LOT!
@@ -157,7 +158,7 @@ module OpenC3
     # Stops all logging and closes the current log file.
     def stop
       threads = nil
-      @mutex.synchronize { @logging_enabled = false; threads = close_file(false) }
+      @mutex.synchronize { threads = close_file(false); @logging_enabled = false; }
       return threads
     end
 
@@ -187,10 +188,11 @@ module OpenC3
       while true
         filename_parts = [attempt]
         filename_parts.unshift @label if @label
-        filename = File.join(Dir.tmpdir, File.build_timestamped_filename([@label, attempt], ext))
+        filename = File.join(@tmp_dir, File.build_timestamped_filename([@label, attempt], ext))
         if File.exist?(filename)
           attempt ||= 0
           attempt += 1
+          Logger.warn("Unexpected file name conflict: #{filename}")
         else
           return filename
         end
@@ -260,7 +262,7 @@ module OpenC3
     # wrapped with a rescue and handled with handle_critical_exception
     # Assumes mutex has already been taken
     def start_new_file
-      close_file(false)
+      close_file(false) if @file
 
       # Start log file
       @filename = create_unique_filename()
@@ -279,16 +281,16 @@ module OpenC3
       OpenC3.handle_critical_exception(err)
     end
 
-    def prepare_write(time_nsec_since_epoch, data_length, redis_topic = nil, redis_offset = nil)
+    def prepare_write(time_nsec_since_epoch, data_length, redis_topic = nil, redis_offset = nil, allow_new_file: true)
       # This check includes logging_enabled again because it might have changed since we acquired the mutex
       # Ensures new files based on size, and ensures always increasing time order in files
       if @logging_enabled
         if !@file
           Logger.debug("Log writer start new file because no file opened")
-          start_new_file()
+          start_new_file() if allow_new_file
         elsif @cycle_size and ((@file_size + data_length) > @cycle_size)
           Logger.debug("Log writer start new file due to cycle size #{@cycle_size}")
-          start_new_file()
+          start_new_file() if allow_new_file
         elsif @enforce_time_order and @previous_time_nsec_since_epoch and (@previous_time_nsec_since_epoch > time_nsec_since_epoch)
           # Warning: Creating new files here can cause lots of files to be created if packets make it through out of order
           # Changed to just a error to prevent file thrashing
@@ -315,6 +317,9 @@ module OpenC3
             Logger.debug "Log File Closed : #{@filename}"
             date = first_timestamp[0..7] # YYYYMMDD
             bucket_key = File.join(@remote_log_directory, date, bucket_filename())
+            # Cleanup timestamps here so they are unset for the next file
+            @first_time = nil
+            @last_time = nil
             threads << BucketUtilities.move_log_file_to_bucket(@filename, bucket_key)
             # Now that the file is in storage, trim the Redis stream after a delay
             @cleanup_offsets << {}
@@ -324,7 +329,7 @@ module OpenC3
             @cleanup_times << Time.now + CLEANUP_DELAY
             @last_offsets.clear
           rescue Exception => err
-            Logger.instance.error "Error closing #{@filename} : #{err.formatted}"
+            Logger.error "Error closing #{@filename} : #{err.formatted}"
           end
 
           @file = nil

data/lib/openc3/logs/packet_log_writer.rb

@@ -97,12 +97,15 @@ module OpenC3
     # @param data [String] Binary string of data
     # @param id [Integer] Target ID
     # @param redis_offset [Integer] The offset of this packet in its Redis stream
-    def write(entry_type, cmd_or_tlm, target_name, packet_name, time_nsec_since_epoch, stored, data, id = nil, redis_topic = nil, redis_offset = '0-0')
+    def write(entry_type, cmd_or_tlm, target_name, packet_name, time_nsec_since_epoch, stored, data, id = nil, redis_topic = nil, redis_offset = '0-0', take_mutex: true, allow_new_file: true)
       return if !@logging_enabled
 
-      @mutex.synchronize do
-        prepare_write(time_nsec_since_epoch, data.length, redis_topic, redis_offset)
+      @mutex.lock if take_mutex
+      begin
+        prepare_write(time_nsec_since_epoch, data.length, redis_topic, redis_offset, allow_new_file: allow_new_file)
         write_entry(entry_type, cmd_or_tlm, target_name, packet_name, time_nsec_since_epoch, stored, data, id) if @file
+      ensure
+        @mutex.unlock if take_mutex
       end
     rescue => err
       Logger.instance.error "Error writing #{@filename} : #{err.formatted}"
@@ -121,7 +124,6 @@ module OpenC3
       @index_filename = create_unique_filename('.idx'.freeze)
       @index_file = File.new(@index_filename, 'wb')
       @index_file.write(OPENC3_INDEX_HEADER)
-
       @cmd_packet_table = {}
       @tlm_packet_table = {}
       @key_map_table = {}
@@ -149,8 +151,6 @@ module OpenC3
           write_entry(:OFFSET_MARKER, nil, nil, nil, nil, nil, last_offset + ',' + redis_topic, nil) if @file
         end
 
-        threads.concat(super(false))
-
         if @index_file
           begin
             write_index_file_footer()
@@ -166,6 +166,9 @@ module OpenC3
           @index_file = nil
           @index_filename = nil
         end
+
+        threads.concat(super(false))
+
       ensure
         @mutex.unlock if take_mutex
       end

data/lib/openc3/microservices/decom_microservice.rb

@@ -60,6 +60,10 @@ module OpenC3
                   handle_inject_tlm(msg_hash['inject_tlm'])
                   next
                 end
+                if msg_hash.key?('build_cmd')
+                  handle_build_cmd(msg_hash['build_cmd'], msg_id)
+                  next
+                end
               else
                 decom_packet(topic, msg_id, msg_hash, redis)
                 @metric.set(name: 'decom_total', value: @count, type: 'counter')

data/lib/openc3/microservices/interface_decom_common.rb

@@ -37,5 +37,37 @@ module OpenC3
       packet.received_time = Time.now.sys
       TelemetryTopic.write_packet(packet, scope: @scope)
     end
+
+    def handle_build_cmd(build_cmd_json, msg_id)
+      build_cmd_hash = JSON.parse(build_cmd_json, allow_nan: true, create_additions: true)
+      target_name = build_cmd_hash['target_name']
+      cmd_name = build_cmd_hash['cmd_name']
+      cmd_params = build_cmd_hash['cmd_params']
+      range_check = build_cmd_hash['range_check']
+      raw = build_cmd_hash['raw']
+      ack_topic = "{#{@scope}__ACKCMD}TARGET__#{target_name}"
+      begin
+        command = System.commands.build_cmd(target_name, cmd_name, cmd_params, range_check, raw)
+        msg_hash = {
+          id: msg_id,
+          result: 'SUCCESS',
+          time: command.packet_time.to_nsec_from_epoch,
+          received_time: command.received_time.to_nsec_from_epoch,
+          target_name: command.target_name,
+          packet_name: command.packet_name,
+          received_count: command.received_count,
+          buffer: command.buffer(false)
+        }
+      # If there is an error due to parameter out of range, etc, we rescue it so we can
+      # write the ACKCMD}TARGET topic and allow the TelemetryDecomTopic.build_cmd to return
+      rescue => error
+        msg_hash = {
+          id: msg_id,
+          result: 'ERROR',
+          message: error.message
+        }
+      end
+      Topic.write_topic(ack_topic, msg_hash)
+    end
   end
 end

data/lib/openc3/microservices/reducer_microservice.rb

@@ -386,7 +386,7 @@ module OpenC3
         # Write out all entries in progress
         write_all_entries(reducer_state, plw, type, target_name, stored)
         reducer_state.clear
-        plw.start_new_file(true) # Automatically closes the current file
+        plw.close_file
         return true
       else
         return false
@@ -450,20 +450,24 @@ module OpenC3
       # We've collected all the values so calculate the AVG and STDDEV
       if type == 'minute'
         raw_keys.each do |key|
-          reduced["_NUM_SAMPLES"] ||= reduced["#{key}__VALS"].length # Keep a single sample count per packet
-          reduced["#{key}__A"], reduced["#{key}__S"] =
-            Math.stddev_population(reduced["#{key}__VALS"])
-          # Remove the raw values as they're only used for AVG / STDDEV calculation
-          reduced.delete("#{key}__VALS")
+          if reduced["#{key}__VALS"]
+            reduced["_NUM_SAMPLES"] ||= reduced["#{key}__VALS"].length # Keep a single sample count per packet
+            reduced["#{key}__A"], reduced["#{key}__S"] =
+              Math.stddev_population(reduced["#{key}__VALS"])
+            # Remove the raw values as they're only used for AVG / STDDEV calculation
+            reduced.delete("#{key}__VALS")
+          end
         end
 
         converted_keys.each do |key|
-          reduced["_NUM_SAMPLES"] ||= reduced["#{key}__CVALS"].length # Keep a single sample count per packet
-          reduced["#{key}__CA"], reduced["#{key}__CS"] =
-            Math.stddev_population(reduced["#{key}__CVALS"])
+          if reduced["#{key}__CVALS"]
+            reduced["_NUM_SAMPLES"] ||= reduced["#{key}__CVALS"].length # Keep a single sample count per packet
+            reduced["#{key}__CA"], reduced["#{key}__CS"] =
+              Math.stddev_population(reduced["#{key}__CVALS"])
 
-          # Remove the converted values as they're only used for AVG / STDDEV calculation
-          reduced.delete("#{key}__CVALS")
+            # Remove the converted values as they're only used for AVG / STDDEV calculation
+            reduced.delete("#{key}__CVALS")
+          end
         end
       else
         samples = reduced["_NUM_SAMPLES__VALS"]

data/lib/openc3/models/cvt_model.rb

@@ -40,9 +40,16 @@ module OpenC3
       Store.hset("#{scope}__tlm__#{target_name}", packet_name, JSON.generate(hash.as_json(:allow_nan => true)))
     end
 
+    # Get the hash for packet in the CVT
+    def self.get(target_name:, packet_name:, scope: $openc3_scope)
+      packet = Store.hget("#{scope}__tlm__#{target_name}", packet_name)
+      raise "Packet '#{target_name} #{packet_name}' does not exist" unless packet
+      JSON.parse(packet, :allow_nan => true, :create_additions => true)
+    end
+
     # Set an item in the current value table
     def self.set_item(target_name, packet_name, item_name, value, type:, scope: $openc3_scope)
-      hash = JSON.parse(Store.hget("#{scope}__tlm__#{target_name}", packet_name), :allow_nan => true, :create_additions => true)
+      hash = get(target_name: target_name, packet_name: packet_name, scope: scope)
       case type
       when :WITH_UNITS
         hash["#{item_name}__U"] = value.to_s # WITH_UNITS should always be a string
@@ -87,7 +94,7 @@ module OpenC3
         result = JSON.parse(overrides, :allow_nan => true, :create_additions => true)[override_key]
         return result if result
       end
-      hash = JSON.parse(Store.hget("#{scope}__tlm__#{target_name}", packet_name), :allow_nan => true, :create_additions => true)
+      hash = get(target_name: target_name, packet_name: packet_name, scope: scope)
       hash.values_at(*types).each do |result|
         if result
           if type == :FORMATTED or type == :WITH_UNITS
@@ -115,9 +122,7 @@ module OpenC3
 
       lookups.each do |target_packet_key, target_name, packet_name, value_keys|
         unless packet_lookup[target_packet_key]
-          packet = Store.hget("#{scope}__tlm__#{target_name}", packet_name)
-          raise "Packet '#{target_name} #{packet_name}' does not exist" unless packet
-          packet_lookup[target_packet_key] = JSON.parse(packet, :allow_nan => true, :create_additions => true)
+          packet_lookup[target_packet_key] = get(target_name: target_name, packet_name: packet_name, scope: scope)
         end
         hash = packet_lookup[target_packet_key]
         item_result = []