chore(generator): delegate request-id setup to public request by hebaalazzeh · Pull Request #17739 · googleapis/google-cloud-python

hebaalazzeh · 2026-07-16T15:16:46Z

Updates generator templates and goldens to import public requests from google-api-core gapic_v1 and call setup_request_id helper. Removes duplicate setup_request_id test logic from generated client unit tests.

Temporarily pointing to this PR then will revert once it is merged/released:

Associated / Dependent API Core PR: feat(api_core): add request-id auto-population logic to gapic_v1 public helpers #17738

gemini-code-assist

Code Review

This pull request refactors the request ID setup logic in the generated client templates by delegating it to google.api_core.gapic_v1.method_helpers.setup_request_id instead of maintaining an inline implementation. As a result, the redundant unit tests for _setup_request_id have been removed from both the templates and the golden integration tests. There are no review comments, so I have no feedback to provide.

daniel-sanche · 2026-07-16T18:12:59Z

This implementation makes sense if we plan to bump up the api_core requirement Before merging, we need to:

get the changes in feat(api_core): add request-id auto-population logic to gapic_v1 public helpers #17738 released
update the setup.py to reference the new api_core version floor
regenerate goldens

There's also a chance we will want to keep a fallback implementation to keep supporting old api_core versions

…lic helpers Introduces method_helpers module containing setup_request_id helper. Exposes the module as public in gapic_v1.

…t and improve docstring

…lic helpers Introduces method_helpers module containing setup_request_id helper. Exposes the module as public in gapic_v1.

Updates generator templates and goldens to import public method_helpers from google-api-core gapic_v1 and call setup_request_id helper. Removes duplicate setup_request_id test logic from generated client unit tests.

…ator

…t and improve docstring

…per directly

…_core requests.py

… async_client

…p_request_id fix

… tests

hebaalazzeh · 2026-07-22T18:59:02Z

/gemini review

gemini-code-assist

Code Review

This pull request introduces a new compatibility module template _compat.py.j2 to provide fallbacks for older versions of google-api-core, and refactors the generator, client templates, and tests to use it. The review feedback highlights three main issues: a missing test__compat.py.j2 template for the newly added golden test file, an optimization opportunity in _compat.py.j2 to check if request is None before generating a UUID, and a mismatch between the template and the generated golden file where a less precise check in the golden file could incorrectly overwrite valid falsy values.

daniel-sanche · 2026-07-22T19:40:51Z

+  {% if method_settings and method_settings.auto_populated_fields %}
+    {% set has_auto_populated_fields.value = true %}
+  {% endif %}
+{% endfor %}


I think I commented this on a different PR, but can you clarify what has_auto_populated_fields is doing? Both for me, and as a comment for future maintainers

daniel-sanche · 2026-07-22T19:47:42Z

        "grpcio-tools",
    )
    session.install("-e", ".")
+    session.install("-e", "../google-api-core")


This is probably fine, but is this required? Shouldn't the tests pass against the released api_core too?

Note that it will still use a pinned version on 3.10 (in line below this)

…ion and clean up allowed private templates

…s in client templates

…apper and remove Jinja namespace loops

…-api-core') from noxfile.py

…reach 100% statement and branch coverage

daniel-sanche · 2026-07-22T23:43:58Z

+        get_universe_domain,
+    )
+except ImportError:
+    # TODO(https://github.com/googleapis/google-cloud-python/issues/17813): Remove these fallbacks when google-api-core >= 2.18.0 is the minimum required version.


The current api-core version is 2.33.0, so I assume these versions are incorrect?

daniel-sanche · 2026-07-22T23:47:37Z

+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""A compatibility module for older versions of google-api-core."""


Is there a reason we're not seeing this file generated for all goldens?

daniel-sanche · 2026-07-22T23:48:06Z

                extras = "[async_rest]"

-            session.install("-e", f"{tmp_dir}{extras}", "-r", constraints_path)
+            session.install("-e", f"{tmp_dir}{extras}", "--no-build-isolation", "-r", constraints_path)


why was --no-build-isolation included?

…in _compat.py.j2

gemini-code-assist Bot reviewed Jul 16, 2026

View reviewed changes

hebaalazzeh changed the base branch from main to feat/gapic-centralization-api-core-request-id July 16, 2026 15:20

hebaalazzeh self-assigned this Jul 16, 2026

hebaalazzeh closed this Jul 16, 2026

hebaalazzeh reopened this Jul 16, 2026

hebaalazzeh requested a review from daniel-sanche July 16, 2026 15:49

hebaalazzeh force-pushed the feat/gapic-generator-centralization-request-id branch from f037044 to f25d768 Compare July 16, 2026 16:10

hebaalazzeh force-pushed the feat/gapic-centralization-api-core-request-id branch from a0bff77 to 613b392 Compare July 16, 2026 16:18

hebaalazzeh force-pushed the feat/gapic-generator-centralization-request-id branch from f25d768 to 71b2f4e Compare July 16, 2026 16:20

hebaalazzeh force-pushed the feat/gapic-centralization-api-core-request-id branch 3 times, most recently from e02ee4b to db040bb Compare July 16, 2026 16:28

daniel-sanche added the do not merge Indicates a pull request not ready for merge, due to either quality or timing. label Jul 16, 2026

hebaalazzeh force-pushed the feat/gapic-generator-centralization-request-id branch from 71b2f4e to a8cc8d8 Compare July 16, 2026 18:11

hebaalazzeh changed the title ~~feat: delegate request-id setup to public method_helpers~~ chore(generator): delegate request-id setup to public request Jul 16, 2026

daniel-sanche reviewed Jul 16, 2026

View reviewed changes

Comment thread ...apic-generator/gapic/templates/%namespace/%name_%version/%sub/services/%service/client.py.j2 Outdated

hebaalazzeh added 3 commits July 16, 2026 23:19

feat(api-core): move request-id auto-population logic to gapic_v1 pub…

79f3668

…lic helpers Introduces method_helpers module containing setup_request_id helper. Exposes the module as public in gapic_v1.

refactor(api-core): rename gapic_v1.method_helpers to gapic_v1.reques…

62fbcc8

…t and improve docstring

chore: address PR review comments for gapic centralization request ID

20adea6

hebaalazzeh force-pushed the feat/gapic-centralization-api-core-request-id branch from 90602cc to 76ac456 Compare July 16, 2026 23:21

hebaalazzeh added 7 commits July 16, 2026 23:25

feat(api-core): move request-id auto-population logic to gapic_v1 pub…

f03ac7c

…lic helpers Introduces method_helpers module containing setup_request_id helper. Exposes the module as public in gapic_v1.

feat: delegate request-id setup to public method_helpers

2cc27b5

Updates generator templates and goldens to import public method_helpers from google-api-core gapic_v1 and call setup_request_id helper. Removes duplicate setup_request_id test logic from generated client unit tests.

refactor: use request module instead of method_helpers in gapic-gener…

9c2121c

…ator

refactor(api-core): rename gapic_v1.method_helpers to gapic_v1.reques…

dbc7307

…t and improve docstring

chore: address PR review comments for gapic centralization request ID

5f1b721

chore: remove private _setup_request_id and call setup_request_id hel…

99cee8e

…per directly

test(api-core): update UUID regex in test_request.py

4ff1910

hebaalazzeh force-pushed the feat/gapic-centralization-api-core-request-id branch from 8e31d83 to 20adea6 Compare July 16, 2026 23:42

refactor(api-core): rename request.py to requests.py for consistency

77f97c8

hebaalazzeh force-pushed the feat/gapic-generator-centralization-request-id branch from 20e4bea to a8105ff Compare July 21, 2026 20:23

ohmayr reviewed Jul 21, 2026

View reviewed changes

Comment thread packages/gapic-generator/gapic/templates/%namespace/%name_%version/%sub/_compat.py.j2 Outdated

ohmayr reviewed Jul 21, 2026

View reviewed changes

Comment thread packages/gapic-generator/gapic/templates/%namespace/%name_%version/%sub/_compat.py.j2

ohmayr reviewed Jul 21, 2026

View reviewed changes

Comment thread ...enerator/gapic/templates/%namespace/%name_%version/%sub/services/%service/async_client.py.j2 Outdated

ohmayr reviewed Jul 21, 2026

View reviewed changes

Comment thread ...integration/goldens/storagebatchoperations/google/cloud/storagebatchoperations_v1/_compat.py Outdated

daniel-sanche requested changes Jul 21, 2026

View reviewed changes

fix(generator): update fallback proto-plus check to exactly match api…

e243bbd

…_core requests.py

hebaalazzeh force-pushed the feat/gapic-generator-centralization-request-id branch from 4659080 to e243bbd Compare July 21, 2026 20:38

fix(generator): rename requests import to request to match api-core

926eb3c

daniel-sanche reviewed Jul 21, 2026

View reviewed changes

Comment thread packages/gapic-generator/gapic/generator/generator.py Outdated

hebaalazzeh added 5 commits July 21, 2026 21:41

fix(generator): fix broken diff in client.py and duplicate wrapper in…

22d569d

… async_client

test(generator): add tests for _compat.py fallback

c4eb2d9

fix(generator): update storagebatchoperations goldens to reflect setu…

ebc6bd9

…p_request_id fix

fix(generator): add storagebatchoperations goldens missing files

eb08c77

fix(generator): address remaining PR review comments

e052b61

hebaalazzeh force-pushed the feat/gapic-generator-centralization-request-id branch from cd6b66e to e052b61 Compare July 21, 2026 22:16

hebaalazzeh added 2 commits July 21, 2026 23:05

fix(generator): always generate _compat.py and remove downstream unit…

44e43ce

… tests

fix(generator): use unified _compat.py.j2

6f07478

hebaalazzeh force-pushed the feat/gapic-generator-centralization-request-id branch from 57a8810 to 6f07478 Compare July 21, 2026 23:13

fix(generator): install local google-api-core in nox test sessions

82aa10c

gemini-code-assist Bot reviewed Jul 22, 2026

View reviewed changes

daniel-sanche requested changes Jul 22, 2026

View reviewed changes

hebaalazzeh added 5 commits July 22, 2026 21:09

fix(generator): address PR review comments for request-id centralizat…

6eb89f7

…ion and clean up allowed private templates

docs(templates): add explanatory comment for has_auto_populated_field…

a25e3fb

…s in client templates

refactor(schema): encapsulate has_auto_populated_fields on Service wr…

9770a1e

…apper and remove Jinja namespace loops

chore(generator): remove unnecessary session.install('-e', '../google…

e09ddec

…-api-core') from noxfile.py

test(schema): add unit test for Service.has_auto_populated_fields to …

e047593

…reach 100% statement and branch coverage

daniel-sanche reviewed Jul 22, 2026

View reviewed changes

docs(generator): clarify lower-bound google-api-core version comment …

f813e56

…in _compat.py.j2

Uh oh!

Conversation

hebaalazzeh commented Jul 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

daniel-sanche commented Jul 16, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

hebaalazzeh commented Jul 22, 2026

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

daniel-sanche Jul 22, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

daniel-sanche Jul 22, 2026

Choose a reason for hiding this comment

Uh oh!

daniel-sanche Jul 22, 2026

Choose a reason for hiding this comment

Uh oh!

daniel-sanche Jul 22, 2026

Choose a reason for hiding this comment

Uh oh!

daniel-sanche Jul 22, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

hebaalazzeh commented Jul 16, 2026 •

edited

Loading