Skip to content
This repository was archived by the owner on Nov 9, 2024. It is now read-only.

Commit 4682a42

Browse files
gcf-owl-bot[bot]parthea
gcf-owl-bot[bot]
and
parthea
authored
chore: Update gapic-generator-python to v1.7.1 (#320)
* chore: Enable requesting numeric enums in "transport=rest" responses for services supporting this (Java, Go, Python, PHP, TypeScript, C#, and Ruby), even if they do not yet turn on REST transport chore: disallow "transport=rest" for services where numeric enums are not confirmed to be supported (except in PHP and Java) PiperOrigin-RevId: 493113566 Source-Link: googleapis/googleapis@758f0d1 Source-Link: https://github.com/googleapis/googleapis-gen/commit/78bd8f05e1276363eb14eae70e91fe4bc20703ab Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNzhiZDhmMDVlMTI3NjM2M2ViMTRlYWU3MGU5MWZlNGJjMjA3MDNhYiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * add gapic_version.py * fix(deps): Require google-api-core >=1.34.0, >=2.11.0 fix: Drop usage of pkg_resources fix: Fix timeout default values docs(samples): Snippetgen should call await on the operation coroutine before calling result PiperOrigin-RevId: 493260409 Source-Link: googleapis/googleapis@fea4387 Source-Link: https://github.com/googleapis/googleapis-gen/commit/387b7344c7529ee44be84e613b19a820508c612b Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMzg3YjczNDRjNzUyOWVlNDRiZTg0ZTYxM2IxOWE4MjA1MDhjNjEyYiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * chore: Update gapic-generator-python to v1.7.1 PiperOrigin-RevId: 495049888 Source-Link: googleapis/googleapis@bf4359c Source-Link: https://github.com/googleapis/googleapis-gen/commit/5ab9576eafbd4de436896f01c278757d87a24e27 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNWFiOTU3NmVhZmJkNGRlNDM2ODk2ZjAxYzI3ODc1N2Q4N2EyNGUyNyJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Anthonios Partheniou <partheniou@google.com>
1 parent 1d2309a commit 4682a42

16 files changed

Lines changed: 194 additions & 187 deletions

File tree

‎.coveragerc‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,3 @@ exclude_lines =
1010
pragma: NO COVER
1111
# Ignore debug-only repr
1212
def __repr__
13-
# Ignore pkg_resources exceptions.
14-
# This is added at the module level as a safeguard for if someone
15-
# generates the code and tries to run it without pip installing. This
16-
# makes it virtually impossible to test properly.
17-
except pkg_resources.DistributionNotFound

‎analytics-data-v1alpha-py.tar.gz‎

Whitespace-only changes.

‎google/analytics/data_v1alpha/gapic_version.py‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# -*- coding: utf-8 -*-
2+
# Copyright 2022 Google LLC
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
#
16+
__version__ = "0.14.2" # {x-release-please-version}

‎google/analytics/data_v1alpha/services/alpha_analytics_data/async_client.py‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@
3434
from google.api_core.client_options import ClientOptions
3535
from google.auth import credentials as ga_credentials # type: ignore
3636
from google.oauth2 import service_account # type: ignore
37-
import pkg_resources
37+
38+
from google.analytics.data_v1alpha import gapic_version as package_version
3839

3940
try:
4041
OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault]
@@ -218,7 +219,7 @@ async def run_funnel_report(
218219
] = None,
219220
*,
220221
retry: OptionalRetry = gapic_v1.method.DEFAULT,
221-
timeout: Optional[float] = None,
222+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
222223
metadata: Sequence[Tuple[str, str]] = (),
223224
) -> analytics_data_api.RunFunnelReportResponse:
224225
r"""Returns a customized funnel report of your Google Analytics
@@ -311,14 +312,9 @@ async def __aexit__(self, exc_type, exc, tb):
311312
await self.transport.close()
312313

313314

314-
try:
315-
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
316-
gapic_version=pkg_resources.get_distribution(
317-
"google-analytics-data",
318-
).version,
319-
)
320-
except pkg_resources.DistributionNotFound:
321-
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
315+
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
316+
gapic_version=package_version.__version__
317+
)
322318

323319

324320
__all__ = ("AlphaAnalyticsDataAsyncClient",)

‎google/analytics/data_v1alpha/services/alpha_analytics_data/client.py‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@
3838
from google.auth.transport import mtls # type: ignore
3939
from google.auth.transport.grpc import SslCredentials # type: ignore
4040
from google.oauth2 import service_account # type: ignore
41-
import pkg_resources
41+
42+
from google.analytics.data_v1alpha import gapic_version as package_version
4243

4344
try:
4445
OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault]
@@ -338,9 +339,6 @@ def __init__(
338339
transport (Union[str, AlphaAnalyticsDataTransport]): The
339340
transport to use. If set to None, a transport is chosen
340341
automatically.
341-
NOTE: "rest" transport functionality is currently in a
342-
beta state (preview). We welcome your feedback via an
343-
issue in this library's source repository.
344342
client_options (Optional[Union[google.api_core.client_options.ClientOptions, dict]]): Custom options for the
345343
client. It won't take effect if a ``transport`` instance is provided.
346344
(1) The ``api_endpoint`` property can be used to override the
@@ -429,7 +427,7 @@ def run_funnel_report(
429427
] = None,
430428
*,
431429
retry: OptionalRetry = gapic_v1.method.DEFAULT,
432-
timeout: Optional[float] = None,
430+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
433431
metadata: Sequence[Tuple[str, str]] = (),
434432
) -> analytics_data_api.RunFunnelReportResponse:
435433
r"""Returns a customized funnel report of your Google Analytics
@@ -530,14 +528,9 @@ def __exit__(self, type, value, traceback):
530528
self.transport.close()
531529

532530

533-
try:
534-
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
535-
gapic_version=pkg_resources.get_distribution(
536-
"google-analytics-data",
537-
).version,
538-
)
539-
except pkg_resources.DistributionNotFound:
540-
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
531+
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
532+
gapic_version=package_version.__version__
533+
)
541534

542535

543536
__all__ = ("AlphaAnalyticsDataClient",)

‎google/analytics/data_v1alpha/services/alpha_analytics_data/transports/base.py‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,13 @@
2323
import google.auth # type: ignore
2424
from google.auth import credentials as ga_credentials # type: ignore
2525
from google.oauth2 import service_account # type: ignore
26-
import pkg_resources
2726

27+
from google.analytics.data_v1alpha import gapic_version as package_version
2828
from google.analytics.data_v1alpha.types import analytics_data_api
2929

30-
try:
31-
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
32-
gapic_version=pkg_resources.get_distribution(
33-
"google-analytics-data",
34-
).version,
35-
)
36-
except pkg_resources.DistributionNotFound:
37-
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
30+
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
31+
gapic_version=package_version.__version__
32+
)
3833

3934

4035
class AlphaAnalyticsDataTransport(abc.ABC):

‎google/analytics/data_v1alpha/services/alpha_analytics_data/transports/rest.py‎

Lines changed: 36 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,13 @@ class AlphaAnalyticsDataRestInterceptor:
6363
6464
.. code-block:: python
6565
class MyCustomAlphaAnalyticsDataInterceptor(AlphaAnalyticsDataRestInterceptor):
66-
def pre_run_funnel_report(request, metadata):
66+
def pre_run_funnel_report(self, request, metadata):
6767
logging.log(f"Received request: {request}")
6868
return request, metadata
6969
70-
def post_run_funnel_report(response):
70+
def post_run_funnel_report(self, response):
7171
logging.log(f"Received response: {response}")
72+
return response
7273
7374
transport = AlphaAnalyticsDataRestTransport(interceptor=MyCustomAlphaAnalyticsDataInterceptor())
7475
client = AlphaAnalyticsDataClient(transport=transport)
@@ -118,9 +119,6 @@ class AlphaAnalyticsDataRestTransport(AlphaAnalyticsDataTransport):
118119
119120
It sends JSON representations of protocol buffers over HTTP/1.1
120121
121-
NOTE: This REST transport functionality is currently in a beta
122-
state (preview). We welcome your feedback via an issue in this
123-
library's source repository. Thank you!
124122
"""
125123

126124
def __init__(
@@ -140,39 +138,35 @@ def __init__(
140138
) -> None:
141139
"""Instantiate the transport.
142140
143-
NOTE: This REST transport functionality is currently in a beta
144-
state (preview). We welcome your feedback via a GitHub issue in
145-
this library's repository. Thank you!
146-
147-
Args:
148-
host (Optional[str]):
149-
The hostname to connect to.
150-
credentials (Optional[google.auth.credentials.Credentials]): The
151-
authorization credentials to attach to requests. These
152-
credentials identify the application to the service; if none
153-
are specified, the client will attempt to ascertain the
154-
credentials from the environment.
155-
156-
credentials_file (Optional[str]): A file with credentials that can
157-
be loaded with :func:`google.auth.load_credentials_from_file`.
158-
This argument is ignored if ``channel`` is provided.
159-
scopes (Optional(Sequence[str])): A list of scopes. This argument is
160-
ignored if ``channel`` is provided.
161-
client_cert_source_for_mtls (Callable[[], Tuple[bytes, bytes]]): Client
162-
certificate to configure mutual TLS HTTP channel. It is ignored
163-
if ``channel`` is provided.
164-
quota_project_id (Optional[str]): An optional project to use for billing
165-
and quota.
166-
client_info (google.api_core.gapic_v1.client_info.ClientInfo):
167-
The client info used to send a user-agent string along with
168-
API requests. If ``None``, then default info will be used.
169-
Generally, you only need to set this if you are developing
170-
your own client library.
171-
always_use_jwt_access (Optional[bool]): Whether self signed JWT should
172-
be used for service account credentials.
173-
url_scheme: the protocol scheme for the API endpoint. Normally
174-
"https", but for testing or local servers,
175-
"http" can be specified.
141+
Args:
142+
host (Optional[str]):
143+
The hostname to connect to.
144+
credentials (Optional[google.auth.credentials.Credentials]): The
145+
authorization credentials to attach to requests. These
146+
credentials identify the application to the service; if none
147+
are specified, the client will attempt to ascertain the
148+
credentials from the environment.
149+
150+
credentials_file (Optional[str]): A file with credentials that can
151+
be loaded with :func:`google.auth.load_credentials_from_file`.
152+
This argument is ignored if ``channel`` is provided.
153+
scopes (Optional(Sequence[str])): A list of scopes. This argument is
154+
ignored if ``channel`` is provided.
155+
client_cert_source_for_mtls (Callable[[], Tuple[bytes, bytes]]): Client
156+
certificate to configure mutual TLS HTTP channel. It is ignored
157+
if ``channel`` is provided.
158+
quota_project_id (Optional[str]): An optional project to use for billing
159+
and quota.
160+
client_info (google.api_core.gapic_v1.client_info.ClientInfo):
161+
The client info used to send a user-agent string along with
162+
API requests. If ``None``, then default info will be used.
163+
Generally, you only need to set this if you are developing
164+
your own client library.
165+
always_use_jwt_access (Optional[bool]): Whether self signed JWT should
166+
be used for service account credentials.
167+
url_scheme: the protocol scheme for the API endpoint. Normally
168+
"https", but for testing or local servers,
169+
"http" can be specified.
176170
"""
177171
# Run the base constructor
178172
# TODO(yon-mg): resolve other ctor params i.e. scopes, quota, etc.
@@ -253,7 +247,7 @@ def __call__(
253247
body = json_format.MessageToJson(
254248
transcoded_request["body"],
255249
including_default_value_fields=False,
256-
use_integers_for_enums=False,
250+
use_integers_for_enums=True,
257251
)
258252
uri = transcoded_request["uri"]
259253
method = transcoded_request["method"]
@@ -263,10 +257,12 @@ def __call__(
263257
json_format.MessageToJson(
264258
transcoded_request["query_params"],
265259
including_default_value_fields=False,
266-
use_integers_for_enums=False,
260+
use_integers_for_enums=True,
267261
)
268262
)
269263

264+
query_params["$alt"] = "json;enum-encoding=int"
265+
270266
# Send the request
271267
headers = dict(metadata)
272268
headers["Content-Type"] = "application/json"

‎google/analytics/data_v1beta/gapic_version.py‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# -*- coding: utf-8 -*-
2+
# Copyright 2022 Google LLC
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
#
16+
__version__ = "0.14.2" # {x-release-please-version}

‎google/analytics/data_v1beta/services/beta_analytics_data/async_client.py‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@
3434
from google.api_core.client_options import ClientOptions
3535
from google.auth import credentials as ga_credentials # type: ignore
3636
from google.oauth2 import service_account # type: ignore
37-
import pkg_resources
37+
38+
from google.analytics.data_v1beta import gapic_version as package_version
3839

3940
try:
4041
OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault]
@@ -217,7 +218,7 @@ async def run_report(
217218
request: Optional[Union[analytics_data_api.RunReportRequest, dict]] = None,
218219
*,
219220
retry: OptionalRetry = gapic_v1.method.DEFAULT,
220-
timeout: Optional[float] = None,
221+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
221222
metadata: Sequence[Tuple[str, str]] = (),
222223
) -> analytics_data_api.RunReportResponse:
223224
r"""Returns a customized report of your Google Analytics event data.
@@ -306,7 +307,7 @@ async def run_pivot_report(
306307
request: Optional[Union[analytics_data_api.RunPivotReportRequest, dict]] = None,
307308
*,
308309
retry: OptionalRetry = gapic_v1.method.DEFAULT,
309-
timeout: Optional[float] = None,
310+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
310311
metadata: Sequence[Tuple[str, str]] = (),
311312
) -> analytics_data_api.RunPivotReportResponse:
312313
r"""Returns a customized pivot report of your Google
@@ -392,7 +393,7 @@ async def batch_run_reports(
392393
] = None,
393394
*,
394395
retry: OptionalRetry = gapic_v1.method.DEFAULT,
395-
timeout: Optional[float] = None,
396+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
396397
metadata: Sequence[Tuple[str, str]] = (),
397398
) -> analytics_data_api.BatchRunReportsResponse:
398399
r"""Returns multiple reports in a batch. All reports must
@@ -474,7 +475,7 @@ async def batch_run_pivot_reports(
474475
] = None,
475476
*,
476477
retry: OptionalRetry = gapic_v1.method.DEFAULT,
477-
timeout: Optional[float] = None,
478+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
478479
metadata: Sequence[Tuple[str, str]] = (),
479480
) -> analytics_data_api.BatchRunPivotReportsResponse:
480481
r"""Returns multiple pivot reports in a batch. All
@@ -555,7 +556,7 @@ async def get_metadata(
555556
*,
556557
name: Optional[str] = None,
557558
retry: OptionalRetry = gapic_v1.method.DEFAULT,
558-
timeout: Optional[float] = None,
559+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
559560
metadata: Sequence[Tuple[str, str]] = (),
560561
) -> analytics_data_api.Metadata:
561562
r"""Returns metadata for dimensions and metrics available in
@@ -678,7 +679,7 @@ async def run_realtime_report(
678679
] = None,
679680
*,
680681
retry: OptionalRetry = gapic_v1.method.DEFAULT,
681-
timeout: Optional[float] = None,
682+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
682683
metadata: Sequence[Tuple[str, str]] = (),
683684
) -> analytics_data_api.RunRealtimeReportResponse:
684685
r"""Returns a customized report of realtime event data for your
@@ -768,7 +769,7 @@ async def check_compatibility(
768769
] = None,
769770
*,
770771
retry: OptionalRetry = gapic_v1.method.DEFAULT,
771-
timeout: Optional[float] = None,
772+
timeout: Union[float, object] = gapic_v1.method.DEFAULT,
772773
metadata: Sequence[Tuple[str, str]] = (),
773774
) -> analytics_data_api.CheckCompatibilityResponse:
774775
r"""This compatibility method lists dimensions and
@@ -864,14 +865,9 @@ async def __aexit__(self, exc_type, exc, tb):
864865
await self.transport.close()
865866

866867

867-
try:
868-
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
869-
gapic_version=pkg_resources.get_distribution(
870-
"google-analytics-data",
871-
).version,
872-
)
873-
except pkg_resources.DistributionNotFound:
874-
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
868+
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
869+
gapic_version=package_version.__version__
870+
)
875871

876872

877873
__all__ = ("BetaAnalyticsDataAsyncClient",)

0 commit comments

Comments
 (0)