Python script runner api

openc3-cosmos-script-runner-api/scripts/running_script.py

@@ -1322,12 +1322,8 @@ def load_utility(procedure_name):
             not_cached = start(procedure_name)
         finally:
             RunningScript.instance.use_instrumentation = saved
-    else:  # Just call require
-        # TODO
-        # importlib.import_module(module)
-        # importlib.reload(module)
-        # not_cached = require(procedure_name)
-        pass
+    else:
+        raise RuntimeError("load_utility not supported outside of Script Runner")
     # Return whether we had to load and instrument this file, i.e. it was not cached
     # This is designed to match the behavior of Ruby's require and load keywords
     return not_cached

openc3/python/openc3/io/json_api_object.py

@@ -1,4 +1,4 @@
-# Copyright 2023 OpenC3, Inc.
+# Copyright 2024 OpenC3, Inc.
 # All Rights Reserved.
 #
 # This program is free software; you can modify and/or redistribute it
@@ -43,7 +43,7 @@ class JsonApiObject:
     # attr_reader :request_data
     # attr_reader :response_data
 
-    USER_AGENT = "OpenC3 / v5 (ruby/openc3/lib/io/json_api_object)"
+    USER_AGENT = "OpenC3 / v5 (python/openc3/io/json_api_object)"
 
     # @param url [String] The url of openc3-cosmos-cmd-tlm-api http://openc3-cosmos-cmd-tlm-api:2901
     # @param timeout [Float] The time to wait before disconnecting 1.0
@@ -187,13 +187,13 @@ def _send_request(self, method, endpoint, kwargs):
             kwargs["url"] = f"{self.url}{endpoint}"
             self.log[0] = f"{method} Request: {kwargs}"
             resp = getattr(self.http, method)(**kwargs)
-            self.log[
-                1
-            ] = f"{method} Response: {resp.status_code} {resp.headers} {resp.text}"
+            self.log[1] = (
+                f"{method} Response: {resp.status_code} {resp.headers} {resp.text}"
+            )
             self.response_data = resp.text
             return resp
         except Exception as error:
             self.log[2] = f"{method} Exception: {repr(error)}"
             self.disconnect()
             error = f"Api Exception: {self.log[0]} ::: {self.log[1]} ::: {self.log[2]}"
-            raise error
+            raise RuntimeError(error)

openc3/python/openc3/packets/packet.py

@@ -349,7 +349,7 @@ def template(self, template):
     # self.return [Array<String>] Warning messages for bit definition overlaps
     def check_bit_offsets(self):
         if self.ignore_overlap:
-            Logger.info(
+            Logger.debug(
                 f"{self.target_name} {self.packet_name} has IGNORE_OVERLAP so bit overlaps ignored"
             )
             return []

openc3/python/openc3/script/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2023 OpenC3, Inc.
+# Copyright 2024 OpenC3, Inc.
 # All Rights Reserved.
 #
 # This program is free software; you can modify and/or redistribute it
@@ -15,10 +15,11 @@
 # if purchased from OpenC3, Inc.
 
 from openc3.api import WHITELIST
-from openc3.script.server_proxy import ServerProxy
+from openc3.script.server_proxy import ApiServerProxy, ScriptServerProxy
 from openc3.utilities.extract import convert_to_value
 
-API_SERVER = ServerProxy()
+API_SERVER = ApiServerProxy()
+SCRIPT_RUNNER_API_SERVER = ScriptServerProxy()
 RUNNING_SCRIPT = None
 DISCONNECT = False
 OPENC3_IN_CLUSTER = False
@@ -29,6 +30,8 @@
 def shutdown_script():
     global API_SERVER
     API_SERVER.shutdown()
+    global SCRIPT_RUNNER_API_SERVER
+    SCRIPT_RUNNER_API_SERVER.shutdown()
 
 
 def prompt_for_hazardous(target_name, cmd_name, hazardous_description):
@@ -141,6 +144,7 @@ def prompt(
 from .telemetry import *
 from .metadata import *
 from .screen import *
+from .script_runner import *
 from .storage import *
 
 # Define all the WHITELIST methods

openc3/python/openc3/script/api_shared.py

@@ -1,4 +1,4 @@
-# Copyright 2022 Ball Aerospace & Technologies Corp.
+# Copyright 2024 OpenC3, Inc.
 # All Rights Reserved.
 #
 # This program is free software; you can modify and/or redistribute it
@@ -11,10 +11,6 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Affero General Public License for more details.
 
-# Modified by OpenC3, Inc.
-# All changes Copyright 2023, OpenC3, Inc.
-# All Rights Reserved
-#
 # This file may also be used under the terms of a commercial license
 # if purchased from OpenC3, Inc.
 
@@ -590,47 +586,24 @@ def get_max_output():
     if openc3.script.RUNNING_SCRIPT:
         return openc3.script.RUNNING_SCRIPT.max_output_characters
 
-    ###########################################################################
-    # Scripts Outside of ScriptRunner Support
-    # ScriptRunner overrides these methods to work in the OpenC3 cluster
-    # They are only here to allow for scripts to have a chance to work
-    # unaltered outside of the cluster
-    ###########################################################################
-
-    # TODO:
-    # def start(procedure_name)
-    #   cached = false
-    #   begin
-    #     Kernel::load(procedure_name)
-    #   rescue LoadError => error
-    #     raise LoadError, f"Error loading -- {procedure_name}\n{error.message}"
-    #   end
-    #   # Return whether we had to load and instrument this file, i.e. it was not cached
-    #   !cached
-    # end
-
-    # # Require an additional ruby file
-    # def load_utility(procedure_name)
-    #   return start(procedure_name)
-    # end
-    # def require_utility(procedure_name)
-    #   # Ensure require_utility works like require where you don't need the .rb extension
-    #   if File.extname(procedure_name) != '.rb'
-    #     procedure_name += '.rb'
-    #   end
-    #   @require_utility_cache ||= {}
-    #   if @require_utility_cache[procedure_name]
-    #     return false
-    #   else
-    #     @require_utility_cache[procedure_name] = true
-    #     begin
-    #       return start(procedure_name)
-    #     rescue LoadError
-    #       @require_utility_cache[procedure_name] = false
-    #       raise # reraise the error
-    #     end
-    #   end
-    # end
+
+###########################################################################
+# Scripts Outside of ScriptRunner Support
+# ScriptRunner overrides these methods to work in the OpenC3 cluster
+# They are only here to allow for scripts to have a chance to work
+# unaltered outside of the cluster
+###########################################################################
+
+
+# Exec a procedure
+def start(procedure_name):
+    with open(procedure_name) as f:
+        exec(f.read())
+
+
+# Require an additional python file
+def load_utility(procedure_name):
+    raise RuntimeError("load_utility not supported outside of Script Runner")
 
 
 ###########################################################################