sdss-almanac 0.2.10__py3-none-any.whl → 0.2.12__py3-none-any.whl

almanac/__init__.py

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

almanac/cli.py

@@ -41,7 +41,12 @@ def main(
 
     # This keeps the default behaviour as 'query mode' but allows for commands like 'config'.
     if ctx.invoked_subcommand is not None:
-        command = dict(config=config, dump=dump, add=add)[ctx.invoked_subcommand]
+        command = dict(
+            config=config,
+            dump=dump,
+            add=add,
+            lookup=lookup
+        )[ctx.invoked_subcommand]
         return ctx.invoke(command, **ctx.params)
 
     import h5py as h5
@@ -196,6 +201,95 @@ def main(
         for item in buffered_critical_logs:
             logger.critical(item)
 
+
+@main.command()
+@click.argument("identifier", type=int)
+@click.option("--careful", is_flag=True, help="Don't assume unique field for a given (obs, mjd, catalogid)")
+def lookup(identifier, careful, **kwargs):
+    """Lookup a target by catalog identifier or SDSS identifier."""
+
+    if not identifier:
+        return
+
+    from peewee import fn
+    from itertools import chain, starmap
+    from almanac.database import database
+    from almanac.apogee import get_exposures
+    from sdssdb.peewee.sdss5db.targetdb import (
+        Assignment, AssignmentStatus,CartonToTarget, Target, Hole, Observatory,
+        Design, DesignToField
+    )
+    from sdssdb.peewee.sdss5db.catalogdb import SDSS_ID_flat
+
+    from rich.table import Table as RichTable
+    from rich.console import Console
+    from rich.live import Live
+
+    identifiers = (
+        SDSS_ID_flat
+        .select(
+            SDSS_ID_flat.catalogid,
+            SDSS_ID_flat.sdss_id,
+        )
+        .where(
+            (SDSS_ID_flat.sdss_id == identifier)
+        |   (SDSS_ID_flat.catalogid == identifier)
+        )
+        .tuples()
+    )
+
+    identifiers = { catalogid: sdss_id for catalogid, sdss_id in identifiers }
+    if not identifiers:
+        raise click.ClickException(f"Identifier {identifier} not found in SDSS-V database")
+
+    q = (
+        Target
+        .select(
+            fn.Lower(Observatory.label),
+            AssignmentStatus.mjd,
+        )
+        .join(CartonToTarget)
+        .join(Assignment)
+        .join(AssignmentStatus)
+        .switch(Assignment)
+        .join(Hole)
+        .join(Observatory)
+        .where(
+            Target.catalogid.in_(tuple(identifiers.keys()))
+        &   (AssignmentStatus.status == 1)
+        )
+        .tuples()
+    )
+    q = tuple(set([(obs, int(mjd)) for obs, mjd in q]))
+
+    console = Console()
+
+    title = "; ".join([f"SDSS ID {sdss_id} / Catalog ID {catalogid}" for catalogid, sdss_id in identifiers.items()])
+
+    # Create Rich table
+    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"):
+        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:
+                for target in exposure.targets:
+                    if target.catalogid in identifiers:
+                        fields[key] = exposure.field_id
+                        rich_table.add_row(*list(map(str, (
+                            exposure.observatory,
+                            exposure.mjd,
+                            exposure.exposure,
+                            exposure.field_id,
+                            target.fiber_id,
+                            target.catalogid
+                        ))))
+                        break
+
 @main.group()
 def add(**kwargs):
     """Add new information to an existing Almanac file."""

almanac/data_models/exposure.py

@@ -77,6 +77,13 @@ class Exposure(BaseModel):
     #def sparse_pak(self) -> bool:
     #    return "sparse" in self.observer_comment.lower()
 
+    def __str__(self):
+        return (
+            f"<Exposure(observatory={self.observatory},"
+            f" mjd={self.mjd}, exposure={self.exposure},"
+            f" image_type={self.image_type})>"
+        )
+
     @computed_field
     def flagged_bad(self) -> bool:
         marked_bad = (self.observatory, self.mjd, self.exposure) in lookup_bad_exposures
@@ -342,8 +349,11 @@ class Exposure(BaseModel):
                             # went wrong in early plate era.
                             rows["plugged_mjd"] = self.plugged_mjd
                             rows["observatory"] = self.observatory
-
-                self._targets = tuple([factory(**r) for r in rows])
+                try:
+                    self._targets = tuple([factory(**r) for r in rows])
+                except Exception as e:
+                    e.add_note(f"Originated from {self}")
+                    raise
             else:
                 self._targets = tuple()
         return self._targets

almanac/data_models/plate.py

@@ -49,7 +49,7 @@ class PlateTarget(BaseModel):
 
     # Instrument identifiers
     spectrograph_id: int = Field(alias="spectrographId", description="Spectrograph ID", default=-1)
-    fiber_id: int = Field(alias="fiberId", description="Fiber ID", default=-1)
+    fiber_id: int = Field(alias="fiberId", description="Fiber ID", ge=1, le=300)
     planned_fiber_id: int = Field(alias="fiberid", description="Fiber ID", default=-1)
     throughput: int = Field(description="Throughput value", default=-1)
 
@@ -137,6 +137,12 @@ class PlateTarget(BaseModel):
                         break
 
                 if self.fiber_id in (53, 60):
-                    self.fiber_id = -1  # unpopulated fiber
+                    # The DRP indicates that these are unpopulated fibers.
+                    self.hole_type = "unplugged"
+                    self.category = "unplugged"
+                    self.planned_hole_type = "unplugged"
+                    self.ra = np.nan
+                    self.dec = np.nan
+                    self.obj_type = "na"
 
         return self

{sdss_almanac-0.2.10.dist-info → sdss_almanac-0.2.12.dist-info}/METADATA

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

{sdss_almanac-0.2.10.dist-info → sdss_almanac-0.2.12.dist-info}/RECORD

@@ -1,7 +1,7 @@
-almanac/__init__.py,sha256=o_bowgFBdkGVkmnHzBWUTrlCXvLvGJqYQuBojDtBv6Q,110
+almanac/__init__.py,sha256=vR2wU2aXGUfju14ePXTgSjjq-pHXFyWCqs8ZlD17mO0,110
 almanac/apogee.py,sha256=Q7juc7BJdnP56-4UZ4CSg6FCULr22KHinHly2d0KMt8,10390
 almanac/catalog.py,sha256=tVwlLtVaUbSt1hoTpIPP2bMhgd4rpcUUP_zdr6uks2c,11633
-almanac/cli.py,sha256=MUqE9kBfRfJPl6FLw-pJ1EUpIfZcami5IakGqxCvXsQ,26523
+almanac/cli.py,sha256=4nlH0zjdeW_kMXvkCoxaNmfpUhUAJbFFjzZNvIKy88k,29678
 almanac/config.py,sha256=5oRO-mrtaCKIcqGxcrfeNHZIjHkULDRrI_Bv1CU5uxE,3259
 almanac/database.py,sha256=6YeuRSFU5zfIen7zU-nI4pN_Z_fnYkglPcYxzVF4Xqo,758
 almanac/display.py,sha256=IflM5Y3yOJEDkvyUYQe3bOFs1iEwoe3mUj8mbODsYDk,15388
@@ -10,19 +10,19 @@ almanac/logger.py,sha256=N7U610gLP6JVDUGcua3UaV9DLoWg1njfkg4F7t11UW4,665
 almanac/qa.py,sha256=hws0YLjD6C-yC81LKmEZPRXOvucfmZE4cYEZot1R9mk,776
 almanac/utils.py,sha256=0ditIHNb41_OKjaMHxEnicHnTT0NAp3SAW3QZ196JL0,4832
 almanac/data_models/__init__.py,sha256=OVLgGYbJmmetYJ7pKUs5jylzC6XAyk2BnC6arjZnuMY,89
-almanac/data_models/exposure.py,sha256=aUzavB8Xdv5rizVJI1jSdN0KaIf7UvxiPp5kTKqXakE,12834
+almanac/data_models/exposure.py,sha256=NaokIebZCQ2i167S6qjJvDuqkYSMCiFJUP8UPovtlFs,13194
 almanac/data_models/fps.py,sha256=6wM3TgCOnq2cEiGe_rKAp2pW-klGya9Fx9Y_5EbBHRU,5319
 almanac/data_models/metadata.py,sha256=49Gkhw-saVJbx5t_B61SyV2qMmvXgB-yLCFQk5Kpw5M,10990
-almanac/data_models/plate.py,sha256=hehFKr35PL_iaqLHcAHBxnDraB1_y_S7sc9wL6z7vYQ,6618
+almanac/data_models/plate.py,sha256=xWovW5Rjjt56OK3MP2TZslquv1b0zLtUS5nvw-xz7QQ,6905
 almanac/data_models/types.py,sha256=An2xrTDb4UT1DVsySiFv94pAbJZnY06kkiS9PPYZLwM,2247
 almanac/data_models/utils.py,sha256=FBmY2OMRrOr6elisq910Uj5ZvaXmLQWOGAbMPqA2_T4,6232
 almanac/etc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 almanac/etc/bad_exposures.csv,sha256=VQQoq6uXDhnnIyp6vw0cfeTaoyNqPi5dW0MwfKsDRCk,25394
 almanac/stash/data_models.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 almanac/stash/plugmap_models.py,sha256=8yxw6ZXuLP1ZdFuT7wCW_Z5JSJll4uymiIWRb6WvSOk,8973
-sdss_almanac-0.2.10.dist-info/licenses/LICENSE.md,sha256=_7dAUQQ5Ph_x1hcFXhi9aHBcqq9H11zco12eO4B3Cyg,1504
-sdss_almanac-0.2.10.dist-info/METADATA,sha256=p7n9LIOz_DFzxqvuM9GVmYJpYaL3Lno_IV3u-Sq-nr0,6995
-sdss_almanac-0.2.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sdss_almanac-0.2.10.dist-info/entry_points.txt,sha256=5Obfm-uaVxE3RnRm2W7dYaX_O_j5ggGvAW5UQG5AtuE,45
-sdss_almanac-0.2.10.dist-info/top_level.txt,sha256=sWBGH9a-2-nFB2-rGqioyigbkcz14t1u8rqAs_RYe_w,8
-sdss_almanac-0.2.10.dist-info/RECORD,,
+sdss_almanac-0.2.12.dist-info/licenses/LICENSE.md,sha256=_7dAUQQ5Ph_x1hcFXhi9aHBcqq9H11zco12eO4B3Cyg,1504
+sdss_almanac-0.2.12.dist-info/METADATA,sha256=QVqM9dBL87gm9bXuiqEOE8ED10-G45NUvkysBkRfdek,6995
+sdss_almanac-0.2.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sdss_almanac-0.2.12.dist-info/entry_points.txt,sha256=5Obfm-uaVxE3RnRm2W7dYaX_O_j5ggGvAW5UQG5AtuE,45
+sdss_almanac-0.2.12.dist-info/top_level.txt,sha256=sWBGH9a-2-nFB2-rGqioyigbkcz14t1u8rqAs_RYe_w,8
+sdss_almanac-0.2.12.dist-info/RECORD,,