Update schemas with missing fields

lsst · Jan 4, 2024 · f76f7e3 · f76f7e3
1 parent 2b9c5b9
commit f76f7e3
Show file tree

Hide file tree

Showing 9 changed files with 275 additions and 255 deletions.
diff --git a/python/lsst/alert/packet/bin/validateAvroRoundTrip.py b/python/lsst/alert/packet/bin/validateAvroRoundTrip.py
@@ -120,7 +120,7 @@ def main():
         check_file_round_trip(args.cutout_template,
                               message.pop('cutoutTemplate')['stampData'])
 
-    message_size = len(json.dumps(message).encode('utf-8'))
+    message_size = len(json.dumps(message, default=repr).encode('utf-8'))
     print("Size in bytes of JSON-encoded message (excl. stamps): %d" % (message_size,))
     print("Size in bytes of stamps:                              %d" % (stamp_size,))
     print("TOTAL:                                                %d" % (stamp_size + message_size,))
@@ -135,7 +135,7 @@ def main():
     #   populated with nulls;
     # - Precision has been lost on the floats.
     if args.print:
-        print(json.dumps(message, sort_keys=True, indent=4))
+        print(json.dumps(message, sort_keys=True, indent=4, default=repr))
 
 
 if __name__ == "__main__":

diff --git a/python/lsst/alert/packet/schema/6/0/lsst.v6_0.diaForcedSource.avsc b/python/lsst/alert/packet/schema/6/0/lsst.v6_0.diaForcedSource.avsc
@@ -19,35 +19,35 @@
       "type": "long"
     },
     {
-      "default": null,
       "doc": "Point Source model flux.",
+      "default": null,
       "name": "psfFlux",
       "type": [
         "null",
         "float"
       ]
     },
     {
-      "default": null,
       "doc": "Uncertainty of psfFlux.",
+      "default": null,
       "name": "psfFluxErr",
       "type": [
         "null",
         "float"
       ]
     },
     {
-      "default": null,
       "doc": "x position at which psfFlux has been measured.",
+      "default": null,
       "name": "x",
       "type": [
         "null",
         "float"
       ]
     },
     {
-      "default": null,
       "doc": "y position at which psfFlux has been measured.",
+      "default": null,
       "name": "y",
       "type": [
         "null",
@@ -56,17 +56,21 @@
     },
     {
       "doc": "Flags, bitwise OR tbd",
+      "default": null,
       "name": "flags",
-      "type": "long"
+      "type": [
+        "null",
+        "long"
+      ]
     },
     {
       "doc": "Effective mid-visit time for this diaForcedSource, expressed as Modified Julian Date, International Atomic Time.",
       "name": "midpointMjdTai",
       "type": "double"
     },
     {
-      "default": null,
       "doc": "Filter band this source was observed with.",
+      "default": null,
       "name": "band",
       "type": [
         "null",