sdss-almanac 0.2.12__tar.gz → 0.3.1__tar.gz

{sdss_almanac-0.2.12 → sdss_almanac-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sdss-almanac
-Version: 0.2.12
+Version: 0.3.1
 Summary: Everything we've got
 Author-email: Andy Casey <andrew.casey@monash.edu>
 License: BSD 3-Clause License

{sdss_almanac-0.2.12 → sdss_almanac-0.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "sdss-almanac"
-version = "0.2.12"
+version = "0.3.1"
 authors = [
     { name = "Andy Casey", email = "andrew.casey@monash.edu" }
 ]

{sdss_almanac-0.2.12 → sdss_almanac-0.3.1}/src/almanac/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.2.12"
+__version__ = "0.3.1"
 
 from .config import config, get_config_path, ConfigManager
 from .logger import logger

{sdss_almanac-0.2.12 → sdss_almanac-0.3.1}/src/almanac/cli.py

@@ -217,7 +217,7 @@ def lookup(identifier, careful, **kwargs):
     from almanac.apogee import get_exposures
     from sdssdb.peewee.sdss5db.targetdb import (
         Assignment, AssignmentStatus,CartonToTarget, Target, Hole, Observatory,
-        Design, DesignToField
+        Design, DesignToField, Field
     )
     from sdssdb.peewee.sdss5db.catalogdb import SDSS_ID_flat
 
@@ -225,62 +225,87 @@ def lookup(identifier, careful, **kwargs):
     from rich.console import Console
     from rich.live import Live
 
-    identifiers = (
+    sq = (
         SDSS_ID_flat
-        .select(
-            SDSS_ID_flat.catalogid,
-            SDSS_ID_flat.sdss_id,
-        )
+        .select(SDSS_ID_flat.sdss_id)
         .where(
             (SDSS_ID_flat.sdss_id == identifier)
         |   (SDSS_ID_flat.catalogid == identifier)
         )
+        .alias("sq")
+    )
+    q = (
+        SDSS_ID_flat
+        .select(SDSS_ID_flat.catalogid, SDSS_ID_flat.sdss_id)
+        .distinct()
+        .join(sq, on=(SDSS_ID_flat.sdss_id == sq.c.sdss_id))
         .tuples()
     )
 
-    identifiers = { catalogid: sdss_id for catalogid, sdss_id in identifiers }
-    if not identifiers:
+    sdss_ids, catalogids = (set(), [])
+    for catalogid, sdss_id in q:
+        sdss_ids.add(sdss_id)
+        catalogids.append(catalogid)
+
+    if not catalogids:
         raise click.ClickException(f"Identifier {identifier} not found in SDSS-V database")
 
+    if len(sdss_ids) != 1:
+        raise click.ClickException(f"Identifier {identifier} is ambiguous and matches multiple SDSS IDs: {', '.join(map(str, sdss_ids))}")
+
     q = (
         Target
         .select(
             fn.Lower(Observatory.label),
             AssignmentStatus.mjd,
+            Field.field_id,
         )
+        .distinct()
         .join(CartonToTarget)
         .join(Assignment)
         .join(AssignmentStatus)
         .switch(Assignment)
         .join(Hole)
         .join(Observatory)
+        .switch(Assignment)
+        .join(Design)
+        .join(DesignToField)
+        .join(Field)
         .where(
-            Target.catalogid.in_(tuple(identifiers.keys()))
+            Target.catalogid.in_(tuple(catalogids))
         &   (AssignmentStatus.status == 1)
         )
         .tuples()
     )
-    q = tuple(set([(obs, int(mjd)) for obs, mjd in q]))
+    fields = {}
+    for obs, mjd, field_id in q:
+        mjd = int(mjd)
+        fields.setdefault((obs, mjd), set())
+        fields[(obs, mjd)].add(field_id)
 
     console = Console()
 
-    title = "; ".join([f"SDSS ID {sdss_id} / Catalog ID {catalogid}" for catalogid, sdss_id in identifiers.items()])
+    title = f"SDSS ID {sdss_id}"
 
-    # Create Rich table
-    rich_table = RichTable(title=f"{title}", title_style="bold blue", show_header=True, header_style="bold cyan")
+    rich_table = RichTable(
+        title=f"{title}",
+        title_style="bold blue",
+        show_header=True,
+        header_style="bold cyan"
+    )
 
-    for field_name in ("obs", "mjd", "exposure", "field", "fiber_id", "catalogid"):
+    for field_name in ("#", "obs", "mjd", "exposure", "field", "fiber_id", "catalogid"):
         rich_table.add_column(field_name, justify="center")
 
-    fields = {}
-    with Live(rich_table, console=console, refresh_per_second=4, screen=False) as live:
-        for exposure in chain(*starmap(get_exposures, q)):
-            key = (exposure.observatory, exposure.mjd)
-            if (key not in fields or fields[key] == exposure.field_id) or careful:
+    i = 1
+    with Live(rich_table, console=console, refresh_per_second=4) as live:
+        for exposure in chain(*starmap(get_exposures, fields.keys())):
+            field_ids = fields[(exposure.observatory, exposure.mjd)]
+            if exposure.field_id in field_ids:
                 for target in exposure.targets:
-                    if target.catalogid in identifiers:
-                        fields[key] = exposure.field_id
+                    if target.catalogid in catalogids:
                         rich_table.add_row(*list(map(str, (
+                            i,
                             exposure.observatory,
                             exposure.mjd,
                             exposure.exposure,
@@ -288,8 +313,10 @@ def lookup(identifier, careful, **kwargs):
                             target.fiber_id,
                             target.catalogid
                         ))))
+                        i += 1
                         break
 
+
 @main.group()
 def add(**kwargs):
     """Add new information to an existing Almanac file."""

{sdss_almanac-0.2.12 → sdss_almanac-0.3.1}/src/sdss_almanac.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sdss-almanac
-Version: 0.2.12
+Version: 0.3.1
 Summary: Everything we've got
 Author-email: Andy Casey <andrew.casey@monash.edu>
 License: BSD 3-Clause License