openc3 6.4.2 → 6.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f50276d75f7b083b8e4ab9bf5572978eb7b67b8d463d5757b7e5dcc64de861b1
-  data.tar.gz: c7af952c813bf8ca3032443225046ac74dd40d366e42a26e0ab5fd8a13e3de04
+  metadata.gz: 5c28c663c7d3743f9bb095a0818ae486accf2f1bb69f5079ec95788153f3005f
+  data.tar.gz: 64a60dc5bad2e3cdc78953b2dbd49a689d4b91a08e80bf8a2c4668b308a811bf
 SHA512:
-  metadata.gz: e9724e49c5fa0cceffea2b5f3584820542d50a47b5dee4be7e0fafa5af7b6fecf4d152e48b65752ce73f51391219770bc650041ee676d3943eb48efd67f98770
-  data.tar.gz: 8e4429f6a6200454c4d98b1e8b5c881154be0582db9c096329f7c7039a93f7710533dce063d1d562835bfddc094dcc71e6b8ed0661ef2dcdb53ceae0c3412c8d
+  metadata.gz: 88c76af077c0feeec36831656367e9a5c2ff4968d8d567a6d3822f4a7dec1afea33d4921aa6d5941f97c4234a85da68aa7ef7b1767eeb629650a85589f9db673
+  data.tar.gz: 0c548964225e629edff50e0666347eedcc8e6b0d9fb7ab5d134fb0a206e481ba2353568fa6ab99f0fbdfdc6758c62eec7320deeb1c0a37a4448544b2ee26215d

data/bin/openc3cli

@@ -15,7 +15,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
@@ -62,14 +62,7 @@ def print_usage
   puts "  cli help                          # Displays this information"
   puts "  cli rake                          # Runs rake in the local directory"
   puts "  cli irb                           # Runs irb in the local directory"
-  puts "  cli script list /PATH SCOPE       # lists script names filtered by path within scope, 'DEFAULT' if not given"
-  puts "  cli script spawn NAME SCOPE  variable1=value1 variable2=value2  # Starts named script remotely"
-  puts "  cli script run NAME SCOPE variable1=value1 variable2=value2  # Starts named script, monitoring status on console,\
-  by default until error or exit"
-  puts "  cli script init                   # initialize running scripts (Enterprise Only)"
-  puts "    PARAMETERS name-value pairs to form the script's runtime environment"
-  puts "    OPTIONS: --wait 0 seconds to monitor status before detaching from the running script; ie --wait 100"
-  puts "             --disconnect run the script in disconnect mode"
+  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 list <SCOPE>                  # Lists installed plugins, SCOPE is DEFAULT if not given"
@@ -619,86 +612,180 @@ def cli_script_monitor(script_id)
   return ret_code
 end
 
-def cli_script_list(args=[])
-  path = ''
-  if (args[0] && args[0][0] == '/')
-    path = (args.shift)[1..-1]+'/'
+def get_env_from_args(args)
+  # Figure out if there are any optional environment variables
+  # args[0] is the command, args[1] is the script file
+  # args[2..-1] are environment variables specified as NAME=VALUE
+  environ = {}
+  if args.length > 2
+    args[2..-1].each do |arg|
+      name, value = arg.split('=')
+      if name and value
+        environ[name] = value
+      end
+    end
   end
-  scope = args[1]
-  scope ||= 'DEFAULT'
+  return environ
+end
+
+def cli_script_init
   require 'openc3/script'
-  script_list(scope: scope).each do |script_name|
-    puts(script_name) if script_name.start_with?(path)
-  end
+  initialize_offline_access()
   return 0
 end
 
-def cli_script_run(disconnect=false, environment={}, args=[])
-  #  we are limiting the wait for status, not the script run time
-  #  we make 0 mean 'forever'
+def cli_script_list(args, options)
+  require 'openc3/script'
+  puts script_list(scope: options[:scope])
+  return 0
+end
+
+def cli_script_run(args, options)
+  environment = get_env_from_args(args)
+
   ret_code = ERROR_CODE
-  wait_limit = 0
-  if (i = args.index('--wait'))
-    begin
-      args.delete('--wait')
-      # pull out the flag
-      seconds = args[i]
-      wait_limit = Integer(seconds, 10) # only decimal, ignore leading 0
-      args.delete_at(i)
-      # and its value
-    rescue ArgumentError
-      abort("  --wait requires a number of seconds to wait, not [#{seconds}]")
-    end
-  end
-  abort("No script file provided") if args[0].nil?
-  scope = args[1]
-  scope ||= 'DEFAULT'
   require 'openc3/script'
-  id = script_run(args[0], disconnect: disconnect, environment: environment, scope: scope) # could raise
-  $script_interrupt_text = "  Script #{args[0]} still running remotely.\n" # for Ctrl-C
-  if (wait_limit < 1) then
-    ret_code = cli_script_monitor(id)
-  else
-    Timeout::timeout(wait_limit, nil, "--wait #{wait_limit} exceeded") do
+  if (id = script_run(args[1], disconnect: options[:disconnect], environment: environment, scope: options[:scope]))
+    puts id
+    $script_interrupt_text = "  Script #{args[1]} still running remotely.\n" # for Ctrl-C
+    if (options[:wait] < 1) then
       ret_code = cli_script_monitor(id)
-    rescue Timeout::ExitException, Timeout::Error => e
-      # Timeout exceptions are also raised by the Websocket API, so we check
-      if e.message =~ /^--wait /
-        puts e.message + ", detaching from running script #{args[0]}"
-      else
-        raise
+    else
+      Timeout::timeout(options[:wait], nil, "--wait #{options[:wait]} exceeded") do
+        ret_code = cli_script_monitor(id)
+      rescue Timeout::ExitException, Timeout::Error => e
+        # Timeout exceptions are also raised by the Websocket API, so we check
+        if e.message =~ /^--wait /
+          puts e.message + ", detaching from running script #{args[1]}"
+        else
+          raise
+        end
       end
     end
   end
   return ret_code
+rescue => e
+  puts "Error running script: #{e.message}"
+  puts "Have you called 'script init'?"
+  puts e.backtrace
+  return ERROR_CODE
 end
 
-def cli_script_spawn(disconnect=false, environment={}, args=[])
+def cli_script_spawn(args, options)
+  environment = get_env_from_args(args)
+
   ret_code = ERROR_CODE
-  if (args.index('--wait'))
-    abort("Did you mean \"script run --wait <seconds> [...]\"?")
-  end
-  abort("No script file provided") if args[0].nil?
-  # heaven help you if you left out the script name
-  scope = args[1]
-  scope ||= 'DEFAULT'
   require 'openc3/script'
-  if (id = script_run(args[0], disconnect: disconnect, environment: environment, scope: scope))
+  if (id = script_run(args[1], disconnect: options[:disconnect], environment: environment, scope: options[:scope]))
     puts id
     ret_code = 0
   end
   return ret_code
+rescue => e
+  puts "Error running script: #{e.message}"
+  puts "Have you called 'script init'?"
+  puts e.backtrace
+  return ERROR_CODE
 end
 
-def cli_script_init
+def cli_script_running(args, options)
+  ret_code = ERROR_CODE
   require 'openc3/script'
-  initialize_offline_access()
+  if args[1]
+    limit = args[1].to_i
+  else
+    limit = 100
+  end
+  if args[2]
+    offset = args[2].to_i
+  else
+    offset = 0
+  end
+  if (list = running_script_list(limit: limit, offset: offset, scope: options[:scope]))
+    if options[:verbose]
+      pp list
+    else
+      printf("%-5s %-20s %-30s %-22s %-10s\n", "ID", "User", "Filename", "Start Time", "State")
+      list.each do |hash|
+        printf("%-5s %-20s %-30s %-22s %-10s\n", hash['name'], hash['user_full_name'], hash['filename'], hash['start_time'], hash['state'])
+      end
+    end
+    ret_code = 0
+  end
+  return ret_code
+rescue => e
+  puts "Error getting script status for #{args[1]}: #{e.message}"
+  puts "Have you called 'script init'?"
+  puts e.backtrace
+  return ERROR_CODE
+end
+
+def cli_script_status(args, options)
+  ret_code = ERROR_CODE
+  require 'openc3/script'
+  if (hash = script_get(args[1], scope: options[:scope]))
+    if options[:verbose]
+      pp hash
+    else
+      printf("%-5s %-20s %-30s %-22s %-10s\n", "ID", "User", "Filename", "Start Time", "State")
+      printf("%-5s %-20s %-30s %-22s %-10s\n", hash['name'], hash['user_full_name'], hash['filename'], hash['start_time'], hash['state'])
+    end
+    ret_code = 0
+  end
+  return ret_code
+rescue => e
+  puts "Error getting script status for #{args[1]}: #{e.message}"
+  puts "Have you called 'script init'?"
+  puts e.backtrace
+  return ERROR_CODE
+end
+
+def cli_script_stop(args, options)
+  require 'openc3/script'
+  running_script_stop(args[1], scope: options[:scope])
   return 0
+rescue => e
+  puts "Error stopping script #{args[1]}: #{e.message}"
+  puts "Have you called 'script init'?"
+  puts e.backtrace
+  return ERROR_CODE
 end
 
-## cli_script(args) turns an ARGV of [spawn|run] <--wait 123...> <--disconnect> SCRIPT <scope> <ENV_A=1 ENV_B=2 ...>
-#                   into function calls and tidied parameters to remote-control a script via RunningScriptWebSocketApi
 def cli_script(args=[])
+  options = {scope: 'DEFAULT', disconnect: false, wait: 0, verbose: false}
+  option_parser = OptionParser.new do |opts|
+    opts.banner = "Usage: script --scope SCOPE [init | list | spawn | run]\n" +
+      "  init                               Initialize running scripts (Enterprise Only)\n" +
+      "  list                               List scripts in the specified scope\n" +
+      "  spawn SCRIPT [ENV=VALUE]           Spawn SCRIPT in the specified scope with optional env vars and return script ID\n" +
+      "  run SCRIPT [ENV=VALUE]             Run SCRIPT in the specified scope with optional env vars and print script output\n" +
+      "  running [LIMIT] [OFFSET]           Get a list of all running scripts (limit 100 by default). Use LIMIT and OFFSET to get large batches.\n" +
+      "  status SCRIPT_ID                   Get status for the running script given by SCRIPT_ID\n" +
+      "  stop SCRIPT_ID                     Stop the running script given by SCRIPT_ID\n"
+    opts.on("-h", "--help", "Show this message") do
+      puts opts
+      exit
+    end
+    opts.on("--scope SCOPE", "Run with specified scope (default = DEFAULT)") do |arg|
+      options[:scope] = arg
+    end
+    opts.on("-d", "--disconnect", "Run a script in disconnect mode (default = false)") do |arg|
+      options[:disconnect] = arg
+    end
+    opts.on("-w SECONDS", "--wait SECONDS", "*run only* - wait for the specified number of seconds before aborting script monitoring") do |arg|
+      options[:wait] = Integer(arg)
+    end
+    opts.on("-v", "--verbose", "*status only* - output ALL status information") do |arg|
+      options[:verbose] = arg
+    end
+  end
+
+  begin
+    option_parser.parse!(args)
+  rescue
+    abort(option_parser.to_s)
+  end
+
   ret_code = ERROR_CODE
   check_environment()
   # Double check for the OPENC3_API_PASSWORD because it is absolutely required
@@ -706,38 +793,30 @@ def cli_script(args=[])
   if ENV['OPENC3_API_PASSWORD'].nil? or ENV['OPENC3_API_PASSWORD'].empty?
     abort "OPENC3_API_PASSWORD environment variable is required for cli script"
   end
-  command = args.shift
-  # pull out the disconnect flag
-  discon = args.delete('--disconnect')
-  discon = (discon.is_a? String) ? true : false
-  environ = {}
-  args.each do |arg|
-    name, value = arg.split('=')
-    if name and value
-    # add env[k]=v ; pull out "k=v"
-      environ[name] = value
-      args.delete(arg)
-    end
-  end
+
+  # The script command is the first parameter and it is required
+  command = args[0]
+  abort(option_parser.to_s) unless command
+
   case command
-  # for list
-  # args[] should now be ["/<path>", "<scope>"]
-  #                   or ["/<path>"]
-  #                   or ["<scope>"]
-  #                   or []
+  when 'init'
+    ret_code = cli_script_init()
   when 'list'
-    ret_code = cli_script_list(args)
-  # for spawn or run
-  # args[] should now be ["--wait 100", "script_name", "<scope>"]
-  #                   or ["--wait 100", "script_name"]
-  #                   or ["script_name", "<scope>"]
-  #                   or ["script_name"]
+    ret_code = cli_script_list(args, options)
   when 'spawn'
-    ret_code = cli_script_spawn(discon, environ, args)
+    abort(option_parser.to_s) unless args[1] # script file is required
+    ret_code = cli_script_spawn(args, options)
   when 'run'
-    ret_code = cli_script_run(discon, environ, args)
-  when 'init'
-    ret_code = cli_script_init()
+    abort(option_parser.to_s) unless args[1] # script file is required
+    ret_code = cli_script_run(args, options)
+  when 'running'
+    ret_code = cli_script_running(args, options)
+  when 'status'
+    abort(option_parser.to_s) unless args[1] # script ID is required
+    ret_code = cli_script_status(args, options)
+  when 'stop'
+    abort(option_parser.to_s) unless args[1] # script ID is required
+    ret_code = cli_script_stop(args, options)
   else
     abort 'openc3cli internal error: parsing arguments'
   end
@@ -754,13 +833,7 @@ if not ARGV[0].nil? # argument(s) given
     IRB.start
 
   when 'script'
-    case ARGV[1]
-    when 'list', 'run', 'spawn', 'init'
-      cli_script(ARGV[1..-1])
-    else
-      # invalid actions, misplaced and malformed leading options and 'help' come here
-      abort("cli script <action> must be one of #{CLI_SCRIPT_ACTIONS}, not [#{ARGV[1]}]")
-    end
+    cli_script(ARGV[1..-1])
 
   when 'rake'
     if File.exist?('Rakefile')
@@ -790,6 +863,8 @@ if not ARGV[0].nil? # argument(s) given
     cli_pkg_uninstall(ARGV[1], scope: ARGV[2])
 
   when 'generate'
+    # To test against a local copy call this file from the root cosmos directory like this:
+    # ruby -Iopenc3/lib openc3/bin/openc3cli generate ...
     OpenC3::CliGenerator.generate(ARGV[1..-1])
 
   when 'rubysloc'

data/data/config/_graph_params.yaml

@@ -1,17 +1,17 @@
 ---
-- name: Target name
+- name: Target Name
   required: true
   description: The target name
   values: .+
-- name: Packet name
+- name: Packet Name
   required: true
   description: The packet name
   values: .+
-- name: Item name
+- name: Item Name
   required: true
   description: The item name
   values: .+
-- name: Value type
+- name: Value Type
   required: false
   description: The type of the value to display. Default is CONVERTED.
   values: <%= %w(RAW CONVERTED) %>

data/data/config/conversions.yaml

@@ -118,6 +118,7 @@ PROCESSOR_CONVERSION:
   description: |
     This command reads a value from a processor. The value is read from the
     processor's available values. The processor must be defined in the target's configuration.
+    See the [Processor](/docs/configuration/processors) documentation for more information.
   parameters:
     - name: Processor Name
       required: true
@@ -132,7 +133,7 @@ PROCESSOR_CONVERSION:
     ITEM TEMP1HIGH 0 0 DERIVED "High-water mark for TEMP1"
       READ_CONVERSION processor_conversion.rb TEMP1WATER HIGH_WATER
   python_example: |
-    PROCESSOR TEMP1WATER watermark_processor.rb TEMP1
+    PROCESSOR TEMP1WATER openc3/conversions/watermark_processor.py TEMP1
     ITEM TEMP1HIGH 0 0 DERIVED "High-water mark for TEMP1"
       READ_CONVERSION openc3/conversions/processor_conversion.py TEMP1WATER HIGH_WATER
 RECEIVED_COUNT_CONVERSION:

data/data/config/item_modifiers.yaml

@@ -162,6 +162,7 @@ LIMITS:
       values: .+
 LIMITS_RESPONSE:
   summary: Defines a response class that is called when the limits state of the current item changes
+  description: See the [Limits Response](/docs/configuration/limits-response) documentation for more information.
   ruby_example: LIMITS_RESPONSE example_limits_response.rb 10
   python_example: LIMITS_RESPONSE example_limits_response.py 10
   parameters:

data/data/config/plugins.yaml

@@ -88,4 +88,17 @@ WIDGET:
         - name: Regex
           required: false
           description: Regex to match against filenames. If match, then no ERB processing
-          values: .+
+          values: .+
+SCRIPT_ENGINE:
+  summary: Define a script engine to add language support to Script Runner
+  example: SCRIPT_ENGINE .print print_script_engine.py
+  description: Defines a script engine to add language support to Script Runner
+  parameters:
+    - name: Extension
+      description: Extension that will use this script engine
+      required: true
+      values: .+
+    - name: Script Engine Filename
+      description: Filename that implements the script engine. Should be in top level lib folder in plugin.
+      required: true
+      values: .+

data/data/config/processors.yaml

@@ -0,0 +1,51 @@
+---
+WATERMARK_PROCESSOR:
+  summary: Calculates high and low values for a given item
+  description: |
+    Stores high and low values for a given item as HIGH_WATER and LOW_WATER.
+    Values are retrieved using a [ProcessorConversion](/docs/configuration/conversions#processor_conversion).
+  parameters:
+    - name: Item Name
+      description: The item name to calculate high and low values for
+      required: true
+      values: .+
+    - name: Value Type
+      required: false
+      description: The type of the value to display. Default is CONVERTED.
+      values: <%= %w(RAW CONVERTED) %>
+  ruby_example: |
+    PROCESSOR TEMP1WATER watermark_processor.rb TEMP1
+    ITEM TEMP1HIGH 0 0 DERIVED "High-water mark for TEMP1"
+      READ_CONVERSION processor_conversion.rb TEMP1WATER HIGH_WATER
+  python_example: |
+    PROCESSOR TEMP1WATER openc3/conversions/watermark_processor.py TEMP1
+    ITEM TEMP1HIGH 0 0 DERIVED "High-water mark for TEMP1"
+      READ_CONVERSION openc3/conversions/processor_conversion.py TEMP1WATER HIGH_WATER
+STATISTICS_PROCESSOR:
+  summary: Calculates statistics for a given item
+  description: |
+    This processor calculates statistics for a given item as MIN, MAX, MEAN, and STDDEV
+    over a specified number of samples. Values are retrieved using a [ProcessorConversion](/docs/configuration/conversions#processor_conversion).
+  parameters:
+    - name: Item Name
+      description: The item name to calculate statistics for
+      required: true
+      values: .+
+    - name: Samples to Average
+      required: true
+      description: The number of samples to average for statistics
+      values: .*
+    - name: Value Type
+      required: false
+      description: The type of the value to display. Default is CONVERTED.
+      values: <%= %w(RAW CONVERTED) %>
+  ruby_example: PROCESSOR TEMP1STAT statistics_processor.rb TEMP1 100
+  python_example: PROCESSOR TEMP1STAT openc3/processors/statistics_processor.rb TEMP1 100
+  ruby_example: |
+    PROCESSOR TEMP1STAT statistics_processor.rb TEMP1 100
+    ITEM TEMP1STDDEV 0 0 DERIVED "Stddev of most recent 100 samples for TEMP1"
+      READ_CONVERSION processor_conversion.rb TEMP1STAT STDDEV FLOAT 64
+  python_example: |
+    PROCESSOR TEMP1STAT openc3/conversions/statistics_processor.py TEMP1 100
+    ITEM TEMP1STDDEV 0 0 DERIVED "Stddev of most recent 100 samples for TEMP1"
+      READ_CONVERSION openc3/conversions/processor_conversion.py TEMP1STAT STDDEV FLOAT 64

data/data/config/telemetry_modifiers.yaml

@@ -135,6 +135,7 @@ META:
       values: .*
 PROCESSOR:
   summary: Defines a processor class that executes code every time a packet is received
+  description: See the [Processor](/docs/configuration/processors) documentation for more information.
   ruby_example: PROCESSOR TEMP1HIGH watermark_processor.rb TEMP1
   python_example: PROCESSOR TEMP1HIGH watermark_processor.py TEMP1
   parameters:

data/lib/openc3/api/tlm_api.rb

@@ -114,8 +114,8 @@ module OpenC3
     #
     # @param args [String|Array<String>] See the description for calling style
     # @param type [Symbol] Telemetry type, :RAW, :CONVERTED (default), :FORMATTED, or :WITH_UNITS
-    def set_tlm(*args, type: :CONVERTED, manual: false, scope: $openc3_scope, token: $openc3_token)
-      target_name, packet_name, item_name, value = _set_tlm_process_args(args, __method__, scope: scope)
+    def set_tlm(*args, type: :CONVERTED, manual: false, cache_timeout: nil, scope: $openc3_scope, token: $openc3_token)
+      target_name, packet_name, item_name, value = _set_tlm_process_args(args, __method__, cache_timeout: cache_timeout, scope: scope)
       authorize(permission: 'tlm_set', target_name: target_name, packet_name: packet_name, manual: manual, scope: scope, token: token)
       CvtModel.set_item(target_name, packet_name, item_name, value, type: type.intern, scope: scope)
     end
@@ -528,7 +528,7 @@ module OpenC3
       return [target_name, packet_name, item_name]
     end
 
-    def _set_tlm_process_args(args, method_name, scope: $openc3_scope, token: $openc3_token)
+    def _set_tlm_process_args(args, method_name, cache_timeout: nil, scope: $openc3_scope, token: $openc3_token)
       case args.length
       when 1
         target_name, packet_name, item_name, value = extract_fields_from_set_tlm_text(args[0])
@@ -544,8 +544,13 @@ module OpenC3
       target_name = target_name.upcase
       packet_name = packet_name.upcase
       item_name = item_name.upcase
-      # Determine if this item exists, it will raise appropriate errors if not
-      TargetModel.packet_item(target_name, packet_name, item_name, scope: scope)
+
+      if packet_name == 'LATEST'
+        packet_name = CvtModel.determine_latest_packet_for_item(target_name, item_name, cache_timeout: cache_timeout, scope: scope)
+      else
+        # Determine if this item exists, it will raise appropriate errors if not
+        TargetModel.packet_item(target_name, packet_name, item_name, scope: scope)
+      end
 
       return [target_name, packet_name, item_name, value]
     end

data/lib/openc3/microservices/interface_microservice.rb

@@ -128,15 +128,21 @@ module OpenC3
             end
             if msg_hash['raw']
               if @interface.connected?
-                @logger.info "#{@interface.name}: Write raw"
-                # A raw interface write results in an UNKNOWN packet
-                command = System.commands.packet('UNKNOWN', 'UNKNOWN')
-                command.received_count = TargetModel.increment_command_count('UNKNOWN', 'UNKNOWN', 1, scope: @scope)
-                command = command.clone
-                command.buffer = msg_hash['raw']
-                command.received_time = Time.now
-                CommandTopic.write_packet(command, scope: @scope)
-                @interface.write_raw(msg_hash['raw'])
+                begin
+                  @logger.info "#{@interface.name}: Write raw"
+                  # A raw interface write results in an UNKNOWN packet
+                  command = System.commands.packet('UNKNOWN', 'UNKNOWN')
+                  command.received_count = TargetModel.increment_command_count('UNKNOWN', 'UNKNOWN', 1, scope: @scope)
+                  command = command.clone
+                  command.buffer = msg_hash['raw']
+                  command.received_time = Time.now
+                  CommandTopic.write_packet(command, scope: @scope)
+                  @logger.info("write_raw sent #{msg_hash['raw'].length} bytes to #{@interface.name}", scope: @scope)
+                  @interface.write_raw(msg_hash['raw'])
+                rescue => e
+                  @logger.error "#{@interface.name}: write_raw: #{e.formatted}"
+                  next e.message
+                end
                 next 'SUCCESS'
               else
                 next "Interface not connected: #{@interface.name}"

data/lib/openc3/models/plugin_model.rb

@@ -31,6 +31,7 @@ require 'openc3/models/gem_model'
 require 'openc3/models/target_model'
 require 'openc3/models/interface_model'
 require 'openc3/models/router_model'
+require 'openc3/models/script_engine_model'
 require 'openc3/models/tool_model'
 require 'openc3/models/widget_model'
 require 'openc3/models/microservice_model'
@@ -249,7 +250,7 @@ module OpenC3
               case keyword
               when 'VARIABLE', 'NEEDS_DEPENDENCIES'
                 # Ignore during phase 2
-              when 'TARGET', 'INTERFACE', 'ROUTER', 'MICROSERVICE', 'TOOL', 'WIDGET'
+              when 'TARGET', 'INTERFACE', 'ROUTER', 'MICROSERVICE', 'TOOL', 'WIDGET', 'SCRIPT_ENGINE'
                 begin
                   if current_model
                     current_model.create unless validate_only
@@ -260,7 +261,7 @@ module OpenC3
                 # Otherwise we're stuck constantly iterating on the last model
                 ensure
                   current_model = nil
-                  current_model = OpenC3.const_get((keyword.capitalize + 'Model').intern).handle_config(parser,
+                  current_model = OpenC3.const_get((keyword.split('_').collect(&:capitalize).join + 'Model').intern).handle_config(parser,
                     keyword, params, plugin: plugin_model.name, needs_dependencies: needs_dependencies, scope: scope)
                 end
               else
@@ -339,7 +340,7 @@ module OpenC3
       sleep 15 if microservice_count > 0 # Cycle time 5s times 2 plus 5s wait for soft stop and then hard stop
       # Remove all the other models now that the processes have stopped
       # Save TargetModel for last as it has the most to cleanup
-      [InterfaceModel, RouterModel, ToolModel, WidgetModel, TargetModel].each do |model|
+      [InterfaceModel, RouterModel, ToolModel, WidgetModel, TargetModel, ScriptEngineModel].each do |model|
         model.find_all_by_plugin(plugin: @name, scope: @scope).each do |_name, model_instance|
           begin
             model_instance.destroy
@@ -369,7 +370,7 @@ module OpenC3
     ensure
       # Double check everything is gone
       found = []
-      [MicroserviceModel, InterfaceModel, RouterModel, ToolModel, WidgetModel, TargetModel].each do |model|
+      [MicroserviceModel, InterfaceModel, RouterModel, ToolModel, WidgetModel, TargetModel, ScriptEngineModel].each do |model|
         model.find_all_by_plugin(plugin: @name, scope: @scope).each do |_name, model_instance|
           found << model_instance
         end