Skip to content

Commit 2b2a7d9

Browse files
fix(deps): require google-api-core >= 2.8.0 (#39)
- [ ] Regenerate this pull request now. PiperOrigin-RevId: 459095142 Source-Link: googleapis/googleapis@4f1be99 Source-Link: googleapis/googleapis-gen@ae686d9 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYWU2ODZkOWNkZTRmYzNlMzZkMGFjMDJlZmI4NjQzYjE1ODkwYzFlZCJ9 feat: add audience parameter PiperOrigin-RevId: 456827138 Source-Link: googleapis/googleapis@23f1a15 Source-Link: googleapis/googleapis-gen@4075a85 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNDA3NWE4NTE0ZjY3NjY5MWVjMTU2Njg4YTViYmYxODNhYTk4OTNjZSJ9 feat: add asset_id and stream_id fields to VodSession and LiveSession responses fix: remove COMPLETE_POD stitching option PiperOrigin-RevId: 454023909 Source-Link: googleapis/googleapis@f296ef5 Source-Link: googleapis/googleapis-gen@bb5e9fc Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYmI1ZTlmY2IyMTQwNGViMGY2ZTY0OTQ0M2M0MWM1YWNmZGMzMDFlMSJ9
1 parent 125030d commit 2b2a7d9

File tree

11 files changed

+100
-45
lines changed

11 files changed

+100
-45
lines changed

packages/google-cloud-video-stitcher/google/cloud/video/stitcher_v1/services/video_stitcher_service/async_client.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2148,15 +2148,6 @@ async def sample_create_live_session():
21482148
session should be created, in the form of
21492149
``projects/{project_number}/locations/{location}``.
21502150
2151-
Valid locations:
2152-
2153-
- ``-`` (Video Stitcher API will pick a location that
2154-
is closest to the caller.)
2155-
- ``us-east1``
2156-
- ``us-west1``
2157-
- ``us-central1``
2158-
- ``europe-west1``
2159-
21602151
This corresponds to the ``parent`` field
21612152
on the ``request`` instance; if ``request`` is provided, this
21622153
should not be set.

packages/google-cloud-video-stitcher/google/cloud/video/stitcher_v1/services/video_stitcher_service/client.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -579,6 +579,7 @@ def __init__(
579579
quota_project_id=client_options.quota_project_id,
580580
client_info=client_info,
581581
always_use_jwt_access=True,
582+
api_audience=client_options.api_audience,
582583
)
583584

584585
def create_cdn_key(
@@ -2483,15 +2484,6 @@ def sample_create_live_session():
24832484
session should be created, in the form of
24842485
``projects/{project_number}/locations/{location}``.
24852486
2486-
Valid locations:
2487-
2488-
- ``-`` (Video Stitcher API will pick a location that
2489-
is closest to the caller.)
2490-
- ``us-east1``
2491-
- ``us-west1``
2492-
- ``us-central1``
2493-
- ``europe-west1``
2494-
24952487
This corresponds to the ``parent`` field
24962488
on the ``request`` instance; if ``request`` is provided, this
24972489
should not be set.

packages/google-cloud-video-stitcher/google/cloud/video/stitcher_v1/services/video_stitcher_service/transports/base.py

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ def __init__(
6262
quota_project_id: Optional[str] = None,
6363
client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
6464
always_use_jwt_access: Optional[bool] = False,
65+
api_audience: Optional[str] = None,
6566
**kwargs,
6667
) -> None:
6768
"""Instantiate the transport.
@@ -89,11 +90,6 @@ def __init__(
8990
be used for service account credentials.
9091
"""
9192

92-
# Save the hostname. Default to port 443 (HTTPS) if none is specified.
93-
if ":" not in host:
94-
host += ":443"
95-
self._host = host
96-
9793
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
9894

9995
# Save the scopes.
@@ -114,6 +110,11 @@ def __init__(
114110
credentials, _ = google.auth.default(
115111
**scopes_kwargs, quota_project_id=quota_project_id
116112
)
113+
# Don't apply audience if the credentials file passed from user.
114+
if hasattr(credentials, "with_gdch_audience"):
115+
credentials = credentials.with_gdch_audience(
116+
api_audience if api_audience else host
117+
)
117118

118119
# If the credentials are service account credentials, then always try to use self signed JWT.
119120
if (
@@ -126,6 +127,11 @@ def __init__(
126127
# Save the credentials.
127128
self._credentials = credentials
128129

130+
# Save the hostname. Default to port 443 (HTTPS) if none is specified.
131+
if ":" not in host:
132+
host += ":443"
133+
self._host = host
134+
129135
def _prep_wrapped_messages(self, client_info):
130136
# Precompute the wrapped methods.
131137
self._wrapped_methods = {

packages/google-cloud-video-stitcher/google/cloud/video/stitcher_v1/services/video_stitcher_service/transports/grpc.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ def __init__(
6969
quota_project_id: Optional[str] = None,
7070
client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
7171
always_use_jwt_access: Optional[bool] = False,
72+
api_audience: Optional[str] = None,
7273
) -> None:
7374
"""Instantiate the transport.
7475
@@ -164,6 +165,7 @@ def __init__(
164165
quota_project_id=quota_project_id,
165166
client_info=client_info,
166167
always_use_jwt_access=always_use_jwt_access,
168+
api_audience=api_audience,
167169
)
168170

169171
if not self._grpc_channel:

packages/google-cloud-video-stitcher/google/cloud/video/stitcher_v1/services/video_stitcher_service/transports/grpc_asyncio.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ def __init__(
114114
quota_project_id=None,
115115
client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
116116
always_use_jwt_access: Optional[bool] = False,
117+
api_audience: Optional[str] = None,
117118
) -> None:
118119
"""Instantiate the transport.
119120
@@ -209,6 +210,7 @@ def __init__(
209210
quota_project_id=quota_project_id,
210211
client_info=client_info,
211212
always_use_jwt_access=always_use_jwt_access,
213+
api_audience=api_audience,
212214
)
213215

214216
if not self._grpc_channel:

packages/google-cloud-video-stitcher/google/cloud/video/stitcher_v1/types/sessions.py

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ class VodSession(proto.Message):
7777
manifest_options (google.cloud.video.stitcher_v1.types.ManifestOptions):
7878
Additional options that affect the output of
7979
the manifest.
80+
asset_id (str):
81+
Output only. The generated ID of the
82+
VodSession's source media.
8083
"""
8184

8285
name = proto.Field(
@@ -114,6 +117,10 @@ class VodSession(proto.Message):
114117
number=9,
115118
message="ManifestOptions",
116119
)
120+
asset_id = proto.Field(
121+
proto.STRING,
122+
number=10,
123+
)
117124

118125

119126
class Interstitials(proto.Message):
@@ -287,6 +294,9 @@ class LiveSession(proto.Message):
287294
manifest_options (google.cloud.video.stitcher_v1.types.ManifestOptions):
288295
Additional options that affect the output of
289296
the manifest.
297+
stream_id (str):
298+
Output only. The generated ID of the
299+
LiveSession's source stream.
290300
"""
291301

292302
class StitchingPolicy(proto.Enum):
@@ -296,7 +306,6 @@ class StitchingPolicy(proto.Enum):
296306
"""
297307
STITCHING_POLICY_UNSPECIFIED = 0
298308
COMPLETE_AD = 1
299-
COMPLETE_POD = 2
300309
CUT_CURRENT = 3
301310

302311
name = proto.Field(
@@ -344,6 +353,10 @@ class StitchingPolicy(proto.Enum):
344353
number=10,
345354
message="ManifestOptions",
346355
)
356+
stream_id = proto.Field(
357+
proto.STRING,
358+
number=11,
359+
)
347360

348361

349362
class AdTag(proto.Message):

packages/google-cloud-video-stitcher/google/cloud/video/stitcher_v1/types/video_stitcher_service.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -644,15 +644,6 @@ class CreateLiveSessionRequest(proto.Message):
644644
Required. The project and location in which the live session
645645
should be created, in the form of
646646
``projects/{project_number}/locations/{location}``.
647-
648-
Valid locations:
649-
650-
- ``-`` (Video Stitcher API will pick a location that is
651-
closest to the caller.)
652-
- ``us-east1``
653-
- ``us-west1``
654-
- ``us-central1``
655-
- ``europe-west1``
656647
live_session (google.cloud.video.stitcher_v1.types.LiveSession):
657648
Required. Parameters for creating a live
658649
session.

packages/google-cloud-video-stitcher/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
platforms="Posix; MacOS X; Windows",
4040
include_package_data=True,
4141
install_requires=(
42-
"google-api-core[grpc] >= 1.31.5, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.0",
42+
"google-api-core[grpc] >= 2.8.0, <3.0.0dev",
4343
"proto-plus >= 1.19.7, <2.0.0dev",
4444
"protobuf >= 3.19.0, <4.0.0dev",
4545
),

packages/google-cloud-video-stitcher/testing/constraints-3.6.txt

Lines changed: 0 additions & 10 deletions
This file was deleted.

packages/google-cloud-video-stitcher/testing/constraints-3.7.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
#
66
# e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev",
77
# Then this file should have foo==1.14.0
8-
google-api-core==1.31.5
8+
google-api-core==2.8.0
99
proto-plus==1.19.7
1010
protobuf==3.19.0

0 commit comments

Comments
 (0)