tickets/SP-3143: Make sure dates returned from prenight index bucket are dates, not strings

rubin_sim/sim_archive/prenightindex.py

@@ -137,6 +137,21 @@ def get_prenight_index_from_bucket(
 
     prenights.index.name = "visitseq_uuid"
 
+    # Dates in json are loaded into strings, but in the
+    # DB query code they are returned as instances of
+    # datetime.date.
+    # Convert correctly formatted date strings to datetime.date
+    # so they come back the same regardless of origin.
+    date_keys = ("sim_creation_day_obs", "first_day_obs", "last_day_obs", "parent_last_day_obs")
+    for key in date_keys:
+        replacement_values = None
+        try:
+            replacement_values = pd.to_datetime(prenights[key]).dt.date
+        except (ValueError, KeyError):
+            pass
+        if replacement_values is not None:
+            prenights[key] = replacement_values
+
     return prenights
 
 

tests/sim_archive/test_prenightindex.py

@@ -1,6 +1,6 @@
 import os
 import unittest
-from datetime import date
+from datetime import date, datetime
 from io import StringIO
 from tempfile import TemporaryDirectory
 from typing import ClassVar
@@ -9,6 +9,8 @@
 
 import pandas as pd
 import testing.postgresql
+from astropy.time import Time, TimezoneInfo
+from astropy.units import hour
 from lsst.resources import ResourcePath
 
 from rubin_sim.sim_archive import vseqarchive, vseqmetadata
@@ -71,16 +73,24 @@ def setUpClass(cls) -> None:
         vseqmetadata.VSARCHIVE_PGPORT = cls.test_database.psycopg2_dsn()["port"]
         vseqmetadata.VSARCHIVE_PGSCHEMA = TEST_METADATA_DB_SCHEMA
 
+        # Set the creation time by hand and assign it directly
+        # so that if the dayobs rolls over during the test it
+        # won't cause tests to fail.
+        creation_time = Time.now()
+
         # Create a simple simulation using TEST_VISITS data
         cls.sim_uuid = cls.vsarch.record_simulation_metadata(
             TEST_VISITS,
             "Test simonyi simulation",
             first_day_obs="2026-12-01",
             last_day_obs="2026-12-02",
+            creation_time=creation_time,
             telescope="simonyi",
         )
-        # Store the sim creation date for our test
-        cls.sim_creation_date = date(2026, 12, 1)
+        # Store the sim creation dayobs
+        sim_creation_datetime = creation_time.to_datetime(timezone=TimezoneInfo(utc_offset=-12 * hour))
+        assert isinstance(sim_creation_datetime, datetime)
+        cls.sim_creation_dayobs = sim_creation_datetime.date()
         cls.vsarch.tag(cls.sim_uuid, "prenight", "nominal", "ideal")
 
         # Add visits to the simulation
@@ -148,11 +158,7 @@ def test_get_prenight_index_from_database_with_integer_dayobs(self) -> None:
         self.assertEqual(len(result), 1)
 
     def test_get_sim_uuid(self) -> None:
-        # Test the get_sim_uuid function
-        # We should be able to find our test simulation
-        # Using today's date as requested
-        today = date.today()
-        result = get_sim_uuid(today, 1, 20261201)
+        result = get_sim_uuid(self.sim_creation_dayobs, 1, 20261201)
 
         # Should return a UUID
         self.assertIsInstance(result, UUID)
@@ -162,18 +168,18 @@ def test_get_sim_uuid(self) -> None:
 
         # Test with date object for day_obs
         result2 = get_sim_uuid(
-            today,
+            self.sim_creation_dayobs,
             1,
             date(2026, 12, 1),
         )
         self.assertEqual(result2, self.sim_uuid)
 
         # Test with str for day_obs
-        result3 = get_sim_uuid(today, 1, "20261201")
+        result3 = get_sim_uuid(self.sim_creation_dayobs, 1, "20261201")
         self.assertEqual(result3, self.sim_uuid)
 
         # Test with iso str for day_obs
-        result4 = get_sim_uuid(today, 1, "2026-12-01")
+        result4 = get_sim_uuid(self.sim_creation_dayobs, 1, "2026-12-01")
         self.assertEqual(result4, self.sim_uuid)
 
         # Test that it raises ValueError for non-existent simulation
@@ -183,7 +189,7 @@ def test_get_sim_uuid(self) -> None:
 
         # Test that it raises ValueError for non-existent daily_id
         with self.assertRaises(ValueError):
-            get_sim_uuid(today, 2, 20261201)
+            get_sim_uuid(self.sim_creation_dayobs, 2, 20261201)
 
     def test_get_sim_metadata(self) -> None:
         # Test the get_sim_index_info function
@@ -291,15 +297,15 @@ def test_get_prenight_index_from_bucket(self) -> None:
 
             # Check that the first row has expected data
             first_row = result.loc["6c242afb-edd1-4cea-9f8c-80e0a18b4b75"]
-            self.assertEqual(first_row["sim_creation_day_obs"], "2026-04-11")
+            self.assertEqual(first_row["sim_creation_day_obs"], date(2026, 4, 11))
             self.assertEqual(first_row["daily_id"], 2)
             self.assertIn("ideal", first_row["tags"])
             self.assertIn("nominal", first_row["tags"])
             self.assertIn("prenight", first_row["tags"])
 
             # Check that the second row has expected data
             second_row = result.loc["b9405aaf-dfe8-4508-ad90-cb37527dbc27"]
-            self.assertEqual(second_row["sim_creation_day_obs"], "2026-04-11")
+            self.assertEqual(second_row["sim_creation_day_obs"], date(2026, 4, 11))
             self.assertEqual(second_row["daily_id"], 3)
             self.assertIn("ideal", second_row["tags"])
             self.assertIn("nominal", second_row["tags"])