openc3 6.10.4 → 7.0.0.pre.rc2

data/lib/openc3/topics/queue_topic.rb

@@ -1,17 +1,12 @@
 # encoding: ascii-8bit
 
-# Copyright 2025 OpenC3, Inc.
+# Copyright 2026 OpenC3, Inc.
 # All Rights Reserved.
 #
-# This program is free software; you can modify and/or redistribute it
-# under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation; version 3 with
-# attribution addendums as found in the LICENSE.txt
-#
 # 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 the
-# GNU Affero General Public License for more details.
+# 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.

data/lib/openc3/topics/router_topic.rb

@@ -3,18 +3,13 @@
 # Copyright 2022 Ball Aerospace & Technologies Corp.
 # All Rights Reserved.
 #
-# This program is free software; you can modify and/or redistribute it
-# under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation; version 3 with
-# attribution addendums as found in the LICENSE.txt
-#
 # 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 the
-# GNU Affero General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See LICENSE.md for more details.
 
 # Modified by OpenC3, Inc.
-# All changes Copyright 2022, OpenC3, Inc.
+# All changes Copyright 2026, OpenC3, Inc.
 # All Rights Reserved
 #
 # This file may also be used under the terms of a commercial license

data/lib/openc3/topics/system_events_topic.rb

@@ -1,17 +1,12 @@
 # encoding: ascii-8bit
 
-# Copyright 2024 OpenC3, Inc.
+# Copyright 2026 OpenC3, Inc.
 # All Rights Reserved.
 #
-# This program is free software; you can modify and/or redistribute it
-# under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation; version 3 with
-# attribution addendums as found in the LICENSE.txt
-#
 # 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 the
-# GNU Affero General Public License for more details.
+# 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.

data/lib/openc3/topics/telemetry_decom_topic.rb

@@ -3,18 +3,13 @@
 # Copyright 2022 Ball Aerospace & Technologies Corp.
 # All Rights Reserved.
 #
-# This program is free software; you can modify and/or redistribute it
-# under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation; version 3 with
-# attribution addendums as found in the LICENSE.txt
-#
 # 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 the
-# GNU Affero General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See LICENSE.md for more details.
 
 # Modified by OpenC3, Inc.
-# All changes Copyright 2022, OpenC3, Inc.
+# All changes Copyright 2026, OpenC3, Inc.
 # All Rights Reserved
 #
 # This file may also be used under the terms of a commercial license
@@ -30,25 +25,30 @@ module OpenC3
         # Need to build a JSON hash of the decommutated data
         # Support "downward typing"
         # everything base name is RAW (including DERIVED)
-        # Request for WITH_UNITS, etc will look down until it finds something
+        # Request for FORMATTED, etc will look down until it finds something
         # If nothing - item does not exist - nil
-        # __ as separators ITEM1, ITEM1__C, ITEM1__F, ITEM1__U
+        # __ as separators ITEM1, ITEM1__C, ITEM1__F
 
         json_hash = CvtModel.build_json_from_packet(packet)
+        # Convert to JSON-safe types once and reuse for both topic write and CVT set
+        json_safe_hash = json_hash.as_json
+        json_data = JSON.generate(json_safe_hash, allow_nan: true)
         # Write to stream
         msg_hash = {
           :time => packet.packet_time.to_nsec_from_epoch,
+          :received_time => packet.received_time.to_nsec_from_epoch,
           :stored => packet.stored.to_s,
           :target_name => packet.target_name,
           :packet_name => packet.packet_name,
           :received_count => packet.received_count,
-          :json_data => JSON.generate(json_hash.as_json, allow_nan: true),
+          :json_data => json_data,
         }
         Topic.write_topic("#{scope}__DECOM__{#{packet.target_name}}__#{packet.packet_name}", msg_hash, id)
 
         unless packet.stored
           # Also update the current value table with the latest decommutated data
-          CvtModel.set(json_hash, target_name: packet.target_name, packet_name: packet.packet_name, scope: scope)
+          # Pass pre-serialized JSON to avoid calling as_json twice
+          CvtModel.set_json(json_data, json_safe_hash, target_name: packet.target_name, packet_name: packet.packet_name, scope: scope)
         end
       end
     end

data/lib/openc3/topics/telemetry_topic.rb

@@ -3,18 +3,13 @@
 # Copyright 2022 Ball Aerospace & Technologies Corp.
 # All Rights Reserved.
 #
-# This program is free software; you can modify and/or redistribute it
-# under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation; version 3 with
-# attribution addendums as found in the LICENSE.txt
-#
 # 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 the
-# GNU Affero General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See LICENSE.md for more details.
 
 # Modified by OpenC3, Inc.
-# All changes Copyright 2022, OpenC3, Inc.
+# All changes Copyright 2026, OpenC3, Inc.
 # All Rights Reserved
 #
 # This file may also be used under the terms of a commercial license

data/lib/openc3/topics/timeline_topic.rb

@@ -3,21 +3,16 @@
 # Copyright 2022 Ball Aerospace & Technologies Corp.
 # All Rights Reserved.
 #
-# This program is free software; you can modify and/or redistribute it
-# under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation; version 3 with
-# attribution addendums as found in the LICENSE.txt
-#
 # 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 the
-# GNU Affero General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See LICENSE.md for more details.
 
 # Modified by OpenC3, Inc.
-# All changes Copyright 2022, OpenC3, Inc.
+# All changes Copyright 2026, 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/topics/topic'

data/lib/openc3/topics/topic.rb

@@ -3,18 +3,13 @@
 # Copyright 2022 Ball Aerospace & Technologies Corp.
 # All Rights Reserved.
 #
-# This program is free software; you can modify and/or redistribute it
-# under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation; version 3 with
-# attribution addendums as found in the LICENSE.txt
-#
 # 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 the
-# GNU Affero General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See LICENSE.md for more details.
 
 # Modified by OpenC3, Inc.
-# All changes Copyright 2022, OpenC3, Inc.
+# All changes Copyright 2026, OpenC3, Inc.
 # All Rights Reserved
 #
 # This file may also be used under the terms of a commercial license

data/lib/openc3/utilities/authentication.rb

@@ -3,18 +3,13 @@
 # Copyright 2022 Ball Aerospace & Technologies Corp.
 # All Rights Reserved.
 #
-# This program is free software; you can modify and/or redistribute it
-# under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation; version 3 with
-# attribution addendums as found in the LICENSE.txt
-#
 # 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 the
-# GNU Affero General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See LICENSE.md for more details.
 
 # Modified by OpenC3, Inc.
-# All changes Copyright 2023, OpenC3, Inc.
+# All changes Copyright 2026, OpenC3, Inc.
 # All Rights Reserved
 #
 # This file may also be used under the terms of a commercial license
@@ -33,16 +28,40 @@ module OpenC3
   # OpenC3 COSMOS Core authentication code
   class OpenC3Authentication
     def initialize()
-      @token = ENV['OPENC3_API_PASSWORD']
-      if @token.nil?
+      password = ENV['OPENC3_API_PASSWORD']
+      if password.nil?
         raise OpenC3AuthenticationError, "Authentication requires environment variable OPENC3_API_PASSWORD"
       end
+      @service = password == ENV['OPENC3_SERVICE_PASSWORD']
+      response = _make_auth_request(password)
+      @token = response.body
+      if @token.nil? or @token.empty?
+        raise OpenC3AuthenticationError, "Authentication failed. Please check the password in the environment variable OPENC3_API_PASSWORD"
+      end
     end
 
     # Load the token from the environment
     def token(include_bearer: true)
       @token
     end
+
+    def _make_auth_request(password)
+      Faraday.new.post(_generate_auth_url, '{"password": "' + password + '"}', {'Content-Type' => 'application/json'})
+    end
+
+    def _generate_auth_url
+      schema = ENV['OPENC3_API_SCHEMA'] || 'http'
+      hostname = ENV['OPENC3_API_HOSTNAME'] || (ENV['OPENC3_DEVEL'] ? '127.0.0.1' : 'openc3-cosmos-cmd-tlm-api')
+      port = ENV['OPENC3_API_PORT'] || '2901'
+      port = port.to_i
+      endpoint = if @service
+        "auth/verify_service"
+      else
+        "auth/verify"
+      end
+      return "#{schema}://#{hostname}:#{port}/openc3-api/#{endpoint}"
+    end
+
   end
 
   # OpenC3 enterprise Keycloak authentication code

data/lib/openc3/utilities/authorization.rb

@@ -3,18 +3,13 @@
 # Copyright 2022 Ball Aerospace & Technologies Corp.
 # All Rights Reserved.
 #
-# This program is free software; you can modify and/or redistribute it
-# under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation; version 3 with
-# attribution addendums as found in the LICENSE.txt
-#
 # 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 the
-# GNU Affero General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See LICENSE.md for more details.
 
 # Modified by OpenC3, Inc.
-# All changes Copyright 2024, OpenC3, Inc.
+# All changes Copyright 2026, OpenC3, Inc.
 # All Rights Reserved
 #
 # This file may also be used under the terms of a commercial license
@@ -43,7 +38,7 @@ rescue LoadError
         if $openc3_authorize
           raise AuthError.new("Token is required") unless token
           unless OpenC3::AuthModel.verify(token)
-            raise AuthError.new("Password is invalid")
+            raise AuthError.new("Token is invalid")
           end
         end
         return "anonymous"

data/lib/openc3/utilities/aws_bucket.rb

@@ -1,17 +1,12 @@
 # encoding: ascii-8bit
 
-# Copyright 2022 OpenC3, Inc.
+# Copyright 2026 OpenC3, Inc.
 # All Rights Reserved.
 #
-# This program is free software; you can modify and/or redistribute it
-# under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation; version 3 with
-# attribution addendums as found in the LICENSE.txt
-#
 # 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 the
-# GNU Affero General Public License for more details.
+# 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.
@@ -29,6 +24,15 @@ module OpenC3
       super()
       @client = Aws::S3::Client.new
       @aws_arn = ENV['OPENC3_AWS_ARN_PREFIX'] || 'arn:aws'
+      # Checksums are supported by real AWS S3 but may not be supported by
+      # S3-compatible backends like versitygw. Auto-detect based on
+      # whether a custom endpoint is configured. Can be overridden with ENV var.
+      @use_checksum = if ENV.key?('OPENC3_NO_S3_CHECKSUM')
+        ENV['OPENC3_NO_S3_CHECKSUM'].to_s.empty?  # Empty string means use checksum
+      else
+        # If OPENC3_BUCKET_URL is set, we're using a non-AWS S3 backend
+        !ENV.key?('OPENC3_BUCKET_URL')
+      end
     end
 
     def create(bucket)
@@ -83,7 +87,106 @@ module OpenC3
           ]
         }
         EOL
-        @client.put_bucket_policy({ bucket: bucket, policy: policy, checksum_algorithm: "SHA256" })
+        begin
+          options = { bucket: bucket, policy: policy }
+          options[:checksum_algorithm] = "SHA256" if @use_checksum
+          @client.put_bucket_policy(options)
+        rescue Aws::S3::Errors::NotImplemented, Aws::S3::Errors::ServiceError, Aws::S3::Errors::InternalError => e
+          Logger.warn("put_bucket_policy not supported by S3 backend: #{e.message}")
+        end
+      end
+    end
+
+    # Apply bucket policy to grant ScriptRunner user access to config and logs buckets
+    # This provides reduced permissions compared to the root user for security
+    def ensure_scriptrunner_policy(config_bucket, logs_bucket)
+      sr_username = ENV['OPENC3_SR_BUCKET_USERNAME']
+      return unless sr_username
+      return if sr_username == ENV['OPENC3_BUCKET_USERNAME'] # Same as root, no policy needed
+
+      # Policy for config bucket - read targets, read/write targets_modified
+      # Note: versitygw expects Principal as comma-separated raw usernames
+      config_policy = <<~EOL
+      {
+        "Version": "2012-10-17",
+        "Statement": [
+          {
+            "Sid": "ScriptRunnerListBucket",
+            "Effect": "Allow",
+            "Principal": ["#{sr_username}"],
+            "Action": [
+              "s3:ListBucket",
+              "s3:GetBucketLocation"
+            ],
+            "Resource": "#{@aws_arn}:s3:::#{config_bucket}"
+          },
+          {
+            "Sid": "ScriptRunnerReadTargets",
+            "Effect": "Allow",
+            "Principal": ["#{sr_username}"],
+            "Action": "s3:GetObject",
+            "Resource": "#{@aws_arn}:s3:::#{config_bucket}/*"
+          },
+          {
+            "Sid": "ScriptRunnerWriteTargetsModified",
+            "Effect": "Allow",
+            "Principal": ["#{sr_username}"],
+            "Action": [
+              "s3:PutObject",
+              "s3:DeleteObject"
+            ],
+            "Resource": "#{@aws_arn}:s3:::#{config_bucket}/*/targets_modified/*"
+          }
+        ]
+      }
+      EOL
+
+      # Policy for logs bucket - read/write tool_logs/sr
+      logs_policy = <<~EOL
+      {
+        "Version": "2012-10-17",
+        "Statement": [
+          {
+            "Sid": "ScriptRunnerListBucket",
+            "Effect": "Allow",
+            "Principal": ["#{sr_username}"],
+            "Action": [
+              "s3:ListBucket",
+              "s3:GetBucketLocation"
+            ],
+            "Resource": "#{@aws_arn}:s3:::#{logs_bucket}"
+          },
+          {
+            "Sid": "ScriptRunnerWriteToolLogs",
+            "Effect": "Allow",
+            "Principal": ["#{sr_username}"],
+            "Action": [
+              "s3:GetObject",
+              "s3:PutObject",
+              "s3:DeleteObject"
+            ],
+            "Resource": "#{@aws_arn}:s3:::#{logs_bucket}/*/tool_logs/sr/*"
+          }
+        ]
+      }
+      EOL
+
+      begin
+        Logger.info("Applying ScriptRunner bucket policy to #{config_bucket}")
+        options = { bucket: config_bucket, policy: config_policy }
+        options[:checksum_algorithm] = "SHA256" if @use_checksum
+        @client.put_bucket_policy(options)
+      rescue Aws::S3::Errors::NotImplemented, Aws::S3::Errors::ServiceError, Aws::S3::Errors::InternalError => e
+        Logger.warn("put_bucket_policy for #{config_bucket} not supported by S3 backend: #{e.message}")
+      end
+
+      begin
+        Logger.info("Applying ScriptRunner bucket policy to #{logs_bucket}")
+        options = { bucket: logs_bucket, policy: logs_policy }
+        options[:checksum_algorithm] = "SHA256" if @use_checksum
+        @client.put_bucket_policy(options)
+      rescue Aws::S3::Errors::NotImplemented, Aws::S3::Errors::ServiceError, Aws::S3::Errors::InternalError => e
+        Logger.warn("put_bucket_policy for #{logs_bucket} not supported by S3 backend: #{e.message}")
       end
     end
 
@@ -194,9 +297,16 @@ module OpenC3
 
     # put_object fires off the request to store but does not confirm
     def put_object(bucket:, key:, body:, content_type: nil, cache_control: nil, metadata: nil)
-      @client.put_object(bucket: bucket, key: key, body: body,
-        content_type: content_type, cache_control: cache_control, metadata: metadata,
-        checksum_algorithm: "SHA256")
+      options = {
+        bucket: bucket,
+        key: key,
+        body: body,
+        content_type: content_type,
+        cache_control: cache_control,
+        metadata: metadata
+      }
+      options[:checksum_algorithm] = "SHA256" if @use_checksum
+      @client.put_object(**options)
     end
 
     # @returns [Boolean] Whether the file exists
@@ -222,14 +332,14 @@ module OpenC3
 
     def delete_object(bucket:, key:)
       @client.delete_object(bucket: bucket, key: key)
-    rescue Exception
-      Logger.error("Error deleting object bucket: #{bucket}, key: #{key}")
+    rescue Exception => e
+      Logger.error("Error deleting object bucket: #{bucket}, key: #{key}: #{e.message}")
     end
 
     def delete_objects(bucket:, keys:)
       @client.delete_objects(bucket: bucket, delete: { objects: keys.map {|key| { key: key } } })
-    rescue Exception
-      Logger.error("Error deleting objects bucket: #{bucket}, keys: #{keys}")
+    rescue Exception => e
+      Logger.error("Error deleting objects bucket: #{bucket}, keys: #{keys}: #{e.message}")
     end
 
     def presigned_request(bucket:, key:, method:, internal: true)

data/lib/openc3/utilities/bucket.rb

@@ -1,17 +1,12 @@
 # encoding: ascii-8bit
 
-# Copyright 2022 OpenC3, Inc.
+# Copyright 2026 OpenC3, Inc.
 # All Rights Reserved.
 #
-# This program is free software; you can modify and/or redistribute it
-# under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation; version 3 with
-# attribution addendums as found in the LICENSE.txt
-#
 # 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 the
-# GNU Affero General Public License for more details.
+# 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.
@@ -27,7 +22,7 @@ module OpenC3
 
     def self.getClient
       raise 'OPENC3_CLOUD environment variable is required' unless ENV['OPENC3_CLOUD']
-      # Base is AwsBucket which works with MINIO, Enterprise implements additional
+      # Base is AwsBucket which works with S3-compatible storage (versitygw), Enterprise implements additional
       bucket_class = ENV['OPENC3_CLOUD'].capitalize + 'Bucket'
       klass = OpenC3.require_class('openc3/utilities/'+bucket_class.class_name_to_filename)
       klass.new
@@ -45,6 +40,11 @@ module OpenC3
       raise NotImplementedError, "#{self.class} has not implemented method '#{__method__}'"
     end
 
+    # Apply bucket policies for ScriptRunner user (only applicable for local mode)
+    def ensure_scriptrunner_policy(config_bucket, logs_bucket)
+      # No-op by default, implemented by AwsBucket for local mode
+    end
+
     def exist?(bucket)
       raise NotImplementedError, "#{self.class} has not implemented method '#{__method__}'"
     end

data/lib/openc3/utilities/bucket_file_cache.rb

@@ -3,18 +3,13 @@
 # Copyright 2022 Ball Aerospace & Technologies Corp.
 # All Rights Reserved.
 #
-# This program is free software; you can modify and/or redistribute it
-# under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation; version 3 with
-# attribution addendums as found in the LICENSE.txt
-#
 # 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 the
-# GNU Affero General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See LICENSE.md for more details.
 
 # Modified by OpenC3, Inc.
-# All changes Copyright 2022, OpenC3, Inc.
+# All changes Copyright 2026, OpenC3, Inc.
 # All Rights Reserved
 #
 # This file may also be used under the terms of a commercial license
@@ -51,9 +46,6 @@ class BucketFile
     path_split = @bucket_path.split("/")
     scope = path_split[0].to_s.upcase
     stream_mode = path_split[1].to_s.split("_")[0].to_s.upcase
-    if stream_mode == 'REDUCED'
-      stream_mode << '_' << path_split[1].to_s.split("_")[1].to_s.upcase
-    end
     cmd_or_tlm = path_split[2].to_s.upcase
     target_name = path_split[3].to_s.upcase
     if stream_mode == 'RAW'
@@ -61,8 +53,6 @@ class BucketFile
     else
       if stream_mode == 'DECOM'
         type = (cmd_or_tlm == 'CMD') ? 'DECOMCMD' : 'DECOM'
-      else
-        type = stream_mode # REDUCED_MINUTE, REDUCED_HOUR, or REDUCED_DAY
       end
     end
     @topic_prefix = "#{scope}__#{type}__{#{target_name}}"

data/lib/openc3/utilities/bucket_require.rb

@@ -1,17 +1,12 @@
 # encoding: ascii-8bit
 
-# Copyright 2022 OpenC3, Inc.
+# Copyright 2026 OpenC3, Inc.
 # All Rights Reserved.
 #
-# This program is free software; you can modify and/or redistribute it
-# under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation; version 3 with
-# attribution addendums as found in the LICENSE.txt
-#
 # 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 the
-# GNU Affero General Public License for more details.
+# 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.

data/lib/openc3/utilities/bucket_utilities.rb

@@ -3,18 +3,13 @@
 # Copyright 2022 Ball Aerospace & Technologies Corp.
 # All Rights Reserved.
 #
-# This program is free software; you can modify and/or redistribute it
-# under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation; version 3 with
-# attribution addendums as found in the LICENSE.txt
-#
 # 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 the
-# GNU Affero General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See LICENSE.md for more details.
 
 # Modified by OpenC3, Inc.
-# All changes Copyright 2022, OpenC3, Inc.
+# All changes Copyright 2026, OpenC3, Inc.
 # All Rights Reserved
 #
 # This file may also be used under the terms of a commercial license
@@ -22,7 +17,6 @@
 
 require 'openc3/utilities/bucket'
 require 'openc3/utilities/target_file'
-require 'openc3/models/reducer_model'
 require 'zlib'
 
 module OpenC3
@@ -111,7 +105,6 @@ module OpenC3
         end
 
         Logger.debug "wrote #{ENV['OPENC3_LOGS_BUCKET']}/#{bucket_key}"
-        ReducerModel.add_file(bucket_key) # Record the new file for data reduction
 
         File.delete(orig_filename) if orig_filename
         File.delete(filename)