Merge pull request #495 from gemini-hlsw/SCHED-475

SCHED 475: Add required conditions to each visit
gemini-hlsw · Aug 19, 2024 · f91777c · f91777c
2 parents ee0aa89 + b1c81e0
commit f91777c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/scheduler/core/plans/plan.py b/scheduler/core/plans/plan.py
@@ -94,6 +94,7 @@ def add(self,
         visit = Visit(start,
                       obs.id,
                       obs.obs_class,
+                      obs.constraints.conditions,
                       atom_start,
                       atom_end,
                       start_time_slot,

diff --git a/scheduler/core/plans/visit.py b/scheduler/core/plans/visit.py
@@ -5,7 +5,7 @@
 from datetime import datetime
 from typing import final, Optional
 
-from lucupy.minimodel import ObservationID, Resource, ObservationClass
+from lucupy.minimodel import ObservationID, Resource, ObservationClass, Conditions
 
 __all__ = [
     'Visit',
@@ -18,6 +18,7 @@ class Visit:
     start_time: datetime  # Unsure if this or something else
     obs_id: ObservationID
     obs_class: ObservationClass
+    obs_conditions: Conditions
     atom_start_idx: int
     atom_end_idx: int
     start_time_slot: int

diff --git a/scheduler/graphql_mid/types.py b/scheduler/graphql_mid/types.py
@@ -11,7 +11,7 @@
 from astropy.coordinates import Angle
 from strawberry.scalars import JSON  # noqa
 
-from lucupy.minimodel import CloudCover, ImageQuality, Site, VariantSnapshot
+from lucupy.minimodel import CloudCover, ImageQuality, Site, VariantSnapshot, Conditions
 
 from scheduler.core.eventsqueue.nightchanges import NightlyTimeline
 from scheduler.core.plans import Plan, Plans, Visit, NightStats
@@ -47,7 +47,7 @@ class SConditions:
     cc: str
 
     @staticmethod
-    def from_computed_conditions(variant: VariantSnapshot):
+    def from_computed_conditions(variant: VariantSnapshot | Conditions):
         return SConditions(iq=variant.iq.name, cc=variant.cc.name)
 
 
@@ -63,6 +63,7 @@ class SVisit:
     atom_end_idx: int
     altitude: List[float]
     instrument: str
+    required_conditions: SConditions
     obs_class: str
     score: float
     peak_score: float
@@ -79,6 +80,7 @@ def from_computed_visit(visit: Visit, alt_degs: List[float]) -> 'SVisit':
                       atom_end_idx=visit.atom_end_idx,
                       altitude=alt_degs,
                       instrument=visit.instrument.id if visit.instrument is not None else 'None',
+                      required_conditions=SConditions.from_computed_conditions(visit.obs_conditions),
                       score=visit.score,
                       peak_score=visit.peak_score,
                       obs_class=visit.obs_class.name,