Merge pull request #51 from LSSTDESC/issue/50/cli_rail_pipe

moved cli to src/rail/cli/rail_pipe

pyproject.toml

@@ -38,7 +38,7 @@ dev = [
 ]
 
 [project.scripts]
-rail_pipe = "rail.cli.pipe_commands:pipe_cli"
+rail_pipe = "rail.cli.rail_pipe.pipe_commands:pipe_cli"
 
 [build-system]
 requires = [

src/rail/cli/rail_pipe/__main__.py

@@ -0,0 +1,5 @@
+# This file must exist with these contents
+from .pipe_commands import pipe_cli
+
+if __name__ == "__main__":
+    pipe_cli()

src/rail/cli/pipe_commands.py → src/rail/cli/rail_pipe/pipe_commands.py

@@ -5,8 +5,8 @@
 from rail.core import __version__
 
 from rail.utils.project import RailProject
-from rail.cli import pipe_options, pipe_scripts
-from rail.cli.reduce_roman_rubin_data import reduce_roman_rubin_data
+from rail.cli.rail_pipe import pipe_options, pipe_scripts
+from rail.cli.rail_pipe.reduce_roman_rubin_data import reduce_roman_rubin_data
 
 
 @click.group()
@@ -37,41 +37,46 @@ def build_command(config_file: str, **kwargs: Any) -> int:
     return ok
 
 
-@pipe_cli.command(name="reduce")
+@pipe_cli.command(name="subsample")
 @pipe_options.config_file()
-@pipe_options.input_tag()
-@pipe_options.input_selection()
 @pipe_options.selection()
+@pipe_options.flavor()
+@pipe_options.label()
 @pipe_options.run_mode()
-def reduce_command(config_file: str, **kwargs: Any) -> int:
-    """Reduce the roman rubin simulations for PZ analysis"""
+def subsample_command(config_file: str, **kwargs: Any) -> int:
+    """Make a training or test data set by randomly selecting objects"""
+    """Make a training data set by randomly selecting objects"""
     project = RailProject.load_config(config_file)
+    flavors = project.get_flavor_args(kwargs.pop('flavor'))
     selections = project.get_selection_args(kwargs.pop('selection'))
-    input_selections = kwargs.pop('input_selection')
-    iter_kwargs = project.generate_kwargs_iterable(selection=selections, input_selection=input_selections)
-    input_tag = kwargs.pop('input_tag', 'truth')
+    iter_kwargs = project.generate_kwargs_iterable(flavor=flavors, selection=selections)
     ok = 0
     for kw in iter_kwargs:
-        ok |= reduce_roman_rubin_data(project, input_tag, **kw, **kwargs)
+        ok |= pipe_scripts.subsample_data(project, **kw, **kwargs)
     return ok
 
 
-@pipe_cli.command(name="subsample")
+@pipe_cli.group(name="reduce")
+def reduce_group() -> None:
+    """Reduce input data for PZ analysis"""
+
+
+@reduce_group.command(name="roman_rubin")
 @pipe_options.config_file()
+@pipe_options.input_tag()
+@pipe_options.input_selection()
 @pipe_options.selection()
-@pipe_options.flavor()
-@pipe_options.label()
 @pipe_options.run_mode()
-def subsample_command(config_file: str, **kwargs: Any) -> int:
-    """Make a training or test data set by randomly selecting objects"""
-    """Make a training data set by randomly selecting objects"""
+def reduce_roman_rubin(config_file: str, **kwargs: Any) -> int:
+    """Reduce the roman rubin simulations for PZ analysis"""
     project = RailProject.load_config(config_file)
-    flavors = project.get_flavor_args(kwargs.pop('flavor'))
     selections = project.get_selection_args(kwargs.pop('selection'))
-    iter_kwargs = project.generate_kwargs_iterable(flavor=flavors, selection=selections)
+    input_selections = kwargs.pop('input_selection')
+    iter_kwargs = project.generate_kwargs_iterable(selection=selections, input_selection=input_selections)
+    input_tag = kwargs.pop('input_tag', 'truth')
     ok = 0
     for kw in iter_kwargs:
-        ok |= pipe_scripts.subsample_data(project, **kw, **kwargs)
+        ok |= reduce_roman_rubin_data(project, input_tag, **kw, **kwargs)
     return ok
 
 

src/rail/cli/pipe_options.py → src/rail/cli/rail_pipe/pipe_options.py

@@ -2,7 +2,7 @@
 
 import click
 
-from rail.cli.options import (
+from rail.cli.rail.options import (
     EnumChoice,
     PartialOption,
     PartialArgument,

src/rail/cli/pipe_scripts.py → src/rail/cli/rail_pipe/pipe_scripts.py

@@ -13,7 +13,7 @@
 from rail.utils import catalog_utils
 from rail.core.stage import RailPipeline
 from rail.utils.project import RailProject
-from rail.cli.pipe_options import RunMode
+from rail.cli.rail_pipe.pipe_options import RunMode
 
 
 def handle_command(

src/rail/cli/reduce_roman_rubin_data.py → src/rail/cli/rail_pipe/reduce_roman_rubin_data.py

@@ -7,7 +7,7 @@
 import pyarrow.parquet as pq
 from pyarrow import acero
 
-from rail.cli.pipe_options import RunMode
+from rail.cli.rail_pipe.pipe_options import RunMode
 from rail.utils.project import RailProject