openc3 5.14.0 → 5.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b009f636dd8566127001ad9ee48972d584fb03baaf88389646048e7231dc54b
-  data.tar.gz: 0ce2ff7aad089eba4794f4f15075bcf5e3087632f776eb76127c80af5256bda6
+  metadata.gz: 459b654a51a4d3b984681eb1b25165039e95d0a22c68e08973fc3539beee1b5c
+  data.tar.gz: cf6975c07ab38342228401d84a01f1ee672f4a74b7c2a697f2dc893aecfb4b3e
 SHA512:
-  metadata.gz: 1d87b341b985cca628485419b0406b449289364497e4061024d0407551920fc8f62529fb35897761a1ae471c838cf2ce38d706fcf84eea4960abdd24a7608af5
-  data.tar.gz: '0758dfda18babfc4c47f870efe074e5a6bbd371aee1ba2a362f3d851791f20c2f5955e7f144972198a461a314b0a2a334c02d8191c7387503c30a11d8bd53c50'
+  metadata.gz: 8368bda2e80639021df632271a972a5a716a8db380eb23dd4375d3334d10ca3001a5a33d9017caeeff684804338d4ba36a2adc180d1656f843d20440560d47ab
+  data.tar.gz: 195a9f6a3e4dbbadb1ed219765f627e1dd3cf96f9fd14a21e7891ea24e5cef6847eefb644ae8cfcbd15a894a32f0c23fc10bf405b9b2c3011553411f14f58b42

data/lib/openc3/microservices/decom_microservice.rb

@@ -45,6 +45,7 @@ module OpenC3
     end
 
     def run
+      setup_microservice_topic()
       while true
         break if @cancel_thread
 
@@ -52,8 +53,9 @@ module OpenC3
           OpenC3.in_span("read_topics") do
             Topic.read_topics(@topics) do |topic, msg_id, msg_hash, redis|
               break if @cancel_thread
-
-              if topic =~ /__DECOMINTERFACE/
+              if topic == @microservice_topic
+                microservice_cmd(topic, msg_id, msg_hash, redis)
+              elsif topic =~ /__DECOMINTERFACE/
                 if msg_hash.key?('inject_tlm')
                   handle_inject_tlm(msg_hash['inject_tlm'])
                   next

data/lib/openc3/microservices/log_microservice.rb

@@ -62,12 +62,17 @@ module OpenC3
 
     def run
       setup_plws()
+      setup_microservice_topic()
       while true
         break if @cancel_thread
 
         Topic.read_topics(@topics) do |topic, msg_id, msg_hash, redis|
           break if @cancel_thread
-          log_data(topic, msg_id, msg_hash, redis)
+          if topic == @microservice_topic
+            microservice_cmd(topic, msg_id, msg_hash, redis)
+          else
+            log_data(topic, msg_id, msg_hash, redis)
+          end
           @count += 1
           @metric.set(name: 'log_total', value: @count, type: 'counter')
         end

data/lib/openc3/microservices/microservice.rb

@@ -116,6 +116,7 @@ module OpenC3
       end
       @logger.info("Microservice initialized with config:\n#{@config}")
       @topics ||= []
+      @microservice_topic = "MICROSERVICE__#{@name}"
 
       # Get configuration for any targets
       @target_names = @config["target_names"]
@@ -210,5 +211,32 @@ module OpenC3
       @logger.info("Shutting down microservice complete: #{@name}")
       @shutdown_complete = true
     end
+
+    def setup_microservice_topic
+      @topics.append(@microservice_topic)
+      Thread.current[:topic_offsets] ||= {}
+      topic_offsets = Thread.current[:topic_offsets]
+      topic_offsets[@microservice_topic] = "0-0" # Always get all available
+    end
+
+    # Returns if the command was handled
+    def microservice_cmd(topic, msg_id, msg_hash, redis)
+      command = msg_hash['command']
+      case command
+      when 'ADD_TOPICS'
+        topics = JSON.parse(msg_hash['topics'])
+        if topics and Array === topics
+          topics.each do |new_topic|
+            @topics << new_topic unless @topics.include?(new_topic)
+          end
+        else
+          raise "Invalid topics given to microservice_cmd: #{topics}"
+        end
+        Topic.trim_topic(topic, msg_id)
+        return true
+      end
+      Topic.trim_topic(topic, msg_id)
+      return false
+    end
   end
 end

data/lib/openc3/models/microservice_model.rb

@@ -43,6 +43,7 @@ module OpenC3
     attr_accessor :secrets
     attr_accessor :prefix
     attr_accessor :disable_erb
+    attr_accessor :ignore_changes
 
     # NOTE: The following three class methods are used by the ModelController
     # and are reimplemented to enable various Model class methods to work
@@ -103,6 +104,7 @@ module OpenC3
       secrets: [],
       prefix: nil,
       disable_erb: nil,
+      ignore_changes: nil,
       scope:
     )
       parts = name.split("__")
@@ -128,6 +130,7 @@ module OpenC3
       @secrets = secrets
       @prefix = prefix
       @disable_erb = disable_erb
+      @ignore_changes = ignore_changes
       @bucket = Bucket.getClient()
     end
 
@@ -149,7 +152,8 @@ module OpenC3
         'needs_dependencies' => @needs_dependencies,
         'secrets' => @secrets.as_json(*a),
         'prefix' => @prefix,
-        'disable_erb' => @disable_erb
+        'disable_erb' => @disable_erb,
+        'ignore_changes' => @ignore_changes
       }
     end
 

data/lib/openc3/models/plugin_model.rb

@@ -342,7 +342,7 @@ module OpenC3
         raise message
       end
     rescue Exception => error
-      Logger.error("Error undeploying plugin model #{@name} in scope #{@scope} due to: #{error}")
+      Logger.error("Error undeploying plugin model #{@name} in scope #{@scope} due to: #{error.formatted}")
     ensure
       # Double check everything is gone
       found = []

data/lib/openc3/models/target_model.rb

@@ -869,6 +869,42 @@ module OpenC3
           )
         end
       end
+
+      # Inform microservices of new topics
+      # Need to tell loggers to log, and decom to decom
+      # We do this for no downtime
+      raw_topics = []
+      decom_topics = []
+      packets.each do |packet|
+        if cmd_or_tlm == :TELEMETRY
+          raw_topics << "#{@scope}__TELEMETRY__{#{@name}}__#{packet.packet_name.upcase}"
+          decom_topics << "#{@scope}__DECOM__{#{@name}}__#{packet.packet_name.upcase}"
+        else
+          raw_topics << "#{@scope}__COMMAND__{#{@name}}__#{packet.packet_name.upcase}"
+          decom_topics << "#{@scope}__DECOMCMD__{#{@name}}__#{packet.packet_name.upcase}"
+        end
+      end
+      if cmd_or_tlm == :TELEMETRY
+        Topic.write_topic("MICROSERVICE__#{@scope}__PACKETLOG__#{@name}", {'command' => 'ADD_TOPICS', 'topics' => raw_topics.as_json.to_json})
+        add_topics_to_microservice("#{@scope}__PACKETLOG__#{@name}", raw_topics)
+        Topic.write_topic("MICROSERVICE__#{@scope}__DECOMLOG__#{@name}", {'command' => 'ADD_TOPICS', 'topics' => decom_topics.as_json.to_json})
+        add_topics_to_microservice("#{@scope}__DECOMLOG__#{@name}", decom_topics)
+        Topic.write_topic("MICROSERVICE__#{@scope}__DECOM__#{@name}", {'command' => 'ADD_TOPICS', 'topics' => raw_topics.as_json.to_json})
+        add_topics_to_microservice("#{@scope}__DECOM__#{@name}", raw_topics)
+      else
+        Topic.write_topic("MICROSERVICE__#{@scope}__COMMANDLOG__#{@name}", {'command' => 'ADD_TOPICS', 'topics' => raw_topics.as_json.to_json})
+        add_topics_to_microservice("#{@scope}__COMMANDLOG__#{@name}", raw_topics)
+        Topic.write_topic("MICROSERVICE__#{@scope}__DECOMCMDLOG__#{@name}", {'command' => 'ADD_TOPICS', 'topics' => decom_topics.as_json.to_json})
+        add_topics_to_microservice("#{@scope}__DECOMCMDLOG__#{@name}", decom_topics)
+      end
+    end
+
+    def add_topics_to_microservice(microservice_name, topics)
+      model = MicroserviceModel.get_model(name: microservice_name, scope: @scope)
+      model.topics.concat(topics)
+      model.topics.uniq!
+      model.ignore_changes = true # Don't restart the microservice right now
+      model.update
     end
 
     def deploy_commmandlog_microservice(gem_path, variables, topics, instance = nil, parent = nil)
@@ -1109,7 +1145,6 @@ module OpenC3
       decom_command_topic_list = []
       packet_topic_list = []
       decom_topic_list = []
-      reduced_topic_list = []
       begin
         system.commands.packets(@name).each do |packet_name, packet|
           command_topic_list << "#{@scope}__COMMAND__{#{@name}}__#{packet_name}"
@@ -1122,9 +1157,6 @@ module OpenC3
         system.telemetry.packets(@name).each do |packet_name, packet|
           packet_topic_list << "#{@scope}__TELEMETRY__{#{@name}}__#{packet_name}"
           decom_topic_list  << "#{@scope}__DECOM__{#{@name}}__#{packet_name}"
-          reduced_topic_list << "#{@scope}__REDUCED_MINUTE__{#{@name}}__#{packet_name}"
-          reduced_topic_list << "#{@scope}__REDUCED_HOUR__{#{@name}}__#{packet_name}"
-          reduced_topic_list << "#{@scope}__REDUCED_DAY__{#{@name}}__#{packet_name}"
         end
       rescue
         # No telemetry packets for this target

data/lib/openc3/operators/microservice_operator.rb

@@ -98,28 +98,30 @@ module OpenC3
           previous_parent = @previous_microservices[microservice_name]['parent']
           if @previous_microservices[microservice_name] != microservice_config
             # CHANGED
-            scope = microservice_name.split("__")[0]
-            Logger.info("Changed microservice detected: #{microservice_name}\nWas: #{@previous_microservices[microservice_name]}\nIs: #{microservice_config}", scope: scope)
-            if parent or previous_parent
-              if parent == previous_parent
-                # Same Parent - Respawn parent
-                @changed_microservices[parent] = @microservices[parent] if @microservices[parent] and @previous_microservices[parent]
-              elsif parent and previous_parent
-                # Parent changed - Respawn both parents
-                @changed_microservices[parent] = @microservices[parent] if @microservices[parent] and @previous_microservices[parent]
-                @changed_microservices[previous_parent] = @microservices[previous_parent] if @microservices[previous_parent] and @previous_microservices[previous_parent]
-              elsif parent
-                # Moved under a parent - Respawn parent and kill standalone
-                @changed_microservices[parent] = @microservices[parent] if @microservices[parent] and @previous_microservices[parent]
-                @removed_microservices[microservice_name] = microservice_config
-              else # previous_parent
-                # Moved to standalone - Respawn previous parent and make new
-                @changed_microservices[previous_parent] = @microservices[previous_parent] if @microservices[previous_parent] and @previous_microservices[previous_parent]
-                @new_microservices[microservice_name] = microservice_config
+            if not microservice_config['ignore_changes']
+              scope = microservice_name.split("__")[0]
+              Logger.info("Changed microservice detected: #{microservice_name}\nWas: #{@previous_microservices[microservice_name]}\nIs: #{microservice_config}", scope: scope)
+              if parent or previous_parent
+                if parent == previous_parent
+                  # Same Parent - Respawn parent
+                  @changed_microservices[parent] = @microservices[parent] if @microservices[parent] and @previous_microservices[parent]
+                elsif parent and previous_parent
+                  # Parent changed - Respawn both parents
+                  @changed_microservices[parent] = @microservices[parent] if @microservices[parent] and @previous_microservices[parent]
+                  @changed_microservices[previous_parent] = @microservices[previous_parent] if @microservices[previous_parent] and @previous_microservices[previous_parent]
+                elsif parent
+                  # Moved under a parent - Respawn parent and kill standalone
+                  @changed_microservices[parent] = @microservices[parent] if @microservices[parent] and @previous_microservices[parent]
+                  @removed_microservices[microservice_name] = microservice_config
+                else # previous_parent
+                  # Moved to standalone - Respawn previous parent and make new
+                  @changed_microservices[previous_parent] = @microservices[previous_parent] if @microservices[previous_parent] and @previous_microservices[previous_parent]
+                  @new_microservices[microservice_name] = microservice_config
+                end
+              else
+                # Respawn regular microservice
+                @changed_microservices[microservice_name] = microservice_config
               end
-            else
-              # Respawn regular microservice
-              @changed_microservices[microservice_name] = microservice_config
             end
           end
         else

data/lib/openc3/packets/commands.rb

@@ -303,6 +303,10 @@ module OpenC3
       @config.commands
     end
 
+    def dynamic_add_packet(packet, affect_ids: false)
+      @config.dynamic_add_packet(packet, :COMMAND, affect_ids: affect_ids)
+    end
+
     protected
 
     def set_parameters(command, params, range_checking)

data/lib/openc3/packets/packet_config.rb

@@ -315,30 +315,60 @@ module OpenC3
           hash = @cmd_id_value_hash[@current_packet.target_name]
           hash = {} unless hash
           @cmd_id_value_hash[@current_packet.target_name] = hash
-          update_id_value_hash(hash)
+          update_id_value_hash(@current_packet, hash)
         else
           @telemetry[@current_packet.target_name][@current_packet.packet_name] = @current_packet
           hash = @tlm_id_value_hash[@current_packet.target_name]
           hash = {} unless hash
           @tlm_id_value_hash[@current_packet.target_name] = hash
-          update_id_value_hash(hash)
+          update_id_value_hash(@current_packet, hash)
         end
         @current_packet = nil
         @current_item = nil
       end
     end
 
+    def dynamic_add_packet(packet, cmd_or_tlm = :TELEMETRY, affect_ids: false)
+      if cmd_or_tlm == :COMMAND
+        @commands[packet.target_name][packet.packet_name] = packet
+
+        if affect_ids
+          hash = @cmd_id_value_hash[packet.target_name]
+          hash = {} unless hash
+          @cmd_id_value_hash[packet.target_name] = hash
+          update_id_value_hash(packet, hash)
+        end
+      else
+        @telemetry[packet.target_name][packet.packet_name] = packet
+
+        # Update latest_data lookup for telemetry
+        packet.sorted_items.each do |item|
+          target_latest_data = @latest_data[packet.target_name]
+          target_latest_data[item.name] ||= []
+          latest_data_packets = target_latest_data[item.name]
+          latest_data_packets << packet unless latest_data_packets.include?(packet)
+        end
+
+        if affect_ids
+          hash = @tlm_id_value_hash[packet.target_name]
+          hash = {} unless hash
+          @tlm_id_value_hash[packet.target_name] = hash
+          update_id_value_hash(packet, hash)
+        end
+      end
+    end
+
     protected
 
-    def update_id_value_hash(hash)
-      if @current_packet.id_items.length > 0
+    def update_id_value_hash(packet, hash)
+      if packet.id_items.length > 0
         key = []
-        @current_packet.id_items.each do |item|
+        packet.id_items.each do |item|
           key << item.id_value
         end
-        hash[key] = @current_packet
+        hash[key] = packet
       else
-        hash['CATCHALL'.freeze] = @current_packet
+        hash['CATCHALL'.freeze] = packet
       end
     end
 

data/lib/openc3/packets/telemetry.rb

@@ -442,5 +442,9 @@ module OpenC3
     def all
       @config.telemetry
     end
+
+    def dynamic_add_packet(packet, affect_ids: false)
+      @config.dynamic_add_packet(packet, :TELEMETRY, affect_ids: affect_ids)
+    end
   end # class Telemetry
 end

data/lib/openc3/system/system.rb

@@ -60,6 +60,9 @@ module OpenC3
     # The current limits set
     @@limits_set = nil
 
+    # Callbacks to call once @@instance is created
+    @@post_instance_callbacks = []
+
     # @return [Symbol] The current limits_set of the system returned from Redis
     def self.limits_set
       unless @@limits_set
@@ -72,6 +75,14 @@ module OpenC3
       @@limits_set = value.to_s.intern
     end
 
+    def self.add_post_instance_callback(callback)
+      if @@instance
+        callback.call()
+      else
+        @@post_instance_callbacks << callback
+      end
+    end
+
     def self.setup_targets(target_names, base_dir, scope:)
       # Nothing to do if there are no targets
       return if target_names.nil? or target_names.length == 0
@@ -121,11 +132,30 @@ module OpenC3
       raise "System.instance parameters are required on first call" unless target_names and target_config_dir
 
       @@instance_mutex.synchronize do
+        return @@instance if @@instance
         @@instance ||= self.new(target_names, target_config_dir)
+        @@post_instance_callbacks.each do |callback|
+          callback.call
+        end
         return @@instance
       end
     end
 
+    # Dynamically add packets to the system instance
+    #
+    # @param dynamic_packets [Array of packets]
+    # @param cmd_or_tlm [Symbol] :COMMAND or :TELEMETRY
+    # @param affect_ids [Boolean] Whether to affect packet id lookup or not
+    def self.dynamic_update(dynamic_packets, cmd_or_tlm = :TELEMETRY, affect_ids: false)
+      dynamic_packets.each do |packet|
+        if cmd_or_tlm == :TELEMETRY
+          @@instance.telemetry.dynamic_add_packet(packet, affect_ids: affect_ids)
+        else
+          @@instance.commands.dynamic_add_packet(packet, affect_ids: affect_ids)
+        end
+      end
+    end
+
     # Create a new System object.
     #
     # @param target_names [Array of target names]

data/lib/openc3/version.rb

@@ -1,14 +1,14 @@
 # encoding: ascii-8bit
 
-OPENC3_VERSION = '5.14.0'
+OPENC3_VERSION = '5.14.1'
 module OpenC3
   module Version
     MAJOR = '5'
     MINOR = '14'
-    PATCH = '0'
+    PATCH = '1'
     OTHER = ''
-    BUILD = 'dd31e4853fa50ed08ee3100e43e75849617d0a47'
+    BUILD = '902e54e502f6070c58183746a7db21a50e7b5263'
   end
-  VERSION = '5.14.0'
-  GEM_VERSION = '5.14.0'
+  VERSION = '5.14.1'
+  GEM_VERSION = '5.14.1'
 end

data/templates/tool_angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "<%= tool_name %>",
-  "version": "5.14.0",
+  "version": "5.14.1",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -12,7 +12,7 @@
   },
   "private": true,
   "dependencies": {
-    "@openc3/tool-common": "5.14.0",
+    "@openc3/tool-common": "5.14.1",
     "@angular/animations": "^17.0.8",
     "@angular/cdk": "^17.0.4",
     "@angular/common": "^17.0.8",

data/templates/tool_svelte/package.json

@@ -11,7 +11,7 @@
     "smui-theme": "smui-theme compile build/smui.css -i src/theme"
   },
   "dependencies": {
-    "@openc3/tool-common": "5.14.0",
+    "@openc3/tool-common": "5.14.1",
     "@astrouxds/astro-web-components": "7.20.0",
     "@smui/button": "^7.0.0-beta.16",
     "@smui/card": "^7.0.0-beta.16",

data/templates/tool_vue/package.json

@@ -1,6 +1,6 @@
 {
   "name": "<%= tool_name %>",
-  "version": "5.14.0",
+  "version": "5.14.1",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -11,7 +11,7 @@
     "test:components": "vue-cli-service test:components"
   },
   "dependencies": {
-    "@openc3/tool-common": "5.14.0",
+    "@openc3/tool-common": "5.14.1",
     "@astrouxds/astro-web-components": "7.20.0",
     "axios": "1.6.5",
     "date-fns": "2.30.0",

data/templates/widget/package.json

@@ -1,12 +1,12 @@
 {
   "name": "widget",
-  "version": "5.14.0",
+  "version": "5.14.1",
   "private": true,
   "scripts": {
     "build": "vue-cli-service build --target lib --dest tools/widgets/<%= widget_name %> --formats umd-min <%= widget_path %> --name <%= widget_name %>"
   },
   "dependencies": {
-    "@openc3/tool-common": "5.14.0",
+    "@openc3/tool-common": "5.14.1",
     "@astrouxds/astro-web-components": "7.20.0",
     "vue": "2.7.16",
     "vuetify": "2.7.1"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openc3
 version: !ruby/object:Gem::Version
-  version: 5.14.0
+  version: 5.14.1
 platform: ruby
 authors:
 - Ryan Melton
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-18 00:00:00.000000000 Z
+date: 2024-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler