Merge pull request #87 from lsst/tickets/PREOPS-5118

tickets/PREOPS-5118: Prepare for USDF deployment of the scheduler snapshot dashboard

Dockerfile

@@ -16,4 +16,9 @@ RUN mkdir -p ${TEST_DATA_DIR} && \
 
 # Container execution
 ENV RUBIN_SIM_DATA_DIR=/home/${MAMBA_USER}/schedview/rubin_sim_data
+ENV SCHEDULER_SNAPSHOT_DASHBOARD_PORT=8080
+ENV LSST_DISABLE_BUCKET_VALIDATION=1
+ENV LSST_S3_USE_THREADS=False
+ENV S3_ENDPOINT_URL=https://s3dfrgw.slac.stanford.edu
+ENV SIMS_SKYBRIGHTNESS_DATA=https://s3df.slac.stanford.edu/groups/rubin/static/sim-data/sims_skybrightness_pre/h5_2023_09_12_small/
 CMD prenight --port 8080

container_environment.yaml

@@ -8,15 +8,18 @@ dependencies:
  - numpy
  - pandas
  - astropy >= 5.3
- - rubin-scheduler
- - rubin-sim
  - uranography >= 1.1.0
  - bokeh >= 3.1.1
  - panel >= 1.1.0
  - uranography
  - param
  - git
+ - botocore
+ - boto3
  - wget
+ - lsst-efd-client
+ - rubin-scheduler
+ - rubin-sim
  - pip
  - pip:
    - lsst.resources

schedview/app/scheduler_dashboard/scheduler_dashboard.py

@@ -1807,8 +1807,8 @@ def main():
     print("Starting scheduler dashboard.")
     commandline_args = parse_arguments()
 
-    if "SCHEDULER_PORT" in os.environ:
-        scheduler_port = int(os.environ["SCHEDULER_PORT"])
+    if "SCHEDULER_SNAPSHOT_DASHBOARD_PORT" in os.environ:
+        scheduler_port = int(os.environ["SCHEDULER_SNAPSHOT_DASHBOARD_PORT"])
     else:
         scheduler_port = 8888
 

schedview/plot/survey.py

@@ -203,12 +203,19 @@ def map_survey_healpix(
 
     if survey is not None:
         try:
+            try:
+                ra_deg = list(survey.ra_deg)
+                dec_deg = list(survey.dec_deg)
+            except TypeError:
+                ra_deg = [survey.ra_deg]
+                dec_deg = [survey.dec_deg]
+
             survey_field_data_source = bokeh.models.ColumnDataSource(
                 data={
-                    "ra": list(survey.ra_deg),
-                    "decl": list(survey.dec_deg),
-                    "name": ["survey_pointing {i}" for i, ra in enumerate(list(survey.ra_deg))],
-                    "glyph_size": [20] * len(list(survey.ra_deg)),
+                    "ra": ra_deg,
+                    "decl": dec_deg,
+                    "name": ["survey_pointing {i}" for i, ra in enumerate(ra_deg)],
+                    "glyph_size": [20] * len(ra_deg),
                 },
                 name="survey_pointings",
             )