fixed nasa_ads api logic alma's bugs and translate scripts

Author: inoribea

astroquery_cli/__init__.py

@@ -1,6 +1,21 @@
 # astroquery_cli/__init__.py
 from importlib import metadata
+import logging
+import sys
+
+# Suppress astroquery log messages globally
+logging.getLogger('astroquery').setLevel(logging.CRITICAL)
+
+# Monkey patch logging.Logger._set_defaults to prevent AttributeError from astroquery
+# This needs to happen before astroquery is imported.
+# We replace _set_defaults with a no-op if it exists.
+if hasattr(logging.Logger, '_set_defaults'):
+    original_set_defaults = logging.Logger._set_defaults
+    def no_op_set_defaults(self):
+        pass
+    logging.Logger._set_defaults = no_op_set_defaults
+
 try:
     __version__ = metadata.version("astroquery-cli")
 except metadata.PackageNotFoundError:
-    __version__ = "None" 
+    __version__ = "None"

astroquery_cli/config.py

@@ -29,7 +29,7 @@ def load_config():
         # Create a default config file for the user
         with open(CONFIG_FILE_PATH, 'w') as f:
             f.write("[Environment]\n")
-            f.write("# ADS_DEV_KEY = your_ads_dev_key\n")
+            f.write("ADS_DEV_KEY = \n") # Add this line
             f.write("# AQC_DEBUG = true\n")
             f.write("# AQC_VERBOSE = true\n")
             f.write("# AQC_LANG = en\n")

astroquery_cli/locales/fr/LC_MESSAGES/messages.mo

@@ -11,6 +11,10 @@
 from rich.console import Console # Import Console
 from rich.text import Text # Import Text
 import re # Import re
+import logging # Import logging
+
+# Suppress astroquery log messages globally (moved to __init__.py for earlier execution)
+# Monkey patch for astroquery.logger._init_log (moved to __init__.py for earlier execution)
 
 from astroquery_cli import config # Import config first
 # Load configuration from ~/.aqc/config.ini
@@ -24,7 +28,6 @@
 from astroquery_cli.debug import debug_manager
 
 
-
 def save_default_lang(lang):
     config.set_language(lang.strip())
 
@@ -41,18 +44,19 @@ def load_default_lang():
     context_settings={"help_option_names": ["-h", "--help"]},
 )
 
-_captured_stdout_during_import = ""
-
 def setup_subcommands():
-    global _captured_stdout_during_import # Declare global here
-    f = StringIO()
-    with redirect_stdout(f):
-        from .modules import (
-            simbad_cli, alma_cli, esasky_cli, gaia_cli, irsa_cli, irsa_dust_cli,
-            jplhorizons_cli, jplsbdb_cli, mast_cli, nasa_ads_cli, ned_cli,
-            splatalogue_cli, vizier_cli
-        )
-    _captured_stdout_during_import = f.getvalue()
+    import logging
+    # Suppress astroquery log messages during import
+    logging.getLogger('astroquery').setLevel(logging.CRITICAL)
+
+    # Import all subcommands
+    from .modules import (
+        simbad_cli, alma_cli, esasky_cli, gaia_cli, irsa_cli, irsa_dust_cli,
+        jplhorizons_cli, jplsbdb_cli, mast_cli, nasa_ads_cli, ned_cli,
+        splatalogue_cli, vizier_cli
+    )
+    # Restore astroquery log level after import
+    logging.getLogger('astroquery').setLevel(logging.NOTSET)
 
     app.add_typer(simbad_cli.get_app(), name="simbad")
     app.add_typer(alma_cli.get_app(), name="alma")
@@ -106,7 +110,6 @@ def main_callback(
         help=i18n._("Enable verbose output.")
     )
 ):
-    global _captured_stdout_during_import
     _ = builtins._
     ctx.obj = ctx.obj or {}
 
@@ -157,20 +160,6 @@ def main_callback(
     }
     debug_manager.print_translation_info(selected_lang, translation_info)
 
-    # Process captured stdout messages after translation is initialized
-    if _captured_stdout_during_import:
-        lines = _captured_stdout_during_import.splitlines()
-        for line in lines:
-            if "Gaia ESA Archive has been rolled back" in line:
-                translated_message = _(
-                    "Please note that the Gaia ESA Archive has been rolled back to version 3.7. "
-                    "Please find the release notes at https://www.cosmos.esa.int/web/gaia-users/archive/release-notes"
-                )
-                print(translated_message)
-            else:
-                print(line)
-        _captured_stdout_during_import = ""
-
     # Try to inject our translations into Click's gettext domain
     try:
         import gettext
@@ -249,7 +238,6 @@ 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)
-                # Remove the "Usage:" line if present in the full help text
                 # 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
@@ -261,11 +249,19 @@ def custom_gettext(message):
             raise typer.Exit()
 
 def cli():
+    from rich.console import Console # Import Console here
     try:
+        # Check for debug flag early to configure debug_manager before module imports
+        if "--debug" in sys.argv or "-d" in sys.argv:
+            debug_manager.enable_debug()
+            # Print a message indicating debug mode is enabled
+            console = Console()
+            console.print("[bold green]Debug mode enabled.[/bold green]")
+        # Removed the "Debug mode disabled" message as per user request.
+
         setup_subcommands()
         app()
     except KeyboardInterrupt:
-        from rich.console import Console
         _ = i18n.get_translator()
         console = Console()
         console.print(f"[bold yellow]{_('User interrupted the query. Exiting safely.')}[bold yellow]")

astroquery_cli/locales/ja/LC_MESSAGES/messages.mo

@@ -2,6 +2,7 @@
 from typing import Optional, List
 from astropy.table import Table as AstropyTable
 from astroquery.alma import Alma
+import logging # Import logging
 from ..utils import (
     console,
     display_table,
@@ -16,6 +17,7 @@
 import re # Import re
 from io import StringIO # Import StringIO
 from contextlib import redirect_stdout # Import redirect_stdout
+import sys # Import sys
 from astroquery_cli.common_options import setup_debug_context # Import setup_debug_context
 
 def get_app():
@@ -75,6 +77,9 @@ def alma_callback(
                 console.print(full_help_text)
             raise typer.Exit()
 
+    # Suppress ALMA log messages during import
+    logging.getLogger('astroquery.alma').setLevel(logging.WARNING)
+
     Alma.ROW_LIMIT = 50
     Alma.TIMEOUT = 60
 
@@ -94,17 +99,16 @@ def query_object(
         output_file: Optional[str] = common_output_options["output_file"],
         output_format: Optional[str] = common_output_options["output_format"],
         max_rows_display: int = typer.Option(20, help=builtins._("Maximum number of rows to display. Use -1 for all rows.")),
-        show_all_columns: bool = typer.Option(False, "--show-all-cols", help=builtins._("Show all columns in the output table.")),
-        test: bool = typer.Option(False, "--test", "-t", help=_("Enable test mode and print elapsed time."))
+        show_all_columns: bool = typer.Option(False, "--show-all-cols", help=builtins._("Show all columns in the output table."))
     ):
-        import time
-        start = time.perf_counter() if test else None
-
         lang = ctx.obj.get("lang", "en") if ctx.obj else "en"
         _ = i18n.get_translator(lang)
-        console.print(_("[cyan]Querying ALMA for object: '{object_name}'...[/cyan]").format(object_name=object_name))
         alma = Alma()
         try:
+            # Debugging information
+            console.print(f"DEBUG: query_object - object_name: {object_name}")
+
+            console.print(f"[cyan]{_('Querying ALMA for object: {object_name}').format(object_name=object_name)}[/cyan]")
             query_payload = {'source_name_alma': object_name}
             if payload:
                 for item in payload:
@@ -131,11 +135,6 @@ def query_object(
             handle_astroquery_exception(ctx, e, _("ALMA object"))
             raise typer.Exit(code=1)
 
-        if test:
-            elapsed = time.perf_counter() - start
-            print(f"Elapsed: {elapsed:.3f} s")
-            raise typer.Exit()
-
     @app.command(name="region", help=builtins._("Query ALMA for observations in a sky region."))
     @global_keyboard_interrupt_handler
     def query_region(
@@ -147,16 +146,15 @@ def query_region(
         output_file: Optional[str] = common_output_options["output_file"],
         output_format: Optional[str] = common_output_options["output_format"],
         max_rows_display: int = typer.Option(20, help=builtins._("Maximum number of rows to display. Use -1 for all rows.")),
-        show_all_columns: bool = typer.Option(False, "--show-all-cols", help=builtins._("Show all columns in the output table.")),
-test: bool = typer.Option(False, "--test", "-t", help=builtins._("Enable test mode and print elapsed time."))
+        show_all_columns: bool = typer.Option(False, "--show-all-cols", help=builtins._("Show all columns in the output table."))
     ):
-        import time
-        start = time.perf_counter() if test else None
-
         lang = ctx.obj.get("lang", "en") if ctx.obj else "en"
         _ = i18n.get_translator(lang)
-        console.print(_("[cyan]Querying ALMA for region: '{coordinates}' with radius '{radius}'...[/cyan]").format(coordinates=coordinates, radius=radius))
         try:
+            # Debugging information
+            console.print(f"DEBUG: query_region - coordinates: {coordinates}, radius: {radius}")
+
+            console.print(f"[cyan]{_('Querying ALMA for region: {coordinates} with radius {radius}').format(coordinates=coordinates, radius=radius)}[/cyan]")
             coord = parse_coordinates(ctx, coordinates)
             rad = parse_angle_str_to_quantity(ctx, radius)
             alma = Alma()
@@ -178,9 +176,5 @@ def query_region(
             handle_astroquery_exception(ctx, e, _("ALMA region"))
             raise typer.Exit(code=1)
 
-        if test:
-            elapsed = time.perf_counter() - start
-            print(f"Elapsed: {elapsed:.3f} s")
-            raise typer.Exit()
 
     return app

astroquery_cli/locales/zh/LC_MESSAGES/messages.mo

@@ -7,6 +7,9 @@
 
 console = Console()
 
+# Suppress Gaia server messages during import
+gaia_conf.show_server_messages = False
+
 from ..utils import display_table, handle_astroquery_exception, parse_coordinates, parse_angle_str_to_quantity, common_output_options, save_table_to_file
 from ..utils import global_keyboard_interrupt_handler
 from ..i18n import get_translator
@@ -43,6 +46,9 @@ def gaia_callback(
         )
     ):
         setup_debug_context(ctx, debug, verbose)
+        # Re-enable Gaia server messages when the gaia app is actually invoked
+        gaia_conf.show_server_messages = True
+        console.print(builtins._("[yellow]Please note that the Gaia ESA Archive has been rolled back to version 3.7. Please find the release notes at https://www.cosmos.esa.int/web/gaia-users/archive/release-notes[/yellow]"))
 
         # Custom help display logic
         if ctx.invoked_subcommand is None and \
@@ -72,8 +78,6 @@ def gaia_callback(
                 console.print(full_help_text)
             raise typer.Exit()
 
-    gaia_conf.show_server_messages = True
-
     GAIA_TABLES = {
         "main_source": "gaiadr3.gaia_source",
         "dr2_source": "gaiadr2.gaia_source",