Python: implement object oneOf support

Author: badboy

glean-core/python/glean/_loader.py

@@ -226,6 +226,10 @@ def _object_factory(
                 yield n, ty
                 yield from fct
                 fields.append((itemname, ty, field(default=None)))
+            elif val["type"] == "oneof":
+                # We don't actually enforce proper validation here
+                subtypes = [_struct_type(st) for st in val["subtypes"]]
+                fields.append((itemname, Union[None, *subtypes], field(default=None)))
             else:
                 fields.append((itemname, _struct_type(val["type"]), field(default=None)))
         newclass = make_dataclass(name, fields, bases=(metrics.ObjectSerialize,))

samples/python/glean-sample/__main__.py

@@ -35,6 +35,15 @@
 # Does not throw an exception, but will record an error
 metrics.party.balloons.set([])
 
+ch = metrics.party.ChooserObject()
+f = metrics.party.ChooserObjectItem(key="fortywo", value=42)
+ch.append(f)
+f = metrics.party.ChooserObjectItem(key="to-be", value=False)
+ch.append(f)
+f = metrics.party.ChooserObjectItem(key="to-be", value=["string"])
+ch.append(f)
+metrics.party.chooser.set(ch)
+
 pings.prototype.submit()
 
 Glean.shutdown()

samples/python/metrics.yaml

@@ -48,3 +48,29 @@ party:
             type: string
           diameter:
             type: number
+
+  chooser:
+    type: object
+    description: |
+      Array of key-value elements
+    bugs:
+      - https://bugzilla.mozilla.org/123456789
+    data_reviews:
+      - http://example.com/reviews
+    notification_emails:
+      - [email protected]
+    expires: never
+    send_in_pings:
+      - prototype
+    structure:
+      type: array
+      items:
+        type: object
+        properties:
+          key:
+            type: string
+          value:
+            oneOf:
+              - type: string
+              - type: number
+              - type: boolean