openc3 5.16.1 → 5.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ac82073ce5dfe75636cde46ad9bb2c0969653414ed774e02932f6f3c0d93ac5
-  data.tar.gz: f372bc340015f6a32c9df038f8601f7be44e57782f95bfc9b8290592820b46e4
+  metadata.gz: 178d5ecd9984ee77cc79a3f4e6b84f793a863aa01dc1da87cb318ddff90f0397
+  data.tar.gz: cab3009043a7f423cd11f882f8639790d890588fae5ada6aa7dae868bf78b3ed
 SHA512:
-  metadata.gz: 90152ca7620ed0f1a7c1292d12a89fa1fcc503e4320ca430da04d4fad2c586669baf9c6f5f61de5943d029ce4a7e67d2dab1cb3f59abd42bd158dce80a863cb9
-  data.tar.gz: a5b1d9a4c815b8d2d3a9c6a35b351be0c3a0f25d9d89bbe53d1c76e510d39f7983c03fc26a3ee6010cee222b1675843782d6587fd8fcc6045abf298b7f461e6c
+  metadata.gz: f3197aabb417f5a467b4cbcdbb48c9a7523002ecf9b58930aa37a31d521abf5ce132b66c27a77ca14cb0676badeb42a8d689991e226be50577ddddccfced0a58
+  data.tar.gz: aa8749e4a08c4891a7aa4aa72d46474d5b4bfa17da047ef8f537b727fda31e9225dba24121e7680b6458fa5abfcdafdf6221d86b06d0adb9362f8bead3691496

data/bin/openc3cli

@@ -316,7 +316,7 @@ def validate_plugin(plugin_file_path, scope:, variables_file: nil)
   puts "Successfully validated #{File.basename(plugin_file_path)}"
   result = 0 # bash and Windows consider 0 success
 rescue => e
-  puts "Error: #{e.message}"
+  puts e.message
   result = ERROR_CODE
 ensure
   exit(result)

data/lib/openc3/config/config_parser.rb

@@ -125,10 +125,10 @@ module OpenC3
       #   default this gets constructed to point to the generic configuration
       #   Guide on the OpenC3 Wiki.
       def initialize(config_parser, message = "Configuration Error", usage = "", url = "")
-        if Error == message
+        if Error === message
           super(message.message)
-        elsif Exception == message
-          super("#{message.class}:#{message.message}")
+        elsif Exception === message
+          super("#{message.class}: #{message.message}")
         else
           super(message)
         end
@@ -449,18 +449,24 @@ module OpenC3
       return if errors.empty?
       message = ''
       errors.each do |error|
+        # Once we have a message we want to ignore errors about bad items, packets, and targets
+        # because the real error is probably in a previous definition
+        next if message != '' && error.message.include?('No current item')
+        next if message != '' && error.message.include?('No current packet')
+        next if message != '' && error.message.include?('Unknown keyword and parameters for Target')
+
         if error.is_a? OpenC3::ConfigParser::Error
-          message += "\n#{File.basename(error.filename)}:#{error.line_number}: #{error.line}"
+          message += "\n#{File.basename(error.filename)}:#{error.line_number}: #{error.line}" if error.filename
           message += "\nError: #{error.message}"
           message += "\nUsage: #{error.usage}" unless error.usage.empty?
-          message += "\nBacktrace:"
-          message += "\n#{error.backtrace.join("\n")}"
-        else
-          message += "\n#{error.formatted}"
+          message += "\n"
+        # Only capture the first non-ConfigParser::Error which is typically
+        # a RuntimeError generated from a raise during parsing
+        elsif message == ''
+          message += "\n#{error.formatted}\n"
         end
-        message += "\n"
       end
-      raise message
+      raise Error.new(self, message)
     end
 
     if RUBY_ENGINE != 'ruby' or ENV['OPENC3_NO_EXT']

data/lib/openc3/models/plugin_model.rb

@@ -245,13 +245,19 @@ module OpenC3
               when 'VARIABLE', 'NEEDS_DEPENDENCIES'
                 # Ignore during phase 2
               when 'TARGET', 'INTERFACE', 'ROUTER', 'MICROSERVICE', 'TOOL', 'WIDGET'
-                if current_model
-                  current_model.create unless validate_only
-                  current_model.deploy(gem_path, variables, validate_only: validate_only)
+                begin
+                  if current_model
+                    current_model.create unless validate_only
+                    current_model.deploy(gem_path, variables, validate_only: validate_only)
+                  end
+                # If something goes wrong in create, or more likely in deploy,
+                # we want to clear the current_model and try to instantiate the next
+                # Otherwise we're stuck constantly iterating on the last model
+                ensure
                   current_model = nil
+                  current_model = OpenC3.const_get((keyword.capitalize + 'Model').intern).handle_config(parser,
+                    keyword, params, plugin: plugin_model.name, needs_dependencies: needs_dependencies, scope: scope)
                 end
-                current_model = OpenC3.const_get((keyword.capitalize + 'Model').intern).handle_config(parser,
-                  keyword, params, plugin: plugin_model.name, needs_dependencies: needs_dependencies, scope: scope)
               else
                 if current_model
                   current_model.handle_config(parser, keyword, params)
@@ -271,10 +277,10 @@ module OpenC3
             $LOAD_PATH.delete(load_dir)
           end
         end
-      rescue => err
+      rescue => e
         # Install failed - need to cleanup
         plugin_model.destroy unless validate_only
-        raise err
+        raise e
       ensure
         FileUtils.remove_entry(temp_dir) if temp_dir and File.exist?(temp_dir)
         tf.unlink if tf
@@ -301,7 +307,7 @@ module OpenC3
       super(update: update, force: force, queued: queued)
     end
 
-    def as_json(*a)
+    def as_json(*_a)
       {
         'name' => @name,
         'variables' => @variables,
@@ -316,11 +322,11 @@ module OpenC3
       errors = []
       microservice_count = 0
       microservices = MicroserviceModel.find_all_by_plugin(plugin: @name, scope: @scope)
-      microservices.each do |name, model_instance|
+      microservices.each do |_name, model_instance|
         begin
           model_instance.destroy
-        rescue Exception => error
-          errors << error
+        rescue Exception => e
+          errors << e
         end
         microservice_count += 1
       end
@@ -329,20 +335,20 @@ module OpenC3
       # Remove all the other models now that the processes have stopped
       # Save TargetModel for last as it has the most to cleanup
       [InterfaceModel, RouterModel, ToolModel, WidgetModel, TargetModel].each do |model|
-        model.find_all_by_plugin(plugin: @name, scope: @scope).each do |name, model_instance|
+        model.find_all_by_plugin(plugin: @name, scope: @scope).each do |_name, model_instance|
           begin
             model_instance.destroy
-          rescue Exception => error
-            errors << error
+          rescue Exception => e
+            errors << e
           end
         end
       end
       # Cleanup Redis stuff that might have been left by microservices
-      microservices.each do |name, model_instance|
+      microservices.each do |_name, model_instance|
         begin
           model_instance.cleanup
-        rescue Exception => error
-          errors << error
+        rescue Exception => e
+          errors << e
         end
       end
       # Raise all the errors at once
@@ -353,13 +359,13 @@ module OpenC3
         end
         raise message
       end
-    rescue Exception => error
-      Logger.error("Error undeploying plugin model #{@name} in scope #{@scope} due to: #{error.formatted}")
+    rescue Exception => e
+      Logger.error("Error undeploying plugin model #{@name} in scope #{@scope} due to: #{e.formatted}")
     ensure
       # Double check everything is gone
       found = []
       [MicroserviceModel, InterfaceModel, RouterModel, ToolModel, WidgetModel, TargetModel].each do |model|
-        model.find_all_by_plugin(plugin: @name, scope: @scope).each do |name, model_instance|
+        model.find_all_by_plugin(plugin: @name, scope: @scope).each do |_name, model_instance|
           found << model_instance
         end
       end

data/lib/openc3/models/target_model.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
@@ -753,7 +753,7 @@ module OpenC3
       packet_hash.each do |target_name, packets|
         Store.del("#{@scope}__openc3tlm__#{target_name}") if clear_old
         packets.each do |packet_name, packet|
-          Logger.info "Configuring tlm packet: #{target_name} #{packet_name}"
+          Logger.debug "Configuring tlm packet: #{target_name} #{packet_name}"
           begin
             Store.hset("#{@scope}__openc3tlm__#{target_name}", packet_name, JSON.generate(packet.as_json(:allow_nan => true)))
           rescue JSON::GeneratorError => e
@@ -773,7 +773,7 @@ module OpenC3
       packet_hash.each do |target_name, packets|
         Store.del("#{@scope}__openc3cmd__#{target_name}") if clear_old
         packets.each do |packet_name, packet|
-          Logger.info "Configuring cmd packet: #{target_name} #{packet_name}"
+          Logger.debug "Configuring cmd packet: #{target_name} #{packet_name}"
           begin
             Store.hset("#{@scope}__openc3cmd__#{target_name}", packet_name, JSON.generate(packet.as_json(:allow_nan => true)))
           rescue JSON::GeneratorError => e

data/lib/openc3/packets/packet.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
@@ -396,7 +396,7 @@ module OpenC3
     # @return [Array<String>] Warning messages for big definition overlaps
     def check_bit_offsets
       if @ignore_overlap
-        Logger.instance.info("#{@target_name} #{@packet_name} has IGNORE_OVERLAP so bit overlaps ignored")
+        Logger.instance.debug("#{@target_name} #{@packet_name} has IGNORE_OVERLAP so bit overlaps ignored")
         return []
       end
       expected_next_offset = nil

data/lib/openc3/packets/packet_config.rb

@@ -488,7 +488,7 @@ module OpenC3
             end
           end
         rescue Exception => e
-          raise parser.error(e)
+          raise parser.error(e.formatted)
         end
 
       when 'TEMPLATE'
@@ -503,7 +503,7 @@ module OpenC3
         begin
           @current_packet.template = parser.read_file(params[0])
         rescue Exception => e
-          raise parser.error(e)
+          raise parser.error(e.formatted)
         end
 
       when 'RESPONSE'

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

@@ -66,8 +66,6 @@ module OpenC3
           item.limits.response = PythonProxy.new('LimitsResponse', @parser.parameters[0], [])
         end
       end
-    rescue Exception => e
-      raise @parser.error(e, @usage)
     end
   end
 end

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

@@ -88,8 +88,6 @@ module OpenC3
         item = packet.define(item)
       end
       item
-    rescue => err
-      raise @parser.error(err, @usage)
     end
 
     private
@@ -105,17 +103,16 @@ module OpenC3
 
     def get_bit_offset
       return 0 if append?
-
       Integer(@parser.parameters[1])
-    rescue => err # In case Integer fails
-      raise @parser.error(err, @usage)
+    rescue => e
+      raise @parser.error(e, @usage)
     end
 
     def get_bit_size
       index = append? ? 1 : 2
       Integer(@parser.parameters[index])
-    rescue => err
-      raise @parser.error(err, @usage)
+    rescue => e
+      raise @parser.error(e, @usage)
     end
 
     def get_array_size
@@ -133,8 +130,8 @@ module OpenC3
         @warnings << warning
       end
       array_bit_size
-    rescue => err
-      raise @parser.error(err, @usage)
+    rescue => e
+      raise @parser.error(e, @usage)
     end
 
     def get_endianness(packet)

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

@@ -71,8 +71,6 @@ module OpenC3
       end
       processor.name = get_processor_name()
       packet.processors[processor.name] = processor
-    rescue Exception => err
-      raise @parser.error(err, @usage)
     end
 
     private

data/lib/openc3/system/system.rb

@@ -183,7 +183,7 @@ module OpenC3
         errors << "Error processing #{cmd_tlm_file}:\n#{e.message}"
       end
       unless errors.empty?
-        raise errors.join("\n")
+        raise parser.error(errors.join("\n"))
       end
     end
   end

data/lib/openc3/system/target.rb

@@ -140,11 +140,11 @@ module OpenC3
                 filename = parameters[0]
                 OpenC3.require_file(parameters[0])
               end
-            rescue Exception => err
-              raise parser.error(err.message)
+            rescue Exception => e
+              raise parser.error(e.formatted)
             end
           rescue Exception => e
-            raise parser.error(e.message)
+            raise parser.error(e.formatted)
           end
 
           # This code resolves any relative paths to absolute before putting into the @requires array

data/lib/openc3/tools/table_manager/table_item_parser.rb

@@ -17,7 +17,7 @@
 # All changes Copyright 2022, OpenC3, Inc.
 # All Rights Reserved
 #
-# This file may also be used under the terms of a commercial license 
+# This file may also be used under the terms of a commercial license
 # if purchased from OpenC3, Inc.
 
 require 'openc3/packets/packet_config'
@@ -62,8 +62,6 @@ module OpenC3
         item = table.define(item)
       end
       item
-    rescue => err
-      raise @parser.error(err, @usage)
     end
   end
 end

data/lib/openc3/utilities/local_mode.rb

@@ -47,6 +47,7 @@ module OpenC3
       'openc3-enterprise-tool-base',
       'openc3-cosmos-tool-autonomic',
       'openc3-cosmos-tool-calendar',
+      'openc3-cosmos-tool-grafana',
       'openc3-tool-base',
     ]
 
@@ -168,7 +169,7 @@ module OpenC3
               json = JSON.parse(data, :allow_nan => true, :create_additions => true)
 
               found = false
-              found_models.each do |name, model_details|
+              found_models.each do |name, _model_details|
                 if json["name"] == name
                   # Matched pair
                   found = true
@@ -339,7 +340,7 @@ module OpenC3
     def self.modified_targets(scope:)
       targets = {}
       local_catalog = build_local_catalog(scope: scope)
-      local_catalog.each do |key, size|
+      local_catalog.each do |key, _size|
         split_key = key.split('/') # scope/targets_modified/target_name/*
         target_name = split_key[2]
         if target_name
@@ -352,7 +353,7 @@ module OpenC3
     def self.modified_files(target_name, scope:)
       modified = []
       local_catalog = build_local_catalog(scope: scope)
-      local_catalog.each do |key, size|
+      local_catalog.each do |key, _size|
         split_key = key.split('/') # scope/targets_modified/target_name/*
         local_target_name = split_key[2]
         if target_name == local_target_name
@@ -399,7 +400,7 @@ module OpenC3
     def self.local_target_files(scope:, path_matchers:, include_temp: false)
       files = []
       local_catalog = build_local_catalog(scope: scope)
-      local_catalog.each do |key, size|
+      local_catalog.each do |key, _size|
         split_key = key.split('/')
         # DEFAULT/targets_modified/__TEMP__/YYYY_MM_DD_HH_MM_SS_mmm_temp.rb
         # See target_file.rb TEMP_FOLDER
@@ -434,8 +435,8 @@ module OpenC3
             JSON.parse(data, :allow_nan => true, :create_additions => true)
             # Only save if the parse was successful
             ToolConfigModel.save_config(parts[-2], File.basename(config, '.json'), data, scope: scope, local_mode: false)
-          rescue JSON::ParserError => error
-            puts "Unable to initialize tool config due to #{error.message}"
+          rescue JSON::ParserError => e
+            puts "Unable to initialize tool config due to #{e.message}"
           end
         end
       end
@@ -555,7 +556,7 @@ module OpenC3
         end
       end
 
-      remote_catalog.each do |key, size|
+      remote_catalog.each do |key, _size|
         local_size = local_catalog[key]
         if local_size
           # Both files exist - Handled earlier

data/lib/openc3/version.rb

@@ -1,14 +1,14 @@
 # encoding: ascii-8bit
 
-OPENC3_VERSION = '5.16.1'
+OPENC3_VERSION = '5.16.2'
 module OpenC3
   module Version
     MAJOR = '5'
     MINOR = '16'
-    PATCH = '1'
+    PATCH = '2'
     OTHER = ''
-    BUILD = 'd21b56e140b77e4b5e859c7d51c5544e42a8f833'
+    BUILD = '91e39a71be955ef5d20c474b73d8bc9a3f895284'
   end
-  VERSION = '5.16.1'
-  GEM_VERSION = '5.16.1'
+  VERSION = '5.16.2'
+  GEM_VERSION = '5.16.2'
 end

data/templates/conversion/conversion.py

@@ -1,4 +1,6 @@
 from openc3.conversions.conversion import Conversion
+# Using tlm() requires the following:
+# from openc3.api.tlm_api import tlm
 
 # Custom conversion class
 # See https://docs.openc3.com/docs/configuration/telemetry#read_conversion
@@ -26,3 +28,4 @@ class <%= conversion_class %>(Conversion):
         # Used when conversion is applied to a regular (not DERIVED) item
         # NOTE: You can also use packet.read("ITEM") to get additional values
         # return value / 2 * packet.read("OTHER_ITEM")
+        return value

data/templates/limits_response/response.py

@@ -1,5 +1,5 @@
 from openc3.packets.limits_response import LimitsResponse
-
+from openc3.api import *
 
 class <%= response_class %>(LimitsResponse):
     # @param packet [Packet] Packet the limits response is assigned to

data/templates/tool_angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "<%= tool_name %>",
-  "version": "5.16.1",
+  "version": "5.16.2",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -12,7 +12,7 @@
   },
   "private": true,
   "dependencies": {
-    "@openc3/tool-common": "5.16.1",
+    "@openc3/tool-common": "5.16.2",
     "@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.16.1",
+    "@openc3/tool-common": "5.16.2",
     "@astrouxds/astro-web-components": "7.22.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.16.1",
+  "version": "5.16.2",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -11,7 +11,7 @@
     "test:components": "vue-cli-service test:components"
   },
   "dependencies": {
-    "@openc3/tool-common": "5.16.1",
+    "@openc3/tool-common": "5.16.2",
     "@astrouxds/astro-web-components": "7.22.0",
     "axios": "1.6.8",
     "date-fns": "3.6.0",

data/templates/widget/package.json

@@ -1,12 +1,12 @@
 {
   "name": "widget",
-  "version": "5.16.1",
+  "version": "5.16.2",
   "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.16.1",
+    "@openc3/tool-common": "5.16.2",
     "@astrouxds/astro-web-components": "7.22.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.16.1
+  version: 5.16.2
 platform: ruby
 authors:
 - Ryan Melton
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-08 00:00:00.000000000 Z
+date: 2024-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler