fix: add oneof fields to generated protoplus init

gapic/ads-templates/%namespace/%name/%version/%sub/types/_message.py.j2

@@ -43,6 +43,7 @@ class {{ message.name }}({{ p }}.Message):
     {% else -%}
     {{ field.name }} = {{ p }}.{% if field.repeated %}Repeated{% endif %}Field(
         {{- p }}.{{ field.proto_type }}, number={{ field.number }}
+    {% if field.oneof %}, oneof='{{ field.oneof }}'{% endif %}
     {%- if field.enum or field.message %},
         {{ field.proto_type.lower() }}={{ field.type.ident.rel(message.ident) }},
     {% endif %})

gapic/schema/api.py

@@ -556,14 +556,43 @@ def _load_children(self,
             answer[wrapped.name] = wrapped
         return answer
 
+    def _get_oneofs(self,
+                    oneof_pbs: Sequence[descriptor_pb2.OneofDescriptorProto],
+                    address: metadata.Address, path: Tuple[int, ...],
+                    ) -> Dict[str, wrappers.Oneof]:
+        """Return a dictionary of wrapped oneofs for the given message.
+
+        Args:
+            oneof_fields (Sequence[~.descriptor_pb2.OneofDescriptorProto]): A
+                sequence of protobuf field objects.
+            address (~.metadata.Address): An address object denoting the
+                location of these oneofs.
+            path (Tuple[int]): The source location path thus far, as
+                understood by ``SourceCodeInfo.Location``.
+
+        Returns:
+            Mapping[str, ~.wrappers.Oneof]: A ordered mapping of
+                :class:`~.wrappers.Oneof` objects.
+        """
+        # Iterate over the oneofs and collect them into a dictionary.
+        answer: Dict[str, wrappers.Oneof] = collections.OrderedDict()
+        for oneof_pb, i in zip(oneof_pbs, range(0, sys.maxsize)):
+            answer[oneof_pb.name] = wrappers.Oneof(
+                oneof_pb=oneof_pb,
+            )
+
+        # Done; return the answer.
+        return answer
+
     def _get_fields(self,
                     field_pbs: Sequence[descriptor_pb2.FieldDescriptorProto],
                     address: metadata.Address, path: Tuple[int, ...],
+                    oneofs = None
                     ) -> Dict[str, wrappers.Field]:
         """Return a dictionary of wrapped fields for the given message.
 
         Args:
-            fields (Sequence[~.descriptor_pb2.FieldDescriptorProto]): A
+            field_pbs (Sequence[~.descriptor_pb2.FieldDescriptorProto]): A
                 sequence of protobuf field objects.
             address (~.metadata.Address): An address object denoting the
                 location of these fields.
@@ -586,6 +615,10 @@ def _get_fields(self,
         # `_load_message` method.
         answer: Dict[str, wrappers.Field] = collections.OrderedDict()
         for field_pb, i in zip(field_pbs, range(0, sys.maxsize)):
+            oneof_name = None
+            if getattr(field_pb, 'oneof_index', -1) >= 0 and oneofs:
+                    oneof_name = list(oneofs.keys())[field_pb.oneof_index]
+
             answer[field_pb.name] = wrappers.Field(
                 field_pb=field_pb,
                 enum=self.api_enums.get(field_pb.type_name.lstrip('.')),
@@ -594,6 +627,7 @@ def _get_fields(self,
                     address=address.child(field_pb.name, path + (i,)),
                     documentation=self.docs.get(path + (i,), self.EMPTY),
                 ),
+                oneof=oneof_name,
             )
 
         # Done; return the answer.
@@ -779,19 +813,25 @@ def _load_message(self,
             loader=self._load_message,
             path=path + (3,),
         )
-        # self._load_children(message.oneof_decl, loader=self._load_field,
-        #                     address=nested_addr, info=info.get(8, {}))
+
+        oneofs = self._get_oneofs(
+            message_pb.oneof_decl,
+            address=address,
+            path=path + (8,),
+        )
 
         # Create a dictionary of all the fields for this message.
         fields = self._get_fields(
             message_pb.field,
             address=address,
             path=path + (2,),
+            oneofs=oneofs,
         )
         fields.update(self._get_fields(
             message_pb.extension,
             address=address,
             path=path + (6,),
+            oneofs=oneofs,
         ))
 
         # Create a message correspoding to this descriptor.
@@ -804,6 +844,7 @@ def _load_message(self,
                 address=address,
                 documentation=self.docs.get(path, self.EMPTY),
             ),
+            oneofs=oneofs,
         )
         return self.proto_messages[address.proto]
 

gapic/schema/wrappers.py

@@ -54,6 +54,7 @@ class Field:
     meta: metadata.Metadata = dataclasses.field(
         default_factory=metadata.Metadata,
     )
+    oneof: Optional[str] = None
 
     def __getattr__(self, name):
         return getattr(self.field_pb, name)
@@ -206,6 +207,15 @@ def with_context(self, *, collisions: FrozenSet[str]) -> 'Field':
         )
 
 
+@dataclasses.dataclass(frozen=True)
+class Oneof:
+    """Description of a field."""
+    oneof_pb: descriptor_pb2.OneofDescriptorProto
+
+    def __getattr__(self, name):
+        return getattr(self.oneof_pb, name)
+
+
 @dataclasses.dataclass(frozen=True)
 class MessageType:
     """Description of a message (defined with the ``message`` keyword)."""
@@ -220,6 +230,7 @@ class MessageType:
     meta: metadata.Metadata = dataclasses.field(
         default_factory=metadata.Metadata,
     )
+    oneofs: Optional[List[str]] = None
 
     def __getattr__(self, name):
         return getattr(self.message_pb, name)

gapic/templates/%namespace/%name_%version/%sub/types/_message.py.j2

@@ -43,6 +43,7 @@ class {{ message.name }}({{ p }}.Message):
     {% else -%}
     {{ field.name }} = {{ p }}.{% if field.repeated %}Repeated{% endif %}Field(
         {{- p }}.{{ field.proto_type }}, number={{ field.number }}
+    {% if field.oneof %}, oneof='{{ field.oneof }}'{% endif %}
     {%- if field.enum or field.message %},
         {{ field.proto_type.lower() }}={{ field.type.ident.rel(message.ident) }},
     {% endif %})