Redundant options have been merged, simplifying the command entry.

Author: inoribea

astroquery_cli/modules/jpl_cli.py

@@ -152,21 +152,21 @@ def query_horizons(ctx: typer.Context,
         import time
         start = time.perf_counter() if test else None
 
-        if target is None:
+        if target is None and not any(arg in ["-h", "--help"] for arg in ctx.args):
             help_output_capture = StringIO()
             with redirect_stdout(help_output_capture):
-                ctx.get_help()
+                try:
+                    ctx.get_help()
+                except SystemExit:
+                    pass
             full_help_text = help_output_capture.getvalue()
 
-            # Extract Usage and Arguments sections
-            usage_match = re.search(r'Usage:.*?\n', full_help_text)
-            arguments_match = re.search(r'╭─ Arguments ─.*?(\n(?:│.*?\n)*)╰─.*─╯', full_help_text, re.DOTALL)
-            
-            if usage_match:
-                console.print(usage_match.group(0).strip())
-            if arguments_match:
-                console.print(arguments_match.group(0))
+            # Remove the "Options" section
+            full_help_text = re.sub(r'╭─ Options ─.*?(\n(?:│.*?\n)*)╰─.*─╯', '', full_help_text, flags=re.DOTALL)
+            # Remove the "Commands" section
+            full_help_text = re.sub(r'╭─ Commands ─.*?(\n(?:│.*?\n)*)╰─.*─╯', '', full_help_text, flags=re.DOTALL)
 
+            console.print(full_help_text)
             raise typer.Exit()
 
         console.print(_("[cyan]Querying JPL Horizons for '{target}'...[/cyan]").format(target=target))
@@ -276,15 +276,12 @@ def query_sbdb(ctx: typer.Context,
                 ctx.get_help()
             full_help_text = help_output_capture.getvalue()
 
-            # Extract Usage and Arguments sections
-            usage_match = re.search(r'Usage:.*?\n', full_help_text)
-            arguments_match = re.search(r'╭─ Arguments ─.*?(\n(?:│.*?\n)*)╰─.*─╯', full_help_text, re.DOTALL)
-            
-            if usage_match:
-                console.print(usage_match.group(0).strip())
-            if arguments_match:
-                console.print(arguments_match.group(0))
+            # Remove the "Options" section
+            full_help_text = re.sub(r'╭─ Options ─.*?(\n(?:│.*?\n)*)╰─.*─╯', '', full_help_text, flags=re.DOTALL)
+            # Remove the "Commands" section
+            full_help_text = re.sub(r'╭─ Commands ─.*?(\n(?:│.*?\n)*)╰─.*─╯', '', full_help_text, flags=re.DOTALL)
 
+            console.print(full_help_text)
             raise typer.Exit()
 
         console.print(_("[cyan]Querying JPL SBDB for target: '{target}'...[/cyan]").format(target=target))

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "astroquery_cli"
-version = "0.12.1"
+version = "0.12.5"
 description = "CLI for astroquery modules with autocompletion."
 authors = ["inoribea <inoribea@outlook.com>"]
 readme = "README.md"