openc3 5.17.0 → 5.18.0

data/lib/openc3/io/json_drb.rb

@@ -14,18 +14,16 @@
 # GNU Affero General Public License for more details.
 
 # Modified by OpenC3, Inc.
-# All changes Copyright 2022, OpenC3, Inc.
+# All changes Copyright 2024, OpenC3, Inc.
 # All Rights Reserved
 #
 # This file may also be used under the terms of a commercial license
 # if purchased from OpenC3, Inc.
 
-require 'thread'
 require 'socket'
 require 'json'
 # require 'drb/acl'
 require 'drb/drb'
-require 'set'
 require 'openc3/io/json_rpc'
 require 'openc3/io/json_drb_rack'
 require 'rackup'
@@ -185,10 +183,10 @@ module OpenC3
                 "Make sure all sockets/streams are closed in all applications,\n" +
                 "wait 1 minute and try again."
         # Something else went wrong which is fatal
-        rescue => error
+        rescue => e
           @server = nil
-          Logger.error "JsonDRb http server could not be started or unexpectedly died.\n#{error.formatted}"
-          OpenC3.handle_fatal_exception(error)
+          Logger.error "JsonDRb http server could not be started or unexpectedly died.\n#{e.formatted}"
+          OpenC3.handle_fatal_exception(e)
         end
 
         # Wait for the server to be started in the thread before returning.
@@ -272,42 +270,42 @@ module OpenC3
             if request.id
               response = JsonRpcSuccessResponse.new(result, request.id)
             end
-          rescue Exception => error
+          rescue Exception => e
             # Filter out the framework stack trace (rails, rack, puma etc)
-            lines = error.formatted.split("\n")
+            lines = e.formatted.split("\n")
             i = lines.find_index { |row| row.include?('actionpack') || row.include?('activesupport') }
             Logger.error lines[0...i].join("\n")
 
             if request.id
-              if NoMethodError === error
+              if NoMethodError === e
                 error_code = JsonRpcError::ErrorCode::METHOD_NOT_FOUND
                 response = JsonRpcErrorResponse.new(
-                  JsonRpcError.new(error_code, "Method not found", error), request.id
+                  JsonRpcError.new(error_code, "Method not found", e), request.id
                 )
-              elsif ArgumentError === error
+              elsif ArgumentError === e
                 error_code = JsonRpcError::ErrorCode::INVALID_PARAMS
                 response = JsonRpcErrorResponse.new(
-                  JsonRpcError.new(error_code, "Invalid params", error), request.id
+                  JsonRpcError.new(error_code, "Invalid params", e), request.id
                 )
-              elsif AuthError === error
+              elsif AuthError === e
                 error_code = JsonRpcError::ErrorCode::AUTH_ERROR
                 response = JsonRpcErrorResponse.new(
-                  JsonRpcError.new(error_code, error.message, error), request.id
+                  JsonRpcError.new(error_code, e.message, e), request.id
                 )
-              elsif ForbiddenError === error
+              elsif ForbiddenError === e
                 error_code = JsonRpcError::ErrorCode::FORBIDDEN_ERROR
                 response = JsonRpcErrorResponse.new(
-                  JsonRpcError.new(error_code, error.message, error), request.id
+                  JsonRpcError.new(error_code, e.message, e), request.id
                 )
-              elsif HazardousError === error
+              elsif HazardousError === e
                 error_code = JsonRpcError::ErrorCode::HAZARDOUS_ERROR
                 response = JsonRpcErrorResponse.new(
-                  JsonRpcError.new(error_code, error.message, error), request.id
+                  JsonRpcError.new(error_code, e.message, e), request.id
                 )
               else
                 error_code = JsonRpcError::ErrorCode::OTHER_ERROR
                 response = JsonRpcErrorResponse.new(
-                  JsonRpcError.new(error_code, error.message, error), request.id
+                  JsonRpcError.new(error_code, e.message, e), request.id
                 )
               end
             end
@@ -322,9 +320,9 @@ module OpenC3
         end
         response_data = process_response(response, start_time) if response
         return response_data, error_code
-      rescue => error
+      rescue => e
         error_code = JsonRpcError::ErrorCode::INVALID_REQUEST
-        response = JsonRpcErrorResponse.new(JsonRpcError.new(error_code, "Invalid Request", error), nil)
+        response = JsonRpcErrorResponse.new(JsonRpcError.new(error_code, "Invalid Request", e), nil)
         response_data = process_response(response, start_time)
         return response_data, error_code
       end

data/lib/openc3/io/json_rpc.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 2024, OpenC3, Inc.
 # All Rights Reserved
 #
 # This file may also be used under the terms of a commercial license
@@ -25,7 +25,7 @@ require 'date'
 require 'openc3/core_ext/string'
 
 class Object
-  def as_json(options = nil) #:nodoc:
+  def as_json(_options = nil) #:nodoc:
     if respond_to?(:to_hash)
       to_hash
     else
@@ -43,21 +43,21 @@ class Struct #:nodoc:
 end
 
 class TrueClass
-  def as_json(options = nil) self end #:nodoc:
+  def as_json(_options = nil) self end #:nodoc:
 end
 
 class FalseClass
-  def as_json(options = nil) self end #:nodoc:
+  def as_json(_options = nil) self end #:nodoc:
 end
 
 class NilClass
-  def as_json(options = nil) self end #:nodoc:
+  def as_json(_options = nil) self end #:nodoc:
 end
 
 class String
   NON_ASCII_PRINTABLE = /[^\x21-\x7e\s]/
   NON_UTF8_PRINTABLE = /[\x00-\x08\x0E-\x1F\x7F]/
-  def as_json(options = nil)
+  def as_json(_options = nil)
     as_utf8 = self.dup.force_encoding('UTF-8')
     if as_utf8.valid_encoding?
       if as_utf8 =~ NON_UTF8_PRINTABLE
@@ -72,11 +72,11 @@ class String
 end
 
 class Symbol
-  def as_json(options = nil) to_s end #:nodoc:
+  def as_json(_options = nil) to_s end #:nodoc:
 end
 
 class Numeric
-  def as_json(options = nil) self end #:nodoc:
+  def as_json(_options = nil) self end #:nodoc:
 end
 
 class Float
@@ -88,7 +88,7 @@ class Float
     end
   end
 
-  def as_json(options = nil)
+  def as_json(_options = nil)
     return { "json_class" => "Float", "raw" => "Infinity" }  if self.infinite? ==  1
     return { "json_class" => "Float", "raw" => "-Infinity" } if self.infinite? == -1
     return { "json_class" => "Float", "raw" => "NaN" }       if self.nan?
@@ -98,7 +98,7 @@ class Float
 end
 
 class Regexp
-  def as_json(options = nil) to_s end #:nodoc:
+  def as_json(_options = nil) to_s end #:nodoc:
 end
 
 module Enumerable
@@ -122,19 +122,19 @@ class Hash
 end
 
 class Time
-  def as_json(options = nil) #:nodoc:
+  def as_json(_options = nil) #:nodoc:
     self.to_s
   end
 end
 
 class Date
-  def as_json(options = nil) #:nodoc:
+  def as_json(_options = nil) #:nodoc:
     self.to_s
   end
 end
 
 class DateTime
-  def as_json(options = nil) #:nodoc:
+  def as_json(_options = nil) #:nodoc:
     self.to_s
   end
 end
@@ -269,6 +269,7 @@ module OpenC3
     def self.from_json(request_data, request_headers)
       hash = JSON.parse(request_data, :allow_nan => true, :create_additions => true)
       hash['keyword_params']['token'] = request_headers['HTTP_AUTHORIZATION'] if request_headers['HTTP_AUTHORIZATION']
+      hash['keyword_params']['manual'] = request_headers['HTTP_MANUAL'] if request_headers['HTTP_MANUAL']
       # Verify the jsonrpc version is correct and there is a method and id
       raise unless hash['jsonrpc'.freeze] == "2.0".freeze && hash['method'.freeze] && hash['id'.freeze]
 

data/lib/openc3/microservices/microservice.rb

@@ -14,7 +14,7 @@
 # GNU Affero General Public License for more details.
 
 # Modified by OpenC3, Inc.
-# All changes Copyright 2023, OpenC3, Inc.
+# All changes Copyright 2024, OpenC3, Inc.
 # All Rights Reserved
 #
 # This file may also be used under the terms of a commercial license
@@ -54,13 +54,13 @@ module OpenC3
         microservice.state = 'RUNNING'
         microservice.run
         microservice.state = 'FINISHED'
-      rescue Exception => err
-        if SystemExit === err or SignalException === err
+      rescue Exception => e
+        if SystemExit === e or SignalException === e
           microservice.state = 'KILLED'
         else
-          microservice.error = err
+          microservice.error = e
           microservice.state = 'DIED_ERROR'
-          Logger.fatal("Microservice #{name} dying from exception\n#{err.formatted}")
+          Logger.fatal("Microservice #{name} dying from exception\n#{e.formatted}")
         end
       ensure
         MicroserviceStatusModel.set(microservice.as_json(:allow_nan => true), scope: microservice.scope)
@@ -171,7 +171,7 @@ module OpenC3
               # Run ruby syntax so we can log those
               syntax_check, _ = Open3.capture2e("ruby -c #{ruby_filename}")
               if /Syntax OK/.match?(syntax_check)
-                @logger.info("Ruby microservice #{@name} file #{ruby_filename} passed syntax check\n", scope: @scope)
+                @logger.debug("Ruby microservice #{@name} file #{ruby_filename} passed syntax check\n", scope: @scope)
               else
                 @logger.error("Ruby microservice #{@name} file #{ruby_filename} failed syntax check\n#{syntax_check}", scope: @scope)
               end
@@ -188,9 +188,9 @@ module OpenC3
             MicroserviceStatusModel.set(as_json(:allow_nan => true), scope: @scope) unless @cancel_thread
             break if @microservice_status_sleeper.sleep(@microservice_status_period_seconds)
           end
-        rescue Exception => err
-          @logger.error "#{@name} status thread died: #{err.formatted}"
-          raise err
+        rescue Exception => e
+          @logger.error "#{@name} status thread died: #{e.formatted}"
+          raise e
         end
       end
     end
@@ -208,7 +208,7 @@ module OpenC3
       MicroserviceStatusModel.set(as_json(:allow_nan => true), scope: @scope)
       FileUtils.remove_entry(@temp_dir) if File.exist?(@temp_dir)
       @metric.shutdown
-      @logger.info("Shutting down microservice complete: #{@name}")
+      @logger.debug("Shutting down microservice complete: #{@name}")
       @shutdown_complete = true
     end
 
@@ -220,7 +220,7 @@ module OpenC3
     end
 
     # Returns if the command was handled
-    def microservice_cmd(topic, msg_id, msg_hash, redis)
+    def microservice_cmd(topic, msg_id, msg_hash, _redis)
       command = msg_hash['command']
       case command
       when 'ADD_TOPICS'

data/lib/openc3/microservices/scope_cleanup_microservice.rb

@@ -22,7 +22,7 @@ require 'openc3/microservices/cleanup_microservice'
 module OpenC3
   class ScopeCleanupMicroservice < CleanupMicroservice
     def run
-      scope = ScopeModel.get_model(name: @scope, scope: @scope)
+      scope = ScopeModel.get_model(name: @scope)
 
       areas = [
         ["#{@scope}/text_logs", scope.text_log_retain_time],

data/lib/openc3/microservices/timeline_microservice.rb

@@ -24,6 +24,7 @@ require 'openc3/utilities/authentication'
 require 'openc3/microservices/microservice'
 require 'openc3/models/activity_model'
 require 'openc3/models/timeline_model'
+require 'openc3/models/tool_config_model'
 require 'openc3/topics/timeline_topic'
 
 require 'openc3/script'
@@ -66,61 +67,82 @@ module OpenC3
 
         run_activity(activity)
       end
-      @logger.info "#{@timeline_name} timeine worker exiting"
+      @logger.info "#{@timeline_name} timeline worker exiting"
     end
 
     def run_activity(activity)
-      case activity.kind.upcase
-      when 'COMMAND'
+      case activity.kind.downcase
+      when 'command'
         run_command(activity)
-      when 'SCRIPT'
+      when 'script'
         run_script(activity)
-      when 'EXPIRE'
+      when 'expire'
         clear_expired(activity)
       else
         @logger.error "Unknown kind passed to microservice #{@timeline_name}: #{activity.as_json(:allow_nan => true)}"
       end
     end
 
+    def get_exec_setting()
+      json = ToolConfigModel.load_config('calendar-settings', 'default', scope: @scope)
+      if json
+        settings = JSON.parse(json)
+        return settings['execEnabled']
+      else
+        # Default is execute
+        return true
+      end
+    end
+
     def run_command(activity)
       @logger.info "#{@timeline_name} run_command > #{activity.as_json(:allow_nan => true)}"
       begin
-        username = activity.data['username']
-        token = get_token(username)
-        raise "No token available for username: #{username}" unless token
-        cmd_no_hazardous_check(activity.data['command'], scope: @scope, token: token)
-        activity.commit(status: 'completed', fulfillment: true)
+        if get_exec_setting()
+          username = activity.data['username']
+          token = get_token(username)
+          raise "No token available for username: #{username}" unless token
+          cmd_no_hazardous_check(activity.data['command'], scope: @scope, token: token)
+          activity.commit(status: 'completed', fulfillment: true)
+        else
+          activity.commit(status: 'disabled', message: 'Execution is disabled')
+          @logger.warn "#{@timeline_name} run_command disabled > #{activity.as_json(:allow_nan => true)}"
+        end
       rescue StandardError => e
         activity.commit(status: 'failed', message: e.message)
-        @logger.error "#{@timeline_name} run_cmd failed > #{activity.as_json(:allow_nan => true)}, #{e.formatted}"
+        @logger.error "#{@timeline_name} run_command failed > #{activity.as_json(:allow_nan => true)}, #{e.formatted}"
       end
     end
 
     def run_script(activity)
       @logger.info "#{@timeline_name} run_script > #{activity.as_json(:allow_nan => true)}"
       begin
-        username = activity.data['username']
-        token = get_token(username)
-        raise "No token available for username: #{username}" unless token
-        request = Net::HTTP::Post.new(
-          "/script-api/scripts/#{activity.data['script']}/run?scope=#{@scope}",
-          'Content-Type' => 'application/json',
-          'Authorization' => token
-        )
-        request.body = JSON.generate({
-          'scope' => @scope,
-          'environment' => activity.data['environment'],
-          'timeline' => @timeline_name,
-          'id' => activity.start
-        })
-        hostname = ENV['OPENC3_SCRIPT_HOSTNAME'] || 'openc3-cosmos-script-runner-api'
-        response = Net::HTTP.new(hostname, 2902).request(request)
-        raise "failed to call #{hostname}, for script: #{activity.data['script']}, response code: #{response.code}" if response.code != '200'
-
-        activity.commit(status: 'completed', message: "#{activity.data['script']} => #{response.body}", fulfillment: true)
+        if get_exec_setting()
+          username = activity.data['username']
+          token = get_token(username)
+          raise "No token available for username: #{username}" unless token
+          request = Net::HTTP::Post.new(
+            "/script-api/scripts/#{activity.data['script']}/run?scope=#{@scope}",
+            'Content-Type' => 'application/json',
+            'Authorization' => token
+          )
+          request.body = JSON.generate({
+            'scope' => @scope,
+            'environment' => activity.data['environment'],
+            'timeline' => @timeline_name,
+            'id' => activity.start
+          })
+          hostname = ENV['OPENC3_SCRIPT_HOSTNAME'] || 'openc3-cosmos-script-runner-api'
+          response = Net::HTTP.new(hostname, 2902).request(request)
+          raise "failed to call #{hostname}, for script: #{activity.data['script']}, response code: #{response.code}" if response.code != '200'
+
+          activity.commit(status: 'completed', message: "#{activity.data['script']} => #{response.body}", fulfillment: true)
+        else
+          activity.commit(status: 'disabled', message: 'Execution is disabled')
+          @logger.warn "#{@timeline_name} run_script disabled > #{activity.as_json(:allow_nan => true)}"
+        end
       rescue StandardError => e
         activity.commit(status: 'failed', message: e.message)
-        @logger.error "#{@timeline_name} run_script failed > #{activity.as_json(:allow_nan => true).to_s}, #{e.message}"
+        @logger.error "#{@timeline_name} run_script failed > #{activity.as_json(:allow_nan => true)}, #{e.message}"
       end
     end
 
@@ -212,7 +234,7 @@ module OpenC3
     def run
       @logger.info "#{@timeline_name} timeline manager running"
       loop do
-        start = Time.now.to_i
+        start = Time.now.to_f
         @schedule.activities.each do |activity|
           start_difference = activity.start - start
           if start_difference <= 0 && @schedule.not_queued?(activity.start)
@@ -230,19 +252,19 @@ module OpenC3
         sleep(1)
         break if @cancel_thread
       end
-      @logger.info "#{@timeline_name} timeine manager exiting"
+      @logger.info "#{@timeline_name} timeline manager exiting"
     end
 
     # Add task to remove events older than 7 days
     def add_expire_activity
-      now = Time.now.to_i
-      @expire = now + 3_000
+      now = Time.now.to_f
+      @expire = now + 3540 # Needs to be less than 3600 which is the hour we store in memory
       activity = ActivityModel.new(
         name: @timeline_name,
         scope: @scope,
         start: 0,
-        stop: (now - 86_400 * 7),
-        kind: 'EXPIRE',
+        stop: (now - (86_400 * 7)),
+        kind: 'expire',
         data: {}
       )
       @queue << activity
@@ -283,13 +305,13 @@ module OpenC3
       super(name)
       @timeline_name = name.split('__')[2]
       @schedule = Schedule.new(@timeline_name)
-      @manager = TimelineManager.new(name: @timeline_name, logger: @logger, scope: scope, schedule: @schedule)
+      @manager = TimelineManager.new(name: @timeline_name, logger: @logger, scope: @scope, schedule: @schedule)
       @manager_thread = nil
       @read_topic = true
     end
 
     def run
-      @logger.info "#{@name} timeine running"
+      @logger.info "#{@name} timeline running"
       @manager_thread = Thread.new { @manager.run }
       loop do
         current_activities = ActivityModel.activities(name: @timeline_name, scope: @scope)
@@ -299,19 +321,19 @@ module OpenC3
         block_for_updates()
         break if @cancel_thread
       end
-      @logger.info "#{@name} timeine exitting"
+      @logger.info "#{@name} timeline exiting"
     end
 
     def topic_lookup_functions
       {
         'timeline' => {
-          'created' => :timeline_nop,
+          'created' => :timeline_noop,
           'refresh' => :schedule_refresh,
-          'updated' => :timeline_nop,
-          'deleted' => :timeline_nop
+          'updated' => :timeline_noop,
+          'deleted' => :timeline_noop
         },
         'activity' => {
-          'event' => :timeline_nop,
+          'event' => :timeline_noop,
           'created' => :create_activity_from_event,
           'updated' => :schedule_refresh,
           'deleted' => :remove_activity_from_event
@@ -335,7 +357,7 @@ module OpenC3
       end
     end
 
-    def timeline_nop(data)
+    def timeline_noop(data)
       @logger.debug "#{@name} timeline web socket event: #{data}"
     end
 
@@ -347,8 +369,8 @@ module OpenC3
     # Add the activity to the schedule. We don't need to hold the job in memory
     # if it is longer than an hour away. A refresh task will update that.
     def create_activity_from_event(data)
-      diff = data['start'] - Time.now.to_i
-      return unless (2..3600).include? diff
+      diff = data['start'] - Time.now.to_f
+      return if diff < 0 or diff > 3600
 
       activity = ActivityModel.from_json(data, name: @timeline_name, scope: @scope)
       @schedule.add_activity(activity)
@@ -357,17 +379,20 @@ module OpenC3
     # Remove the activity from the schedule. We don't need to remove the activity
     # if it is longer than an hour away. It will be removed from the data.
     def remove_activity_from_event(data)
-      diff = data['start'] - Time.now.to_i
-      return unless (2..3600).include? diff
+      diff = data['start'] - Time.now.to_f
+      return if diff < 0 or diff > 3600
 
       activity = ActivityModel.from_json(data, name: @timeline_name, scope: @scope)
       @schedule.remove_activity(activity)
     end
 
     def shutdown
-      @read_topic = false
       @manager.shutdown
-      super
+      # super also sets @cancel_thread = true but we want to set it first
+      # so when we set @read_topic = false the run loop stops
+      @cancel_thread = true
+      @read_topic = false
+      super()
     end
   end
 end

data/lib/openc3/models/activity_model.rb

@@ -28,16 +28,14 @@ require 'securerandom'
 
 module OpenC3
   class ActivityError < StandardError; end
-
   class ActivityInputError < ActivityError; end
-
   class ActivityOverlapError < ActivityError; end
 
   class ActivityModel < Model
     MAX_DURATION = Time::SEC_PER_DAY
     PRIMARY_KEY = '__openc3_timelines'.freeze # MUST be equal to `TimelineModel::PRIMARY_KEY` minus the leading __
     # See run_activity(activity) in openc3/lib/openc3/microservices/timeline_microservice.rb
-    VALID_KINDS = %w(COMMAND SCRIPT RESERVE EXPIRE)
+    VALID_KINDS = %w(command script reserve expire)
 
     # Called via the microservice this gets the previous 00:00:15 to 01:01:00. This should allow
     # for a small buffer around the timeline to make sure the schedule doesn't get stale.
@@ -45,7 +43,7 @@ module OpenC3
     # with 15 slots to make sure we don't miss a planned task.
     # @return [Array|nil] Array of the next hour in the sorted set
     def self.activities(name:, scope:)
-      now = Time.now.to_i
+      now = Time.now.to_f
       start_score = now - 15
       stop_score = (now + 3660)
       array = Store.zrangebyscore("#{scope}#{PRIMARY_KEY}__#{name}", start_score, stop_score)
@@ -158,7 +156,7 @@ module OpenC3
       @updated_at = updated_at
     end
 
-    # validate_time searches from the current activity @stop - 1 (because we allow overlap of stop with start)
+    # validate_time searches from the current activity @stop (exclusive because we allow overlap of stop with start)
     # back through @start - MAX_DURATION. The method is trying to validate that this new activity does not
     # overlap with anything else. The reason we search back past @start through MAX_DURATION is because we
     # need to return all the activities that may start before us and verify that we don't overlap them.
@@ -170,7 +168,8 @@ module OpenC3
     #
     # @param [Integer] ignore_score - should be nil unless you want to ignore a time when doing an update
     def validate_time(ignore_score = nil)
-      array = Store.zrevrangebyscore(@primary_key, @stop - 1, @start - MAX_DURATION)
+      # Adding a '(' makes the max value exclusive
+      array = Store.zrevrangebyscore(@primary_key, "(#{@stop}", @start - MAX_DURATION)
       array.each do |value|
         activity = JSON.parse(value, :allow_nan => true, :create_additions => true)
         if ignore_score == activity['start']
@@ -197,15 +196,15 @@ module OpenC3
       rescue Date::Error
         raise ActivityInputError.new "start and stop must be seconds: #{start}, #{stop}"
       end
-      now_i = Time.now.to_i
+      now_f = Time.now.to_f
       begin
         duration = stop - start
       rescue NoMethodError
         raise ActivityInputError.new "start and stop must be seconds: #{start}, #{stop}"
       end
-      if now_i >= start and kind != 'EXPIRE'
-        raise ActivityInputError.new "activity must be in the future, current_time: #{now_i} vs #{start}"
-      elsif duration >= MAX_DURATION
+      if now_f >= start and kind != 'expire'
+        raise ActivityInputError.new "activity must be in the future, current_time: #{now_f} vs #{start}"
+      elsif duration >= MAX_DURATION and kind != 'expire'
         raise ActivityInputError.new "activity can not be longer than #{MAX_DURATION} seconds"
       elsif duration <= 0
         raise ActivityInputError.new "start: #{start} must be before stop: #{stop}"
@@ -220,11 +219,12 @@ module OpenC3
 
     # Set the values of the instance, @start, @kind, @data, @events...
     def set_input(start:, stop:, kind: nil, data: nil, events: nil, fulfillment: nil, recurring: nil)
+      kind = kind.to_s.downcase
       validate_input(start: start, stop: stop, kind: kind, data: data)
       @start = start
       @stop = stop
       @fulfillment = fulfillment.nil? ? false : fulfillment
-      @kind = kind.nil? ? @kind : kind
+      @kind = kind
       @data = data.nil? ? @data : data
       @events = events.nil? ? Array.new : events
       @recurring = recurring.nil? ? @recurring : recurring
@@ -232,7 +232,7 @@ module OpenC3
 
     # Update the Redis hash at primary_key and set the score equal to the start Epoch time
     # the member is set to the JSON generated via calling as_json
-    def create
+    def create(overlap: true)
       if @recurring['end'] and @recurring['frequency'] and @recurring['span']
         # First validate the initial recurring activity ... all others are just offsets
         validate_input(start: @start, stop: @stop, kind: @kind, data: @data)
@@ -284,11 +284,13 @@ module OpenC3
         notify(kind: 'created')
       else
         validate_input(start: @start, stop: @stop, kind: @kind, data: @data)
-        collision = validate_time()
-        unless collision.nil?
-          raise ActivityOverlapError.new "activity overlaps existing at #{collision}"
+        if !overlap
+          # If we don't allow overlap we need to validate the time
+          collision = validate_time()
+          unless collision.nil?
+            raise ActivityOverlapError.new "activity overlaps existing at #{collision}"
+          end
         end
-
         @updated_at = Time.now.to_nsec_from_epoch
         add_event(status: 'created')
         Store.zadd(@primary_key, @start, JSON.generate(self.as_json(:allow_nan => true)))
@@ -299,7 +301,7 @@ module OpenC3
     # Update the Redis hash at primary_key and remove the current activity at the current score
     # and update the score to the new score equal to the start Epoch time this uses a multi
     # to execute both the remove and create.
-    def update(start:, stop:, kind:, data:)
+    def update(start:, stop:, kind:, data:, overlap: true)
       array = Store.zrangebyscore(@primary_key, @start, @start)
       if array.length == 0
         raise ActivityError.new "failed to find activity at: #{@start}"
@@ -308,10 +310,12 @@ module OpenC3
       old_start = @start
       set_input(start: start, stop: stop, kind: kind, data: data, events: @events)
       @updated_at = Time.now.to_nsec_from_epoch
-      # copy of create
-      collision = validate_time(old_start)
-      unless collision.nil?
-        raise ActivityOverlapError.new "failed to update #{old_start}, no activities can overlap, collision: #{collision}"
+      if !overlap
+        # If we don't allow overlap we need to validate the time
+        collision = validate_time(old_start)
+        unless collision.nil?
+          raise ActivityOverlapError.new "failed to update #{old_start}, no activities can overlap, collision: #{collision}"
+        end
       end
 
       add_event(status: 'updated')