revert wrappers

Author: ohmayr

gapic/schema/wrappers.py

@@ -67,9 +67,9 @@
 
 from gapic import utils
 from gapic.schema import metadata
+from gapic.utils import cached_proto_context
 from gapic.utils import uri_sample
 from gapic.utils import make_private
-from gapic.utils import cached_proto_context
 
 
 @dataclasses.dataclass(frozen=True)
@@ -437,10 +437,8 @@ def with_context(
                 if self.message
                 else None
             ),
-            enum=(self.enum.with_context(collisions=collisions) if self.enum else None),
-            meta=self.meta.with_context(
-                collisions=collisions,
-            ),
+            enum=self.enum.with_context(collisions=collisions) if self.enum else None,
+            meta=self.meta.with_context(collisions=collisions),
         )
 
     def add_to_address_allowlist(
@@ -741,9 +739,7 @@ def path_regex_str(self) -> str:
         return parsing_regex_str
 
     def get_field(
-        self,
-        *field_path: str,
-        collisions: Optional[Set[str]] = None,
+        self, *field_path: str, collisions: Optional[Set[str]] = None
     ) -> Field:
         """Return a field arbitrarily deep in this message's structure.
 
@@ -836,8 +832,7 @@ def with_context(
             fields=(
                 {
                     k: v.with_context(
-                        collisions=collisions,
-                        visited_messages=visited_messages,
+                        collisions=collisions, visited_messages=visited_messages
                     )
                     for k, v in self.fields.items()
                 }
@@ -946,11 +941,7 @@ def ident(self) -> metadata.Address:
         return self.meta.address
 
     @cached_proto_context
-    def with_context(
-        self,
-        *,
-        collisions: Set[str],
-    ) -> "EnumType":
+    def with_context(self, *, collisions: Set[str]) -> "EnumType":
         """Return a derivative of this enum with the provided context.
 
         This method is used to address naming collisions. The returned
@@ -1997,9 +1988,7 @@ def with_context(
                 collisions=collisions,
                 visited_messages=visited_messages,
             ),
-            meta=self.meta.with_context(
-                collisions=collisions,
-            ),
+            meta=self.meta.with_context(collisions=collisions),
         )
 
     def add_to_address_allowlist(
@@ -2399,9 +2388,7 @@ def with_context(
                 )
                 for k, v in self.methods.items()
             },
-            meta=self.meta.with_context(
-                collisions=collisions,
-            ),
+            meta=self.meta.with_context(collisions=collisions),
         )
 
     def add_to_address_allowlist(