Skip to content

Commit fc05e08

Browse files
committed
fixed format
1 parent e42f0a3 commit fc05e08

4 files changed

Lines changed: 25 additions & 8 deletions

File tree

packages/google-api-core/google/api_core/gapic_v1/method.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def _extract_metrics_header(metadata):
7676
# Key located. Check the rest of the list for duplicate entries
7777
arbitrary_metadata = list(metadata[:i])
7878
metric_values = [val]
79-
for k, v in metadata[i+1:]:
79+
for k, v in metadata[i + 1 :]:
8080
if k == client_info.METRICS_METADATA_KEY:
8181
metric_values.append(v)
8282
else:
@@ -85,6 +85,7 @@ def _extract_metrics_header(metadata):
8585
# No key found
8686
return list(metadata), []
8787

88+
8889
class _GapicCallable(object):
8990
"""Callable that applies retry, timeout, and metadata logic.
9091
@@ -148,7 +149,9 @@ def __call__(
148149
metadata = kwargs.get("metadata")
149150
if not metadata:
150151
if self._metrics_values:
151-
kwargs["metadata"] = [(client_info.METRICS_METADATA_KEY, self._metrics_values)] + self._arbitrary_metadata
152+
kwargs["metadata"] = [
153+
(client_info.METRICS_METADATA_KEY, self._metrics_values)
154+
] + self._arbitrary_metadata
152155
else:
153156
kwargs["metadata"] = self._arbitrary_metadata
154157
else:
@@ -157,7 +160,9 @@ def __call__(
157160
if self._metrics_values:
158161
api_client_values.append(self._metrics_values)
159162
if api_client_values:
160-
merged_metadata.append((client_info.METRICS_METADATA_KEY, " ".join(api_client_values)))
163+
merged_metadata.append(
164+
(client_info.METRICS_METADATA_KEY, " ".join(api_client_values))
165+
)
161166
merged_metadata.extend(self._arbitrary_metadata)
162167
kwargs["metadata"] = merged_metadata
163168

packages/google-api-core/tests/unit/gapic/test_method.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,15 +129,20 @@ def test_invoke_wrapped_method_with_duplicate_x_goog_api_client_metadata():
129129
user_agent="custom-user-agent/1.0",
130130
python_version="3.14.0",
131131
grpc_version="1.76.0",
132-
api_core_version="2.29.0"
132+
api_core_version="2.29.0",
133133
)
134134

135-
wrapped_method = google.api_core.gapic_v1.method.wrap_method(method, client_info=client_info)
135+
wrapped_method = google.api_core.gapic_v1.method.wrap_method(
136+
method, client_info=client_info
137+
)
136138

137139
# Invoke the wrapped method with an explicit user-provided custom header
138140
wrapped_method(
139141
mock.sentinel.request,
140-
metadata=[("x-goog-api-client", "override-client/2.0"), ("other-header", "value")]
142+
metadata=[
143+
("x-goog-api-client", "override-client/2.0"),
144+
("other-header", "value"),
145+
],
141146
)
142147

143148
method.assert_called_once_with(mock.sentinel.request, metadata=mock.ANY)
@@ -151,7 +156,10 @@ def test_invoke_wrapped_method_with_duplicate_x_goog_api_client_metadata():
151156
assert metadata_dict["other-header"] == "value"
152157
assert "x-goog-api-client" in metadata_dict
153158
# Verify both the user-provided override value and the library system telemetry are merged explicitly
154-
assert metadata_dict["x-goog-api-client"] == "override-client/2.0 custom-user-agent/1.0 gl-python/3.14.0 grpc/1.76.0 gax/2.29.0"
159+
assert (
160+
metadata_dict["x-goog-api-client"]
161+
== "override-client/2.0 custom-user-agent/1.0 gl-python/3.14.0 grpc/1.76.0 gax/2.29.0"
162+
)
155163

156164

157165
@mock.patch("time.sleep")

packages/google-auth/google/auth/transport/grpc.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ class AuthMetadataPlugin(grpc.AuthMetadataPlugin):
5151
will be stripped from authorization headers.
5252
"""
5353

54-
def __init__(self, credentials, request, default_host=None, *, suppress_metrics_header=False):
54+
def __init__(
55+
self, credentials, request, default_host=None, *, suppress_metrics_header=False
56+
):
5557
# pylint: disable=no-value-for-parameter
5658
# pylint doesn't realize that the super method takes no arguments
5759
# because this class is the same name as the superclass.

packages/google-auth/tests/transport/test_grpc.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,12 @@ def test__get_authorization_headers_with_service_account_and_default_host(self):
134134

135135
def test_suppress_metrics_header(self):
136136
credentials = mock.create_autospec(service_account.Credentials)
137+
137138
# Mock credentials before_request that adds metric and authorization
138139
def mock_before_request(request, method, url, headers):
139140
headers["x-goog-api-client"] = "foo"
140141
headers["authorization"] = "Bearer token"
142+
141143
credentials.before_request.side_effect = mock_before_request
142144
request = mock.create_autospec(transport.Request)
143145

0 commit comments

Comments
 (0)