misc

wlauto/commands/run.py

@@ -20,11 +20,11 @@ import shutil
 
 import wlauto
 from wlauto import Command, settings
-from wlauto.core.agenda import Agenda
 from wlauto.core.execution import Executor
 from wlauto.utils.log import add_log_file
-from wlauto.core.configuration import RunConfiguration
+from wlauto.core.configuration import RunConfiguration, WAConfiguration
 from wlauto.core import pluginloader
+from wlauto.core.configuration_parsers import Agenda, ConfigFile, EnvrironmentVars, CommandLineArgs
 
 
 class RunCommand(Command):
@@ -32,6 +32,103 @@ class RunCommand(Command):
     name = 'run'
     description = 'Execute automated workloads on a remote device and process the resulting output.'
 
+    def initialize(self, context):
+        self.parser.add_argument('agenda', metavar='AGENDA',
+                                 help="""
+                                 Agenda for this workload automation run. This defines which
+                                 workloads will be executed, how many times, with which
+                                 tunables, etc.  See example agendas in {} for an example of
+                                 how this file should be structured.
+                                 """.format(os.path.dirname(wlauto.__file__)))
+        self.parser.add_argument('-d', '--output-directory', metavar='DIR', default=None,
+                                 help="""
+                                 Specify a directory where the output will be generated. If
+                                 the directory already exists, the script will abort unless -f
+                                 option (see below) is used, in which case the contents of the
+                                 directory will be overwritten. If this option is not specified,
+                                 then {} will be used instead.
+                                 """.format("settings.default_output_directory"))  # TODO: Fix this!
+        self.parser.add_argument('-f', '--force', action='store_true',
+                                 help="""
+                                 Overwrite output directory if it exists. By default, the script
+                                 will abort in this situation to prevent accidental data loss.
+                                 """)
+        self.parser.add_argument('-i', '--id', action='append', dest='only_run_ids', metavar='ID',
+                                 help="""
+                                 Specify a workload spec ID from an agenda to run. If this is
+                                 specified, only that particular spec will be run, and other
+                                 workloads in the agenda will be ignored. This option may be
+                                 used to specify multiple IDs.
+                                 """)
+        self.parser.add_argument('--disable', action='append', dest='instruments_to_disable',
+                                 metavar='INSTRUMENT', help="""
+                                 Specify an instrument to disable from the command line. This
+                                 equivalent to adding "~{metavar}" to the instrumentation list in
+                                 the agenda. This can be used to temporarily disable a troublesome
+                                 instrument for a particular run without introducing permanent
+                                 change to the config (which one might then forget to revert).
+                                 This option may be specified multiple times.
+                                 """)
+
+    def execute(self, args):
+
+        # STAGE 1: Gather configuratation
+
+        env = EnvrironmentVars()
+        args = CommandLineArgs(args)
+
+        # STAGE 2.1a: Early WAConfiguration, required to find config files
+        if env.user_directory:
+            settings.set("user_directory", env.user_directory)
+        if env.plugin_paths:
+            settings.set("plugin_paths", env.plugin_paths)
+        # STAGE 1 continued
+
+        # TODO: Check for config.py and convert to yaml, if it fails, warn user.
+        configs = [ConfigFile(os.path.join(settings.user_directory, 'config.yaml'))]
+        for c in args.config:
+            configs.append(ConfigFile(c))
+        agenda = Agenda(args.agenda)
+        configs.append(Agenda.config)
+
+        # STAGE 2: Sending configuration to the correct place & merging in
+        #          order of priority.
+        #
+        #          Priorities (lowest to highest):
+        #           - Enviroment Variables
+        #           - config.yaml from `user_directory`
+        #           - config files passed via command line
+        #             (the first specified will be the first to be applied)
+        #           - Agenda
+        #           - Command line configuration e.g. disabled instrumentation.
+
+        # STAGE 2.1b: WAConfiguration
+        for config in configs:
+            for config_point in settings.configuration.keys():
+                if hasattr(config, config_point):
+                    settings.set(config_point, config.getattr(config_point))
+
+
+    def _parse_config(self):
+        pass
+
+    def _serialize_raw_config(self, env, args, agenda, configs):
+        pod = {}
+        pod['environment_variables'] = env.to_pod()
+        pod['commandline_arguments'] = args.to_pod()
+        pod['agenda'] = agenda.to_pod()
+        pod['config_files'] = [c.to_pod() for c in configs]
+        return pod
+
+    def _serialize_final_config(self):
+        pass
+
+
+class OldRunCommand(Command):
+
+    name = 'old_run'
+    description = 'Execute automated workloads on a remote device and process the resulting output.'
+
     def initialize(self, context):
         self.parser.add_argument('agenda', metavar='AGENDA',
                                  help="""