sdss-almanac 0.2.9__tar.gz → 0.2.11__tar.gz

{sdss_almanac-0.2.9 → sdss_almanac-0.2.11}/PKG-INFO

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

{sdss_almanac-0.2.9 → sdss_almanac-0.2.11}/pyproject.toml

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

{sdss_almanac-0.2.9 → sdss_almanac-0.2.11}/src/almanac/__init__.py

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

{sdss_almanac-0.2.9 → sdss_almanac-0.2.11}/src/almanac/cli.py

@@ -383,10 +383,10 @@ def update(key, value, **kwargs):
     click.echo(click.style("Deprecated: use `almanac config set`", fg="yellow"))
     return set(key, value, **kwargs)
 
-@config.command
+@config.command(name="set")
 @click.argument("key")
 @click.argument("value")
-def set(key, value, **kwargs):
+def _set(key, value, **kwargs):
     """Set a configuration value"""
 
     from almanac import config, get_config_path, ConfigManager

{sdss_almanac-0.2.9 → sdss_almanac-0.2.11}/src/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

{sdss_almanac-0.2.9 → sdss_almanac-0.2.11}/src/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.9 → sdss_almanac-0.2.11}/src/sdss_almanac.egg-info/PKG-INFO

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