Skip to content

Commit 492d7e2

Browse files
author
ask-pyth
committed
Release 1.30.0. For changelog, check CHANGELOG.rst
1 parent c1910c1 commit 492d7e2

26 files changed

+896
-59
lines changed

ask-sdk-model/CHANGELOG.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -371,3 +371,13 @@ This release contains the following changes :
371371

372372
This release contains the following changes :
373373
- APL for Audio now sends RuntimeError requests that notify developer of any errors that happened during APLA processing.
374+
375+
376+
1.30.0
377+
~~~~~~
378+
379+
This release contains the following changes :
380+
381+
- Add support for APL 1.6 version. More information about the newest version can be found `here <https://developer.amazon.com/en-US/docs/alexa/alexa-presentation-language/apl-latest-version.html>`__.
382+
383+

ask-sdk-model/ask_sdk_model/__version__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
__pip_package_name__ = 'ask-sdk-model'
1515
__description__ = 'The ASK SDK Model package provides model definitions, for building Alexa Skills.'
1616
__url__ = 'https://github.com/alexa/alexa-apis-for-python'
17-
__version__ = '1.29.0'
17+
__version__ = '1.30.0'
1818
__author__ = 'Alexa Skills Kit'
1919
__author_email__ = 'ask-sdk-dynamic@amazon.com'
2020
__license__ = 'Apache 2.0'

ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/__init__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,15 @@
4343
from .component_visible_on_screen_media_tag import ComponentVisibleOnScreenMediaTag
4444
from .transform_property import TransformProperty
4545
from .send_index_list_data_directive import SendIndexListDataDirective
46+
from .select_command import SelectCommand
4647
from .align import Align
4748
from .highlight_mode import HighlightMode
4849
from .sequential_command import SequentialCommand
4950
from .runtime import Runtime
5051
from .execute_commands_directive import ExecuteCommandsDirective
5152
from .component_visible_on_screen_scrollable_tag import ComponentVisibleOnScreenScrollableTag
5253
from .move_transform_property import MoveTransformProperty
54+
from .finish_command import FinishCommand
5355
from .clear_focus_command import ClearFocusCommand
5456
from .component_entity import ComponentEntity
5557
from .command import Command
@@ -64,10 +66,12 @@
6466
from .send_event_command import SendEventCommand
6567
from .component_visible_on_screen_tags import ComponentVisibleOnScreenTags
6668
from .alexa_presentation_apl_interface import AlexaPresentationAplInterface
69+
from .reinflate_command import ReinflateCommand
6770
from .component_visible_on_screen_viewport_tag import ComponentVisibleOnScreenViewportTag
6871
from .set_state_command import SetStateCommand
6972
from .rotate_transform_property import RotateTransformProperty
7073
from .scroll_to_index_command import ScrollToIndexCommand
74+
from .scroll_to_component_command import ScrollToComponentCommand
7175
from .speak_list_command import SpeakListCommand
7276
from .media_command_type import MediaCommandType
7377
from .rendered_document_state import RenderedDocumentState

ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/animate_item_command.py

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ class AnimateItemCommand(Command):
3737
:type delay: (optional) int
3838
:param description: A user-provided description of this command.
3939
:type description: (optional) str
40+
:param screen_lock: If true, disable the Interaction Timer.
41+
:type screen_lock: (optional) bool
42+
:param sequencer: Specify the sequencer that should execute this command.
43+
:type sequencer: (optional) str
4044
:param when: If false, the execution of the command is skipped. Defaults to true.
4145
:type when: (optional) bool
4246
:param component_id: The ID of the animated component.
@@ -57,6 +61,8 @@ class AnimateItemCommand(Command):
5761
'object_type': 'str',
5862
'delay': 'int',
5963
'description': 'str',
64+
'screen_lock': 'bool',
65+
'sequencer': 'str',
6066
'when': 'bool',
6167
'component_id': 'str',
6268
'duration': 'int',
@@ -70,6 +76,8 @@ class AnimateItemCommand(Command):
7076
'object_type': 'type',
7177
'delay': 'delay',
7278
'description': 'description',
79+
'screen_lock': 'screenLock',
80+
'sequencer': 'sequencer',
7381
'when': 'when',
7482
'component_id': 'componentId',
7583
'duration': 'duration',
@@ -80,14 +88,18 @@ class AnimateItemCommand(Command):
8088
} # type: Dict
8189
supports_multiple_types = False
8290

83-
def __init__(self, delay=None, description=None, when=None, component_id=None, duration=None, easing='linear', repeat_count=None, repeat_mode=None, value=None):
84-
# type: (Union[int, str, None], Optional[str], Optional[bool], Optional[str], Union[int, str, None], Optional[str], Union[int, str, None], Optional[AnimateItemRepeatMode_22d93893], Optional[List[AnimatedProperty_b438632b]]) -> None
91+
def __init__(self, delay=None, description=None, screen_lock=None, sequencer=None, when=None, component_id=None, duration=None, easing='linear', repeat_count=None, repeat_mode=None, value=None):
92+
# type: (Union[int, str, None], Optional[str], Optional[bool], Optional[str], Optional[bool], Optional[str], Union[int, str, None], Optional[str], Union[int, str, None], Optional[AnimateItemRepeatMode_22d93893], Optional[List[AnimatedProperty_b438632b]]) -> None
8593
"""Runs a fixed-duration animation sequence on one or more properties of a single component.
8694
8795
:param delay: The delay in milliseconds before this command starts executing; must be non-negative. Defaults to 0.
8896
:type delay: (optional) int
8997
:param description: A user-provided description of this command.
9098
:type description: (optional) str
99+
:param screen_lock: If true, disable the Interaction Timer.
100+
:type screen_lock: (optional) bool
101+
:param sequencer: Specify the sequencer that should execute this command.
102+
:type sequencer: (optional) str
91103
:param when: If false, the execution of the command is skipped. Defaults to true.
92104
:type when: (optional) bool
93105
:param component_id: The ID of the animated component.
@@ -106,7 +118,7 @@ def __init__(self, delay=None, description=None, when=None, component_id=None, d
106118
self.__discriminator_value = "AnimateItem" # type: str
107119

108120
self.object_type = self.__discriminator_value
109-
super(AnimateItemCommand, self).__init__(object_type=self.__discriminator_value, delay=delay, description=description, when=when)
121+
super(AnimateItemCommand, self).__init__(object_type=self.__discriminator_value, delay=delay, description=description, screen_lock=screen_lock, sequencer=sequencer, when=when)
110122
self.component_id = component_id
111123
self.duration = duration
112124
self.easing = easing

ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/auto_page_command.py

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ class AutoPageCommand(Command):
3535
:type delay: (optional) int
3636
:param description: A user-provided description of this command.
3737
:type description: (optional) str
38+
:param screen_lock: If true, disable the Interaction Timer.
39+
:type screen_lock: (optional) bool
40+
:param sequencer: Specify the sequencer that should execute this command.
41+
:type sequencer: (optional) str
3842
:param when: If false, the execution of the command is skipped. Defaults to true.
3943
:type when: (optional) bool
4044
:param component_id: The id of the Pager component.
@@ -49,6 +53,8 @@ class AutoPageCommand(Command):
4953
'object_type': 'str',
5054
'delay': 'int',
5155
'description': 'str',
56+
'screen_lock': 'bool',
57+
'sequencer': 'str',
5258
'when': 'bool',
5359
'component_id': 'str',
5460
'count': 'int',
@@ -59,21 +65,27 @@ class AutoPageCommand(Command):
5965
'object_type': 'type',
6066
'delay': 'delay',
6167
'description': 'description',
68+
'screen_lock': 'screenLock',
69+
'sequencer': 'sequencer',
6270
'when': 'when',
6371
'component_id': 'componentId',
6472
'count': 'count',
6573
'duration': 'duration'
6674
} # type: Dict
6775
supports_multiple_types = False
6876

69-
def __init__(self, delay=None, description=None, when=None, component_id=None, count=None, duration=None):
70-
# type: (Union[int, str, None], Optional[str], Optional[bool], Optional[str], Union[int, str, None], Union[int, str, None]) -> None
77+
def __init__(self, delay=None, description=None, screen_lock=None, sequencer=None, when=None, component_id=None, count=None, duration=None):
78+
# type: (Union[int, str, None], Optional[str], Optional[bool], Optional[str], Optional[bool], Optional[str], Union[int, str, None], Union[int, str, None]) -> None
7179
"""Automatically progress through a series of pages displayed in a Pager component. The AutoPage command finishes after the last page has been displayed for the requested time period.
7280
7381
:param delay: The delay in milliseconds before this command starts executing; must be non-negative. Defaults to 0.
7482
:type delay: (optional) int
7583
:param description: A user-provided description of this command.
7684
:type description: (optional) str
85+
:param screen_lock: If true, disable the Interaction Timer.
86+
:type screen_lock: (optional) bool
87+
:param sequencer: Specify the sequencer that should execute this command.
88+
:type sequencer: (optional) str
7789
:param when: If false, the execution of the command is skipped. Defaults to true.
7890
:type when: (optional) bool
7991
:param component_id: The id of the Pager component.
@@ -86,7 +98,7 @@ def __init__(self, delay=None, description=None, when=None, component_id=None, c
8698
self.__discriminator_value = "AutoPage" # type: str
8799

88100
self.object_type = self.__discriminator_value
89-
super(AutoPageCommand, self).__init__(object_type=self.__discriminator_value, delay=delay, description=description, when=when)
101+
super(AutoPageCommand, self).__init__(object_type=self.__discriminator_value, delay=delay, description=description, screen_lock=screen_lock, sequencer=sequencer, when=when)
90102
self.component_id = component_id
91103
self.count = count
92104
self.duration = duration

ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/clear_focus_command.py

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ class ClearFocusCommand(Command):
3535
:type delay: (optional) int
3636
:param description: A user-provided description of this command.
3737
:type description: (optional) str
38+
:param screen_lock: If true, disable the Interaction Timer.
39+
:type screen_lock: (optional) bool
40+
:param sequencer: Specify the sequencer that should execute this command.
41+
:type sequencer: (optional) str
3842
:param when: If false, the execution of the command is skipped. Defaults to true.
3943
:type when: (optional) bool
4044
@@ -43,32 +47,40 @@ class ClearFocusCommand(Command):
4347
'object_type': 'str',
4448
'delay': 'int',
4549
'description': 'str',
50+
'screen_lock': 'bool',
51+
'sequencer': 'str',
4652
'when': 'bool'
4753
} # type: Dict
4854

4955
attribute_map = {
5056
'object_type': 'type',
5157
'delay': 'delay',
5258
'description': 'description',
59+
'screen_lock': 'screenLock',
60+
'sequencer': 'sequencer',
5361
'when': 'when'
5462
} # type: Dict
5563
supports_multiple_types = False
5664

57-
def __init__(self, delay=None, description=None, when=None):
58-
# type: (Union[int, str, None], Optional[str], Optional[bool]) -> None
65+
def __init__(self, delay=None, description=None, screen_lock=None, sequencer=None, when=None):
66+
# type: (Union[int, str, None], Optional[str], Optional[bool], Optional[str], Optional[bool]) -> None
5967
"""Removes focus from the component that is currently in focus.
6068
6169
:param delay: The delay in milliseconds before this command starts executing; must be non-negative. Defaults to 0.
6270
:type delay: (optional) int
6371
:param description: A user-provided description of this command.
6472
:type description: (optional) str
73+
:param screen_lock: If true, disable the Interaction Timer.
74+
:type screen_lock: (optional) bool
75+
:param sequencer: Specify the sequencer that should execute this command.
76+
:type sequencer: (optional) str
6577
:param when: If false, the execution of the command is skipped. Defaults to true.
6678
:type when: (optional) bool
6779
"""
6880
self.__discriminator_value = "ClearFocus" # type: str
6981

7082
self.object_type = self.__discriminator_value
71-
super(ClearFocusCommand, self).__init__(object_type=self.__discriminator_value, delay=delay, description=description, when=when)
83+
super(ClearFocusCommand, self).__init__(object_type=self.__discriminator_value, delay=delay, description=description, screen_lock=screen_lock, sequencer=sequencer, when=when)
7284

7385
def to_dict(self):
7486
# type: () -> Dict[str, object]

ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/command.py

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ class Command(object):
3737
:type delay: (optional) int
3838
:param description: A user-provided description of this command.
3939
:type description: (optional) str
40+
:param screen_lock: If true, disable the Interaction Timer.
41+
:type screen_lock: (optional) bool
42+
:param sequencer: Specify the sequencer that should execute this command.
43+
:type sequencer: (optional) str
4044
:param when: If false, the execution of the command is skipped. Defaults to true.
4145
:type when: (optional) bool
4246
@@ -49,6 +53,8 @@ class Command(object):
4953
|
5054
| ControlMedia: :py:class:`ask_sdk_model.interfaces.alexa.presentation.apl.control_media_command.ControlMediaCommand`,
5155
|
56+
| Finish: :py:class:`ask_sdk_model.interfaces.alexa.presentation.apl.finish_command.FinishCommand`,
57+
|
5258
| AutoPage: :py:class:`ask_sdk_model.interfaces.alexa.presentation.apl.auto_page_command.AutoPageCommand`,
5359
|
5460
| PlayMedia: :py:class:`ask_sdk_model.interfaces.alexa.presentation.apl.play_media_command.PlayMediaCommand`,
@@ -63,6 +69,8 @@ class Command(object):
6369
|
6470
| SpeakList: :py:class:`ask_sdk_model.interfaces.alexa.presentation.apl.speak_list_command.SpeakListCommand`,
6571
|
72+
| Select: :py:class:`ask_sdk_model.interfaces.alexa.presentation.apl.select_command.SelectCommand`,
73+
|
6674
| Sequential: :py:class:`ask_sdk_model.interfaces.alexa.presentation.apl.sequential_command.SequentialCommand`,
6775
|
6876
| SetState: :py:class:`ask_sdk_model.interfaces.alexa.presentation.apl.set_state_command.SetStateCommand`,
@@ -73,58 +81,70 @@ class Command(object):
7381
|
7482
| OpenURL: :py:class:`ask_sdk_model.interfaces.alexa.presentation.apl.open_url_command.OpenUrlCommand`,
7583
|
84+
| Reinflate: :py:class:`ask_sdk_model.interfaces.alexa.presentation.apl.reinflate_command.ReinflateCommand`,
85+
|
7686
| ClearFocus: :py:class:`ask_sdk_model.interfaces.alexa.presentation.apl.clear_focus_command.ClearFocusCommand`,
7787
|
7888
| ScrollToIndex: :py:class:`ask_sdk_model.interfaces.alexa.presentation.apl.scroll_to_index_command.ScrollToIndexCommand`,
7989
|
8090
| SetValue: :py:class:`ask_sdk_model.interfaces.alexa.presentation.apl.set_value_command.SetValueCommand`,
8191
|
82-
| SetFocus: :py:class:`ask_sdk_model.interfaces.alexa.presentation.apl.set_focus_command.SetFocusCommand`
92+
| SetFocus: :py:class:`ask_sdk_model.interfaces.alexa.presentation.apl.set_focus_command.SetFocusCommand`,
93+
|
94+
| ScrollToComponent: :py:class:`ask_sdk_model.interfaces.alexa.presentation.apl.scroll_to_component_command.ScrollToComponentCommand`
8395
8496
"""
8597
deserialized_types = {
8698
'object_type': 'str',
8799
'delay': 'int',
88100
'description': 'str',
101+
'screen_lock': 'bool',
102+
'sequencer': 'str',
89103
'when': 'bool'
90104
} # type: Dict
91105

92106
attribute_map = {
93107
'object_type': 'type',
94108
'delay': 'delay',
95109
'description': 'description',
110+
'screen_lock': 'screenLock',
111+
'sequencer': 'sequencer',
96112
'when': 'when'
97113
} # type: Dict
98114
supports_multiple_types = False
99115

100116
discriminator_value_class_map = {
101117
'SetPage': 'ask_sdk_model.interfaces.alexa.presentation.apl.set_page_command.SetPageCommand',
102118
'ControlMedia': 'ask_sdk_model.interfaces.alexa.presentation.apl.control_media_command.ControlMediaCommand',
119+
'Finish': 'ask_sdk_model.interfaces.alexa.presentation.apl.finish_command.FinishCommand',
103120
'AutoPage': 'ask_sdk_model.interfaces.alexa.presentation.apl.auto_page_command.AutoPageCommand',
104121
'PlayMedia': 'ask_sdk_model.interfaces.alexa.presentation.apl.play_media_command.PlayMediaCommand',
105122
'Scroll': 'ask_sdk_model.interfaces.alexa.presentation.apl.scroll_command.ScrollCommand',
106123
'Idle': 'ask_sdk_model.interfaces.alexa.presentation.apl.idle_command.IdleCommand',
107124
'AnimateItem': 'ask_sdk_model.interfaces.alexa.presentation.apl.animate_item_command.AnimateItemCommand',
108125
'SendEvent': 'ask_sdk_model.interfaces.alexa.presentation.apl.send_event_command.SendEventCommand',
109126
'SpeakList': 'ask_sdk_model.interfaces.alexa.presentation.apl.speak_list_command.SpeakListCommand',
127+
'Select': 'ask_sdk_model.interfaces.alexa.presentation.apl.select_command.SelectCommand',
110128
'Sequential': 'ask_sdk_model.interfaces.alexa.presentation.apl.sequential_command.SequentialCommand',
111129
'SetState': 'ask_sdk_model.interfaces.alexa.presentation.apl.set_state_command.SetStateCommand',
112130
'SpeakItem': 'ask_sdk_model.interfaces.alexa.presentation.apl.speak_item_command.SpeakItemCommand',
113131
'Parallel': 'ask_sdk_model.interfaces.alexa.presentation.apl.parallel_command.ParallelCommand',
114132
'OpenURL': 'ask_sdk_model.interfaces.alexa.presentation.apl.open_url_command.OpenUrlCommand',
133+
'Reinflate': 'ask_sdk_model.interfaces.alexa.presentation.apl.reinflate_command.ReinflateCommand',
115134
'ClearFocus': 'ask_sdk_model.interfaces.alexa.presentation.apl.clear_focus_command.ClearFocusCommand',
116135
'ScrollToIndex': 'ask_sdk_model.interfaces.alexa.presentation.apl.scroll_to_index_command.ScrollToIndexCommand',
117136
'SetValue': 'ask_sdk_model.interfaces.alexa.presentation.apl.set_value_command.SetValueCommand',
118-
'SetFocus': 'ask_sdk_model.interfaces.alexa.presentation.apl.set_focus_command.SetFocusCommand'
137+
'SetFocus': 'ask_sdk_model.interfaces.alexa.presentation.apl.set_focus_command.SetFocusCommand',
138+
'ScrollToComponent': 'ask_sdk_model.interfaces.alexa.presentation.apl.scroll_to_component_command.ScrollToComponentCommand'
119139
}
120140

121141
json_discriminator_key = "type"
122142

123143
__metaclass__ = ABCMeta
124144

125145
@abstractmethod
126-
def __init__(self, object_type=None, delay=None, description=None, when=None):
127-
# type: (Optional[str], Union[int, str, None], Optional[str], Optional[bool]) -> None
146+
def __init__(self, object_type=None, delay=None, description=None, screen_lock=None, sequencer=None, when=None):
147+
# type: (Optional[str], Union[int, str, None], Optional[str], Optional[bool], Optional[str], Optional[bool]) -> None
128148
"""A message that can change the visual or audio presentation of the content on the screen.
129149
130150
:param object_type: Defines the command type and dictates which properties must/can be included.
@@ -133,6 +153,10 @@ def __init__(self, object_type=None, delay=None, description=None, when=None):
133153
:type delay: (optional) int
134154
:param description: A user-provided description of this command.
135155
:type description: (optional) str
156+
:param screen_lock: If true, disable the Interaction Timer.
157+
:type screen_lock: (optional) bool
158+
:param sequencer: Specify the sequencer that should execute this command.
159+
:type sequencer: (optional) str
136160
:param when: If false, the execution of the command is skipped. Defaults to true.
137161
:type when: (optional) bool
138162
"""
@@ -141,6 +165,8 @@ def __init__(self, object_type=None, delay=None, description=None, when=None):
141165
self.object_type = object_type
142166
self.delay = delay
143167
self.description = description
168+
self.screen_lock = screen_lock
169+
self.sequencer = sequencer
144170
self.when = when
145171

146172
@classmethod

0 commit comments

Comments
 (0)