Merge pull request #75 from lsst/tickets/PREOPS-4948

tickets/PREOPS-4948: functions to support imitating a DES nightsum report using a Times Square notebook

.github/workflows/build_container.yaml

@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: conda-incubator/setup-miniconda@v2
+      - uses: conda-incubator/setup-miniconda@v3
         with:
           python-version: "3.11"
           auto-update-conda: true
@@ -38,7 +38,7 @@ jobs:
 
       - name: Access rubin-sched-data cache
         id: cache-rs
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: cached-rubin-sched-data
         with:

.github/workflows/build_docs.yaml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: conda-incubator/setup-miniconda@v2
+      - uses: conda-incubator/setup-miniconda@v3
         with:
           auto-update-conda: true
           python-version: "3.11"
@@ -46,7 +46,7 @@ jobs:
         shell: bash -l {0}
         run: |
           cd docs
-          package-docs build
+          make html
 
       - name: Upload documentation
         uses: lsst-sqre/ltd-upload@v1

.github/workflows/cache.yaml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install conda
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
           python-version: "3.11"
           auto-update-conda: true
@@ -29,14 +29,14 @@ jobs:
         id: rs-install
         shell: bash -l {0}
         run: |
-          mamba install --quiet rubin-scheduler     
+          mamba install --quiet rubin-scheduler
           mamba list rubin-scheduler | grep -v "#" | awk '{print $2}' > ${{ github.workspace }}/rs_version
           echo "rs-version" `cat ${{ github.workspace }}/rs_version`
-          echo "rs-version=`cat ${{ github.workspace }}/rs_version`" >> $GITHUB_OUTPUT          
+          echo "rs-version=`cat ${{ github.workspace }}/rs_version`" >> $GITHUB_OUTPUT
 
       - name: Access rubin-sched-data cache
         id: cache-rs
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: cached-rubin-sched-data
         with:
@@ -59,8 +59,9 @@ jobs:
         name: Update/Download data.
         shell: bash -l {0}
         run: |
-          export RUBIN_SIM_DATA_DIR=~/rubin_sim_data       
+          export RUBIN_SIM_DATA_DIR=~/rubin_sim_data
           scheduler_download_data --update --tdqm_disable
+          rs_download_data --update --tdqm_disable --dirs sim-baseline
 
       - name: Check data
         shell: bash -l {0}
@@ -72,6 +73,4 @@ jobs:
           cat $RUBIN_SIM_DATA_DIR/versions.txt
           echo "is it in sync?"
           scheduler_download_data --versions
-  
-
-
+          rs_download_data --versions

.github/workflows/cleanup_cache.yaml

@@ -15,7 +15,7 @@ jobs:
           echo "Fetching list of cache key"
           cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH  | cut -f 1)
 
-          ## Setting this to not fail the workflow while deleting cache keys. 
+          ## Setting this to not fail the workflow while deleting cache keys.
           set +e
           echo "Deleting caches..."
           for cacheKey in $cacheKeysForPR
@@ -27,6 +27,3 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           REPO: ${{ github.repository }}
           BRANCH: refs/pull/${{ github.event.pull_request.number }}/merge
-
-
-

.github/workflows/ruff.yaml

@@ -13,12 +13,12 @@ jobs:
   isort:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: isort/isort-action@v1
         with:
           requirements-files: "requirements.txt test-requirements.txt"
   ruff:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: chartboost/ruff-action@v1
+      - uses: actions/checkout@v4
+      - uses: chartboost/ruff-action@v1

.github/workflows/test_and_build.yaml

@@ -26,7 +26,7 @@ jobs:
         python-version: ["3.11"]
     steps:
       - uses: actions/checkout@v4
-      - uses: conda-incubator/setup-miniconda@v2
+      - uses: conda-incubator/setup-miniconda@v3
         with:
           python-version: ${{ matrix.python-version }}
           auto-update-conda: true
@@ -49,7 +49,7 @@ jobs:
 
       - name: Access rubin-sched-data cache
         id: cache-rs
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: cached-rubin-sched-data
         with:
@@ -63,12 +63,13 @@ jobs:
         run: |
           export RUBIN_SIM_DATA_DIR=~/rubin_sim_data
           scheduler_download_data --update --tdqm_disable
+          rs_download_data --update --tdqm_disable --dirs sim_baseline
 
       - name: Install schedview
         shell: bash -l {0}
         run: |
           echo `pwd`
-          python -m pip install . --no-deps
+          python -m pip install -e . --no-deps
 
       - name: Conda list
         shell: bash -l {0}
@@ -85,7 +86,7 @@ jobs:
           pytest -r a -v --cov=schedview --cov=tests --cov-report=xml --cov-report=term --cov-branch
 
       - name: Upload coverage to codecov
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v4
         with:
           file: coverage.xml
 

.gitignore

@@ -146,3 +146,7 @@ util/sample_data/sample_rewards.h5
 util/sample_data/sample_scheduler.pickle.xz
 notebooks/de421.bsp
 notebooks/MPCORB.DAT.gz
+
+# Other temporary files
+tmp/*
+util/tmp/*

container_environment.yaml

@@ -9,6 +9,7 @@ dependencies:
  - pandas
  - astropy >= 5.3
  - rubin-scheduler
+ - rubin-sim
  - uranography >= 1.1.0
  - bokeh >= 3.1.1
  - panel >= 1.1.0

requirements.txt

@@ -11,4 +11,5 @@ param
 pytz
 uranography
 rubin-scheduler
+rubin-sim
 pip

schedview/app/prenight/prenight.py

@@ -287,12 +287,20 @@ def _update_visits(self):
             if not ResourcePath(self.opsim_output_fname).exists():
                 raise FileNotFoundError(f"Resource not found: {self.opsim_output_fname}")
 
-            visits = schedview.collect.opsim.read_opsim(
-                self.opsim_output_fname,
-                Time(self._almanac_events.loc["sunset", "UTC"]),
-                Time(self._almanac_events.loc["sunrise", "UTC"]),
-            )
-            if len(visits) == 0:
+            try:
+                visits = schedview.collect.opsim.read_opsim(
+                    self.opsim_output_fname,
+                    Time(self._almanac_events.loc["sunset", "UTC"]),
+                    Time(self._almanac_events.loc["sunrise", "UTC"]),
+                )
+                no_data_found = len(visits) == 0
+            except UserWarning as user_warning:
+                if user_warning.args[0].startswith("No data found matching"):
+                    no_data_found = True
+                else:
+                    raise user_warning
+
+            if no_data_found:
                 self.logger.info("No visits on requested night, looking for a night with visits.")
                 # read all visits to so we can find a central one
                 visits = schedview.collect.opsim.read_opsim(self.opsim_output_fname)

schedview/collect/__init__.py

@@ -4,6 +4,7 @@
     "read_scheduler",
     "sample_pickle",
     "load_bright_stars",
+    "read_ddf_visits",
 ]
 
 from .footprint import get_footprint

schedview/collect/local.py

@@ -1,5 +1,5 @@
 from .metrics import get_metric_path  # noqa F401
-from .opsim import read_opsim  # noqa F401
+from .opsim import read_ddf_visits, read_opsim  # noqa F401
 from .scheduler_pickle import read_scheduler  # noqa F401
 from .scheduler_pickle import sample_pickle  # noqa F401
 from .stars import load_bright_stars  # noqa F401