openc3 7.0.0.pre.rc1 → 7.0.0.pre.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 716b55f22220d1ee722f05550fcb177cea96e9898356a62bfa970e4222f7c7fa
-  data.tar.gz: 2a8db01e57ce7215d352d38682f3c25893828c8a500d8fd5d8f0e3b09ab854e7
+  metadata.gz: a7c545191fe3248b560961c422b5906474a068d06df3d480a35a61dba621e469
+  data.tar.gz: 77b9201a38591fad76787947918fd6910a8599e09368cdfdf9d0870520a9f073
 SHA512:
-  metadata.gz: c74aaf9e7b3f4a0c176c002cc54b53388d291d50377814c16e13ab7276d8d567a38634c0a2fa51d6c5e9738270fcd1f851c0ea36b03ab3f4ea5ea499f43f3550
-  data.tar.gz: 2c97ee833cb18b8725caeab3b2ebe0347d85f8e6c4dcb4d531395f1c7c9e3be68d6405bd8d65a151bf989c4a66a945753c160b9a7fc05227d6f54f60dcc84c02
+  metadata.gz: 164c14d7fd49d30bcaf8f8838cd2e3d63c3fbbccb514e7b5a40348868e68317100d8a48beda0a3015959d0f49d3093b40b1184e517093ae7a4df4aafb8710be0
+  data.tar.gz: cb6276f37e41717565abbbb24d7df1006cf4dfbfdeff92c76b34638dff29279dcfed536aced5a488d1aacf63541568d3a0c8da4b7edd5ecaed9f792b3a12a7ae

data/data/config/command_modifiers.yaml

@@ -266,6 +266,15 @@ TEMPLATE:
       description: The template string which should be enclosed in quotes
       values: "['\"].*['\"]"
   since: 5.0.10
+TEMPLATE_BASE64:
+  summary: Defines a template binary as base64 used to initialize the command before default values are filled in
+  description: Base64 encoded binary data
+  parameters:
+    - name: Template
+      required: true
+      description: The template string as base64 data
+      values: .+
+  since: 7.0.0
 TEMPLATE_FILE:
   summary: Defines a template file used to initialize the command before default values are filled in
   description: Generally the template file is formatted in JSON or HTML and then values are filled in with

data/data/config/telemetry_modifiers.yaml

@@ -259,6 +259,15 @@ TEMPLATE:
       description: The template string which should be enclosed in quotes
       values: "['\"].*['\"]"
   since: 5.0.10
+TEMPLATE_BASE64:
+  summary: Defines a template binary as base64 used to to pull telemetry values from a string buffer
+  description: Base64 encoded binary data
+  parameters:
+    - name: Template
+      required: true
+      description: The template string as base64 data
+      values: .+
+  since: 7.0.0
 TEMPLATE_FILE:
   summary: Defines a template file used to pull telemetry values from a string buffer
   parameters:

data/lib/openc3/accessors/accessor.rb

@@ -26,8 +26,9 @@ module OpenC3
     def read_item(item, buffer)
       if item.parent_item
         # Structure is used to read items with parent, not accessor
-        structure_buffer = read_item(item.parent_item, buffer)
-        structure = item.parent_item.structure
+        parent_item = @packet.get_item(item.parent_item)
+        structure_buffer = read_item(parent_item, buffer)
+        structure = parent_item.structure
         structure.read(item.key, :RAW, structure_buffer)
       else
         self.class.read_item(item, buffer)
@@ -37,10 +38,11 @@ module OpenC3
     def write_item(item, value, buffer)
       if item.parent_item
         # Structure is used to write items with parent, not accessor
-        structure_buffer = read_item(item.parent_item, buffer)
-        structure = item.parent_item.structure
+        parent_item = @packet.get_item(item.parent_item)
+        structure_buffer = read_item(parent_item, buffer)
+        structure = parent_item.structure
         structure.write(item.key, value, :RAW, structure_buffer)
-        self.class.write_item(item.parent_item, structure_buffer, buffer)
+        self.class.write_item(parent_item, structure_buffer, buffer)
       else
         self.class.write_item(item, value, buffer)
       end

data/lib/openc3/accessors/binary_accessor.rb

@@ -133,10 +133,11 @@ module OpenC3
     def read_item(item, buffer)
       return nil if item.data_type == :DERIVED
       if item.parent_item
-        handle_read_variable_bit_size(item.parent_item, buffer) if item.parent_item.variable_bit_size
+        parent_item = @packet.get_item(item.parent_item)
+        handle_read_variable_bit_size(parent_item, buffer) if parent_item.variable_bit_size
         # Structure is used to read items with parent, not accessor
-        structure_buffer = read_item(item.parent_item, buffer)
-        structure = item.parent_item.structure
+        structure_buffer = read_item(parent_item, buffer)
+        structure = parent_item.structure
         structure.read(item.key, :RAW, structure_buffer)
       else
         handle_read_variable_bit_size(item, buffer) if item.variable_bit_size
@@ -275,11 +276,12 @@ module OpenC3
       return nil if item.data_type == :DERIVED
       if item.parent_item
         # Structure is used to write items with parent, not accessor
-        structure_buffer = read_item(item.parent_item, buffer)
-        structure = item.parent_item.structure
+        parent_item = @packet.get_item(item.parent_item)
+        structure_buffer = read_item(parent_item, buffer)
+        structure = parent_item.structure
         structure.write(item.key, value, :RAW, structure_buffer)
-        handle_write_variable_bit_size(item.parent_item, structure_buffer, buffer) if item.parent_item.variable_bit_size
-        self.class.write_item(item.parent_item, structure_buffer, buffer)
+        handle_write_variable_bit_size(parent_item, structure_buffer, buffer) if parent_item.variable_bit_size
+        self.class.write_item(parent_item, structure_buffer, buffer)
       else
         handle_write_variable_bit_size(item, value, buffer) if item.variable_bit_size
         self.class.write_item(item, value, buffer)

data/lib/openc3/models/cvt_model.rb

@@ -159,7 +159,7 @@ module OpenC3
           current_position += 1
           next
         end
-        table_name = QuestDBClient.sanitize_table_name(target_name, packet_name)
+        table_name = QuestDBClient.sanitize_table_name(target_name, packet_name, scope: scope)
         tables[table_name] = 1
         index = tables.find_index {|k,v| k == table_name }
 
@@ -406,7 +406,7 @@ module OpenC3
       # If a start_time is passed we're doing a QuestDB lookup and directly return the results
       # TODO: This currently does NOT support the override values
       if start_time
-        return tsdb_lookup(items, start_time: start_time, end_time: end_time)
+        return tsdb_lookup(items, start_time: start_time, end_time: end_time, scope: scope)
       end
 
       # First generate a lookup hash of all the items represented so we can query the CVT

data/lib/openc3/models/microservice_model.rb

@@ -200,8 +200,16 @@ module OpenC3
         @cmd = parameters.dup
         # Automatically use UV venv Python for user microservices to ensure openc3 module is found
         # Replace 'python', 'python3', or 'python3.X' with the correct Python binary
-        if @cmd[0] =~ /^python3?(\.[\d]+)?$/
-          @cmd[0] = ENV['OPENC3_PYTHON_BIN'] || '/openc3/python/.venv/bin/python'
+        # Handles both split form: CMD python start.py -> ["python", "start.py"]
+        # and quoted single-string form: CMD "python start.py" -> ["python start.py"]
+        python_bin = ENV['OPENC3_PYTHON_BIN'] || '/openc3/python/.venv/bin/python'
+        # Handle split form:  CMD python start.py  => @cmd = ["python", "start.py"]
+        if @cmd[0] =~ /^python3?(\.\d+)*$/
+          @cmd[0] = python_bin
+        # Handle quoted single-string form: CMD "python start.py" => @cmd = ["python start.py"]
+        elsif @cmd[0] =~ /^python3?(\.\d+)*\s+/
+          _exe, rest = @cmd[0].split(/\s+/, 2)
+          @cmd = [python_bin, rest]
         end
       when 'OPTION'
         parser.verify_num_parameters(2, nil, "#{keyword} <Option Name> <Option Values>")

data/lib/openc3/models/plugin_model.rb

@@ -192,9 +192,11 @@ module OpenC3
         tf = nil
 
         # Get the gem from local gem server if it hasn't been passed
-        unless gem_file_path
+        if gem_file_path.nil?
           gem_name = plugin_hash['name'].split("__")[0]
           gem_file_path = OpenC3::GemModel.get(gem_name)
+        else
+          gem_name = File.basename(gem_file_path)
         end
 
         # Attempt to remove all older versions of this same plugin before install to prevent version conflicts

data/lib/openc3/packets/packet.rb

@@ -602,7 +602,7 @@ module OpenC3
         cloned_item = sorted_item.clone
         cloned_item.key = cloned_item.name
         cloned_item.name = "#{item.name}.#{cloned_item.name}"
-        cloned_item.parent_item = item
+        cloned_item.parent_item = item.name
         cloned_item.bit_offset = item.bit_offset
         if sorted_item.bit_size <= 0
           cloned_item.bit_size = item.bit_size
@@ -1140,9 +1140,8 @@ module OpenC3
       if @validator
         config << "  VALIDATOR #{@validator.class} #{@validator.args.map { |a| a.to_s.quote_if_necessary }.join(" ")}\n"
       end
-      # TODO: Add TEMPLATE_ENCODED so this can always be done inline regardless of content
       if @template
-        config << "  TEMPLATE '#{@template}'\n"
+        config << "  TEMPLATE_BASE64 #{Base64.strict_encode64(@template)}\n"
       end
       config << "  ALLOW_SHORT\n" if @short_buffer_allowed
       config << "  HAZARDOUS #{@hazardous_description.to_s.quote_if_necessary}\n" if @hazardous
@@ -1228,7 +1227,7 @@ module OpenC3
       config['accessor'] = @accessor.class.to_s
       config['accessor_args'] = @accessor.args
       config['validator'] = @validator.class.to_s if @validator
-      config['template'] = Base64.encode64(@template) if @template
+      config['template'] = Base64.strict_encode64(@template) if @template
       config['config_name'] = self.config_name
       config['obfuscated_items'] = @obfuscated_items&.map(&:name) || []
 

data/lib/openc3/packets/packet_config.rb

@@ -30,6 +30,7 @@ require 'openc3/utilities/python_proxy'
 require 'openc3/conversions'
 require 'openc3/processors'
 require 'openc3/accessors'
+require 'base64'
 require 'nokogiri'
 require 'ostruct'
 require 'fileutils'
@@ -239,7 +240,7 @@ module OpenC3
               'PARAMETER', 'ID_ITEM', 'ID_PARAMETER', 'ARRAY_ITEM', 'ARRAY_PARAMETER', 'APPEND_ITEM',\
               'APPEND_PARAMETER', 'APPEND_ID_ITEM', 'APPEND_ID_PARAMETER', 'APPEND_ARRAY_ITEM',\
               'APPEND_ARRAY_PARAMETER', 'ALLOW_SHORT', 'HAZARDOUS', 'PROCESSOR', 'META',\
-              'DISABLE_MESSAGES', 'HIDDEN', 'DISABLED', 'VIRTUAL', 'CATCHALL', 'RESTRICTED', 'ACCESSOR', 'TEMPLATE', 'TEMPLATE_FILE',\
+              'DISABLE_MESSAGES', 'HIDDEN', 'DISABLED', 'VIRTUAL', 'CATCHALL', 'RESTRICTED', 'ACCESSOR', 'TEMPLATE', 'TEMPLATE_BASE64', 'TEMPLATE_FILE',\
               'RESPONSE', 'ERROR_RESPONSE', 'SCREEN', 'RELATED_ITEM', 'IGNORE_OVERLAP', 'VALIDATOR', 'SUBPACKET', 'SUBPACKETIZER',\
               'STRUCTURE', 'APPEND_STRUCTURE'
             raise parser.error("No current packet for #{keyword}") unless @current_packet
@@ -598,14 +599,19 @@ module OpenC3
       when 'TEMPLATE'
         usage = "#{keyword} <Template string>"
         parser.verify_num_parameters(1, 1, usage)
-        @current_packet.template = params[0]
+        @current_packet.template = params[0].force_encoding('ascii-8bit')
+
+      when 'TEMPLATE_BASE64'
+        usage = "#{keyword} <Template string>"
+        parser.verify_num_parameters(1, 1, usage)
+        @current_packet.template = Base64.decode64(params[0])
 
       when 'TEMPLATE_FILE'
         usage = "#{keyword} <Template file path>"
         parser.verify_num_parameters(1, 1, usage)
 
         begin
-          @current_packet.template = parser.read_file(params[0])
+          @current_packet.template = parser.read_file(params[0]).force_encoding('ascii-8bit')
         rescue Exception => e
           raise parser.error(e.formatted)
         end

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

@@ -173,8 +173,16 @@ module OpenC3
       algorithm_xml = Nokogiri::XML::Builder.new do |alg_xml|
         alg_xml.AlgorithmSet do
           derived.each do |packet_name, item|
+            rc = item.read_conversion
+            # PythonProxy overrides .class to return a String, so handle both cases
+            conv_name = if rc
+              rc_class = rc.class
+              rc_class.is_a?(String) ? rc_class : rc_class.name
+            else
+              "NoConversion"
+            end
             alg_xml.CustomAlgorithm("name" => "#{packet_name.tr(INVALID_CHARS, REPLACEMENT_CHAR)}_" \
-                                    "#{item.name.tr(INVALID_CHARS, REPLACEMENT_CHAR)}_#{item.read_conversion.class.name}") do
+                                    "#{item.name.tr(INVALID_CHARS, REPLACEMENT_CHAR)}_#{conv_name}") do
               alg_xml.ExternalAlgorithmSet do
                 alg_xml.ExternalAlgorithm("implementationName" => "TODO", "algorithmLocation" => "TODO")
               end

data/lib/openc3/packets/structure_item.rb

@@ -334,7 +334,7 @@ module OpenC3
         hash['variable_bit_size'] = @variable_bit_size
       end
       if self.parent_item
-        hash['parent_item'] = self.parent_item.as_json
+        hash['parent_item'] = self.parent_item
       end
       if self.structure
         hash['structure'] = self.structure.as_json

data/lib/openc3/utilities/questdb_client.rb

@@ -162,9 +162,10 @@ module OpenC3
     # @param target_name [String] Target name
     # @param packet_name [String] Packet name
     # @param cmd_or_tlm [String, Symbol] "CMD" or "TLM" prefix (default "TLM")
+    # @param scope [String] Scope name (default "DEFAULT")
     # @return [String] Sanitized table name
-    def self.sanitize_table_name(target_name, packet_name, cmd_or_tlm = "TLM")
-      "#{cmd_or_tlm}__#{target_name}__#{packet_name}".gsub(/[?,'"\\\/:\)\(\+\*\%~]/, '_')
+    def self.sanitize_table_name(target_name, packet_name, cmd_or_tlm = "TLM", scope: "DEFAULT")
+      "#{scope}__#{cmd_or_tlm}__#{target_name}__#{packet_name}".gsub(/[?,'"\\\/:\)\(\+\*\%~]/, '_')
     end
 
     # Sanitize a column name for QuestDB.

data/lib/openc3/utilities/running_script.rb

@@ -341,6 +341,7 @@ class RunningScript
   attr_accessor :user_input
   attr_accessor :prompt_id
   attr_reader :script_status
+  attr_reader :suite_report
   attr_accessor :execute_while_paused_info
 
   # This REGEX is also found in scripts_controller.rb
@@ -1210,7 +1211,7 @@ class RunningScript
       elsif parts[0] and init_split.length > 1
         parts[0] += "_#{init_split[-1]}"
       end
-      running_script_anycable_publish("running-script-channel:#{@script_status.id}", { type: :report, report: OpenC3::SuiteRunner.suite_results.report })
+      @suite_report = OpenC3::SuiteRunner.suite_results.report
       # Write out the report to a local file
       log_dir = File.join(RAILS_ROOT, 'log')
       filename = File.join(log_dir, File.build_timestamped_filename(['sr', parts.join('__')]))

data/lib/openc3/version.rb

@@ -1,14 +1,14 @@
 # encoding: ascii-8bit
 
-OPENC3_VERSION = '7.0.0-rc1'
+OPENC3_VERSION = '7.0.0-rc2'
 module OpenC3
   module Version
     MAJOR = '7'
     MINOR = '0'
     PATCH = '0'
-    OTHER = 'pre.rc1'
-    BUILD = 'a12aa8aec00dea1fcb9125ef87bbea432b45f9d3'
+    OTHER = 'pre.rc2'
+    BUILD = 'f3aa0d40478504753a1f4728bae52e02342c50f9'
   end
-  VERSION = '7.0.0-rc1'
-  GEM_VERSION = '7.0.0.pre.rc1'
+  VERSION = '7.0.0-rc2'
+  GEM_VERSION = '7.0.0.pre.rc2'
 end

data/templates/tool_angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "<%= tool_name %>",
-  "version": "7.0.0-rc1",
+  "version": "7.0.0-rc2",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",

data/templates/tool_vue/package.json

@@ -1,6 +1,6 @@
 {
   "name": "<%= tool_name %>",
-  "version": "7.0.0-rc1",
+  "version": "7.0.0-rc2",
   "private": true,
   "type": "module",
   "scripts": {

data/templates/widget/package.json

@@ -1,6 +1,6 @@
 {
   "name": "<%= widget_name %>",
-  "version": "7.0.0-rc1",
+  "version": "7.0.0-rc2",
   "private": true,
   "type": "module",
   "scripts": {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openc3
 version: !ruby/object:Gem::Version
-  version: 7.0.0.pre.rc1
+  version: 7.0.0.pre.rc2
 platform: ruby
 authors:
 - Ryan Melton