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

Commit 959836b

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore: use gapic-generator-python 0.53.4 (#242)
- [ ] Regenerate this pull request now. docs: list oneofs in docstring fix(deps): require google-api-core >= 1.28.0 fix(deps): drop packaging dependency committer: busunkim96@ PiperOrigin-RevId: 406468269 Source-Link: googleapis/googleapis@83d81b0 Source-Link: https://github.com/googleapis/googleapis-gen/commit/2ff001fbacb9e77e71d734de5f955c05fdae8526 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMmZmMDAxZmJhY2I5ZTc3ZTcxZDczNGRlNWY5NTVjMDVmZGFlODUyNiJ9
1 parent ba1e767 commit 959836b

File tree

39 files changed

+170
-752
lines changed

39 files changed

+170
-752
lines changed

‎google/cloud/videointelligence_v1/services/video_intelligence_service/async_client.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@
1919
from typing import Dict, Sequence, Tuple, Type, Union
2020
import pkg_resources
2121

22-
import google.api_core.client_options as ClientOptions # type: ignore
22+
from google.api_core.client_options import ClientOptions # type: ignore
2323
from google.api_core import exceptions as core_exceptions # type: ignore
2424
from google.api_core import gapic_v1 # type: ignore
2525
from google.api_core import retry as retries # type: ignore
2626
from google.auth import credentials as ga_credentials # type: ignore
2727
from google.oauth2 import service_account # type: ignore
2828

29+
OptionalRetry = Union[retries.Retry, object]
30+
2931
from google.api_core import operation # type: ignore
3032
from google.api_core import operation_async # type: ignore
3133
from google.cloud.videointelligence_v1.types import video_intelligence
@@ -167,11 +169,11 @@ def __init__(
167169

168170
async def annotate_video(
169171
self,
170-
request: video_intelligence.AnnotateVideoRequest = None,
172+
request: Union[video_intelligence.AnnotateVideoRequest, dict] = None,
171173
*,
172174
input_uri: str = None,
173175
features: Sequence[video_intelligence.Feature] = None,
174-
retry: retries.Retry = gapic_v1.method.DEFAULT,
176+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
175177
timeout: float = None,
176178
metadata: Sequence[Tuple[str, str]] = (),
177179
) -> operation_async.AsyncOperation:
@@ -182,7 +184,7 @@ async def annotate_video(
182184
contains ``AnnotateVideoResponse`` (results).
183185
184186
Args:
185-
request (:class:`google.cloud.videointelligence_v1.types.AnnotateVideoRequest`):
187+
request (Union[google.cloud.videointelligence_v1.types.AnnotateVideoRequest, dict]):
186188
The request object. Video annotation request.
187189
input_uri (:class:`str`):
188190
Input video location. Currently, only `Cloud

‎google/cloud/videointelligence_v1/services/video_intelligence_service/client.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
from google.auth.exceptions import MutualTLSChannelError # type: ignore
3131
from google.oauth2 import service_account # type: ignore
3232

33+
OptionalRetry = Union[retries.Retry, object]
34+
3335
from google.api_core import operation # type: ignore
3436
from google.api_core import operation_async # type: ignore
3537
from google.cloud.videointelligence_v1.types import video_intelligence
@@ -340,7 +342,7 @@ def annotate_video(
340342
*,
341343
input_uri: str = None,
342344
features: Sequence[video_intelligence.Feature] = None,
343-
retry: retries.Retry = gapic_v1.method.DEFAULT,
345+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
344346
timeout: float = None,
345347
metadata: Sequence[Tuple[str, str]] = (),
346348
) -> operation.Operation:

‎google/cloud/videointelligence_v1/services/video_intelligence_service/transports/base.py‎

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#
1616
import abc
1717
from typing import Awaitable, Callable, Dict, Optional, Sequence, Union
18-
import packaging.version
1918
import pkg_resources
2019

2120
import google.auth # type: ignore
@@ -39,15 +38,6 @@
3938
except pkg_resources.DistributionNotFound:
4039
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
4140

42-
try:
43-
# google.auth.__version__ was added in 1.26.0
44-
_GOOGLE_AUTH_VERSION = google.auth.__version__
45-
except AttributeError:
46-
try: # try pkg_resources if it is available
47-
_GOOGLE_AUTH_VERSION = pkg_resources.get_distribution("google-auth").version
48-
except pkg_resources.DistributionNotFound: # pragma: NO COVER
49-
_GOOGLE_AUTH_VERSION = None
50-
5141

5242
class VideoIntelligenceServiceTransport(abc.ABC):
5343
"""Abstract transport class for VideoIntelligenceService."""
@@ -97,7 +87,7 @@ def __init__(
9787
host += ":443"
9888
self._host = host
9989

100-
scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
90+
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
10191

10292
# Save the scopes.
10393
self._scopes = scopes
@@ -130,29 +120,6 @@ def __init__(
130120
# Save the credentials.
131121
self._credentials = credentials
132122

133-
# TODO(busunkim): This method is in the base transport
134-
# to avoid duplicating code across the transport classes. These functions
135-
# should be deleted once the minimum required versions of google-auth is increased.
136-
137-
# TODO: Remove this function once google-auth >= 1.25.0 is required
138-
@classmethod
139-
def _get_scopes_kwargs(
140-
cls, host: str, scopes: Optional[Sequence[str]]
141-
) -> Dict[str, Optional[Sequence[str]]]:
142-
"""Returns scopes kwargs to pass to google-auth methods depending on the google-auth version"""
143-
144-
scopes_kwargs = {}
145-
146-
if _GOOGLE_AUTH_VERSION and (
147-
packaging.version.parse(_GOOGLE_AUTH_VERSION)
148-
>= packaging.version.parse("1.25.0")
149-
):
150-
scopes_kwargs = {"scopes": scopes, "default_scopes": cls.AUTH_SCOPES}
151-
else:
152-
scopes_kwargs = {"scopes": scopes or cls.AUTH_SCOPES}
153-
154-
return scopes_kwargs
155-
156123
def _prep_wrapped_messages(self, client_info):
157124
# Precompute the wrapped methods.
158125
self._wrapped_methods = {
@@ -183,7 +150,7 @@ def close(self):
183150
raise NotImplementedError()
184151

185152
@property
186-
def operations_client(self) -> operations_v1.OperationsClient:
153+
def operations_client(self):
187154
"""Return the client designed to process long-running operations."""
188155
raise NotImplementedError()
189156

‎google/cloud/videointelligence_v1/services/video_intelligence_service/transports/grpc.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ def __init__(
112112
self._grpc_channel = None
113113
self._ssl_channel_credentials = ssl_channel_credentials
114114
self._stubs: Dict[str, Callable] = {}
115-
self._operations_client = None
115+
self._operations_client: Optional[operations_v1.OperationsClient] = None
116116

117117
if api_mtls_endpoint:
118118
warnings.warn("api_mtls_endpoint is deprecated", DeprecationWarning)

‎google/cloud/videointelligence_v1/services/video_intelligence_service/transports/grpc_asyncio.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
from google.api_core import operations_v1 # type: ignore
2222
from google.auth import credentials as ga_credentials # type: ignore
2323
from google.auth.transport.grpc import SslCredentials # type: ignore
24-
import packaging.version
2524

2625
import grpc # type: ignore
2726
from grpc.experimental import aio # type: ignore
@@ -159,7 +158,7 @@ def __init__(
159158
self._grpc_channel = None
160159
self._ssl_channel_credentials = ssl_channel_credentials
161160
self._stubs: Dict[str, Callable] = {}
162-
self._operations_client = None
161+
self._operations_client: Optional[operations_v1.OperationsAsyncClient] = None
163162

164163
if api_mtls_endpoint:
165164
warnings.warn("api_mtls_endpoint is deprecated", DeprecationWarning)

‎google/cloud/videointelligence_v1/types/video_intelligence.py‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1182,18 +1182,27 @@ class ObjectTrackingFrame(proto.Message):
11821182
class ObjectTrackingAnnotation(proto.Message):
11831183
r"""Annotations corresponding to one tracked object.
11841184
1185+
This message has `oneof`_ fields (mutually exclusive fields).
1186+
For each oneof, at most one member field can be set at the same time.
1187+
Setting any member of the oneof automatically clears all other
1188+
members.
1189+
1190+
.. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields
1191+
11851192
Attributes:
11861193
segment (google.cloud.videointelligence_v1.types.VideoSegment):
11871194
Non-streaming batch mode ONLY.
11881195
Each object track corresponds to one video
11891196
segment where it appears.
1197+
This field is a member of `oneof`_ ``track_info``.
11901198
track_id (int):
11911199
Streaming mode ONLY. In streaming mode, we do not know the
11921200
end time of a tracked object before it is completed. Hence,
11931201
there is no VideoSegment info returned. Instead, we provide
11941202
a unique identifiable integer track_id so that the customers
11951203
can correlate the results of the ongoing
11961204
ObjectTrackAnnotation of the same track_id over time.
1205+
This field is a member of `oneof`_ ``track_info``.
11971206
entity (google.cloud.videointelligence_v1.types.Entity):
11981207
Entity to specify the object category that
11991208
this track is labeled as.

‎google/cloud/videointelligence_v1beta2/services/video_intelligence_service/async_client.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@
1919
from typing import Dict, Sequence, Tuple, Type, Union
2020
import pkg_resources
2121

22-
import google.api_core.client_options as ClientOptions # type: ignore
22+
from google.api_core.client_options import ClientOptions # type: ignore
2323
from google.api_core import exceptions as core_exceptions # type: ignore
2424
from google.api_core import gapic_v1 # type: ignore
2525
from google.api_core import retry as retries # type: ignore
2626
from google.auth import credentials as ga_credentials # type: ignore
2727
from google.oauth2 import service_account # type: ignore
2828

29+
OptionalRetry = Union[retries.Retry, object]
30+
2931
from google.api_core import operation # type: ignore
3032
from google.api_core import operation_async # type: ignore
3133
from google.cloud.videointelligence_v1beta2.types import video_intelligence
@@ -167,11 +169,11 @@ def __init__(
167169

168170
async def annotate_video(
169171
self,
170-
request: video_intelligence.AnnotateVideoRequest = None,
172+
request: Union[video_intelligence.AnnotateVideoRequest, dict] = None,
171173
*,
172174
input_uri: str = None,
173175
features: Sequence[video_intelligence.Feature] = None,
174-
retry: retries.Retry = gapic_v1.method.DEFAULT,
176+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
175177
timeout: float = None,
176178
metadata: Sequence[Tuple[str, str]] = (),
177179
) -> operation_async.AsyncOperation:
@@ -182,7 +184,7 @@ async def annotate_video(
182184
contains ``AnnotateVideoResponse`` (results).
183185
184186
Args:
185-
request (:class:`google.cloud.videointelligence_v1beta2.types.AnnotateVideoRequest`):
187+
request (Union[google.cloud.videointelligence_v1beta2.types.AnnotateVideoRequest, dict]):
186188
The request object. Video annotation request.
187189
input_uri (:class:`str`):
188190
Input video location. Currently, only `Google Cloud

‎google/cloud/videointelligence_v1beta2/services/video_intelligence_service/client.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
from google.auth.exceptions import MutualTLSChannelError # type: ignore
3131
from google.oauth2 import service_account # type: ignore
3232

33+
OptionalRetry = Union[retries.Retry, object]
34+
3335
from google.api_core import operation # type: ignore
3436
from google.api_core import operation_async # type: ignore
3537
from google.cloud.videointelligence_v1beta2.types import video_intelligence
@@ -340,7 +342,7 @@ def annotate_video(
340342
*,
341343
input_uri: str = None,
342344
features: Sequence[video_intelligence.Feature] = None,
343-
retry: retries.Retry = gapic_v1.method.DEFAULT,
345+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
344346
timeout: float = None,
345347
metadata: Sequence[Tuple[str, str]] = (),
346348
) -> operation.Operation:

‎google/cloud/videointelligence_v1beta2/services/video_intelligence_service/transports/base.py‎

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#
1616
import abc
1717
from typing import Awaitable, Callable, Dict, Optional, Sequence, Union
18-
import packaging.version
1918
import pkg_resources
2019

2120
import google.auth # type: ignore
@@ -39,15 +38,6 @@
3938
except pkg_resources.DistributionNotFound:
4039
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
4140

42-
try:
43-
# google.auth.__version__ was added in 1.26.0
44-
_GOOGLE_AUTH_VERSION = google.auth.__version__
45-
except AttributeError:
46-
try: # try pkg_resources if it is available
47-
_GOOGLE_AUTH_VERSION = pkg_resources.get_distribution("google-auth").version
48-
except pkg_resources.DistributionNotFound: # pragma: NO COVER
49-
_GOOGLE_AUTH_VERSION = None
50-
5141

5242
class VideoIntelligenceServiceTransport(abc.ABC):
5343
"""Abstract transport class for VideoIntelligenceService."""
@@ -97,7 +87,7 @@ def __init__(
9787
host += ":443"
9888
self._host = host
9989

100-
scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
90+
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
10191

10292
# Save the scopes.
10393
self._scopes = scopes
@@ -130,29 +120,6 @@ def __init__(
130120
# Save the credentials.
131121
self._credentials = credentials
132122

133-
# TODO(busunkim): This method is in the base transport
134-
# to avoid duplicating code across the transport classes. These functions
135-
# should be deleted once the minimum required versions of google-auth is increased.
136-
137-
# TODO: Remove this function once google-auth >= 1.25.0 is required
138-
@classmethod
139-
def _get_scopes_kwargs(
140-
cls, host: str, scopes: Optional[Sequence[str]]
141-
) -> Dict[str, Optional[Sequence[str]]]:
142-
"""Returns scopes kwargs to pass to google-auth methods depending on the google-auth version"""
143-
144-
scopes_kwargs = {}
145-
146-
if _GOOGLE_AUTH_VERSION and (
147-
packaging.version.parse(_GOOGLE_AUTH_VERSION)
148-
>= packaging.version.parse("1.25.0")
149-
):
150-
scopes_kwargs = {"scopes": scopes, "default_scopes": cls.AUTH_SCOPES}
151-
else:
152-
scopes_kwargs = {"scopes": scopes or cls.AUTH_SCOPES}
153-
154-
return scopes_kwargs
155-
156123
def _prep_wrapped_messages(self, client_info):
157124
# Precompute the wrapped methods.
158125
self._wrapped_methods = {
@@ -183,7 +150,7 @@ def close(self):
183150
raise NotImplementedError()
184151

185152
@property
186-
def operations_client(self) -> operations_v1.OperationsClient:
153+
def operations_client(self):
187154
"""Return the client designed to process long-running operations."""
188155
raise NotImplementedError()
189156

‎google/cloud/videointelligence_v1beta2/services/video_intelligence_service/transports/grpc.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ def __init__(
112112
self._grpc_channel = None
113113
self._ssl_channel_credentials = ssl_channel_credentials
114114
self._stubs: Dict[str, Callable] = {}
115-
self._operations_client = None
115+
self._operations_client: Optional[operations_v1.OperationsClient] = None
116116

117117
if api_mtls_endpoint:
118118
warnings.warn("api_mtls_endpoint is deprecated", DeprecationWarning)

0 commit comments

Comments
 (0)