openc3 6.6.0 → 6.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d08bcc3b92811101e2096aa443b5459835d0396aba80b1067c8147388ec050e6
-  data.tar.gz: 2820795b23e3da0530d0306ee2665d69bb5ad86f494609ced199f985929c56f2
+  metadata.gz: 0b3a2017659bdea9209911793ce6d8f53c28320df77e9c938e1a3ec6d0e88527
+  data.tar.gz: 950e4c86f740f303186262aa4c808f063219b7097e4b1a0c343aa83da9a71b48
 SHA512:
-  metadata.gz: 181ce42f3c55f78ee8e6adf3cc7145326974c8239a82478b501def91314169cacb62a9e53c4d0d760e0b0125a1b77e437127f7992d7e4fe42838035640b87dbe
-  data.tar.gz: 957334977c15e7d8e3fe49d14bec6c2e11c7cba09bbaea70cefe3f85a408255f1e7f2620b642c6f7a137d6ff9bdc1b4b49007fca58a9c6c5f9562b81daa0263e
+  metadata.gz: a6bcbc2924b4b7b0e7d961a0892f5e74fbb527998527f3c1ae1d7ba4c3213cbda5088864383c25bbebdeca01b09571efb596248d892fb513dc30181bbf376b1c
+  data.tar.gz: 0f42338482eb4069675bee41a29b0396ced047520a7300f7a627dcca2ff0fc483536448860f82e6e99a44a42b09ce64b261604fc35dd586b53ac764352ac9118

data/bin/openc3cli

@@ -24,17 +24,18 @@
 # This file will handle OpenC3 tasks such as instantiating a new project
 
 require 'openc3'
-require 'openc3/utilities/local_mode'
-require 'openc3/utilities/bucket'
-require 'openc3/utilities/cli_generator'
-require 'openc3/models/scope_model'
-require 'openc3/models/plugin_model'
+require 'openc3/bridge/bridge'
 require 'openc3/models/gem_model'
 require 'openc3/models/migration_model'
+require 'openc3/models/plugin_model'
 require 'openc3/models/python_package_model'
+require 'openc3/models/queue_model'
+require 'openc3/models/scope_model'
 require 'openc3/models/tool_model'
 require 'openc3/packets/packet_config'
-require 'openc3/bridge/bridge'
+require 'openc3/utilities/bucket'
+require 'openc3/utilities/cli_generator'
+require 'openc3/utilities/local_mode'
 require 'ostruct'
 require 'optparse'
 require 'openc3/utilities/zip'
@@ -63,8 +64,9 @@ def print_usage
   puts "  cli rake                          # Runs rake in the local directory"
   puts "  cli irb                           # Runs irb in the local directory"
   puts "  cli script                        # Interact with scripts. Run with --help for more info."
-  puts "  cli validate /PATH/FILENAME.gem SCOPE variables.txt # Validate a COSMOS plugin gem file"
-  puts "  cli load /PATH/FILENAME.gem SCOPE variables.txt     # Loads a COSMOS plugin gem file"
+  puts "  cli validate /PATH/FILENAME.gem SCOPE variables.json  # Validate a COSMOS plugin gem file"
+  puts "  cli load /PATH/FILENAME.gem SCOPE plugin_hash.json    # Loads a COSMOS plugin gem file"
+  puts "    OPTIONS: --variables lets you pass a path to a JSON file containing your plugin's variables"
   puts "  cli list <SCOPE>                  # Lists installed plugins, SCOPE is DEFAULT if not given"
   puts "  cli generate TYPE OPTIONS         # Generate various COSMOS entities"
   puts "    OPTIONS: --ruby or --python is required to specify the language in the generated code unless OPENC3_LANGUAGE is set"
@@ -333,7 +335,7 @@ end
 # Pass true as the last argument to force install even if a plugin with
 # the same version number exists
 #
-def load_plugin(plugin_file_path, scope:, plugin_hash_file: nil, force: false)
+def load_plugin(plugin_file_path, scope:, plugin_hash_file: nil, force: false, variables_file: nil)
   scope ||= 'DEFAULT'
   check_environment()
   if $openc3_in_cluster
@@ -352,9 +354,10 @@ def load_plugin(plugin_file_path, scope:, plugin_hash_file: nil, force: false)
     end
 
     begin
+      existing_variables = JSON.parse(File.read(variables_file)) if variables_file
       if plugin_hash_file
         # Admin Create / Edit / or Upgrade Plugin
-        OpenC3::PluginModel.install_phase1(plugin_file_path, scope: scope)
+        OpenC3::PluginModel.install_phase1(plugin_file_path, existing_variables: existing_variables, scope: scope)
         plugin_hash = JSON.parse(File.read(plugin_hash_file), :allow_nan => true, :create_additions => true)
       else
         # Init or Command Line openc3cli load with no plugin_hash_file
@@ -378,7 +381,7 @@ def load_plugin(plugin_file_path, scope:, plugin_hash_file: nil, force: false)
         end
         return if found
 
-        plugin_hash = OpenC3::PluginModel.install_phase1(plugin_file_path, scope: scope)
+        plugin_hash = OpenC3::PluginModel.install_phase1(plugin_file_path, existing_variables: existing_variables, scope: scope)
       end
 
       # Determine if plugin named in plugin_hash exists
@@ -640,12 +643,39 @@ def cli_script_list(args, options)
   return 0
 end
 
+def parse_suite_runner_options(options)
+  suite_runner = nil
+  # suite must be given to enable Suite Runner execution
+  if options[:suite]
+    suite_runner = {}
+    suite_runner['suite'] = options[:suite]
+    if options[:group]
+      suite_runner['group'] = options[:group]
+      # script requires group to be set
+      if options[:script]
+        suite_runner['script'] = options[:script]
+      end
+    end
+    if options[:method]
+      suite_runner['method'] = options[:method]
+    else
+      suite_runner['method'] = 'start'
+    end
+    if options[:options]
+      suite_runner['options'] = options[:options].split(',')
+    else
+      suite_runner['options'] = ["continueAfterError"]
+    end
+  end
+  return suite_runner
+end
+
 def cli_script_run(args, options)
   environment = get_env_from_args(args)
-
+  suite_runner = parse_suite_runner_options(options)
   ret_code = ERROR_CODE
   require 'openc3/script'
-  if (id = script_run(args[1], disconnect: options[:disconnect], environment: environment, scope: options[:scope]))
+  if (id = script_run(args[1], disconnect: options[:disconnect], environment: environment, suite_runner: suite_runner, scope: options[:scope]))
     puts id
     $script_interrupt_text = "  Script #{args[1]} still running remotely.\n" # for Ctrl-C
     if (options[:wait] < 1) then
@@ -673,10 +703,10 @@ end
 
 def cli_script_spawn(args, options)
   environment = get_env_from_args(args)
-
+  suite_runner = parse_suite_runner_options(options)
   ret_code = ERROR_CODE
   require 'openc3/script'
-  if (id = script_run(args[1], disconnect: options[:disconnect], environment: environment, scope: options[:scope]))
+  if (id = script_run(args[1], disconnect: options[:disconnect], environment: environment, suite_runner: suite_runner, scope: options[:scope]))
     puts id
     ret_code = 0
   end
@@ -769,6 +799,22 @@ def cli_script(args=[])
     opts.on("--scope SCOPE", "Run with specified scope (default = DEFAULT)") do |arg|
       options[:scope] = arg
     end
+    opts.on("--suite SUITE", "Run with specified suite") do |arg|
+      options[:suite] = arg
+    end
+    opts.on("--group GROUP", "Run with specified group") do |arg|
+      options[:group] = arg
+    end
+    opts.on("--script SCRIPT", "Run with specified script") do |arg|
+      options[:script] = arg
+    end
+    opts.on("--method start", "Method must be start, setup, or teardown. Default is start.") do |arg|
+      options[:method] = arg
+    end
+    # TODO 7.0: Should these all be snake case?
+    opts.on("--options options", "Options is a comma separated list consisting of continueAfterError,pauseOnError,abortAfterError,manual,loop,breakLoopOnError. Default is continueAfterError.") do |arg|
+      options[:options] = arg
+    end
     opts.on("-d", "--disconnect", "Run a script in disconnect mode (default = false)") do |arg|
       options[:disconnect] = arg
     end
@@ -848,7 +894,18 @@ if not ARGV[0].nil? # argument(s) given
   when 'load'
     # force is a boolean so if they pass 'force' it is true
     # See plugins_controller.rb install for usage
-    load_plugin(ARGV[1], scope: ARGV[2], plugin_hash_file: ARGV[3], force: ARGV[4] == 'force')
+    variables_option = ARGV.find_index('--variables')
+    if variables_option.nil?
+      scope = ARGV[2]
+      plugin_hash_file = ARGV[3]
+      force = ARGV[4] == 'force'
+    else
+      scope = ARGV[2] unless variables_option <= 2
+      plugin_hash_file = ARGV[3] unless variables_option <= 3
+      force = ARGV[4] == 'force' unless variables_option <= 4
+      variables_file = ARGV[variables_option + 1]
+    end
+    load_plugin(ARGV[1], scope: scope, plugin_hash_file: plugin_hash_file, force: force, variables_file: variables_file)
 
   when 'list'
     list_plugins(scope: ARGV[1])
@@ -959,6 +1016,10 @@ if not ARGV[0].nil? # argument(s) given
       end
     end
 
+  when 'createqueue'
+    queue = OpenC3::QueueModel.new(name: ARGV[1], state: 'RELEASE', scope: ARGV[2])
+    queue.create
+
   when 'destroyscope'
     scope = OpenC3::ScopeModel.get_model(name: ARGV[1])
     scope.destroy

data/data/config/command_modifiers.yaml

@@ -11,7 +11,7 @@ PARAMETER:
     - name: Bit Offset
       required: true
       description: Bit offset into the command packet of the Most Significant Bit of this parameter.
-        May be negative to indicate on offset from the end of the packet.
+        May be negative to indicate an offset from the end of the packet.
         Always use a bit offset of 0 for derived parameters.
       values: '[-]?\d+'
     <%= MetaConfigParser.load('_params.yaml').to_meta_config_yaml(4) %>
@@ -50,7 +50,7 @@ ID_PARAMETER:
     - name: Bit Offset
       required: true
       description: Bit offset into the command packet of the Most Significant Bit of this parameter.
-        May be negative to indicate on offset from the end of the packet.
+        May be negative to indicate an offset from the end of the packet.
       values: '[-]?\d+'
     <%= MetaConfigParser.load('_id_params.yaml').to_meta_config_yaml(4) %>
   example: ID_PARAMETER OPCODE 32 32 UINT 2 2 2 "Opcode identifier"
@@ -80,7 +80,7 @@ ARRAY_PARAMETER:
     - name: Bit Offset
       required: true
       description: Bit offset into the command packet of the Most Significant Bit of this parameter.
-        May be negative to indicate on offset from the end of the packet.
+        May be negative to indicate an offset from the end of the packet.
         Always use a bit offset of 0 for derived parameters.
       values: '[-]?\d+'
     <%= MetaConfigParser.load('_array_params.yaml').to_meta_config_yaml(4) %>

data/data/config/interface_modifiers.yaml

@@ -124,7 +124,7 @@ PROTOCOL:
   python_example: |
     INTERFACE DATA_INT openc3/interfaces/tcpip_client_interface.py host.docker.internal 8080 8081 10.0 nil BURST
       MAP_TARGET DATA
-      PROTOCOL READ IgnorePacketProtocol INST IMAGE # Drop all INST IMAGE packets
+      PROTOCOL READ openc3/interfaces/protocols/ignore_packet_protocol.py INST IMAGE # Drop all INST IMAGE packets
 OPTION:
   summary: Set a parameter on an interface
   description:

data/data/config/table_manager.yaml

@@ -22,7 +22,7 @@ TABLE:
         - name: Bit Offset
           required: true
           description: Bit offset into the table of the Most Significant Bit of this parameter.
-            May be negative to indicate on offset from the end of the table.
+            May be negative to indicate an offset from the end of the table.
             Always use a bit offset of 0 for derived parameters.
           values: '[-]?\d+'
         <%= MetaConfigParser.load('_params.yaml').to_meta_config_yaml(8) %>

data/data/config/telemetry_modifiers.yaml

@@ -14,7 +14,7 @@ ITEM:
     - name: Bit Offset
       required: true
       description: Bit offset into the telemetry packet of the Most Significant Bit of this item.
-        May be negative to indicate on offset from the end of the packet.
+        May be negative to indicate an offset from the end of the packet.
         Always use a bit offset of 0 for derived item.
       values: '[-]?\d+'
     <%= MetaConfigParser.load('_items.yaml').to_meta_config_yaml(4) %>
@@ -44,7 +44,7 @@ ID_ITEM:
     - name: Bit Offset
       required: true
       description: Bit offset into the telemetry packet of the Most Significant Bit of this item.
-        May be negative to indicate on offset from the end of the packet.
+        May be negative to indicate an offset from the end of the packet.
       values: '[-]?\d+'
     <%= MetaConfigParser.load('_id_items.yaml').to_meta_config_yaml(4) %>
 APPEND_ID_ITEM:
@@ -71,7 +71,7 @@ ARRAY_ITEM:
     - name: Bit Offset
       required: true
       description: Bit offset into the telemetry packet of the Most Significant Bit of this item.
-        May be negative to indicate on offset from the end of the packet.
+        May be negative to indicate an offset from the end of the packet.
         Always use a bit offset of 0 for derived item.
       values: '[-]?\d+'
     <%= MetaConfigParser.load('_array_params.yaml').to_meta_config_yaml(4) %>

data/data/config/widgets.yaml

@@ -746,11 +746,11 @@ Telemetry Widgets:
           values: <%= %w(RAW CONVERTED FORMATTED WITH_UNITS) %>
         - name: Width
           required: false
-          description: Width of the LED circle (default = 15)
+          description: Width of the LED circle (default = 20)
           values: .*
         - name: Height
           required: false
-          description: Height of the LED circle (default = 15)
+          description: Height of the LED circle (default = 20)
           values: .*
       example: |
         LED INST PARAMS VALUE5 RAW 25 20 # Ellipse

data/lib/openc3/accessors.rb

@@ -1,6 +1,6 @@
 # encoding: ascii-8bit
 
-# Copyright 2022 OpenC3, Inc.
+# Copyright 2024 OpenC3, Inc.
 # All Rights Reserved.
 #
 # This program is free software; you can modify and/or redistribute it

data/lib/openc3/api/cmd_api.rb

@@ -14,7 +14,7 @@
 # GNU Affero General Public License for more details.
 
 # Modified by OpenC3, Inc.
-# All changes Copyright 2024, OpenC3, Inc.
+# All changes Copyright 2025, OpenC3, Inc.
 # All Rights Reserved
 #
 # This file may also be used under the terms of a commercial license
@@ -24,6 +24,7 @@
 # See https://github.com/OpenC3/cosmos/pull/1963
 
 require 'openc3/api/interface_api'
+require 'openc3/models/queue_model'
 require 'openc3/models/target_model'
 require 'openc3/topics/command_topic'
 require 'openc3/topics/command_decom_topic'
@@ -452,7 +453,7 @@ module OpenC3
     end
 
     # NOTE: When adding new keywords to this method, make sure to update script/commands.rb
-    def _cmd_implementation(method_name, *args, range_check:, hazardous_check:, raw:, timeout: nil, log_message: nil, manual: false, validate: true,
+    def _cmd_implementation(method_name, *args, range_check:, hazardous_check:, raw:, timeout: nil, log_message: nil, manual: false, validate: true, queue: nil,
                             scope: $openc3_scope, token: $openc3_token, **kwargs)
       extract_string_kwargs_to_args(args, kwargs)
       unless [nil, true, false].include?(log_message)
@@ -538,9 +539,19 @@ module OpenC3
         'log_message' => log_message.to_s,
         'obfuscated_items' => packet['obfuscated_items'].to_s
       }
-      CommandTopic.send_command(command, timeout: timeout, scope: scope)
+      # Users have to explicitly opt into a default queue by setting the OPENC3_DEFAULT_QUEUE
+      # At which point ALL commands will go to that queue unless they specifically opt out with queue: false
+      if ENV['OPENC3_DEFAULT_QUEUE'] && queue.nil?
+        queue = ENV['OPENC3_DEFAULT_QUEUE']
+      end
+      if queue
+        # Pull the command out of the script string, e.g. cmd("INST ABORT")
+        queued = cmd_string.split('("')[1].split('")')[0]
+        QueueModel.queue_command(queue, command: queued, username: username, scope: scope)
+      else
+        CommandTopic.send_command(command, timeout: timeout, scope: scope)
+      end
       return command
     end
-
   end
 end

data/lib/openc3/api/settings_api.rb

@@ -31,6 +31,7 @@ rescue LoadError
 end
 require 'openc3/models/setting_model'
 require 'openc3/models/news_model'
+require 'openc3/models/plugin_store_model'
 
 module OpenC3
   module Api
@@ -43,6 +44,7 @@ module OpenC3
                        'set_setting',
                        'save_setting', # DEPRECATED
                        'update_news',
+                       'update_plugin_store',
                      ])
 
     def list_settings(manual: false, scope: $openc3_scope, token: $openc3_token)
@@ -103,5 +105,11 @@ module OpenC3
     rescue Exception => e
       NewsModel.news_error("Error contacting OpenC3 news feed. #{e.message})")
     end
+
+    # Update the local copy of the plugin store data
+    def update_plugin_store(manual: false, scope: $openc3_scope, token: $openc3_token)
+      authorize(permission: 'admin', manual: manual, scope: scope, token: token)
+      PluginStoreModel.update()
+    end
   end
 end

data/lib/openc3/api/stash_api.rb

@@ -1,6 +1,6 @@
 # encoding: ascii-8bit
 
-# Copyright 2022 OpenC3, Inc
+# Copyright 2024 OpenC3, Inc
 # All Rights Reserved.
 #
 # This program is free software; you can modify and/or redistribute it

data/lib/openc3/api/tlm_api.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 2025, OpenC3, Inc.
 # All Rights Reserved
 #
 # This file may also be used under the terms of a commercial license
@@ -22,7 +22,7 @@
 #
 # A portion of this file was funded by Blue Origin Enterprises, L.P.
 # See https://github.com/OpenC3/cosmos/pull/1963
-
+#
 # A portion of this file was funded by Blue Origin Enterprises, L.P.
 # See https://github.com/OpenC3/cosmos/pull/1957
 
@@ -49,6 +49,7 @@ module OpenC3
                        'normalize_tlm',
                        'get_tlm_buffer',
                        'get_tlm_packet',
+                       'get_tlm_available',
                        'get_tlm_values',
                        'get_all_tlm',
                        'get_all_telemetry', # DEPRECATED
@@ -254,6 +255,81 @@ module OpenC3
       items.zip(current_values).map { | item , values | [item, values[0], values[1]]}
     end
 
+    # Returns the available items from a list of requested screen items
+    # This does the packet introspection to determine what is actually available
+    # Like if you ask for WITH_UNITS but only RAW is available
+    def get_tlm_available(items, manual: false, scope: $openc3_scope, token: $openc3_token)
+      results = []
+      items.each do |item|
+        item_upcase = item.to_s.upcase
+        target_name, orig_packet_name, item_name, value_type = item_upcase.split('__')
+        packet_name = orig_packet_name
+        raise ArgumentError, "items must be formatted as TGT__PKT__ITEM__TYPE" if target_name.nil? || packet_name.nil? || item_name.nil? || value_type.nil?
+        if orig_packet_name == 'LATEST'
+          # TODO: Do we need to lookup ALL the possible packets for this item?
+          # We can have a large cache_timeout of 1 because all we're trying to do is lookup a packet
+          packet_name = CvtModel.determine_latest_packet_for_item(target_name, item_name, cache_timeout: 1, scope: scope)
+        end
+        authorize(permission: 'tlm', target_name: target_name, packet_name: packet_name, scope: scope, token: token)
+        begin
+          item = TargetModel.packet_item(target_name, packet_name, item_name, scope: scope)
+          if Packet::RESERVED_ITEM_NAMES.include?(item_name)
+            value_type = 'RAW' # Must request the raw value when dealing with the reserved items
+          end
+
+          # QuestDB 9.0.0 only supports DOUBLE arrays: https://questdb.com/docs/concept/array/
+          if item['array_size']
+            # TODO: This needs work ... we're JSON encoding non numeric array values
+            if item['data_type'] == 'STRING' or item['data_type'] == 'BLOCK'
+              results << nil
+              next
+            end
+            value_type = 'RAW'
+          end
+
+          case value_type
+          when 'WITH_UNITS'
+            if item['units']
+              results << [target_name, orig_packet_name, item_name, 'WITH_UNITS'].join('__')
+            elsif item['format_string']
+              results << [target_name, orig_packet_name, item_name, 'FORMATTED'].join('__')
+            # This logic must match the logic in Packet#decom
+            elsif item['states'] or (item['read_conversion'] and item['data_type'] != 'DERIVED')
+              results << [target_name, orig_packet_name, item_name, 'CONVERTED'].join('__')
+            else
+              results << [target_name, orig_packet_name, item_name, 'RAW'].join('__')
+            end
+          when 'FORMATTED'
+            if item['format_string']
+              results << [target_name, orig_packet_name, item_name, 'FORMATTED'].join('__')
+            # This logic must match the logic in Packet#decom
+            elsif item['states'] or (item['read_conversion'] and item['data_type'] != 'DERIVED')
+              results << [target_name, orig_packet_name, item_name, 'CONVERTED'].join('__')
+            else
+              results << [target_name, orig_packet_name, item_name, 'RAW'].join('__')
+            end
+          when 'CONVERTED'
+            # This logic must match the logic in Packet#decom
+            if item['states'] or (item['read_conversion'] and item['data_type'] != 'DERIVED')
+              results << [target_name, orig_packet_name, item_name, 'CONVERTED'].join('__')
+            else
+              results << [target_name, orig_packet_name, item_name, 'RAW'].join('__')
+            end
+          else # RAW or unknown
+            results << [target_name, orig_packet_name, item_name, 'RAW'].join('__')
+          end
+
+          # Tack on __LIMITS to notify that we have an available limits value
+          if item['limits']['DEFAULT']
+            results[-1] += '__LIMITS'
+          end
+        rescue RuntimeError => e
+          results << nil
+        end
+      end
+      results
+    end
+
     # Returns all the item values (along with their limits state). The items
     # can be from any target and packet and thus must be fully qualified with
     # their target and packet names.
@@ -264,26 +340,32 @@ module OpenC3
     # @return [Array<Object, Symbol>]
     #   Array consisting of the item value and limits state
     #   given as symbols such as :RED, :YELLOW, :STALE
-    def get_tlm_values(items, stale_time: 30, cache_timeout: nil, manual: false, scope: $openc3_scope, token: $openc3_token)
-      if !items.is_a?(Array) || !items[0].is_a?(String)
+    def get_tlm_values(items, stale_time: 30, cache_timeout: nil, manual: false, start_time: nil, end_time: nil, scope: $openc3_scope, token: $openc3_token)
+      if !items.is_a?(Array)
         raise ArgumentError, "items must be array of strings: ['TGT__PKT__ITEM__TYPE', ...]"
       end
       packets = []
       cvt_items = []
       items.each_with_index do |item, index|
-        item_upcase = item.to_s.upcase
-        target_name, packet_name, item_name, value_type = item_upcase.split('__')
-        raise ArgumentError, "items must be formatted as TGT__PKT__ITEM__TYPE" if target_name.nil? || packet_name.nil? || item_name.nil? || value_type.nil?
-        packet_name = CvtModel.determine_latest_packet_for_item(target_name, item_name, cache_timeout: cache_timeout, scope: scope) if packet_name == 'LATEST'
-        # Change packet_name in case of LATEST and ensure upcase
-        cvt_items[index] = [target_name, packet_name, item_name, value_type]
+        if item.nil?
+          # null items mean that it doesn't exist
+          cvt_items[index] = nil
+        else
+          item_upcase = item.to_s.upcase
+          target_name, packet_name, item_name, value_type, limits = item_upcase.split('__')
+          raise ArgumentError, "items must be formatted as TGT__PKT__ITEM__TYPE" if target_name.nil? || packet_name.nil? || item_name.nil? || value_type.nil?
+          if packet_name == 'LATEST' # Lookup packet_name in case of LATEST
+            packet_name = CvtModel.determine_latest_packet_for_item(target_name, item_name, cache_timeout: cache_timeout, scope: scope)
+          end
+        end
+        cvt_items[index] = [target_name, packet_name, item_name, value_type, limits]
         packets << [target_name, packet_name]
       end
       packets.uniq!
       packets.each do |target_name, packet_name|
         authorize(permission: 'tlm', target_name: target_name, packet_name: packet_name, manual: manual, scope: scope, token: token)
       end
-      CvtModel.get_tlm_values(cvt_items, stale_time: stale_time, cache_timeout: cache_timeout, scope: scope)
+      CvtModel.get_tlm_values(cvt_items, stale_time: stale_time, cache_timeout: cache_timeout, start_time: start_time, end_time: end_time, scope: scope)
     end
 
     # Returns an array of all the telemetry packet hashes
@@ -374,16 +456,16 @@ module OpenC3
         raise ArgumentError, "packets must be nested array: [['TGT','PKT'],...]"
       end
 
-      result = {}
+      results = {}
       packets.each do |target_name, packet_name|
         target_name = target_name.upcase
         packet_name = packet_name.upcase
         authorize(permission: 'tlm', target_name: target_name, packet_name: packet_name, manual: manual, scope: scope, token: token)
         topic = "#{scope}__DECOM__{#{target_name}}__#{packet_name}"
         id, _ = Topic.get_newest_message(topic)
-        result[topic] = id ? id : '0-0'
+        results[topic] = id ? id : '0-0'
       end
-      result.to_a.join(SUBSCRIPTION_DELIMITER)
+      results.to_a.join(SUBSCRIPTION_DELIMITER)
     end
     # Alias the singular as well since that matches COSMOS 4
     alias subscribe_packet subscribe_packets

data/lib/openc3/core_ext/kernel.rb

@@ -14,10 +14,10 @@
 # GNU Affero General Public License for more details.
 
 # Modified by OpenC3, Inc.
-# All changes Copyright 2022, OpenC3, Inc.
+# All changes Copyright 2025, OpenC3, Inc.
 # All Rights Reserved
 #
-# This file may also be used under the terms of a commercial license 
+# This file may also be used under the terms of a commercial license
 # if purchased from OpenC3, Inc.
 
 # OpenC3 specific additions to the Ruby Kernel module
@@ -40,6 +40,6 @@ module Kernel
   # @param start [Integer] The number of stack entries to skip
   # @return [Symbol] The name of the calling method
   def calling_method(start = 1)
-    caller[start][/`([^']*)'/, 1].intern
+    caller[start][/[`']([^']*)'/, 1].intern
   end
 end

data/lib/openc3/logs/log_writer.rb

@@ -319,19 +319,23 @@ module OpenC3
           begin
             @file.close unless @file.closed?
             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 << {}
-            @last_offsets.each do |redis_topic, last_offset|
-              @cleanup_offsets[-1][redis_topic] = last_offset
+            # Only try to moce the file if we've written data to it
+            # This is indicated by the first and last timestamps being set
+            if @first_time and @last_time
+              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 << {}
+              @last_offsets.each do |redis_topic, last_offset|
+                @cleanup_offsets[-1][redis_topic] = last_offset
+              end
+              @cleanup_times << (Time.now + CLEANUP_DELAY)
+              @last_offsets.clear
             end
-            @cleanup_times << (Time.now + CLEANUP_DELAY)
-            @last_offsets.clear
           rescue Exception => e
             Logger.error "Error closing #{@filename} : #{e.formatted}"
           end

data/lib/openc3/microservices/interface_microservice.rb

@@ -298,7 +298,7 @@ module OpenC3
                 @interface.write(command)
 
                 command.obfuscate
-                
+
                 if command.validator and validate
                   begin
                     result, reason = command.validator.post_check(command)
@@ -559,6 +559,19 @@ module OpenC3
           target.interface = new_interface
         end
         @interface = new_interface
+
+        # Update the model
+        if @interface_or_router == 'INTERFACE'
+          interface_model = InterfaceModel.get(name: @interface.name, scope: @scope)
+          # config_params[0] is the filename so set the rest
+          interface_model['config_params'][1..-1] = *params
+          InterfaceModel.set(interface_model, scope: @scope)
+        else
+          router_model = RouterModel.get(name: @interface.name, scope: @scope)
+          # config_params[0] is the filename so set the rest
+          router_model['config_params'][1..-1] = *params
+          RouterModel.set(router_model, scope: @scope)
+        end
       end
 
       @interface.state = 'ATTEMPTING'

data/lib/openc3/microservices/plugin_microservice.rb

@@ -43,8 +43,8 @@ module OpenC3
       # Fortify: Process Control
       # This is dangerous! However, plugins need to be able to run whatever they want.
       # Only admins can install plugins and they need to be vetted for content.
-      # NOTE: In OpenC3 EE each microservice gets its own container so the potential
-      # footprint is much smaller. In OpenSource OpenC3 you're in the same container
+      # NOTE: In Enterprise each microservice gets its own container so the potential
+      # footprint is much smaller. In Core you're in the same container
       # as all the other plugins.
       exec(*@config["cmd"])
     end