separate out context

Author: ohmayr

gapic/cli/generate.py

@@ -63,6 +63,7 @@ def generate(request: typing.BinaryIO, output: typing.BinaryIO) -> None:
         # to each template in the rendering step.
         api_schema = api.API.build(req.proto_file, opts=opts, package=package)
 
+    with generation_cache_context():
         # Translate into a protobuf CodeGeneratorResponse; this reads the
         # individual templates and renders them.
         # If there are issues, error out appropriately.

gapic/utils/cache.py

@@ -88,24 +88,14 @@ def wrapper(self, *, collisions, **kwargs):
         if context_cache is None:
             return func(self, collisions=collisions, **kwargs)
 
-        col_key = frozenset(collisions) if collisions else None
-        
-        # CRITICAL FIX: Include these flags in the key.
-        # This prevents the "Summary" (skip_fields=True) from being returned
-        # when the template asks for the "Full" (skip_fields=False) object.
-        skip_key = kwargs.get('skip_fields', False)
-        
-        visited = kwargs.get('visited_messages')
-        vis_key = tuple(sorted(id(m) for m in visited)) if visited else None
-        
-        key = (id(self), col_key, skip_key, vis_key)
+        # 2. Create the cache key
+        collisions_key = frozenset(collisions) if collisions else None
+        key = (id(self), collisions_key)
 
         # 3. Check Cache
         if key in context_cache:
             return context_cache[key]
 
-        keep_alive.append(self)
-
         # 4. Execute the actual function
         # We ensure context_cache is passed down to the recursive calls
         result = func(self, collisions=collisions, **kwargs)