no context

Author: ohmayr

gapic/schema/api.py

@@ -1235,7 +1235,7 @@ def proto(self) -> Proto:
         return dataclasses.replace(
             naive,
             all_enums=collections.OrderedDict(
-                (k, v.with_context(collisions=global_collisions, context_cache=self.context_cache))
+                (k, v.with_context(collisions=global_collisions))
                 for k, v in naive.all_enums.items()
             ),
             all_messages=collections.OrderedDict(
@@ -1244,7 +1244,6 @@ def proto(self) -> Proto:
                     v.with_context(
                         collisions=global_collisions,
                         visited_messages=visited_messages,
-                        context_cache=self.context_cache,
                     ),
                 )
                 for k, v in naive.all_messages.items()
@@ -1257,12 +1256,11 @@ def proto(self) -> Proto:
                     v.with_context(
                         collisions=global_collisions,
                         visited_messages=visited_messages,
-                        context_cache=self.context_cache,
                     ),
                 )
                 for k, v in naive.services.items()
             ),
-            meta=naive.meta.with_context(collisions=naive.names, context_cache=self.context_cache),
+            meta=naive.meta.with_context(collisions=naive.names),
         )
 
     @cached_property

gapic/schema/metadata.py

@@ -360,8 +360,7 @@ def resolve(self, selector: str) -> str:
             return f'{".".join(self.package)}.{selector}'
         return selector
 
-    @cached_proto_context
-    def with_context(self, *, collisions: Set[str], context_cache: Optional[Dict] = None) -> "Address":
+    def with_context(self, *, collisions: Set[str]) -> "Address":
         """Return a derivative of this address with the provided context.
 
         This method is used to address naming collisions. The returned
@@ -400,8 +399,7 @@ def doc(self):
             return "\n\n".join(self.documentation.leading_detached_comments)
         return ""
 
-    @cached_proto_context
-    def with_context(self, *, collisions: Set[str], context_cache: Optional[Dict] = None) -> "Metadata":
+    def with_context(self, *, collisions: Set[str]) -> "Metadata":
         """Return a derivative of this metadata with the provided context.
 
         This method is used to address naming collisions. The returned
@@ -411,7 +409,7 @@ def with_context(self, *, collisions: Set[str], context_cache: Optional[Dict] =
         return (
             dataclasses.replace(
                 self,
-                address=self.address.with_context(collisions=collisions, context_cache=context_cache),
+                address=self.address.with_context(collisions=collisions),
             )
             if collisions and collisions != self.address.collisions
             else self

gapic/schema/wrappers.py

@@ -440,7 +440,7 @@ def with_context(
                 else None
             ),
             enum=self.enum.with_context(collisions=collisions, context_cache=context_cache) if self.enum else None,
-            meta=self.meta.with_context(collisions=collisions, context_cache=context_cache),
+            meta=self.meta.with_context(collisions=collisions),
         )
 
     def add_to_address_allowlist(
@@ -856,7 +856,7 @@ def with_context(
                 )
                 for k, v in self.nested_messages.items()
             },
-            meta=self.meta.with_context(collisions=collisions, context_cache=context_cache),
+            meta=self.meta.with_context(collisions=collisions),
         )
 
     def add_to_address_allowlist(
@@ -956,7 +956,7 @@ def with_context(self, *, collisions: Set[str], context_cache: Optional[Dict] =
         return (
             dataclasses.replace(
                 self,
-                meta=self.meta.with_context(collisions=collisions, context_cache=context_cache),
+                meta=self.meta.with_context(collisions=collisions),
             )
             if collisions
             else self
@@ -2004,7 +2004,7 @@ def with_context(
                 visited_messages=visited_messages,
                 context_cache=context_cache
             ),
-            meta=self.meta.with_context(collisions=collisions, context_cache=context_cache),
+            meta=self.meta.with_context(collisions=collisions),
         )
 
     def add_to_address_allowlist(
@@ -2406,7 +2406,7 @@ def with_context(
                 )
                 for k, v in self.methods.items()
             },
-            meta=self.meta.with_context(collisions=collisions, context_cache=context_cache),
+            meta=self.meta.with_context(collisions=collisions),
         )
 
     def add_to_address_allowlist(