Skip to content

Commit 7cd5217

Browse files
partheaparthea
authored
Merge branch 'main' into migration.python-containeranalysis.migration.2023-10-21.04.migrate
2 parents 0501b70 + 0f98033 commit 7cd5217

File tree

424 files changed

+119177
-13
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

424 files changed

+119177
-13
lines changed

‎packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/async_client.py‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,16 @@ async def sample_generate_message():
380380
# and friendly error handling.
381381
rpc = gapic_v1.method_async.wrap_method(
382382
self._client._transport.generate_message,
383-
default_timeout=None,
383+
default_retry=retries.Retry(
384+
initial=1.0,
385+
maximum=10.0,
386+
multiplier=1.3,
387+
predicate=retries.if_exception_type(
388+
core_exceptions.ServiceUnavailable,
389+
),
390+
deadline=60.0,
391+
),
392+
default_timeout=60.0,
384393
client_info=DEFAULT_CLIENT_INFO,
385394
)
386395

@@ -508,7 +517,16 @@ async def sample_count_message_tokens():
508517
# and friendly error handling.
509518
rpc = gapic_v1.method_async.wrap_method(
510519
self._client._transport.count_message_tokens,
511-
default_timeout=None,
520+
default_retry=retries.Retry(
521+
initial=1.0,
522+
maximum=10.0,
523+
multiplier=1.3,
524+
predicate=retries.if_exception_type(
525+
core_exceptions.ServiceUnavailable,
526+
),
527+
deadline=60.0,
528+
),
529+
default_timeout=60.0,
512530
client_info=DEFAULT_CLIENT_INFO,
513531
)
514532

‎packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/transports/base.py‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,30 @@ def _prep_wrapped_messages(self, client_info):
124124
self._wrapped_methods = {
125125
self.generate_message: gapic_v1.method.wrap_method(
126126
self.generate_message,
127-
default_timeout=None,
127+
default_retry=retries.Retry(
128+
initial=1.0,
129+
maximum=10.0,
130+
multiplier=1.3,
131+
predicate=retries.if_exception_type(
132+
core_exceptions.ServiceUnavailable,
133+
),
134+
deadline=60.0,
135+
),
136+
default_timeout=60.0,
128137
client_info=client_info,
129138
),
130139
self.count_message_tokens: gapic_v1.method.wrap_method(
131140
self.count_message_tokens,
132-
default_timeout=None,
141+
default_retry=retries.Retry(
142+
initial=1.0,
143+
maximum=10.0,
144+
multiplier=1.3,
145+
predicate=retries.if_exception_type(
146+
core_exceptions.ServiceUnavailable,
147+
),
148+
deadline=60.0,
149+
),
150+
default_timeout=60.0,
133151
client_info=client_info,
134152
),
135153
}

‎packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/async_client.py‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,16 @@ async def sample_get_model():
297297
# and friendly error handling.
298298
rpc = gapic_v1.method_async.wrap_method(
299299
self._client._transport.get_model,
300-
default_timeout=None,
300+
default_retry=retries.Retry(
301+
initial=1.0,
302+
maximum=10.0,
303+
multiplier=1.3,
304+
predicate=retries.if_exception_type(
305+
core_exceptions.ServiceUnavailable,
306+
),
307+
deadline=60.0,
308+
),
309+
default_timeout=60.0,
301310
client_info=DEFAULT_CLIENT_INFO,
302311
)
303312

@@ -422,7 +431,16 @@ async def sample_list_models():
422431
# and friendly error handling.
423432
rpc = gapic_v1.method_async.wrap_method(
424433
self._client._transport.list_models,
425-
default_timeout=None,
434+
default_retry=retries.Retry(
435+
initial=1.0,
436+
maximum=10.0,
437+
multiplier=1.3,
438+
predicate=retries.if_exception_type(
439+
core_exceptions.ServiceUnavailable,
440+
),
441+
deadline=60.0,
442+
),
443+
default_timeout=60.0,
426444
client_info=DEFAULT_CLIENT_INFO,
427445
)
428446

‎packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/transports/base.py‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,30 @@ def _prep_wrapped_messages(self, client_info):
124124
self._wrapped_methods = {
125125
self.get_model: gapic_v1.method.wrap_method(
126126
self.get_model,
127-
default_timeout=None,
127+
default_retry=retries.Retry(
128+
initial=1.0,
129+
maximum=10.0,
130+
multiplier=1.3,
131+
predicate=retries.if_exception_type(
132+
core_exceptions.ServiceUnavailable,
133+
),
134+
deadline=60.0,
135+
),
136+
default_timeout=60.0,
128137
client_info=client_info,
129138
),
130139
self.list_models: gapic_v1.method.wrap_method(
131140
self.list_models,
132-
default_timeout=None,
141+
default_retry=retries.Retry(
142+
initial=1.0,
143+
maximum=10.0,
144+
multiplier=1.3,
145+
predicate=retries.if_exception_type(
146+
core_exceptions.ServiceUnavailable,
147+
),
148+
deadline=60.0,
149+
),
150+
default_timeout=60.0,
133151
client_info=client_info,
134152
),
135153
}

‎packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/async_client.py‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,16 @@ async def sample_generate_text():
403403
# and friendly error handling.
404404
rpc = gapic_v1.method_async.wrap_method(
405405
self._client._transport.generate_text,
406-
default_timeout=None,
406+
default_retry=retries.Retry(
407+
initial=1.0,
408+
maximum=10.0,
409+
multiplier=1.3,
410+
predicate=retries.if_exception_type(
411+
core_exceptions.ServiceUnavailable,
412+
),
413+
deadline=60.0,
414+
),
415+
default_timeout=60.0,
407416
client_info=DEFAULT_CLIENT_INFO,
408417
)
409418

@@ -516,7 +525,16 @@ async def sample_embed_text():
516525
# and friendly error handling.
517526
rpc = gapic_v1.method_async.wrap_method(
518527
self._client._transport.embed_text,
519-
default_timeout=None,
528+
default_retry=retries.Retry(
529+
initial=1.0,
530+
maximum=10.0,
531+
multiplier=1.3,
532+
predicate=retries.if_exception_type(
533+
core_exceptions.ServiceUnavailable,
534+
),
535+
deadline=60.0,
536+
),
537+
default_timeout=60.0,
520538
client_info=DEFAULT_CLIENT_INFO,
521539
)
522540

‎packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/transports/base.py‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,30 @@ def _prep_wrapped_messages(self, client_info):
124124
self._wrapped_methods = {
125125
self.generate_text: gapic_v1.method.wrap_method(
126126
self.generate_text,
127-
default_timeout=None,
127+
default_retry=retries.Retry(
128+
initial=1.0,
129+
maximum=10.0,
130+
multiplier=1.3,
131+
predicate=retries.if_exception_type(
132+
core_exceptions.ServiceUnavailable,
133+
),
134+
deadline=60.0,
135+
),
136+
default_timeout=60.0,
128137
client_info=client_info,
129138
),
130139
self.embed_text: gapic_v1.method.wrap_method(
131140
self.embed_text,
132-
default_timeout=None,
141+
default_retry=retries.Retry(
142+
initial=1.0,
143+
maximum=10.0,
144+
multiplier=1.3,
145+
predicate=retries.if_exception_type(
146+
core_exceptions.ServiceUnavailable,
147+
),
148+
deadline=60.0,
149+
),
150+
default_timeout=60.0,
133151
client_info=client_info,
134152
),
135153
}

‎packages/google-ai-generativelanguage/noxfile.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@
2929

3030
BLACK_VERSION = "black[jupyter]==23.7.0"
3131
ISORT_VERSION = "isort==5.11.0"
32+
3233
LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"]
3334

35+
3436
DEFAULT_PYTHON_VERSION = "3.9"
3537

3638
UNIT_TEST_PYTHON_VERSIONS: List[str] = ["3.7", "3.8", "3.9", "3.10", "3.11"]
@@ -89,6 +91,7 @@ def lint(session):
8991
"--check",
9092
*LINT_PATHS,
9193
)
94+
9295
session.run("flake8", "google", "tests")
9396

9497

‎packages/google-cloud-dataflow-client/.OwlBot.yaml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Copyright 2021 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
16+
deep-remove-regex:
17+
- /owl-bot-staging
18+
19+
deep-copy-regex:
20+
- source: /google/dataflow/(v.*)/.*-py
21+
dest: /owl-bot-staging/google-cloud-dataflow-client/$1
22+
23+
begin-after-commit-hash: 70f7f0525414fe4dfeb2fc2e81546b073f83a621

‎packages/google-cloud-dataflow-client/.coveragerc‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[run]
2+
branch = True
3+
4+
[report]
5+
show_missing = True
6+
omit =
7+
google/cloud/dataflow/__init__.py
8+
google/cloud/dataflow/gapic_version.py
9+
exclude_lines =
10+
# Re-enable the standard pragma
11+
pragma: NO COVER
12+
# Ignore debug-only repr
13+
def __repr__

‎packages/google-cloud-dataflow-client/.flake8‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# -*- coding: utf-8 -*-
2+
#
3+
# Copyright 2023 Google LLC
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# https://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
17+
# Generated by synthtool. DO NOT EDIT!
18+
[flake8]
19+
ignore = E203, E231, E266, E501, W503
20+
exclude =
21+
# Exclude generated code.
22+
**/proto/**
23+
**/gapic/**
24+
**/services/**
25+
**/types/**
26+
*_pb2.py
27+
28+
# Standard linting exemptions.
29+
**/.nox/**
30+
__pycache__,
31+
.git,
32+
*.pyc,
33+
conf.py

0 commit comments

Comments
 (0)