fixed bugs

Author: inoribea

astroquery_cli/main.py

@@ -83,14 +83,19 @@ def setup_subcommands():
     app.add_typer(mast_cli.get_app(), name="mast")
     app.add_typer(ads_cli.get_app(), name="ads")
     app.add_typer(ned_cli.get_app(), name="ned")
-    app.add_typer(simbad_cli.get_app(), name="simbad")
-    app.add_typer(splatalogue_cli.get_app(), name="splatalogue")
-    app.add_typer(vizier_cli.get_app(), name="vizier")
-    app.add_typer(heasarc_cli.get_app(), name="heasarc")
+    app.add_typer(simbad_cli.get_app(), name="simbad", help=builtins._("Query the SIMBAD astronomical database. (sim)"))
+    app.add_typer(simbad_cli.get_app(), name="sim") # Alias for simbad
+    app.add_typer(splatalogue_cli.get_app(), name="splatalogue", help=builtins._("Query the Splatalogue spectral line database. (spl)"))
+    app.add_typer(splatalogue_cli.get_app(), name="spl") # Alias for splatalogue
+    app.add_typer(vizier_cli.get_app(), name="vizier", help=builtins._("Query the VizieR astronomical catalog database. (viz)"))
+    app.add_typer(vizier_cli.get_app(), name="viz") # Alias for vizier
+    app.add_typer(heasarc_cli.get_app(), name="heasarc", help=builtins._("Query the HEASARC database. (hea)"))
+    app.add_typer(heasarc_cli.get_app(), name="hea") # Alias for heasarc
     app.add_typer(sdss_cli.get_app(), name="sdss")
     app.add_typer(eso_cli.get_app(), name="eso")
     app.add_typer(nist_cli.get_app(), name="nist")
-    app.add_typer(exoplanet_cli.get_app(), name="exoplanet")
+    app.add_typer(exoplanet_cli.get_app(), name="exoplanet", help=builtins._("Query the NASA Exoplanet Archive. (exo)"))
+    app.add_typer(exoplanet_cli.get_app(), name="exo") # Alias for exoplanet
 
 @app.callback()
 def main_callback(
@@ -254,6 +259,9 @@ def custom_gettext(message):
                     pass
             full_help_text = help_output_capture.getvalue()
 
+            # Define aliases to filter out
+            aliases_to_filter = ["sim", "spl", "viz", "hea", "exo"]
+
             # Remove the gaia_message from the captured help text if it's present
             # This is to prevent duplication if Typer's help also includes it
             import re
@@ -263,11 +271,31 @@ def custom_gettext(message):
             commands_match = re.search(r'╭─ Commands ─.*?(\n(?:│.*?\n)*)╰─.*─╯', full_help_text, re.DOTALL)
             if commands_match:
                 commands_section = commands_match.group(0)
-                # This is a fallback in case Typer's internal help generation includes it
-                filtered_commands_section = "\n".join([
-                    line for line in commands_section.splitlines() if "Usage:" not in line
-                ])
-                console.print(filtered_commands_section)
+                # Filter out alias lines
+                filtered_commands_section_lines = []
+                for line in commands_section.splitlines():
+                    is_alias_line = False
+                    for alias in aliases_to_filter:
+                        # Check if the line starts with the alias name followed by spaces
+                        if re.match(rf"^\s*│\s*{re.escape(alias)}\s+", line):
+                            is_alias_line = True
+                            break
+                    if not is_alias_line and "Usage:" not in line:
+                        filtered_commands_section_lines.append(line)
+                
+                # Reconstruct the commands section, ensuring the borders are kept
+                if len(filtered_commands_section_lines) > 1: # Check if there's content beyond just the header/footer
+                    # Find the header and footer lines
+                    header_line = filtered_commands_section_lines[0]
+                    footer_line = filtered_commands_section_lines[-1]
+                    
+                    # Reconstruct the section with filtered content in between
+                    commands_section = header_line + "\n" + "\n".join(filtered_commands_section_lines[1:-1]) + "\n" + footer_line
+                else:
+                    # If only header/footer remain, just use the original filtered section
+                    commands_section = "\n".join(filtered_commands_section_lines)
+
+                console.print(commands_section)
             else:
                 # Fallback: if commands section not found, print full help
                 console.print(full_help_text)

astroquery_cli/modules/ads_cli.py

@@ -23,7 +23,7 @@ def get_app():
     _ = builtins._
     app = typer.Typer(
         name="ads",
-        help=builtins._("Query the NASA Astrophysics Data System (ADS)."),
+        help=builtins._("Query the NASA Astrophysics Data System"),
         invoke_without_command=True, # Add this to allow callback to run without subcommand
         no_args_is_help=False # Set to False for custom handling
     )

astroquery_cli/modules/eso_cli.py

@@ -23,7 +23,7 @@ def get_app():
     _ = builtins._
     app = typer.Typer(
         name="eso",
-        help=builtins._("Query the European Southern Observatory (ESO) archive."),
+        help=builtins._("Query the European Southern Observatory archive."),
         invoke_without_command=True,
         no_args_is_help=False
     )

astroquery_cli/modules/irsa_cli.py

@@ -29,7 +29,7 @@ def get_app():
     _ = builtins._
     app = typer.Typer(
         name="irsa",
-        help=builtins._("Query NASA/IPAC Infrared Science Archive (IRSA)."),
+        help=builtins._("Query NASA/IPAC Infrared Science Archive"),
         invoke_without_command=True, # Add this to allow callback to run without subcommand
         no_args_is_help=False # Set to False for custom handling
     )

astroquery_cli/modules/jpl_cli.py

@@ -60,14 +60,40 @@ def jpl_callback(
                 except SystemExit:
                     pass
             full_help_text = help_output_capture.getvalue()
+            
+            # Define aliases to filter out
+            aliases_to_filter = ["h", "s"]
+
             commands_match = re.search(r'╭─ Commands ─.*?(\n(?:│.*?\n)*)╰─.*─╯', full_help_text, re.DOTALL)
             if commands_match:
                 commands_section = commands_match.group(0)
-                filtered_commands_section = "\n".join([
-                    line for line in commands_section.splitlines() if "Usage:" not in line
-                ])
-                console.print(filtered_commands_section)
+                # Filter out alias lines
+                filtered_commands_section_lines = []
+                for line in commands_section.splitlines():
+                    is_alias_line = False
+                    for alias in aliases_to_filter:
+                        # Check if the line starts with the alias name followed by spaces
+                        if re.match(rf"^\s*│\s*{re.escape(alias)}\s+", line):
+                            is_alias_line = True
+                            break
+                    if not is_alias_line and "Usage:" not in line:
+                        filtered_commands_section_lines.append(line)
+                
+                # Reconstruct the commands section, ensuring the borders are kept
+                if len(filtered_commands_section_lines) > 1: # Check if there's content beyond just the header/footer
+                    # Find the header and footer lines
+                    header_line = filtered_commands_section_lines[0]
+                    footer_line = filtered_commands_section_lines[-1]
+                    
+                    # Reconstruct the section with filtered content in between
+                    commands_section = header_line + "\n" + "\n".join(filtered_commands_section_lines[1:-1]) + "\n" + footer_line
+                else:
+                    # If only header/footer remain, just use the original filtered section
+                    commands_section = "\n".join(filtered_commands_section_lines)
+
+                console.print(commands_section)
             else:
+                # Fallback: if commands section not found, print full help
                 console.print(full_help_text)
             raise typer.Exit()
 
@@ -105,7 +131,8 @@ def get_default_quantities_ephem(ctx: typer.Context,):
         _ = i18n.get_translator(lang)
         return "1,2,4,8,9,10,12,13,14,19,20,21,23,24,31"
 
-    @app.command(name="horizons", help=builtins._("Query ephemerides, orbital elements, or vectors for a target object."))
+    @app.command(name="horizons", help=builtins._("Query ephemerides, orbital elements, or vectors for a target object. (h)"))
+    @app.command(name="h", help=builtins._("Alias for horizons."))
     @global_keyboard_interrupt_handler
     def query_horizons(ctx: typer.Context,
         target: Optional[str] = typer.Argument(None, help=builtins._("Object ID (e.g., 'Mars', 'Ceres', '2000NM', '@10'). Use '@' prefix for spacecraft ID.")),
@@ -247,7 +274,7 @@ def query_horizons(ctx: typer.Context,
 
     sbdb_app = typer.Typer(
         name="sbdb",
-        help=builtins._("Query JPL Small-Body Database (SBDB)."),
+        help=builtins._("Query JPL Small-Body Database (SBDB). (s)"),
         no_args_is_help=False
     )
 
@@ -431,4 +458,5 @@ def default(self, obj):
             raise typer.Exit()
 
     app.add_typer(sbdb_app, name="sbdb")
+    app.add_typer(sbdb_app, name="s") # Alias for sbdb
     return app

astroquery_cli/modules/mast_cli.py

@@ -23,7 +23,7 @@ def get_app():
     _ = builtins._
     app = typer.Typer(
         name="mast",
-        help=builtins._("Query the Mikulski Archive for Space Telescopes (MAST)."),
+        help=builtins._("Query the Mikulski Archive for Space Telescopes"),
         invoke_without_command=True, # Add this to allow callback to run without subcommand
         no_args_is_help=False # Set to False for custom handling
     )

astroquery_cli/modules/ned_cli.py

@@ -23,7 +23,7 @@ def get_app():
     _ = builtins._
     app = typer.Typer(
         name="ned",
-        help=builtins._("Query the NASA/IPAC Extragalactic Database (NED)."),
+        help=builtins._("Query the NASA/IPAC Extragalactic Database"),
         invoke_without_command=True, # Add this to allow callback to run without subcommand
         no_args_is_help=False # Set to False for custom handling
     )

astroquery_cli/modules/sdss_cli.py

@@ -24,7 +24,7 @@ def get_app():
     app = typer.Typer(
         name="sdss",
         help=builtins._(
-            "Query the Sloan Digital Sky Survey (SDSS) database.\n\n"
+            "Query the Sloan Digital Sky Survey database.\n\n"
             "Perform a query on SDSS. You must provide parameters for exactly one of the following query types:\n\n"
             "  1. Cone Search:\n"
             "     --ra <RA> --dec <DEC> --radius <RADIUS>\n"