fix: Make vendored google.protobuf a conditional fallback#1876
Open
gavin-aguiar wants to merge 5 commits into
Open
fix: Make vendored google.protobuf a conditional fallback#1876gavin-aguiar wants to merge 5 commits into
gavin-aguiar wants to merge 5 commits into
Conversation
hallvictoria
previously approved these changes
Jun 19, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Make the vendored copy a conditional fallback that only activates when the function app actually ships google.protobuf (the only scenario where the original descriptor-pool conflict can occur).
Detection
A single os.path.isdir check on:
/.python_packages/lib/site-packages/google/protobuf
If present → activate vendored fallback. If absent → do nothing; worker uses its own protobuf + upb.
Activation
When activation triggers:
The alias propagates to submodules automatically via the parent package's path, so from google.protobuf.timestamp_pb2 import Timestamp correctly resolves to the vendored copy without needing per-submodule aliasing.
Fixes #
Pull Request Checklist
Host-Worker Contract
Worker Execution Logic
If yes, please answer the following:
Python Version Coverage
Programming Model Compatibility (for Python 3.13+)