Skip to content

Commit 774cb40

Browse files
codejudascodejudas
committed
[Librarian] Regenerated @ c4079ef2e396aaadcdc4dfcbebb16b4a9a34a1dc
1 parent b4537b3 commit 774cb40

File tree

71 files changed

+1508
-1412
lines changed

Some content is hidden

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

71 files changed

+1508
-1412
lines changed

‎CHANGES.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ twilio-python Changelog
33

44
Here you can see the full list of changes between each twilio-python release.
55

6+
[2018-04-28] Version 6.13.0
7+
----------------------------
8+
**Video**
9+
- Redesign API by adding custom `VideoLayout` object. **(breaking change)**
10+
11+
612
[2018-04-20] Version 6.12.1
713
----------------------------
814
**Twiml**

‎tests/integration/video/v1/test_composition.py‎

Lines changed: 116 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,56 @@ def test_fetch_response(self):
3636
"date_completed": "2015-07-30T20:01:33Z",
3737
"date_deleted": null,
3838
"sid": "CJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
39+
"room_sid": "RMaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
3940
"audio_sources": [
40-
"RTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
41+
"PAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
42+
"user*"
4143
],
42-
"video_sources": [
44+
"audio_sources_excluded": [
4345
"RTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
4446
],
45-
"video_layout": "GRID",
47+
"video_layout": {
48+
"grid": {
49+
"video_sources": [
50+
"*"
51+
],
52+
"video_sources_excluded": [
53+
"MTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
54+
],
55+
"reuse": "show_oldest",
56+
"x_pos": 100,
57+
"y_pos": 600,
58+
"z_pos": 10,
59+
"width": 0,
60+
"height": 0,
61+
"max_columns": 0,
62+
"max_rows": 0,
63+
"cells_excluded": []
64+
},
65+
"pip": {
66+
"video_sources": [
67+
"RTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaab"
68+
],
69+
"video_sources_excluded": [],
70+
"reuse": "none",
71+
"x_pos": 100,
72+
"y_pos": 600,
73+
"z_pos": 10,
74+
"width": 0,
75+
"height": 0,
76+
"max_columns": 0,
77+
"max_rows": 0,
78+
"cells_excluded": []
79+
}
80+
},
4681
"resolution": "1280x720",
4782
"format": "webm",
4883
"bitrate": 64,
4984
"size": 4,
5085
"duration": 6,
51-
"room_sid": "RMaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
86+
"trim": true,
87+
"media_external_location": null,
88+
"encryption_key": null,
5289
"url": "https://video.twilio.com/v1/Compositions/CJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
5390
"links": {
5491
"media": "https://video.twilio.com/v1/Compositions/CJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Media"
@@ -108,18 +145,52 @@ def test_read_results_response(self):
108145
"date_completed": "2015-07-30T20:01:33Z",
109146
"date_deleted": null,
110147
"sid": "CJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
148+
"room_sid": "RMaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
111149
"audio_sources": [
112150
"RTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
113-
"RTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaab"
151+
"user*"
114152
],
115-
"video_sources": [],
116-
"video_layout": "GRID",
153+
"audio_sources_excluded": [],
154+
"video_layout": {
155+
"grid": {
156+
"video_sources": [
157+
"user*"
158+
],
159+
"video_sources_excluded": [],
160+
"reuse": "show_oldest",
161+
"x_pos": 100,
162+
"y_pos": 600,
163+
"z_pos": 10,
164+
"width": 0,
165+
"height": 0,
166+
"max_columns": 0,
167+
"max_rows": 0,
168+
"cells_excluded": []
169+
},
170+
"pip": {
171+
"video_sources": [
172+
"RTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaab"
173+
],
174+
"video_sources_excluded": [],
175+
"reuse": "none",
176+
"x_pos": 100,
177+
"y_pos": 600,
178+
"z_pos": 10,
179+
"width": 0,
180+
"height": 0,
181+
"max_columns": 0,
182+
"max_rows": 0,
183+
"cells_excluded": []
184+
}
185+
},
117186
"resolution": "1280x720",
118-
"format": "mp3",
119-
"bitrate": 16,
120-
"size": 55,
121-
"duration": 10,
122-
"room_sid": "RMaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
187+
"format": "webm",
188+
"bitrate": 64,
189+
"size": 4,
190+
"duration": 6,
191+
"trim": true,
192+
"media_external_location": null,
193+
"encryption_key": null,
123194
"url": "https://video.twilio.com/v1/Compositions/CJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
124195
"links": {
125196
"media": "https://video.twilio.com/v1/Compositions/CJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Media"
@@ -186,18 +257,44 @@ def test_create_response(self):
186257
"date_completed": null,
187258
"date_deleted": null,
188259
"sid": "CJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
260+
"room_sid": "RMaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
189261
"audio_sources": [
190262
"RTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
191-
"RTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaab"
263+
"user*"
192264
],
193-
"video_sources": [],
194-
"video_layout": "GRID",
195-
"resolution": "1280x720",
196-
"format": "mp3",
265+
"audio_sources_excluded": [
266+
"RTbaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
267+
],
268+
"video_layout": {
269+
"custom": {
270+
"video_sources": [
271+
"user*"
272+
],
273+
"video_sources_excluded": [
274+
"RTcaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
275+
],
276+
"reuse": "show_oldest",
277+
"x_pos": 100,
278+
"y_pos": 600,
279+
"z_pos": 10,
280+
"width": 800,
281+
"height": 0,
282+
"max_columns": 0,
283+
"max_rows": 0,
284+
"cells_excluded": [
285+
2,
286+
3
287+
]
288+
}
289+
},
290+
"trim": true,
291+
"format": "mp4",
292+
"resolution": "1920x1080",
197293
"bitrate": 0,
198294
"size": 0,
199-
"duration": 1,
200-
"room_sid": "RMaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
295+
"duration": 0,
296+
"media_external_location": null,
297+
"encryption_key": null,
201298
"url": "https://video.twilio.com/v1/Compositions/CJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
202299
"links": {
203300
"media": "https://video.twilio.com/v1/Compositions/CJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Media"

‎twilio/rest/api/v2010/account/__init__.py‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def stream(self, friendly_name=values.unset, status=values.unset, limit=None,
8383
The results are returned as a generator, so this operation is memory efficient.
8484
8585
:param unicode friendly_name: FriendlyName to filter on
86-
:param AccountInstance.Status status: Status to filter on
86+
:param unicode status: Status to filter on
8787
:param int limit: Upper limit for the number of records to return. stream()
8888
guarantees to never return more than limit. Default is no limit
8989
:param int page_size: Number of records to fetch per request, when not set will use
@@ -108,7 +108,7 @@ def list(self, friendly_name=values.unset, status=values.unset, limit=None,
108108
memory before returning.
109109
110110
:param unicode friendly_name: FriendlyName to filter on
111-
:param AccountInstance.Status status: Status to filter on
111+
:param unicode status: Status to filter on
112112
:param int limit: Upper limit for the number of records to return. list() guarantees
113113
never to return more than limit. Default is no limit
114114
:param int page_size: Number of records to fetch per request, when not set will use
@@ -134,7 +134,7 @@ def page(self, friendly_name=values.unset, status=values.unset,
134134
Request is executed immediately
135135
136136
:param unicode friendly_name: FriendlyName to filter on
137-
:param AccountInstance.Status status: Status to filter on
137+
:param unicode status: Status to filter on
138138
:param str page_token: PageToken provided by the API
139139
:param int page_number: Page Number, this value is simply for client state
140140
:param int page_size: Number of records to return, defaults to 50
@@ -312,7 +312,7 @@ def update(self, friendly_name=values.unset, status=values.unset):
312312
Update the AccountInstance
313313
314314
:param unicode friendly_name: FriendlyName to update
315-
:param AccountInstance.Status status: Status to update the Account with
315+
:param unicode status: Status to update the Account with
316316
317317
:returns: Updated AccountInstance
318318
:rtype: twilio.rest.api.v2010.account.AccountInstance
@@ -626,11 +626,6 @@ def __repr__(self):
626626
class AccountInstance(InstanceResource):
627627
""" """
628628

629-
class Status(object):
630-
ACTIVE = "active"
631-
SUSPENDED = "suspended"
632-
CLOSED = "closed"
633-
634629
class Type(object):
635630
TRIAL = "Trial"
636631
FULL = "Full"
@@ -727,7 +722,7 @@ def sid(self):
727722
def status(self):
728723
"""
729724
:returns: The status of this account
730-
:rtype: AccountInstance.Status
725+
:rtype: unicode
731726
"""
732727
return self._properties['status']
733728

@@ -769,7 +764,7 @@ def update(self, friendly_name=values.unset, status=values.unset):
769764
Update the AccountInstance
770765
771766
:param unicode friendly_name: FriendlyName to update
772-
:param AccountInstance.Status status: Status to update the Account with
767+
:param unicode status: Status to update the Account with
773768
774769
:returns: Updated AccountInstance
775770
:rtype: twilio.rest.api.v2010.account.AccountInstance

0 commit comments

Comments
 (0)