openc3 7.1.0 → 7.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa824943ce72cce586cdfe03c1a5a8395120801bd845174c25433a15bf986306
-  data.tar.gz: 620cc66576e14e7e696419e5be0b5704190452d29efc35a315a489099b20f82e
+  metadata.gz: 719b55747a7004cc44da1976c3f15eec6c67a3fca702b56792862f59f02cb8b5
+  data.tar.gz: c80082e75c059dac71d15a56264cba9c968f82c494e564e33b598c75ac01a6c2
 SHA512:
-  metadata.gz: 1f392d51b2e5870128a995aa9e5717f9a4ed3bf0b8f55952b9141ec34898406734a2a834cf18d09b78d6e82f5675c2c0f3269e2ef62964ec58f2b96b8933ce80
-  data.tar.gz: a92a073ff672da55a44b85b700cb5b6a908208e9a10ddcad77828f02de0f877c3db2252d7d93857ab5b65d55b39594dfc109d72028a82cbfeaa6e468878eef94
+  metadata.gz: 5b3c1ca82717f1debd25ab4a6ac0239aa9baee2b5f736f61b7f52103397b608ab3de8fd0d50e10f0a4481b507b2a519987a4c4c68f7d0f3770cd48f3e165b8eb
+  data.tar.gz: d2bc96742a2555be7c8149dd728155a76ba7c1a16474eb26a36388bdedaacc1fba9c447ab373beebd8fd58ac81248541531de1a163bc156be195c76e34b515f2

data/bin/openc3cli

@@ -444,6 +444,9 @@ def unload_plugin(plugin_name, scope:)
       plugin_model = OpenC3::PluginModel.get_model(name: plugin_name, scope: scope)
       plugin_model.destroy
       OpenC3::LocalMode.remove_local_plugin(plugin_name, scope: scope)
+      # Remove the backing gem now that no PluginModel references it,
+      # so it disappears from the admin Packages tab.
+      OpenC3::PluginModel.cleanup_gem(plugin_name, scope: scope)
       OpenC3::Logger.info("PluginModel destroyed: #{plugin_name}", scope: scope)
     rescue => e
       abort("Error uninstalling plugin: #{scope}: #{plugin_name}: #{e.formatted}")

data/data/config/interface_modifiers.yaml

@@ -212,7 +212,9 @@ WORK_DIR:
     WORK_DIR '/openc3/lib/openc3/microservices'
 PORT:
   summary: Open port for the microservice
-  description: Kubernetes needs a Service to be applied to open a port so this is required for Kubernetes support
+  description:
+    Kubernetes needs a Service to be applied to open a port so this is required for Kubernetes support
+    See [Exposing Microservices](/docs/guides/exposing-microservices) for more information.
   since: 5.7.0
   parameters:
     - name: Number

data/data/config/microservice.yaml

@@ -40,7 +40,9 @@ MICROSERVICE:
           WORK_DIR .
     PORT:
       summary: Open port for the microservice
-      description: Kubernetes needs a Service to be applied to open a port so this is required for Kubernetes support
+      description:
+        Kubernetes needs a Service to be applied to open a port so this is required for Kubernetes support.
+        See [Exposing Microservices](/docs/guides/exposing-microservices) for more information.
       since: 5.0.10
       parameters:
         - name: Number

data/data/config/plugins.yaml

@@ -38,6 +38,7 @@ VARIABLE_STATE:
     VARIABLE log_retain_time 172800
     VARIABLE_STATE "24 hours" 86400
     VARIABLE_STATE "48 hours" 172800
+    VARIABLE_STATE 60 # Both description and value are set to 60
   parameters:
     - name: State Description
       required: false

data/lib/openc3/api/api.rb

@@ -17,6 +17,7 @@
 
 require 'openc3/script/extract'
 require 'openc3/script/api_shared'
+require 'openc3/api/calendar_api'
 require 'openc3/api/cmd_api'
 require 'openc3/api/config_api'
 require 'openc3/api/interface_api'

data/lib/openc3/api/calendar_api.rb

@@ -0,0 +1,183 @@
+# encoding: ascii-8bit
+
+# Copyright 2026 OpenC3, Inc.
+# All Rights Reserved.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See LICENSE.md for more details.
+#
+# This file may also be used under the terms of a commercial license
+# if purchased from OpenC3, Inc.
+
+require 'date'
+require 'openc3/models/timeline_model'
+require 'openc3/models/activity_model'
+require 'openc3/topics/timeline_topic'
+
+module OpenC3
+  module Api
+    # NOTE: These methods are intentionally NOT added to WHITELIST. Their signatures
+    # match openc3/lib/openc3/script/calendar.rb (no manual:/token: kwargs), so they
+    # cannot be dispatched via JSON-RPC (which auto-injects manual/token from headers).
+    # The script-side calendar methods reach the server through the timeline/activity
+    # HTTP controllers, which call these helpers after performing their own
+    # authorization.
+
+    # Returns an array of all timelines for the given scope.
+    def list_timelines(scope: $openc3_scope)
+      ret = []
+      TimelineModel.all.each do |timeline, value|
+        if scope == timeline.split('__')[0]
+          ret << value
+        end
+      end
+      ret
+    end
+
+    # Creates a new timeline and deploys its microservice.
+    # @return [Hash] the created timeline as a hash
+    def create_timeline(name, color: nil, scope: $openc3_scope)
+      model = TimelineModel.new(name: name, color: color, scope: scope)
+      model.create()
+      model.deploy()
+      model.as_json()
+    end
+
+    # @return [Hash, nil] the timeline as a hash, or nil if not found
+    def get_timeline(name, scope: $openc3_scope)
+      model = TimelineModel.get(name: name, scope: scope)
+      return nil if model.nil?
+      model.as_json()
+    end
+
+    # Updates the color of an existing timeline.
+    # @return [Hash, nil] the updated timeline as a hash, or nil if not found
+    def set_timeline_color(name, color, scope: $openc3_scope)
+      model = TimelineModel.get(name: name, scope: scope)
+      return nil if model.nil?
+      model.color = color
+      model.update()
+      model.notify(kind: 'updated')
+      model.as_json()
+    end
+
+    # Updates the execute flag of an existing timeline.
+    # @return [Hash, nil] the updated timeline as a hash, or nil if not found
+    def set_timeline_execute(name, enable, scope: $openc3_scope)
+      model = TimelineModel.get(name: name, scope: scope)
+      return nil if model.nil?
+      model.execute = enable
+      model.update()
+      model.notify(kind: 'updated')
+      model.as_json()
+    end
+
+    # Deletes a timeline (and optionally all of its activities when force is true).
+    # @return [Hash, nil] {'name' => name}, or nil if not found
+    def delete_timeline(name, force: false, scope: $openc3_scope)
+      model = TimelineModel.get(name: name, scope: scope)
+      return nil if model.nil?
+      TimelineModel.delete(name: name, scope: scope, force: force)
+      model.undeploy()
+      model.notify(kind: 'deleted')
+      { 'name' => name }
+    end
+
+    # Creates a new activity on the specified timeline.
+    # username is read from data['username'] if present and is used for the audit event.
+    # @return [Hash] the created activity as a hash
+    def create_timeline_activity(name, kind:, start:, stop:, data: {}, recurring: nil, scope: $openc3_scope)
+      data ||= {}
+      hash = {
+        kind: kind,
+        start: _cal_to_epoch(start),
+        stop: _cal_to_epoch(stop),
+        data: data,
+      }
+      if recurring
+        recurring = recurring.dup
+        if recurring['end']
+          recurring['end'] = _cal_to_epoch(recurring['end'])
+        end
+        hash[:recurring] = recurring
+      end
+      model = ActivityModel.from_json(hash, name: name, scope: scope)
+      model.create(username: data['username'])
+      model.as_json()
+    end
+
+    # Updates an existing activity on the specified timeline.
+    # @return [Hash, nil] the updated activity as a hash, or nil if not found
+    def update_timeline_activity(name, id:, kind:, start:, stop:, uuid:, data: {}, scope: $openc3_scope)
+      data ||= {}
+      model = ActivityModel.score(name: name, score: id.to_i, uuid: uuid, scope: scope)
+      return nil if model.nil?
+      model.update(
+        start: _cal_to_epoch(start),
+        stop: _cal_to_epoch(stop),
+        kind: kind,
+        data: data,
+        username: data['username'],
+      )
+      model.as_json()
+    end
+
+    # @return [Hash, nil] the activity as a hash, or nil if not found
+    def get_timeline_activity(name, start, uuid, scope: $openc3_scope)
+      model = ActivityModel.score(name: name, score: start.to_i, uuid: uuid, scope: scope)
+      return nil if model.nil?
+      model.as_json()
+    end
+
+    # Returns activities on the timeline in the given window.
+    # When start/stop are nil, defaults to a window of [now - 7 days, now + 7 days].
+    # When limit is nil, defaults to one event per minute over the window.
+    # @return [Array<Hash>] the matching activities
+    def get_timeline_activities(name, start: nil, stop: nil, limit: nil, scope: $openc3_scope)
+      now = DateTime.now.new_offset(0)
+      start_score = start.nil? ? (now - 7).strftime('%s').to_i : _cal_to_epoch(start)
+      stop_score = stop.nil? ? (now + 7).strftime('%s').to_i : _cal_to_epoch(stop)
+      limit ||= ((stop_score - start_score) / 60).to_i
+      ActivityModel.get(name: name, scope: scope, start: start_score, stop: stop_score, limit: limit)
+    end
+
+    # Removes an activity (or all members of its recurring group when recurring is truthy).
+    # @return [Integer] number of activities removed (0 indicates not found)
+    def delete_timeline_activity(name, start, uuid, recurring: nil, scope: $openc3_scope)
+      ActivityModel.destroy(name: name, scope: scope, score: start.to_i, uuid: uuid, recurring: recurring)
+    end
+
+    # @return [Integer] count of activities on the timeline
+    def count_timeline_activities(name, scope: $openc3_scope)
+      ActivityModel.count(name: name, scope: scope)
+    end
+
+    # Commits an event to an existing activity.
+    # @return [Hash, nil] the activity as a hash, or nil if not found
+    def commit_timeline_activity(name, start, uuid, status:, message: nil, scope: $openc3_scope)
+      model = ActivityModel.score(name: name, score: start.to_i, uuid: uuid, scope: scope)
+      return nil if model.nil?
+      model.commit(status: status, message: message)
+      model.as_json()
+    end
+
+    # Convert a value to an epoch integer. Accepts Integer/Numeric (treated as already-epoch),
+    # numeric strings, and ISO-style date/time strings or DateTime/Time objects.
+    def _cal_to_epoch(value)
+      case value
+      when Integer
+        value
+      when Numeric
+        value.to_i
+      when DateTime, Time, Date
+        value.to_datetime.strftime('%s').to_i
+      else
+        s = value.to_s
+        return s.to_i if s.match?(/\A-?\d+\z/)
+        DateTime.parse(s).strftime('%s').to_i
+      end
+    end
+  end
+end

data/lib/openc3/microservices/decom_microservice.rb

@@ -94,13 +94,15 @@ module OpenC3
       @limits_event_topic = "#{@scope}__openc3_limits_events"
       @topics << @limits_event_topic
       Topic.update_topic_offsets(@topics, db_shard: @db_shard)
+      # Initialize before assigning limits_change_callback - sync_system below
+      # can fire the callback synchronously for any persisted-disabled items.
+      @limits_response_queue = Queue.new
+      @limits_response_thread = nil
       System.telemetry.limits_change_callback = method(:limits_change_callback)
       LimitsEventTopic.sync_system(scope: @scope)
       @error_count = 0
       @metric.set(name: 'decom_total', value: @count, type: 'counter')
       @metric.set(name: 'decom_error_total', value: @error_count, type: 'counter')
-      @limits_response_queue = Queue.new
-      @limits_response_thread = nil
     end
 
     def run

data/lib/openc3/models/plugin_model.rb

@@ -158,12 +158,12 @@ module OpenC3
             variables[current_variable_name]['description'] = params[0]
           when 'VARIABLE_STATE'
             usage = "#{keyword} <Display Text> <Value>"
-            parser.verify_num_parameters(2, 2, usage)
+            parser.verify_num_parameters(1, 2, usage)
             unless current_variable_name
               raise "VARIABLE_STATE must follow a VARIABLE definition"
             end
             variables[current_variable_name]['options'] ||= []
-            option = { 'value' => params[1], 'text' => params[0] }
+            option = { 'value' => params[1] || params[0], 'text' => params[0] }
             variables[current_variable_name]['options'] << option
           end
         end
@@ -229,12 +229,13 @@ module OpenC3
         plugin_model.homepage = pkg.spec.homepage
         plugin_model.repository = pkg.spec.metadata['source_code_uri'] # this key because it's in the official gemspec examples
         plugin_model.keywords = pkg.spec.metadata['openc3_store_keywords']&.split(/, ?/)
-        img_path = pkg.spec.metadata['openc3_store_image']
-        unless img_path
-          default_img_path = 'public/store_img.png'
-          full_default_path = File.join(gem_path, default_img_path)
-          img_path = default_img_path if File.exist? full_default_path
-        end
+        # Resolve the plugin's store image path. The gemspec generated by
+        # `cli generate plugin` sets `openc3_store_image` to `public/store_img.png`
+        # but does not create that file, so we must verify existence regardless
+        # of whether the path came from metadata or the default — otherwise the
+        # frontend hits a 500 when fetching the missing file.
+        img_path = pkg.spec.metadata['openc3_store_image'] || 'public/store_img.png'
+        img_path = nil unless File.exist?(File.join(gem_path, img_path))
         package_name = "#{pkg.spec.name}-#{pkg.spec.version}"
         plugin_model.img_path = File.join('gems', package_name, img_path) if img_path # convert this filesystem path to volumes mount path
         plugin_model.update() unless validate_only
@@ -525,5 +526,16 @@ module OpenC3
       end
       return result.sort
     end
+
+    # Remove the backing gem for an unloaded plugin so it disappears from
+    # GemModel.names (and the admin Packages tab). Skips the removal if any
+    # other PluginModel (any scope, any counter) still references the gem,
+    # via the existing PluginModel.gem_names check inside GemModel.destroy.
+    def self.cleanup_gem(plugin_name, scope:)
+      gem_filename = plugin_name.split("__")[0]
+      OpenC3::GemModel.destroy(gem_filename, log_and_raise_needed_errors: false)
+    rescue => e
+      Logger.warn("Could not remove gem #{gem_filename}: #{e.message}", scope: scope)
+    end
   end
 end

data/lib/openc3/models/queue_model.rb

@@ -44,34 +44,37 @@ module OpenC3
       model = get_model(name: name, scope: scope)
       raise QueueError, "Queue '#{name}' not found in scope '#{scope}'" unless model
 
-      if model.state != 'DISABLE'
-        result = Store.zrevrange("#{scope}:#{name}", 0, 0, with_scores: true)
-        if result.empty?
-          id = 1.0
-        else
-          id = result[0][1].to_f + 1
-        end
-
-        # Build command data with support for both formats
-        command_data = { username: username, timestamp: Time.now.to_nsec_from_epoch, validate: validate, timeout: timeout }
-        if target_name && cmd_name
-          # New format: store target_name, cmd_name, and cmd_params separately
-          command_data[:target_name] = target_name
-          command_data[:cmd_name] = cmd_name
-          command_data[:cmd_params] = JSON.generate(cmd_params.as_json, allow_nan: true) if cmd_params
-        elsif command
-          # Legacy format: store command string for backwards compatibility
-          command_data[:value] = command
-        else
-          raise QueueError, "Must provide either command string or target_name/cmd_name parameters"
-        end
-
-        Store.zadd("#{scope}:#{name}", id, command_data.to_json)
-        model.notify(kind: 'command')
-      else
+      if model.state == 'DISABLE'
         error_msg = command || "#{target_name} #{cmd_name}"
         raise QueueError, "Queue '#{name}' is disabled. Command '#{error_msg}' not queued."
       end
+
+      result = Store.zrevrange("#{scope}:#{name}", 0, 0, with_scores: true)
+      id = result.empty? ? 1.0 : result[0][1].to_f + 1
+
+      command_data = build_command_data(username: username, command: command, target_name: target_name,
+                                        cmd_name: cmd_name, cmd_params: cmd_params, validate: validate, timeout: timeout)
+      Store.zadd("#{scope}:#{name}", id, command_data.to_json)
+      model.notify(kind: 'command')
+    end
+
+    # Build the hash that gets serialized into Redis. Always uses symbol keys so
+    # downstream code in this class can access values consistently. cmd_params is
+    # JSON-encoded as a string so binary data survives the round-trip via as_json.
+    def self.build_command_data(username:, command: nil, target_name: nil, cmd_name: nil, cmd_params: nil, validate: nil, timeout: nil)
+      command_data = { username: username, timestamp: Time.now.to_nsec_from_epoch }
+      if target_name && cmd_name
+        command_data[:target_name] = target_name
+        command_data[:cmd_name] = cmd_name
+        command_data[:cmd_params] = JSON.generate(cmd_params.as_json, allow_nan: true) if cmd_params
+      elsif command
+        command_data[:value] = command
+      else
+        raise QueueError, "Must provide either command string or target_name/cmd_name parameters"
+      end
+      command_data[:validate] = validate unless validate.nil?
+      command_data[:timeout] = timeout unless timeout.nil?
+      command_data
     end
 
     attr_accessor :name, :state
@@ -115,49 +118,36 @@ module OpenC3
       QueueTopic.write_notification(notification, scope: @scope)
     end
 
-    def insert_command(id, command_data)
+    def insert_command(id: nil, username:, command: nil, target_name: nil, cmd_name: nil, cmd_params: nil, validate: nil, timeout: nil)
       if @state == 'DISABLE'
-        if command_data['value']
-          command_name = command_data['value']
-        else
-          command_name = "#{command_data['target_name']} #{command_data['cmd_name']}"
-        end
+        command_name = command || "#{target_name} #{cmd_name}"
         raise QueueError, "Queue '#{@name}' is disabled. Command '#{command_name}' not queued."
       end
 
       unless id
         result = Store.zrevrange("#{@scope}:#{@name}", 0, 0, with_scores: true)
-        if result.empty?
-          id = 1.0
-        else
-          id = result[0][1].to_f + 1
-        end
+        id = result.empty? ? 1.0 : result[0][1].to_f + 1
       end
 
-      # Convert cmd_params values to JSON-safe format if present
-      if command_data['cmd_params']
-        command_data['cmd_params'] = JSON.generate(command_data['cmd_params'].as_json, allow_nan: true)
-      end
+      command_data = self.class.build_command_data(username: username, command: command, target_name: target_name,
+                                                   cmd_name: cmd_name, cmd_params: cmd_params, validate: validate, timeout: timeout)
       Store.zadd("#{@scope}:#{@name}", id, command_data.to_json)
       notify(kind: 'command')
     end
 
-    def update_command(id:, command:, username:, validate: nil, timeout: nil)
+    def update_command(id:, username:, command: nil, target_name: nil, cmd_name: nil, cmd_params: nil, validate: nil, timeout: nil)
       if @state == 'DISABLE'
         raise QueueError, "Queue '#{@name}' is disabled. Command at id #{id} not updated."
       end
 
-      # Check if command exists at the given id
       existing = Store.zrangebyscore("#{@scope}:#{@name}", id, id)
       if existing.empty?
         raise QueueError, "No command found at id #{id} in queue '#{@name}'"
       end
 
-      # Remove the existing command and add the new one at the same id
       Store.zremrangebyscore("#{@scope}:#{@name}", id, id)
-      command_data = { username: username, value: command, timestamp: Time.now.to_nsec_from_epoch }
-      command_data[:validate] = validate unless validate.nil?
-      command_data[:timeout] = timeout unless timeout.nil?
+      command_data = self.class.build_command_data(username: username, command: command, target_name: target_name,
+                                                   cmd_name: cmd_name, cmd_params: cmd_params, validate: validate, timeout: timeout)
       Store.zadd("#{@scope}:#{@name}", id, command_data.to_json)
       notify(kind: 'command')
     end

data/lib/openc3/models/trigger_model.rb

@@ -107,7 +107,7 @@ module OpenC3
       group:,
       left:,
       operator:,
-      right:,
+      right: nil,
       state: false,
       enabled: true,
       dependents: nil,

data/lib/openc3/packets/parsers/xtce_parser.rb

@@ -709,6 +709,26 @@ module OpenC3
       end
     end
 
+    def set_item_range_and_default(item)
+      return if item.range
+      return if item.data_type == :STRING || item.data_type == :BLOCK
+
+      if item.data_type == :INT
+        item.range = (-(2**(item.bit_size - 1)))..((2**(item.bit_size - 1)) - 1)
+        item.default = 0 if item.default.nil?
+      elsif item.data_type == :UINT
+        item.range = 0..((2**item.bit_size) - 1)
+        item.default = 0 if item.default.nil?
+      elsif item.data_type == :FLOAT
+        if item.bit_size == 32
+          item.range = -3.402823e38..3.402823e38
+        else
+          item.range = -Float::MAX..Float::MAX
+        end
+        item.default = 0.0 if item.default.nil?
+      end
+    end
+
     def set_limits(item, type)
       return unless @current_cmd_or_tlm == PacketConfig::TELEMETRY
 
@@ -756,7 +776,9 @@ module OpenC3
                 @current_packet.get_item(item.name)
               rescue
                 # Item hasn't already been added so define it
-                @current_packet.define(item.clone)
+                cloned_item = item.clone
+                @current_packet.define(cloned_item)
+                set_item_range_and_default(cloned_item) if @current_cmd_or_tlm == PacketConfig::COMMAND
                 count += 1
               end
             end

data/lib/openc3/script/script.rb

@@ -206,10 +206,12 @@ module OpenC3
       _file_dialog(title, message, filter)
     end
 
-    def open_bucket_dialog(title, message = "Open Bucket File")
+    def open_bucket_dialog(title, message = "Open Bucket File", default_path: nil, filter: nil)
       answer = ''
+      hint = default_path ? " [default: #{default_path}]" : ''
+      hint += " filter: #{filter}" if filter
       while answer.empty?
-        print "#{title}\n#{message}\n<Type bucket file path (e.g. BUCKET/path/to/file)>:"
+        print "#{title}\n#{message}\n<Type bucket file path (e.g. BUCKET/path/to/file)>#{hint}:"
         answer = gets
         answer.chomp!
       end

data/lib/openc3/topics/command_topic.rb

@@ -33,6 +33,7 @@ module OpenC3
                    received_count: packet.received_count,
                    stored: packet.stored.to_s,
                    buffer: packet.buffer(false) }
+      msg_hash[:extra] = JSON.generate(packet.extra.as_json, allow_nan: true) if packet.extra
       db_shard = Store.db_shard_for_target(packet.target_name, scope: scope)
       EphemeralStoreQueued.instance(db_shard: db_shard).write_topic(topic, msg_hash)
     end

data/lib/openc3/topics/telemetry_decom_topic.rb

@@ -43,6 +43,7 @@ module OpenC3
           :received_count => packet.received_count,
           :json_data => json_data,
         }
+        msg_hash[:extra] = JSON.generate(packet.extra.as_json, allow_nan: true) if packet.extra
         db_shard = Store.db_shard_for_target(packet.target_name, scope: scope)
         Topic.write_topic("#{scope}__DECOM__{#{packet.target_name}}__#{packet.packet_name}", msg_hash, id, db_shard: db_shard)
 

data/lib/openc3/utilities/cli_generator.rb

@@ -293,6 +293,13 @@ RUBY
       if File.exist?(microservice_path)
         abort("Microservice #{microservice_path} already exists!")
       end
+      # plugin.txt is checked separately because the user may have deleted the
+      # microservices/NAME directory without cleaning up the plugin.txt entry.
+      # A duplicate MICROSERVICE entry causes plugin install to fail with
+      # "openc3_microservices:...already exists at create".
+      if File.exist?('plugin.txt') && File.read('plugin.txt') =~ /^MICROSERVICE\s+#{Regexp.escape(microservice_name)}\b/
+        abort("plugin.txt already declares MICROSERVICE #{microservice_name}. Remove that entry before regenerating.")
+      end
       microservice_filename = "#{microservice_name.downcase}.#{@@language}"
       microservice_class = microservice_filename.filename_to_class_name
       microservice_class.inspect # Remove unused variable warning. These are used in binding for generator

data/lib/openc3/utilities/running_script.rb

@@ -1280,18 +1280,16 @@ class RunningScript
         # Start Output Thread
         @@output_thread = Thread.new { output_thread() } unless @@output_thread
 
-        if @script_engine
-          if @script_status.start_line_no != 1 or !@script_status.end_line_no.nil?
-            if @script_status.end_line_no.nil?
-              # Goto line
-              start(@script_status.filename, line_no: @script_status.start_line_no, complete: true)
-            else
-              # Execute selection
-              start(@script_status.filename, line_no: @script_status.start_line_no, end_line_no: @script_status.end_line_no, complete: true)
-            end
+        if @script_status.start_line_no != 1 or !@script_status.end_line_no.nil?
+          if @script_status.end_line_no.nil?
+            # Run From Line / Goto line
+            start(@script_status.filename, line_no: @script_status.start_line_no, complete: true)
           else
-            @script_engine.run_text(text, filename: @script_status.filename)
+            # Execute Selection
+            start(@script_status.filename, line_no: @script_status.start_line_no, end_line_no: @script_status.end_line_no, complete: true)
           end
+        elsif @script_engine
+          @script_engine.run_text(text, filename: @script_status.filename)
         else
           if initial_filename == 'SCRIPTRUNNER'
             # Don't instrument pseudo scripts

data/lib/openc3/version.rb

@@ -1,14 +1,14 @@
 # encoding: ascii-8bit
 
-OPENC3_VERSION = '7.1.0'
+OPENC3_VERSION = '7.1.1'
 module OpenC3
   module Version
     MAJOR = '7'
     MINOR = '1'
-    PATCH = '0'
+    PATCH = '1'
     OTHER = ''
-    BUILD = '1074049d7a87d4b4d8cdc31e3512ab495b7492bb'
+    BUILD = '1c377442111a2b1801fb5c6b49a27d604e2cce55'
   end
-  VERSION = '7.1.0'
-  GEM_VERSION = '7.1.0'
+  VERSION = '7.1.1'
+  GEM_VERSION = '7.1.1'
 end

data/templates/microservice/microservices/TEMPLATE/microservice.py

@@ -1,4 +1,13 @@
 import time
+
+# Add any plugin lib directories to the Python search path so this microservice
+# can import helpers from `/lib` folders inside installed plugins (Ruby gets this
+# for free via gem `$LOAD_PATH`; Python does not).
+import glob
+from openc3.top_level import add_to_search_path
+for path in glob.glob("/gems/gems/**/lib"):
+    add_to_search_path(path, True)
+
 from openc3.microservices.microservice import Microservice
 from openc3.utilities.sleeper import Sleeper
 from openc3.api import *

data/templates/tool_angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "<%= tool_name %>",
-  "version": "7.1.0",
+  "version": "7.1.1",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -23,7 +23,7 @@
     "@angular/platform-browser-dynamic": "^18.2.6",
     "@angular/router": "^18.2.6",
     "@astrouxds/astro-web-components": "^7.24.0",
-    "@openc3/js-common": "7.1.0",
+    "@openc3/js-common": "7.1.1",
     "rxjs": "~7.8.0",
     "single-spa": "^5.9.5",
     "single-spa-angular": "^9.2.0",

data/templates/tool_react/package.json

@@ -16,7 +16,7 @@
     "@emotion/react": "^11.13.3",
     "@emotion/styled": "^11.11.0",
     "@mui/material": "^6.1.1",
-    "@openc3/js-common": "7.1.0",
+    "@openc3/js-common": "7.1.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "single-spa-react": "^5.1.4"

data/templates/tool_svelte/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrouxds/astro-web-components": "^7.24.0",
-    "@openc3/js-common": "7.1.0",
+    "@openc3/js-common": "7.1.1",
     "@smui/button": "^7.0.0",
     "@smui/common": "^7.0.0",
     "@smui/card": "^7.0.0",

data/templates/tool_vue/package.json

@@ -1,6 +1,6 @@
 {
   "name": "<%= tool_name %>",
-  "version": "7.1.0",
+  "version": "7.1.1",
   "private": true,
   "type": "module",
   "scripts": {
@@ -11,8 +11,8 @@
   },
   "dependencies": {
     "@astrouxds/astro-web-components": "^7.24.0",
-    "@openc3/js-common": "7.1.0",
-    "@openc3/vue-common": "7.1.0",
+    "@openc3/js-common": "7.1.1",
+    "@openc3/vue-common": "7.1.1",
     "axios": "^1.7.7",
     "date-fns": "^4.1.0",
     "lodash": "^4.17.21",

data/templates/widget/package.json

@@ -1,6 +1,6 @@
 {
   "name": "<%= widget_name %>",
-  "version": "7.1.0",
+  "version": "7.1.1",
   "private": true,
   "type": "module",
   "scripts": {
@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "@astrouxds/astro-web-components": "^7.24.0",
-    "@openc3/vue-common": "7.1.0",
+    "@openc3/vue-common": "7.1.1",
     "vuetify": "^3.7.1"
   },
   "devDependencies": {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openc3
 version: !ruby/object:Gem::Version
-  version: 7.1.0
+  version: 7.1.1
 platform: ruby
 authors:
 - Ryan Melton
@@ -973,6 +973,7 @@ files:
 - lib/openc3/api/README.md
 - lib/openc3/api/api.rb
 - lib/openc3/api/authorized_api.rb
+- lib/openc3/api/calendar_api.rb
 - lib/openc3/api/cmd_api.rb
 - lib/openc3/api/config_api.rb
 - lib/openc3/api/interface_api.rb