Merge pull request #65 from HYPERNETS/metadata_db

Metadata db

Author: shunt16

hypernets_processor/cli/common.py

@@ -3,7 +3,8 @@
 """
 
 from hypernets_processor.version import __version__
-from hypernets_processor.cli.common import configure_std_parser, PROCESSOR_CONFIG_PATH
+from hypernets_processor.utils.config import PROCESSOR_CONFIG_PATH
+from hypernets_processor.utils.cli import configure_std_parser
 from hypernets_processor.cli.hypernets_processor_main import main
 
 

hypernets_processor/cli/config_templates/job.config

@@ -4,7 +4,7 @@
 
 from hypernets_processor.version import __version__
 from hypernets_processor.cli.hypernets_scheduler_main import main
-from hypernets_processor.cli.common import SCHEDULER_CONFIG_PATH
+from hypernets_processor.utils.config import SCHEDULER_CONFIG_PATH
 import argparse
 
 

hypernets_processor/cli/hypernets_processor_cli.py

@@ -3,7 +3,8 @@
 """
 
 from hypernets_processor.version import __version__
-from hypernets_processor.cli.common import configure_logging, read_config_file, read_jobs_list
+from hypernets_processor.utils.config import read_config_file, read_jobs_list
+from hypernets_processor.utils.logging import configure_logging
 from hypernets_processor.utils.config import get_config_value
 from hypernets_processor import Scheduler
 from hypernets_processor.cli.hypernets_processor_main import main as processor_main

hypernets_processor/cli/hypernets_processor_main.py

@@ -0,0 +1,67 @@
+"""
+job init cli
+"""
+
+from hypernets_processor.version import __version__
+import argparse
+from hypernets_processor.main.init_job_main import main
+
+
+'''___Authorship___'''
+__author__ = "Sam Hunt"
+__created__ = "20/10/2020"
+__version__ = __version__
+__maintainer__ = "Sam Hunt"
+__email__ = "sam.hunt@npl.co.uk"
+__status__ = "Development"
+
+
+def configure_parser():
+    """
+    Configure parser
+
+    :return: parser
+    :rtype: argparse.ArgumentParser
+    """
+
+    description = "Tool for initialising hypernets_processor jobs"
+
+    # Initialise argument parser
+    parser = argparse.ArgumentParser(description=description,
+                                     formatter_class=argparse.ArgumentDefaultsHelpFormatter)
+
+    parser.add_argument("-n", "--job-name", action="store", required=True,
+                        help="Job name")
+
+    parser.add_argument("-w", "--job-working-directory", action="store", required=True,
+                        help="Working directory of job (will write config here)")
+
+    parser.add_argument("-i", "--raw-data-directory", action="store", required=True,
+                        help="Directory of input data")
+
+    parser.add_argument("--add-to-scheduler", action="store_true",
+                        help="Option to add job to automatically hypernets_scheduler jobs")
+
+    return parser
+
+
+parser = configure_parser()
+parsed_args = parser.parse_args()
+
+
+def cli():
+    """
+    Command line interface for job init
+    """
+
+    settings = dict()
+    settings["job_name"] = parsed_args.job_name
+    settings["job_working_directory"] = parsed_args.job_working_directory
+    settings["raw_data_directory"] = parsed_args.raw_data_directory
+    settings["add_to_scheduler"] = parsed_args.add_to_scheduler
+
+    main(settings)
+
+
+if __name__ == "__main__":
+    pass