openc3 7.0.0.pre.rc3 → 7.0.1

data/lib/openc3/models/reaction_model.rb

@@ -32,10 +32,12 @@ module OpenC3
     ACTION_TYPES = [SCRIPT_REACTION, COMMAND_REACTION, NOTIFY_REACTION]
 
     def self.create_unique_name(scope:)
-      reaction_names = self.names(scope: scope) # comes back sorted
+      reaction_names = self.names(scope: scope)
       num = 1 # Users count with 1
-      if reaction_names[-1]
-        num = reaction_names[-1][5..-1].to_i + 1
+      unless reaction_names.empty?
+        # Extract numeric suffixes and find the max to avoid lexicographic sort issues
+        max_num = reaction_names.map { |name| name[5..-1].to_i }.max
+        num = max_num + 1
       end
       return "REACT#{num}"
     end
@@ -77,7 +79,7 @@ module OpenC3
     end
 
     attr_reader :name, :scope, :snooze, :triggers, :actions, :enabled, :trigger_level, :snoozed_until
-    attr_accessor :username, :shard
+    attr_accessor :username, :shard, :label
 
     def initialize(
       name:,
@@ -90,6 +92,7 @@ module OpenC3
       snoozed_until: nil,
       username: nil,
       shard: 0,
+      label: nil,
       updated_at: nil
     )
       super("#{scope}#{PRIMARY_KEY}", name: name, scope: scope)
@@ -102,6 +105,7 @@ module OpenC3
       @triggers = validate_triggers(triggers)
       @username = username
       @shard = shard.to_i # to_i to handle nil
+      @label = label
       @updated_at = updated_at
     end
 
@@ -177,28 +181,40 @@ module OpenC3
       return actions
     end
 
-    def verify_triggers
+    # Validate that all triggers exist, but do not persist dependent changes yet.
+    # Returns the list of trigger models that need updating.
+    def validate_triggers_exist
       if @triggers.empty?
         raise ReactionInputError.new "reaction must contain at least one valid trigger: #{@triggers}"
       end
 
+      models_to_update = []
       @triggers.each do | trigger |
         model = TriggerModel.get(name: trigger['name'], group: trigger['group'], scope: @scope)
         if model.nil?
           raise ReactionInputError.new "failed to find trigger: #{trigger}"
         end
-        model.update_dependents(dependent: @name)
-        model.update()
+        unless model.dependents.include?(@name)
+          model.update_dependents(dependent: @name)
+          models_to_update << model
+        end
       end
+      models_to_update
+    end
+
+    # Persist dependent changes to trigger models
+    def commit_trigger_dependents(models)
+      models.each { |model| model.update() }
     end
 
     def create
       unless Store.hget(@primary_key, @name).nil?
         raise ReactionInputError.new "existing reaction found: #{@name}"
       end
-      verify_triggers()
+      models = validate_triggers_exist()
       @updated_at = Time.now.to_nsec_from_epoch
       Store.hset(@primary_key, @name, JSON.generate(as_json, allow_nan: true))
+      commit_trigger_dependents(models)
       notify(kind: 'created')
     end
 
@@ -222,9 +238,10 @@ module OpenC3
         end
       end
 
-      verify_triggers()
+      models = validate_triggers_exist()
       @updated_at = Time.now.to_nsec_from_epoch
       Store.hset(@primary_key, @name, JSON.generate(as_json, allow_nan: true))
+      commit_trigger_dependents(models)
       # No notification as this is only called via reaction_controller which already notifies
     end
 
@@ -281,6 +298,7 @@ module OpenC3
         'actions' => @actions,
         'username' => @username,
         'shard' => @shard,
+        'label' => @label,
         'updated_at' => @updated_at
       }
     end

data/lib/openc3/models/script_engine_model.rb

@@ -13,7 +13,7 @@
 
 require 'openc3/top_level'
 require 'openc3/models/model'
-require 'openc3/models/scope_model'
+# require 'openc3/models/scope_model' # Circular require
 require 'openc3/utilities/bucket'
 require 'openc3/utilities/bucket_utilities'
 

data/lib/openc3/models/target_model.rb

@@ -164,36 +164,41 @@ module OpenC3
       if target_name.include?('..') || target_name.include?('/') || target_name.include?('\\')
         raise ArgumentError, "Invalid target_name: #{target_name.inspect}"
       end
-      tmp_dir = Dir.mktmpdir
-      zip_filename = File.join(tmp_dir, "#{target_name}.zip")
-      Zip.continue_on_exists_proc = true
-      zip = Zip::File.open(zip_filename, create: true)
+      temp_dir = Dir.mktmpdir
+      begin
+        zip_filename = OpenC3.sanitize_path(File.join(temp_dir, "#{target_name}.zip"))
+        Zip.continue_on_exists_proc = true
+        zip = Zip::File.open(zip_filename, create: true)
 
-      if ENV['OPENC3_LOCAL_MODE']
-        OpenC3::LocalMode.zip_target(target_name, zip, scope: scope)
-      else
-        bucket = Bucket.getClient()
-        # The trailing slash is important!
-        prefix = "#{scope}/targets_modified/#{target_name}/"
-        resp = bucket.list_objects(
-          bucket: ENV['OPENC3_CONFIG_BUCKET'],
-          prefix: prefix,
-        )
-        resp.each do |item|
-          # item.key looks like DEFAULT/targets_modified/INST/screens/blah.txt
-          base_path = item.key.sub(prefix, '') # remove prefix
-          local_path = File.join(tmp_dir, base_path)
-          # Ensure dir structure exists, get_object fails if not
-          FileUtils.mkdir_p(File.dirname(local_path))
-          bucket.get_object(bucket: ENV['OPENC3_CONFIG_BUCKET'], key: item.key, path: local_path)
-          zip.add(base_path, local_path)
+        if ENV['OPENC3_LOCAL_MODE']
+          OpenC3::LocalMode.zip_target(target_name, zip, scope: scope)
+        else
+          bucket = Bucket.getClient()
+          # The trailing slash is important!
+          prefix = "#{scope}/targets_modified/#{target_name}/"
+          resp = bucket.list_objects(
+            bucket: ENV['OPENC3_CONFIG_BUCKET'],
+            prefix: prefix,
+          )
+          resp.each do |item|
+            # item.key looks like DEFAULT/targets_modified/INST/screens/blah.txt
+            base_path = item.key.sub(prefix, '') # remove prefix
+            local_path = File.join(temp_dir, base_path)
+            # Ensure dir structure exists, get_object fails if not
+            FileUtils.mkdir_p(File.dirname(local_path))
+            bucket.get_object(bucket: ENV['OPENC3_CONFIG_BUCKET'], key: item.key, path: local_path)
+            zip.add(base_path, local_path)
+          end
         end
+        zip.close
+
+        result = OpenStruct.new
+        result.filename = File.basename(zip_filename)
+        result.contents = File.read(zip_filename, mode: 'rb')
+      ensure
+        FileUtils.remove_entry_secure(temp_dir, true)
       end
-      zip.close
 
-      result = OpenStruct.new
-      result.filename = File.basename(zip_filename)
-      result.contents = File.read(zip_filename, mode: 'rb')
       return result
     end
 
@@ -393,14 +398,7 @@ module OpenC3
       shard: 0,
       scope:
     )
-      super("#{scope}__#{PRIMARY_KEY}", name: name, plugin: plugin, updated_at: updated_at,
-        cmd_buffer_depth: cmd_buffer_depth, cmd_log_cycle_time: cmd_log_cycle_time, cmd_log_cycle_size: cmd_log_cycle_size,
-        cmd_log_retain_time: cmd_log_retain_time,
-        tlm_buffer_depth: tlm_buffer_depth, tlm_log_cycle_time: tlm_log_cycle_time, tlm_log_cycle_size: tlm_log_cycle_size,
-        tlm_log_retain_time: tlm_log_retain_time,
-        cmd_decom_retain_time: cmd_decom_retain_time, tlm_decom_retain_time: tlm_decom_retain_time,
-        cleanup_poll_time: cleanup_poll_time, needs_dependencies: needs_dependencies, target_microservices: target_microservices,
-        scope: scope)
+      super("#{scope}__#{PRIMARY_KEY}", name: name, plugin: plugin, updated_at: updated_at, scope: scope)
       @folder_name = folder_name
       @requires = requires
       @ignored_parameters = ignored_parameters

data/lib/openc3/models/tool_model.rb

@@ -16,7 +16,7 @@
 # if purchased from OpenC3, Inc.
 
 require 'openc3/models/model'
-require 'openc3/models/scope_model'
+# require 'openc3/models/scope_model' # Circular require
 require 'openc3/utilities/bucket'
 require 'openc3/utilities/bucket_utilities'
 require 'rack'
@@ -179,7 +179,7 @@ module OpenC3
         end
       end
 
-      if @url and !@url.start_with?('/') and @url !~ URI::regexp
+      if @url and !@url.start_with?('/') and @url !~ URI::RFC2396_PARSER.make_regexp
         raise "URL must be a full URL (http://domain.com/path) or a relative path (/path)"
       end
 
@@ -250,9 +250,22 @@ module OpenC3
 
       variables["tool_name"] = @name
       start_path = "/tools/#{@folder_name}/"
-      Dir.glob(gem_path + start_path + "**/*") do |filename|
-        next if filename == '.' or filename == '..' or File.directory?(filename)
-
+      # Sort files so dependencies are uploaded before dependents:
+      # fonts first, then CSS, then index.html last (it triggers all other loads)
+      filenames = Dir.glob(gem_path + start_path + "**/*")
+      filenames.reject! { |f| f == '.' or f == '..' or File.directory?(f) }
+      filenames.sort_by! do |filename|
+        if filename.include?('/fonts/')
+          [0, filename]
+        elsif filename.include?('/css/')
+          [1, filename]
+        elsif File.basename(filename) == 'index.html'
+          [3, filename]
+        else
+          [2, filename]
+        end
+      end
+      filenames.each do |filename|
         key = filename.split(gem_path + '/tools/')[-1]
         extension = filename.split('.')[-1]
         content_type = Rack::Mime.mime_type(".#{extension}")

data/lib/openc3/models/trigger_model.rb

@@ -19,7 +19,7 @@ require 'openc3/models/model'
 require 'openc3/models/microservice_model'
 require 'openc3/models/target_model'
 require 'openc3/models/trigger_group_model'
-require 'openc3/models/reaction_model'
+# require 'openc3/models/reaction_model' # Remove circular require
 require 'openc3/topics/autonomic_topic'
 
 module OpenC3
@@ -52,10 +52,12 @@ module OpenC3
     TRIGGER_TYPE = 'trigger'.freeze
 
     def self.create_unique_name(group:, scope:)
-      trigger_names = self.names(group: group, scope: scope) # comes back sorted
+      trigger_names = self.names(group: group, scope: scope)
       num = 1 # Users count with 1
-      if trigger_names[-1]
-        num = trigger_names[-1][4..-1].to_i + 1
+      unless trigger_names.empty?
+        # Extract numeric suffixes and find the max to avoid lexicographic sort issues
+        max_num = trigger_names.map { |name| name[4..-1].to_i }.max
+        num = max_num + 1
       end
       return "TRIG#{num}"
     end
@@ -97,6 +99,7 @@ module OpenC3
     end
 
     attr_reader :name, :scope, :state, :group, :enabled, :left, :operator, :right, :dependents, :roots
+    attr_accessor :label
 
     def initialize(
       name:,
@@ -108,6 +111,7 @@ module OpenC3
       state: false,
       enabled: true,
       dependents: nil,
+      label: nil,
       updated_at: nil
     )
       super("#{scope}#{PRIMARY_KEY}#{group}", name: name, scope: scope)
@@ -119,6 +123,7 @@ module OpenC3
       @operator = validate_operator(operator: operator)
       @right = validate_operand(operand: right, right: true)
       @dependents = dependents
+      @label = label
       @updated_at = updated_at
       selected_group = TriggerGroupModel.get(name: @group, scope: @scope)
       if selected_group.nil?
@@ -175,8 +180,11 @@ module OpenC3
       end
     end
 
-    def verify_triggers
+    # Validate that all root triggers exist, but do not persist dependent changes yet.
+    # Returns the list of root trigger models that need updating.
+    def validate_roots
       @dependents = [] if @dependents.nil?
+      models_to_update = []
       @roots.each do | trigger |
         model = TriggerModel.get(name: trigger, group: @group, scope: @scope)
         if model.nil?
@@ -184,25 +192,33 @@ module OpenC3
         end
         unless model.dependents.include?(@name)
           model.update_dependents(dependent: @name)
-          model.update()
+          models_to_update << model
         end
       end
+      models_to_update
+    end
+
+    # Persist dependent changes to root triggers
+    def commit_roots(models)
+      models.each { |model| model.update() }
     end
 
     def create
       unless Store.hget(@primary_key, @name).nil?
         raise TriggerInputError.new "existing trigger found: '#{@name}'"
       end
-      verify_triggers()
+      models = validate_roots()
       @updated_at = Time.now.to_nsec_from_epoch
       Store.hset(@primary_key, @name, JSON.generate(as_json, allow_nan: true))
+      commit_roots(models)
       notify(kind: 'created')
     end
 
     def update
-      verify_triggers()
+      models = validate_roots()
       @updated_at = Time.now.to_nsec_from_epoch
       Store.hset(@primary_key, @name, JSON.generate(as_json, allow_nan: true))
+      commit_roots(models)
       # No notification as this is only called via trigger_controller which already notifies
     end
 
@@ -267,6 +283,7 @@ module OpenC3
         'left' => @left,
         'operator' => @operator,
         'right' => @right,
+        'label' => @label,
         'updated_at' => @updated_at,
       }
     end

data/lib/openc3/models/widget_model.rb

@@ -15,9 +15,8 @@
 # This file may also be used under the terms of a commercial license
 # if purchased from OpenC3, Inc.
 
-require 'openc3/top_level'
 require 'openc3/models/model'
-require 'openc3/models/scope_model'
+# require 'openc3/models/scope_model' # Circular require
 require 'openc3/utilities/bucket'
 require 'openc3/utilities/bucket_utilities'
 

data/lib/openc3/operators/operator.rb

@@ -54,8 +54,10 @@ module OpenC3
     end
 
     def finalize
-      extract()
-      close()
+      unless closed?
+        extract()
+        close()
+      end
       unlink()
 
       output = ''
@@ -174,7 +176,7 @@ module OpenC3
         end
         @process.stop
       end
-      FileUtils.remove_entry_secure(@temp_dir, true)
+      FileUtils.remove_entry_secure(@temp_dir, true) if @temp_dir
       @process = nil
     end
 
@@ -300,6 +302,7 @@ module OpenC3
             # Respawn process
             output = p.extract_output
             Logger.error("Unexpected process died... respawning! #{p.cmd_line}\n#{output}\n", scope: p.scope)
+            p.hard_stop
             p.start
           end
         end
@@ -308,6 +311,7 @@ module OpenC3
 
     def shutdown_processes(processes)
       # Make a copy so we don't mutate original
+      hard_stop_processes = processes.dup
       processes = processes.dup
 
       Logger.info("Commanding soft stops...")
@@ -331,10 +335,8 @@ module OpenC3
         end
         sleep(0.1)
       end
-      if processes.length > 0
-        Logger.debug("Commanding hard stops...")
-        processes.each { |_name, p| p.hard_stop }
-      end
+      Logger.debug("Commanding hard stops...")
+      hard_stop_processes.each { |_name, p| p.output_increment; p.extract_output; p.hard_stop }
     end
 
     def shutdown

data/lib/openc3/packets/json_packet.rb

@@ -189,6 +189,8 @@ module OpenC3
           postfix = 'C'
         when :FORMATTED, :WITH_UNITS
           postfix = 'F'
+        else
+          raise "Unsupported value type: #{value_type}"
         end
         case reduced_type
         when :MIN

data/lib/openc3/packets/packet.rb

@@ -16,6 +16,7 @@
 # if purchased from OpenC3, Inc.
 
 require 'digest'
+require 'active_support/core_ext/object/deep_dup'
 require 'openc3/packets/structure'
 require 'openc3/packets/packet_item'
 require 'openc3/ext/packet' if RUBY_ENGINE == 'ruby' and !ENV['OPENC3_NO_EXT']

data/lib/openc3/packets/packet_config.rb

@@ -252,7 +252,7 @@ module OpenC3
           #######################################################################
           when 'STATE', 'READ_CONVERSION', 'WRITE_CONVERSION', 'POLY_READ_CONVERSION',\
               'POLY_WRITE_CONVERSION', 'SEG_POLY_READ_CONVERSION', 'SEG_POLY_WRITE_CONVERSION',\
-              'GENERIC_READ_CONVERSION_START', 'GENERIC_WRITE_CONVERSION_START', 'REQUIRED',\
+              'GENERIC_READ_CONVERSION_START', 'GENERIC_WRITE_CONVERSION_START', 'CONVERTED_DATA', 'REQUIRED',\
               'LIMITS', 'LIMITS_RESPONSE', 'UNITS', 'FORMAT_STRING', 'DESCRIPTION',\
               'MINIMUM_VALUE', 'MAXIMUM_VALUE', 'DEFAULT_VALUE', 'OVERFLOW', 'OVERLAP', 'KEY', 'VARIABLE_BIT_SIZE',\
               'OBFUSCATE'
@@ -675,11 +675,6 @@ module OpenC3
             klass = OpenC3.require_class(params[0])
             conversion = klass.new(*params[1..(params.length - 1)])
             @current_item.public_send("#{keyword.downcase}=".to_sym, conversion)
-            if klass != ProcessorConversion and (conversion.converted_type.nil? or conversion.converted_bit_size.nil?)
-              msg = "Read Conversion #{params[0]} on item #{@current_item.name} does not specify converted type or bit size"
-              @warnings << msg
-              Logger.instance.warn @warnings[-1]
-            end
           else
             conversion = PythonProxy.new('Conversion', params[0], *params[1..(params.length - 1)])
             @current_item.public_send("#{keyword.downcase}=".to_sym, conversion)
@@ -719,8 +714,9 @@ module OpenC3
       # All config.lines following this config.line are considered part
       # of the conversion until an end of conversion marker is found
       when 'GENERIC_READ_CONVERSION_START', 'GENERIC_WRITE_CONVERSION_START'
-        usage = "#{keyword} <Converted Type (optional)> <Converted Bit Size (optional)>"
-        parser.verify_num_parameters(0, 2, usage)
+        # As of COSMOS 7 the converted type and bit size are deprecated
+        # but we're still allowing them to be defined as parameters for backward compatibility
+        parser.verify_num_parameters(0, 2, keyword)
         @proc_text = ''
         @building_generic_conversion = true
         parser.set_preserve_lines(true)
@@ -731,10 +727,30 @@ module OpenC3
           raise parser.error("Invalid converted_type: #{@converted_type}.") unless CONVERTED_DATA_TYPES.include? @converted_type
         end
         @converted_bit_size = Integer(params[1]) if params[1]
-        if @converted_type.nil? or @converted_bit_size.nil?
-          msg = "Generic Conversion on item #{@current_item.name} does not specify converted type or bit size"
-          @warnings << msg
-          Logger.instance.warn @warnings[-1]
+
+      # Define the converted data type, bit size, and optional array size
+      # for items with read conversions (especially DERIVED items)
+      when 'CONVERTED_DATA'
+        usage = "CONVERTED_DATA <Converted Bit Size> <Converted Type> <Converted Array Size (optional)>"
+        parser.verify_num_parameters(2, 3, usage)
+        raise parser.error("#{keyword} requires a current item") unless @current_item
+        raise parser.error("#{keyword} requires a current item with a conversion") unless @current_item.read_conversion or @current_item.write_conversion
+        converted_bit_size = Integer(params[0])
+        converted_type = params[1].upcase.intern
+        raise parser.error("Invalid converted_type: #{converted_type}.") unless CONVERTED_DATA_TYPES.include? converted_type
+        if @current_item.read_conversion
+          @current_item.read_conversion.converted_type = converted_type
+          @current_item.read_conversion.converted_bit_size = converted_bit_size
+          if params[2]
+            @current_item.read_conversion.converted_array_size = Integer(params[2])
+          end
+        end
+        if @current_item.write_conversion
+          @current_item.write_conversion.converted_type = converted_type
+          @current_item.write_conversion.converted_bit_size = converted_bit_size
+          if params[2]
+            @current_item.write_conversion.converted_array_size = Integer(params[2])
+          end
         end
 
       # Define a set of limits for the current telemetry item

data/lib/openc3/script/api_shared.rb

@@ -288,6 +288,7 @@ module OpenC3
       start_time = Time.now.sys
       success, value = _openc3_script_wait_implementation_comparison(target_name, packet_name, item_name, type, comparison_to_eval, timeout, polling_rate, scope: scope, token: token, &block)
       value = "'#{value}'" if value.is_a? String # Show user the check against a quoted string
+      value = 'nil' if value.nil? # Show user nil value as 'nil'
       time_diff = Time.now.sys - start_time
       check_str = "CHECK: #{_upcase(target_name, packet_name, item_name)}"
       if comparison_to_eval
@@ -531,7 +532,7 @@ module OpenC3
       if comparison_to_eval
         _check_eval(target_name, packet_name, item_name, comparison_to_eval, value)
       else
-        puts "CHECK: #{_upcase(target_name, packet_name, item_name)} == #{value}"
+        puts "CHECK: #{_upcase(target_name, packet_name, item_name)} == #{value.nil? ? 'nil' : value.inspect}"
       end
     end
 
@@ -632,6 +633,7 @@ module OpenC3
       start_time = Time.now.sys
       success, value = _openc3_script_wait_implementation_comparison(target_name, packet_name, item_name, value_type, comparison_to_eval, timeout, polling_rate, scope: scope, token: token)
       value = "'#{value}'" if value.is_a? String # Show user the check against a quoted string
+      value = 'nil' if value.nil? # Show user nil value as 'nil'
       time_diff = Time.now.sys - start_time
       wait_str = "WAIT: #{_upcase(target_name, packet_name, item_name)} #{comparison_to_eval}"
       value_str = "with value == #{value} after waiting #{time_diff} seconds"
@@ -863,8 +865,20 @@ module OpenC3
       # Show user the check against a quoted string
       # Note: We have to preserve the original 'value' variable because we're going to eval against it
       value_str = value.is_a?(String) ? "'#{value}'" : value
+      value_str = 'nil' if value.nil? # Show user nil value as 'nil'
       with_value = "with value == #{value_str}"
-      if eval(string)
+
+      eval_is_valid = _check_eval_validity(value, comparison_to_eval)
+      unless eval_is_valid
+        message = "Invalid comparison for types"
+        if $disconnect
+          puts "ERROR: #{message}"
+        else
+          raise CheckError, message
+        end
+      end
+
+      if eval_is_valid && eval(string)
         puts "#{check_str} success #{with_value}"
       else
         message = "#{check_str} failed #{with_value}"
@@ -883,5 +897,28 @@ module OpenC3
         raise e
       end
     end
+
+    def _check_eval_validity(value, comparison)
+      return true if comparison.nil? || comparison.empty?
+
+      begin
+        operator, operand = extract_operator_and_operand_from_comparison(comparison)
+      rescue RuntimeError => e
+        if e.message.include?("Unable to parse operand")
+          # If we can't parse the operand, let the eval happen anyway
+          # It will raise an appropriate error (like NameError for undefined constants)
+          return true
+        end
+        raise # Re-raise invalid operator errors
+      rescue JSON::ParserError
+        return true
+      end
+
+      if [">=", "<=", ">", "<"].include?(operator)
+        return false if value.nil? || operand.nil? || value.is_a?(Array) || operand.is_a?(Array)
+      end
+
+      return true
+    end
   end
 end

data/lib/openc3/script/calendar.rb

@@ -52,21 +52,37 @@ module OpenC3
       return _cal_handle_response(response, 'Failed to delete timeline')
     end
 
+    # Creates an activity for the specified timeline.
+    #
+    # @param name [String] The name of the timeline.
+    # @param kind [String] The kind of activity. Must be one of "COMMAND", "SCRIPT", or "RESERVE".
+    # @param start [DateTime] The start time of the activity.
+    # @param stop [DateTime] The stop time of the activity.
+    # @param data [Hash, optional] Additional data to associate with the activity. Defaults to {}. Any activity can provide "username", "notes", and "customTitle". "command", "script", and "reserve" keys are reserves for the corresponding activity kind, with "environment" also available for script activities.
+    # @param scope [String, optional] The scope of the activity. Defaults to OPENC3_SCOPE, must correspond to the timeline.
     def create_timeline_activity(name, kind:, start:, stop:, data: {}, scope: $openc3_scope)
-      kind = kind.to_s.downcase()
-      kinds = %w(command script reserve)
-      unless kinds.include?(kind)
-        raise "Unknown kind: #{kind}. Must be one of #{kinds.join(', ')}."
-      end
-      post_data = {}
-      post_data['start'] = start.to_datetime.iso8601
-      post_data['stop'] = stop.to_datetime.iso8601
-      post_data['kind'] = kind
-      post_data['data'] = data
+      post_data = _build_activity_data(kind, start, stop, data)
       response = $api_server.request('post', "/openc3-api/timeline/#{name}/activities", data: post_data, json: true, scope: scope)
       return _cal_handle_response(response, 'Failed to create timeline activity')
     end
 
+    # Updates an existing activity on the specified timeline.
+    #
+    # @param name [String] The name of the timeline.
+    # @param id [Integer] The start time / score of the activity (Unix seconds).
+    # @param kind [String] The kind of activity. Must be one of "COMMAND", "SCRIPT", or "RESERVE".
+    # @param start [DateTime] The new start time of the activity.
+    # @param stop [DateTime] The new stop time of the activity.
+    # @param data [Hash, optional] Additional data to associate with the activity. Defaults to {}. Any activity can provide "username", "notes", and "customTitle". "command", "script", and "reserve" keys are reserved for the corresponding activity kind, with "environment" also available for script activities.
+    # @param uuid [String] The UUID of the activity.
+    # @param scope [String, optional] The scope of the activity. Defaults to OPENC3_SCOPE.
+    def update_timeline_activity(name, id:, kind:, start:, stop:, uuid:, data: {}, scope: $openc3_scope)
+      post_data = _build_activity_data(kind, start, stop, data)
+      url = "/openc3-api/timeline/#{name}/activity/#{id}/#{uuid}"
+      response = $api_server.request('put', url, data: post_data, json: true, scope: scope)
+      return _cal_handle_response(response, 'Failed to update timeline activity')
+    end
+
     def get_timeline_activity(name, start, uuid, scope: $openc3_scope)
       response = $api_server.request('get', "/openc3-api/timeline/#{name}/activity/#{start}/#{uuid}", scope: scope)
       return _cal_handle_response(response, 'Failed to get timeline activity')
@@ -89,6 +105,20 @@ module OpenC3
       return _cal_handle_response(response, 'Failed to delete timeline activity')
     end
 
+    def _build_activity_data(kind, start, stop, data)
+      kind = kind.to_s.downcase()
+      kinds = %w(command script reserve)
+      unless kinds.include?(kind)
+        raise "Unknown kind: #{kind}. Must be one of #{kinds.join(', ')}."
+      end
+      {
+        'start' => start.to_datetime.iso8601,
+        'stop' => stop.to_datetime.iso8601,
+        'kind' => kind,
+        'data' => data,
+      }
+    end
+
     # Helper method to handle the response
     def _cal_handle_response(response, error_message)
       return nil if response.nil?