Change package entrypoint to parent CLI script

marcai/cli.py

@@ -0,0 +1,42 @@
+import argparse
+from . import train, predict, process, find_matches
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        description="Command-line interface for marcai package"
+    )
+    subparsers = parser.add_subparsers(required=True)
+
+    train_parser = subparsers.add_parser(
+        "train", parents=[train.args_parser()], help="Train a model", add_help=False
+    )
+    predict_parser = subparsers.add_parser(
+        "predict",
+        parents=[predict.args_parser()],
+        help="Make predictions using a trained model",
+        add_help=False,
+    )
+    process_parser = subparsers.add_parser(
+        "process", parents=[process.args_parser()], help="Process data", add_help=False
+    )
+    find_matches_parser = subparsers.add_parser(
+        "find_matches",
+        parents=[find_matches.args_parser()],
+        help="Find matches in data",
+        add_help=False,
+    )
+
+    train_parser.set_defaults(func=train.main)
+    predict_parser.set_defaults(func=predict.main)
+    process_parser.set_defaults(func=process.main)
+    find_matches_parser.set_defaults(func=find_matches.main)
+
+    args = parser.parse_args()
+
+    args.func(args)
+   
+
+
+if __name__ == "__main__":
+    main()

marcai/find_matches.py

@@ -10,7 +10,7 @@ from marcai.utils import load_config
 from marcai.utils.parsing import load_records, record_dict
 
 
-def main():
+def args_parser():
     parser = argparse.ArgumentParser()
     parser.add_argument("-i", "--inputs", nargs="+", help="MARC files", required=True)
     parser.add_argument(
@@ -32,7 +32,12 @@ def main():
     parser.add_argument("-o", "--output", help="Output file", required=True)
     parser.add_argument("-t", "--threshold", help="Threshold for matching", type=float)
 
-    args = parser.parse_args()
+    return parser
+
+
+def main():
+
+    args = args_parser().parse_args()
 
     config_path = f"{args.model_dir}/config.yaml"
     model_onnx = f"{args.model_dir}/model.onnx"

marcai/predict.py

@@ -23,8 +23,7 @@ def predict_onnx(model_onnx_path, data):
 
     return ort_outs
 
-
-def main():
+def args_parser():
     parser = argparse.ArgumentParser()
     parser.add_argument(
         "-i", "--input", help="Path to preprocessed data file", required=True
@@ -42,8 +41,12 @@ def main():
         default=1024,
         type=int,
     )
+    return parser
+
+
+def main():
 
-    args = parser.parse_args()
+    args = args_parser().parse_args()
 
     config_path = f"{args.model_dir}/config.yaml"
     model_onnx = f"{args.model_dir}/model.onnx"

marcai/process.py

@@ -190,7 +190,7 @@ def process(df0, df1):
     return result_df
 
 
-def parse_args():
+def args_parser():
     parser = argparse.ArgumentParser(
         formatter_class=argparse.ArgumentDefaultsHelpFormatter
     )
@@ -217,13 +217,13 @@ def parse_args():
         default=1,
     )
 
-    return parser.parse_args()
+    return parser
 
 
 def main():
     
     start = time.time()
-    args = parse_args()
+    args = args_parser().parse_args()
 
     # Load records
     print("Loading records...")

marcai/train.py

@@ -88,12 +88,14 @@ def train(name=None):
         archive.add(save_dir, arcname=os.path.basename(save_dir))
 
 
-def main():
+def args_parser():
     parser = argparse.ArgumentParser()
-    parser.add_argument(
-        "-n", "--run-name", help="Name for training run"
-    )
-    args = parser.parse_args()
+    parser.add_argument("-n", "--run-name", help="Name for training run", required=True)
+    return parser
+
+def main():
+    
+    args = args_parser().parse_args()
 
     train(args.run_name)
 

setup.cfg

@@ -7,8 +7,5 @@ packages = find:
 
 [options.entry_points]
 console_scripts =
-    process = marcai:process.main
-    predict = marcai:predict.main
-    train = marcai:train.main
-    find_matches = marcai:find_matches.main
-    
+		marc-ai = marcai:cli.main
+