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

Commit 08c1a06

Browse files
fix: Remove default_ad_break_duration from LiveConfig (#145)
* feat!: Update LRO metadata type to google.cloud.common.OperationMetadata BREAKING CHANGE PiperOrigin-RevId: 520405218 Source-Link: googleapis/googleapis@4931d1b Source-Link: https://github.com/googleapis/googleapis-gen/commit/dd1f11489e32e15ba5a5b1a76e2b8f4748c6c1d9 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZGQxZjExNDg5ZTMyZTE1YmE1YTViMWE3NmUyYjhmNDc0OGM2YzFkOSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * feat!: Remove default_ad_break_duration from LiveConfig BREAKING CHANGE PiperOrigin-RevId: 520434307 Source-Link: googleapis/googleapis@273994f Source-Link: https://github.com/googleapis/googleapis-gen/commit/49986a12fef4f0ed9b200228347e3f5d280cc72f Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNDk5ODZhMTJmZWY0ZjBlZDliMjAwMjI4MzQ3ZTNmNWQyODBjYzcyZiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * fix!: Roll back the changes that update of LRO metadata type to google.cloud.common.OperationMetadata PiperOrigin-RevId: 520464508 Source-Link: googleapis/googleapis@cf01552 Source-Link: https://github.com/googleapis/googleapis-gen/commit/5a981d622d237b05476086408ec523ff4b7c0600 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNWE5ODFkNjIyZDIzN2IwNTQ3NjA4NjQwOGVjNTIzZmY0YjdjMDYwMCJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * feat!: introduce GAM settings for GAM related configs and support ListOperations PiperOrigin-RevId: 524328971 Source-Link: googleapis/googleapis@a5f8761 Source-Link: https://github.com/googleapis/googleapis-gen/commit/6414e5e4aa4eb9de399b3b5f36c9d1640ebcd07a Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNjQxNGU1ZTRhYTRlYjlkZTM5OWIzYjVmMzZjOWQxNjQwZWJjZDA3YSJ9 * 🦉 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 25fa456 commit 08c1a06

File tree

9 files changed

+36
-106
lines changed

9 files changed

+36
-106
lines changed

google/cloud/video/stitcher/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
PrefetchConfig,
5353
)
5454
from google.cloud.video.stitcher_v1.types.sessions import (
55-
GamVodConfig,
5655
Interstitials,
5756
LiveSession,
5857
ManifestOptions,
@@ -124,7 +123,6 @@
124123
"LiveConfig",
125124
"PrefetchConfig",
126125
"AdTracking",
127-
"GamVodConfig",
128126
"Interstitials",
129127
"LiveSession",
130128
"ManifestOptions",

google/cloud/video/stitcher_v1/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
from .types.events import Event, ProgressEvent
4141
from .types.live_configs import AdTracking, GamLiveConfig, LiveConfig, PrefetchConfig
4242
from .types.sessions import (
43-
GamVodConfig,
4443
Interstitials,
4544
LiveSession,
4645
ManifestOptions,
@@ -105,7 +104,6 @@
105104
"DeleteSlateRequest",
106105
"Event",
107106
"GamLiveConfig",
108-
"GamVodConfig",
109107
"GetCdnKeyRequest",
110108
"GetLiveAdTagDetailRequest",
111109
"GetLiveConfigRequest",

google/cloud/video/stitcher_v1/services/video_stitcher_service/async_client.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
from google.api_core import operation # type: ignore
4646
from google.api_core import operation_async # type: ignore
4747
from google.longrunning import operations_pb2
48-
from google.protobuf import duration_pb2 # type: ignore
4948
from google.protobuf import empty_pb2 # type: ignore
5049
from google.protobuf import field_mask_pb2 # type: ignore
5150

google/cloud/video/stitcher_v1/services/video_stitcher_service/client.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
from google.api_core import operation # type: ignore
5050
from google.api_core import operation_async # type: ignore
5151
from google.longrunning import operations_pb2
52-
from google.protobuf import duration_pb2 # type: ignore
5352
from google.protobuf import empty_pb2 # type: ignore
5453
from google.protobuf import field_mask_pb2 # type: ignore
5554

google/cloud/video/stitcher_v1/types/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
from .events import Event, ProgressEvent
3232
from .live_configs import AdTracking, GamLiveConfig, LiveConfig, PrefetchConfig
3333
from .sessions import (
34-
GamVodConfig,
3534
Interstitials,
3635
LiveSession,
3736
ManifestOptions,
@@ -98,7 +97,6 @@
9897
"LiveConfig",
9998
"PrefetchConfig",
10099
"AdTracking",
101-
"GamVodConfig",
102100
"Interstitials",
103101
"LiveSession",
104102
"ManifestOptions",

google/cloud/video/stitcher_v1/types/live_configs.py

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232

3333

3434
class AdTracking(proto.Enum):
35-
r"""Determines the Ad tracking policy.
35+
r"""Determines the ad tracking policy.
3636
3737
Values:
3838
AD_TRACKING_UNSPECIFIED (0):
3939
The ad tracking policy is not specified.
4040
CLIENT (1):
41-
Client side ad tracking is specified. The
41+
Client-side ad tracking is specified. The
4242
client player is expected to trigger playback
4343
and activity events itself.
4444
SERVER (2):
@@ -70,27 +70,21 @@ class LiveConfig(proto.Message):
7070
state (google.cloud.video.stitcher_v1.types.LiveConfig.State):
7171
Output only. State of the live config.
7272
ad_tracking (google.cloud.video.stitcher_v1.types.AdTracking):
73-
Required. Determines how the ads should be tracked. If
73+
Required. Determines how the ads are tracked. If
7474
[gam_live_config][google.cloud.video.stitcher.v1.LiveConfig.gam_live_config]
7575
is set, the value must be ``CLIENT`` because the IMA SDK
7676
handles ad tracking.
7777
default_slate (str):
78-
This must refer to a slate in the same
79-
project. In case Google Ad Manager (GAM) is
80-
being used for ads this will be used to set the
81-
appropriate value of slateCreativeId in
78+
This must refer to a slate in the same project. If Google Ad
79+
Manager (GAM) is used for ads, this string sets the value of
80+
``slateCreativeId`` in
8281
https://developers.google.com/ad-manager/api/reference/v202211/LiveStreamEventService.LiveStreamEvent#slateCreativeId
8382
stitching_policy (google.cloud.video.stitcher_v1.types.LiveConfig.StitchingPolicy):
8483
Defines the stitcher behavior in case an ad does not align
8584
exactly with the ad break boundaries. If not specified, the
8685
default is ``CUT_CURRENT``.
8786
prefetch_config (google.cloud.video.stitcher_v1.types.PrefetchConfig):
8887
The configuration for prefetching ads.
89-
default_ad_break_duration (google.protobuf.duration_pb2.Duration):
90-
The default ad pod duration in seconds that
91-
will be requested when a cue-out does not
92-
specify a duration. The default value of this
93-
field is 30s.
9488
"""
9589

9690
class State(proto.Enum):
@@ -114,7 +108,7 @@ class State(proto.Enum):
114108
class StitchingPolicy(proto.Enum):
115109
r"""Defines the ad stitching behavior in case the ad duration does not
116110
align exactly with the ad break boundaries. If not specified, the
117-
default is CUT_CURRENT.
111+
default is ``CUT_CURRENT``.
118112
119113
Values:
120114
STITCHING_POLICY_UNSPECIFIED (0):
@@ -171,11 +165,6 @@ class StitchingPolicy(proto.Enum):
171165
number=10,
172166
message="PrefetchConfig",
173167
)
174-
default_ad_break_duration: duration_pb2.Duration = proto.Field(
175-
proto.MESSAGE,
176-
number=11,
177-
message=duration_pb2.Duration,
178-
)
179168

180169

181170
class PrefetchConfig(proto.Message):

google/cloud/video/stitcher_v1/types/sessions.py

Lines changed: 27 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
__protobuf__ = proto.module(
2626
package="google.cloud.video.stitcher.v1",
2727
manifest={
28-
"GamVodConfig",
2928
"VodSession",
3029
"Interstitials",
3130
"VodSessionAd",
@@ -38,28 +37,6 @@
3837
)
3938

4039

41-
class GamVodConfig(proto.Message):
42-
r"""Metadata for registering a VOD Session with Google Ad Manager
43-
(GAM).
44-
45-
Attributes:
46-
network_code (str):
47-
Required. Ad Manager network code.
48-
stream_id (str):
49-
Required. The stream ID generated by Ad
50-
Manager.
51-
"""
52-
53-
network_code: str = proto.Field(
54-
proto.STRING,
55-
number=1,
56-
)
57-
stream_id: str = proto.Field(
58-
proto.STRING,
59-
number=2,
60-
)
61-
62-
6340
class VodSession(proto.Message):
6441
r"""Metadata for a VOD session. The session expires 4 hours after
6542
its creation.
@@ -103,12 +80,32 @@ class VodSession(proto.Message):
10380
[gam_vod_config][google.cloud.video.stitcher.v1.VodSession.gam_vod_config]
10481
is set, the value must be ``CLIENT`` because the IMA SDK
10582
handles ad tracking.
106-
gam_vod_config (google.cloud.video.stitcher_v1.types.GamVodConfig):
107-
This has the Google Ad Manager (GAM) related
108-
metadata in the case where GAM is used for the
109-
ads.
83+
gam_settings (google.cloud.video.stitcher_v1.types.VodSession.GamSettings):
84+
This field should be set with appropriate
85+
values if GAM is being used for ads.
11086
"""
11187

88+
class GamSettings(proto.Message):
89+
r"""Defines fields related to Google Ad Manager (GAM). This
90+
should be set if GAM is being used for ads.
91+
92+
Attributes:
93+
network_code (str):
94+
Required. Ad Manager network code.
95+
stream_id (str):
96+
Required. The stream ID generated by Ad
97+
Manager.
98+
"""
99+
100+
network_code: str = proto.Field(
101+
proto.STRING,
102+
number=1,
103+
)
104+
stream_id: str = proto.Field(
105+
proto.STRING,
106+
number=2,
107+
)
108+
112109
name: str = proto.Field(
113110
proto.STRING,
114111
number=1,
@@ -149,10 +146,10 @@ class VodSession(proto.Message):
149146
number=11,
150147
enum=live_configs.AdTracking,
151148
)
152-
gam_vod_config: "GamVodConfig" = proto.Field(
149+
gam_settings: GamSettings = proto.Field(
153150
proto.MESSAGE,
154-
number=12,
155-
message="GamVodConfig",
151+
number=13,
152+
message=GamSettings,
156153
)
157154

158155

@@ -313,60 +310,12 @@ class GamSettings(proto.Message):
313310
should be set if GAM
314311
is being used for ads.
315312
316-
This message has `oneof`_ fields (mutually exclusive fields).
317-
For each oneof, at most one member field can be set at the same time.
318-
Setting any member of the oneof automatically clears all other
319-
members.
320-
321-
.. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields
322-
323313
Attributes:
324-
gam_hls (google.cloud.video.stitcher_v1.types.LiveSession.GamSettings.GamHls):
325-
Fields that are specific to HLS manifests.
326-
327-
This field is a member of `oneof`_ ``manifest_fields``.
328-
gam_dash (google.cloud.video.stitcher_v1.types.LiveSession.GamSettings.GamDash):
329-
Fields that are specific to DASH manifests.
330-
331-
This field is a member of `oneof`_ ``manifest_fields``.
332314
stream_id (str):
333315
Required. The stream ID generated by Ad
334316
Manager.
335317
"""
336318

337-
class GamHls(proto.Message):
338-
r"""GamHls is a container for any HLS specific input fields for
339-
GAM Live Stitching.
340-
341-
"""
342-
343-
class GamDash(proto.Message):
344-
r"""GamDash is a container for any DASH specific input fields for
345-
GAM Live Stitching.
346-
347-
Attributes:
348-
period_template_uri (str):
349-
Required. The session template url by Ad
350-
Manager for DASH periods.
351-
"""
352-
353-
period_template_uri: str = proto.Field(
354-
proto.STRING,
355-
number=1,
356-
)
357-
358-
gam_hls: "LiveSession.GamSettings.GamHls" = proto.Field(
359-
proto.MESSAGE,
360-
number=2,
361-
oneof="manifest_fields",
362-
message="LiveSession.GamSettings.GamHls",
363-
)
364-
gam_dash: "LiveSession.GamSettings.GamDash" = proto.Field(
365-
proto.MESSAGE,
366-
number=3,
367-
oneof="manifest_fields",
368-
message="LiveSession.GamSettings.GamDash",
369-
)
370319
stream_id: str = proto.Field(
371320
proto.STRING,
372321
number=1,

google/cloud/video/stitcher_v1/types/slates.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class Slate(proto.Message):
3939
slate. This URI must return an MP4 video with at
4040
least one audio track.
4141
gam_slate (google.cloud.video.stitcher_v1.types.Slate.GamSlate):
42-
gam_slate has all the GAM related attributes of slates.
42+
gam_slate has all the GAM-related attributes of slates.
4343
"""
4444

4545
class GamSlate(proto.Message):

samples/generated_samples/snippet_metadata_google.cloud.video.stitcher.v1.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
],
99
"language": "PYTHON",
1010
"name": "google-cloud-video-stitcher",
11-
"version": "0.7.0"
11+
"version": "0.1.0"
1212
},
1313
"snippets": [
1414
{

0 commit comments

Comments
 (0)