CLI Typer replcement of arg parser , improved sample name display

Author: ArturU043

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "servicex_analysis_utils"
-version = "1.0.b3"
+version = "1.0.0"
 description = "A package with analysis tools for ServiceX."
 authors = [{name = "Artur Cordeiro Oudot Choi", email = "acordeir@cern.ch"}]
 readme = "README.md"
@@ -38,7 +38,7 @@ test = [
 ]
 
 [project.scripts]
-servicex-get-structure = "servicex_analysis_utils.cli:run_from_command"
+servicex-get-structure = "servicex_analysis_utils.cli:app"
 
 
 [tool.hatch.build.targets.wheel]

servicex_analysis_utils/cli.py

@@ -1,9 +1,12 @@
-import argparse
 import sys
 import json
 import os
 import logging
 from .file_peeking import get_structure
+import typer
+from typing import List
+
+app = typer.Typer()
 
 
 def make_dataset_list(dataset_arg):
@@ -46,30 +49,25 @@ def make_dataset_list(dataset_arg):
     return dataset
 
 
-def run_from_command():
+@app.command()
+def run_from_command(
+    dataset: List[str] = typer.Argument(
+        ...,
+        help="Input datasets (Rucio DID) or path to JSON file containing datasets in a dict.",
+    ),
+    filter_branch: str = typer.Option(
+        "", "--filter-branch", help="Only display branches containing this string."
+    ),
+):
     """
     Calls the get_structure function and sends results to stdout.
-    To run on command line: servicex-get-structure -dataset --fileter-branch
+    To run on command line: servicex-get-structure -dataset --filter-branch
     """
-    parser = argparse.ArgumentParser(
-        description="CLI tool for retrieving ROOT file structures."
-    )
-
-    parser.add_argument(
-        "dataset",
-        nargs="+",
-        help="Input datasets (Rucio DID) or a JSON file containing datasets in a dict.",
-    )
-    parser.add_argument(
-        "--filter-branch",
-        default="",
-        help="Only display branches containing this string.",
-    )
-
-    args = parser.parse_args()
+    ds_format = make_dataset_list(dataset)
+    result = get_structure(ds_format, filter_branch=filter_branch, do_print=False)
 
-    ds_format = make_dataset_list(args.dataset)
+    print(result)
 
-    result = get_structure(ds_format, filter_branch=args.filter_branch, do_print=False)
 
-    print(result)
+if __name__ == "__main__":
+    app()

servicex_analysis_utils/file_peeking.py

@@ -98,11 +98,10 @@ def build_deliver_spec(datasets):
     user_in = type(datasets)
 
     if user_in == str:
-        dataset_dict.update({"Sample": datasets})
+        dataset_dict.update({datasets: datasets})
     elif user_in == list and type(datasets[0]) is str:
-        for i in range(len(datasets)):
-            name = "Sample" + str(i + 1)  # write number for humans
-            dataset_dict.update({name: datasets[i]})
+        for ds in datasets:
+            dataset_dict.update({ds: ds})
     elif user_in == dict:
         dataset_dict = datasets
     else: