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

…n showcase test sessions

…w action SHAs

…all in showcase_library

…d goldens

…-api-core in showcase sessions

…in pyproject.toml

… to match client.py.j2

daniel-sanche · 2026-07-23T17:49:31Z

+            "-p",
+            "google",
+            "--check-untyped-defs",
+        )


Is this change related? Why is this here?

daniel-sanche · 2026-07-23T17:49:42Z

+[tool.setuptools.package-data]
+"google.api_core" = ["py.typed"]
+"*" = ["py.typed"]
+


Same question: Why is this here?

daniel-sanche · 2026-07-23T17:50:58Z

            )
            assert len(cgr.file) == 1
-            assert cgr.file[0].name == "foo/bar/baz.py"
-            assert cgr.file[0].content == "I am a template result.\n"


Why were these assertions removed?

…erator assertions

ohmayr · 2026-07-23T18:09:42Z

            # Install the library without a constraints file.
            session.install("-e", tmp_dir)

+        session.install("-e", "../google-api-core", "--no-deps")


Can you clarify why this is needed? This is causing mypy to fail btw

daniel-sanche · 2026-07-23T19:17:16Z


 from .rest_base import _BaseStorageBatchOperationsRestTransport
+from google.cloud.storagebatchoperations_v1.storage_batch_operations._compat import transcode_request
+from google.cloud.storagebatchoperations_v1._compat import transcode_request


I think I mentioned this in a different PR, but can we have _compat in the service directory?

daniel-sanche · 2026-07-23T19:29:24Z

-        def _get_unset_required_fields(cls, message_dict):
-            return {k: v for k, v in cls.__REQUIRED_FIELDS_DEFAULT_VALUES.items() if k not in message_dict}
+        _REQUIRED_FIELDS_DEFAULT_VALUES: Dict[str, Any] = {
+        "updateMask" : {},        }


nit: the indentation is a bit off on these

daniel-sanche · 2026-07-23T19:31:20Z

+except ImportError:  # pragma: NO COVER
+    from google.auth.transport import mtls  # type: ignore
+
+    # 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.


I mentioned this in a different PR, but 2.18.0 seems like the wrong version

daniel-sanche · 2026-07-23T19:33:28Z

+                    "Environment variable `GOOGLE_API_USE_CLIENT_CERTIFICATE` must be"
+                    " either `true` or `false`"
+                )
+            return use_client_cert_str == "true"


I don't think these were indended to be here? This was a separate PR, but use_client_cert_effective shouldn't be in api_core, since it's already in google-auth

You can add a compat function for this if you want, but it should probably come in a separate change:

try: from google.auth.....mtls import should_use_client_cert except ImportError: def should_use_client_cert(): ...

hebaalazzeh · 2026-07-23T22:22:06Z

To simplify things for myself and the review process I am going to break things down:

Starting with the compat layer: chore(generator): add compatability layer templates #17886
I will be making progress towards backfilling the compat layer tracked in: Backfill compatibility functions into _compat.py.j2 #17883
I will add the conditional logic to check if static code exists separately tracked in: Add conditional logic in _compat.py.j2 to import static code from google-api-core #17884

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 added 2 commits July 23, 2026 07:30

fix(generator): add --no-deps when installing local google-api-core i…

0dc81e3

…n showcase test sessions

fix(generator): type annotate self._client_options and update workflo…

4a279f2

…w action SHAs

hebaalazzeh force-pushed the feat/gapic-generator-centralization-request-id branch from b014e36 to 0dc81e3 Compare July 23, 2026 08:18

hebaalazzeh added 14 commits July 23, 2026 15:14

chore(generator): revert unrelated golden files to match origin/main

ee9cd96

chore(generator): revert setup.py and WORKSPACE changes

77a80a8

chore(ci): revert gapic-generator-tests.yml to origin/main

1919ee2

chore(generator): clean up test_service.py and noxfile.py

e3b439f

fix(generator): restore noxfile.py and add local google-api-core inst…

0e5ebca

…all in showcase_library

fix(generator): fix import group formatting in _compat.py template an…

fa8fbae

…d goldens

chore(generator): restore get_uuid4_re macro in test_macros.j2

4b50876

chore(api-core): revert requests.py and test_requests.py to origin/main

86352b4

chore(generator): remove unused get_uuid4_re macro from test_macros.j2

ddacf0d

fix(generator): pass MYPY_CONFIG_FILE to mypy in showcase_mypy session

492bf63

fix(generator): add --no-build-isolation when installing local google…

09bea02

…-api-core in showcase sessions

fix(generator): remove --no-build-isolation and specify package-data …

b7577b2

…in pyproject.toml

fix(generator): update self._client_options in golden client.py files…

0055127

… to match client.py.j2

ci: trigger Bazel integration test check for goldens

d0b42c8

daniel-sanche reviewed Jul 23, 2026

View reviewed changes

hebaalazzeh added 2 commits July 23, 2026 17:58

chore: revert google-api-core pyproject.toml edit

8dbac4c

chore(generator): revert noxfile.py mypy command and restore test_gen…

dd49e39

…erator assertions

ohmayr reviewed Jul 23, 2026

View reviewed changes

daniel-sanche requested changes Jul 23, 2026

View reviewed changes

hebaalazzeh added 7 commits July 23, 2026 23:34

wip

30199d5

wip

dca70f5

Merge branch 'main' into feat/gapic-generator-centralization-request-id

64d4933

Merge branch 'main' into feat/gapic-generator-centralization-request-id

9ef2569

revert noxfile

4ee805e

fix compat layer

0012d51

update goldens

adf2e80

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

chore(generator): delegate request-id setup to public request#17739

chore(generator): delegate request-id setup to public request#17739
hebaalazzeh wants to merge 87 commits into
mainfrom
feat/gapic-generator-centralization-request-id

hebaalazzeh commented Jul 16, 2026 •

edited

Loading

Uh oh!

gemini-code-assist Bot left a comment

Uh oh!

daniel-sanche commented Jul 16, 2026

Uh oh!

Uh oh!

daniel-sanche Jul 23, 2026

Uh oh!

daniel-sanche Jul 23, 2026

Uh oh!

daniel-sanche Jul 23, 2026

Uh oh!

ohmayr Jul 23, 2026

Uh oh!

daniel-sanche Jul 23, 2026

Uh oh!

daniel-sanche Jul 23, 2026

Uh oh!

daniel-sanche Jul 23, 2026

Uh oh!

daniel-sanche Jul 23, 2026

Uh oh!

hebaalazzeh commented Jul 23, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

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!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

hebaalazzeh commented Jul 23, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

hebaalazzeh commented Jul 16, 2026 •

edited

Loading