Fix typin gerrors with unwrap

Author: AdrienVannson

poetry.lock

@@ -13,7 +13,7 @@ packages = [
 
 [tool.poetry.dependencies]
 python = "^3.10"
-betterproto2 = "^0.1.1"
+betterproto2 = "^0.1.3"
 # The Ruff version is pinned. To update it, also update it in .pre-commit-config.yaml
 ruff = "~0.7.4"
 grpclib = "^0.4.1"

pyproject.toml

@@ -33,6 +33,7 @@
 )
 
 import betterproto2
+from betterproto2 import unwrap
 from betterproto2.lib.google.protobuf import (
     DescriptorProto,
     EnumDescriptorProto,
@@ -111,7 +112,7 @@ def get_comment(
     proto_file: "FileDescriptorProto",
     path: list[int],
 ) -> str:
-    for sci_loc in proto_file.source_code_info.location:
+    for sci_loc in unwrap(proto_file.source_code_info).location:
         if list(sci_loc.path) == path:
             all_comments = list(sci_loc.leading_detached_comments)
             if sci_loc.leading_comments:
@@ -429,23 +430,23 @@ def optional(self) -> bool:
     @property
     def betterproto_field_args(self) -> list[str]:
         args = super().betterproto_field_args
-        group = self.message.proto_obj.oneof_decl[self.proto_obj.oneof_index].name
+        group = self.message.proto_obj.oneof_decl[unwrap(self.proto_obj.oneof_index)].name
         args.append(f'group="{group}"')
         return args
 
 
 @dataclass(kw_only=True)
 class MapEntryCompiler(FieldCompiler):
-    py_k_type: str | None = None
-    py_v_type: str | None = None
+    py_k_type: str = ""
+    py_v_type: str = ""
     proto_k_type: str = ""
     proto_v_type: str = ""
 
     def ready(self) -> None:
         """Explore nested types and set k_type and v_type if unset."""
         map_entry = f"{self.proto_obj.name.replace('_', '').lower()}entry"
         for nested in self.message.proto_obj.nested_type:
-            if nested.name.replace("_", "").lower() == map_entry and nested.options.map_entry:
+            if nested.name.replace("_", "").lower() == map_entry and unwrap(nested.options).map_entry:
                 # Get Python types
                 self.py_k_type = FieldCompiler(
                     source_file=self.source_file,
@@ -463,8 +464,8 @@ def ready(self) -> None:
                 ).py_type
 
                 # Get proto types
-                self.proto_k_type = FieldDescriptorProtoType(nested.field[0].type).name
-                self.proto_v_type = FieldDescriptorProtoType(nested.field[1].type).name
+                self.proto_k_type = unwrap(FieldDescriptorProtoType(nested.field[0].type).name)
+                self.proto_v_type = unwrap(FieldDescriptorProtoType(nested.field[1].type).name)
                 return
 
         raise ValueError("can't find enum")