diff --git a/ask-sdk-model/CHANGELOG.rst b/ask-sdk-model/CHANGELOG.rst index 0abd393..a595b1a 100644 --- a/ask-sdk-model/CHANGELOG.rst +++ b/ask-sdk-model/CHANGELOG.rst @@ -121,9 +121,10 @@ This release contains the following changes : 1.8.0 ~~~~~~~ -This release contains the following : -Introduces support for customizing your skill’s experience for Echo Auto, which is now shipping to select customers via our invite program, and vehicles and other aftermarket devices that support Alexa Auto. -The automotive experience introduces another way for customers to interact with skills, while they are on-the-go and their attention is on the road. Now you can adapt your skill experience to be succinct, location-aware, and adaptive to your customer’s needs while they’re outside the home. +This release contains the following changes : + +- Introduces support for customizing your skill's experience for Echo Auto, which is now shipping to select customers via our invite program, and vehicles and other aftermarket devices that support Alexa Auto. +- The automotive experience introduces another way for customers to interact with skills, while they are on-the-go and their attention is on the road. Now you can adapt your skill experience to be succinct, location-aware, and adaptive to your customer's needs while they're outside the home. 1.9.0 @@ -133,3 +134,13 @@ This release contains the following changes : - Dynamic entities for customized interactions - Add additional 'entitlementReason' field in In-Skill products + + +1.10.0 +~~~~~~~ + +This release contains the following changes : + +- The `Skill Messaging API `__ is now supported. Use the Skill Messaging API to send a message request to a skill for a specified user. +- Adds support for additional `APL Standard Commands `__. +- Packaged type information in models as per `PEP 0561 `__. diff --git a/ask-sdk-model/MANIFEST.in b/ask-sdk-model/MANIFEST.in index 070326d..2e4a158 100644 --- a/ask-sdk-model/MANIFEST.in +++ b/ask-sdk-model/MANIFEST.in @@ -1,4 +1,5 @@ include README.rst include CHANGELOG.rst include LICENSE -include requirements.txt \ No newline at end of file +include requirements.txt +recursive-include ask_sdk_model py.typed \ No newline at end of file diff --git a/ask-sdk-model/ask_sdk_model/__version__.py b/ask-sdk-model/ask_sdk_model/__version__.py index dc95ebe..8a964ce 100644 --- a/ask-sdk-model/ask_sdk_model/__version__.py +++ b/ask-sdk-model/ask_sdk_model/__version__.py @@ -14,7 +14,7 @@ __pip_package_name__ = 'ask-sdk-model' __description__ = 'The ASK SDK Model package provides model definitions, for building Alexa Skills.' __url__ = 'https://github.com/alexa/alexa-apis-for-python' -__version__ = '1.9.0' +__version__ = '1.10.0' __author__ = 'Alexa Skills Kit' __author_email__ = 'ask-sdk-dynamic@amazon.com' __license__ = 'Apache 2.0' diff --git a/ask-sdk-model/ask_sdk_model/application.py b/ask-sdk-model/ask_sdk_model/application.py index ea8af6e..9c65ec4 100644 --- a/ask-sdk-model/ask_sdk_model/application.py +++ b/ask-sdk-model/ask_sdk_model/application.py @@ -36,11 +36,11 @@ class Application(object): """ deserialized_types = { 'application_id': 'str' - } + } # type: Dict attribute_map = { 'application_id': 'applicationId' - } +} # type: Dict def __init__(self, application_id=None): # type: (Optional[str]) -> None @@ -49,14 +49,14 @@ def __init__(self, application_id=None): :param application_id: A string representing the application identifier for your skill. :type application_id: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.application_id = application_id def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/canfulfill/can_fulfill_intent.py b/ask-sdk-model/ask_sdk_model/canfulfill/can_fulfill_intent.py index 2c972a7..12497fa 100644 --- a/ask-sdk-model/ask_sdk_model/canfulfill/can_fulfill_intent.py +++ b/ask-sdk-model/ask_sdk_model/canfulfill/can_fulfill_intent.py @@ -41,12 +41,12 @@ class CanFulfillIntent(object): deserialized_types = { 'can_fulfill': 'ask_sdk_model.canfulfill.can_fulfill_intent_values.CanFulfillIntentValues', 'slots': 'dict(str, ask_sdk_model.canfulfill.can_fulfill_slot.CanFulfillSlot)' - } + } # type: Dict attribute_map = { 'can_fulfill': 'canFulfill', 'slots': 'slots' - } +} # type: Dict def __init__(self, can_fulfill=None, slots=None): # type: (Optional[CanFulfillIntentValues], Optional[Dict[str, CanFulfillSlot]]) -> None @@ -57,7 +57,7 @@ def __init__(self, can_fulfill=None, slots=None): :param slots: A map that represents skill's detailed response to each detected slot within the intent such as if skill can understand and fulfill the detected slot. This supplements the overall canFulfillIntent response and help Alexa make better ranking and arbitration decisions. The key is the name of the slot. The value is an object of type CanFulfillSlot. :type slots: (optional) dict(str, ask_sdk_model.canfulfill.can_fulfill_slot.CanFulfillSlot) """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.can_fulfill = can_fulfill self.slots = slots @@ -65,7 +65,7 @@ def __init__(self, can_fulfill=None, slots=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/canfulfill/can_fulfill_intent_request.py b/ask-sdk-model/ask_sdk_model/canfulfill/can_fulfill_intent_request.py index 69d31ec..70ba821 100644 --- a/ask-sdk-model/ask_sdk_model/canfulfill/can_fulfill_intent_request.py +++ b/ask-sdk-model/ask_sdk_model/canfulfill/can_fulfill_intent_request.py @@ -52,7 +52,7 @@ class CanFulfillIntentRequest(Request): 'locale': 'str', 'dialog_state': 'ask_sdk_model.dialog_state.DialogState', 'intent': 'ask_sdk_model.intent.Intent' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -61,7 +61,7 @@ class CanFulfillIntentRequest(Request): 'locale': 'locale', 'dialog_state': 'dialogState', 'intent': 'intent' - } +} # type: Dict def __init__(self, request_id=None, timestamp=None, locale=None, dialog_state=None, intent=None): # type: (Optional[str], Optional[datetime], Optional[str], Optional[DialogState], Optional[Intent]) -> None @@ -78,7 +78,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, dialog_state=No :param intent: :type intent: (optional) ask_sdk_model.intent.Intent """ - self.__discriminator_value = "CanFulfillIntentRequest" + self.__discriminator_value = "CanFulfillIntentRequest" # type: str self.object_type = self.__discriminator_value super(CanFulfillIntentRequest, self).__init__(object_type=self.__discriminator_value, request_id=request_id, timestamp=timestamp, locale=locale) @@ -88,7 +88,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, dialog_state=No def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/canfulfill/can_fulfill_slot.py b/ask-sdk-model/ask_sdk_model/canfulfill/can_fulfill_slot.py index 40d2f6e..cb36fef 100644 --- a/ask-sdk-model/ask_sdk_model/canfulfill/can_fulfill_slot.py +++ b/ask-sdk-model/ask_sdk_model/canfulfill/can_fulfill_slot.py @@ -41,12 +41,12 @@ class CanFulfillSlot(object): deserialized_types = { 'can_understand': 'ask_sdk_model.canfulfill.can_understand_slot_values.CanUnderstandSlotValues', 'can_fulfill': 'ask_sdk_model.canfulfill.can_fulfill_slot_values.CanFulfillSlotValues' - } + } # type: Dict attribute_map = { 'can_understand': 'canUnderstand', 'can_fulfill': 'canFulfill' - } +} # type: Dict def __init__(self, can_understand=None, can_fulfill=None): # type: (Optional[CanUnderstandSlotValues], Optional[CanFulfillSlotValues]) -> None @@ -57,7 +57,7 @@ def __init__(self, can_understand=None, can_fulfill=None): :param can_fulfill: :type can_fulfill: (optional) ask_sdk_model.canfulfill.can_fulfill_slot_values.CanFulfillSlotValues """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.can_understand = can_understand self.can_fulfill = can_fulfill @@ -65,7 +65,7 @@ def __init__(self, can_understand=None, can_fulfill=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/canfulfill/py.typed b/ask-sdk-model/ask_sdk_model/canfulfill/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/context.py b/ask-sdk-model/ask_sdk_model/context.py index ebe37ae..8dcea64 100644 --- a/ask-sdk-model/ask_sdk_model/context.py +++ b/ask-sdk-model/ask_sdk_model/context.py @@ -55,7 +55,7 @@ class Context(object): 'display': 'ask_sdk_model.interfaces.display.display_state.DisplayState', 'geolocation': 'ask_sdk_model.interfaces.geolocation.geolocation_state.GeolocationState', 'viewport': 'ask_sdk_model.interfaces.viewport.viewport_state.ViewportState' - } + } # type: Dict attribute_map = { 'system': 'System', @@ -64,7 +64,7 @@ class Context(object): 'display': 'Display', 'geolocation': 'Geolocation', 'viewport': 'Viewport' - } +} # type: Dict def __init__(self, system=None, audio_player=None, automotive=None, display=None, geolocation=None, viewport=None): # type: (Optional[SystemState], Optional[AudioPlayerState], Optional[AutomotiveState], Optional[DisplayState], Optional[GeolocationState], Optional[ViewportState]) -> None @@ -83,7 +83,7 @@ def __init__(self, system=None, audio_player=None, automotive=None, display=None :param viewport: Provides the characteristics of a device's viewport. :type viewport: (optional) ask_sdk_model.interfaces.viewport.viewport_state.ViewportState """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.system = system self.audio_player = audio_player @@ -95,7 +95,7 @@ def __init__(self, system=None, audio_player=None, automotive=None, display=None def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/device.py b/ask-sdk-model/ask_sdk_model/device.py index 9ea4e6c..fe0508b 100644 --- a/ask-sdk-model/ask_sdk_model/device.py +++ b/ask-sdk-model/ask_sdk_model/device.py @@ -40,12 +40,12 @@ class Device(object): deserialized_types = { 'device_id': 'str', 'supported_interfaces': 'ask_sdk_model.supported_interfaces.SupportedInterfaces' - } + } # type: Dict attribute_map = { 'device_id': 'deviceId', 'supported_interfaces': 'supportedInterfaces' - } +} # type: Dict def __init__(self, device_id=None, supported_interfaces=None): # type: (Optional[str], Optional[SupportedInterfaces]) -> None @@ -56,7 +56,7 @@ def __init__(self, device_id=None, supported_interfaces=None): :param supported_interfaces: Lists each interface that the device supports. For example, if supportedInterfaces includes AudioPlayer {}, then you know that the device supports streaming audio using the AudioPlayer interface :type supported_interfaces: (optional) ask_sdk_model.supported_interfaces.SupportedInterfaces """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.device_id = device_id self.supported_interfaces = supported_interfaces @@ -64,7 +64,7 @@ def __init__(self, device_id=None, supported_interfaces=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/dialog/confirm_intent_directive.py b/ask-sdk-model/ask_sdk_model/dialog/confirm_intent_directive.py index 5b4b7af..8347934 100644 --- a/ask-sdk-model/ask_sdk_model/dialog/confirm_intent_directive.py +++ b/ask-sdk-model/ask_sdk_model/dialog/confirm_intent_directive.py @@ -37,12 +37,12 @@ class ConfirmIntentDirective(Directive): deserialized_types = { 'object_type': 'str', 'updated_intent': 'ask_sdk_model.intent.Intent' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'updated_intent': 'updatedIntent' - } +} # type: Dict def __init__(self, updated_intent=None): # type: (Optional[Intent]) -> None @@ -51,7 +51,7 @@ def __init__(self, updated_intent=None): :param updated_intent: :type updated_intent: (optional) ask_sdk_model.intent.Intent """ - self.__discriminator_value = "Dialog.ConfirmIntent" + self.__discriminator_value = "Dialog.ConfirmIntent" # type: str self.object_type = self.__discriminator_value super(ConfirmIntentDirective, self).__init__(object_type=self.__discriminator_value) @@ -60,7 +60,7 @@ def __init__(self, updated_intent=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/dialog/confirm_slot_directive.py b/ask-sdk-model/ask_sdk_model/dialog/confirm_slot_directive.py index 1dc7b78..20b87eb 100644 --- a/ask-sdk-model/ask_sdk_model/dialog/confirm_slot_directive.py +++ b/ask-sdk-model/ask_sdk_model/dialog/confirm_slot_directive.py @@ -40,13 +40,13 @@ class ConfirmSlotDirective(Directive): 'object_type': 'str', 'updated_intent': 'ask_sdk_model.intent.Intent', 'slot_to_confirm': 'str' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'updated_intent': 'updatedIntent', 'slot_to_confirm': 'slotToConfirm' - } +} # type: Dict def __init__(self, updated_intent=None, slot_to_confirm=None): # type: (Optional[Intent], Optional[str]) -> None @@ -57,7 +57,7 @@ def __init__(self, updated_intent=None, slot_to_confirm=None): :param slot_to_confirm: :type slot_to_confirm: (optional) str """ - self.__discriminator_value = "Dialog.ConfirmSlot" + self.__discriminator_value = "Dialog.ConfirmSlot" # type: str self.object_type = self.__discriminator_value super(ConfirmSlotDirective, self).__init__(object_type=self.__discriminator_value) @@ -67,7 +67,7 @@ def __init__(self, updated_intent=None, slot_to_confirm=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/dialog/delegate_directive.py b/ask-sdk-model/ask_sdk_model/dialog/delegate_directive.py index 5e2dcd1..6142f3a 100644 --- a/ask-sdk-model/ask_sdk_model/dialog/delegate_directive.py +++ b/ask-sdk-model/ask_sdk_model/dialog/delegate_directive.py @@ -37,12 +37,12 @@ class DelegateDirective(Directive): deserialized_types = { 'object_type': 'str', 'updated_intent': 'ask_sdk_model.intent.Intent' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'updated_intent': 'updatedIntent' - } +} # type: Dict def __init__(self, updated_intent=None): # type: (Optional[Intent]) -> None @@ -51,7 +51,7 @@ def __init__(self, updated_intent=None): :param updated_intent: :type updated_intent: (optional) ask_sdk_model.intent.Intent """ - self.__discriminator_value = "Dialog.Delegate" + self.__discriminator_value = "Dialog.Delegate" # type: str self.object_type = self.__discriminator_value super(DelegateDirective, self).__init__(object_type=self.__discriminator_value) @@ -60,7 +60,7 @@ def __init__(self, updated_intent=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/dialog/dynamic_entities_directive.py b/ask-sdk-model/ask_sdk_model/dialog/dynamic_entities_directive.py index 9b3a32a..41ea0e6 100644 --- a/ask-sdk-model/ask_sdk_model/dialog/dynamic_entities_directive.py +++ b/ask-sdk-model/ask_sdk_model/dialog/dynamic_entities_directive.py @@ -41,13 +41,13 @@ class DynamicEntitiesDirective(Directive): 'object_type': 'str', 'update_behavior': 'ask_sdk_model.er.dynamic.update_behavior.UpdateBehavior', 'types': 'list[ask_sdk_model.er.dynamic.entity_list_item.EntityListItem]' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'update_behavior': 'updateBehavior', 'types': 'types' - } +} # type: Dict def __init__(self, update_behavior=None, types=None): # type: (Optional[UpdateBehavior], Optional[List[EntityListItem]]) -> None @@ -58,7 +58,7 @@ def __init__(self, update_behavior=None, types=None): :param types: :type types: (optional) list[ask_sdk_model.er.dynamic.entity_list_item.EntityListItem] """ - self.__discriminator_value = "Dialog.UpdateDynamicEntities" + self.__discriminator_value = "Dialog.UpdateDynamicEntities" # type: str self.object_type = self.__discriminator_value super(DynamicEntitiesDirective, self).__init__(object_type=self.__discriminator_value) @@ -68,7 +68,7 @@ def __init__(self, update_behavior=None, types=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/dialog/elicit_slot_directive.py b/ask-sdk-model/ask_sdk_model/dialog/elicit_slot_directive.py index a71a357..3a376af 100644 --- a/ask-sdk-model/ask_sdk_model/dialog/elicit_slot_directive.py +++ b/ask-sdk-model/ask_sdk_model/dialog/elicit_slot_directive.py @@ -40,13 +40,13 @@ class ElicitSlotDirective(Directive): 'object_type': 'str', 'updated_intent': 'ask_sdk_model.intent.Intent', 'slot_to_elicit': 'str' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'updated_intent': 'updatedIntent', 'slot_to_elicit': 'slotToElicit' - } +} # type: Dict def __init__(self, updated_intent=None, slot_to_elicit=None): # type: (Optional[Intent], Optional[str]) -> None @@ -57,7 +57,7 @@ def __init__(self, updated_intent=None, slot_to_elicit=None): :param slot_to_elicit: :type slot_to_elicit: (optional) str """ - self.__discriminator_value = "Dialog.ElicitSlot" + self.__discriminator_value = "Dialog.ElicitSlot" # type: str self.object_type = self.__discriminator_value super(ElicitSlotDirective, self).__init__(object_type=self.__discriminator_value) @@ -67,7 +67,7 @@ def __init__(self, updated_intent=None, slot_to_elicit=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/dialog/py.typed b/ask-sdk-model/ask_sdk_model/dialog/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/directive.py b/ask-sdk-model/ask_sdk_model/directive.py index b5d41d3..ac6a766 100644 --- a/ask-sdk-model/ask_sdk_model/directive.py +++ b/ask-sdk-model/ask_sdk_model/directive.py @@ -76,11 +76,11 @@ class Directive(object): """ deserialized_types = { 'object_type': 'str' - } + } # type: Dict attribute_map = { 'object_type': 'type' - } +} # type: Dict discriminator_value_class_map = { 'AudioPlayer.Stop': 'ask_sdk_model.interfaces.audioplayer.stop_directive.StopDirective', @@ -115,13 +115,13 @@ def __init__(self, object_type=None): :param object_type: :type object_type: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.object_type = object_type @classmethod def get_real_child_model(cls, data): - # type: (Dict[str, str]) -> str + # type: (Dict[str, str]) -> Optional[str] """Returns the real base class specified by the discriminator""" discriminator_value = data[cls.json_discriminator_key] return cls.discriminator_value_class_map.get(discriminator_value) @@ -129,7 +129,7 @@ def get_real_child_model(cls, data): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/er/dynamic/entity.py b/ask-sdk-model/ask_sdk_model/er/dynamic/entity.py index e42fa65..e49e379 100644 --- a/ask-sdk-model/ask_sdk_model/er/dynamic/entity.py +++ b/ask-sdk-model/ask_sdk_model/er/dynamic/entity.py @@ -40,12 +40,12 @@ class Entity(object): deserialized_types = { 'id': 'str', 'name': 'ask_sdk_model.er.dynamic.entity_value_and_synonyms.EntityValueAndSynonyms' - } + } # type: Dict attribute_map = { 'id': 'id', 'name': 'name' - } +} # type: Dict def __init__(self, id=None, name=None): # type: (Optional[str], Optional[EntityValueAndSynonyms]) -> None @@ -56,7 +56,7 @@ def __init__(self, id=None, name=None): :param name: :type name: (optional) ask_sdk_model.er.dynamic.entity_value_and_synonyms.EntityValueAndSynonyms """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.id = id self.name = name @@ -64,7 +64,7 @@ def __init__(self, id=None, name=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/er/dynamic/entity_list_item.py b/ask-sdk-model/ask_sdk_model/er/dynamic/entity_list_item.py index d1dee53..f58d892 100644 --- a/ask-sdk-model/ask_sdk_model/er/dynamic/entity_list_item.py +++ b/ask-sdk-model/ask_sdk_model/er/dynamic/entity_list_item.py @@ -40,12 +40,12 @@ class EntityListItem(object): deserialized_types = { 'name': 'str', 'values': 'list[ask_sdk_model.er.dynamic.entity.Entity]' - } + } # type: Dict attribute_map = { 'name': 'name', 'values': 'values' - } +} # type: Dict def __init__(self, name=None, values=None): # type: (Optional[str], Optional[List[Entity]]) -> None @@ -56,7 +56,7 @@ def __init__(self, name=None, values=None): :param values: A list of dynamic entities which are of the same type :type values: (optional) list[ask_sdk_model.er.dynamic.entity.Entity] """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.name = name self.values = values @@ -64,7 +64,7 @@ def __init__(self, name=None, values=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/er/dynamic/entity_value_and_synonyms.py b/ask-sdk-model/ask_sdk_model/er/dynamic/entity_value_and_synonyms.py index 1f29404..0372150 100644 --- a/ask-sdk-model/ask_sdk_model/er/dynamic/entity_value_and_synonyms.py +++ b/ask-sdk-model/ask_sdk_model/er/dynamic/entity_value_and_synonyms.py @@ -39,12 +39,12 @@ class EntityValueAndSynonyms(object): deserialized_types = { 'value': 'str', 'synonyms': 'list[str]' - } + } # type: Dict attribute_map = { 'value': 'value', 'synonyms': 'synonyms' - } +} # type: Dict def __init__(self, value=None, synonyms=None): # type: (Optional[str], Optional[List[object]]) -> None @@ -55,7 +55,7 @@ def __init__(self, value=None, synonyms=None): :param synonyms: An array of synonyms for the entity :type synonyms: (optional) list[str] """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.value = value self.synonyms = synonyms @@ -63,7 +63,7 @@ def __init__(self, value=None, synonyms=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/er/dynamic/py.typed b/ask-sdk-model/ask_sdk_model/er/dynamic/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/er/py.typed b/ask-sdk-model/ask_sdk_model/er/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/events/py.typed b/ask-sdk-model/ask_sdk_model/events/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/events/skillevents/account_linked_body.py b/ask-sdk-model/ask_sdk_model/events/skillevents/account_linked_body.py index aba0c7a..4e3686f 100644 --- a/ask-sdk-model/ask_sdk_model/events/skillevents/account_linked_body.py +++ b/ask-sdk-model/ask_sdk_model/events/skillevents/account_linked_body.py @@ -34,11 +34,11 @@ class AccountLinkedBody(object): """ deserialized_types = { 'access_token': 'str' - } + } # type: Dict attribute_map = { 'access_token': 'accessToken' - } +} # type: Dict def __init__(self, access_token=None): # type: (Optional[str]) -> None @@ -47,14 +47,14 @@ def __init__(self, access_token=None): :param access_token: :type access_token: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.access_token = access_token def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/events/skillevents/account_linked_request.py b/ask-sdk-model/ask_sdk_model/events/skillevents/account_linked_request.py index c5054ee..1d07330 100644 --- a/ask-sdk-model/ask_sdk_model/events/skillevents/account_linked_request.py +++ b/ask-sdk-model/ask_sdk_model/events/skillevents/account_linked_request.py @@ -54,7 +54,7 @@ class AccountLinkedRequest(Request): 'body': 'ask_sdk_model.events.skillevents.account_linked_body.AccountLinkedBody', 'event_creation_time': 'datetime', 'event_publishing_time': 'datetime' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -64,7 +64,7 @@ class AccountLinkedRequest(Request): 'body': 'body', 'event_creation_time': 'eventCreationTime', 'event_publishing_time': 'eventPublishingTime' - } +} # type: Dict def __init__(self, request_id=None, timestamp=None, locale=None, body=None, event_creation_time=None, event_publishing_time=None): # type: (Optional[str], Optional[datetime], Optional[str], Optional[AccountLinkedBody], Optional[datetime], Optional[datetime]) -> None @@ -83,7 +83,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, body=None, even :param event_publishing_time: :type event_publishing_time: (optional) datetime """ - self.__discriminator_value = "AlexaSkillEvent.SkillAccountLinked" + self.__discriminator_value = "AlexaSkillEvent.SkillAccountLinked" # type: str self.object_type = self.__discriminator_value super(AccountLinkedRequest, self).__init__(object_type=self.__discriminator_value, request_id=request_id, timestamp=timestamp, locale=locale) @@ -94,7 +94,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, body=None, even def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/events/skillevents/permission.py b/ask-sdk-model/ask_sdk_model/events/skillevents/permission.py index 16e3597..abcebd2 100644 --- a/ask-sdk-model/ask_sdk_model/events/skillevents/permission.py +++ b/ask-sdk-model/ask_sdk_model/events/skillevents/permission.py @@ -34,11 +34,11 @@ class Permission(object): """ deserialized_types = { 'scope': 'str' - } + } # type: Dict attribute_map = { 'scope': 'scope' - } +} # type: Dict def __init__(self, scope=None): # type: (Optional[str]) -> None @@ -47,14 +47,14 @@ def __init__(self, scope=None): :param scope: :type scope: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.scope = scope def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/events/skillevents/permission_accepted_request.py b/ask-sdk-model/ask_sdk_model/events/skillevents/permission_accepted_request.py index e6cf9a2..a9af56c 100644 --- a/ask-sdk-model/ask_sdk_model/events/skillevents/permission_accepted_request.py +++ b/ask-sdk-model/ask_sdk_model/events/skillevents/permission_accepted_request.py @@ -52,7 +52,7 @@ class PermissionAcceptedRequest(Request): 'body': 'ask_sdk_model.events.skillevents.permission_body.PermissionBody', 'event_creation_time': 'datetime', 'event_publishing_time': 'datetime' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -62,7 +62,7 @@ class PermissionAcceptedRequest(Request): 'body': 'body', 'event_creation_time': 'eventCreationTime', 'event_publishing_time': 'eventPublishingTime' - } +} # type: Dict def __init__(self, request_id=None, timestamp=None, locale=None, body=None, event_creation_time=None, event_publishing_time=None): # type: (Optional[str], Optional[datetime], Optional[str], Optional[PermissionBody], Optional[datetime], Optional[datetime]) -> None @@ -81,7 +81,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, body=None, even :param event_publishing_time: :type event_publishing_time: (optional) datetime """ - self.__discriminator_value = "AlexaSkillEvent.SkillPermissionAccepted" + self.__discriminator_value = "AlexaSkillEvent.SkillPermissionAccepted" # type: str self.object_type = self.__discriminator_value super(PermissionAcceptedRequest, self).__init__(object_type=self.__discriminator_value, request_id=request_id, timestamp=timestamp, locale=locale) @@ -92,7 +92,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, body=None, even def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/events/skillevents/permission_body.py b/ask-sdk-model/ask_sdk_model/events/skillevents/permission_body.py index cbac327..8b0ff4c 100644 --- a/ask-sdk-model/ask_sdk_model/events/skillevents/permission_body.py +++ b/ask-sdk-model/ask_sdk_model/events/skillevents/permission_body.py @@ -35,11 +35,11 @@ class PermissionBody(object): """ deserialized_types = { 'accepted_permissions': 'list[ask_sdk_model.events.skillevents.permission.Permission]' - } + } # type: Dict attribute_map = { 'accepted_permissions': 'acceptedPermissions' - } +} # type: Dict def __init__(self, accepted_permissions=None): # type: (Optional[List[Permission]]) -> None @@ -48,14 +48,14 @@ def __init__(self, accepted_permissions=None): :param accepted_permissions: :type accepted_permissions: (optional) list[ask_sdk_model.events.skillevents.permission.Permission] """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.accepted_permissions = accepted_permissions def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/events/skillevents/permission_changed_request.py b/ask-sdk-model/ask_sdk_model/events/skillevents/permission_changed_request.py index 23de64a..190b0e6 100644 --- a/ask-sdk-model/ask_sdk_model/events/skillevents/permission_changed_request.py +++ b/ask-sdk-model/ask_sdk_model/events/skillevents/permission_changed_request.py @@ -52,7 +52,7 @@ class PermissionChangedRequest(Request): 'body': 'ask_sdk_model.events.skillevents.permission_body.PermissionBody', 'event_creation_time': 'datetime', 'event_publishing_time': 'datetime' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -62,7 +62,7 @@ class PermissionChangedRequest(Request): 'body': 'body', 'event_creation_time': 'eventCreationTime', 'event_publishing_time': 'eventPublishingTime' - } +} # type: Dict def __init__(self, request_id=None, timestamp=None, locale=None, body=None, event_creation_time=None, event_publishing_time=None): # type: (Optional[str], Optional[datetime], Optional[str], Optional[PermissionBody], Optional[datetime], Optional[datetime]) -> None @@ -81,7 +81,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, body=None, even :param event_publishing_time: :type event_publishing_time: (optional) datetime """ - self.__discriminator_value = "AlexaSkillEvent.SkillPermissionChanged" + self.__discriminator_value = "AlexaSkillEvent.SkillPermissionChanged" # type: str self.object_type = self.__discriminator_value super(PermissionChangedRequest, self).__init__(object_type=self.__discriminator_value, request_id=request_id, timestamp=timestamp, locale=locale) @@ -92,7 +92,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, body=None, even def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/events/skillevents/proactive_subscription_changed_body.py b/ask-sdk-model/ask_sdk_model/events/skillevents/proactive_subscription_changed_body.py index 58e0c41..ecdf85f 100644 --- a/ask-sdk-model/ask_sdk_model/events/skillevents/proactive_subscription_changed_body.py +++ b/ask-sdk-model/ask_sdk_model/events/skillevents/proactive_subscription_changed_body.py @@ -35,11 +35,11 @@ class ProactiveSubscriptionChangedBody(object): """ deserialized_types = { 'subscriptions': 'list[ask_sdk_model.events.skillevents.proactive_subscription_event.ProactiveSubscriptionEvent]' - } + } # type: Dict attribute_map = { 'subscriptions': 'subscriptions' - } +} # type: Dict def __init__(self, subscriptions=None): # type: (Optional[List[ProactiveSubscriptionEvent]]) -> None @@ -48,14 +48,14 @@ def __init__(self, subscriptions=None): :param subscriptions: The list of events that this customer is currently subscribed to. If a customer unsubscribes from an event, this list will contain remaining event types to which the customer is still subscribed to receive from your skill. If the list of subscriptions is empty, this customer has unsubscribed from all event types from your skill. :type subscriptions: (optional) list[ask_sdk_model.events.skillevents.proactive_subscription_event.ProactiveSubscriptionEvent] """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.subscriptions = subscriptions def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/events/skillevents/proactive_subscription_changed_request.py b/ask-sdk-model/ask_sdk_model/events/skillevents/proactive_subscription_changed_request.py index 0bbe259..3484505 100644 --- a/ask-sdk-model/ask_sdk_model/events/skillevents/proactive_subscription_changed_request.py +++ b/ask-sdk-model/ask_sdk_model/events/skillevents/proactive_subscription_changed_request.py @@ -48,7 +48,7 @@ class ProactiveSubscriptionChangedRequest(Request): 'timestamp': 'datetime', 'locale': 'str', 'body': 'ask_sdk_model.events.skillevents.proactive_subscription_changed_body.ProactiveSubscriptionChangedBody' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -56,7 +56,7 @@ class ProactiveSubscriptionChangedRequest(Request): 'timestamp': 'timestamp', 'locale': 'locale', 'body': 'body' - } +} # type: Dict def __init__(self, request_id=None, timestamp=None, locale=None, body=None): # type: (Optional[str], Optional[datetime], Optional[str], Optional[ProactiveSubscriptionChangedBody]) -> None @@ -71,7 +71,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, body=None): :param body: :type body: (optional) ask_sdk_model.events.skillevents.proactive_subscription_changed_body.ProactiveSubscriptionChangedBody """ - self.__discriminator_value = "AlexaSkillEvent.ProactiveSubscriptionChanged" + self.__discriminator_value = "AlexaSkillEvent.ProactiveSubscriptionChanged" # type: str self.object_type = self.__discriminator_value super(ProactiveSubscriptionChangedRequest, self).__init__(object_type=self.__discriminator_value, request_id=request_id, timestamp=timestamp, locale=locale) @@ -80,7 +80,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, body=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/events/skillevents/proactive_subscription_event.py b/ask-sdk-model/ask_sdk_model/events/skillevents/proactive_subscription_event.py index f8101de..7ea4aa3 100644 --- a/ask-sdk-model/ask_sdk_model/events/skillevents/proactive_subscription_event.py +++ b/ask-sdk-model/ask_sdk_model/events/skillevents/proactive_subscription_event.py @@ -34,11 +34,11 @@ class ProactiveSubscriptionEvent(object): """ deserialized_types = { 'event_name': 'str' - } + } # type: Dict attribute_map = { 'event_name': 'eventName' - } +} # type: Dict def __init__(self, event_name=None): # type: (Optional[str]) -> None @@ -47,14 +47,14 @@ def __init__(self, event_name=None): :param event_name: :type event_name: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.event_name = event_name def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/events/skillevents/py.typed b/ask-sdk-model/ask_sdk_model/events/skillevents/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/events/skillevents/skill_disabled_request.py b/ask-sdk-model/ask_sdk_model/events/skillevents/skill_disabled_request.py index bb4d2b2..0d339e7 100644 --- a/ask-sdk-model/ask_sdk_model/events/skillevents/skill_disabled_request.py +++ b/ask-sdk-model/ask_sdk_model/events/skillevents/skill_disabled_request.py @@ -48,7 +48,7 @@ class SkillDisabledRequest(Request): 'locale': 'str', 'event_creation_time': 'datetime', 'event_publishing_time': 'datetime' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -57,7 +57,7 @@ class SkillDisabledRequest(Request): 'locale': 'locale', 'event_creation_time': 'eventCreationTime', 'event_publishing_time': 'eventPublishingTime' - } +} # type: Dict def __init__(self, request_id=None, timestamp=None, locale=None, event_creation_time=None, event_publishing_time=None): # type: (Optional[str], Optional[datetime], Optional[str], Optional[datetime], Optional[datetime]) -> None @@ -74,7 +74,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, event_creation_ :param event_publishing_time: :type event_publishing_time: (optional) datetime """ - self.__discriminator_value = "AlexaSkillEvent.SkillDisabled" + self.__discriminator_value = "AlexaSkillEvent.SkillDisabled" # type: str self.object_type = self.__discriminator_value super(SkillDisabledRequest, self).__init__(object_type=self.__discriminator_value, request_id=request_id, timestamp=timestamp, locale=locale) @@ -84,7 +84,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, event_creation_ def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/events/skillevents/skill_enabled_request.py b/ask-sdk-model/ask_sdk_model/events/skillevents/skill_enabled_request.py index 687645d..f710c3c 100644 --- a/ask-sdk-model/ask_sdk_model/events/skillevents/skill_enabled_request.py +++ b/ask-sdk-model/ask_sdk_model/events/skillevents/skill_enabled_request.py @@ -48,7 +48,7 @@ class SkillEnabledRequest(Request): 'locale': 'str', 'event_creation_time': 'datetime', 'event_publishing_time': 'datetime' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -57,7 +57,7 @@ class SkillEnabledRequest(Request): 'locale': 'locale', 'event_creation_time': 'eventCreationTime', 'event_publishing_time': 'eventPublishingTime' - } +} # type: Dict def __init__(self, request_id=None, timestamp=None, locale=None, event_creation_time=None, event_publishing_time=None): # type: (Optional[str], Optional[datetime], Optional[str], Optional[datetime], Optional[datetime]) -> None @@ -74,7 +74,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, event_creation_ :param event_publishing_time: :type event_publishing_time: (optional) datetime """ - self.__discriminator_value = "AlexaSkillEvent.SkillEnabled" + self.__discriminator_value = "AlexaSkillEvent.SkillEnabled" # type: str self.object_type = self.__discriminator_value super(SkillEnabledRequest, self).__init__(object_type=self.__discriminator_value, request_id=request_id, timestamp=timestamp, locale=locale) @@ -84,7 +84,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, event_creation_ def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/intent.py b/ask-sdk-model/ask_sdk_model/intent.py index 3da3e69..baae8fd 100644 --- a/ask-sdk-model/ask_sdk_model/intent.py +++ b/ask-sdk-model/ask_sdk_model/intent.py @@ -44,13 +44,13 @@ class Intent(object): 'name': 'str', 'slots': 'dict(str, ask_sdk_model.slot.Slot)', 'confirmation_status': 'ask_sdk_model.intent_confirmation_status.IntentConfirmationStatus' - } + } # type: Dict attribute_map = { 'name': 'name', 'slots': 'slots', 'confirmation_status': 'confirmationStatus' - } +} # type: Dict def __init__(self, name=None, slots=None, confirmation_status=None): # type: (Optional[str], Optional[Dict[str, Slot]], Optional[IntentConfirmationStatus]) -> None @@ -63,7 +63,7 @@ def __init__(self, name=None, slots=None, confirmation_status=None): :param confirmation_status: :type confirmation_status: (optional) ask_sdk_model.intent_confirmation_status.IntentConfirmationStatus """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.name = name self.slots = slots @@ -72,7 +72,7 @@ def __init__(self, name=None, slots=None, confirmation_status=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/intent_request.py b/ask-sdk-model/ask_sdk_model/intent_request.py index 2fb7b0e..c36d1cd 100644 --- a/ask-sdk-model/ask_sdk_model/intent_request.py +++ b/ask-sdk-model/ask_sdk_model/intent_request.py @@ -52,7 +52,7 @@ class IntentRequest(Request): 'locale': 'str', 'dialog_state': 'ask_sdk_model.dialog_state.DialogState', 'intent': 'ask_sdk_model.intent.Intent' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -61,7 +61,7 @@ class IntentRequest(Request): 'locale': 'locale', 'dialog_state': 'dialogState', 'intent': 'intent' - } +} # type: Dict def __init__(self, request_id=None, timestamp=None, locale=None, dialog_state=None, intent=None): # type: (Optional[str], Optional[datetime], Optional[str], Optional[DialogState], Optional[Intent]) -> None @@ -78,7 +78,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, dialog_state=No :param intent: An object that represents what the user wants. :type intent: (optional) ask_sdk_model.intent.Intent """ - self.__discriminator_value = "IntentRequest" + self.__discriminator_value = "IntentRequest" # type: str self.object_type = self.__discriminator_value super(IntentRequest, self).__init__(object_type=self.__discriminator_value, request_id=request_id, timestamp=timestamp, locale=locale) @@ -88,7 +88,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, dialog_state=No def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/__init__.py b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/__init__.py index 9b06bfc..57a4c14 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/__init__.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/__init__.py @@ -15,14 +15,28 @@ from __future__ import absolute_import from .position import Position +from .idle_command import IdleCommand from .user_event import UserEvent +from .play_media_command import PlayMediaCommand from .render_document_directive import RenderDocumentDirective +from .audio_track import AudioTrack +from .parallel_command import ParallelCommand +from .scroll_command import ScrollCommand from .auto_page_command import AutoPageCommand from .speak_item_command import SpeakItemCommand +from .video_source import VideoSource from .align import Align from .highlight_mode import HighlightMode +from .sequential_command import SequentialCommand from .runtime import Runtime from .execute_commands_directive import ExecuteCommandsDirective from .command import Command +from .control_media_command import ControlMediaCommand from .set_page_command import SetPageCommand +from .send_event_command import SendEventCommand from .alexa_presentation_apl_interface import AlexaPresentationAplInterface +from .set_state_command import SetStateCommand +from .scroll_to_index_command import ScrollToIndexCommand +from .speak_list_command import SpeakListCommand +from .media_command_type import MediaCommandType +from .component_state import ComponentState diff --git a/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/alexa_presentation_apl_interface.py b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/alexa_presentation_apl_interface.py index c93a340..195a706 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/alexa_presentation_apl_interface.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/alexa_presentation_apl_interface.py @@ -35,11 +35,11 @@ class AlexaPresentationAplInterface(object): """ deserialized_types = { 'runtime': 'ask_sdk_model.interfaces.alexa.presentation.apl.runtime.Runtime' - } + } # type: Dict attribute_map = { 'runtime': 'runtime' - } +} # type: Dict def __init__(self, runtime=None): # type: (Optional[Runtime]) -> None @@ -48,14 +48,14 @@ def __init__(self, runtime=None): :param runtime: :type runtime: (optional) ask_sdk_model.interfaces.alexa.presentation.apl.runtime.Runtime """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.runtime = runtime def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/audio_track.py b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/audio_track.py new file mode 100644 index 0000000..310d01f --- /dev/null +++ b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/audio_track.py @@ -0,0 +1,65 @@ +# coding: utf-8 + +# +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file +# except in compliance with the License. A copy of the License is located at +# +# http://aws.amazon.com/apache2.0/ +# +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for +# the specific language governing permissions and limitations under the License. +# + +import pprint +import re # noqa: F401 +import six +import typing +from enum import Enum + + +if typing.TYPE_CHECKING: + from typing import Dict, List, Optional + from datetime import datetime + + +class AudioTrack(Enum): + """ + The audio track to play on. Defaults to “foreground” + + + + Allowed enum values: [foreground] + """ + foreground = "foreground" + + def to_dict(self): + # type: () -> Dict[str, object] + """Returns the model properties as a dict""" + result = {self.name: self.value} + return result + + def to_str(self): + # type: () -> str + """Returns the string representation of the model""" + return pprint.pformat(self.value) + + def __repr__(self): + # type: () -> str + """For `print` and `pprint`""" + return self.to_str() + + def __eq__(self, other): + # type: (object) -> bool + """Returns true if both objects are equal""" + if not isinstance(other, AudioTrack): + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + # type: (object) -> bool + """Returns true if both objects are not equal""" + return not self == other diff --git a/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/auto_page_command.py b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/auto_page_command.py index 7f4dcf2..5418fc9 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/auto_page_command.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/auto_page_command.py @@ -53,7 +53,7 @@ class AutoPageCommand(Command): 'component_id': 'str', 'count': 'int', 'duration': 'int' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -63,7 +63,7 @@ class AutoPageCommand(Command): 'component_id': 'componentId', 'count': 'count', 'duration': 'duration' - } +} # type: Dict def __init__(self, delay=None, description=None, when=None, component_id=None, count=None, duration=None): # type: (Optional[int], Optional[str], Optional[bool], Optional[str], Optional[int], Optional[int]) -> None @@ -82,7 +82,7 @@ def __init__(self, delay=None, description=None, when=None, component_id=None, c :param duration: Time to wait between pages (in milliseconds). Defaults to 0. :type duration: (optional) int """ - self.__discriminator_value = "AutoPage" + self.__discriminator_value = "AutoPage" # type: str self.object_type = self.__discriminator_value super(AutoPageCommand, self).__init__(object_type=self.__discriminator_value, delay=delay, description=description, when=when) @@ -93,7 +93,7 @@ def __init__(self, delay=None, description=None, when=None, component_id=None, c def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/command.py b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/command.py index cc0d716..1059daa 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/command.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/command.py @@ -47,9 +47,29 @@ class Command(object): | SetPage: :py:class:`ask_sdk_model.interfaces.alexa.presentation.apl.set_page_command.SetPageCommand`, | + | ControlMedia: :py:class:`ask_sdk_model.interfaces.alexa.presentation.apl.control_media_command.ControlMediaCommand`, + | + | Sequential: :py:class:`ask_sdk_model.interfaces.alexa.presentation.apl.sequential_command.SequentialCommand`, + | + | SetState: :py:class:`ask_sdk_model.interfaces.alexa.presentation.apl.set_state_command.SetStateCommand`, + | | SpeakItem: :py:class:`ask_sdk_model.interfaces.alexa.presentation.apl.speak_item_command.SpeakItemCommand`, | - | AutoPage: :py:class:`ask_sdk_model.interfaces.alexa.presentation.apl.auto_page_command.AutoPageCommand` + | AutoPage: :py:class:`ask_sdk_model.interfaces.alexa.presentation.apl.auto_page_command.AutoPageCommand`, + | + | Parallel: :py:class:`ask_sdk_model.interfaces.alexa.presentation.apl.parallel_command.ParallelCommand`, + | + | PlayMedia: :py:class:`ask_sdk_model.interfaces.alexa.presentation.apl.play_media_command.PlayMediaCommand`, + | + | ScrollToIndex: :py:class:`ask_sdk_model.interfaces.alexa.presentation.apl.scroll_to_index_command.ScrollToIndexCommand`, + | + | Scroll: :py:class:`ask_sdk_model.interfaces.alexa.presentation.apl.scroll_command.ScrollCommand`, + | + | Idle: :py:class:`ask_sdk_model.interfaces.alexa.presentation.apl.idle_command.IdleCommand`, + | + | SendEvent: :py:class:`ask_sdk_model.interfaces.alexa.presentation.apl.send_event_command.SendEventCommand`, + | + | SpeakList: :py:class:`ask_sdk_model.interfaces.alexa.presentation.apl.speak_list_command.SpeakListCommand` """ deserialized_types = { @@ -57,19 +77,29 @@ class Command(object): 'delay': 'int', 'description': 'str', 'when': 'bool' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'delay': 'delay', 'description': 'description', 'when': 'when' - } +} # type: Dict discriminator_value_class_map = { 'SetPage': 'ask_sdk_model.interfaces.alexa.presentation.apl.set_page_command.SetPageCommand', + 'ControlMedia': 'ask_sdk_model.interfaces.alexa.presentation.apl.control_media_command.ControlMediaCommand', + 'Sequential': 'ask_sdk_model.interfaces.alexa.presentation.apl.sequential_command.SequentialCommand', + 'SetState': 'ask_sdk_model.interfaces.alexa.presentation.apl.set_state_command.SetStateCommand', 'SpeakItem': 'ask_sdk_model.interfaces.alexa.presentation.apl.speak_item_command.SpeakItemCommand', - 'AutoPage': 'ask_sdk_model.interfaces.alexa.presentation.apl.auto_page_command.AutoPageCommand' + 'AutoPage': 'ask_sdk_model.interfaces.alexa.presentation.apl.auto_page_command.AutoPageCommand', + 'Parallel': 'ask_sdk_model.interfaces.alexa.presentation.apl.parallel_command.ParallelCommand', + 'PlayMedia': 'ask_sdk_model.interfaces.alexa.presentation.apl.play_media_command.PlayMediaCommand', + 'ScrollToIndex': 'ask_sdk_model.interfaces.alexa.presentation.apl.scroll_to_index_command.ScrollToIndexCommand', + 'Scroll': 'ask_sdk_model.interfaces.alexa.presentation.apl.scroll_command.ScrollCommand', + 'Idle': 'ask_sdk_model.interfaces.alexa.presentation.apl.idle_command.IdleCommand', + 'SendEvent': 'ask_sdk_model.interfaces.alexa.presentation.apl.send_event_command.SendEventCommand', + 'SpeakList': 'ask_sdk_model.interfaces.alexa.presentation.apl.speak_list_command.SpeakListCommand' } json_discriminator_key = "type" @@ -90,7 +120,7 @@ def __init__(self, object_type=None, delay=None, description=None, when=None): :param when: If false, the execution of the command is skipped. Defaults to true. :type when: (optional) bool """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.object_type = object_type self.delay = delay @@ -99,7 +129,7 @@ def __init__(self, object_type=None, delay=None, description=None, when=None): @classmethod def get_real_child_model(cls, data): - # type: (Dict[str, str]) -> str + # type: (Dict[str, str]) -> Optional[str] """Returns the real base class specified by the discriminator""" discriminator_value = data[cls.json_discriminator_key] return cls.discriminator_value_class_map.get(discriminator_value) @@ -107,7 +137,7 @@ def get_real_child_model(cls, data): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/component_state.py b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/component_state.py new file mode 100644 index 0000000..09ee780 --- /dev/null +++ b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/component_state.py @@ -0,0 +1,67 @@ +# coding: utf-8 + +# +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file +# except in compliance with the License. A copy of the License is located at +# +# http://aws.amazon.com/apache2.0/ +# +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for +# the specific language governing permissions and limitations under the License. +# + +import pprint +import re # noqa: F401 +import six +import typing +from enum import Enum + + +if typing.TYPE_CHECKING: + from typing import Dict, List, Optional + from datetime import datetime + + +class ComponentState(Enum): + """ + Component state. + + + + Allowed enum values: [checked, disabled, focused] + """ + checked = "checked" + disabled = "disabled" + focused = "focused" + + def to_dict(self): + # type: () -> Dict[str, object] + """Returns the model properties as a dict""" + result = {self.name: self.value} + return result + + def to_str(self): + # type: () -> str + """Returns the string representation of the model""" + return pprint.pformat(self.value) + + def __repr__(self): + # type: () -> str + """For `print` and `pprint`""" + return self.to_str() + + def __eq__(self, other): + # type: (object) -> bool + """Returns true if both objects are equal""" + if not isinstance(other, ComponentState): + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + # type: (object) -> bool + """Returns true if both objects are not equal""" + return not self == other diff --git a/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/control_media_command.py b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/control_media_command.py new file mode 100644 index 0000000..bcad71f --- /dev/null +++ b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/control_media_command.py @@ -0,0 +1,145 @@ +# coding: utf-8 + +# +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file +# except in compliance with the License. A copy of the License is located at +# +# http://aws.amazon.com/apache2.0/ +# +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for +# the specific language governing permissions and limitations under the License. +# + +import pprint +import re # noqa: F401 +import six +import typing +from enum import Enum +from ask_sdk_model.interfaces.alexa.presentation.apl.command import Command + + +if typing.TYPE_CHECKING: + from typing import Dict, List, Optional + from datetime import datetime + from ask_sdk_model.interfaces.alexa.presentation.apl.media_command_type import MediaCommandType + + +class ControlMediaCommand(Command): + """ + Control a media player to play, pause, change tracks, or perform some other common action. + + + :param delay: The delay in milliseconds before this command starts executing; must be non-negative. Defaults to 0. + :type delay: (optional) int + :param description: A user-provided description of this command. + :type description: (optional) str + :param when: If false, the execution of the command is skipped. Defaults to true. + :type when: (optional) bool + :param command: The command to issue on the media player + :type command: (optional) ask_sdk_model.interfaces.alexa.presentation.apl.media_command_type.MediaCommandType + :param component_id: The name of the media playing component + :type component_id: (optional) str + :param value: Optional data value + :type value: (optional) int + + """ + deserialized_types = { + 'object_type': 'str', + 'delay': 'int', + 'description': 'str', + 'when': 'bool', + 'command': 'ask_sdk_model.interfaces.alexa.presentation.apl.media_command_type.MediaCommandType', + 'component_id': 'str', + 'value': 'int' + } # type: Dict + + attribute_map = { + 'object_type': 'type', + 'delay': 'delay', + 'description': 'description', + 'when': 'when', + 'command': 'command', + 'component_id': 'componentId', + 'value': 'value' +} # type: Dict + + def __init__(self, delay=None, description=None, when=None, command=None, component_id=None, value=None): + # type: (Optional[int], Optional[str], Optional[bool], Optional[MediaCommandType], Optional[str], Optional[int]) -> None + """Control a media player to play, pause, change tracks, or perform some other common action. + + :param delay: The delay in milliseconds before this command starts executing; must be non-negative. Defaults to 0. + :type delay: (optional) int + :param description: A user-provided description of this command. + :type description: (optional) str + :param when: If false, the execution of the command is skipped. Defaults to true. + :type when: (optional) bool + :param command: The command to issue on the media player + :type command: (optional) ask_sdk_model.interfaces.alexa.presentation.apl.media_command_type.MediaCommandType + :param component_id: The name of the media playing component + :type component_id: (optional) str + :param value: Optional data value + :type value: (optional) int + """ + self.__discriminator_value = "ControlMedia" # type: str + + self.object_type = self.__discriminator_value + super(ControlMediaCommand, self).__init__(object_type=self.__discriminator_value, delay=delay, description=description, when=when) + self.command = command + self.component_id = component_id + self.value = value + + def to_dict(self): + # type: () -> Dict[str, object] + """Returns the model properties as a dict""" + result = {} # type: Dict + + for attr, _ in six.iteritems(self.deserialized_types): + value = getattr(self, attr) + if isinstance(value, list): + result[attr] = list(map( + lambda x: x.to_dict() if hasattr(x, "to_dict") else + x.value if isinstance(x, Enum) else x, + value + )) + elif isinstance(value, Enum): + result[attr] = value.value + elif hasattr(value, "to_dict"): + result[attr] = value.to_dict() + elif isinstance(value, dict): + result[attr] = dict(map( + lambda item: (item[0], item[1].to_dict()) + if hasattr(item[1], "to_dict") else + (item[0], item[1].value) + if isinstance(item[1], Enum) else item, + value.items() + )) + else: + result[attr] = value + + return result + + def to_str(self): + # type: () -> str + """Returns the string representation of the model""" + return pprint.pformat(self.to_dict()) + + def __repr__(self): + # type: () -> str + """For `print` and `pprint`""" + return self.to_str() + + def __eq__(self, other): + # type: (object) -> bool + """Returns true if both objects are equal""" + if not isinstance(other, ControlMediaCommand): + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + # type: (object) -> bool + """Returns true if both objects are not equal""" + return not self == other diff --git a/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/execute_commands_directive.py b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/execute_commands_directive.py index b0c8e3b..de039b9 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/execute_commands_directive.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/execute_commands_directive.py @@ -42,13 +42,13 @@ class ExecuteCommandsDirective(Directive): 'object_type': 'str', 'commands': 'list[ask_sdk_model.interfaces.alexa.presentation.apl.command.Command]', 'token': 'str' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'commands': 'commands', 'token': 'token' - } +} # type: Dict def __init__(self, commands=None, token=None): # type: (Optional[List[Command]], Optional[str]) -> None @@ -59,7 +59,7 @@ def __init__(self, commands=None, token=None): :param token: A skill defined token, unique for each presentation. Must match the token provided by the skill in the RenderDocument directive used to render the original APL document. :type token: (optional) str """ - self.__discriminator_value = "Alexa.Presentation.APL.ExecuteCommands" + self.__discriminator_value = "Alexa.Presentation.APL.ExecuteCommands" # type: str self.object_type = self.__discriminator_value super(ExecuteCommandsDirective, self).__init__(object_type=self.__discriminator_value) @@ -69,7 +69,7 @@ def __init__(self, commands=None, token=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/idle_command.py b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/idle_command.py new file mode 100644 index 0000000..5c1d8a1 --- /dev/null +++ b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/idle_command.py @@ -0,0 +1,123 @@ +# coding: utf-8 + +# +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file +# except in compliance with the License. A copy of the License is located at +# +# http://aws.amazon.com/apache2.0/ +# +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for +# the specific language governing permissions and limitations under the License. +# + +import pprint +import re # noqa: F401 +import six +import typing +from enum import Enum +from ask_sdk_model.interfaces.alexa.presentation.apl.command import Command + + +if typing.TYPE_CHECKING: + from typing import Dict, List, Optional + from datetime import datetime + + +class IdleCommand(Command): + """ + The idle command does nothing. It may be a placeholder or used to insert a calculated delay in a longer series of commands. + + + :param delay: The delay in milliseconds before this command starts executing; must be non-negative. Defaults to 0. + :type delay: (optional) int + :param description: A user-provided description of this command. + :type description: (optional) str + :param when: If false, the execution of the command is skipped. Defaults to true. + :type when: (optional) bool + + """ + deserialized_types = { + 'object_type': 'str', + 'delay': 'int', + 'description': 'str', + 'when': 'bool' + } # type: Dict + + attribute_map = { + 'object_type': 'type', + 'delay': 'delay', + 'description': 'description', + 'when': 'when' +} # type: Dict + + def __init__(self, delay=None, description=None, when=None): + # type: (Optional[int], Optional[str], Optional[bool]) -> None + """The idle command does nothing. It may be a placeholder or used to insert a calculated delay in a longer series of commands. + + :param delay: The delay in milliseconds before this command starts executing; must be non-negative. Defaults to 0. + :type delay: (optional) int + :param description: A user-provided description of this command. + :type description: (optional) str + :param when: If false, the execution of the command is skipped. Defaults to true. + :type when: (optional) bool + """ + self.__discriminator_value = "Idle" # type: str + + self.object_type = self.__discriminator_value + super(IdleCommand, self).__init__(object_type=self.__discriminator_value, delay=delay, description=description, when=when) + + def to_dict(self): + # type: () -> Dict[str, object] + """Returns the model properties as a dict""" + result = {} # type: Dict + + for attr, _ in six.iteritems(self.deserialized_types): + value = getattr(self, attr) + if isinstance(value, list): + result[attr] = list(map( + lambda x: x.to_dict() if hasattr(x, "to_dict") else + x.value if isinstance(x, Enum) else x, + value + )) + elif isinstance(value, Enum): + result[attr] = value.value + elif hasattr(value, "to_dict"): + result[attr] = value.to_dict() + elif isinstance(value, dict): + result[attr] = dict(map( + lambda item: (item[0], item[1].to_dict()) + if hasattr(item[1], "to_dict") else + (item[0], item[1].value) + if isinstance(item[1], Enum) else item, + value.items() + )) + else: + result[attr] = value + + return result + + def to_str(self): + # type: () -> str + """Returns the string representation of the model""" + return pprint.pformat(self.to_dict()) + + def __repr__(self): + # type: () -> str + """For `print` and `pprint`""" + return self.to_str() + + def __eq__(self, other): + # type: (object) -> bool + """Returns true if both objects are equal""" + if not isinstance(other, IdleCommand): + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + # type: (object) -> bool + """Returns true if both objects are not equal""" + return not self == other diff --git a/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/media_command_type.py b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/media_command_type.py new file mode 100644 index 0000000..8c78452 --- /dev/null +++ b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/media_command_type.py @@ -0,0 +1,71 @@ +# coding: utf-8 + +# +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file +# except in compliance with the License. A copy of the License is located at +# +# http://aws.amazon.com/apache2.0/ +# +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for +# the specific language governing permissions and limitations under the License. +# + +import pprint +import re # noqa: F401 +import six +import typing +from enum import Enum + + +if typing.TYPE_CHECKING: + from typing import Dict, List, Optional + from datetime import datetime + + +class MediaCommandType(Enum): + """ + The command enumerated value is the operation that should be performed on the media player. + + + + Allowed enum values: [play, pause, next, previous, rewind, seek, setTrack] + """ + play = "play" + pause = "pause" + next = "next" + previous = "previous" + rewind = "rewind" + seek = "seek" + setTrack = "setTrack" + + def to_dict(self): + # type: () -> Dict[str, object] + """Returns the model properties as a dict""" + result = {self.name: self.value} + return result + + def to_str(self): + # type: () -> str + """Returns the string representation of the model""" + return pprint.pformat(self.value) + + def __repr__(self): + # type: () -> str + """For `print` and `pprint`""" + return self.to_str() + + def __eq__(self, other): + # type: (object) -> bool + """Returns true if both objects are equal""" + if not isinstance(other, MediaCommandType): + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + # type: (object) -> bool + """Returns true if both objects are not equal""" + return not self == other diff --git a/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/parallel_command.py b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/parallel_command.py new file mode 100644 index 0000000..eb8b9be --- /dev/null +++ b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/parallel_command.py @@ -0,0 +1,131 @@ +# coding: utf-8 + +# +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file +# except in compliance with the License. A copy of the License is located at +# +# http://aws.amazon.com/apache2.0/ +# +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for +# the specific language governing permissions and limitations under the License. +# + +import pprint +import re # noqa: F401 +import six +import typing +from enum import Enum +from ask_sdk_model.interfaces.alexa.presentation.apl.command import Command + + +if typing.TYPE_CHECKING: + from typing import Dict, List, Optional + from datetime import datetime + from ask_sdk_model.interfaces.alexa.presentation.apl.command import Command + + +class ParallelCommand(Command): + """ + Execute a series of commands in parallel. The parallel command starts executing all child command simultaneously. The parallel command is considered finished when all of its child commands have finished. When the parallel command is terminated early, all currently executing commands are terminated. + + + :param delay: The delay in milliseconds before this command starts executing; must be non-negative. Defaults to 0. + :type delay: (optional) int + :param description: A user-provided description of this command. + :type description: (optional) str + :param when: If false, the execution of the command is skipped. Defaults to true. + :type when: (optional) bool + :param commands: An un-ordered array of commands to execute in parallel. Once all commands have finished executing the parallel command finishes. Please note that the delay of parallel command and the delay of each command are additive. + :type commands: (optional) list[ask_sdk_model.interfaces.alexa.presentation.apl.command.Command] + + """ + deserialized_types = { + 'object_type': 'str', + 'delay': 'int', + 'description': 'str', + 'when': 'bool', + 'commands': 'list[ask_sdk_model.interfaces.alexa.presentation.apl.command.Command]' + } # type: Dict + + attribute_map = { + 'object_type': 'type', + 'delay': 'delay', + 'description': 'description', + 'when': 'when', + 'commands': 'commands' +} # type: Dict + + def __init__(self, delay=None, description=None, when=None, commands=None): + # type: (Optional[int], Optional[str], Optional[bool], Optional[List[Command]]) -> None + """Execute a series of commands in parallel. The parallel command starts executing all child command simultaneously. The parallel command is considered finished when all of its child commands have finished. When the parallel command is terminated early, all currently executing commands are terminated. + + :param delay: The delay in milliseconds before this command starts executing; must be non-negative. Defaults to 0. + :type delay: (optional) int + :param description: A user-provided description of this command. + :type description: (optional) str + :param when: If false, the execution of the command is skipped. Defaults to true. + :type when: (optional) bool + :param commands: An un-ordered array of commands to execute in parallel. Once all commands have finished executing the parallel command finishes. Please note that the delay of parallel command and the delay of each command are additive. + :type commands: (optional) list[ask_sdk_model.interfaces.alexa.presentation.apl.command.Command] + """ + self.__discriminator_value = "Parallel" # type: str + + self.object_type = self.__discriminator_value + super(ParallelCommand, self).__init__(object_type=self.__discriminator_value, delay=delay, description=description, when=when) + self.commands = commands + + def to_dict(self): + # type: () -> Dict[str, object] + """Returns the model properties as a dict""" + result = {} # type: Dict + + for attr, _ in six.iteritems(self.deserialized_types): + value = getattr(self, attr) + if isinstance(value, list): + result[attr] = list(map( + lambda x: x.to_dict() if hasattr(x, "to_dict") else + x.value if isinstance(x, Enum) else x, + value + )) + elif isinstance(value, Enum): + result[attr] = value.value + elif hasattr(value, "to_dict"): + result[attr] = value.to_dict() + elif isinstance(value, dict): + result[attr] = dict(map( + lambda item: (item[0], item[1].to_dict()) + if hasattr(item[1], "to_dict") else + (item[0], item[1].value) + if isinstance(item[1], Enum) else item, + value.items() + )) + else: + result[attr] = value + + return result + + def to_str(self): + # type: () -> str + """Returns the string representation of the model""" + return pprint.pformat(self.to_dict()) + + def __repr__(self): + # type: () -> str + """For `print` and `pprint`""" + return self.to_str() + + def __eq__(self, other): + # type: (object) -> bool + """Returns true if both objects are equal""" + if not isinstance(other, ParallelCommand): + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + # type: (object) -> bool + """Returns true if both objects are not equal""" + return not self == other diff --git a/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/play_media_command.py b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/play_media_command.py new file mode 100644 index 0000000..7f86472 --- /dev/null +++ b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/play_media_command.py @@ -0,0 +1,146 @@ +# coding: utf-8 + +# +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file +# except in compliance with the License. A copy of the License is located at +# +# http://aws.amazon.com/apache2.0/ +# +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for +# the specific language governing permissions and limitations under the License. +# + +import pprint +import re # noqa: F401 +import six +import typing +from enum import Enum +from ask_sdk_model.interfaces.alexa.presentation.apl.command import Command + + +if typing.TYPE_CHECKING: + from typing import Dict, List, Optional + from datetime import datetime + from ask_sdk_model.interfaces.alexa.presentation.apl.video_source import VideoSource + from ask_sdk_model.interfaces.alexa.presentation.apl.audio_track import AudioTrack + + +class PlayMediaCommand(Command): + """ + Plays media on a media player (currently only a Video player; audio may be added in the future). The media may be on the background audio track or may be sequenced with speak directives). + + + :param delay: The delay in milliseconds before this command starts executing; must be non-negative. Defaults to 0. + :type delay: (optional) int + :param description: A user-provided description of this command. + :type description: (optional) str + :param when: If false, the execution of the command is skipped. Defaults to true. + :type when: (optional) bool + :param audio_track: The command to issue on the media player + :type audio_track: (optional) ask_sdk_model.interfaces.alexa.presentation.apl.audio_track.AudioTrack + :param component_id: The name of the media playing component + :type component_id: (optional) str + :param source: The media source + :type source: (optional) list[ask_sdk_model.interfaces.alexa.presentation.apl.video_source.VideoSource] + + """ + deserialized_types = { + 'object_type': 'str', + 'delay': 'int', + 'description': 'str', + 'when': 'bool', + 'audio_track': 'ask_sdk_model.interfaces.alexa.presentation.apl.audio_track.AudioTrack', + 'component_id': 'str', + 'source': 'list[ask_sdk_model.interfaces.alexa.presentation.apl.video_source.VideoSource]' + } # type: Dict + + attribute_map = { + 'object_type': 'type', + 'delay': 'delay', + 'description': 'description', + 'when': 'when', + 'audio_track': 'audioTrack', + 'component_id': 'componentId', + 'source': 'source' +} # type: Dict + + def __init__(self, delay=None, description=None, when=None, audio_track=None, component_id=None, source=None): + # type: (Optional[int], Optional[str], Optional[bool], Optional[AudioTrack], Optional[str], Optional[List[VideoSource]]) -> None + """Plays media on a media player (currently only a Video player; audio may be added in the future). The media may be on the background audio track or may be sequenced with speak directives). + + :param delay: The delay in milliseconds before this command starts executing; must be non-negative. Defaults to 0. + :type delay: (optional) int + :param description: A user-provided description of this command. + :type description: (optional) str + :param when: If false, the execution of the command is skipped. Defaults to true. + :type when: (optional) bool + :param audio_track: The command to issue on the media player + :type audio_track: (optional) ask_sdk_model.interfaces.alexa.presentation.apl.audio_track.AudioTrack + :param component_id: The name of the media playing component + :type component_id: (optional) str + :param source: The media source + :type source: (optional) list[ask_sdk_model.interfaces.alexa.presentation.apl.video_source.VideoSource] + """ + self.__discriminator_value = "PlayMedia" # type: str + + self.object_type = self.__discriminator_value + super(PlayMediaCommand, self).__init__(object_type=self.__discriminator_value, delay=delay, description=description, when=when) + self.audio_track = audio_track + self.component_id = component_id + self.source = source + + def to_dict(self): + # type: () -> Dict[str, object] + """Returns the model properties as a dict""" + result = {} # type: Dict + + for attr, _ in six.iteritems(self.deserialized_types): + value = getattr(self, attr) + if isinstance(value, list): + result[attr] = list(map( + lambda x: x.to_dict() if hasattr(x, "to_dict") else + x.value if isinstance(x, Enum) else x, + value + )) + elif isinstance(value, Enum): + result[attr] = value.value + elif hasattr(value, "to_dict"): + result[attr] = value.to_dict() + elif isinstance(value, dict): + result[attr] = dict(map( + lambda item: (item[0], item[1].to_dict()) + if hasattr(item[1], "to_dict") else + (item[0], item[1].value) + if isinstance(item[1], Enum) else item, + value.items() + )) + else: + result[attr] = value + + return result + + def to_str(self): + # type: () -> str + """Returns the string representation of the model""" + return pprint.pformat(self.to_dict()) + + def __repr__(self): + # type: () -> str + """For `print` and `pprint`""" + return self.to_str() + + def __eq__(self, other): + # type: (object) -> bool + """Returns true if both objects are equal""" + if not isinstance(other, PlayMediaCommand): + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + # type: (object) -> bool + """Returns true if both objects are not equal""" + return not self == other diff --git a/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/py.typed b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/render_document_directive.py b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/render_document_directive.py index 1a38b0b..af97798 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/render_document_directive.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/render_document_directive.py @@ -45,7 +45,7 @@ class RenderDocumentDirective(Directive): 'document': 'dict(str, object)', 'datasources': 'dict(str, object)', 'packages': 'list[object]' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -53,7 +53,7 @@ class RenderDocumentDirective(Directive): 'document': 'document', 'datasources': 'datasources', 'packages': 'packages' - } +} # type: Dict def __init__(self, token=None, document=None, datasources=None, packages=None): # type: (Optional[str], Optional[Dict[str, object]], Optional[Dict[str, object]], Optional[List[object]]) -> None @@ -68,7 +68,7 @@ def __init__(self, token=None, document=None, datasources=None, packages=None): :param packages: A list of packages including layouts, styles, and images etc. :type packages: (optional) list[object] """ - self.__discriminator_value = "Alexa.Presentation.APL.RenderDocument" + self.__discriminator_value = "Alexa.Presentation.APL.RenderDocument" # type: str self.object_type = self.__discriminator_value super(RenderDocumentDirective, self).__init__(object_type=self.__discriminator_value) @@ -80,7 +80,7 @@ def __init__(self, token=None, document=None, datasources=None, packages=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/runtime.py b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/runtime.py index 22f38e1..abf445a 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/runtime.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/runtime.py @@ -36,11 +36,11 @@ class Runtime(object): """ deserialized_types = { 'max_version': 'str' - } + } # type: Dict attribute_map = { 'max_version': 'maxVersion' - } +} # type: Dict def __init__(self, max_version=None): # type: (Optional[str]) -> None @@ -49,14 +49,14 @@ def __init__(self, max_version=None): :param max_version: Maximum APL version supported by the runtime. :type max_version: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.max_version = max_version def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/scroll_command.py b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/scroll_command.py new file mode 100644 index 0000000..871fa84 --- /dev/null +++ b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/scroll_command.py @@ -0,0 +1,137 @@ +# coding: utf-8 + +# +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file +# except in compliance with the License. A copy of the License is located at +# +# http://aws.amazon.com/apache2.0/ +# +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for +# the specific language governing permissions and limitations under the License. +# + +import pprint +import re # noqa: F401 +import six +import typing +from enum import Enum +from ask_sdk_model.interfaces.alexa.presentation.apl.command import Command + + +if typing.TYPE_CHECKING: + from typing import Dict, List, Optional + from datetime import datetime + + +class ScrollCommand(Command): + """ + Scroll a ScrollView or Sequence forward or backward by a number of pages. The Scroll command has the following properties in addition to the regular command properties. + + + :param delay: The delay in milliseconds before this command starts executing; must be non-negative. Defaults to 0. + :type delay: (optional) int + :param description: A user-provided description of this command. + :type description: (optional) str + :param when: If false, the execution of the command is skipped. Defaults to true. + :type when: (optional) bool + :param distance: The number of pages to scroll. Defaults to 1. + :type distance: (optional) int + :param component_id: The id of the component. + :type component_id: (optional) str + + """ + deserialized_types = { + 'object_type': 'str', + 'delay': 'int', + 'description': 'str', + 'when': 'bool', + 'distance': 'int', + 'component_id': 'str' + } # type: Dict + + attribute_map = { + 'object_type': 'type', + 'delay': 'delay', + 'description': 'description', + 'when': 'when', + 'distance': 'distance', + 'component_id': 'componentId' +} # type: Dict + + def __init__(self, delay=None, description=None, when=None, distance=None, component_id=None): + # type: (Optional[int], Optional[str], Optional[bool], Optional[int], Optional[str]) -> None + """Scroll a ScrollView or Sequence forward or backward by a number of pages. The Scroll command has the following properties in addition to the regular command properties. + + :param delay: The delay in milliseconds before this command starts executing; must be non-negative. Defaults to 0. + :type delay: (optional) int + :param description: A user-provided description of this command. + :type description: (optional) str + :param when: If false, the execution of the command is skipped. Defaults to true. + :type when: (optional) bool + :param distance: The number of pages to scroll. Defaults to 1. + :type distance: (optional) int + :param component_id: The id of the component. + :type component_id: (optional) str + """ + self.__discriminator_value = "Scroll" # type: str + + self.object_type = self.__discriminator_value + super(ScrollCommand, self).__init__(object_type=self.__discriminator_value, delay=delay, description=description, when=when) + self.distance = distance + self.component_id = component_id + + def to_dict(self): + # type: () -> Dict[str, object] + """Returns the model properties as a dict""" + result = {} # type: Dict + + for attr, _ in six.iteritems(self.deserialized_types): + value = getattr(self, attr) + if isinstance(value, list): + result[attr] = list(map( + lambda x: x.to_dict() if hasattr(x, "to_dict") else + x.value if isinstance(x, Enum) else x, + value + )) + elif isinstance(value, Enum): + result[attr] = value.value + elif hasattr(value, "to_dict"): + result[attr] = value.to_dict() + elif isinstance(value, dict): + result[attr] = dict(map( + lambda item: (item[0], item[1].to_dict()) + if hasattr(item[1], "to_dict") else + (item[0], item[1].value) + if isinstance(item[1], Enum) else item, + value.items() + )) + else: + result[attr] = value + + return result + + def to_str(self): + # type: () -> str + """Returns the string representation of the model""" + return pprint.pformat(self.to_dict()) + + def __repr__(self): + # type: () -> str + """For `print` and `pprint`""" + return self.to_str() + + def __eq__(self, other): + # type: (object) -> bool + """Returns true if both objects are equal""" + if not isinstance(other, ScrollCommand): + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + # type: (object) -> bool + """Returns true if both objects are not equal""" + return not self == other diff --git a/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/scroll_to_index_command.py b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/scroll_to_index_command.py new file mode 100644 index 0000000..aa54955 --- /dev/null +++ b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/scroll_to_index_command.py @@ -0,0 +1,145 @@ +# coding: utf-8 + +# +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file +# except in compliance with the License. A copy of the License is located at +# +# http://aws.amazon.com/apache2.0/ +# +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for +# the specific language governing permissions and limitations under the License. +# + +import pprint +import re # noqa: F401 +import six +import typing +from enum import Enum +from ask_sdk_model.interfaces.alexa.presentation.apl.command import Command + + +if typing.TYPE_CHECKING: + from typing import Dict, List, Optional + from datetime import datetime + from ask_sdk_model.interfaces.alexa.presentation.apl.align import Align + + +class ScrollToIndexCommand(Command): + """ + Scroll forward or backward through a ScrollView or Sequence to ensure that a particular child component is in view. + + + :param delay: The delay in milliseconds before this command starts executing; must be non-negative. Defaults to 0. + :type delay: (optional) int + :param description: A user-provided description of this command. + :type description: (optional) str + :param when: If false, the execution of the command is skipped. Defaults to true. + :type when: (optional) bool + :param align: + :type align: (optional) ask_sdk_model.interfaces.alexa.presentation.apl.align.Align + :param component_id: The id of the component. + :type component_id: (optional) str + :param index: The 0-based index of the child to display. + :type index: (optional) int + + """ + deserialized_types = { + 'object_type': 'str', + 'delay': 'int', + 'description': 'str', + 'when': 'bool', + 'align': 'ask_sdk_model.interfaces.alexa.presentation.apl.align.Align', + 'component_id': 'str', + 'index': 'int' + } # type: Dict + + attribute_map = { + 'object_type': 'type', + 'delay': 'delay', + 'description': 'description', + 'when': 'when', + 'align': 'align', + 'component_id': 'componentId', + 'index': 'index' +} # type: Dict + + def __init__(self, delay=None, description=None, when=None, align=None, component_id=None, index=None): + # type: (Optional[int], Optional[str], Optional[bool], Optional[Align], Optional[str], Optional[int]) -> None + """Scroll forward or backward through a ScrollView or Sequence to ensure that a particular child component is in view. + + :param delay: The delay in milliseconds before this command starts executing; must be non-negative. Defaults to 0. + :type delay: (optional) int + :param description: A user-provided description of this command. + :type description: (optional) str + :param when: If false, the execution of the command is skipped. Defaults to true. + :type when: (optional) bool + :param align: + :type align: (optional) ask_sdk_model.interfaces.alexa.presentation.apl.align.Align + :param component_id: The id of the component. + :type component_id: (optional) str + :param index: The 0-based index of the child to display. + :type index: (optional) int + """ + self.__discriminator_value = "ScrollToIndex" # type: str + + self.object_type = self.__discriminator_value + super(ScrollToIndexCommand, self).__init__(object_type=self.__discriminator_value, delay=delay, description=description, when=when) + self.align = align + self.component_id = component_id + self.index = index + + def to_dict(self): + # type: () -> Dict[str, object] + """Returns the model properties as a dict""" + result = {} # type: Dict + + for attr, _ in six.iteritems(self.deserialized_types): + value = getattr(self, attr) + if isinstance(value, list): + result[attr] = list(map( + lambda x: x.to_dict() if hasattr(x, "to_dict") else + x.value if isinstance(x, Enum) else x, + value + )) + elif isinstance(value, Enum): + result[attr] = value.value + elif hasattr(value, "to_dict"): + result[attr] = value.to_dict() + elif isinstance(value, dict): + result[attr] = dict(map( + lambda item: (item[0], item[1].to_dict()) + if hasattr(item[1], "to_dict") else + (item[0], item[1].value) + if isinstance(item[1], Enum) else item, + value.items() + )) + else: + result[attr] = value + + return result + + def to_str(self): + # type: () -> str + """Returns the string representation of the model""" + return pprint.pformat(self.to_dict()) + + def __repr__(self): + # type: () -> str + """For `print` and `pprint`""" + return self.to_str() + + def __eq__(self, other): + # type: (object) -> bool + """Returns true if both objects are equal""" + if not isinstance(other, ScrollToIndexCommand): + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + # type: (object) -> bool + """Returns true if both objects are not equal""" + return not self == other diff --git a/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/send_event_command.py b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/send_event_command.py new file mode 100644 index 0000000..aa6babe --- /dev/null +++ b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/send_event_command.py @@ -0,0 +1,137 @@ +# coding: utf-8 + +# +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file +# except in compliance with the License. A copy of the License is located at +# +# http://aws.amazon.com/apache2.0/ +# +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for +# the specific language governing permissions and limitations under the License. +# + +import pprint +import re # noqa: F401 +import six +import typing +from enum import Enum +from ask_sdk_model.interfaces.alexa.presentation.apl.command import Command + + +if typing.TYPE_CHECKING: + from typing import Dict, List, Optional + from datetime import datetime + + +class SendEventCommand(Command): + """ + The SendEvent command allows the APL author to generate and send an event to Alexa. + + + :param delay: The delay in milliseconds before this command starts executing; must be non-negative. Defaults to 0. + :type delay: (optional) int + :param description: A user-provided description of this command. + :type description: (optional) str + :param when: If false, the execution of the command is skipped. Defaults to true. + :type when: (optional) bool + :param arguments: An array of argument data to pass to Alexa. + :type arguments: (optional) list[str] + :param components: An array of components to extract value data from and provide to Alexa. + :type components: (optional) list[str] + + """ + deserialized_types = { + 'object_type': 'str', + 'delay': 'int', + 'description': 'str', + 'when': 'bool', + 'arguments': 'list[str]', + 'components': 'list[str]' + } # type: Dict + + attribute_map = { + 'object_type': 'type', + 'delay': 'delay', + 'description': 'description', + 'when': 'when', + 'arguments': 'arguments', + 'components': 'components' +} # type: Dict + + def __init__(self, delay=None, description=None, when=None, arguments=None, components=None): + # type: (Optional[int], Optional[str], Optional[bool], Optional[List[object]], Optional[List[object]]) -> None + """The SendEvent command allows the APL author to generate and send an event to Alexa. + + :param delay: The delay in milliseconds before this command starts executing; must be non-negative. Defaults to 0. + :type delay: (optional) int + :param description: A user-provided description of this command. + :type description: (optional) str + :param when: If false, the execution of the command is skipped. Defaults to true. + :type when: (optional) bool + :param arguments: An array of argument data to pass to Alexa. + :type arguments: (optional) list[str] + :param components: An array of components to extract value data from and provide to Alexa. + :type components: (optional) list[str] + """ + self.__discriminator_value = "SendEvent" # type: str + + self.object_type = self.__discriminator_value + super(SendEventCommand, self).__init__(object_type=self.__discriminator_value, delay=delay, description=description, when=when) + self.arguments = arguments + self.components = components + + def to_dict(self): + # type: () -> Dict[str, object] + """Returns the model properties as a dict""" + result = {} # type: Dict + + for attr, _ in six.iteritems(self.deserialized_types): + value = getattr(self, attr) + if isinstance(value, list): + result[attr] = list(map( + lambda x: x.to_dict() if hasattr(x, "to_dict") else + x.value if isinstance(x, Enum) else x, + value + )) + elif isinstance(value, Enum): + result[attr] = value.value + elif hasattr(value, "to_dict"): + result[attr] = value.to_dict() + elif isinstance(value, dict): + result[attr] = dict(map( + lambda item: (item[0], item[1].to_dict()) + if hasattr(item[1], "to_dict") else + (item[0], item[1].value) + if isinstance(item[1], Enum) else item, + value.items() + )) + else: + result[attr] = value + + return result + + def to_str(self): + # type: () -> str + """Returns the string representation of the model""" + return pprint.pformat(self.to_dict()) + + def __repr__(self): + # type: () -> str + """For `print` and `pprint`""" + return self.to_str() + + def __eq__(self, other): + # type: (object) -> bool + """Returns true if both objects are equal""" + if not isinstance(other, SendEventCommand): + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + # type: (object) -> bool + """Returns true if both objects are not equal""" + return not self == other diff --git a/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/sequential_command.py b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/sequential_command.py new file mode 100644 index 0000000..8be9177 --- /dev/null +++ b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/sequential_command.py @@ -0,0 +1,138 @@ +# coding: utf-8 + +# +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file +# except in compliance with the License. A copy of the License is located at +# +# http://aws.amazon.com/apache2.0/ +# +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for +# the specific language governing permissions and limitations under the License. +# + +import pprint +import re # noqa: F401 +import six +import typing +from enum import Enum +from ask_sdk_model.interfaces.alexa.presentation.apl.command import Command + + +if typing.TYPE_CHECKING: + from typing import Dict, List, Optional + from datetime import datetime + from ask_sdk_model.interfaces.alexa.presentation.apl.command import Command + + +class SequentialCommand(Command): + """ + A sequential command executes a series of commands in order. The sequential command executes the command list in order, waiting for the previous command to finish before executing the next. The sequential command is finished when all of its child commands have finished. When the Sequential command is terminated early, the currently executing command is terminated and no further commands are executed. + + + :param delay: The delay in milliseconds before this command starts executing; must be non-negative. Defaults to 0. + :type delay: (optional) int + :param description: A user-provided description of this command. + :type description: (optional) str + :param when: If false, the execution of the command is skipped. Defaults to true. + :type when: (optional) bool + :param commands: An array of commands to execute. The commands execute in order; each command must finish before the next can begin. Please note that the delay of sequential command and the delay of the first command in the sequence are additive. + :type commands: (optional) list[ask_sdk_model.interfaces.alexa.presentation.apl.command.Command] + :param repeat_count: The number of times to repeat this series of commands. Defaults to 0. Negative values will be ignored. Note that the delay assigned to overall sequential command only applies the first time. For example, in the sample sequential command below the first SendEvent fires at 3000 milliseconds, the second at 5000, the first SendEvent fires again at 7000 milliseconds, and so forth. {\"type\": \"Sequential\",\"delay\": 1000,\"repeatCount\": 2,\"commands\": [{ \"type\": \"SendEvent\",\"delay\": 2000},{\"type\": \"SendEvent\",\"delay\": 2000}]} + :type repeat_count: (optional) int + + """ + deserialized_types = { + 'object_type': 'str', + 'delay': 'int', + 'description': 'str', + 'when': 'bool', + 'commands': 'list[ask_sdk_model.interfaces.alexa.presentation.apl.command.Command]', + 'repeat_count': 'int' + } # type: Dict + + attribute_map = { + 'object_type': 'type', + 'delay': 'delay', + 'description': 'description', + 'when': 'when', + 'commands': 'commands', + 'repeat_count': 'repeatCount' +} # type: Dict + + def __init__(self, delay=None, description=None, when=None, commands=None, repeat_count=None): + # type: (Optional[int], Optional[str], Optional[bool], Optional[List[Command]], Optional[int]) -> None + """A sequential command executes a series of commands in order. The sequential command executes the command list in order, waiting for the previous command to finish before executing the next. The sequential command is finished when all of its child commands have finished. When the Sequential command is terminated early, the currently executing command is terminated and no further commands are executed. + + :param delay: The delay in milliseconds before this command starts executing; must be non-negative. Defaults to 0. + :type delay: (optional) int + :param description: A user-provided description of this command. + :type description: (optional) str + :param when: If false, the execution of the command is skipped. Defaults to true. + :type when: (optional) bool + :param commands: An array of commands to execute. The commands execute in order; each command must finish before the next can begin. Please note that the delay of sequential command and the delay of the first command in the sequence are additive. + :type commands: (optional) list[ask_sdk_model.interfaces.alexa.presentation.apl.command.Command] + :param repeat_count: The number of times to repeat this series of commands. Defaults to 0. Negative values will be ignored. Note that the delay assigned to overall sequential command only applies the first time. For example, in the sample sequential command below the first SendEvent fires at 3000 milliseconds, the second at 5000, the first SendEvent fires again at 7000 milliseconds, and so forth. {\"type\": \"Sequential\",\"delay\": 1000,\"repeatCount\": 2,\"commands\": [{ \"type\": \"SendEvent\",\"delay\": 2000},{\"type\": \"SendEvent\",\"delay\": 2000}]} + :type repeat_count: (optional) int + """ + self.__discriminator_value = "Sequential" # type: str + + self.object_type = self.__discriminator_value + super(SequentialCommand, self).__init__(object_type=self.__discriminator_value, delay=delay, description=description, when=when) + self.commands = commands + self.repeat_count = repeat_count + + def to_dict(self): + # type: () -> Dict[str, object] + """Returns the model properties as a dict""" + result = {} # type: Dict + + for attr, _ in six.iteritems(self.deserialized_types): + value = getattr(self, attr) + if isinstance(value, list): + result[attr] = list(map( + lambda x: x.to_dict() if hasattr(x, "to_dict") else + x.value if isinstance(x, Enum) else x, + value + )) + elif isinstance(value, Enum): + result[attr] = value.value + elif hasattr(value, "to_dict"): + result[attr] = value.to_dict() + elif isinstance(value, dict): + result[attr] = dict(map( + lambda item: (item[0], item[1].to_dict()) + if hasattr(item[1], "to_dict") else + (item[0], item[1].value) + if isinstance(item[1], Enum) else item, + value.items() + )) + else: + result[attr] = value + + return result + + def to_str(self): + # type: () -> str + """Returns the string representation of the model""" + return pprint.pformat(self.to_dict()) + + def __repr__(self): + # type: () -> str + """For `print` and `pprint`""" + return self.to_str() + + def __eq__(self, other): + # type: (object) -> bool + """Returns true if both objects are equal""" + if not isinstance(other, SequentialCommand): + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + # type: (object) -> bool + """Returns true if both objects are not equal""" + return not self == other diff --git a/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/set_page_command.py b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/set_page_command.py index 337d26d..2cb5a04 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/set_page_command.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/set_page_command.py @@ -54,7 +54,7 @@ class SetPageCommand(Command): 'component_id': 'str', 'position': 'ask_sdk_model.interfaces.alexa.presentation.apl.position.Position', 'value': 'int' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -64,7 +64,7 @@ class SetPageCommand(Command): 'component_id': 'componentId', 'position': 'position', 'value': 'value' - } +} # type: Dict def __init__(self, delay=None, description=None, when=None, component_id=None, position=None, value=None): # type: (Optional[int], Optional[str], Optional[bool], Optional[str], Optional[Position], Optional[int]) -> None @@ -83,7 +83,7 @@ def __init__(self, delay=None, description=None, when=None, component_id=None, p :param value: The distance to move. May be an absolute value or a relative value. :type value: (optional) int """ - self.__discriminator_value = "SetPage" + self.__discriminator_value = "SetPage" # type: str self.object_type = self.__discriminator_value super(SetPageCommand, self).__init__(object_type=self.__discriminator_value, delay=delay, description=description, when=when) @@ -94,7 +94,7 @@ def __init__(self, delay=None, description=None, when=None, component_id=None, p def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/set_state_command.py b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/set_state_command.py new file mode 100644 index 0000000..b2a4e3e --- /dev/null +++ b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/set_state_command.py @@ -0,0 +1,145 @@ +# coding: utf-8 + +# +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file +# except in compliance with the License. A copy of the License is located at +# +# http://aws.amazon.com/apache2.0/ +# +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for +# the specific language governing permissions and limitations under the License. +# + +import pprint +import re # noqa: F401 +import six +import typing +from enum import Enum +from ask_sdk_model.interfaces.alexa.presentation.apl.command import Command + + +if typing.TYPE_CHECKING: + from typing import Dict, List, Optional + from datetime import datetime + from ask_sdk_model.interfaces.alexa.presentation.apl.component_state import ComponentState + + +class SetStateCommand(Command): + """ + The SetState command changes one of the component’s state settings. The SetState command can be used to change the checked, disabled, and focused states. The karaoke and pressed states may not be directly set; use the Select command or SpeakItem commands to change those states. Also, note that the focused state may only be set - it can’t be cleared. + + + :param delay: The delay in milliseconds before this command starts executing; must be non-negative. Defaults to 0. + :type delay: (optional) int + :param description: A user-provided description of this command. + :type description: (optional) str + :param when: If false, the execution of the command is skipped. Defaults to true. + :type when: (optional) bool + :param component_id: The id of the component whose value should be set. + :type component_id: (optional) str + :param state: The name of the state to set. Must be one of “checked”, “disabled”, and “focused”. + :type state: (optional) ask_sdk_model.interfaces.alexa.presentation.apl.component_state.ComponentState + :param value: The value to set on the property + :type value: (optional) bool + + """ + deserialized_types = { + 'object_type': 'str', + 'delay': 'int', + 'description': 'str', + 'when': 'bool', + 'component_id': 'str', + 'state': 'ask_sdk_model.interfaces.alexa.presentation.apl.component_state.ComponentState', + 'value': 'bool' + } # type: Dict + + attribute_map = { + 'object_type': 'type', + 'delay': 'delay', + 'description': 'description', + 'when': 'when', + 'component_id': 'componentId', + 'state': 'state', + 'value': 'value' +} # type: Dict + + def __init__(self, delay=None, description=None, when=None, component_id=None, state=None, value=None): + # type: (Optional[int], Optional[str], Optional[bool], Optional[str], Optional[ComponentState], Optional[bool]) -> None + """The SetState command changes one of the component’s state settings. The SetState command can be used to change the checked, disabled, and focused states. The karaoke and pressed states may not be directly set; use the Select command or SpeakItem commands to change those states. Also, note that the focused state may only be set - it can’t be cleared. + + :param delay: The delay in milliseconds before this command starts executing; must be non-negative. Defaults to 0. + :type delay: (optional) int + :param description: A user-provided description of this command. + :type description: (optional) str + :param when: If false, the execution of the command is skipped. Defaults to true. + :type when: (optional) bool + :param component_id: The id of the component whose value should be set. + :type component_id: (optional) str + :param state: The name of the state to set. Must be one of “checked”, “disabled”, and “focused”. + :type state: (optional) ask_sdk_model.interfaces.alexa.presentation.apl.component_state.ComponentState + :param value: The value to set on the property + :type value: (optional) bool + """ + self.__discriminator_value = "SetState" # type: str + + self.object_type = self.__discriminator_value + super(SetStateCommand, self).__init__(object_type=self.__discriminator_value, delay=delay, description=description, when=when) + self.component_id = component_id + self.state = state + self.value = value + + def to_dict(self): + # type: () -> Dict[str, object] + """Returns the model properties as a dict""" + result = {} # type: Dict + + for attr, _ in six.iteritems(self.deserialized_types): + value = getattr(self, attr) + if isinstance(value, list): + result[attr] = list(map( + lambda x: x.to_dict() if hasattr(x, "to_dict") else + x.value if isinstance(x, Enum) else x, + value + )) + elif isinstance(value, Enum): + result[attr] = value.value + elif hasattr(value, "to_dict"): + result[attr] = value.to_dict() + elif isinstance(value, dict): + result[attr] = dict(map( + lambda item: (item[0], item[1].to_dict()) + if hasattr(item[1], "to_dict") else + (item[0], item[1].value) + if isinstance(item[1], Enum) else item, + value.items() + )) + else: + result[attr] = value + + return result + + def to_str(self): + # type: () -> str + """Returns the string representation of the model""" + return pprint.pformat(self.to_dict()) + + def __repr__(self): + # type: () -> str + """For `print` and `pprint`""" + return self.to_str() + + def __eq__(self, other): + # type: (object) -> bool + """Returns true if both objects are equal""" + if not isinstance(other, SetStateCommand): + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + # type: (object) -> bool + """Returns true if both objects are not equal""" + return not self == other diff --git a/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/speak_item_command.py b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/speak_item_command.py index 413e751..2d5da8b 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/speak_item_command.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/speak_item_command.py @@ -58,7 +58,7 @@ class SpeakItemCommand(Command): 'component_id': 'str', 'highlight_mode': 'ask_sdk_model.interfaces.alexa.presentation.apl.highlight_mode.HighlightMode', 'minimum_dwell_time': 'int' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -69,7 +69,7 @@ class SpeakItemCommand(Command): 'component_id': 'componentId', 'highlight_mode': 'highlightMode', 'minimum_dwell_time': 'minimumDwellTime' - } +} # type: Dict def __init__(self, delay=None, description=None, when=None, align=None, component_id=None, highlight_mode=None, minimum_dwell_time=None): # type: (Optional[int], Optional[str], Optional[bool], Optional[Align], Optional[str], Optional[HighlightMode], Optional[int]) -> None @@ -90,7 +90,7 @@ def __init__(self, delay=None, description=None, when=None, align=None, componen :param minimum_dwell_time: The minimum number of milliseconds that an item should be highlighted for. Defaults to 0. :type minimum_dwell_time: (optional) int """ - self.__discriminator_value = "SpeakItem" + self.__discriminator_value = "SpeakItem" # type: str self.object_type = self.__discriminator_value super(SpeakItemCommand, self).__init__(object_type=self.__discriminator_value, delay=delay, description=description, when=when) @@ -102,7 +102,7 @@ def __init__(self, delay=None, description=None, when=None, align=None, componen def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/speak_list_command.py b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/speak_list_command.py new file mode 100644 index 0000000..8b90ebd --- /dev/null +++ b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/speak_list_command.py @@ -0,0 +1,159 @@ +# coding: utf-8 + +# +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file +# except in compliance with the License. A copy of the License is located at +# +# http://aws.amazon.com/apache2.0/ +# +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for +# the specific language governing permissions and limitations under the License. +# + +import pprint +import re # noqa: F401 +import six +import typing +from enum import Enum +from ask_sdk_model.interfaces.alexa.presentation.apl.command import Command + + +if typing.TYPE_CHECKING: + from typing import Dict, List, Optional + from datetime import datetime + from ask_sdk_model.interfaces.alexa.presentation.apl.align import Align + + +class SpeakListCommand(Command): + """ + Read the contents of a range of items inside a common container. Each item will scroll into view before speech. Each item should have a speech property, but it is not required. + + + :param delay: The delay in milliseconds before this command starts executing; must be non-negative. Defaults to 0. + :type delay: (optional) int + :param description: A user-provided description of this command. + :type description: (optional) str + :param when: If false, the execution of the command is skipped. Defaults to true. + :type when: (optional) bool + :param align: + :type align: (optional) ask_sdk_model.interfaces.alexa.presentation.apl.align.Align + :param component_id: The id of the component to read. + :type component_id: (optional) str + :param count: The number of items to speak + :type count: (optional) int + :param minimum_dwell_time: The minimum number of milliseconds that an item will be highlighted for. Defaults to 0. + :type minimum_dwell_time: (optional) int + :param start: The 0-based index of the first item to speak + :type start: (optional) int + + """ + deserialized_types = { + 'object_type': 'str', + 'delay': 'int', + 'description': 'str', + 'when': 'bool', + 'align': 'ask_sdk_model.interfaces.alexa.presentation.apl.align.Align', + 'component_id': 'str', + 'count': 'int', + 'minimum_dwell_time': 'int', + 'start': 'int' + } # type: Dict + + attribute_map = { + 'object_type': 'type', + 'delay': 'delay', + 'description': 'description', + 'when': 'when', + 'align': 'align', + 'component_id': 'componentId', + 'count': 'count', + 'minimum_dwell_time': 'minimumDwellTime', + 'start': 'start' +} # type: Dict + + def __init__(self, delay=None, description=None, when=None, align=None, component_id=None, count=None, minimum_dwell_time=None, start=None): + # type: (Optional[int], Optional[str], Optional[bool], Optional[Align], Optional[str], Optional[int], Optional[int], Optional[int]) -> None + """Read the contents of a range of items inside a common container. Each item will scroll into view before speech. Each item should have a speech property, but it is not required. + + :param delay: The delay in milliseconds before this command starts executing; must be non-negative. Defaults to 0. + :type delay: (optional) int + :param description: A user-provided description of this command. + :type description: (optional) str + :param when: If false, the execution of the command is skipped. Defaults to true. + :type when: (optional) bool + :param align: + :type align: (optional) ask_sdk_model.interfaces.alexa.presentation.apl.align.Align + :param component_id: The id of the component to read. + :type component_id: (optional) str + :param count: The number of items to speak + :type count: (optional) int + :param minimum_dwell_time: The minimum number of milliseconds that an item will be highlighted for. Defaults to 0. + :type minimum_dwell_time: (optional) int + :param start: The 0-based index of the first item to speak + :type start: (optional) int + """ + self.__discriminator_value = "SpeakList" # type: str + + self.object_type = self.__discriminator_value + super(SpeakListCommand, self).__init__(object_type=self.__discriminator_value, delay=delay, description=description, when=when) + self.align = align + self.component_id = component_id + self.count = count + self.minimum_dwell_time = minimum_dwell_time + self.start = start + + def to_dict(self): + # type: () -> Dict[str, object] + """Returns the model properties as a dict""" + result = {} # type: Dict + + for attr, _ in six.iteritems(self.deserialized_types): + value = getattr(self, attr) + if isinstance(value, list): + result[attr] = list(map( + lambda x: x.to_dict() if hasattr(x, "to_dict") else + x.value if isinstance(x, Enum) else x, + value + )) + elif isinstance(value, Enum): + result[attr] = value.value + elif hasattr(value, "to_dict"): + result[attr] = value.to_dict() + elif isinstance(value, dict): + result[attr] = dict(map( + lambda item: (item[0], item[1].to_dict()) + if hasattr(item[1], "to_dict") else + (item[0], item[1].value) + if isinstance(item[1], Enum) else item, + value.items() + )) + else: + result[attr] = value + + return result + + def to_str(self): + # type: () -> str + """Returns the string representation of the model""" + return pprint.pformat(self.to_dict()) + + def __repr__(self): + # type: () -> str + """For `print` and `pprint`""" + return self.to_str() + + def __eq__(self, other): + # type: (object) -> bool + """Returns true if both objects are equal""" + if not isinstance(other, SpeakListCommand): + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + # type: (object) -> bool + """Returns true if both objects are not equal""" + return not self == other diff --git a/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/user_event.py b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/user_event.py index 05297e4..3fabf8d 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/user_event.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/user_event.py @@ -54,7 +54,7 @@ class UserEvent(Request): 'arguments': 'list[object]', 'source': 'object', 'components': 'object' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -65,7 +65,7 @@ class UserEvent(Request): 'arguments': 'arguments', 'source': 'source', 'components': 'components' - } +} # type: Dict def __init__(self, request_id=None, timestamp=None, locale=None, token=None, arguments=None, source=None, components=None): # type: (Optional[str], Optional[datetime], Optional[str], Optional[str], Optional[List[object]], Optional[object], Optional[object]) -> None @@ -86,7 +86,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, token=None, arg :param components: Components associated with the request. :type components: (optional) object """ - self.__discriminator_value = "Alexa.Presentation.APL.UserEvent" + self.__discriminator_value = "Alexa.Presentation.APL.UserEvent" # type: str self.object_type = self.__discriminator_value super(UserEvent, self).__init__(object_type=self.__discriminator_value, request_id=request_id, timestamp=timestamp, locale=locale) @@ -98,7 +98,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, token=None, arg def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/video_source.py b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/video_source.py new file mode 100644 index 0000000..4231081 --- /dev/null +++ b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/apl/video_source.py @@ -0,0 +1,135 @@ +# coding: utf-8 + +# +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file +# except in compliance with the License. A copy of the License is located at +# +# http://aws.amazon.com/apache2.0/ +# +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for +# the specific language governing permissions and limitations under the License. +# + +import pprint +import re # noqa: F401 +import six +import typing +from enum import Enum + + +if typing.TYPE_CHECKING: + from typing import Dict, List, Optional + from datetime import datetime + + +class VideoSource(object): + """ + The source property holds the video clip or sequence of video clips to play. + + + :param description: Optional description of this source material + :type description: (optional) str + :param duration: Duration of time to play. If not set, defaults to the entire stream. Expressed in milliseconds. + :type duration: (optional) int + :param url: Media source material + :type url: (optional) str + :param repeat_count: Number of times to loop the video. Defaults to 0. + :type repeat_count: (optional) int + :param offset: Offset to start playing at in the stream (defaults to 0). + :type offset: (optional) int + + """ + deserialized_types = { + 'description': 'str', + 'duration': 'int', + 'url': 'str', + 'repeat_count': 'int', + 'offset': 'int' + } # type: Dict + + attribute_map = { + 'description': 'description', + 'duration': 'duration', + 'url': 'url', + 'repeat_count': 'repeatCount', + 'offset': 'offset' +} # type: Dict + + def __init__(self, description=None, duration=None, url=None, repeat_count=None, offset=None): + # type: (Optional[str], Optional[int], Optional[str], Optional[int], Optional[int]) -> None + """The source property holds the video clip or sequence of video clips to play. + + :param description: Optional description of this source material + :type description: (optional) str + :param duration: Duration of time to play. If not set, defaults to the entire stream. Expressed in milliseconds. + :type duration: (optional) int + :param url: Media source material + :type url: (optional) str + :param repeat_count: Number of times to loop the video. Defaults to 0. + :type repeat_count: (optional) int + :param offset: Offset to start playing at in the stream (defaults to 0). + :type offset: (optional) int + """ + self.__discriminator_value = None # type: str + + self.description = description + self.duration = duration + self.url = url + self.repeat_count = repeat_count + self.offset = offset + + def to_dict(self): + # type: () -> Dict[str, object] + """Returns the model properties as a dict""" + result = {} # type: Dict + + for attr, _ in six.iteritems(self.deserialized_types): + value = getattr(self, attr) + if isinstance(value, list): + result[attr] = list(map( + lambda x: x.to_dict() if hasattr(x, "to_dict") else + x.value if isinstance(x, Enum) else x, + value + )) + elif isinstance(value, Enum): + result[attr] = value.value + elif hasattr(value, "to_dict"): + result[attr] = value.to_dict() + elif isinstance(value, dict): + result[attr] = dict(map( + lambda item: (item[0], item[1].to_dict()) + if hasattr(item[1], "to_dict") else + (item[0], item[1].value) + if isinstance(item[1], Enum) else item, + value.items() + )) + else: + result[attr] = value + + return result + + def to_str(self): + # type: () -> str + """Returns the string representation of the model""" + return pprint.pformat(self.to_dict()) + + def __repr__(self): + # type: () -> str + """For `print` and `pprint`""" + return self.to_str() + + def __eq__(self, other): + # type: (object) -> bool + """Returns true if both objects are equal""" + if not isinstance(other, VideoSource): + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + # type: (object) -> bool + """Returns true if both objects are not equal""" + return not self == other diff --git a/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/py.typed b/ask-sdk-model/ask_sdk_model/interfaces/alexa/presentation/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/interfaces/alexa/py.typed b/ask-sdk-model/ask_sdk_model/interfaces/alexa/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/py.typed b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/request/authorize_attributes.py b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/request/authorize_attributes.py index aa8cfe1..08d0bcd 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/request/authorize_attributes.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/request/authorize_attributes.py @@ -54,7 +54,7 @@ class AuthorizeAttributes(BaseAmazonPayEntity): 'soft_descriptor': 'str', 'object_type': 'str', 'version': 'str' - } + } # type: Dict attribute_map = { 'authorization_reference_id': 'authorizationReferenceId', @@ -64,7 +64,7 @@ class AuthorizeAttributes(BaseAmazonPayEntity): 'soft_descriptor': 'softDescriptor', 'object_type': '@type', 'version': '@version' - } +} # type: Dict def __init__(self, authorization_reference_id=None, authorization_amount=None, transaction_timeout=None, seller_authorization_note=None, soft_descriptor=None, version=None): # type: (Optional[str], Optional[Price], Optional[int], Optional[str], Optional[str], Optional[str]) -> None @@ -83,7 +83,7 @@ def __init__(self, authorization_reference_id=None, authorization_amount=None, t :param version: Version of the Amazon Pay Entity. Can be 2 or greater. :type version: (optional) str """ - self.__discriminator_value = "AuthorizeAttributes" + self.__discriminator_value = "AuthorizeAttributes" # type: str self.object_type = self.__discriminator_value super(AuthorizeAttributes, self).__init__(object_type=self.__discriminator_value, version=version) @@ -96,7 +96,7 @@ def __init__(self, authorization_reference_id=None, authorization_amount=None, t def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/request/base_amazon_pay_entity.py b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/request/base_amazon_pay_entity.py index 98879e0..94a621e 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/request/base_amazon_pay_entity.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/request/base_amazon_pay_entity.py @@ -61,12 +61,12 @@ class BaseAmazonPayEntity(object): deserialized_types = { 'object_type': 'str', 'version': 'str' - } + } # type: Dict attribute_map = { 'object_type': '@type', 'version': '@version' - } +} # type: Dict discriminator_value_class_map = { 'AuthorizeAttributes': 'ask_sdk_model.interfaces.amazonpay.model.request.authorize_attributes.AuthorizeAttributes', @@ -94,14 +94,14 @@ def __init__(self, object_type=None, version=None): :param version: Version of the Amazon Pay Entity. Can be 2 or greater. :type version: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.object_type = object_type self.version = version @classmethod def get_real_child_model(cls, data): - # type: (Dict[str, str]) -> str + # type: (Dict[str, str]) -> Optional[str] """Returns the real base class specified by the discriminator""" discriminator_value = data[cls.json_discriminator_key] return cls.discriminator_value_class_map.get(discriminator_value) @@ -109,7 +109,7 @@ def get_real_child_model(cls, data): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/request/billing_agreement_attributes.py b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/request/billing_agreement_attributes.py index e935bda..989578e 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/request/billing_agreement_attributes.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/request/billing_agreement_attributes.py @@ -48,7 +48,7 @@ class BillingAgreementAttributes(BaseAmazonPayEntity): 'seller_billing_agreement_attributes': 'ask_sdk_model.interfaces.amazonpay.model.request.seller_billing_agreement_attributes.SellerBillingAgreementAttributes', 'object_type': 'str', 'version': 'str' - } + } # type: Dict attribute_map = { 'platform_id': 'platformId', @@ -56,7 +56,7 @@ class BillingAgreementAttributes(BaseAmazonPayEntity): 'seller_billing_agreement_attributes': 'sellerBillingAgreementAttributes', 'object_type': '@type', 'version': '@version' - } +} # type: Dict def __init__(self, platform_id=None, seller_note=None, seller_billing_agreement_attributes=None, version=None): # type: (Optional[str], Optional[str], Optional[SellerBillingAgreementAttributes], Optional[str]) -> None @@ -71,7 +71,7 @@ def __init__(self, platform_id=None, seller_note=None, seller_billing_agreement_ :param version: Version of the Amazon Pay Entity. Can be 2 or greater. :type version: (optional) str """ - self.__discriminator_value = "BillingAgreementAttributes" + self.__discriminator_value = "BillingAgreementAttributes" # type: str self.object_type = self.__discriminator_value super(BillingAgreementAttributes, self).__init__(object_type=self.__discriminator_value, version=version) @@ -82,7 +82,7 @@ def __init__(self, platform_id=None, seller_note=None, seller_billing_agreement_ def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/request/price.py b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/request/price.py index 99fb7ea..5c540bc 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/request/price.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/request/price.py @@ -44,14 +44,14 @@ class Price(BaseAmazonPayEntity): 'currency_code': 'str', 'object_type': 'str', 'version': 'str' - } + } # type: Dict attribute_map = { 'amount': 'amount', 'currency_code': 'currencyCode', 'object_type': '@type', 'version': '@version' - } +} # type: Dict def __init__(self, amount=None, currency_code=None, version=None): # type: (Optional[str], Optional[str], Optional[str]) -> None @@ -64,7 +64,7 @@ def __init__(self, amount=None, currency_code=None, version=None): :param version: Version of the Amazon Pay Entity. Can be 2 or greater. :type version: (optional) str """ - self.__discriminator_value = "Price" + self.__discriminator_value = "Price" # type: str self.object_type = self.__discriminator_value super(Price, self).__init__(object_type=self.__discriminator_value, version=version) @@ -74,7 +74,7 @@ def __init__(self, amount=None, currency_code=None, version=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/request/provider_attributes.py b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/request/provider_attributes.py index 86b9c37..b5d4e22 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/request/provider_attributes.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/request/provider_attributes.py @@ -45,14 +45,14 @@ class ProviderAttributes(BaseAmazonPayEntity): 'provider_credit_list': 'list[ask_sdk_model.interfaces.amazonpay.model.request.provider_credit.ProviderCredit]', 'object_type': 'str', 'version': 'str' - } + } # type: Dict attribute_map = { 'provider_id': 'providerId', 'provider_credit_list': 'providerCreditList', 'object_type': '@type', 'version': '@version' - } +} # type: Dict def __init__(self, provider_id=None, provider_credit_list=None, version=None): # type: (Optional[str], Optional[List[ProviderCredit]], Optional[str]) -> None @@ -65,7 +65,7 @@ def __init__(self, provider_id=None, provider_credit_list=None, version=None): :param version: Version of the Amazon Pay Entity. Can be 2 or greater. :type version: (optional) str """ - self.__discriminator_value = "ProviderAttributes" + self.__discriminator_value = "ProviderAttributes" # type: str self.object_type = self.__discriminator_value super(ProviderAttributes, self).__init__(object_type=self.__discriminator_value, version=version) @@ -75,7 +75,7 @@ def __init__(self, provider_id=None, provider_credit_list=None, version=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/request/provider_credit.py b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/request/provider_credit.py index b2daee8..4db8f01 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/request/provider_credit.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/request/provider_credit.py @@ -43,14 +43,14 @@ class ProviderCredit(BaseAmazonPayEntity): 'credit': 'ask_sdk_model.interfaces.amazonpay.model.request.price.Price', 'object_type': 'str', 'version': 'str' - } + } # type: Dict attribute_map = { 'provider_id': 'providerId', 'credit': 'credit', 'object_type': '@type', 'version': '@version' - } +} # type: Dict def __init__(self, provider_id=None, credit=None, version=None): # type: (Optional[str], Optional[Price], Optional[str]) -> None @@ -63,7 +63,7 @@ def __init__(self, provider_id=None, credit=None, version=None): :param version: Version of the Amazon Pay Entity. Can be 2 or greater. :type version: (optional) str """ - self.__discriminator_value = "ProviderCredit" + self.__discriminator_value = "ProviderCredit" # type: str self.object_type = self.__discriminator_value super(ProviderCredit, self).__init__(object_type=self.__discriminator_value, version=version) @@ -73,7 +73,7 @@ def __init__(self, provider_id=None, credit=None, version=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/request/py.typed b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/request/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/request/seller_billing_agreement_attributes.py b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/request/seller_billing_agreement_attributes.py index 56eb792..dae53ff 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/request/seller_billing_agreement_attributes.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/request/seller_billing_agreement_attributes.py @@ -47,7 +47,7 @@ class SellerBillingAgreementAttributes(BaseAmazonPayEntity): 'custom_information': 'str', 'object_type': 'str', 'version': 'str' - } + } # type: Dict attribute_map = { 'seller_billing_agreement_id': 'sellerBillingAgreementId', @@ -55,7 +55,7 @@ class SellerBillingAgreementAttributes(BaseAmazonPayEntity): 'custom_information': 'customInformation', 'object_type': '@type', 'version': '@version' - } +} # type: Dict def __init__(self, seller_billing_agreement_id=None, store_name=None, custom_information=None, version=None): # type: (Optional[str], Optional[str], Optional[str], Optional[str]) -> None @@ -70,7 +70,7 @@ def __init__(self, seller_billing_agreement_id=None, store_name=None, custom_inf :param version: Version of the Amazon Pay Entity. Can be 2 or greater. :type version: (optional) str """ - self.__discriminator_value = "SellerBillingAgreementAttributes" + self.__discriminator_value = "SellerBillingAgreementAttributes" # type: str self.object_type = self.__discriminator_value super(SellerBillingAgreementAttributes, self).__init__(object_type=self.__discriminator_value, version=version) @@ -81,7 +81,7 @@ def __init__(self, seller_billing_agreement_id=None, store_name=None, custom_inf def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/request/seller_order_attributes.py b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/request/seller_order_attributes.py index 0f7ea16..054578d 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/request/seller_order_attributes.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/request/seller_order_attributes.py @@ -50,7 +50,7 @@ class SellerOrderAttributes(BaseAmazonPayEntity): 'seller_note': 'str', 'object_type': 'str', 'version': 'str' - } + } # type: Dict attribute_map = { 'seller_order_id': 'sellerOrderId', @@ -59,7 +59,7 @@ class SellerOrderAttributes(BaseAmazonPayEntity): 'seller_note': 'sellerNote', 'object_type': '@type', 'version': '@version' - } +} # type: Dict def __init__(self, seller_order_id=None, store_name=None, custom_information=None, seller_note=None, version=None): # type: (Optional[str], Optional[str], Optional[str], Optional[str], Optional[str]) -> None @@ -76,7 +76,7 @@ def __init__(self, seller_order_id=None, store_name=None, custom_information=Non :param version: Version of the Amazon Pay Entity. Can be 2 or greater. :type version: (optional) str """ - self.__discriminator_value = "SellerOrderAttributes" + self.__discriminator_value = "SellerOrderAttributes" # type: str self.object_type = self.__discriminator_value super(SellerOrderAttributes, self).__init__(object_type=self.__discriminator_value, version=version) @@ -88,7 +88,7 @@ def __init__(self, seller_order_id=None, store_name=None, custom_information=Non def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/response/authorization_details.py b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/response/authorization_details.py index a6145fe..2e5fef8 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/response/authorization_details.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/response/authorization_details.py @@ -79,7 +79,7 @@ class AuthorizationDetails(AuthorizationDetails): 'capture_now': 'bool', 'soft_descriptor': 'str', 'authorization_billing_address': 'ask_sdk_model.interfaces.amazonpay.model.response.destination.Destination' - } + } # type: Dict attribute_map = { 'amazon_authorization_id': 'amazonAuthorizationId', @@ -96,7 +96,7 @@ class AuthorizationDetails(AuthorizationDetails): 'capture_now': 'captureNow', 'soft_descriptor': 'softDescriptor', 'authorization_billing_address': 'authorizationBillingAddress' - } +} # type: Dict def __init__(self, amazon_authorization_id=None, authorization_reference_id=None, seller_authorization_note=None, authorization_amount=None, captured_amount=None, authorization_fee=None, id_list=None, creation_timestamp=None, expiration_timestamp=None, authorization_status=None, soft_decline=None, capture_now=None, soft_descriptor=None, authorization_billing_address=None): # type: (Optional[str], Optional[str], Optional[str], Optional[Price], Optional[Price], Optional[Price], Optional[List[object]], Optional[datetime], Optional[datetime], Optional[AuthorizationStatus], Optional[bool], Optional[bool], Optional[str], Optional[Destination]) -> None @@ -131,7 +131,7 @@ def __init__(self, amazon_authorization_id=None, authorization_reference_id=None :param authorization_billing_address: :type authorization_billing_address: (optional) ask_sdk_model.interfaces.amazonpay.model.response.destination.Destination """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str super(AuthorizationDetails, self).__init__(amazon_authorization_id=amazon_authorization_id, authorization_reference_id=authorization_reference_id, seller_authorization_note=seller_authorization_note, authorization_amount=authorization_amount, captured_amount=captured_amount, authorization_fee=authorization_fee, id_list=id_list, creation_timestamp=creation_timestamp, expiration_timestamp=expiration_timestamp, authorization_status=authorization_status, soft_decline=soft_decline, capture_now=capture_now, soft_descriptor=soft_descriptor) self.authorization_amount = authorization_amount @@ -143,7 +143,7 @@ def __init__(self, amazon_authorization_id=None, authorization_reference_id=None def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/response/authorization_status.py b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/response/authorization_status.py index 9077d1a..c99c6b0 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/response/authorization_status.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/response/authorization_status.py @@ -47,14 +47,14 @@ class AuthorizationStatus(AuthorizationStatus): 'reason_code': 'str', 'reason_description': 'str', 'last_update_timestamp': 'datetime' - } + } # type: Dict attribute_map = { 'state': 'state', 'reason_code': 'reasonCode', 'reason_description': 'reasonDescription', 'last_update_timestamp': 'lastUpdateTimestamp' - } +} # type: Dict def __init__(self, state=None, reason_code=None, reason_description=None, last_update_timestamp=None): # type: (Optional[State], Optional[str], Optional[str], Optional[datetime]) -> None @@ -69,7 +69,7 @@ def __init__(self, state=None, reason_code=None, reason_description=None, last_u :param last_update_timestamp: A timestamp that indicates the time when the authorization, capture, or refund state was last updated. In ISO 8601 format :type last_update_timestamp: (optional) datetime """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str super(AuthorizationStatus, self).__init__(state=state, reason_code=reason_code, reason_description=reason_description, last_update_timestamp=last_update_timestamp) self.state = state @@ -77,7 +77,7 @@ def __init__(self, state=None, reason_code=None, reason_description=None, last_u def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/response/billing_agreement_details.py b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/response/billing_agreement_details.py index 7b68892..6b8e1d8 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/response/billing_agreement_details.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/response/billing_agreement_details.py @@ -59,7 +59,7 @@ class BillingAgreementDetails(BillingAgreementDetails): 'release_environment': 'ask_sdk_model.interfaces.amazonpay.model.response.release_environment.ReleaseEnvironment', 'billing_agreement_status': 'ask_sdk_model.interfaces.amazonpay.model.v1.billing_agreement_status.BillingAgreementStatus', 'billing_address': 'ask_sdk_model.interfaces.amazonpay.model.response.destination.Destination' - } + } # type: Dict attribute_map = { 'billing_agreement_id': 'billingAgreementId', @@ -69,7 +69,7 @@ class BillingAgreementDetails(BillingAgreementDetails): 'release_environment': 'releaseEnvironment', 'billing_agreement_status': 'billingAgreementStatus', 'billing_address': 'billingAddress' - } +} # type: Dict def __init__(self, billing_agreement_id=None, creation_timestamp=None, destination=None, checkout_language=None, release_environment=None, billing_agreement_status=None, billing_address=None): # type: (Optional[str], Optional[datetime], Optional[Destination], Optional[str], Optional[ReleaseEnvironment], Optional[BillingAgreementStatus], Optional[Destination]) -> None @@ -90,7 +90,7 @@ def __init__(self, billing_agreement_id=None, creation_timestamp=None, destinati :param billing_address: :type billing_address: (optional) ask_sdk_model.interfaces.amazonpay.model.response.destination.Destination """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str super(BillingAgreementDetails, self).__init__(billing_agreement_id=billing_agreement_id, creation_timestamp=creation_timestamp, destination=destination, checkout_language=checkout_language, release_environment=release_environment, billing_agreement_status=billing_agreement_status) self.release_environment = release_environment @@ -99,7 +99,7 @@ def __init__(self, billing_agreement_id=None, creation_timestamp=None, destinati def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/response/destination.py b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/response/destination.py index 289f3e4..f1466dc 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/response/destination.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/response/destination.py @@ -67,7 +67,7 @@ class Destination(Destination): 'postal_code': 'str', 'country_code': 'str', 'phone': 'str' - } + } # type: Dict attribute_map = { 'name': 'name', @@ -81,7 +81,7 @@ class Destination(Destination): 'postal_code': 'postalCode', 'country_code': 'countryCode', 'phone': 'phone' - } +} # type: Dict def __init__(self, name=None, company_name=None, address_line1=None, address_line2=None, address_line3=None, city=None, district_or_county=None, state_or_region=None, postal_code=None, country_code=None, phone=None): # type: (Optional[str], Optional[str], Optional[str], Optional[str], Optional[str], Optional[str], Optional[str], Optional[str], Optional[str], Optional[str], Optional[str]) -> None @@ -110,14 +110,14 @@ def __init__(self, name=None, company_name=None, address_line1=None, address_lin :param phone: The phone number :type phone: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str super(Destination, self).__init__(name=name, company_name=company_name, address_line1=address_line1, address_line2=address_line2, address_line3=address_line3, city=city, district_or_county=district_or_county, state_or_region=state_or_region, postal_code=postal_code, country_code=country_code, phone=phone) def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/response/price.py b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/response/price.py index 78e8314..642844d 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/response/price.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/response/price.py @@ -40,12 +40,12 @@ class Price(Price): deserialized_types = { 'amount': 'str', 'currency_code': 'str' - } + } # type: Dict attribute_map = { 'amount': 'amount', 'currency_code': 'currencyCode' - } +} # type: Dict def __init__(self, amount=None, currency_code=None): # type: (Optional[str], Optional[str]) -> None @@ -56,14 +56,14 @@ def __init__(self, amount=None, currency_code=None): :param currency_code: Currency code for the amount. :type currency_code: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str super(Price, self).__init__(amount=amount, currency_code=currency_code) def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/response/py.typed b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/response/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/authorization_details.py b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/authorization_details.py index ef8171f..3afa061 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/authorization_details.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/authorization_details.py @@ -74,7 +74,7 @@ class AuthorizationDetails(object): 'soft_decline': 'bool', 'capture_now': 'bool', 'soft_descriptor': 'str' - } + } # type: Dict attribute_map = { 'amazon_authorization_id': 'amazonAuthorizationId', @@ -90,7 +90,7 @@ class AuthorizationDetails(object): 'soft_decline': 'softDecline', 'capture_now': 'captureNow', 'soft_descriptor': 'softDescriptor' - } +} # type: Dict def __init__(self, amazon_authorization_id=None, authorization_reference_id=None, seller_authorization_note=None, authorization_amount=None, captured_amount=None, authorization_fee=None, id_list=None, creation_timestamp=None, expiration_timestamp=None, authorization_status=None, soft_decline=None, capture_now=None, soft_descriptor=None): # type: (Optional[str], Optional[str], Optional[str], Optional[Price], Optional[Price], Optional[Price], Optional[List[object]], Optional[datetime], Optional[datetime], Optional[AuthorizationStatus], Optional[bool], Optional[bool], Optional[str]) -> None @@ -123,7 +123,7 @@ def __init__(self, amazon_authorization_id=None, authorization_reference_id=None :param soft_descriptor: This is the description to be shown on the buyer's payment instrument statement if AuthorizeAndCapture was chosen. :type soft_descriptor: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.amazon_authorization_id = amazon_authorization_id self.authorization_reference_id = authorization_reference_id @@ -142,7 +142,7 @@ def __init__(self, amazon_authorization_id=None, authorization_reference_id=None def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/authorization_status.py b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/authorization_status.py index ddaaae1..f92d946 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/authorization_status.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/authorization_status.py @@ -46,14 +46,14 @@ class AuthorizationStatus(object): 'reason_code': 'str', 'reason_description': 'str', 'last_update_timestamp': 'datetime' - } + } # type: Dict attribute_map = { 'state': 'state', 'reason_code': 'reasonCode', 'reason_description': 'reasonDescription', 'last_update_timestamp': 'lastUpdateTimestamp' - } +} # type: Dict def __init__(self, state=None, reason_code=None, reason_description=None, last_update_timestamp=None): # type: (Optional[State], Optional[str], Optional[str], Optional[datetime]) -> None @@ -68,7 +68,7 @@ def __init__(self, state=None, reason_code=None, reason_description=None, last_u :param last_update_timestamp: A timestamp that indicates the time when the authorization, capture, or refund state was last updated. In ISO 8601 format :type last_update_timestamp: (optional) datetime """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.state = state self.reason_code = reason_code @@ -78,7 +78,7 @@ def __init__(self, state=None, reason_code=None, reason_description=None, last_u def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/authorize_attributes.py b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/authorize_attributes.py index 14a060d..3407fa7 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/authorize_attributes.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/authorize_attributes.py @@ -49,7 +49,7 @@ class AuthorizeAttributes(object): 'transaction_timeout': 'int', 'seller_authorization_note': 'str', 'soft_descriptor': 'str' - } + } # type: Dict attribute_map = { 'authorization_reference_id': 'authorizationReferenceId', @@ -57,7 +57,7 @@ class AuthorizeAttributes(object): 'transaction_timeout': 'transactionTimeout', 'seller_authorization_note': 'sellerAuthorizationNote', 'soft_descriptor': 'softDescriptor' - } +} # type: Dict def __init__(self, authorization_reference_id=None, authorization_amount=None, transaction_timeout=None, seller_authorization_note=None, soft_descriptor=None): # type: (Optional[str], Optional[Price], Optional[int], Optional[str], Optional[str]) -> None @@ -74,7 +74,7 @@ def __init__(self, authorization_reference_id=None, authorization_amount=None, t :param soft_descriptor: The description to be shown on the user's payment instrument statement if AuthorizeAndCapture is chosen. Format of soft descriptor sent to the payment processor is \"AMZ* <soft descriptor specified here>\". Default is \"AMZ*<SELLER_NAME> amzn.com/ pmts WA\". Maximum length can be 16 characters. :type soft_descriptor: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.authorization_reference_id = authorization_reference_id self.authorization_amount = authorization_amount @@ -85,7 +85,7 @@ def __init__(self, authorization_reference_id=None, authorization_amount=None, t def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/billing_agreement_attributes.py b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/billing_agreement_attributes.py index c578acf..9d94cc3 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/billing_agreement_attributes.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/billing_agreement_attributes.py @@ -43,13 +43,13 @@ class BillingAgreementAttributes(object): 'platform_id': 'str', 'seller_note': 'str', 'seller_billing_agreement_attributes': 'ask_sdk_model.interfaces.amazonpay.model.v1.seller_billing_agreement_attributes.SellerBillingAgreementAttributes' - } + } # type: Dict attribute_map = { 'platform_id': 'platformId', 'seller_note': 'sellerNote', 'seller_billing_agreement_attributes': 'sellerBillingAgreementAttributes' - } +} # type: Dict def __init__(self, platform_id=None, seller_note=None, seller_billing_agreement_attributes=None): # type: (Optional[str], Optional[str], Optional[SellerBillingAgreementAttributes]) -> None @@ -62,7 +62,7 @@ def __init__(self, platform_id=None, seller_note=None, seller_billing_agreement_ :param seller_billing_agreement_attributes: :type seller_billing_agreement_attributes: (optional) ask_sdk_model.interfaces.amazonpay.model.v1.seller_billing_agreement_attributes.SellerBillingAgreementAttributes """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.platform_id = platform_id self.seller_note = seller_note @@ -71,7 +71,7 @@ def __init__(self, platform_id=None, seller_note=None, seller_billing_agreement_ def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/billing_agreement_details.py b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/billing_agreement_details.py index 128ee60..b65dae0 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/billing_agreement_details.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/billing_agreement_details.py @@ -54,7 +54,7 @@ class BillingAgreementDetails(object): 'checkout_language': 'str', 'release_environment': 'ask_sdk_model.interfaces.amazonpay.model.v1.release_environment.ReleaseEnvironment', 'billing_agreement_status': 'ask_sdk_model.interfaces.amazonpay.model.v1.billing_agreement_status.BillingAgreementStatus' - } + } # type: Dict attribute_map = { 'billing_agreement_id': 'billingAgreementId', @@ -63,7 +63,7 @@ class BillingAgreementDetails(object): 'checkout_language': 'checkoutLanguage', 'release_environment': 'releaseEnvironment', 'billing_agreement_status': 'billingAgreementStatus' - } +} # type: Dict def __init__(self, billing_agreement_id=None, creation_timestamp=None, destination=None, checkout_language=None, release_environment=None, billing_agreement_status=None): # type: (Optional[str], Optional[datetime], Optional[Destination], Optional[str], Optional[ReleaseEnvironment], Optional[BillingAgreementStatus]) -> None @@ -82,7 +82,7 @@ def __init__(self, billing_agreement_id=None, creation_timestamp=None, destinati :param billing_agreement_status: :type billing_agreement_status: (optional) ask_sdk_model.interfaces.amazonpay.model.v1.billing_agreement_status.BillingAgreementStatus """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.billing_agreement_id = billing_agreement_id self.creation_timestamp = creation_timestamp @@ -94,7 +94,7 @@ def __init__(self, billing_agreement_id=None, creation_timestamp=None, destinati def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/destination.py b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/destination.py index a31a42d..33ec550 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/destination.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/destination.py @@ -66,7 +66,7 @@ class Destination(object): 'postal_code': 'str', 'country_code': 'str', 'phone': 'str' - } + } # type: Dict attribute_map = { 'name': 'name', @@ -80,7 +80,7 @@ class Destination(object): 'postal_code': 'postalCode', 'country_code': 'countryCode', 'phone': 'phone' - } +} # type: Dict def __init__(self, name=None, company_name=None, address_line1=None, address_line2=None, address_line3=None, city=None, district_or_county=None, state_or_region=None, postal_code=None, country_code=None, phone=None): # type: (Optional[str], Optional[str], Optional[str], Optional[str], Optional[str], Optional[str], Optional[str], Optional[str], Optional[str], Optional[str], Optional[str]) -> None @@ -109,7 +109,7 @@ def __init__(self, name=None, company_name=None, address_line1=None, address_lin :param phone: The phone number :type phone: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.name = name self.company_name = company_name @@ -126,7 +126,7 @@ def __init__(self, name=None, company_name=None, address_line1=None, address_lin def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/price.py b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/price.py index 96b4bb1..14548bf 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/price.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/price.py @@ -39,12 +39,12 @@ class Price(object): deserialized_types = { 'amount': 'str', 'currency_code': 'str' - } + } # type: Dict attribute_map = { 'amount': 'amount', 'currency_code': 'currencyCode' - } +} # type: Dict def __init__(self, amount=None, currency_code=None): # type: (Optional[str], Optional[str]) -> None @@ -55,7 +55,7 @@ def __init__(self, amount=None, currency_code=None): :param currency_code: Currency code for the amount. :type currency_code: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.amount = amount self.currency_code = currency_code @@ -63,7 +63,7 @@ def __init__(self, amount=None, currency_code=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/provider_attributes.py b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/provider_attributes.py index ab9e7e1..48058ee 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/provider_attributes.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/provider_attributes.py @@ -40,12 +40,12 @@ class ProviderAttributes(object): deserialized_types = { 'provider_id': 'str', 'provider_credit_list': 'list[ask_sdk_model.interfaces.amazonpay.model.v1.provider_credit.ProviderCredit]' - } + } # type: Dict attribute_map = { 'provider_id': 'providerId', 'provider_credit_list': 'providerCreditList' - } +} # type: Dict def __init__(self, provider_id=None, provider_credit_list=None): # type: (Optional[str], Optional[List[ProviderCredit]]) -> None @@ -56,7 +56,7 @@ def __init__(self, provider_id=None, provider_credit_list=None): :param provider_credit_list: List of provider credit. :type provider_credit_list: (optional) list[ask_sdk_model.interfaces.amazonpay.model.v1.provider_credit.ProviderCredit] """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.provider_id = provider_id self.provider_credit_list = provider_credit_list @@ -64,7 +64,7 @@ def __init__(self, provider_id=None, provider_credit_list=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/provider_credit.py b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/provider_credit.py index d0ccd7d..c01226d 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/provider_credit.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/provider_credit.py @@ -38,12 +38,12 @@ class ProviderCredit(object): deserialized_types = { 'provider_id': 'str', 'credit': 'ask_sdk_model.interfaces.amazonpay.model.v1.price.Price' - } + } # type: Dict attribute_map = { 'provider_id': 'providerId', 'credit': 'credit' - } +} # type: Dict def __init__(self, provider_id=None, credit=None): # type: (Optional[str], Optional[Price]) -> None @@ -54,7 +54,7 @@ def __init__(self, provider_id=None, credit=None): :param credit: :type credit: (optional) ask_sdk_model.interfaces.amazonpay.model.v1.price.Price """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.provider_id = provider_id self.credit = credit @@ -62,7 +62,7 @@ def __init__(self, provider_id=None, credit=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/py.typed b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/seller_billing_agreement_attributes.py b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/seller_billing_agreement_attributes.py index 16c78cd..cf6fe88 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/seller_billing_agreement_attributes.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/seller_billing_agreement_attributes.py @@ -42,13 +42,13 @@ class SellerBillingAgreementAttributes(object): 'seller_billing_agreement_id': 'str', 'store_name': 'str', 'custom_information': 'str' - } + } # type: Dict attribute_map = { 'seller_billing_agreement_id': 'sellerBillingAgreementId', 'store_name': 'storeName', 'custom_information': 'customInformation' - } +} # type: Dict def __init__(self, seller_billing_agreement_id=None, store_name=None, custom_information=None): # type: (Optional[str], Optional[str], Optional[str]) -> None @@ -61,7 +61,7 @@ def __init__(self, seller_billing_agreement_id=None, store_name=None, custom_inf :param custom_information: Any additional information that you wish to include with this billing agreement. At least one request parameter must be specified. :type custom_information: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.seller_billing_agreement_id = seller_billing_agreement_id self.store_name = store_name @@ -70,7 +70,7 @@ def __init__(self, seller_billing_agreement_id=None, store_name=None, custom_inf def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/seller_order_attributes.py b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/seller_order_attributes.py index 3cda847..b239d59 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/seller_order_attributes.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/model/v1/seller_order_attributes.py @@ -45,14 +45,14 @@ class SellerOrderAttributes(object): 'store_name': 'str', 'custom_information': 'str', 'seller_note': 'str' - } + } # type: Dict attribute_map = { 'seller_order_id': 'sellerOrderId', 'store_name': 'storeName', 'custom_information': 'customInformation', 'seller_note': 'sellerNote' - } +} # type: Dict def __init__(self, seller_order_id=None, store_name=None, custom_information=None, seller_note=None): # type: (Optional[str], Optional[str], Optional[str], Optional[str]) -> None @@ -67,7 +67,7 @@ def __init__(self, seller_order_id=None, store_name=None, custom_information=Non :param seller_note: This represents a description of the order that is displayed in emails to the buyer. :type seller_note: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.seller_order_id = seller_order_id self.store_name = store_name @@ -77,7 +77,7 @@ def __init__(self, seller_order_id=None, store_name=None, custom_information=Non def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/py.typed b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/request/charge_amazon_pay_request.py b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/request/charge_amazon_pay_request.py index 8b5d4b1..7eed23e 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/request/charge_amazon_pay_request.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/request/charge_amazon_pay_request.py @@ -60,7 +60,7 @@ class ChargeAmazonPayRequest(BaseAmazonPayEntity): 'authorize_attributes': 'ask_sdk_model.interfaces.amazonpay.model.request.authorize_attributes.AuthorizeAttributes', 'seller_order_attributes': 'ask_sdk_model.interfaces.amazonpay.model.request.seller_order_attributes.SellerOrderAttributes', 'provider_attributes': 'ask_sdk_model.interfaces.amazonpay.model.request.provider_attributes.ProviderAttributes' - } + } # type: Dict attribute_map = { 'object_type': '@type', @@ -71,7 +71,7 @@ class ChargeAmazonPayRequest(BaseAmazonPayEntity): 'authorize_attributes': 'authorizeAttributes', 'seller_order_attributes': 'sellerOrderAttributes', 'provider_attributes': 'providerAttributes' - } +} # type: Dict def __init__(self, version=None, seller_id=None, billing_agreement_id=None, payment_action=None, authorize_attributes=None, seller_order_attributes=None, provider_attributes=None): # type: (Optional[str], Optional[str], Optional[str], Optional[PaymentAction], Optional[AuthorizeAttributes], Optional[SellerOrderAttributes], Optional[ProviderAttributes]) -> None @@ -92,7 +92,7 @@ def __init__(self, version=None, seller_id=None, billing_agreement_id=None, paym :param provider_attributes: :type provider_attributes: (optional) ask_sdk_model.interfaces.amazonpay.model.request.provider_attributes.ProviderAttributes """ - self.__discriminator_value = "ChargeAmazonPayRequest" + self.__discriminator_value = "ChargeAmazonPayRequest" # type: str self.object_type = self.__discriminator_value super(ChargeAmazonPayRequest, self).__init__(object_type=self.__discriminator_value, version=version) @@ -106,7 +106,7 @@ def __init__(self, version=None, seller_id=None, billing_agreement_id=None, paym def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/request/py.typed b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/request/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/request/setup_amazon_pay_request.py b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/request/setup_amazon_pay_request.py index 8618e05..1e0dcfd 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/request/setup_amazon_pay_request.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/request/setup_amazon_pay_request.py @@ -63,7 +63,7 @@ class SetupAmazonPayRequest(BaseAmazonPayEntity): 'need_amazon_shipping_address': 'bool', 'sandbox_mode': 'bool', 'sandbox_customer_email_id': 'str' - } + } # type: Dict attribute_map = { 'object_type': '@type', @@ -76,7 +76,7 @@ class SetupAmazonPayRequest(BaseAmazonPayEntity): 'need_amazon_shipping_address': 'needAmazonShippingAddress', 'sandbox_mode': 'sandboxMode', 'sandbox_customer_email_id': 'sandboxCustomerEmailId' - } +} # type: Dict def __init__(self, version=None, seller_id=None, country_of_establishment=None, ledger_currency=None, checkout_language=None, billing_agreement_attributes=None, need_amazon_shipping_address=False, sandbox_mode=False, sandbox_customer_email_id=None): # type: (Optional[str], Optional[str], Optional[str], Optional[str], Optional[str], Optional[BillingAgreementAttributes], Optional[bool], Optional[bool], Optional[str]) -> None @@ -101,7 +101,7 @@ def __init__(self, version=None, seller_id=None, country_of_establishment=None, :param sandbox_customer_email_id: Use this parameter to create a Sandbox payment object. In order to use this parameter, you first create a Sandbox user account in Seller Central. Then, pass the email address associated with that Sandbox user account. :type sandbox_customer_email_id: (optional) str """ - self.__discriminator_value = "SetupAmazonPayRequest" + self.__discriminator_value = "SetupAmazonPayRequest" # type: str self.object_type = self.__discriminator_value super(SetupAmazonPayRequest, self).__init__(object_type=self.__discriminator_value, version=version) @@ -117,7 +117,7 @@ def __init__(self, version=None, seller_id=None, country_of_establishment=None, def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/response/amazon_pay_error_response.py b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/response/amazon_pay_error_response.py index 7a91eb2..2e4e228 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/response/amazon_pay_error_response.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/response/amazon_pay_error_response.py @@ -40,12 +40,12 @@ class AmazonPayErrorResponse(AmazonPayErrorResponse): deserialized_types = { 'error_code': 'str', 'error_message': 'str' - } + } # type: Dict attribute_map = { 'error_code': 'errorCode', 'error_message': 'errorMessage' - } +} # type: Dict def __init__(self, error_code=None, error_message=None): # type: (Optional[str], Optional[str]) -> None @@ -56,14 +56,14 @@ def __init__(self, error_code=None, error_message=None): :param error_message: Description of the error. :type error_message: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str super(AmazonPayErrorResponse, self).__init__(error_code=error_code, error_message=error_message) def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/response/charge_amazon_pay_result.py b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/response/charge_amazon_pay_result.py index 09d3c3e..0f8a560 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/response/charge_amazon_pay_result.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/response/charge_amazon_pay_result.py @@ -41,12 +41,12 @@ class ChargeAmazonPayResult(ChargeAmazonPayResult): deserialized_types = { 'amazon_order_reference_id': 'str', 'authorization_details': 'ask_sdk_model.interfaces.amazonpay.model.response.authorization_details.AuthorizationDetails' - } + } # type: Dict attribute_map = { 'amazon_order_reference_id': 'amazonOrderReferenceId', 'authorization_details': 'authorizationDetails' - } +} # type: Dict def __init__(self, amazon_order_reference_id=None, authorization_details=None): # type: (Optional[str], Optional[AuthorizationDetails]) -> None @@ -57,7 +57,7 @@ def __init__(self, amazon_order_reference_id=None, authorization_details=None): :param authorization_details: :type authorization_details: (optional) ask_sdk_model.interfaces.amazonpay.model.response.authorization_details.AuthorizationDetails """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str super(ChargeAmazonPayResult, self).__init__(amazon_order_reference_id=amazon_order_reference_id, authorization_details=authorization_details) self.authorization_details = authorization_details @@ -65,7 +65,7 @@ def __init__(self, amazon_order_reference_id=None, authorization_details=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/response/py.typed b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/response/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/response/setup_amazon_pay_result.py b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/response/setup_amazon_pay_result.py index 551fbf3..3db9163 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/response/setup_amazon_pay_result.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/response/setup_amazon_pay_result.py @@ -37,11 +37,11 @@ class SetupAmazonPayResult(object): """ deserialized_types = { 'billing_agreement_details': 'ask_sdk_model.interfaces.amazonpay.model.response.billing_agreement_details.BillingAgreementDetails' - } + } # type: Dict attribute_map = { 'billing_agreement_details': 'billingAgreementDetails' - } +} # type: Dict def __init__(self, billing_agreement_details=None): # type: (Optional[BillingAgreementDetails]) -> None @@ -50,14 +50,14 @@ def __init__(self, billing_agreement_details=None): :param billing_agreement_details: :type billing_agreement_details: (optional) ask_sdk_model.interfaces.amazonpay.model.response.billing_agreement_details.BillingAgreementDetails """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.billing_agreement_details = billing_agreement_details def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/v1/amazon_pay_error_response.py b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/v1/amazon_pay_error_response.py index 94a71fb..83ddeb2 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/v1/amazon_pay_error_response.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/v1/amazon_pay_error_response.py @@ -39,12 +39,12 @@ class AmazonPayErrorResponse(object): deserialized_types = { 'error_code': 'str', 'error_message': 'str' - } + } # type: Dict attribute_map = { 'error_code': 'errorCode', 'error_message': 'errorMessage' - } +} # type: Dict def __init__(self, error_code=None, error_message=None): # type: (Optional[str], Optional[str]) -> None @@ -55,7 +55,7 @@ def __init__(self, error_code=None, error_message=None): :param error_message: Description of the error. :type error_message: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.error_code = error_code self.error_message = error_message @@ -63,7 +63,7 @@ def __init__(self, error_code=None, error_message=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/v1/charge_amazon_pay.py b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/v1/charge_amazon_pay.py index 2cdbe34..51af96d 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/v1/charge_amazon_pay.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/v1/charge_amazon_pay.py @@ -58,7 +58,7 @@ class ChargeAmazonPay(object): 'authorize_attributes': 'ask_sdk_model.interfaces.amazonpay.model.v1.authorize_attributes.AuthorizeAttributes', 'seller_order_attributes': 'ask_sdk_model.interfaces.amazonpay.model.v1.seller_order_attributes.SellerOrderAttributes', 'provider_attributes': 'ask_sdk_model.interfaces.amazonpay.model.v1.provider_attributes.ProviderAttributes' - } + } # type: Dict attribute_map = { 'consent_token': 'consentToken', @@ -68,7 +68,7 @@ class ChargeAmazonPay(object): 'authorize_attributes': 'authorizeAttributes', 'seller_order_attributes': 'sellerOrderAttributes', 'provider_attributes': 'providerAttributes' - } +} # type: Dict def __init__(self, consent_token=None, seller_id=None, billing_agreement_id=None, payment_action=None, authorize_attributes=None, seller_order_attributes=None, provider_attributes=None): # type: (Optional[str], Optional[str], Optional[str], Optional[PaymentAction], Optional[AuthorizeAttributes], Optional[SellerOrderAttributes], Optional[ProviderAttributes]) -> None @@ -89,7 +89,7 @@ def __init__(self, consent_token=None, seller_id=None, billing_agreement_id=None :param provider_attributes: :type provider_attributes: (optional) ask_sdk_model.interfaces.amazonpay.model.v1.provider_attributes.ProviderAttributes """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.consent_token = consent_token self.seller_id = seller_id @@ -102,7 +102,7 @@ def __init__(self, consent_token=None, seller_id=None, billing_agreement_id=None def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/v1/charge_amazon_pay_result.py b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/v1/charge_amazon_pay_result.py index 4f41443..d91ce21 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/v1/charge_amazon_pay_result.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/v1/charge_amazon_pay_result.py @@ -40,12 +40,12 @@ class ChargeAmazonPayResult(object): deserialized_types = { 'amazon_order_reference_id': 'str', 'authorization_details': 'ask_sdk_model.interfaces.amazonpay.model.v1.authorization_details.AuthorizationDetails' - } + } # type: Dict attribute_map = { 'amazon_order_reference_id': 'amazonOrderReferenceId', 'authorization_details': 'authorizationDetails' - } +} # type: Dict def __init__(self, amazon_order_reference_id=None, authorization_details=None): # type: (Optional[str], Optional[AuthorizationDetails]) -> None @@ -56,7 +56,7 @@ def __init__(self, amazon_order_reference_id=None, authorization_details=None): :param authorization_details: :type authorization_details: (optional) ask_sdk_model.interfaces.amazonpay.model.v1.authorization_details.AuthorizationDetails """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.amazon_order_reference_id = amazon_order_reference_id self.authorization_details = authorization_details @@ -64,7 +64,7 @@ def __init__(self, amazon_order_reference_id=None, authorization_details=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/v1/py.typed b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/v1/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/v1/setup_amazon_pay.py b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/v1/setup_amazon_pay.py index 262ef36..6c4bb45 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/v1/setup_amazon_pay.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/v1/setup_amazon_pay.py @@ -61,7 +61,7 @@ class SetupAmazonPay(object): 'need_amazon_shipping_address': 'bool', 'sandbox_mode': 'bool', 'sandbox_customer_email_id': 'str' - } + } # type: Dict attribute_map = { 'consent_token': 'consentToken', @@ -73,7 +73,7 @@ class SetupAmazonPay(object): 'need_amazon_shipping_address': 'needAmazonShippingAddress', 'sandbox_mode': 'sandboxMode', 'sandbox_customer_email_id': 'sandboxCustomerEmailId' - } +} # type: Dict def __init__(self, consent_token=None, seller_id=None, country_of_establishment=None, ledger_currency=None, checkout_language=None, billing_agreement_attributes=None, need_amazon_shipping_address=False, sandbox_mode=False, sandbox_customer_email_id=None): # type: (Optional[str], Optional[str], Optional[str], Optional[str], Optional[str], Optional[BillingAgreementAttributes], Optional[bool], Optional[bool], Optional[str]) -> None @@ -98,7 +98,7 @@ def __init__(self, consent_token=None, seller_id=None, country_of_establishment= :param sandbox_customer_email_id: Use this parameter to create a Sandbox payment object. In order to use this parameter, you first create a Sandbox user account in Seller Central. Then, pass the email address associated with that Sandbox user account. :type sandbox_customer_email_id: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.consent_token = consent_token self.seller_id = seller_id @@ -113,7 +113,7 @@ def __init__(self, consent_token=None, seller_id=None, country_of_establishment= def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/v1/setup_amazon_pay_result.py b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/v1/setup_amazon_pay_result.py index 7a809fb..0958720 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/v1/setup_amazon_pay_result.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/amazonpay/v1/setup_amazon_pay_result.py @@ -37,11 +37,11 @@ class SetupAmazonPayResult(object): """ deserialized_types = { 'billing_agreement_details': 'ask_sdk_model.interfaces.amazonpay.model.v1.billing_agreement_details.BillingAgreementDetails' - } + } # type: Dict attribute_map = { 'billing_agreement_details': 'billingAgreementDetails' - } +} # type: Dict def __init__(self, billing_agreement_details=None): # type: (Optional[BillingAgreementDetails]) -> None @@ -50,14 +50,14 @@ def __init__(self, billing_agreement_details=None): :param billing_agreement_details: :type billing_agreement_details: (optional) ask_sdk_model.interfaces.amazonpay.model.v1.billing_agreement_details.BillingAgreementDetails """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.billing_agreement_details = billing_agreement_details def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/audio_item.py b/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/audio_item.py index 9f8feea..3ec3f8b 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/audio_item.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/audio_item.py @@ -39,12 +39,12 @@ class AudioItem(object): deserialized_types = { 'stream': 'ask_sdk_model.interfaces.audioplayer.stream.Stream', 'metadata': 'ask_sdk_model.interfaces.audioplayer.audio_item_metadata.AudioItemMetadata' - } + } # type: Dict attribute_map = { 'stream': 'stream', 'metadata': 'metadata' - } +} # type: Dict def __init__(self, stream=None, metadata=None): # type: (Optional[Stream], Optional[AudioItemMetadata]) -> None @@ -55,7 +55,7 @@ def __init__(self, stream=None, metadata=None): :param metadata: :type metadata: (optional) ask_sdk_model.interfaces.audioplayer.audio_item_metadata.AudioItemMetadata """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.stream = stream self.metadata = metadata @@ -63,7 +63,7 @@ def __init__(self, stream=None, metadata=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/audio_item_metadata.py b/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/audio_item_metadata.py index 866003e..1be4fd0 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/audio_item_metadata.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/audio_item_metadata.py @@ -46,14 +46,14 @@ class AudioItemMetadata(object): 'subtitle': 'str', 'art': 'ask_sdk_model.interfaces.display.image.Image', 'background_image': 'ask_sdk_model.interfaces.display.image.Image' - } + } # type: Dict attribute_map = { 'title': 'title', 'subtitle': 'subtitle', 'art': 'art', 'background_image': 'backgroundImage' - } +} # type: Dict def __init__(self, title=None, subtitle=None, art=None, background_image=None): # type: (Optional[str], Optional[str], Optional[Image], Optional[Image]) -> None @@ -68,7 +68,7 @@ def __init__(self, title=None, subtitle=None, art=None, background_image=None): :param background_image: An optional background image for the audio item. :type background_image: (optional) ask_sdk_model.interfaces.display.image.Image """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.title = title self.subtitle = subtitle @@ -78,7 +78,7 @@ def __init__(self, title=None, subtitle=None, art=None, background_image=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/audio_player_interface.py b/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/audio_player_interface.py index 6f83833..97c2b32 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/audio_player_interface.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/audio_player_interface.py @@ -31,22 +31,22 @@ class AudioPlayerInterface(object): """ deserialized_types = { - } + } # type: Dict attribute_map = { - } +} # type: Dict def __init__(self): # type: () -> None """ """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/audio_player_state.py b/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/audio_player_state.py index 1d83723..68ade41 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/audio_player_state.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/audio_player_state.py @@ -41,13 +41,13 @@ class AudioPlayerState(object): 'offset_in_milliseconds': 'int', 'token': 'str', 'player_activity': 'ask_sdk_model.interfaces.audioplayer.player_activity.PlayerActivity' - } + } # type: Dict attribute_map = { 'offset_in_milliseconds': 'offsetInMilliseconds', 'token': 'token', 'player_activity': 'playerActivity' - } +} # type: Dict def __init__(self, offset_in_milliseconds=None, token=None, player_activity=None): # type: (Optional[int], Optional[str], Optional[PlayerActivity]) -> None @@ -60,7 +60,7 @@ def __init__(self, offset_in_milliseconds=None, token=None, player_activity=None :param player_activity: :type player_activity: (optional) ask_sdk_model.interfaces.audioplayer.player_activity.PlayerActivity """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.offset_in_milliseconds = offset_in_milliseconds self.token = token @@ -69,7 +69,7 @@ def __init__(self, offset_in_milliseconds=None, token=None, player_activity=None def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/clear_queue_directive.py b/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/clear_queue_directive.py index 15395c8..794f4f9 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/clear_queue_directive.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/clear_queue_directive.py @@ -37,12 +37,12 @@ class ClearQueueDirective(Directive): deserialized_types = { 'object_type': 'str', 'clear_behavior': 'ask_sdk_model.interfaces.audioplayer.clear_behavior.ClearBehavior' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'clear_behavior': 'clearBehavior' - } +} # type: Dict def __init__(self, clear_behavior=None): # type: (Optional[ClearBehavior]) -> None @@ -51,7 +51,7 @@ def __init__(self, clear_behavior=None): :param clear_behavior: :type clear_behavior: (optional) ask_sdk_model.interfaces.audioplayer.clear_behavior.ClearBehavior """ - self.__discriminator_value = "AudioPlayer.ClearQueue" + self.__discriminator_value = "AudioPlayer.ClearQueue" # type: str self.object_type = self.__discriminator_value super(ClearQueueDirective, self).__init__(object_type=self.__discriminator_value) @@ -60,7 +60,7 @@ def __init__(self, clear_behavior=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/current_playback_state.py b/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/current_playback_state.py index 621a48c..ce2e383 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/current_playback_state.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/current_playback_state.py @@ -41,13 +41,13 @@ class CurrentPlaybackState(object): 'offset_in_milliseconds': 'int', 'player_activity': 'ask_sdk_model.interfaces.audioplayer.player_activity.PlayerActivity', 'token': 'str' - } + } # type: Dict attribute_map = { 'offset_in_milliseconds': 'offsetInMilliseconds', 'player_activity': 'playerActivity', 'token': 'token' - } +} # type: Dict def __init__(self, offset_in_milliseconds=None, player_activity=None, token=None): # type: (Optional[int], Optional[PlayerActivity], Optional[str]) -> None @@ -60,7 +60,7 @@ def __init__(self, offset_in_milliseconds=None, player_activity=None, token=None :param token: :type token: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.offset_in_milliseconds = offset_in_milliseconds self.player_activity = player_activity @@ -69,7 +69,7 @@ def __init__(self, offset_in_milliseconds=None, player_activity=None, token=None def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/error.py b/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/error.py index 9ab5b2e..76b94e0 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/error.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/error.py @@ -38,12 +38,12 @@ class Error(object): deserialized_types = { 'message': 'str', 'object_type': 'ask_sdk_model.interfaces.audioplayer.error_type.ErrorType' - } + } # type: Dict attribute_map = { 'message': 'message', 'object_type': 'type' - } +} # type: Dict def __init__(self, message=None, object_type=None): # type: (Optional[str], Optional[ErrorType]) -> None @@ -54,7 +54,7 @@ def __init__(self, message=None, object_type=None): :param object_type: :type object_type: (optional) ask_sdk_model.interfaces.audioplayer.error_type.ErrorType """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.message = message self.object_type = object_type @@ -62,7 +62,7 @@ def __init__(self, message=None, object_type=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/play_directive.py b/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/play_directive.py index ae4d32f..fa948cc 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/play_directive.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/play_directive.py @@ -41,13 +41,13 @@ class PlayDirective(Directive): 'object_type': 'str', 'play_behavior': 'ask_sdk_model.interfaces.audioplayer.play_behavior.PlayBehavior', 'audio_item': 'ask_sdk_model.interfaces.audioplayer.audio_item.AudioItem' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'play_behavior': 'playBehavior', 'audio_item': 'audioItem' - } +} # type: Dict def __init__(self, play_behavior=None, audio_item=None): # type: (Optional[PlayBehavior], Optional[AudioItem]) -> None @@ -58,7 +58,7 @@ def __init__(self, play_behavior=None, audio_item=None): :param audio_item: :type audio_item: (optional) ask_sdk_model.interfaces.audioplayer.audio_item.AudioItem """ - self.__discriminator_value = "AudioPlayer.Play" + self.__discriminator_value = "AudioPlayer.Play" # type: str self.object_type = self.__discriminator_value super(PlayDirective, self).__init__(object_type=self.__discriminator_value) @@ -68,7 +68,7 @@ def __init__(self, play_behavior=None, audio_item=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/playback_failed_request.py b/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/playback_failed_request.py index ad918b9..51c80d5 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/playback_failed_request.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/playback_failed_request.py @@ -53,7 +53,7 @@ class PlaybackFailedRequest(Request): 'current_playback_state': 'ask_sdk_model.interfaces.audioplayer.current_playback_state.CurrentPlaybackState', 'error': 'ask_sdk_model.interfaces.audioplayer.error.Error', 'token': 'str' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -63,7 +63,7 @@ class PlaybackFailedRequest(Request): 'current_playback_state': 'currentPlaybackState', 'error': 'error', 'token': 'token' - } +} # type: Dict def __init__(self, request_id=None, timestamp=None, locale=None, current_playback_state=None, error=None, token=None): # type: (Optional[str], Optional[datetime], Optional[str], Optional[CurrentPlaybackState], Optional[Error], Optional[str]) -> None @@ -82,7 +82,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, current_playbac :param token: :type token: (optional) str """ - self.__discriminator_value = "AudioPlayer.PlaybackFailed" + self.__discriminator_value = "AudioPlayer.PlaybackFailed" # type: str self.object_type = self.__discriminator_value super(PlaybackFailedRequest, self).__init__(object_type=self.__discriminator_value, request_id=request_id, timestamp=timestamp, locale=locale) @@ -93,7 +93,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, current_playbac def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/playback_finished_request.py b/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/playback_finished_request.py index 25d9293..864f08c 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/playback_finished_request.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/playback_finished_request.py @@ -48,7 +48,7 @@ class PlaybackFinishedRequest(Request): 'locale': 'str', 'offset_in_milliseconds': 'int', 'token': 'str' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -57,7 +57,7 @@ class PlaybackFinishedRequest(Request): 'locale': 'locale', 'offset_in_milliseconds': 'offsetInMilliseconds', 'token': 'token' - } +} # type: Dict def __init__(self, request_id=None, timestamp=None, locale=None, offset_in_milliseconds=None, token=None): # type: (Optional[str], Optional[datetime], Optional[str], Optional[int], Optional[str]) -> None @@ -74,7 +74,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, offset_in_milli :param token: :type token: (optional) str """ - self.__discriminator_value = "AudioPlayer.PlaybackFinished" + self.__discriminator_value = "AudioPlayer.PlaybackFinished" # type: str self.object_type = self.__discriminator_value super(PlaybackFinishedRequest, self).__init__(object_type=self.__discriminator_value, request_id=request_id, timestamp=timestamp, locale=locale) @@ -84,7 +84,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, offset_in_milli def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/playback_nearly_finished_request.py b/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/playback_nearly_finished_request.py index b356e9a..6c8b7d1 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/playback_nearly_finished_request.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/playback_nearly_finished_request.py @@ -48,7 +48,7 @@ class PlaybackNearlyFinishedRequest(Request): 'locale': 'str', 'offset_in_milliseconds': 'int', 'token': 'str' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -57,7 +57,7 @@ class PlaybackNearlyFinishedRequest(Request): 'locale': 'locale', 'offset_in_milliseconds': 'offsetInMilliseconds', 'token': 'token' - } +} # type: Dict def __init__(self, request_id=None, timestamp=None, locale=None, offset_in_milliseconds=None, token=None): # type: (Optional[str], Optional[datetime], Optional[str], Optional[int], Optional[str]) -> None @@ -74,7 +74,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, offset_in_milli :param token: :type token: (optional) str """ - self.__discriminator_value = "AudioPlayer.PlaybackNearlyFinished" + self.__discriminator_value = "AudioPlayer.PlaybackNearlyFinished" # type: str self.object_type = self.__discriminator_value super(PlaybackNearlyFinishedRequest, self).__init__(object_type=self.__discriminator_value, request_id=request_id, timestamp=timestamp, locale=locale) @@ -84,7 +84,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, offset_in_milli def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/playback_started_request.py b/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/playback_started_request.py index d3727cd..155131a 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/playback_started_request.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/playback_started_request.py @@ -48,7 +48,7 @@ class PlaybackStartedRequest(Request): 'locale': 'str', 'offset_in_milliseconds': 'int', 'token': 'str' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -57,7 +57,7 @@ class PlaybackStartedRequest(Request): 'locale': 'locale', 'offset_in_milliseconds': 'offsetInMilliseconds', 'token': 'token' - } +} # type: Dict def __init__(self, request_id=None, timestamp=None, locale=None, offset_in_milliseconds=None, token=None): # type: (Optional[str], Optional[datetime], Optional[str], Optional[int], Optional[str]) -> None @@ -74,7 +74,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, offset_in_milli :param token: :type token: (optional) str """ - self.__discriminator_value = "AudioPlayer.PlaybackStarted" + self.__discriminator_value = "AudioPlayer.PlaybackStarted" # type: str self.object_type = self.__discriminator_value super(PlaybackStartedRequest, self).__init__(object_type=self.__discriminator_value, request_id=request_id, timestamp=timestamp, locale=locale) @@ -84,7 +84,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, offset_in_milli def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/playback_stopped_request.py b/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/playback_stopped_request.py index 74dc4fc..c7a581f 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/playback_stopped_request.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/playback_stopped_request.py @@ -48,7 +48,7 @@ class PlaybackStoppedRequest(Request): 'locale': 'str', 'offset_in_milliseconds': 'int', 'token': 'str' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -57,7 +57,7 @@ class PlaybackStoppedRequest(Request): 'locale': 'locale', 'offset_in_milliseconds': 'offsetInMilliseconds', 'token': 'token' - } +} # type: Dict def __init__(self, request_id=None, timestamp=None, locale=None, offset_in_milliseconds=None, token=None): # type: (Optional[str], Optional[datetime], Optional[str], Optional[int], Optional[str]) -> None @@ -74,7 +74,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, offset_in_milli :param token: :type token: (optional) str """ - self.__discriminator_value = "AudioPlayer.PlaybackStopped" + self.__discriminator_value = "AudioPlayer.PlaybackStopped" # type: str self.object_type = self.__discriminator_value super(PlaybackStoppedRequest, self).__init__(object_type=self.__discriminator_value, request_id=request_id, timestamp=timestamp, locale=locale) @@ -84,7 +84,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, offset_in_milli def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/py.typed b/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/stop_directive.py b/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/stop_directive.py index e41c68c..94b1305 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/stop_directive.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/stop_directive.py @@ -33,18 +33,18 @@ class StopDirective(Directive): """ deserialized_types = { 'object_type': 'str' - } + } # type: Dict attribute_map = { 'object_type': 'type' - } +} # type: Dict def __init__(self): # type: () -> None """ """ - self.__discriminator_value = "AudioPlayer.Stop" + self.__discriminator_value = "AudioPlayer.Stop" # type: str self.object_type = self.__discriminator_value super(StopDirective, self).__init__(object_type=self.__discriminator_value) @@ -52,7 +52,7 @@ def __init__(self): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/stream.py b/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/stream.py index 7a2be24..1b4f694 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/stream.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/audioplayer/stream.py @@ -43,14 +43,14 @@ class Stream(object): 'token': 'str', 'url': 'str', 'offset_in_milliseconds': 'int' - } + } # type: Dict attribute_map = { 'expected_previous_token': 'expectedPreviousToken', 'token': 'token', 'url': 'url', 'offset_in_milliseconds': 'offsetInMilliseconds' - } +} # type: Dict def __init__(self, expected_previous_token=None, token=None, url=None, offset_in_milliseconds=None): # type: (Optional[str], Optional[str], Optional[str], Optional[int]) -> None @@ -65,7 +65,7 @@ def __init__(self, expected_previous_token=None, token=None, url=None, offset_in :param offset_in_milliseconds: :type offset_in_milliseconds: (optional) int """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.expected_previous_token = expected_previous_token self.token = token @@ -75,7 +75,7 @@ def __init__(self, expected_previous_token=None, token=None, url=None, offset_in def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/automotive/automotive_state.py b/ask-sdk-model/ask_sdk_model/interfaces/automotive/automotive_state.py index 2ca7745..789fc88 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/automotive/automotive_state.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/automotive/automotive_state.py @@ -33,22 +33,22 @@ class AutomotiveState(object): """ deserialized_types = { - } + } # type: Dict attribute_map = { - } +} # type: Dict def __init__(self): # type: () -> None """This object contains the automotive specific information of the device """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/automotive/py.typed b/ask-sdk-model/ask_sdk_model/interfaces/automotive/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/interfaces/connections/connections_request.py b/ask-sdk-model/ask_sdk_model/interfaces/connections/connections_request.py index 661a626..51f4f64 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/connections/connections_request.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/connections/connections_request.py @@ -50,7 +50,7 @@ class ConnectionsRequest(Request): 'locale': 'str', 'name': 'str', 'payload': 'dict(str, object)' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -59,7 +59,7 @@ class ConnectionsRequest(Request): 'locale': 'locale', 'name': 'name', 'payload': 'payload' - } +} # type: Dict def __init__(self, request_id=None, timestamp=None, locale=None, name=None, payload=None): # type: (Optional[str], Optional[datetime], Optional[str], Optional[str], Optional[Dict[str, object]]) -> None @@ -76,7 +76,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, name=None, payl :param payload: This is an object sent between the two skills for processing a ConnectionsRequest or ConnectionsResponse. This will always be a valid payload based on Action schema for the requester action. :type payload: (optional) dict(str, object) """ - self.__discriminator_value = "Connections.Request" + self.__discriminator_value = "Connections.Request" # type: str self.object_type = self.__discriminator_value super(ConnectionsRequest, self).__init__(object_type=self.__discriminator_value, request_id=request_id, timestamp=timestamp, locale=locale) @@ -86,7 +86,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, name=None, payl def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/connections/connections_response.py b/ask-sdk-model/ask_sdk_model/interfaces/connections/connections_response.py index e4473c9..307e123 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/connections/connections_response.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/connections/connections_response.py @@ -57,7 +57,7 @@ class ConnectionsResponse(Request): 'name': 'str', 'payload': 'dict(str, object)', 'token': 'str' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -68,7 +68,7 @@ class ConnectionsResponse(Request): 'name': 'name', 'payload': 'payload', 'token': 'token' - } +} # type: Dict def __init__(self, request_id=None, timestamp=None, locale=None, status=None, name=None, payload=None, token=None): # type: (Optional[str], Optional[datetime], Optional[str], Optional[ConnectionsStatus], Optional[str], Optional[Dict[str, object]], Optional[str]) -> None @@ -89,7 +89,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, status=None, na :param token: This is the token that the skill originally sent with the ConnectionsSendRequest directive. :type token: (optional) str """ - self.__discriminator_value = "Connections.Response" + self.__discriminator_value = "Connections.Response" # type: str self.object_type = self.__discriminator_value super(ConnectionsResponse, self).__init__(object_type=self.__discriminator_value, request_id=request_id, timestamp=timestamp, locale=locale) @@ -101,7 +101,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, status=None, na def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/connections/connections_status.py b/ask-sdk-model/ask_sdk_model/interfaces/connections/connections_status.py index 6fb83d5..6fef7df 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/connections/connections_status.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/connections/connections_status.py @@ -39,12 +39,12 @@ class ConnectionsStatus(object): deserialized_types = { 'code': 'str', 'message': 'str' - } + } # type: Dict attribute_map = { 'code': 'code', 'message': 'message' - } +} # type: Dict def __init__(self, code=None, message=None): # type: (Optional[str], Optional[str]) -> None @@ -55,7 +55,7 @@ def __init__(self, code=None, message=None): :param message: This is a message that goes along with response code that can provide more information about what occurred :type message: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.code = code self.message = message @@ -63,7 +63,7 @@ def __init__(self, code=None, message=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/connections/entities/base_entity.py b/ask-sdk-model/ask_sdk_model/interfaces/connections/entities/base_entity.py index 1c0aba4..f7acf09 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/connections/entities/base_entity.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/connections/entities/base_entity.py @@ -47,12 +47,12 @@ class BaseEntity(object): deserialized_types = { 'object_type': 'str', 'version': 'str' - } + } # type: Dict attribute_map = { 'object_type': '@type', 'version': '@version' - } +} # type: Dict discriminator_value_class_map = { 'Restaurant': 'ask_sdk_model.interfaces.connections.entities.restaurant.Restaurant', @@ -73,14 +73,14 @@ def __init__(self, object_type=None, version=None): :param version: version of the request :type version: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.object_type = object_type self.version = version @classmethod def get_real_child_model(cls, data): - # type: (Dict[str, str]) -> str + # type: (Dict[str, str]) -> Optional[str] """Returns the real base class specified by the discriminator""" discriminator_value = data[cls.json_discriminator_key] return cls.discriminator_value_class_map.get(discriminator_value) @@ -88,7 +88,7 @@ def get_real_child_model(cls, data): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/connections/entities/postal_address.py b/ask-sdk-model/ask_sdk_model/interfaces/connections/entities/postal_address.py index bdbdb02..7dc5694 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/connections/entities/postal_address.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/connections/entities/postal_address.py @@ -53,7 +53,7 @@ class PostalAddress(BaseEntity): 'region': 'str', 'postal_code': 'str', 'country': 'str' - } + } # type: Dict attribute_map = { 'object_type': '@type', @@ -63,7 +63,7 @@ class PostalAddress(BaseEntity): 'region': 'region', 'postal_code': 'postalCode', 'country': 'country' - } +} # type: Dict def __init__(self, version=None, street_address=None, locality=None, region=None, postal_code=None, country=None): # type: (Optional[str], Optional[str], Optional[str], Optional[str], Optional[str], Optional[str]) -> None @@ -82,7 +82,7 @@ def __init__(self, version=None, street_address=None, locality=None, region=None :param country: country :type country: (optional) str """ - self.__discriminator_value = "PostalAddress" + self.__discriminator_value = "PostalAddress" # type: str self.object_type = self.__discriminator_value super(PostalAddress, self).__init__(object_type=self.__discriminator_value, version=version) @@ -95,7 +95,7 @@ def __init__(self, version=None, street_address=None, locality=None, region=None def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/connections/entities/py.typed b/ask-sdk-model/ask_sdk_model/interfaces/connections/entities/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/interfaces/connections/entities/restaurant.py b/ask-sdk-model/ask_sdk_model/interfaces/connections/entities/restaurant.py index e22c03a..1bb836b 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/connections/entities/restaurant.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/connections/entities/restaurant.py @@ -45,14 +45,14 @@ class Restaurant(BaseEntity): 'version': 'str', 'name': 'str', 'location': 'ask_sdk_model.interfaces.connections.entities.postal_address.PostalAddress' - } + } # type: Dict attribute_map = { 'object_type': '@type', 'version': '@version', 'name': 'name', 'location': 'location' - } +} # type: Dict def __init__(self, version=None, name=None, location=None): # type: (Optional[str], Optional[str], Optional[PostalAddress]) -> None @@ -65,7 +65,7 @@ def __init__(self, version=None, name=None, location=None): :param location: location :type location: (optional) ask_sdk_model.interfaces.connections.entities.postal_address.PostalAddress """ - self.__discriminator_value = "Restaurant" + self.__discriminator_value = "Restaurant" # type: str self.object_type = self.__discriminator_value super(Restaurant, self).__init__(object_type=self.__discriminator_value, version=version) @@ -75,7 +75,7 @@ def __init__(self, version=None, name=None, location=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/connections/py.typed b/ask-sdk-model/ask_sdk_model/interfaces/connections/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/interfaces/connections/requests/base_request.py b/ask-sdk-model/ask_sdk_model/interfaces/connections/requests/base_request.py index c2e0bf2..8186c76 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/connections/requests/base_request.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/connections/requests/base_request.py @@ -53,12 +53,12 @@ class BaseRequest(object): deserialized_types = { 'object_type': 'str', 'version': 'str' - } + } # type: Dict attribute_map = { 'object_type': '@type', 'version': '@version' - } +} # type: Dict discriminator_value_class_map = { 'ScheduleFoodEstablishmentReservationRequest': 'ask_sdk_model.interfaces.connections.requests.schedule_food_establishment_reservation_request.ScheduleFoodEstablishmentReservationRequest', @@ -82,14 +82,14 @@ def __init__(self, object_type=None, version=None): :param version: version of the request :type version: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.object_type = object_type self.version = version @classmethod def get_real_child_model(cls, data): - # type: (Dict[str, str]) -> str + # type: (Dict[str, str]) -> Optional[str] """Returns the real base class specified by the discriminator""" discriminator_value = data[cls.json_discriminator_key] return cls.discriminator_value_class_map.get(discriminator_value) @@ -97,7 +97,7 @@ def get_real_child_model(cls, data): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/connections/requests/print_image_request.py b/ask-sdk-model/ask_sdk_model/interfaces/connections/requests/print_image_request.py index 82a0213..b9ab74c 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/connections/requests/print_image_request.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/connections/requests/print_image_request.py @@ -50,7 +50,7 @@ class PrintImageRequest(BaseRequest): 'url': 'str', 'description': 'str', 'image_type': 'str' - } + } # type: Dict attribute_map = { 'object_type': '@type', @@ -59,7 +59,7 @@ class PrintImageRequest(BaseRequest): 'url': 'url', 'description': 'description', 'image_type': 'imageType' - } +} # type: Dict def __init__(self, version=None, title=None, url=None, description=None, image_type=None): # type: (Optional[str], Optional[str], Optional[str], Optional[str], Optional[str]) -> None @@ -76,7 +76,7 @@ def __init__(self, version=None, title=None, url=None, description=None, image_t :param image_type: type of the image :type image_type: (optional) str """ - self.__discriminator_value = "PrintImageRequest" + self.__discriminator_value = "PrintImageRequest" # type: str self.object_type = self.__discriminator_value super(PrintImageRequest, self).__init__(object_type=self.__discriminator_value, version=version) @@ -88,7 +88,7 @@ def __init__(self, version=None, title=None, url=None, description=None, image_t def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/connections/requests/print_pdf_request.py b/ask-sdk-model/ask_sdk_model/interfaces/connections/requests/print_pdf_request.py index c1aa3bf..0e55368 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/connections/requests/print_pdf_request.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/connections/requests/print_pdf_request.py @@ -47,7 +47,7 @@ class PrintPDFRequest(BaseRequest): 'title': 'str', 'url': 'str', 'description': 'str' - } + } # type: Dict attribute_map = { 'object_type': '@type', @@ -55,7 +55,7 @@ class PrintPDFRequest(BaseRequest): 'title': 'title', 'url': 'url', 'description': 'description' - } +} # type: Dict def __init__(self, version=None, title=None, url=None, description=None): # type: (Optional[str], Optional[str], Optional[str], Optional[str]) -> None @@ -70,7 +70,7 @@ def __init__(self, version=None, title=None, url=None, description=None): :param description: description of the image :type description: (optional) str """ - self.__discriminator_value = "PrintPDFRequest" + self.__discriminator_value = "PrintPDFRequest" # type: str self.object_type = self.__discriminator_value super(PrintPDFRequest, self).__init__(object_type=self.__discriminator_value, version=version) @@ -81,7 +81,7 @@ def __init__(self, version=None, title=None, url=None, description=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/connections/requests/print_web_page_request.py b/ask-sdk-model/ask_sdk_model/interfaces/connections/requests/print_web_page_request.py index 9db2eb2..896fc93 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/connections/requests/print_web_page_request.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/connections/requests/print_web_page_request.py @@ -47,7 +47,7 @@ class PrintWebPageRequest(BaseRequest): 'title': 'str', 'url': 'str', 'description': 'str' - } + } # type: Dict attribute_map = { 'object_type': '@type', @@ -55,7 +55,7 @@ class PrintWebPageRequest(BaseRequest): 'title': 'title', 'url': 'url', 'description': 'description' - } +} # type: Dict def __init__(self, version=None, title=None, url=None, description=None): # type: (Optional[str], Optional[str], Optional[str], Optional[str]) -> None @@ -70,7 +70,7 @@ def __init__(self, version=None, title=None, url=None, description=None): :param description: description of the image :type description: (optional) str """ - self.__discriminator_value = "PrintWebPageRequest" + self.__discriminator_value = "PrintWebPageRequest" # type: str self.object_type = self.__discriminator_value super(PrintWebPageRequest, self).__init__(object_type=self.__discriminator_value, version=version) @@ -81,7 +81,7 @@ def __init__(self, version=None, title=None, url=None, description=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/connections/requests/py.typed b/ask-sdk-model/ask_sdk_model/interfaces/connections/requests/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/interfaces/connections/requests/schedule_food_establishment_reservation_request.py b/ask-sdk-model/ask_sdk_model/interfaces/connections/requests/schedule_food_establishment_reservation_request.py index 8cedefc..419855d 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/connections/requests/schedule_food_establishment_reservation_request.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/connections/requests/schedule_food_establishment_reservation_request.py @@ -48,7 +48,7 @@ class ScheduleFoodEstablishmentReservationRequest(BaseRequest): 'start_time': 'str', 'party_size': 'str', 'restaurant': 'ask_sdk_model.interfaces.connections.entities.restaurant.Restaurant' - } + } # type: Dict attribute_map = { 'object_type': '@type', @@ -56,7 +56,7 @@ class ScheduleFoodEstablishmentReservationRequest(BaseRequest): 'start_time': 'startTime', 'party_size': 'partySize', 'restaurant': 'restaurant' - } +} # type: Dict def __init__(self, version=None, start_time=None, party_size=None, restaurant=None): # type: (Optional[str], Optional[str], Optional[str], Optional[Restaurant]) -> None @@ -71,7 +71,7 @@ def __init__(self, version=None, start_time=None, party_size=None, restaurant=No :param restaurant: restaurant :type restaurant: (optional) ask_sdk_model.interfaces.connections.entities.restaurant.Restaurant """ - self.__discriminator_value = "ScheduleFoodEstablishmentReservationRequest" + self.__discriminator_value = "ScheduleFoodEstablishmentReservationRequest" # type: str self.object_type = self.__discriminator_value super(ScheduleFoodEstablishmentReservationRequest, self).__init__(object_type=self.__discriminator_value, version=version) @@ -82,7 +82,7 @@ def __init__(self, version=None, start_time=None, party_size=None, restaurant=No def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/connections/requests/schedule_taxi_reservation_request.py b/ask-sdk-model/ask_sdk_model/interfaces/connections/requests/schedule_taxi_reservation_request.py index d2e3214..f31cb92 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/connections/requests/schedule_taxi_reservation_request.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/connections/requests/schedule_taxi_reservation_request.py @@ -51,7 +51,7 @@ class ScheduleTaxiReservationRequest(BaseRequest): 'party_size': 'str', 'pickup_location': 'ask_sdk_model.interfaces.connections.entities.postal_address.PostalAddress', 'drop_off_location': 'ask_sdk_model.interfaces.connections.entities.postal_address.PostalAddress' - } + } # type: Dict attribute_map = { 'object_type': '@type', @@ -60,7 +60,7 @@ class ScheduleTaxiReservationRequest(BaseRequest): 'party_size': 'partySize', 'pickup_location': 'pickupLocation', 'drop_off_location': 'dropOffLocation' - } +} # type: Dict def __init__(self, version=None, pickup_time=None, party_size=None, pickup_location=None, drop_off_location=None): # type: (Optional[str], Optional[str], Optional[str], Optional[PostalAddress], Optional[PostalAddress]) -> None @@ -77,7 +77,7 @@ def __init__(self, version=None, pickup_time=None, party_size=None, pickup_locat :param drop_off_location: drop off location :type drop_off_location: (optional) ask_sdk_model.interfaces.connections.entities.postal_address.PostalAddress """ - self.__discriminator_value = "ScheduleTaxiReservationRequest" + self.__discriminator_value = "ScheduleTaxiReservationRequest" # type: str self.object_type = self.__discriminator_value super(ScheduleTaxiReservationRequest, self).__init__(object_type=self.__discriminator_value, version=version) @@ -89,7 +89,7 @@ def __init__(self, version=None, pickup_time=None, party_size=None, pickup_locat def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/connections/send_request_directive.py b/ask-sdk-model/ask_sdk_model/interfaces/connections/send_request_directive.py index 0e98aa9..6bcad6d 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/connections/send_request_directive.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/connections/send_request_directive.py @@ -44,14 +44,14 @@ class SendRequestDirective(Directive): 'name': 'str', 'payload': 'dict(str, object)', 'token': 'str' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'name': 'name', 'payload': 'payload', 'token': 'token' - } +} # type: Dict def __init__(self, name=None, payload=None, token=None): # type: (Optional[str], Optional[Dict[str, object]], Optional[str]) -> None @@ -64,7 +64,7 @@ def __init__(self, name=None, payload=None, token=None): :param token: This is an echo back string that skills send when during Connections.SendRequest directive. They will receive it when they get the ConnectionsResponse. It is never sent to the skill handling the request. :type token: (optional) str """ - self.__discriminator_value = "Connections.SendRequest" + self.__discriminator_value = "Connections.SendRequest" # type: str self.object_type = self.__discriminator_value super(SendRequestDirective, self).__init__(object_type=self.__discriminator_value) @@ -75,7 +75,7 @@ def __init__(self, name=None, payload=None, token=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/connections/send_response_directive.py b/ask-sdk-model/ask_sdk_model/interfaces/connections/send_response_directive.py index f4b28b3..1fbd5b0 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/connections/send_response_directive.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/connections/send_response_directive.py @@ -42,13 +42,13 @@ class SendResponseDirective(Directive): 'object_type': 'str', 'status': 'ask_sdk_model.interfaces.connections.connections_status.ConnectionsStatus', 'payload': 'dict(str, object)' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'status': 'status', 'payload': 'payload' - } +} # type: Dict def __init__(self, status=None, payload=None): # type: (Optional[ConnectionsStatus], Optional[Dict[str, object]]) -> None @@ -59,7 +59,7 @@ def __init__(self, status=None, payload=None): :param payload: This is an object sent to referrer skill as is. :type payload: (optional) dict(str, object) """ - self.__discriminator_value = "Connections.SendResponse" + self.__discriminator_value = "Connections.SendResponse" # type: str self.object_type = self.__discriminator_value super(SendResponseDirective, self).__init__(object_type=self.__discriminator_value) @@ -69,7 +69,7 @@ def __init__(self, status=None, payload=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/display/body_template1.py b/ask-sdk-model/ask_sdk_model/interfaces/display/body_template1.py index bdd98b9..4d5f508 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/display/body_template1.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/display/body_template1.py @@ -51,7 +51,7 @@ class BodyTemplate1(Template): 'background_image': 'ask_sdk_model.interfaces.display.image.Image', 'title': 'str', 'text_content': 'ask_sdk_model.interfaces.display.text_content.TextContent' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -60,7 +60,7 @@ class BodyTemplate1(Template): 'background_image': 'backgroundImage', 'title': 'title', 'text_content': 'textContent' - } +} # type: Dict def __init__(self, token=None, back_button=None, background_image=None, title=None, text_content=None): # type: (Optional[str], Optional[BackButtonBehavior], Optional[Image], Optional[str], Optional[TextContent]) -> None @@ -77,7 +77,7 @@ def __init__(self, token=None, back_button=None, background_image=None, title=No :param text_content: :type text_content: (optional) ask_sdk_model.interfaces.display.text_content.TextContent """ - self.__discriminator_value = "BodyTemplate1" + self.__discriminator_value = "BodyTemplate1" # type: str self.object_type = self.__discriminator_value super(BodyTemplate1, self).__init__(object_type=self.__discriminator_value, token=token, back_button=back_button) @@ -88,7 +88,7 @@ def __init__(self, token=None, back_button=None, background_image=None, title=No def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/display/body_template2.py b/ask-sdk-model/ask_sdk_model/interfaces/display/body_template2.py index f6343e2..f3238af 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/display/body_template2.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/display/body_template2.py @@ -54,7 +54,7 @@ class BodyTemplate2(Template): 'image': 'ask_sdk_model.interfaces.display.image.Image', 'title': 'str', 'text_content': 'ask_sdk_model.interfaces.display.text_content.TextContent' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -64,7 +64,7 @@ class BodyTemplate2(Template): 'image': 'image', 'title': 'title', 'text_content': 'textContent' - } +} # type: Dict def __init__(self, token=None, back_button=None, background_image=None, image=None, title=None, text_content=None): # type: (Optional[str], Optional[BackButtonBehavior], Optional[Image], Optional[Image], Optional[str], Optional[TextContent]) -> None @@ -83,7 +83,7 @@ def __init__(self, token=None, back_button=None, background_image=None, image=No :param text_content: :type text_content: (optional) ask_sdk_model.interfaces.display.text_content.TextContent """ - self.__discriminator_value = "BodyTemplate2" + self.__discriminator_value = "BodyTemplate2" # type: str self.object_type = self.__discriminator_value super(BodyTemplate2, self).__init__(object_type=self.__discriminator_value, token=token, back_button=back_button) @@ -95,7 +95,7 @@ def __init__(self, token=None, back_button=None, background_image=None, image=No def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/display/body_template3.py b/ask-sdk-model/ask_sdk_model/interfaces/display/body_template3.py index 67d0db5..cc7043e 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/display/body_template3.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/display/body_template3.py @@ -54,7 +54,7 @@ class BodyTemplate3(Template): 'image': 'ask_sdk_model.interfaces.display.image.Image', 'title': 'str', 'text_content': 'ask_sdk_model.interfaces.display.text_content.TextContent' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -64,7 +64,7 @@ class BodyTemplate3(Template): 'image': 'image', 'title': 'title', 'text_content': 'textContent' - } +} # type: Dict def __init__(self, token=None, back_button=None, background_image=None, image=None, title=None, text_content=None): # type: (Optional[str], Optional[BackButtonBehavior], Optional[Image], Optional[Image], Optional[str], Optional[TextContent]) -> None @@ -83,7 +83,7 @@ def __init__(self, token=None, back_button=None, background_image=None, image=No :param text_content: :type text_content: (optional) ask_sdk_model.interfaces.display.text_content.TextContent """ - self.__discriminator_value = "BodyTemplate3" + self.__discriminator_value = "BodyTemplate3" # type: str self.object_type = self.__discriminator_value super(BodyTemplate3, self).__init__(object_type=self.__discriminator_value, token=token, back_button=back_button) @@ -95,7 +95,7 @@ def __init__(self, token=None, back_button=None, background_image=None, image=No def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/display/body_template6.py b/ask-sdk-model/ask_sdk_model/interfaces/display/body_template6.py index 7216f5c..c31f266 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/display/body_template6.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/display/body_template6.py @@ -51,7 +51,7 @@ class BodyTemplate6(Template): 'background_image': 'ask_sdk_model.interfaces.display.image.Image', 'text_content': 'ask_sdk_model.interfaces.display.text_content.TextContent', 'image': 'ask_sdk_model.interfaces.display.image.Image' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -60,7 +60,7 @@ class BodyTemplate6(Template): 'background_image': 'backgroundImage', 'text_content': 'textContent', 'image': 'image' - } +} # type: Dict def __init__(self, token=None, back_button=None, background_image=None, text_content=None, image=None): # type: (Optional[str], Optional[BackButtonBehavior], Optional[Image], Optional[TextContent], Optional[Image]) -> None @@ -77,7 +77,7 @@ def __init__(self, token=None, back_button=None, background_image=None, text_con :param image: :type image: (optional) ask_sdk_model.interfaces.display.image.Image """ - self.__discriminator_value = "BodyTemplate6" + self.__discriminator_value = "BodyTemplate6" # type: str self.object_type = self.__discriminator_value super(BodyTemplate6, self).__init__(object_type=self.__discriminator_value, token=token, back_button=back_button) @@ -88,7 +88,7 @@ def __init__(self, token=None, back_button=None, background_image=None, text_con def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/display/body_template7.py b/ask-sdk-model/ask_sdk_model/interfaces/display/body_template7.py index 5659aab..02d691a 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/display/body_template7.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/display/body_template7.py @@ -50,7 +50,7 @@ class BodyTemplate7(Template): 'title': 'str', 'image': 'ask_sdk_model.interfaces.display.image.Image', 'background_image': 'ask_sdk_model.interfaces.display.image.Image' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -59,7 +59,7 @@ class BodyTemplate7(Template): 'title': 'title', 'image': 'image', 'background_image': 'backgroundImage' - } +} # type: Dict def __init__(self, token=None, back_button=None, title=None, image=None, background_image=None): # type: (Optional[str], Optional[BackButtonBehavior], Optional[str], Optional[Image], Optional[Image]) -> None @@ -76,7 +76,7 @@ def __init__(self, token=None, back_button=None, title=None, image=None, backgro :param background_image: :type background_image: (optional) ask_sdk_model.interfaces.display.image.Image """ - self.__discriminator_value = "BodyTemplate7" + self.__discriminator_value = "BodyTemplate7" # type: str self.object_type = self.__discriminator_value super(BodyTemplate7, self).__init__(object_type=self.__discriminator_value, token=token, back_button=back_button) @@ -87,7 +87,7 @@ def __init__(self, token=None, back_button=None, title=None, image=None, backgro def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/display/display_interface.py b/ask-sdk-model/ask_sdk_model/interfaces/display/display_interface.py index 37fc91d..abd5c95 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/display/display_interface.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/display/display_interface.py @@ -37,12 +37,12 @@ class DisplayInterface(object): deserialized_types = { 'template_version': 'str', 'markup_version': 'str' - } + } # type: Dict attribute_map = { 'template_version': 'templateVersion', 'markup_version': 'markupVersion' - } +} # type: Dict def __init__(self, template_version=None, markup_version=None): # type: (Optional[str], Optional[str]) -> None @@ -53,7 +53,7 @@ def __init__(self, template_version=None, markup_version=None): :param markup_version: :type markup_version: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.template_version = template_version self.markup_version = markup_version @@ -61,7 +61,7 @@ def __init__(self, template_version=None, markup_version=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/display/display_state.py b/ask-sdk-model/ask_sdk_model/interfaces/display/display_state.py index 94abfc6..0ff9193 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/display/display_state.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/display/display_state.py @@ -34,11 +34,11 @@ class DisplayState(object): """ deserialized_types = { 'token': 'str' - } + } # type: Dict attribute_map = { 'token': 'token' - } +} # type: Dict def __init__(self, token=None): # type: (Optional[str]) -> None @@ -47,14 +47,14 @@ def __init__(self, token=None): :param token: :type token: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.token = token def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/display/element_selected_request.py b/ask-sdk-model/ask_sdk_model/interfaces/display/element_selected_request.py index ae30535..ccccfa8 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/display/element_selected_request.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/display/element_selected_request.py @@ -45,7 +45,7 @@ class ElementSelectedRequest(Request): 'timestamp': 'datetime', 'locale': 'str', 'token': 'str' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -53,7 +53,7 @@ class ElementSelectedRequest(Request): 'timestamp': 'timestamp', 'locale': 'locale', 'token': 'token' - } +} # type: Dict def __init__(self, request_id=None, timestamp=None, locale=None, token=None): # type: (Optional[str], Optional[datetime], Optional[str], Optional[str]) -> None @@ -68,7 +68,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, token=None): :param token: :type token: (optional) str """ - self.__discriminator_value = "Display.ElementSelected" + self.__discriminator_value = "Display.ElementSelected" # type: str self.object_type = self.__discriminator_value super(ElementSelectedRequest, self).__init__(object_type=self.__discriminator_value, request_id=request_id, timestamp=timestamp, locale=locale) @@ -77,7 +77,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, token=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/display/hint.py b/ask-sdk-model/ask_sdk_model/interfaces/display/hint.py index 1cba6ad..47e762e 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/display/hint.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/display/hint.py @@ -42,11 +42,11 @@ class Hint(object): """ deserialized_types = { 'object_type': 'str' - } + } # type: Dict attribute_map = { 'object_type': 'type' - } +} # type: Dict discriminator_value_class_map = { 'PlainText': 'ask_sdk_model.interfaces.display.plain_text_hint.PlainTextHint' @@ -64,13 +64,13 @@ def __init__(self, object_type=None): :param object_type: :type object_type: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.object_type = object_type @classmethod def get_real_child_model(cls, data): - # type: (Dict[str, str]) -> str + # type: (Dict[str, str]) -> Optional[str] """Returns the real base class specified by the discriminator""" discriminator_value = data[cls.json_discriminator_key] return cls.discriminator_value_class_map.get(discriminator_value) @@ -78,7 +78,7 @@ def get_real_child_model(cls, data): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/display/hint_directive.py b/ask-sdk-model/ask_sdk_model/interfaces/display/hint_directive.py index 98e720a..fc013ba 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/display/hint_directive.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/display/hint_directive.py @@ -37,12 +37,12 @@ class HintDirective(Directive): deserialized_types = { 'object_type': 'str', 'hint': 'ask_sdk_model.interfaces.display.hint.Hint' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'hint': 'hint' - } +} # type: Dict def __init__(self, hint=None): # type: (Optional[Hint]) -> None @@ -51,7 +51,7 @@ def __init__(self, hint=None): :param hint: :type hint: (optional) ask_sdk_model.interfaces.display.hint.Hint """ - self.__discriminator_value = "Hint" + self.__discriminator_value = "Hint" # type: str self.object_type = self.__discriminator_value super(HintDirective, self).__init__(object_type=self.__discriminator_value) @@ -60,7 +60,7 @@ def __init__(self, hint=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/display/image.py b/ask-sdk-model/ask_sdk_model/interfaces/display/image.py index 524b6a1..195f6df 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/display/image.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/display/image.py @@ -38,12 +38,12 @@ class Image(object): deserialized_types = { 'content_description': 'str', 'sources': 'list[ask_sdk_model.interfaces.display.image_instance.ImageInstance]' - } + } # type: Dict attribute_map = { 'content_description': 'contentDescription', 'sources': 'sources' - } +} # type: Dict def __init__(self, content_description=None, sources=None): # type: (Optional[str], Optional[List[ImageInstance]]) -> None @@ -54,7 +54,7 @@ def __init__(self, content_description=None, sources=None): :param sources: :type sources: (optional) list[ask_sdk_model.interfaces.display.image_instance.ImageInstance] """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.content_description = content_description self.sources = sources @@ -62,7 +62,7 @@ def __init__(self, content_description=None, sources=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/display/image_instance.py b/ask-sdk-model/ask_sdk_model/interfaces/display/image_instance.py index 50285ac..63e9f16 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/display/image_instance.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/display/image_instance.py @@ -44,14 +44,14 @@ class ImageInstance(object): 'size': 'ask_sdk_model.interfaces.display.image_size.ImageSize', 'width_pixels': 'int', 'height_pixels': 'int' - } + } # type: Dict attribute_map = { 'url': 'url', 'size': 'size', 'width_pixels': 'widthPixels', 'height_pixels': 'heightPixels' - } +} # type: Dict def __init__(self, url=None, size=None, width_pixels=None, height_pixels=None): # type: (Optional[str], Optional[ImageSize], Optional[int], Optional[int]) -> None @@ -66,7 +66,7 @@ def __init__(self, url=None, size=None, width_pixels=None, height_pixels=None): :param height_pixels: :type height_pixels: (optional) int """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.url = url self.size = size @@ -76,7 +76,7 @@ def __init__(self, url=None, size=None, width_pixels=None, height_pixels=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/display/list_item.py b/ask-sdk-model/ask_sdk_model/interfaces/display/list_item.py index 70bb776..8ae3d8c 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/display/list_item.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/display/list_item.py @@ -42,13 +42,13 @@ class ListItem(object): 'token': 'str', 'image': 'ask_sdk_model.interfaces.display.image.Image', 'text_content': 'ask_sdk_model.interfaces.display.text_content.TextContent' - } + } # type: Dict attribute_map = { 'token': 'token', 'image': 'image', 'text_content': 'textContent' - } +} # type: Dict def __init__(self, token=None, image=None, text_content=None): # type: (Optional[str], Optional[Image], Optional[TextContent]) -> None @@ -61,7 +61,7 @@ def __init__(self, token=None, image=None, text_content=None): :param text_content: :type text_content: (optional) ask_sdk_model.interfaces.display.text_content.TextContent """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.token = token self.image = image @@ -70,7 +70,7 @@ def __init__(self, token=None, image=None, text_content=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/display/list_template1.py b/ask-sdk-model/ask_sdk_model/interfaces/display/list_template1.py index 4b1e640..e27fb2e 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/display/list_template1.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/display/list_template1.py @@ -51,7 +51,7 @@ class ListTemplate1(Template): 'background_image': 'ask_sdk_model.interfaces.display.image.Image', 'title': 'str', 'list_items': 'list[ask_sdk_model.interfaces.display.list_item.ListItem]' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -60,7 +60,7 @@ class ListTemplate1(Template): 'background_image': 'backgroundImage', 'title': 'title', 'list_items': 'listItems' - } +} # type: Dict def __init__(self, token=None, back_button=None, background_image=None, title=None, list_items=None): # type: (Optional[str], Optional[BackButtonBehavior], Optional[Image], Optional[str], Optional[List[ListItem]]) -> None @@ -77,7 +77,7 @@ def __init__(self, token=None, back_button=None, background_image=None, title=No :param list_items: :type list_items: (optional) list[ask_sdk_model.interfaces.display.list_item.ListItem] """ - self.__discriminator_value = "ListTemplate1" + self.__discriminator_value = "ListTemplate1" # type: str self.object_type = self.__discriminator_value super(ListTemplate1, self).__init__(object_type=self.__discriminator_value, token=token, back_button=back_button) @@ -88,7 +88,7 @@ def __init__(self, token=None, back_button=None, background_image=None, title=No def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/display/list_template2.py b/ask-sdk-model/ask_sdk_model/interfaces/display/list_template2.py index eb2d246..5cd33c9 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/display/list_template2.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/display/list_template2.py @@ -51,7 +51,7 @@ class ListTemplate2(Template): 'background_image': 'ask_sdk_model.interfaces.display.image.Image', 'title': 'str', 'list_items': 'list[ask_sdk_model.interfaces.display.list_item.ListItem]' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -60,7 +60,7 @@ class ListTemplate2(Template): 'background_image': 'backgroundImage', 'title': 'title', 'list_items': 'listItems' - } +} # type: Dict def __init__(self, token=None, back_button=None, background_image=None, title=None, list_items=None): # type: (Optional[str], Optional[BackButtonBehavior], Optional[Image], Optional[str], Optional[List[ListItem]]) -> None @@ -77,7 +77,7 @@ def __init__(self, token=None, back_button=None, background_image=None, title=No :param list_items: :type list_items: (optional) list[ask_sdk_model.interfaces.display.list_item.ListItem] """ - self.__discriminator_value = "ListTemplate2" + self.__discriminator_value = "ListTemplate2" # type: str self.object_type = self.__discriminator_value super(ListTemplate2, self).__init__(object_type=self.__discriminator_value, token=token, back_button=back_button) @@ -88,7 +88,7 @@ def __init__(self, token=None, back_button=None, background_image=None, title=No def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/display/plain_text.py b/ask-sdk-model/ask_sdk_model/interfaces/display/plain_text.py index bab176c..4541263 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/display/plain_text.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/display/plain_text.py @@ -36,12 +36,12 @@ class PlainText(TextField): deserialized_types = { 'object_type': 'str', 'text': 'str' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'text': 'text' - } +} # type: Dict def __init__(self, text=None): # type: (Optional[str]) -> None @@ -50,7 +50,7 @@ def __init__(self, text=None): :param text: :type text: (optional) str """ - self.__discriminator_value = "PlainText" + self.__discriminator_value = "PlainText" # type: str self.object_type = self.__discriminator_value super(PlainText, self).__init__(object_type=self.__discriminator_value) @@ -59,7 +59,7 @@ def __init__(self, text=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/display/plain_text_hint.py b/ask-sdk-model/ask_sdk_model/interfaces/display/plain_text_hint.py index ebf2aed..ba1075f 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/display/plain_text_hint.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/display/plain_text_hint.py @@ -36,12 +36,12 @@ class PlainTextHint(Hint): deserialized_types = { 'object_type': 'str', 'text': 'str' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'text': 'text' - } +} # type: Dict def __init__(self, text=None): # type: (Optional[str]) -> None @@ -50,7 +50,7 @@ def __init__(self, text=None): :param text: :type text: (optional) str """ - self.__discriminator_value = "PlainText" + self.__discriminator_value = "PlainText" # type: str self.object_type = self.__discriminator_value super(PlainTextHint, self).__init__(object_type=self.__discriminator_value) @@ -59,7 +59,7 @@ def __init__(self, text=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/display/py.typed b/ask-sdk-model/ask_sdk_model/interfaces/display/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/interfaces/display/render_template_directive.py b/ask-sdk-model/ask_sdk_model/interfaces/display/render_template_directive.py index 15862a2..ecd3080 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/display/render_template_directive.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/display/render_template_directive.py @@ -37,12 +37,12 @@ class RenderTemplateDirective(Directive): deserialized_types = { 'object_type': 'str', 'template': 'ask_sdk_model.interfaces.display.template.Template' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'template': 'template' - } +} # type: Dict def __init__(self, template=None): # type: (Optional[Template]) -> None @@ -51,7 +51,7 @@ def __init__(self, template=None): :param template: :type template: (optional) ask_sdk_model.interfaces.display.template.Template """ - self.__discriminator_value = "Display.RenderTemplate" + self.__discriminator_value = "Display.RenderTemplate" # type: str self.object_type = self.__discriminator_value super(RenderTemplateDirective, self).__init__(object_type=self.__discriminator_value) @@ -60,7 +60,7 @@ def __init__(self, template=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/display/rich_text.py b/ask-sdk-model/ask_sdk_model/interfaces/display/rich_text.py index c51d106..c53aeaa 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/display/rich_text.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/display/rich_text.py @@ -36,12 +36,12 @@ class RichText(TextField): deserialized_types = { 'object_type': 'str', 'text': 'str' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'text': 'text' - } +} # type: Dict def __init__(self, text=None): # type: (Optional[str]) -> None @@ -50,7 +50,7 @@ def __init__(self, text=None): :param text: :type text: (optional) str """ - self.__discriminator_value = "RichText" + self.__discriminator_value = "RichText" # type: str self.object_type = self.__discriminator_value super(RichText, self).__init__(object_type=self.__discriminator_value) @@ -59,7 +59,7 @@ def __init__(self, text=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/display/template.py b/ask-sdk-model/ask_sdk_model/interfaces/display/template.py index 733840a..522efd1 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/display/template.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/display/template.py @@ -61,13 +61,13 @@ class Template(object): 'object_type': 'str', 'token': 'str', 'back_button': 'ask_sdk_model.interfaces.display.back_button_behavior.BackButtonBehavior' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'token': 'token', 'back_button': 'backButton' - } +} # type: Dict discriminator_value_class_map = { 'ListTemplate2': 'ask_sdk_model.interfaces.display.list_template2.ListTemplate2', @@ -95,7 +95,7 @@ def __init__(self, object_type=None, token=None, back_button=None): :param back_button: :type back_button: (optional) ask_sdk_model.interfaces.display.back_button_behavior.BackButtonBehavior """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.object_type = object_type self.token = token @@ -103,7 +103,7 @@ def __init__(self, object_type=None, token=None, back_button=None): @classmethod def get_real_child_model(cls, data): - # type: (Dict[str, str]) -> str + # type: (Dict[str, str]) -> Optional[str] """Returns the real base class specified by the discriminator""" discriminator_value = data[cls.json_discriminator_key] return cls.discriminator_value_class_map.get(discriminator_value) @@ -111,7 +111,7 @@ def get_real_child_model(cls, data): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/display/text_content.py b/ask-sdk-model/ask_sdk_model/interfaces/display/text_content.py index 4a206b6..3894221 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/display/text_content.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/display/text_content.py @@ -41,13 +41,13 @@ class TextContent(object): 'primary_text': 'ask_sdk_model.interfaces.display.text_field.TextField', 'secondary_text': 'ask_sdk_model.interfaces.display.text_field.TextField', 'tertiary_text': 'ask_sdk_model.interfaces.display.text_field.TextField' - } + } # type: Dict attribute_map = { 'primary_text': 'primaryText', 'secondary_text': 'secondaryText', 'tertiary_text': 'tertiaryText' - } +} # type: Dict def __init__(self, primary_text=None, secondary_text=None, tertiary_text=None): # type: (Optional[TextField], Optional[TextField], Optional[TextField]) -> None @@ -60,7 +60,7 @@ def __init__(self, primary_text=None, secondary_text=None, tertiary_text=None): :param tertiary_text: :type tertiary_text: (optional) ask_sdk_model.interfaces.display.text_field.TextField """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.primary_text = primary_text self.secondary_text = secondary_text @@ -69,7 +69,7 @@ def __init__(self, primary_text=None, secondary_text=None, tertiary_text=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/display/text_field.py b/ask-sdk-model/ask_sdk_model/interfaces/display/text_field.py index 7eaedb1..c02cb43 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/display/text_field.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/display/text_field.py @@ -44,11 +44,11 @@ class TextField(object): """ deserialized_types = { 'object_type': 'str' - } + } # type: Dict attribute_map = { 'object_type': 'type' - } +} # type: Dict discriminator_value_class_map = { 'RichText': 'ask_sdk_model.interfaces.display.rich_text.RichText', @@ -67,13 +67,13 @@ def __init__(self, object_type=None): :param object_type: :type object_type: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.object_type = object_type @classmethod def get_real_child_model(cls, data): - # type: (Dict[str, str]) -> str + # type: (Dict[str, str]) -> Optional[str] """Returns the real base class specified by the discriminator""" discriminator_value = data[cls.json_discriminator_key] return cls.discriminator_value_class_map.get(discriminator_value) @@ -81,7 +81,7 @@ def get_real_child_model(cls, data): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/gadget_controller/py.typed b/ask-sdk-model/ask_sdk_model/interfaces/gadget_controller/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/interfaces/gadget_controller/set_light_directive.py b/ask-sdk-model/ask_sdk_model/interfaces/gadget_controller/set_light_directive.py index b92b3fd..a46b5c7 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/gadget_controller/set_light_directive.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/gadget_controller/set_light_directive.py @@ -45,14 +45,14 @@ class SetLightDirective(Directive): 'version': 'int', 'target_gadgets': 'list[str]', 'parameters': 'ask_sdk_model.services.gadget_controller.set_light_parameters.SetLightParameters' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'version': 'version', 'target_gadgets': 'targetGadgets', 'parameters': 'parameters' - } +} # type: Dict def __init__(self, version=None, target_gadgets=None, parameters=None): # type: (Optional[int], Optional[List[object]], Optional[SetLightParameters]) -> None @@ -65,7 +65,7 @@ def __init__(self, version=None, target_gadgets=None, parameters=None): :param parameters: :type parameters: (optional) ask_sdk_model.services.gadget_controller.set_light_parameters.SetLightParameters """ - self.__discriminator_value = "GadgetController.SetLight" + self.__discriminator_value = "GadgetController.SetLight" # type: str self.object_type = self.__discriminator_value super(SetLightDirective, self).__init__(object_type=self.__discriminator_value) @@ -76,7 +76,7 @@ def __init__(self, version=None, target_gadgets=None, parameters=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/game_engine/input_handler_event_request.py b/ask-sdk-model/ask_sdk_model/interfaces/game_engine/input_handler_event_request.py index 97f8671..c029e6d 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/game_engine/input_handler_event_request.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/game_engine/input_handler_event_request.py @@ -51,7 +51,7 @@ class InputHandlerEventRequest(Request): 'locale': 'str', 'originating_request_id': 'str', 'events': 'list[ask_sdk_model.services.game_engine.input_handler_event.InputHandlerEvent]' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -60,7 +60,7 @@ class InputHandlerEventRequest(Request): 'locale': 'locale', 'originating_request_id': 'originatingRequestId', 'events': 'events' - } +} # type: Dict def __init__(self, request_id=None, timestamp=None, locale=None, originating_request_id=None, events=None): # type: (Optional[str], Optional[datetime], Optional[str], Optional[str], Optional[List[InputHandlerEvent]]) -> None @@ -77,7 +77,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, originating_req :param events: :type events: (optional) list[ask_sdk_model.services.game_engine.input_handler_event.InputHandlerEvent] """ - self.__discriminator_value = "GameEngine.InputHandlerEvent" + self.__discriminator_value = "GameEngine.InputHandlerEvent" # type: str self.object_type = self.__discriminator_value super(InputHandlerEventRequest, self).__init__(object_type=self.__discriminator_value, request_id=request_id, timestamp=timestamp, locale=locale) @@ -87,7 +87,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, originating_req def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/game_engine/py.typed b/ask-sdk-model/ask_sdk_model/interfaces/game_engine/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/interfaces/game_engine/start_input_handler_directive.py b/ask-sdk-model/ask_sdk_model/interfaces/game_engine/start_input_handler_directive.py index 2e4b7cd..5477084 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/game_engine/start_input_handler_directive.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/game_engine/start_input_handler_directive.py @@ -47,7 +47,7 @@ class StartInputHandlerDirective(Directive): 'proxies': 'list[str]', 'recognizers': 'dict(str, ask_sdk_model.services.game_engine.recognizer.Recognizer)', 'events': 'dict(str, ask_sdk_model.services.game_engine.event.Event)' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -55,7 +55,7 @@ class StartInputHandlerDirective(Directive): 'proxies': 'proxies', 'recognizers': 'recognizers', 'events': 'events' - } +} # type: Dict def __init__(self, timeout=None, proxies=None, recognizers=None, events=None): # type: (Optional[int], Optional[List[object]], Optional[Dict[str, Recognizer]], Optional[Dict[str, Event]]) -> None @@ -70,7 +70,7 @@ def __init__(self, timeout=None, proxies=None, recognizers=None, events=None): :param events: The logic that determines when your skill is notified of Echo Button input. Events are listed here as object keys, where the keys specify the name of an event. :type events: (optional) dict(str, ask_sdk_model.services.game_engine.event.Event) """ - self.__discriminator_value = "GameEngine.StartInputHandler" + self.__discriminator_value = "GameEngine.StartInputHandler" # type: str self.object_type = self.__discriminator_value super(StartInputHandlerDirective, self).__init__(object_type=self.__discriminator_value) @@ -82,7 +82,7 @@ def __init__(self, timeout=None, proxies=None, recognizers=None, events=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/game_engine/stop_input_handler_directive.py b/ask-sdk-model/ask_sdk_model/interfaces/game_engine/stop_input_handler_directive.py index fb07bb7..5e6058b 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/game_engine/stop_input_handler_directive.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/game_engine/stop_input_handler_directive.py @@ -36,12 +36,12 @@ class StopInputHandlerDirective(Directive): deserialized_types = { 'object_type': 'str', 'originating_request_id': 'str' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'originating_request_id': 'originatingRequestId' - } +} # type: Dict def __init__(self, originating_request_id=None): # type: (Optional[str]) -> None @@ -50,7 +50,7 @@ def __init__(self, originating_request_id=None): :param originating_request_id: The `requestId` of the request that started the input handler. :type originating_request_id: (optional) str """ - self.__discriminator_value = "GameEngine.StopInputHandler" + self.__discriminator_value = "GameEngine.StopInputHandler" # type: str self.object_type = self.__discriminator_value super(StopInputHandlerDirective, self).__init__(object_type=self.__discriminator_value) @@ -59,7 +59,7 @@ def __init__(self, originating_request_id=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/geolocation/altitude.py b/ask-sdk-model/ask_sdk_model/interfaces/geolocation/altitude.py index 3010158..ec7a5cb 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/geolocation/altitude.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/geolocation/altitude.py @@ -39,12 +39,12 @@ class Altitude(object): deserialized_types = { 'altitude_in_meters': 'float', 'accuracy_in_meters': 'float' - } + } # type: Dict attribute_map = { 'altitude_in_meters': 'altitudeInMeters', 'accuracy_in_meters': 'accuracyInMeters' - } +} # type: Dict def __init__(self, altitude_in_meters=None, accuracy_in_meters=None): # type: (Optional[float], Optional[float]) -> None @@ -55,7 +55,7 @@ def __init__(self, altitude_in_meters=None, accuracy_in_meters=None): :param accuracy_in_meters: A double representing the accuracy of the altitude measurement in meters. :type accuracy_in_meters: (optional) float """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.altitude_in_meters = altitude_in_meters self.accuracy_in_meters = accuracy_in_meters @@ -63,7 +63,7 @@ def __init__(self, altitude_in_meters=None, accuracy_in_meters=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/geolocation/coordinate.py b/ask-sdk-model/ask_sdk_model/interfaces/geolocation/coordinate.py index c323404..824ae4a 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/geolocation/coordinate.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/geolocation/coordinate.py @@ -42,13 +42,13 @@ class Coordinate(object): 'latitude_in_degrees': 'float', 'longitude_in_degrees': 'float', 'accuracy_in_meters': 'float' - } + } # type: Dict attribute_map = { 'latitude_in_degrees': 'latitudeInDegrees', 'longitude_in_degrees': 'longitudeInDegrees', 'accuracy_in_meters': 'accuracyInMeters' - } +} # type: Dict def __init__(self, latitude_in_degrees=None, longitude_in_degrees=None, accuracy_in_meters=None): # type: (Optional[float], Optional[float], Optional[float]) -> None @@ -61,7 +61,7 @@ def __init__(self, latitude_in_degrees=None, longitude_in_degrees=None, accuracy :param accuracy_in_meters: A double representing the accuracy of geolocation data in meters. :type accuracy_in_meters: (optional) float """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.latitude_in_degrees = latitude_in_degrees self.longitude_in_degrees = longitude_in_degrees @@ -70,7 +70,7 @@ def __init__(self, latitude_in_degrees=None, longitude_in_degrees=None, accuracy def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/geolocation/geolocation_interface.py b/ask-sdk-model/ask_sdk_model/interfaces/geolocation/geolocation_interface.py index 8895b8b..1024634 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/geolocation/geolocation_interface.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/geolocation/geolocation_interface.py @@ -31,22 +31,22 @@ class GeolocationInterface(object): """ deserialized_types = { - } + } # type: Dict attribute_map = { - } +} # type: Dict def __init__(self): # type: () -> None """ """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/geolocation/geolocation_state.py b/ask-sdk-model/ask_sdk_model/interfaces/geolocation/geolocation_state.py index dbdf4e0..cbecf3b 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/geolocation/geolocation_state.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/geolocation/geolocation_state.py @@ -54,7 +54,7 @@ class GeolocationState(object): 'heading': 'ask_sdk_model.interfaces.geolocation.heading.Heading', 'speed': 'ask_sdk_model.interfaces.geolocation.speed.Speed', 'location_services': 'ask_sdk_model.interfaces.geolocation.location_services.LocationServices' - } + } # type: Dict attribute_map = { 'timestamp': 'timestamp', @@ -63,7 +63,7 @@ class GeolocationState(object): 'heading': 'heading', 'speed': 'speed', 'location_services': 'locationServices' - } +} # type: Dict def __init__(self, timestamp=None, coordinate=None, altitude=None, heading=None, speed=None, location_services=None): # type: (Optional[str], Optional[Coordinate], Optional[Altitude], Optional[Heading], Optional[Speed], Optional[LocationServices]) -> None @@ -82,7 +82,7 @@ def __init__(self, timestamp=None, coordinate=None, altitude=None, heading=None, :param location_services: :type location_services: (optional) ask_sdk_model.interfaces.geolocation.location_services.LocationServices """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.timestamp = timestamp self.coordinate = coordinate @@ -94,7 +94,7 @@ def __init__(self, timestamp=None, coordinate=None, altitude=None, heading=None, def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/geolocation/heading.py b/ask-sdk-model/ask_sdk_model/interfaces/geolocation/heading.py index 87d1922..8df0d34 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/geolocation/heading.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/geolocation/heading.py @@ -39,12 +39,12 @@ class Heading(object): deserialized_types = { 'direction_in_degrees': 'float', 'accuracy_in_degrees': 'float' - } + } # type: Dict attribute_map = { 'direction_in_degrees': 'directionInDegrees', 'accuracy_in_degrees': 'accuracyInDegrees' - } +} # type: Dict def __init__(self, direction_in_degrees=None, accuracy_in_degrees=None): # type: (Optional[float], Optional[float]) -> None @@ -55,7 +55,7 @@ def __init__(self, direction_in_degrees=None, accuracy_in_degrees=None): :param accuracy_in_degrees: A double representing the accuracy of the heading measurement in degrees. :type accuracy_in_degrees: (optional) float """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.direction_in_degrees = direction_in_degrees self.accuracy_in_degrees = accuracy_in_degrees @@ -63,7 +63,7 @@ def __init__(self, direction_in_degrees=None, accuracy_in_degrees=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/geolocation/location_services.py b/ask-sdk-model/ask_sdk_model/interfaces/geolocation/location_services.py index e0db7c7..f271b51 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/geolocation/location_services.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/geolocation/location_services.py @@ -41,12 +41,12 @@ class LocationServices(object): deserialized_types = { 'status': 'ask_sdk_model.interfaces.geolocation.status.Status', 'access': 'ask_sdk_model.interfaces.geolocation.access.Access' - } + } # type: Dict attribute_map = { 'status': 'status', 'access': 'access' - } +} # type: Dict def __init__(self, status=None, access=None): # type: (Optional[Status], Optional[Access]) -> None @@ -57,7 +57,7 @@ def __init__(self, status=None, access=None): :param access: A string representing if Alexa has access to location services running on the hostOS of device. :type access: (optional) ask_sdk_model.interfaces.geolocation.access.Access """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.status = status self.access = access @@ -65,7 +65,7 @@ def __init__(self, status=None, access=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/geolocation/py.typed b/ask-sdk-model/ask_sdk_model/interfaces/geolocation/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/interfaces/geolocation/speed.py b/ask-sdk-model/ask_sdk_model/interfaces/geolocation/speed.py index c3d4aec..b188b75 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/geolocation/speed.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/geolocation/speed.py @@ -39,12 +39,12 @@ class Speed(object): deserialized_types = { 'speed_in_meters_per_second': 'float', 'accuracy_in_meters_per_second': 'float' - } + } # type: Dict attribute_map = { 'speed_in_meters_per_second': 'speedInMetersPerSecond', 'accuracy_in_meters_per_second': 'accuracyInMetersPerSecond' - } +} # type: Dict def __init__(self, speed_in_meters_per_second=None, accuracy_in_meters_per_second=None): # type: (Optional[float], Optional[float]) -> None @@ -55,7 +55,7 @@ def __init__(self, speed_in_meters_per_second=None, accuracy_in_meters_per_secon :param accuracy_in_meters_per_second: A double representing the accuracy of the speed measurement in meters. :type accuracy_in_meters_per_second: (optional) float """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.speed_in_meters_per_second = speed_in_meters_per_second self.accuracy_in_meters_per_second = accuracy_in_meters_per_second @@ -63,7 +63,7 @@ def __init__(self, speed_in_meters_per_second=None, accuracy_in_meters_per_secon def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/messaging/message_received_request.py b/ask-sdk-model/ask_sdk_model/interfaces/messaging/message_received_request.py index f92869e..08cc0ca 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/messaging/message_received_request.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/messaging/message_received_request.py @@ -45,7 +45,7 @@ class MessageReceivedRequest(Request): 'timestamp': 'datetime', 'locale': 'str', 'message': 'dict(str, object)' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -53,7 +53,7 @@ class MessageReceivedRequest(Request): 'timestamp': 'timestamp', 'locale': 'locale', 'message': 'message' - } +} # type: Dict def __init__(self, request_id=None, timestamp=None, locale=None, message=None): # type: (Optional[str], Optional[datetime], Optional[str], Optional[Dict[str, object]]) -> None @@ -68,7 +68,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, message=None): :param message: :type message: (optional) dict(str, object) """ - self.__discriminator_value = "Messaging.MessageReceived" + self.__discriminator_value = "Messaging.MessageReceived" # type: str self.object_type = self.__discriminator_value super(MessageReceivedRequest, self).__init__(object_type=self.__discriminator_value, request_id=request_id, timestamp=timestamp, locale=locale) @@ -77,7 +77,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, message=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/messaging/py.typed b/ask-sdk-model/ask_sdk_model/interfaces/messaging/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/interfaces/monetization/py.typed b/ask-sdk-model/ask_sdk_model/interfaces/monetization/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/interfaces/monetization/v1/in_skill_product.py b/ask-sdk-model/ask_sdk_model/interfaces/monetization/v1/in_skill_product.py index 00fe188..f50004b 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/monetization/v1/in_skill_product.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/monetization/v1/in_skill_product.py @@ -36,11 +36,11 @@ class InSkillProduct(object): """ deserialized_types = { 'product_id': 'str' - } + } # type: Dict attribute_map = { 'product_id': 'productId' - } +} # type: Dict def __init__(self, product_id=None): # type: (Optional[str]) -> None @@ -49,14 +49,14 @@ def __init__(self, product_id=None): :param product_id: The product ID of In Skill Product. :type product_id: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.product_id = product_id def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/monetization/v1/py.typed b/ask-sdk-model/ask_sdk_model/interfaces/monetization/v1/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/interfaces/playbackcontroller/next_command_issued_request.py b/ask-sdk-model/ask_sdk_model/interfaces/playbackcontroller/next_command_issued_request.py index 5945f6b..ccc7cab 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/playbackcontroller/next_command_issued_request.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/playbackcontroller/next_command_issued_request.py @@ -42,14 +42,14 @@ class NextCommandIssuedRequest(Request): 'request_id': 'str', 'timestamp': 'datetime', 'locale': 'str' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'request_id': 'requestId', 'timestamp': 'timestamp', 'locale': 'locale' - } +} # type: Dict def __init__(self, request_id=None, timestamp=None, locale=None): # type: (Optional[str], Optional[datetime], Optional[str]) -> None @@ -62,7 +62,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None): :param locale: A string indicating the user’s locale. For example: en-US. This value is only provided with certain request types. :type locale: (optional) str """ - self.__discriminator_value = "PlaybackController.NextCommandIssued" + self.__discriminator_value = "PlaybackController.NextCommandIssued" # type: str self.object_type = self.__discriminator_value super(NextCommandIssuedRequest, self).__init__(object_type=self.__discriminator_value, request_id=request_id, timestamp=timestamp, locale=locale) @@ -70,7 +70,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/playbackcontroller/pause_command_issued_request.py b/ask-sdk-model/ask_sdk_model/interfaces/playbackcontroller/pause_command_issued_request.py index 86ea8c4..8e2bd72 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/playbackcontroller/pause_command_issued_request.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/playbackcontroller/pause_command_issued_request.py @@ -42,14 +42,14 @@ class PauseCommandIssuedRequest(Request): 'request_id': 'str', 'timestamp': 'datetime', 'locale': 'str' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'request_id': 'requestId', 'timestamp': 'timestamp', 'locale': 'locale' - } +} # type: Dict def __init__(self, request_id=None, timestamp=None, locale=None): # type: (Optional[str], Optional[datetime], Optional[str]) -> None @@ -62,7 +62,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None): :param locale: A string indicating the user’s locale. For example: en-US. This value is only provided with certain request types. :type locale: (optional) str """ - self.__discriminator_value = "PlaybackController.PauseCommandIssued" + self.__discriminator_value = "PlaybackController.PauseCommandIssued" # type: str self.object_type = self.__discriminator_value super(PauseCommandIssuedRequest, self).__init__(object_type=self.__discriminator_value, request_id=request_id, timestamp=timestamp, locale=locale) @@ -70,7 +70,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/playbackcontroller/play_command_issued_request.py b/ask-sdk-model/ask_sdk_model/interfaces/playbackcontroller/play_command_issued_request.py index f3c27ef..c616a71 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/playbackcontroller/play_command_issued_request.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/playbackcontroller/play_command_issued_request.py @@ -42,14 +42,14 @@ class PlayCommandIssuedRequest(Request): 'request_id': 'str', 'timestamp': 'datetime', 'locale': 'str' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'request_id': 'requestId', 'timestamp': 'timestamp', 'locale': 'locale' - } +} # type: Dict def __init__(self, request_id=None, timestamp=None, locale=None): # type: (Optional[str], Optional[datetime], Optional[str]) -> None @@ -62,7 +62,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None): :param locale: A string indicating the user’s locale. For example: en-US. This value is only provided with certain request types. :type locale: (optional) str """ - self.__discriminator_value = "PlaybackController.PlayCommandIssued" + self.__discriminator_value = "PlaybackController.PlayCommandIssued" # type: str self.object_type = self.__discriminator_value super(PlayCommandIssuedRequest, self).__init__(object_type=self.__discriminator_value, request_id=request_id, timestamp=timestamp, locale=locale) @@ -70,7 +70,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/playbackcontroller/previous_command_issued_request.py b/ask-sdk-model/ask_sdk_model/interfaces/playbackcontroller/previous_command_issued_request.py index 3678c3c..f62665e 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/playbackcontroller/previous_command_issued_request.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/playbackcontroller/previous_command_issued_request.py @@ -42,14 +42,14 @@ class PreviousCommandIssuedRequest(Request): 'request_id': 'str', 'timestamp': 'datetime', 'locale': 'str' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'request_id': 'requestId', 'timestamp': 'timestamp', 'locale': 'locale' - } +} # type: Dict def __init__(self, request_id=None, timestamp=None, locale=None): # type: (Optional[str], Optional[datetime], Optional[str]) -> None @@ -62,7 +62,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None): :param locale: A string indicating the user’s locale. For example: en-US. This value is only provided with certain request types. :type locale: (optional) str """ - self.__discriminator_value = "PlaybackController.PreviousCommandIssued" + self.__discriminator_value = "PlaybackController.PreviousCommandIssued" # type: str self.object_type = self.__discriminator_value super(PreviousCommandIssuedRequest, self).__init__(object_type=self.__discriminator_value, request_id=request_id, timestamp=timestamp, locale=locale) @@ -70,7 +70,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/playbackcontroller/py.typed b/ask-sdk-model/ask_sdk_model/interfaces/playbackcontroller/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/interfaces/py.typed b/ask-sdk-model/ask_sdk_model/interfaces/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/interfaces/system/error.py b/ask-sdk-model/ask_sdk_model/interfaces/system/error.py index a797a13..0085b9a 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/system/error.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/system/error.py @@ -38,12 +38,12 @@ class Error(object): deserialized_types = { 'object_type': 'ask_sdk_model.interfaces.system.error_type.ErrorType', 'message': 'str' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'message': 'message' - } +} # type: Dict def __init__(self, object_type=None, message=None): # type: (Optional[ErrorType], Optional[str]) -> None @@ -54,7 +54,7 @@ def __init__(self, object_type=None, message=None): :param message: :type message: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.object_type = object_type self.message = message @@ -62,7 +62,7 @@ def __init__(self, object_type=None, message=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/system/error_cause.py b/ask-sdk-model/ask_sdk_model/interfaces/system/error_cause.py index c9281e1..8f85617 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/system/error_cause.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/system/error_cause.py @@ -34,11 +34,11 @@ class ErrorCause(object): """ deserialized_types = { 'request_id': 'str' - } + } # type: Dict attribute_map = { 'request_id': 'requestId' - } +} # type: Dict def __init__(self, request_id=None): # type: (Optional[str]) -> None @@ -47,14 +47,14 @@ def __init__(self, request_id=None): :param request_id: :type request_id: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.request_id = request_id def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/system/exception_encountered_request.py b/ask-sdk-model/ask_sdk_model/interfaces/system/exception_encountered_request.py index ea941a4..1dd11d4 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/system/exception_encountered_request.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/system/exception_encountered_request.py @@ -50,7 +50,7 @@ class ExceptionEncounteredRequest(Request): 'locale': 'str', 'error': 'ask_sdk_model.interfaces.system.error.Error', 'cause': 'ask_sdk_model.interfaces.system.error_cause.ErrorCause' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -59,7 +59,7 @@ class ExceptionEncounteredRequest(Request): 'locale': 'locale', 'error': 'error', 'cause': 'cause' - } +} # type: Dict def __init__(self, request_id=None, timestamp=None, locale=None, error=None, cause=None): # type: (Optional[str], Optional[datetime], Optional[str], Optional[Error], Optional[ErrorCause]) -> None @@ -76,7 +76,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, error=None, cau :param cause: :type cause: (optional) ask_sdk_model.interfaces.system.error_cause.ErrorCause """ - self.__discriminator_value = "System.ExceptionEncountered" + self.__discriminator_value = "System.ExceptionEncountered" # type: str self.object_type = self.__discriminator_value super(ExceptionEncounteredRequest, self).__init__(object_type=self.__discriminator_value, request_id=request_id, timestamp=timestamp, locale=locale) @@ -86,7 +86,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, error=None, cau def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/system/py.typed b/ask-sdk-model/ask_sdk_model/interfaces/system/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/interfaces/system/system_state.py b/ask-sdk-model/ask_sdk_model/interfaces/system/system_state.py index e7ba809..81cc753 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/system/system_state.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/system/system_state.py @@ -49,7 +49,7 @@ class SystemState(object): 'device': 'ask_sdk_model.device.Device', 'api_endpoint': 'str', 'api_access_token': 'str' - } + } # type: Dict attribute_map = { 'application': 'application', @@ -57,7 +57,7 @@ class SystemState(object): 'device': 'device', 'api_endpoint': 'apiEndpoint', 'api_access_token': 'apiAccessToken' - } +} # type: Dict def __init__(self, application=None, user=None, device=None, api_endpoint=None, api_access_token=None): # type: (Optional[Application], Optional[User], Optional[Device], Optional[str], Optional[str]) -> None @@ -74,7 +74,7 @@ def __init__(self, application=None, user=None, device=None, api_endpoint=None, :param api_access_token: :type api_access_token: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.application = application self.user = user @@ -85,7 +85,7 @@ def __init__(self, application=None, user=None, device=None, api_endpoint=None, def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/videoapp/launch_directive.py b/ask-sdk-model/ask_sdk_model/interfaces/videoapp/launch_directive.py index baad836..428a554 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/videoapp/launch_directive.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/videoapp/launch_directive.py @@ -37,12 +37,12 @@ class LaunchDirective(Directive): deserialized_types = { 'object_type': 'str', 'video_item': 'ask_sdk_model.interfaces.videoapp.video_item.VideoItem' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'video_item': 'videoItem' - } +} # type: Dict def __init__(self, video_item=None): # type: (Optional[VideoItem]) -> None @@ -51,7 +51,7 @@ def __init__(self, video_item=None): :param video_item: :type video_item: (optional) ask_sdk_model.interfaces.videoapp.video_item.VideoItem """ - self.__discriminator_value = "VideoApp.Launch" + self.__discriminator_value = "VideoApp.Launch" # type: str self.object_type = self.__discriminator_value super(LaunchDirective, self).__init__(object_type=self.__discriminator_value) @@ -60,7 +60,7 @@ def __init__(self, video_item=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/videoapp/metadata.py b/ask-sdk-model/ask_sdk_model/interfaces/videoapp/metadata.py index c69727f..dda313c 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/videoapp/metadata.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/videoapp/metadata.py @@ -37,12 +37,12 @@ class Metadata(object): deserialized_types = { 'title': 'str', 'subtitle': 'str' - } + } # type: Dict attribute_map = { 'title': 'title', 'subtitle': 'subtitle' - } +} # type: Dict def __init__(self, title=None, subtitle=None): # type: (Optional[str], Optional[str]) -> None @@ -53,7 +53,7 @@ def __init__(self, title=None, subtitle=None): :param subtitle: :type subtitle: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.title = title self.subtitle = subtitle @@ -61,7 +61,7 @@ def __init__(self, title=None, subtitle=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/videoapp/py.typed b/ask-sdk-model/ask_sdk_model/interfaces/videoapp/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/interfaces/videoapp/video_app_interface.py b/ask-sdk-model/ask_sdk_model/interfaces/videoapp/video_app_interface.py index 927dc25..71ae685 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/videoapp/video_app_interface.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/videoapp/video_app_interface.py @@ -31,22 +31,22 @@ class VideoAppInterface(object): """ deserialized_types = { - } + } # type: Dict attribute_map = { - } +} # type: Dict def __init__(self): # type: () -> None """ """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/videoapp/video_item.py b/ask-sdk-model/ask_sdk_model/interfaces/videoapp/video_item.py index 0a44bdb..6ec7d23 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/videoapp/video_item.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/videoapp/video_item.py @@ -38,12 +38,12 @@ class VideoItem(object): deserialized_types = { 'source': 'str', 'metadata': 'ask_sdk_model.interfaces.videoapp.metadata.Metadata' - } + } # type: Dict attribute_map = { 'source': 'source', 'metadata': 'metadata' - } +} # type: Dict def __init__(self, source=None, metadata=None): # type: (Optional[str], Optional[Metadata]) -> None @@ -54,7 +54,7 @@ def __init__(self, source=None, metadata=None): :param metadata: :type metadata: (optional) ask_sdk_model.interfaces.videoapp.metadata.Metadata """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.source = source self.metadata = metadata @@ -62,7 +62,7 @@ def __init__(self, source=None, metadata=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/viewport/experience.py b/ask-sdk-model/ask_sdk_model/interfaces/viewport/experience.py index 116cecc..6f5f265 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/viewport/experience.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/viewport/experience.py @@ -45,14 +45,14 @@ class Experience(object): 'arc_minute_height': 'float', 'can_rotate': 'bool', 'can_resize': 'bool' - } + } # type: Dict attribute_map = { 'arc_minute_width': 'arcMinuteWidth', 'arc_minute_height': 'arcMinuteHeight', 'can_rotate': 'canRotate', 'can_resize': 'canResize' - } +} # type: Dict def __init__(self, arc_minute_width=None, arc_minute_height=None, can_rotate=None, can_resize=None): # type: (Optional[float], Optional[float], Optional[bool], Optional[bool]) -> None @@ -67,7 +67,7 @@ def __init__(self, arc_minute_width=None, arc_minute_height=None, can_rotate=Non :param can_resize: Indicates if the viewport can be resized, limiting the area which can be used to render the APL response. :type can_resize: (optional) bool """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.arc_minute_width = arc_minute_width self.arc_minute_height = arc_minute_height @@ -77,7 +77,7 @@ def __init__(self, arc_minute_width=None, arc_minute_height=None, can_rotate=Non def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/interfaces/viewport/py.typed b/ask-sdk-model/ask_sdk_model/interfaces/viewport/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/interfaces/viewport/viewport_state.py b/ask-sdk-model/ask_sdk_model/interfaces/viewport/viewport_state.py index 848a107..11d7dc5 100644 --- a/ask-sdk-model/ask_sdk_model/interfaces/viewport/viewport_state.py +++ b/ask-sdk-model/ask_sdk_model/interfaces/viewport/viewport_state.py @@ -64,7 +64,7 @@ class ViewportState(object): 'current_pixel_height': 'float', 'touch': 'list[ask_sdk_model.interfaces.viewport.touch.Touch]', 'keyboard': 'list[ask_sdk_model.interfaces.viewport.keyboard.Keyboard]' - } + } # type: Dict attribute_map = { 'experiences': 'experiences', @@ -76,7 +76,7 @@ class ViewportState(object): 'current_pixel_height': 'currentPixelHeight', 'touch': 'touch', 'keyboard': 'keyboard' - } +} # type: Dict def __init__(self, experiences=None, shape=None, pixel_width=None, pixel_height=None, dpi=None, current_pixel_width=None, current_pixel_height=None, touch=None, keyboard=None): # type: (Optional[List[Experience]], Optional[Shape], Optional[float], Optional[float], Optional[float], Optional[float], Optional[float], Optional[List[Touch]], Optional[List[Keyboard]]) -> None @@ -101,7 +101,7 @@ def __init__(self, experiences=None, shape=None, pixel_width=None, pixel_height= :param keyboard: The physical button input mechanisms supported by the device. An empty array indicates physical button input is unsupported. :type keyboard: (optional) list[ask_sdk_model.interfaces.viewport.keyboard.Keyboard] """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.experiences = experiences self.shape = shape @@ -116,7 +116,7 @@ def __init__(self, experiences=None, shape=None, pixel_width=None, pixel_height= def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/launch_request.py b/ask-sdk-model/ask_sdk_model/launch_request.py index 2797092..7a2fe2a 100644 --- a/ask-sdk-model/ask_sdk_model/launch_request.py +++ b/ask-sdk-model/ask_sdk_model/launch_request.py @@ -44,14 +44,14 @@ class LaunchRequest(Request): 'request_id': 'str', 'timestamp': 'datetime', 'locale': 'str' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'request_id': 'requestId', 'timestamp': 'timestamp', 'locale': 'locale' - } +} # type: Dict def __init__(self, request_id=None, timestamp=None, locale=None): # type: (Optional[str], Optional[datetime], Optional[str]) -> None @@ -64,7 +64,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None): :param locale: A string indicating the user’s locale. For example: en-US. This value is only provided with certain request types. :type locale: (optional) str """ - self.__discriminator_value = "LaunchRequest" + self.__discriminator_value = "LaunchRequest" # type: str self.object_type = self.__discriminator_value super(LaunchRequest, self).__init__(object_type=self.__discriminator_value, request_id=request_id, timestamp=timestamp, locale=locale) @@ -72,7 +72,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/permissions.py b/ask-sdk-model/ask_sdk_model/permissions.py index 59c0db3..08878d2 100644 --- a/ask-sdk-model/ask_sdk_model/permissions.py +++ b/ask-sdk-model/ask_sdk_model/permissions.py @@ -40,12 +40,12 @@ class Permissions(object): deserialized_types = { 'consent_token': 'str', 'scopes': 'dict(str, ask_sdk_model.scope.Scope)' - } + } # type: Dict attribute_map = { 'consent_token': 'consentToken', 'scopes': 'scopes' - } +} # type: Dict def __init__(self, consent_token=None, scopes=None): # type: (Optional[str], Optional[Dict[str, Scope]]) -> None @@ -56,7 +56,7 @@ def __init__(self, consent_token=None, scopes=None): :param scopes: A map where the key is a LoginWithAmazon(LWA) scope and value is a list of key:value pairs which describe the state of user actions on the LWA scope. For e.g. \"scopes\" :{ \"alexa::devices:all:geolocation:read\":{\"status\":\"GRANTED\"}} This value of \"alexa::devices:all:geolocation:read\" will determine if the Geolocation data access is granted by the user, or else it will show a card of type AskForPermissionsConsent to the user to get this permission. :type scopes: (optional) dict(str, ask_sdk_model.scope.Scope) """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.consent_token = consent_token self.scopes = scopes @@ -64,7 +64,7 @@ def __init__(self, consent_token=None, scopes=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/py.typed b/ask-sdk-model/ask_sdk_model/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/request.py b/ask-sdk-model/ask_sdk_model/request.py index e6cb5ab..458a571 100644 --- a/ask-sdk-model/ask_sdk_model/request.py +++ b/ask-sdk-model/ask_sdk_model/request.py @@ -125,14 +125,14 @@ class Request(object): 'request_id': 'str', 'timestamp': 'datetime', 'locale': 'str' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'request_id': 'requestId', 'timestamp': 'timestamp', 'locale': 'locale' - } +} # type: Dict discriminator_value_class_map = { 'AudioPlayer.PlaybackFinished': 'ask_sdk_model.interfaces.audioplayer.playback_finished_request.PlaybackFinishedRequest', @@ -192,7 +192,7 @@ def __init__(self, object_type=None, request_id=None, timestamp=None, locale=Non :param locale: A string indicating the user’s locale. For example: en-US. This value is only provided with certain request types. :type locale: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.object_type = object_type self.request_id = request_id @@ -201,7 +201,7 @@ def __init__(self, object_type=None, request_id=None, timestamp=None, locale=Non @classmethod def get_real_child_model(cls, data): - # type: (Dict[str, str]) -> str + # type: (Dict[str, str]) -> Optional[str] """Returns the real base class specified by the discriminator""" discriminator_value = data[cls.json_discriminator_key] return cls.discriminator_value_class_map.get(discriminator_value) @@ -209,7 +209,7 @@ def get_real_child_model(cls, data): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/request_envelope.py b/ask-sdk-model/ask_sdk_model/request_envelope.py index 3fe7926..2dd33da 100644 --- a/ask-sdk-model/ask_sdk_model/request_envelope.py +++ b/ask-sdk-model/ask_sdk_model/request_envelope.py @@ -48,14 +48,14 @@ class RequestEnvelope(object): 'session': 'ask_sdk_model.session.Session', 'context': 'ask_sdk_model.context.Context', 'request': 'ask_sdk_model.request.Request' - } + } # type: Dict attribute_map = { 'version': 'version', 'session': 'session', 'context': 'context', 'request': 'request' - } +} # type: Dict def __init__(self, version=None, session=None, context=None, request=None): # type: (Optional[str], Optional[Session], Optional[Context], Optional[Request]) -> None @@ -70,7 +70,7 @@ def __init__(self, version=None, session=None, context=None, request=None): :param request: A request object that provides the details of the user’s request. :type request: (optional) ask_sdk_model.request.Request """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.version = version self.session = session @@ -80,7 +80,7 @@ def __init__(self, version=None, session=None, context=None, request=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/response.py b/ask-sdk-model/ask_sdk_model/response.py index 304f8b4..8c49dc4 100644 --- a/ask-sdk-model/ask_sdk_model/response.py +++ b/ask-sdk-model/ask_sdk_model/response.py @@ -54,7 +54,7 @@ class Response(object): 'directives': 'list[ask_sdk_model.directive.Directive]', 'should_end_session': 'bool', 'can_fulfill_intent': 'ask_sdk_model.canfulfill.can_fulfill_intent.CanFulfillIntent' - } + } # type: Dict attribute_map = { 'output_speech': 'outputSpeech', @@ -63,7 +63,7 @@ class Response(object): 'directives': 'directives', 'should_end_session': 'shouldEndSession', 'can_fulfill_intent': 'canFulfillIntent' - } +} # type: Dict def __init__(self, output_speech=None, card=None, reprompt=None, directives=None, should_end_session=None, can_fulfill_intent=None): # type: (Optional[OutputSpeech], Optional[Card], Optional[Reprompt], Optional[List[Directive]], Optional[bool], Optional[CanFulfillIntent]) -> None @@ -82,7 +82,7 @@ def __init__(self, output_speech=None, card=None, reprompt=None, directives=None :param can_fulfill_intent: :type can_fulfill_intent: (optional) ask_sdk_model.canfulfill.can_fulfill_intent.CanFulfillIntent """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.output_speech = output_speech self.card = card @@ -94,7 +94,7 @@ def __init__(self, output_speech=None, card=None, reprompt=None, directives=None def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/response_envelope.py b/ask-sdk-model/ask_sdk_model/response_envelope.py index dc08f51..13b3ee0 100644 --- a/ask-sdk-model/ask_sdk_model/response_envelope.py +++ b/ask-sdk-model/ask_sdk_model/response_envelope.py @@ -44,14 +44,14 @@ class ResponseEnvelope(object): 'session_attributes': 'dict(str, object)', 'user_agent': 'str', 'response': 'ask_sdk_model.response.Response' - } + } # type: Dict attribute_map = { 'version': 'version', 'session_attributes': 'sessionAttributes', 'user_agent': 'userAgent', 'response': 'response' - } +} # type: Dict def __init__(self, version=None, session_attributes=None, user_agent=None, response=None): # type: (Optional[str], Optional[Dict[str, object]], Optional[str], Optional[Response]) -> None @@ -66,7 +66,7 @@ def __init__(self, version=None, session_attributes=None, user_agent=None, respo :param response: :type response: (optional) ask_sdk_model.response.Response """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.version = version self.session_attributes = session_attributes @@ -76,7 +76,7 @@ def __init__(self, version=None, session_attributes=None, user_agent=None, respo def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/scope.py b/ask-sdk-model/ask_sdk_model/scope.py index 8bf5984..e87a7b4 100644 --- a/ask-sdk-model/ask_sdk_model/scope.py +++ b/ask-sdk-model/ask_sdk_model/scope.py @@ -37,11 +37,11 @@ class Scope(object): """ deserialized_types = { 'status': 'ask_sdk_model.permission_status.PermissionStatus' - } + } # type: Dict attribute_map = { 'status': 'status' - } +} # type: Dict def __init__(self, status=None): # type: (Optional[PermissionStatus]) -> None @@ -50,14 +50,14 @@ def __init__(self, status=None): :param status: :type status: (optional) ask_sdk_model.permission_status.PermissionStatus """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.status = status def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/base_service_client.py b/ask-sdk-model/ask_sdk_model/services/base_service_client.py index 0ad4c82..039ece4 100644 --- a/ask-sdk-model/ask_sdk_model/services/base_service_client.py +++ b/ask-sdk-model/ask_sdk_model/services/base_service_client.py @@ -25,7 +25,7 @@ unicode_type = unicode if typing.TYPE_CHECKING: - from typing import TypeVar, Union, List, Dict, Tuple + from typing import TypeVar, Union, List, Dict, Tuple, Optional from .service_client_response import ServiceClientResponse from .api_configuration import ApiConfiguration T = TypeVar('T') @@ -79,7 +79,7 @@ def invoke( :type response_type: class :return: Response object instance of the response_type provided :rtype: object - :raises: :py:class:`ask_sdk_model.services.service_exception.ServiceException` + :raises: :py:class:`ask_sdk_model.services.service_exception.ServiceException` if service fails and :py:class:`ValueError` if serializer or API Client is not configured in api_configuration # noqa: E501 """ request = ApiClientRequest() request.url = BaseServiceClient.__build_url( @@ -87,6 +87,12 @@ def invoke( request.method = method request.headers = header_params + if self._serializer is None: + raise ValueError("Serializer is None") + + if self._api_client is None: + raise ValueError("API client is None") + if body: request.body = self._serializer.serialize(body) @@ -96,15 +102,18 @@ def invoke( raise ServiceException( message="Call to service failed: {}".format(str(e)), status_code=500, headers=None, body=None) + if response.status_code is None: + raise ServiceException(message="Invalid Response, no status code", status_code=500, headers=None, body=None) + if BaseServiceClient.__is_code_successful(response.status_code): if response_type is None: return None return self._serializer.deserialize(response.body, response_type) if response_definitions: - exception_metadata = [d for d in response_definitions if d.status_code == response.status_code] - if exception_metadata: - exception_metadata = exception_metadata[0] + exception_metadata_list = [d for d in response_definitions if d.status_code == response.status_code] + if exception_metadata_list: + exception_metadata = exception_metadata_list[0] exception_body = self._serializer.deserialize(response.body, exception_metadata.response_type) raise ServiceException( message=exception_metadata.message, status_code=exception_metadata.status_code, @@ -143,7 +152,7 @@ def __interpolate_params(path, path_params): @staticmethod def __build_query_string(query_params, is_query_start): - # type: (List[tuple[str, str]], bool) -> str + # type: (List[Tuple[str, str]], bool) -> str """Build query string from query parameters. :param query_params: Parameters sent as part of query string @@ -161,15 +170,15 @@ def __build_query_string(query_params, is_query_start): for query_param in query_params: param_name = query_param[0] param_value = query_param[1] - param_name = param_name.encode("utf-8") if isinstance(param_name, unicode_type) else param_name - param_value = param_value.encode("utf-8") if isinstance(param_value, unicode_type) else param_value - encoded_query_params.append((param_name, param_value)) + param_name_encoded = param_name.encode("utf-8") if isinstance(param_name, unicode_type) else param_name + param_value_encoded = param_value.encode("utf-8") if isinstance(param_value, unicode_type) else param_value + encoded_query_params.append((param_name_encoded, param_value_encoded)) return query_string + urlencode(encoded_query_params) @staticmethod def __build_url(endpoint, path, query_params, path_params): - # type: (str, str, List[tuple[str, str]], Dict[str, str]) -> str + # type: (str, str, List[Tuple[str, str]], Dict[str, str]) -> str """Build URL from the provided parameters. :param endpoint: Endpoint to be sending the api call diff --git a/ask-sdk-model/ask_sdk_model/services/device_address/address.py b/ask-sdk-model/ask_sdk_model/services/device_address/address.py index 4cafafa..9306d06 100644 --- a/ask-sdk-model/ask_sdk_model/services/device_address/address.py +++ b/ask-sdk-model/ask_sdk_model/services/device_address/address.py @@ -57,7 +57,7 @@ class Address(object): 'city': 'str', 'district_or_county': 'str', 'postal_code': 'str' - } + } # type: Dict attribute_map = { 'address_line1': 'addressLine1', @@ -68,7 +68,7 @@ class Address(object): 'city': 'city', 'district_or_county': 'districtOrCounty', 'postal_code': 'postalCode' - } +} # type: Dict def __init__(self, address_line1=None, address_line2=None, address_line3=None, country_code=None, state_or_region=None, city=None, district_or_county=None, postal_code=None): # type: (Optional[str], Optional[str], Optional[str], Optional[str], Optional[str], Optional[str], Optional[str], Optional[str]) -> None @@ -91,7 +91,7 @@ def __init__(self, address_line1=None, address_line2=None, address_line3=None, c :param postal_code: :type postal_code: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.address_line1 = address_line1 self.address_line2 = address_line2 @@ -105,7 +105,7 @@ def __init__(self, address_line1=None, address_line2=None, address_line3=None, c def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/device_address/device_address_service_client.py b/ask-sdk-model/ask_sdk_model/services/device_address/device_address_service_client.py index 2503a94..9822179 100644 --- a/ask-sdk-model/ask_sdk_model/services/device_address/device_address_service_client.py +++ b/ask-sdk-model/ask_sdk_model/services/device_address/device_address_service_client.py @@ -25,7 +25,7 @@ if typing.TYPE_CHECKING: - from typing import Dict, List, Union + from typing import Dict, List, Union, Any from datetime import datetime from ask_sdk_model.services.device_address.short_address import ShortAddress from ask_sdk_model.services.device_address.error import Error @@ -47,7 +47,7 @@ def __init__(self, api_configuration): super(DeviceAddressServiceClient, self).__init__(api_configuration) def get_country_and_postal_code(self, device_id, **kwargs): - # type: (str) -> Union[ShortAddress, Error] + # type: (str, **Any) -> Union[ShortAddress, Error] """ Gets the country and postal code of a device @@ -68,13 +68,13 @@ def get_country_and_postal_code(self, device_id, **kwargs): resource_path = '/v1/devices/{deviceId}/settings/address/countryAndPostalCode' resource_path = resource_path.replace('{format}', 'json') - path_params = {} + path_params = {} # type: Dict if 'device_id' in params: path_params['deviceId'] = params['device_id'] - query_params = [] + query_params = [] # type: List - header_params = [] + header_params = [] # type: List body_params = None header_params.append(('Content-type', 'application/json')) @@ -83,7 +83,7 @@ def get_country_and_postal_code(self, device_id, **kwargs): authorization_value = "Bearer " + self._authorization_value header_params.append(("Authorization", authorization_value)) - error_definitions = [] + error_definitions = [] # type: List error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.device_address.short_address.ShortAddress", status_code=200, message="Successfully get the country and postal code of the deviceId")) error_definitions.append(ServiceClientResponse(response_type=None, status_code=204, message="No content could be queried out")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.device_address.error.Error", status_code=403, message="The authentication token is invalid or doesn't have access to the resource")) @@ -103,7 +103,7 @@ def get_country_and_postal_code(self, device_id, **kwargs): response_type="ask_sdk_model.services.device_address.short_address.ShortAddress") def get_full_address(self, device_id, **kwargs): - # type: (str) -> Union[Address, Error] + # type: (str, **Any) -> Union[Address, Error] """ Gets the address of a device @@ -124,13 +124,13 @@ def get_full_address(self, device_id, **kwargs): resource_path = '/v1/devices/{deviceId}/settings/address' resource_path = resource_path.replace('{format}', 'json') - path_params = {} + path_params = {} # type: Dict if 'device_id' in params: path_params['deviceId'] = params['device_id'] - query_params = [] + query_params = [] # type: List - header_params = [] + header_params = [] # type: List body_params = None header_params.append(('Content-type', 'application/json')) @@ -139,7 +139,7 @@ def get_full_address(self, device_id, **kwargs): authorization_value = "Bearer " + self._authorization_value header_params.append(("Authorization", authorization_value)) - error_definitions = [] + error_definitions = [] # type: List error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.device_address.address.Address", status_code=200, message="Successfully get the address of the device")) error_definitions.append(ServiceClientResponse(response_type=None, status_code=204, message="No content could be queried out")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.device_address.error.Error", status_code=403, message="The authentication token is invalid or doesn't have access to the resource")) diff --git a/ask-sdk-model/ask_sdk_model/services/device_address/error.py b/ask-sdk-model/ask_sdk_model/services/device_address/error.py index 23f2661..3bdc03a 100644 --- a/ask-sdk-model/ask_sdk_model/services/device_address/error.py +++ b/ask-sdk-model/ask_sdk_model/services/device_address/error.py @@ -37,12 +37,12 @@ class Error(object): deserialized_types = { 'object_type': 'str', 'message': 'str' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'message': 'message' - } +} # type: Dict def __init__(self, object_type=None, message=None): # type: (Optional[str], Optional[str]) -> None @@ -53,7 +53,7 @@ def __init__(self, object_type=None, message=None): :param message: A human readable description of error. :type message: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.object_type = object_type self.message = message @@ -61,7 +61,7 @@ def __init__(self, object_type=None, message=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/device_address/py.typed b/ask-sdk-model/ask_sdk_model/services/device_address/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/services/device_address/short_address.py b/ask-sdk-model/ask_sdk_model/services/device_address/short_address.py index f8d64cf..c234d24 100644 --- a/ask-sdk-model/ask_sdk_model/services/device_address/short_address.py +++ b/ask-sdk-model/ask_sdk_model/services/device_address/short_address.py @@ -37,12 +37,12 @@ class ShortAddress(object): deserialized_types = { 'country_code': 'str', 'postal_code': 'str' - } + } # type: Dict attribute_map = { 'country_code': 'countryCode', 'postal_code': 'postalCode' - } +} # type: Dict def __init__(self, country_code=None, postal_code=None): # type: (Optional[str], Optional[str]) -> None @@ -53,7 +53,7 @@ def __init__(self, country_code=None, postal_code=None): :param postal_code: :type postal_code: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.country_code = country_code self.postal_code = postal_code @@ -61,7 +61,7 @@ def __init__(self, country_code=None, postal_code=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/directive/directive.py b/ask-sdk-model/ask_sdk_model/services/directive/directive.py index 7adc288..568c29a 100644 --- a/ask-sdk-model/ask_sdk_model/services/directive/directive.py +++ b/ask-sdk-model/ask_sdk_model/services/directive/directive.py @@ -42,11 +42,11 @@ class Directive(object): """ deserialized_types = { 'object_type': 'str' - } + } # type: Dict attribute_map = { 'object_type': 'type' - } +} # type: Dict discriminator_value_class_map = { 'VoicePlayer.Speak': 'ask_sdk_model.services.directive.speak_directive.SpeakDirective' @@ -64,13 +64,13 @@ def __init__(self, object_type=None): :param object_type: :type object_type: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.object_type = object_type @classmethod def get_real_child_model(cls, data): - # type: (Dict[str, str]) -> str + # type: (Dict[str, str]) -> Optional[str] """Returns the real base class specified by the discriminator""" discriminator_value = data[cls.json_discriminator_key] return cls.discriminator_value_class_map.get(discriminator_value) @@ -78,7 +78,7 @@ def get_real_child_model(cls, data): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/directive/directive_service_client.py b/ask-sdk-model/ask_sdk_model/services/directive/directive_service_client.py index 2615d61..fde9f15 100644 --- a/ask-sdk-model/ask_sdk_model/services/directive/directive_service_client.py +++ b/ask-sdk-model/ask_sdk_model/services/directive/directive_service_client.py @@ -25,7 +25,7 @@ if typing.TYPE_CHECKING: - from typing import Dict, List, Union + from typing import Dict, List, Union, Any from datetime import datetime from ask_sdk_model.services.directive.error import Error from ask_sdk_model.services.directive.send_directive_request import SendDirectiveRequest @@ -46,7 +46,7 @@ def __init__(self, api_configuration): super(DirectiveServiceClient, self).__init__(api_configuration) def enqueue(self, send_directive_request, **kwargs): - # type: (SendDirectiveRequest) -> Union[Error] + # type: (SendDirectiveRequest, **Any) -> Union[Error] """ Send directives to Alexa. @@ -67,11 +67,11 @@ def enqueue(self, send_directive_request, **kwargs): resource_path = '/v1/directives' resource_path = resource_path.replace('{format}', 'json') - path_params = {} + path_params = {} # type: Dict - query_params = [] + query_params = [] # type: List - header_params = [] + header_params = [] # type: List body_params = None if 'send_directive_request' in params: @@ -82,7 +82,7 @@ def enqueue(self, send_directive_request, **kwargs): authorization_value = "Bearer " + self._authorization_value header_params.append(("Authorization", authorization_value)) - error_definitions = [] + error_definitions = [] # type: List error_definitions.append(ServiceClientResponse(response_type=None, status_code=204, message="Directive sent successfully.")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.directive.error.Error", status_code=400, message="Directive not valid.")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.directive.error.Error", status_code=401, message="Not Authorized.")) diff --git a/ask-sdk-model/ask_sdk_model/services/directive/error.py b/ask-sdk-model/ask_sdk_model/services/directive/error.py index 678c79c..5c74329 100644 --- a/ask-sdk-model/ask_sdk_model/services/directive/error.py +++ b/ask-sdk-model/ask_sdk_model/services/directive/error.py @@ -37,12 +37,12 @@ class Error(object): deserialized_types = { 'code': 'int', 'message': 'str' - } + } # type: Dict attribute_map = { 'code': 'code', 'message': 'message' - } +} # type: Dict def __init__(self, code=None, message=None): # type: (Optional[int], Optional[str]) -> None @@ -53,7 +53,7 @@ def __init__(self, code=None, message=None): :param message: Readable description of error. :type message: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.code = code self.message = message @@ -61,7 +61,7 @@ def __init__(self, code=None, message=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/directive/header.py b/ask-sdk-model/ask_sdk_model/services/directive/header.py index 1ea6d02..579a353 100644 --- a/ask-sdk-model/ask_sdk_model/services/directive/header.py +++ b/ask-sdk-model/ask_sdk_model/services/directive/header.py @@ -34,11 +34,11 @@ class Header(object): """ deserialized_types = { 'request_id': 'str' - } + } # type: Dict attribute_map = { 'request_id': 'requestId' - } +} # type: Dict def __init__(self, request_id=None): # type: (Optional[str]) -> None @@ -47,14 +47,14 @@ def __init__(self, request_id=None): :param request_id: This represents the current requestId for what the skill/speechlet was invoked. :type request_id: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.request_id = request_id def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/directive/py.typed b/ask-sdk-model/ask_sdk_model/services/directive/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/services/directive/send_directive_request.py b/ask-sdk-model/ask_sdk_model/services/directive/send_directive_request.py index 11c68d3..595aa41 100644 --- a/ask-sdk-model/ask_sdk_model/services/directive/send_directive_request.py +++ b/ask-sdk-model/ask_sdk_model/services/directive/send_directive_request.py @@ -41,12 +41,12 @@ class SendDirectiveRequest(object): deserialized_types = { 'header': 'ask_sdk_model.services.directive.header.Header', 'directive': 'ask_sdk_model.services.directive.directive.Directive' - } + } # type: Dict attribute_map = { 'header': 'header', 'directive': 'directive' - } +} # type: Dict def __init__(self, header=None, directive=None): # type: (Optional[Header], Optional[Directive]) -> None @@ -57,7 +57,7 @@ def __init__(self, header=None, directive=None): :param directive: Directive Content. :type directive: (optional) ask_sdk_model.services.directive.directive.Directive """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.header = header self.directive = directive @@ -65,7 +65,7 @@ def __init__(self, header=None, directive=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/directive/speak_directive.py b/ask-sdk-model/ask_sdk_model/services/directive/speak_directive.py index 425b0fa..9bacefc 100644 --- a/ask-sdk-model/ask_sdk_model/services/directive/speak_directive.py +++ b/ask-sdk-model/ask_sdk_model/services/directive/speak_directive.py @@ -36,12 +36,12 @@ class SpeakDirective(Directive): deserialized_types = { 'object_type': 'str', 'speech': 'str' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'speech': 'speech' - } +} # type: Dict def __init__(self, speech=None): # type: (Optional[str]) -> None @@ -50,7 +50,7 @@ def __init__(self, speech=None): :param speech: :type speech: (optional) str """ - self.__discriminator_value = "VoicePlayer.Speak" + self.__discriminator_value = "VoicePlayer.Speak" # type: str self.object_type = self.__discriminator_value super(SpeakDirective, self).__init__(object_type=self.__discriminator_value) @@ -59,7 +59,7 @@ def __init__(self, speech=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/gadget_controller/animation_step.py b/ask-sdk-model/ask_sdk_model/services/gadget_controller/animation_step.py index 9e7d9ae..99d49e5 100644 --- a/ask-sdk-model/ask_sdk_model/services/gadget_controller/animation_step.py +++ b/ask-sdk-model/ask_sdk_model/services/gadget_controller/animation_step.py @@ -40,13 +40,13 @@ class AnimationStep(object): 'duration_ms': 'int', 'color': 'str', 'blend': 'bool' - } + } # type: Dict attribute_map = { 'duration_ms': 'durationMs', 'color': 'color', 'blend': 'blend' - } +} # type: Dict def __init__(self, duration_ms=None, color=None, blend=None): # type: (Optional[int], Optional[str], Optional[bool]) -> None @@ -59,7 +59,7 @@ def __init__(self, duration_ms=None, color=None, blend=None): :param blend: A boolean that indicates whether to interpolate from the previous color into this one over the course of this directive's durationMs. :type blend: (optional) bool """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.duration_ms = duration_ms self.color = color @@ -68,7 +68,7 @@ def __init__(self, duration_ms=None, color=None, blend=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/gadget_controller/light_animation.py b/ask-sdk-model/ask_sdk_model/services/gadget_controller/light_animation.py index 81a3bef..4b7770f 100644 --- a/ask-sdk-model/ask_sdk_model/services/gadget_controller/light_animation.py +++ b/ask-sdk-model/ask_sdk_model/services/gadget_controller/light_animation.py @@ -41,13 +41,13 @@ class LightAnimation(object): 'repeat': 'int', 'target_lights': 'list[str]', 'sequence': 'list[ask_sdk_model.services.gadget_controller.animation_step.AnimationStep]' - } + } # type: Dict attribute_map = { 'repeat': 'repeat', 'target_lights': 'targetLights', 'sequence': 'sequence' - } +} # type: Dict def __init__(self, repeat=None, target_lights=None, sequence=None): # type: (Optional[int], Optional[List[object]], Optional[List[AnimationStep]]) -> None @@ -60,7 +60,7 @@ def __init__(self, repeat=None, target_lights=None, sequence=None): :param sequence: The animation steps to render in order. The maximum number of steps that you can define is 38. The minimum is 0. Each step must have the following fields, all of which are required. :type sequence: (optional) list[ask_sdk_model.services.gadget_controller.animation_step.AnimationStep] """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.repeat = repeat self.target_lights = target_lights @@ -69,7 +69,7 @@ def __init__(self, repeat=None, target_lights=None, sequence=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/gadget_controller/py.typed b/ask-sdk-model/ask_sdk_model/services/gadget_controller/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/services/gadget_controller/set_light_parameters.py b/ask-sdk-model/ask_sdk_model/services/gadget_controller/set_light_parameters.py index fe6574b..c50a030 100644 --- a/ask-sdk-model/ask_sdk_model/services/gadget_controller/set_light_parameters.py +++ b/ask-sdk-model/ask_sdk_model/services/gadget_controller/set_light_parameters.py @@ -44,13 +44,13 @@ class SetLightParameters(object): 'trigger_event': 'ask_sdk_model.services.gadget_controller.trigger_event_type.TriggerEventType', 'trigger_event_time_ms': 'int', 'animations': 'list[ask_sdk_model.services.gadget_controller.light_animation.LightAnimation]' - } + } # type: Dict attribute_map = { 'trigger_event': 'triggerEvent', 'trigger_event_time_ms': 'triggerEventTimeMs', 'animations': 'animations' - } +} # type: Dict def __init__(self, trigger_event=None, trigger_event_time_ms=None, animations=None): # type: (Optional[TriggerEventType], Optional[int], Optional[List[LightAnimation]]) -> None @@ -63,7 +63,7 @@ def __init__(self, trigger_event=None, trigger_event_time_ms=None, animations=No :param animations: :type animations: (optional) list[ask_sdk_model.services.gadget_controller.light_animation.LightAnimation] """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.trigger_event = trigger_event self.trigger_event_time_ms = trigger_event_time_ms @@ -72,7 +72,7 @@ def __init__(self, trigger_event=None, trigger_event_time_ms=None, animations=No def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/game_engine/deviation_recognizer.py b/ask-sdk-model/ask_sdk_model/services/game_engine/deviation_recognizer.py index a88c59f..37c82e2 100644 --- a/ask-sdk-model/ask_sdk_model/services/game_engine/deviation_recognizer.py +++ b/ask-sdk-model/ask_sdk_model/services/game_engine/deviation_recognizer.py @@ -38,12 +38,12 @@ class DeviationRecognizer(Recognizer): deserialized_types = { 'object_type': 'str', 'recognizer': 'str' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'recognizer': 'recognizer' - } +} # type: Dict def __init__(self, recognizer=None): # type: (Optional[str]) -> None @@ -52,7 +52,7 @@ def __init__(self, recognizer=None): :param recognizer: The name of the recognizer that defines a pattern that must not be deviated from. :type recognizer: (optional) str """ - self.__discriminator_value = "deviation" + self.__discriminator_value = "deviation" # type: str self.object_type = self.__discriminator_value super(DeviationRecognizer, self).__init__(object_type=self.__discriminator_value) @@ -61,7 +61,7 @@ def __init__(self, recognizer=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/game_engine/event.py b/ask-sdk-model/ask_sdk_model/services/game_engine/event.py index 6ea826e..ec63a79 100644 --- a/ask-sdk-model/ask_sdk_model/services/game_engine/event.py +++ b/ask-sdk-model/ask_sdk_model/services/game_engine/event.py @@ -52,7 +52,7 @@ class Event(object): 'reports': 'ask_sdk_model.services.game_engine.event_reporting_type.EventReportingType', 'maximum_invocations': 'int', 'trigger_time_milliseconds': 'int' - } + } # type: Dict attribute_map = { 'should_end_input_handler': 'shouldEndInputHandler', @@ -61,7 +61,7 @@ class Event(object): 'reports': 'reports', 'maximum_invocations': 'maximumInvocations', 'trigger_time_milliseconds': 'triggerTimeMilliseconds' - } +} # type: Dict def __init__(self, should_end_input_handler=None, meets=None, fails=None, reports=None, maximum_invocations=None, trigger_time_milliseconds=None): # type: (Optional[bool], Optional[List[object]], Optional[List[object]], Optional[EventReportingType], Optional[int], Optional[int]) -> None @@ -80,7 +80,7 @@ def __init__(self, should_end_input_handler=None, meets=None, fails=None, report :param trigger_time_milliseconds: Adds a time constraint to the event. Instead of being considered whenever a raw button event occurs, an event that has this parameter will only be considered once at triggerTimeMilliseconds after the Input Handler has started. Because a time-triggered event can only fire once, the maximumInvocations value is ignored. Omit this property entirely if you do not want to time-constrain the event. :type trigger_time_milliseconds: (optional) int """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.should_end_input_handler = should_end_input_handler self.meets = meets @@ -92,7 +92,7 @@ def __init__(self, should_end_input_handler=None, meets=None, fails=None, report def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/game_engine/input_event.py b/ask-sdk-model/ask_sdk_model/services/game_engine/input_event.py index b71cccd..86686e0 100644 --- a/ask-sdk-model/ask_sdk_model/services/game_engine/input_event.py +++ b/ask-sdk-model/ask_sdk_model/services/game_engine/input_event.py @@ -47,7 +47,7 @@ class InputEvent(object): 'action': 'ask_sdk_model.services.game_engine.input_event_action_type.InputEventActionType', 'color': 'str', 'feature': 'str' - } + } # type: Dict attribute_map = { 'gadget_id': 'gadgetId', @@ -55,7 +55,7 @@ class InputEvent(object): 'action': 'action', 'color': 'color', 'feature': 'feature' - } +} # type: Dict def __init__(self, gadget_id=None, timestamp=None, action=None, color=None, feature=None): # type: (Optional[str], Optional[str], Optional[InputEventActionType], Optional[str], Optional[str]) -> None @@ -72,7 +72,7 @@ def __init__(self, gadget_id=None, timestamp=None, action=None, color=None, feat :param feature: For gadgets with multiple features, this is the feature that the event represents. Echo Buttons have one feature only, so this is always `press`. :type feature: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.gadget_id = gadget_id self.timestamp = timestamp @@ -83,7 +83,7 @@ def __init__(self, gadget_id=None, timestamp=None, action=None, color=None, feat def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/game_engine/input_handler_event.py b/ask-sdk-model/ask_sdk_model/services/game_engine/input_handler_event.py index ea02f29..e13054c 100644 --- a/ask-sdk-model/ask_sdk_model/services/game_engine/input_handler_event.py +++ b/ask-sdk-model/ask_sdk_model/services/game_engine/input_handler_event.py @@ -38,12 +38,12 @@ class InputHandlerEvent(object): deserialized_types = { 'name': 'str', 'input_events': 'list[ask_sdk_model.services.game_engine.input_event.InputEvent]' - } + } # type: Dict attribute_map = { 'name': 'name', 'input_events': 'inputEvents' - } +} # type: Dict def __init__(self, name=None, input_events=None): # type: (Optional[str], Optional[List[InputEvent]]) -> None @@ -54,7 +54,7 @@ def __init__(self, name=None, input_events=None): :param input_events: A chronologically ordered report of the raw Button Events that contributed to this Input Handler Event. :type input_events: (optional) list[ask_sdk_model.services.game_engine.input_event.InputEvent] """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.name = name self.input_events = input_events @@ -62,7 +62,7 @@ def __init__(self, name=None, input_events=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/game_engine/pattern.py b/ask-sdk-model/ask_sdk_model/services/game_engine/pattern.py index a18464e..4566c0c 100644 --- a/ask-sdk-model/ask_sdk_model/services/game_engine/pattern.py +++ b/ask-sdk-model/ask_sdk_model/services/game_engine/pattern.py @@ -46,14 +46,14 @@ class Pattern(object): 'colors': 'list[str]', 'action': 'ask_sdk_model.services.game_engine.input_event_action_type.InputEventActionType', 'repeat': 'int' - } + } # type: Dict attribute_map = { 'gadget_ids': 'gadgetIds', 'colors': 'colors', 'action': 'action', 'repeat': 'repeat' - } +} # type: Dict def __init__(self, gadget_ids=None, colors=None, action=None, repeat=None): # type: (Optional[List[object]], Optional[List[object]], Optional[InputEventActionType], Optional[int]) -> None @@ -68,7 +68,7 @@ def __init__(self, gadget_ids=None, colors=None, action=None, repeat=None): :param repeat: The number of times that the specified action must occur to be considered complete. :type repeat: (optional) int """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.gadget_ids = gadget_ids self.colors = colors @@ -78,7 +78,7 @@ def __init__(self, gadget_ids=None, colors=None, action=None, repeat=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/game_engine/pattern_recognizer.py b/ask-sdk-model/ask_sdk_model/services/game_engine/pattern_recognizer.py index cbc49a1..e09bfcf 100644 --- a/ask-sdk-model/ask_sdk_model/services/game_engine/pattern_recognizer.py +++ b/ask-sdk-model/ask_sdk_model/services/game_engine/pattern_recognizer.py @@ -52,7 +52,7 @@ class PatternRecognizer(Recognizer): 'gadget_ids': 'list[str]', 'actions': 'list[str]', 'pattern': 'list[ask_sdk_model.services.game_engine.pattern.Pattern]' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -61,7 +61,7 @@ class PatternRecognizer(Recognizer): 'gadget_ids': 'gadgetIds', 'actions': 'actions', 'pattern': 'pattern' - } +} # type: Dict def __init__(self, anchor=None, fuzzy=None, gadget_ids=None, actions=None, pattern=None): # type: (Optional[PatternRecognizerAnchorType], Optional[bool], Optional[List[object]], Optional[List[object]], Optional[List[Pattern]]) -> None @@ -78,7 +78,7 @@ def __init__(self, anchor=None, fuzzy=None, gadget_ids=None, actions=None, patte :param pattern: An object that provides all of the events that need to occur, in a specific order, for this recognizer to be true. Omitting any parameters in this object means \"match anything\". :type pattern: (optional) list[ask_sdk_model.services.game_engine.pattern.Pattern] """ - self.__discriminator_value = "match" + self.__discriminator_value = "match" # type: str self.object_type = self.__discriminator_value super(PatternRecognizer, self).__init__(object_type=self.__discriminator_value) @@ -91,7 +91,7 @@ def __init__(self, anchor=None, fuzzy=None, gadget_ids=None, actions=None, patte def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/game_engine/progress_recognizer.py b/ask-sdk-model/ask_sdk_model/services/game_engine/progress_recognizer.py index 70a2df0..7dd0849 100644 --- a/ask-sdk-model/ask_sdk_model/services/game_engine/progress_recognizer.py +++ b/ask-sdk-model/ask_sdk_model/services/game_engine/progress_recognizer.py @@ -41,13 +41,13 @@ class ProgressRecognizer(Recognizer): 'object_type': 'str', 'recognizer': 'str', 'completion': 'float' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'recognizer': 'recognizer', 'completion': 'completion' - } +} # type: Dict def __init__(self, recognizer=None, completion=None): # type: (Optional[str], Optional[float]) -> None @@ -58,7 +58,7 @@ def __init__(self, recognizer=None, completion=None): :param completion: The completion threshold, as a decimal percentage, of the specified recognizer before which this recognizer becomes true. :type completion: (optional) float """ - self.__discriminator_value = "progress" + self.__discriminator_value = "progress" # type: str self.object_type = self.__discriminator_value super(ProgressRecognizer, self).__init__(object_type=self.__discriminator_value) @@ -68,7 +68,7 @@ def __init__(self, recognizer=None, completion=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/game_engine/py.typed b/ask-sdk-model/ask_sdk_model/services/game_engine/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/services/game_engine/recognizer.py b/ask-sdk-model/ask_sdk_model/services/game_engine/recognizer.py index 12ff69c..70526bf 100644 --- a/ask-sdk-model/ask_sdk_model/services/game_engine/recognizer.py +++ b/ask-sdk-model/ask_sdk_model/services/game_engine/recognizer.py @@ -48,11 +48,11 @@ class Recognizer(object): """ deserialized_types = { 'object_type': 'str' - } + } # type: Dict attribute_map = { 'object_type': 'type' - } +} # type: Dict discriminator_value_class_map = { 'progress': 'ask_sdk_model.services.game_engine.progress_recognizer.ProgressRecognizer', @@ -72,13 +72,13 @@ def __init__(self, object_type=None): :param object_type: :type object_type: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.object_type = object_type @classmethod def get_real_child_model(cls, data): - # type: (Dict[str, str]) -> str + # type: (Dict[str, str]) -> Optional[str] """Returns the real base class specified by the discriminator""" discriminator_value = data[cls.json_discriminator_key] return cls.discriminator_value_class_map.get(discriminator_value) @@ -86,7 +86,7 @@ def get_real_child_model(cls, data): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/list_management/alexa_list.py b/ask-sdk-model/ask_sdk_model/services/list_management/alexa_list.py index 9499e19..2bc09b9 100644 --- a/ask-sdk-model/ask_sdk_model/services/list_management/alexa_list.py +++ b/ask-sdk-model/ask_sdk_model/services/list_management/alexa_list.py @@ -52,7 +52,7 @@ class AlexaList(object): 'version': 'int', 'items': 'list[ask_sdk_model.services.list_management.alexa_list_item.AlexaListItem]', 'links': 'ask_sdk_model.services.list_management.links.Links' - } + } # type: Dict attribute_map = { 'list_id': 'listId', @@ -61,7 +61,7 @@ class AlexaList(object): 'version': 'version', 'items': 'items', 'links': 'links' - } +} # type: Dict def __init__(self, list_id=None, name=None, state=None, version=None, items=None, links=None): # type: (Optional[str], Optional[str], Optional[ListState], Optional[int], Optional[List[AlexaListItem]], Optional[Links]) -> None @@ -80,7 +80,7 @@ def __init__(self, list_id=None, name=None, state=None, version=None, items=None :param links: :type links: (optional) ask_sdk_model.services.list_management.links.Links """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.list_id = list_id self.name = name @@ -92,7 +92,7 @@ def __init__(self, list_id=None, name=None, state=None, version=None, items=None def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/list_management/alexa_list_item.py b/ask-sdk-model/ask_sdk_model/services/list_management/alexa_list_item.py index b5fbfe5..c8aacfb 100644 --- a/ask-sdk-model/ask_sdk_model/services/list_management/alexa_list_item.py +++ b/ask-sdk-model/ask_sdk_model/services/list_management/alexa_list_item.py @@ -53,7 +53,7 @@ class AlexaListItem(object): 'created_time': 'str', 'updated_time': 'str', 'href': 'str' - } + } # type: Dict attribute_map = { 'id': 'id', @@ -63,7 +63,7 @@ class AlexaListItem(object): 'created_time': 'createdTime', 'updated_time': 'updatedTime', 'href': 'href' - } +} # type: Dict def __init__(self, id=None, version=None, value=None, status=None, created_time=None, updated_time=None, href=None): # type: (Optional[str], Optional[int], Optional[str], Optional[ListItemState], Optional[str], Optional[str], Optional[str]) -> None @@ -84,7 +84,7 @@ def __init__(self, id=None, version=None, value=None, status=None, created_time= :param href: URL to retrieve the item from. :type href: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.id = id self.version = version @@ -97,7 +97,7 @@ def __init__(self, id=None, version=None, value=None, status=None, created_time= def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/list_management/alexa_list_metadata.py b/ask-sdk-model/ask_sdk_model/services/list_management/alexa_list_metadata.py index 3a1cd80..75fa4ff 100644 --- a/ask-sdk-model/ask_sdk_model/services/list_management/alexa_list_metadata.py +++ b/ask-sdk-model/ask_sdk_model/services/list_management/alexa_list_metadata.py @@ -48,7 +48,7 @@ class AlexaListMetadata(object): 'state': 'ask_sdk_model.services.list_management.list_state.ListState', 'version': 'int', 'status_map': 'list[ask_sdk_model.services.list_management.status.Status]' - } + } # type: Dict attribute_map = { 'list_id': 'listId', @@ -56,7 +56,7 @@ class AlexaListMetadata(object): 'state': 'state', 'version': 'version', 'status_map': 'statusMap' - } +} # type: Dict def __init__(self, list_id=None, name=None, state=None, version=None, status_map=None): # type: (Optional[str], Optional[str], Optional[ListState], Optional[int], Optional[List[Status]]) -> None @@ -73,7 +73,7 @@ def __init__(self, list_id=None, name=None, state=None, version=None, status_map :param status_map: :type status_map: (optional) list[ask_sdk_model.services.list_management.status.Status] """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.list_id = list_id self.name = name @@ -84,7 +84,7 @@ def __init__(self, list_id=None, name=None, state=None, version=None, status_map def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/list_management/alexa_lists_metadata.py b/ask-sdk-model/ask_sdk_model/services/list_management/alexa_lists_metadata.py index e4e33d4..a5e7801 100644 --- a/ask-sdk-model/ask_sdk_model/services/list_management/alexa_lists_metadata.py +++ b/ask-sdk-model/ask_sdk_model/services/list_management/alexa_lists_metadata.py @@ -35,11 +35,11 @@ class AlexaListsMetadata(object): """ deserialized_types = { 'lists': 'list[ask_sdk_model.services.list_management.alexa_list_metadata.AlexaListMetadata]' - } + } # type: Dict attribute_map = { 'lists': 'lists' - } +} # type: Dict def __init__(self, lists=None): # type: (Optional[List[AlexaListMetadata]]) -> None @@ -48,14 +48,14 @@ def __init__(self, lists=None): :param lists: :type lists: (optional) list[ask_sdk_model.services.list_management.alexa_list_metadata.AlexaListMetadata] """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.lists = lists def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/list_management/create_list_item_request.py b/ask-sdk-model/ask_sdk_model/services/list_management/create_list_item_request.py index 59f114a..8350579 100644 --- a/ask-sdk-model/ask_sdk_model/services/list_management/create_list_item_request.py +++ b/ask-sdk-model/ask_sdk_model/services/list_management/create_list_item_request.py @@ -38,12 +38,12 @@ class CreateListItemRequest(object): deserialized_types = { 'value': 'str', 'status': 'ask_sdk_model.services.list_management.list_item_state.ListItemState' - } + } # type: Dict attribute_map = { 'value': 'value', 'status': 'status' - } +} # type: Dict def __init__(self, value=None, status=None): # type: (Optional[str], Optional[ListItemState]) -> None @@ -54,7 +54,7 @@ def __init__(self, value=None, status=None): :param status: :type status: (optional) ask_sdk_model.services.list_management.list_item_state.ListItemState """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.value = value self.status = status @@ -62,7 +62,7 @@ def __init__(self, value=None, status=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/list_management/create_list_request.py b/ask-sdk-model/ask_sdk_model/services/list_management/create_list_request.py index cdcc285..59c257b 100644 --- a/ask-sdk-model/ask_sdk_model/services/list_management/create_list_request.py +++ b/ask-sdk-model/ask_sdk_model/services/list_management/create_list_request.py @@ -38,12 +38,12 @@ class CreateListRequest(object): deserialized_types = { 'name': 'str', 'state': 'ask_sdk_model.services.list_management.list_state.ListState' - } + } # type: Dict attribute_map = { 'name': 'name', 'state': 'state' - } +} # type: Dict def __init__(self, name=None, state=None): # type: (Optional[str], Optional[ListState]) -> None @@ -54,7 +54,7 @@ def __init__(self, name=None, state=None): :param state: :type state: (optional) ask_sdk_model.services.list_management.list_state.ListState """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.name = name self.state = state @@ -62,7 +62,7 @@ def __init__(self, name=None, state=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/list_management/error.py b/ask-sdk-model/ask_sdk_model/services/list_management/error.py index e1ed231..beea352 100644 --- a/ask-sdk-model/ask_sdk_model/services/list_management/error.py +++ b/ask-sdk-model/ask_sdk_model/services/list_management/error.py @@ -37,12 +37,12 @@ class Error(object): deserialized_types = { 'object_type': 'str', 'message': 'str' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'message': 'message' - } +} # type: Dict def __init__(self, object_type=None, message=None): # type: (Optional[str], Optional[str]) -> None @@ -53,7 +53,7 @@ def __init__(self, object_type=None, message=None): :param message: :type message: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.object_type = object_type self.message = message @@ -61,7 +61,7 @@ def __init__(self, object_type=None, message=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/list_management/forbidden_error.py b/ask-sdk-model/ask_sdk_model/services/list_management/forbidden_error.py index 356d35a..83e5017 100644 --- a/ask-sdk-model/ask_sdk_model/services/list_management/forbidden_error.py +++ b/ask-sdk-model/ask_sdk_model/services/list_management/forbidden_error.py @@ -34,11 +34,11 @@ class ForbiddenError(object): """ deserialized_types = { 'message': 'str' - } + } # type: Dict attribute_map = { 'message': 'Message' - } +} # type: Dict def __init__(self, message=None): # type: (Optional[str]) -> None @@ -47,14 +47,14 @@ def __init__(self, message=None): :param message: :type message: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.message = message def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/list_management/links.py b/ask-sdk-model/ask_sdk_model/services/list_management/links.py index ff5d20c..2c78153 100644 --- a/ask-sdk-model/ask_sdk_model/services/list_management/links.py +++ b/ask-sdk-model/ask_sdk_model/services/list_management/links.py @@ -34,11 +34,11 @@ class Links(object): """ deserialized_types = { 'next': 'str' - } + } # type: Dict attribute_map = { 'next': 'next' - } +} # type: Dict def __init__(self, next=None): # type: (Optional[str]) -> None @@ -47,14 +47,14 @@ def __init__(self, next=None): :param next: :type next: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.next = next def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/list_management/list_body.py b/ask-sdk-model/ask_sdk_model/services/list_management/list_body.py index b9a18ea..78a0096 100644 --- a/ask-sdk-model/ask_sdk_model/services/list_management/list_body.py +++ b/ask-sdk-model/ask_sdk_model/services/list_management/list_body.py @@ -34,11 +34,11 @@ class ListBody(object): """ deserialized_types = { 'list_id': 'str' - } + } # type: Dict attribute_map = { 'list_id': 'listId' - } +} # type: Dict def __init__(self, list_id=None): # type: (Optional[str]) -> None @@ -47,14 +47,14 @@ def __init__(self, list_id=None): :param list_id: :type list_id: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.list_id = list_id def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/list_management/list_created_event_request.py b/ask-sdk-model/ask_sdk_model/services/list_management/list_created_event_request.py index 9a6fbbf..3dafdef 100644 --- a/ask-sdk-model/ask_sdk_model/services/list_management/list_created_event_request.py +++ b/ask-sdk-model/ask_sdk_model/services/list_management/list_created_event_request.py @@ -52,7 +52,7 @@ class ListCreatedEventRequest(Request): 'body': 'ask_sdk_model.services.list_management.list_body.ListBody', 'event_creation_time': 'datetime', 'event_publishing_time': 'datetime' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -62,7 +62,7 @@ class ListCreatedEventRequest(Request): 'body': 'body', 'event_creation_time': 'eventCreationTime', 'event_publishing_time': 'eventPublishingTime' - } +} # type: Dict def __init__(self, request_id=None, timestamp=None, locale=None, body=None, event_creation_time=None, event_publishing_time=None): # type: (Optional[str], Optional[datetime], Optional[str], Optional[ListBody], Optional[datetime], Optional[datetime]) -> None @@ -81,7 +81,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, body=None, even :param event_publishing_time: :type event_publishing_time: (optional) datetime """ - self.__discriminator_value = "AlexaHouseholdListEvent.ListCreated" + self.__discriminator_value = "AlexaHouseholdListEvent.ListCreated" # type: str self.object_type = self.__discriminator_value super(ListCreatedEventRequest, self).__init__(object_type=self.__discriminator_value, request_id=request_id, timestamp=timestamp, locale=locale) @@ -92,7 +92,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, body=None, even def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/list_management/list_deleted_event_request.py b/ask-sdk-model/ask_sdk_model/services/list_management/list_deleted_event_request.py index 6036ff7..a5bec91 100644 --- a/ask-sdk-model/ask_sdk_model/services/list_management/list_deleted_event_request.py +++ b/ask-sdk-model/ask_sdk_model/services/list_management/list_deleted_event_request.py @@ -52,7 +52,7 @@ class ListDeletedEventRequest(Request): 'body': 'ask_sdk_model.services.list_management.list_body.ListBody', 'event_creation_time': 'datetime', 'event_publishing_time': 'datetime' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -62,7 +62,7 @@ class ListDeletedEventRequest(Request): 'body': 'body', 'event_creation_time': 'eventCreationTime', 'event_publishing_time': 'eventPublishingTime' - } +} # type: Dict def __init__(self, request_id=None, timestamp=None, locale=None, body=None, event_creation_time=None, event_publishing_time=None): # type: (Optional[str], Optional[datetime], Optional[str], Optional[ListBody], Optional[datetime], Optional[datetime]) -> None @@ -81,7 +81,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, body=None, even :param event_publishing_time: :type event_publishing_time: (optional) datetime """ - self.__discriminator_value = "AlexaHouseholdListEvent.ListDeleted" + self.__discriminator_value = "AlexaHouseholdListEvent.ListDeleted" # type: str self.object_type = self.__discriminator_value super(ListDeletedEventRequest, self).__init__(object_type=self.__discriminator_value, request_id=request_id, timestamp=timestamp, locale=locale) @@ -92,7 +92,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, body=None, even def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/list_management/list_item_body.py b/ask-sdk-model/ask_sdk_model/services/list_management/list_item_body.py index 34233d0..84764f1 100644 --- a/ask-sdk-model/ask_sdk_model/services/list_management/list_item_body.py +++ b/ask-sdk-model/ask_sdk_model/services/list_management/list_item_body.py @@ -37,12 +37,12 @@ class ListItemBody(object): deserialized_types = { 'list_id': 'str', 'list_item_ids': 'list[str]' - } + } # type: Dict attribute_map = { 'list_id': 'listId', 'list_item_ids': 'listItemIds' - } +} # type: Dict def __init__(self, list_id=None, list_item_ids=None): # type: (Optional[str], Optional[List[object]]) -> None @@ -53,7 +53,7 @@ def __init__(self, list_id=None, list_item_ids=None): :param list_item_ids: :type list_item_ids: (optional) list[str] """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.list_id = list_id self.list_item_ids = list_item_ids @@ -61,7 +61,7 @@ def __init__(self, list_id=None, list_item_ids=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/list_management/list_items_created_event_request.py b/ask-sdk-model/ask_sdk_model/services/list_management/list_items_created_event_request.py index 5036297..a028462 100644 --- a/ask-sdk-model/ask_sdk_model/services/list_management/list_items_created_event_request.py +++ b/ask-sdk-model/ask_sdk_model/services/list_management/list_items_created_event_request.py @@ -52,7 +52,7 @@ class ListItemsCreatedEventRequest(Request): 'body': 'ask_sdk_model.services.list_management.list_item_body.ListItemBody', 'event_creation_time': 'datetime', 'event_publishing_time': 'datetime' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -62,7 +62,7 @@ class ListItemsCreatedEventRequest(Request): 'body': 'body', 'event_creation_time': 'eventCreationTime', 'event_publishing_time': 'eventPublishingTime' - } +} # type: Dict def __init__(self, request_id=None, timestamp=None, locale=None, body=None, event_creation_time=None, event_publishing_time=None): # type: (Optional[str], Optional[datetime], Optional[str], Optional[ListItemBody], Optional[datetime], Optional[datetime]) -> None @@ -81,7 +81,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, body=None, even :param event_publishing_time: :type event_publishing_time: (optional) datetime """ - self.__discriminator_value = "AlexaHouseholdListEvent.ItemsCreated" + self.__discriminator_value = "AlexaHouseholdListEvent.ItemsCreated" # type: str self.object_type = self.__discriminator_value super(ListItemsCreatedEventRequest, self).__init__(object_type=self.__discriminator_value, request_id=request_id, timestamp=timestamp, locale=locale) @@ -92,7 +92,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, body=None, even def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/list_management/list_items_deleted_event_request.py b/ask-sdk-model/ask_sdk_model/services/list_management/list_items_deleted_event_request.py index b0f8e80..e3cdd27 100644 --- a/ask-sdk-model/ask_sdk_model/services/list_management/list_items_deleted_event_request.py +++ b/ask-sdk-model/ask_sdk_model/services/list_management/list_items_deleted_event_request.py @@ -52,7 +52,7 @@ class ListItemsDeletedEventRequest(Request): 'body': 'ask_sdk_model.services.list_management.list_item_body.ListItemBody', 'event_creation_time': 'datetime', 'event_publishing_time': 'datetime' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -62,7 +62,7 @@ class ListItemsDeletedEventRequest(Request): 'body': 'body', 'event_creation_time': 'eventCreationTime', 'event_publishing_time': 'eventPublishingTime' - } +} # type: Dict def __init__(self, request_id=None, timestamp=None, locale=None, body=None, event_creation_time=None, event_publishing_time=None): # type: (Optional[str], Optional[datetime], Optional[str], Optional[ListItemBody], Optional[datetime], Optional[datetime]) -> None @@ -81,7 +81,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, body=None, even :param event_publishing_time: :type event_publishing_time: (optional) datetime """ - self.__discriminator_value = "AlexaHouseholdListEvent.ItemsDeleted" + self.__discriminator_value = "AlexaHouseholdListEvent.ItemsDeleted" # type: str self.object_type = self.__discriminator_value super(ListItemsDeletedEventRequest, self).__init__(object_type=self.__discriminator_value, request_id=request_id, timestamp=timestamp, locale=locale) @@ -92,7 +92,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, body=None, even def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/list_management/list_items_updated_event_request.py b/ask-sdk-model/ask_sdk_model/services/list_management/list_items_updated_event_request.py index e612c4d..7435b3f 100644 --- a/ask-sdk-model/ask_sdk_model/services/list_management/list_items_updated_event_request.py +++ b/ask-sdk-model/ask_sdk_model/services/list_management/list_items_updated_event_request.py @@ -52,7 +52,7 @@ class ListItemsUpdatedEventRequest(Request): 'body': 'ask_sdk_model.services.list_management.list_item_body.ListItemBody', 'event_creation_time': 'datetime', 'event_publishing_time': 'datetime' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -62,7 +62,7 @@ class ListItemsUpdatedEventRequest(Request): 'body': 'body', 'event_creation_time': 'eventCreationTime', 'event_publishing_time': 'eventPublishingTime' - } +} # type: Dict def __init__(self, request_id=None, timestamp=None, locale=None, body=None, event_creation_time=None, event_publishing_time=None): # type: (Optional[str], Optional[datetime], Optional[str], Optional[ListItemBody], Optional[datetime], Optional[datetime]) -> None @@ -81,7 +81,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, body=None, even :param event_publishing_time: :type event_publishing_time: (optional) datetime """ - self.__discriminator_value = "AlexaHouseholdListEvent.ItemsUpdated" + self.__discriminator_value = "AlexaHouseholdListEvent.ItemsUpdated" # type: str self.object_type = self.__discriminator_value super(ListItemsUpdatedEventRequest, self).__init__(object_type=self.__discriminator_value, request_id=request_id, timestamp=timestamp, locale=locale) @@ -92,7 +92,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, body=None, even def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/list_management/list_management_service_client.py b/ask-sdk-model/ask_sdk_model/services/list_management/list_management_service_client.py index 606cd28..e6e6ddb 100644 --- a/ask-sdk-model/ask_sdk_model/services/list_management/list_management_service_client.py +++ b/ask-sdk-model/ask_sdk_model/services/list_management/list_management_service_client.py @@ -25,7 +25,7 @@ if typing.TYPE_CHECKING: - from typing import Dict, List, Union + from typing import Dict, List, Union, Any from datetime import datetime from ask_sdk_model.services.list_management.forbidden_error import ForbiddenError from ask_sdk_model.services.list_management.alexa_lists_metadata import AlexaListsMetadata @@ -54,7 +54,7 @@ def __init__(self, api_configuration): super(ListManagementServiceClient, self).__init__(api_configuration) def get_lists_metadata(self, **kwargs): - # type: () -> Union[ForbiddenError, Error, AlexaListsMetadata] + # type: (**Any) -> Union[ForbiddenError, Error, AlexaListsMetadata] """ Retrieves the metadata for all customer lists, including the customer’s default lists. @@ -69,11 +69,11 @@ def get_lists_metadata(self, **kwargs): resource_path = '/v2/householdlists/' resource_path = resource_path.replace('{format}', 'json') - path_params = {} + path_params = {} # type: Dict - query_params = [] + query_params = [] # type: List - header_params = [] + header_params = [] # type: List body_params = None header_params.append(('Content-type', 'application/json')) @@ -82,7 +82,7 @@ def get_lists_metadata(self, **kwargs): authorization_value = "Bearer " + self._authorization_value header_params.append(("Authorization", authorization_value)) - error_definitions = [] + error_definitions = [] # type: List error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.list_management.alexa_lists_metadata.AlexaListsMetadata", status_code=200, message="Success")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.list_management.forbidden_error.ForbiddenError", status_code=403, message="Forbidden")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.list_management.error.Error", status_code=500, message="Internal Server Error")) @@ -99,7 +99,7 @@ def get_lists_metadata(self, **kwargs): response_type="ask_sdk_model.services.list_management.alexa_lists_metadata.AlexaListsMetadata") def delete_list(self, list_id, **kwargs): - # type: (str) -> Union[Error] + # type: (str, **Any) -> Union[Error] """ This API deletes a customer custom list. @@ -120,13 +120,13 @@ def delete_list(self, list_id, **kwargs): resource_path = '/v2/householdlists/{listId}/' resource_path = resource_path.replace('{format}', 'json') - path_params = {} + path_params = {} # type: Dict if 'list_id' in params: path_params['listId'] = params['list_id'] - query_params = [] + query_params = [] # type: List - header_params = [] + header_params = [] # type: List body_params = None header_params.append(('Content-type', 'application/json')) @@ -135,7 +135,7 @@ def delete_list(self, list_id, **kwargs): authorization_value = "Bearer " + self._authorization_value header_params.append(("Authorization", authorization_value)) - error_definitions = [] + error_definitions = [] # type: List error_definitions.append(ServiceClientResponse(response_type=None, status_code=200, message="Success")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.list_management.error.Error", status_code=403, message="Forbidden")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.list_management.error.Error", status_code=404, message="Not Found")) @@ -154,7 +154,7 @@ def delete_list(self, list_id, **kwargs): response_type=None) def delete_list_item(self, list_id, item_id, **kwargs): - # type: (str, str) -> Union[Error] + # type: (str, str, **Any) -> Union[Error] """ This API deletes an item in the specified list. @@ -181,15 +181,15 @@ def delete_list_item(self, list_id, item_id, **kwargs): resource_path = '/v2/householdlists/{listId}/items/{itemId}/' resource_path = resource_path.replace('{format}', 'json') - path_params = {} + path_params = {} # type: Dict if 'list_id' in params: path_params['listId'] = params['list_id'] if 'item_id' in params: path_params['itemId'] = params['item_id'] - query_params = [] + query_params = [] # type: List - header_params = [] + header_params = [] # type: List body_params = None header_params.append(('Content-type', 'application/json')) @@ -198,7 +198,7 @@ def delete_list_item(self, list_id, item_id, **kwargs): authorization_value = "Bearer " + self._authorization_value header_params.append(("Authorization", authorization_value)) - error_definitions = [] + error_definitions = [] # type: List error_definitions.append(ServiceClientResponse(response_type=None, status_code=200, message="Success")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.list_management.error.Error", status_code=403, message="Forbidden")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.list_management.error.Error", status_code=404, message="Not Found")) @@ -217,7 +217,7 @@ def delete_list_item(self, list_id, item_id, **kwargs): response_type=None) def get_list_item(self, list_id, item_id, **kwargs): - # type: (str, str) -> Union[AlexaListItem, Error] + # type: (str, str, **Any) -> Union[AlexaListItem, Error] """ This API can be used to retrieve single item with in any list by listId and itemId. This API can read list items from an archived list. Attempting to read list items from a deleted list return an ObjectNotFound 404 error. @@ -244,15 +244,15 @@ def get_list_item(self, list_id, item_id, **kwargs): resource_path = '/v2/householdlists/{listId}/items/{itemId}/' resource_path = resource_path.replace('{format}', 'json') - path_params = {} + path_params = {} # type: Dict if 'list_id' in params: path_params['listId'] = params['list_id'] if 'item_id' in params: path_params['itemId'] = params['item_id'] - query_params = [] + query_params = [] # type: List - header_params = [] + header_params = [] # type: List body_params = None header_params.append(('Content-type', 'application/json')) @@ -261,7 +261,7 @@ def get_list_item(self, list_id, item_id, **kwargs): authorization_value = "Bearer " + self._authorization_value header_params.append(("Authorization", authorization_value)) - error_definitions = [] + error_definitions = [] # type: List error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.list_management.alexa_list_item.AlexaListItem", status_code=200, message="Success")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.list_management.error.Error", status_code=403, message="Forbidden")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.list_management.error.Error", status_code=404, message="Not Found")) @@ -280,7 +280,7 @@ def get_list_item(self, list_id, item_id, **kwargs): response_type="ask_sdk_model.services.list_management.alexa_list_item.AlexaListItem") def update_list_item(self, list_id, item_id, update_list_item_request, **kwargs): - # type: (str, str, UpdateListItemRequest) -> Union[AlexaListItem, Error] + # type: (str, str, UpdateListItemRequest, **Any) -> Union[AlexaListItem, Error] """ API used to update an item value or item status. @@ -313,15 +313,15 @@ def update_list_item(self, list_id, item_id, update_list_item_request, **kwargs) resource_path = '/v2/householdlists/{listId}/items/{itemId}/' resource_path = resource_path.replace('{format}', 'json') - path_params = {} + path_params = {} # type: Dict if 'list_id' in params: path_params['listId'] = params['list_id'] if 'item_id' in params: path_params['itemId'] = params['item_id'] - query_params = [] + query_params = [] # type: List - header_params = [] + header_params = [] # type: List body_params = None if 'update_list_item_request' in params: @@ -332,7 +332,7 @@ def update_list_item(self, list_id, item_id, update_list_item_request, **kwargs) authorization_value = "Bearer " + self._authorization_value header_params.append(("Authorization", authorization_value)) - error_definitions = [] + error_definitions = [] # type: List error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.list_management.alexa_list_item.AlexaListItem", status_code=200, message="Success")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.list_management.error.Error", status_code=403, message="Forbidden")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.list_management.error.Error", status_code=404, message="Not Found")) @@ -352,7 +352,7 @@ def update_list_item(self, list_id, item_id, update_list_item_request, **kwargs) response_type="ask_sdk_model.services.list_management.alexa_list_item.AlexaListItem") def create_list_item(self, list_id, create_list_item_request, **kwargs): - # type: (str, CreateListItemRequest) -> Union[AlexaListItem, Error] + # type: (str, CreateListItemRequest, **Any) -> Union[AlexaListItem, Error] """ This API creates an item in an active list or in a default list. @@ -379,13 +379,13 @@ def create_list_item(self, list_id, create_list_item_request, **kwargs): resource_path = '/v2/householdlists/{listId}/items/' resource_path = resource_path.replace('{format}', 'json') - path_params = {} + path_params = {} # type: Dict if 'list_id' in params: path_params['listId'] = params['list_id'] - query_params = [] + query_params = [] # type: List - header_params = [] + header_params = [] # type: List body_params = None if 'create_list_item_request' in params: @@ -396,7 +396,7 @@ def create_list_item(self, list_id, create_list_item_request, **kwargs): authorization_value = "Bearer " + self._authorization_value header_params.append(("Authorization", authorization_value)) - error_definitions = [] + error_definitions = [] # type: List error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.list_management.alexa_list_item.AlexaListItem", status_code=201, message="Success")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.list_management.error.Error", status_code=400, message="Bad Request")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.list_management.error.Error", status_code=403, message="Forbidden")) @@ -416,7 +416,7 @@ def create_list_item(self, list_id, create_list_item_request, **kwargs): response_type="ask_sdk_model.services.list_management.alexa_list_item.AlexaListItem") def update_list(self, list_id, update_list_request, **kwargs): - # type: (str, UpdateListRequest) -> Union[Error, AlexaListMetadata] + # type: (str, UpdateListRequest, **Any) -> Union[Error, AlexaListMetadata] """ This API updates a custom list. Only the list name or state can be updated. An Alexa customer can turn an archived list into an active one. @@ -443,13 +443,13 @@ def update_list(self, list_id, update_list_request, **kwargs): resource_path = '/v2/householdlists/{listId}/' resource_path = resource_path.replace('{format}', 'json') - path_params = {} + path_params = {} # type: Dict if 'list_id' in params: path_params['listId'] = params['list_id'] - query_params = [] + query_params = [] # type: List - header_params = [] + header_params = [] # type: List body_params = None if 'update_list_request' in params: @@ -460,7 +460,7 @@ def update_list(self, list_id, update_list_request, **kwargs): authorization_value = "Bearer " + self._authorization_value header_params.append(("Authorization", authorization_value)) - error_definitions = [] + error_definitions = [] # type: List error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.list_management.alexa_list_metadata.AlexaListMetadata", status_code=200, message="Success")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.list_management.error.Error", status_code=400, message="Bad Request")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.list_management.error.Error", status_code=403, message="Forbidden")) @@ -481,7 +481,7 @@ def update_list(self, list_id, update_list_request, **kwargs): response_type="ask_sdk_model.services.list_management.alexa_list_metadata.AlexaListMetadata") def get_list(self, list_id, status, **kwargs): - # type: (str, str) -> Union[AlexaList, Error] + # type: (str, str, **Any) -> Union[AlexaList, Error] """ Retrieves the list metadata including the items in the list with requested status. @@ -508,15 +508,15 @@ def get_list(self, list_id, status, **kwargs): resource_path = '/v2/householdlists/{listId}/{status}/' resource_path = resource_path.replace('{format}', 'json') - path_params = {} + path_params = {} # type: Dict if 'list_id' in params: path_params['listId'] = params['list_id'] if 'status' in params: path_params['status'] = params['status'] - query_params = [] + query_params = [] # type: List - header_params = [] + header_params = [] # type: List body_params = None header_params.append(('Content-type', 'application/json')) @@ -525,7 +525,7 @@ def get_list(self, list_id, status, **kwargs): authorization_value = "Bearer " + self._authorization_value header_params.append(("Authorization", authorization_value)) - error_definitions = [] + error_definitions = [] # type: List error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.list_management.alexa_list.AlexaList", status_code=200, message="Success")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.list_management.error.Error", status_code=400, message="Bad Request")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.list_management.error.Error", status_code=403, message="Forbidden")) @@ -545,7 +545,7 @@ def get_list(self, list_id, status, **kwargs): response_type="ask_sdk_model.services.list_management.alexa_list.AlexaList") def create_list(self, create_list_request, **kwargs): - # type: (CreateListRequest) -> Union[Error, AlexaListMetadata] + # type: (CreateListRequest, **Any) -> Union[Error, AlexaListMetadata] """ This API creates a custom list. The new list name must be different than any existing list name. @@ -566,11 +566,11 @@ def create_list(self, create_list_request, **kwargs): resource_path = '/v2/householdlists/' resource_path = resource_path.replace('{format}', 'json') - path_params = {} + path_params = {} # type: Dict - query_params = [] + query_params = [] # type: List - header_params = [] + header_params = [] # type: List body_params = None if 'create_list_request' in params: @@ -581,7 +581,7 @@ def create_list(self, create_list_request, **kwargs): authorization_value = "Bearer " + self._authorization_value header_params.append(("Authorization", authorization_value)) - error_definitions = [] + error_definitions = [] # type: List error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.list_management.alexa_list_metadata.AlexaListMetadata", status_code=201, message="Success")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.list_management.error.Error", status_code=400, message="Bad Request")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.list_management.error.Error", status_code=403, message="Forbidden")) diff --git a/ask-sdk-model/ask_sdk_model/services/list_management/list_updated_event_request.py b/ask-sdk-model/ask_sdk_model/services/list_management/list_updated_event_request.py index ce2aa96..1d14497 100644 --- a/ask-sdk-model/ask_sdk_model/services/list_management/list_updated_event_request.py +++ b/ask-sdk-model/ask_sdk_model/services/list_management/list_updated_event_request.py @@ -52,7 +52,7 @@ class ListUpdatedEventRequest(Request): 'body': 'ask_sdk_model.services.list_management.list_body.ListBody', 'event_creation_time': 'datetime', 'event_publishing_time': 'datetime' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -62,7 +62,7 @@ class ListUpdatedEventRequest(Request): 'body': 'body', 'event_creation_time': 'eventCreationTime', 'event_publishing_time': 'eventPublishingTime' - } +} # type: Dict def __init__(self, request_id=None, timestamp=None, locale=None, body=None, event_creation_time=None, event_publishing_time=None): # type: (Optional[str], Optional[datetime], Optional[str], Optional[ListBody], Optional[datetime], Optional[datetime]) -> None @@ -81,7 +81,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, body=None, even :param event_publishing_time: :type event_publishing_time: (optional) datetime """ - self.__discriminator_value = "AlexaHouseholdListEvent.ListUpdated" + self.__discriminator_value = "AlexaHouseholdListEvent.ListUpdated" # type: str self.object_type = self.__discriminator_value super(ListUpdatedEventRequest, self).__init__(object_type=self.__discriminator_value, request_id=request_id, timestamp=timestamp, locale=locale) @@ -92,7 +92,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, body=None, even def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/list_management/py.typed b/ask-sdk-model/ask_sdk_model/services/list_management/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/services/list_management/status.py b/ask-sdk-model/ask_sdk_model/services/list_management/status.py index cd13eea..598e1d3 100644 --- a/ask-sdk-model/ask_sdk_model/services/list_management/status.py +++ b/ask-sdk-model/ask_sdk_model/services/list_management/status.py @@ -38,12 +38,12 @@ class Status(object): deserialized_types = { 'url': 'str', 'status': 'ask_sdk_model.services.list_management.list_item_state.ListItemState' - } + } # type: Dict attribute_map = { 'url': 'url', 'status': 'status' - } +} # type: Dict def __init__(self, url=None, status=None): # type: (Optional[str], Optional[ListItemState]) -> None @@ -54,7 +54,7 @@ def __init__(self, url=None, status=None): :param status: :type status: (optional) ask_sdk_model.services.list_management.list_item_state.ListItemState """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.url = url self.status = status @@ -62,7 +62,7 @@ def __init__(self, url=None, status=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/list_management/update_list_item_request.py b/ask-sdk-model/ask_sdk_model/services/list_management/update_list_item_request.py index ea50480..ec1a863 100644 --- a/ask-sdk-model/ask_sdk_model/services/list_management/update_list_item_request.py +++ b/ask-sdk-model/ask_sdk_model/services/list_management/update_list_item_request.py @@ -41,13 +41,13 @@ class UpdateListItemRequest(object): 'value': 'str', 'status': 'ask_sdk_model.services.list_management.list_item_state.ListItemState', 'version': 'int' - } + } # type: Dict attribute_map = { 'value': 'value', 'status': 'status', 'version': 'version' - } +} # type: Dict def __init__(self, value=None, status=None, version=None): # type: (Optional[str], Optional[ListItemState], Optional[int]) -> None @@ -60,7 +60,7 @@ def __init__(self, value=None, status=None, version=None): :param version: Item version when it was read. :type version: (optional) int """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.value = value self.status = status @@ -69,7 +69,7 @@ def __init__(self, value=None, status=None, version=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/list_management/update_list_request.py b/ask-sdk-model/ask_sdk_model/services/list_management/update_list_request.py index 67d1979..39b1f2c 100644 --- a/ask-sdk-model/ask_sdk_model/services/list_management/update_list_request.py +++ b/ask-sdk-model/ask_sdk_model/services/list_management/update_list_request.py @@ -41,13 +41,13 @@ class UpdateListRequest(object): 'name': 'str', 'state': 'ask_sdk_model.services.list_management.list_state.ListState', 'version': 'int' - } + } # type: Dict attribute_map = { 'name': 'name', 'state': 'state', 'version': 'version' - } +} # type: Dict def __init__(self, name=None, state=None, version=None): # type: (Optional[str], Optional[ListState], Optional[int]) -> None @@ -60,7 +60,7 @@ def __init__(self, name=None, state=None, version=None): :param version: :type version: (optional) int """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.name = name self.state = state @@ -69,7 +69,7 @@ def __init__(self, name=None, state=None, version=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/lwa/access_token.py b/ask-sdk-model/ask_sdk_model/services/lwa/access_token.py index 0693719..97e69a6 100644 --- a/ask-sdk-model/ask_sdk_model/services/lwa/access_token.py +++ b/ask-sdk-model/ask_sdk_model/services/lwa/access_token.py @@ -19,11 +19,6 @@ if typing.TYPE_CHECKING: from datetime import datetime - try: - long - except NameError: - long = int - class AccessToken(object): """Represents the access token provided by LWA (Login With Amazon). diff --git a/ask-sdk-model/ask_sdk_model/services/lwa/access_token_request.py b/ask-sdk-model/ask_sdk_model/services/lwa/access_token_request.py index 44ca1f2..1d2e397 100644 --- a/ask-sdk-model/ask_sdk_model/services/lwa/access_token_request.py +++ b/ask-sdk-model/ask_sdk_model/services/lwa/access_token_request.py @@ -67,9 +67,9 @@ def __init__(self, client_id=None, client_secret=None, scope=None): self.scope = scope def to_dict(self): - # type: () -> Dict[str, object] + # type: () -> Dict """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/lwa/access_token_response.py b/ask-sdk-model/ask_sdk_model/services/lwa/access_token_response.py index d5b4852..5fc596d 100644 --- a/ask-sdk-model/ask_sdk_model/services/lwa/access_token_response.py +++ b/ask-sdk-model/ask_sdk_model/services/lwa/access_token_response.py @@ -32,7 +32,7 @@ class AccessTokenResponse(object): :type access_token: str :param expires_in: The duration in seconds of the access token lifetime - :type expires_in: long + :type expires_in: int :param scope: The scope specified in the access token request :type scope: str :param token_type: The type of token issued @@ -40,7 +40,7 @@ class AccessTokenResponse(object): """ deserialized_types = { 'access_token': 'str', - 'expires_in': 'long', + 'expires_in': 'int', 'scope': 'str', 'token_type': 'str' } @@ -55,14 +55,14 @@ class AccessTokenResponse(object): def __init__( self, access_token=None, expires_in=None, scope=None, token_type=None): - # type: (Optional[str], Optional[str], Optional[str], Optional[str]) -> None + # type: (Optional[str], Optional[int], Optional[str], Optional[str]) -> None """LWA response for retrieving an access token. :param access_token: The access token from LWA :type access_token: str :param expires_in: The duration in seconds of the access token lifetime - :type expires_in: long + :type expires_in: int :param scope: The scope specified in the access token request :type scope: str :param token_type: The type of token issued @@ -78,7 +78,7 @@ def __init__( def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/lwa/error.py b/ask-sdk-model/ask_sdk_model/services/lwa/error.py index 38e8f5d..0cab1c2 100644 --- a/ask-sdk-model/ask_sdk_model/services/lwa/error.py +++ b/ask-sdk-model/ask_sdk_model/services/lwa/error.py @@ -59,7 +59,7 @@ def __init__(self, error_description=None, error_type=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/lwa/lwa_client.py b/ask-sdk-model/ask_sdk_model/services/lwa/lwa_client.py index 0b9e4f5..b9f3f45 100644 --- a/ask-sdk-model/ask_sdk_model/services/lwa/lwa_client.py +++ b/ask-sdk-model/ask_sdk_model/services/lwa/lwa_client.py @@ -29,7 +29,7 @@ from .access_token_response import AccessTokenResponse from ..api_configuration import ApiConfiguration from ..authentication_configuration import AuthenticationConfiguration - + from typing import Any, Dict, List, Optional class LwaClient(BaseServiceClient): """Client to call Login with Amazon (LWA) to retrieve access tokens. @@ -71,7 +71,7 @@ def __init__(self, api_configuration, authentication_configuration): if authentication_configuration is None: raise ValueError("authentication_configuration must be provided") self._authentication_configuration = authentication_configuration - self._scoped_token_cache = dict() + self._scoped_token_cache = dict() # type: Dict def get_access_token_for_scope(self, scope): # type: (str) -> str @@ -89,7 +89,7 @@ def get_access_token_for_scope(self, scope): :return: Retrieved access token for the given scope and configured client id, client secret :rtype: str - :raises: :py:class:`ValueError` is no scope is passed. + :raises: :py:class:`ValueError` is no scope is passed and :py:class:`ValueError` if LWA AccessTokenResponse is None. """ if scope is None: raise ValueError("scope must be provided") @@ -111,6 +111,9 @@ def get_access_token_for_scope(self, scope): lwa_response = self._generate_access_token( access_token_request=access_token_request) + if lwa_response is None or lwa_response.expires_in is None: + raise ValueError("Invalid response from LWA Client generate access token call") + access_token = AccessToken( token=lwa_response.access_token, expiry=local_now + timedelta(seconds=lwa_response.expires_in) @@ -120,7 +123,7 @@ def get_access_token_for_scope(self, scope): return access_token.token def _generate_access_token(self, access_token_request, **kwargs): - # type: (AccessTokenRequest) -> AccessTokenResponse + # type: (AccessTokenRequest, **Any) -> Optional[AccessTokenResponse] """Generate access token by calling the LWA API. :param access_token_request: The access token request with client @@ -139,8 +142,8 @@ def _generate_access_token(self, access_token_request, **kwargs): endpoint = "https://api.amazon.com" resource_path = '/auth/O2/token'.replace('{format}', 'json') - path_params = {} - query_params = [] + path_params = {} # type: Dict + query_params = [] # type: List header_params = [ ('Content-type', 'application/x-www-form-urlencoded')] @@ -153,7 +156,7 @@ def _generate_access_token(self, access_token_request, **kwargs): [grant_type_param, client_id_param, client_secret_param, scope_param]) - error_definitions = [] + error_definitions = [] # type: List error_definitions.append(ServiceClientResponse( response_type=( "ask_sdk_model.services.lwa.access_token_response." @@ -176,7 +179,7 @@ def _generate_access_token(self, access_token_request, **kwargs): status_code=503, message="Service Unavailable")) - return self.invoke( + return self.invoke( # type: ignore method="POST", endpoint=endpoint, path=resource_path, diff --git a/ask-sdk-model/ask_sdk_model/services/lwa/py.typed b/ask-sdk-model/ask_sdk_model/services/lwa/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/services/monetization/error.py b/ask-sdk-model/ask_sdk_model/services/monetization/error.py index 6d9d8a9..1604fb9 100644 --- a/ask-sdk-model/ask_sdk_model/services/monetization/error.py +++ b/ask-sdk-model/ask_sdk_model/services/monetization/error.py @@ -36,11 +36,11 @@ class Error(object): """ deserialized_types = { 'message': 'str' - } + } # type: Dict attribute_map = { 'message': 'message' - } +} # type: Dict def __init__(self, message=None): # type: (Optional[str]) -> None @@ -49,14 +49,14 @@ def __init__(self, message=None): :param message: Readable description of error :type message: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.message = message def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/monetization/in_skill_product.py b/ask-sdk-model/ask_sdk_model/services/monetization/in_skill_product.py index ad2a336..a29ae8c 100644 --- a/ask-sdk-model/ask_sdk_model/services/monetization/in_skill_product.py +++ b/ask-sdk-model/ask_sdk_model/services/monetization/in_skill_product.py @@ -66,7 +66,7 @@ class InSkillProduct(object): 'entitlement_reason': 'ask_sdk_model.services.monetization.entitlement_reason.EntitlementReason', 'active_entitlement_count': 'int', 'purchase_mode': 'ask_sdk_model.services.monetization.purchase_mode.PurchaseMode' - } + } # type: Dict attribute_map = { 'product_id': 'productId', @@ -79,7 +79,7 @@ class InSkillProduct(object): 'entitlement_reason': 'entitlementReason', 'active_entitlement_count': 'activeEntitlementCount', 'purchase_mode': 'purchaseMode' - } +} # type: Dict def __init__(self, product_id=None, reference_name=None, name=None, object_type=None, summary=None, purchasable=None, entitled=None, entitlement_reason=None, active_entitlement_count=None, purchase_mode=None): # type: (Optional[str], Optional[str], Optional[str], Optional[ProductType], Optional[str], Optional[PurchasableState], Optional[EntitledState], Optional[EntitlementReason], Optional[int], Optional[PurchaseMode]) -> None @@ -106,7 +106,7 @@ def __init__(self, product_id=None, reference_name=None, name=None, object_type= :param purchase_mode: :type purchase_mode: (optional) ask_sdk_model.services.monetization.purchase_mode.PurchaseMode """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.product_id = product_id self.reference_name = reference_name @@ -122,7 +122,7 @@ def __init__(self, product_id=None, reference_name=None, name=None, object_type= def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/monetization/in_skill_products_response.py b/ask-sdk-model/ask_sdk_model/services/monetization/in_skill_products_response.py index dc37280..91fc4ff 100644 --- a/ask-sdk-model/ask_sdk_model/services/monetization/in_skill_products_response.py +++ b/ask-sdk-model/ask_sdk_model/services/monetization/in_skill_products_response.py @@ -41,13 +41,13 @@ class InSkillProductsResponse(object): 'in_skill_products': 'list[ask_sdk_model.services.monetization.in_skill_product.InSkillProduct]', 'is_truncated': 'bool', 'next_token': 'str' - } + } # type: Dict attribute_map = { 'in_skill_products': 'inSkillProducts', 'is_truncated': 'isTruncated', 'next_token': 'nextToken' - } +} # type: Dict def __init__(self, in_skill_products=None, is_truncated=None, next_token=None): # type: (Optional[List[InSkillProduct]], Optional[bool], Optional[str]) -> None @@ -60,7 +60,7 @@ def __init__(self, in_skill_products=None, is_truncated=None, next_token=None): :param next_token: :type next_token: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.in_skill_products = in_skill_products self.is_truncated = is_truncated @@ -69,7 +69,7 @@ def __init__(self, in_skill_products=None, is_truncated=None, next_token=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/monetization/monetization_service_client.py b/ask-sdk-model/ask_sdk_model/services/monetization/monetization_service_client.py index b5bd525..40cbd63 100644 --- a/ask-sdk-model/ask_sdk_model/services/monetization/monetization_service_client.py +++ b/ask-sdk-model/ask_sdk_model/services/monetization/monetization_service_client.py @@ -25,7 +25,7 @@ if typing.TYPE_CHECKING: - from typing import Dict, List, Union + from typing import Dict, List, Union, Any from datetime import datetime from ask_sdk_model.services.monetization.error import Error from ask_sdk_model.services.monetization.in_skill_product import InSkillProduct @@ -47,7 +47,7 @@ def __init__(self, api_configuration): super(MonetizationServiceClient, self).__init__(api_configuration) def get_in_skill_products(self, accept_language, **kwargs): - # type: (str, str, str, str, str, float) -> Union[Error, InSkillProductsResponse] + # type: (str, **Any) -> Union[Error, InSkillProductsResponse] """ Gets In-Skill Products based on user's context for the Skill. @@ -78,9 +78,9 @@ def get_in_skill_products(self, accept_language, **kwargs): resource_path = '/v1/users/~current/skills/~current/inSkillProducts' resource_path = resource_path.replace('{format}', 'json') - path_params = {} + path_params = {} # type: Dict - query_params = [] + query_params = [] # type: List if 'purchasable' in params: query_params.append(('purchasable', params['purchasable'])) if 'entitled' in params: @@ -92,7 +92,7 @@ def get_in_skill_products(self, accept_language, **kwargs): if 'max_results' in params: query_params.append(('maxResults', params['max_results'])) - header_params = [] + header_params = [] # type: List if 'accept_language' in params: header_params.append(('Accept-Language', params['accept_language'])) @@ -103,7 +103,7 @@ def get_in_skill_products(self, accept_language, **kwargs): authorization_value = "Bearer " + self._authorization_value header_params.append(("Authorization", authorization_value)) - error_definitions = [] + error_definitions = [] # type: List error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.monetization.in_skill_products_response.InSkillProductsResponse", status_code=200, message="Returns a list of In-Skill products on success.")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.monetization.error.Error", status_code=400, message="Invalid request")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.monetization.error.Error", status_code=401, message="The authentication token is invalid or doesn't have access to make this request")) @@ -121,7 +121,7 @@ def get_in_skill_products(self, accept_language, **kwargs): response_type="ask_sdk_model.services.monetization.in_skill_products_response.InSkillProductsResponse") def get_in_skill_product(self, accept_language, product_id, **kwargs): - # type: (str, str) -> Union[Error, InSkillProduct] + # type: (str, str, **Any) -> Union[Error, InSkillProduct] """ Get In-Skill Product information based on user context for the Skill. @@ -148,13 +148,13 @@ def get_in_skill_product(self, accept_language, product_id, **kwargs): resource_path = '/v1/users/~current/skills/~current/inSkillProducts/{productId}' resource_path = resource_path.replace('{format}', 'json') - path_params = {} + path_params = {} # type: Dict if 'product_id' in params: path_params['productId'] = params['product_id'] - query_params = [] + query_params = [] # type: List - header_params = [] + header_params = [] # type: List if 'accept_language' in params: header_params.append(('Accept-Language', params['accept_language'])) @@ -165,7 +165,7 @@ def get_in_skill_product(self, accept_language, product_id, **kwargs): authorization_value = "Bearer " + self._authorization_value header_params.append(("Authorization", authorization_value)) - error_definitions = [] + error_definitions = [] # type: List error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.monetization.in_skill_product.InSkillProduct", status_code=200, message="Returns an In-Skill Product on success.")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.monetization.error.Error", status_code=400, message="Invalid request.")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.monetization.error.Error", status_code=401, message="The authentication token is invalid or doesn't have access to make this request")) diff --git a/ask-sdk-model/ask_sdk_model/services/monetization/py.typed b/ask-sdk-model/ask_sdk_model/services/monetization/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/services/proactive_events/create_proactive_event_request.py b/ask-sdk-model/ask_sdk_model/services/proactive_events/create_proactive_event_request.py index 8058f3b..bb1271d 100644 --- a/ask-sdk-model/ask_sdk_model/services/proactive_events/create_proactive_event_request.py +++ b/ask-sdk-model/ask_sdk_model/services/proactive_events/create_proactive_event_request.py @@ -51,7 +51,7 @@ class CreateProactiveEventRequest(object): 'event': 'ask_sdk_model.services.proactive_events.event.Event', 'localized_attributes': 'list[object]', 'relevant_audience': 'ask_sdk_model.services.proactive_events.relevant_audience.RelevantAudience' - } + } # type: Dict attribute_map = { 'timestamp': 'timestamp', @@ -60,7 +60,7 @@ class CreateProactiveEventRequest(object): 'event': 'event', 'localized_attributes': 'localizedAttributes', 'relevant_audience': 'relevantAudience' - } +} # type: Dict def __init__(self, timestamp=None, reference_id=None, expiry_time=None, event=None, localized_attributes=None, relevant_audience=None): # type: (Optional[datetime], Optional[str], Optional[datetime], Optional[Event], Optional[List[object]], Optional[RelevantAudience]) -> None @@ -79,7 +79,7 @@ def __init__(self, timestamp=None, reference_id=None, expiry_time=None, event=No :param relevant_audience: :type relevant_audience: (optional) ask_sdk_model.services.proactive_events.relevant_audience.RelevantAudience """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.timestamp = timestamp self.reference_id = reference_id @@ -91,7 +91,7 @@ def __init__(self, timestamp=None, reference_id=None, expiry_time=None, event=No def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/proactive_events/error.py b/ask-sdk-model/ask_sdk_model/services/proactive_events/error.py index 5aebe0a..03408ac 100644 --- a/ask-sdk-model/ask_sdk_model/services/proactive_events/error.py +++ b/ask-sdk-model/ask_sdk_model/services/proactive_events/error.py @@ -37,12 +37,12 @@ class Error(object): deserialized_types = { 'code': 'int', 'message': 'str' - } + } # type: Dict attribute_map = { 'code': 'code', 'message': 'message' - } +} # type: Dict def __init__(self, code=None, message=None): # type: (Optional[int], Optional[str]) -> None @@ -53,7 +53,7 @@ def __init__(self, code=None, message=None): :param message: :type message: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.code = code self.message = message @@ -61,7 +61,7 @@ def __init__(self, code=None, message=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/proactive_events/event.py b/ask-sdk-model/ask_sdk_model/services/proactive_events/event.py index dc66ae0..632cef4 100644 --- a/ask-sdk-model/ask_sdk_model/services/proactive_events/event.py +++ b/ask-sdk-model/ask_sdk_model/services/proactive_events/event.py @@ -39,12 +39,12 @@ class Event(object): deserialized_types = { 'name': 'str', 'payload': 'object' - } + } # type: Dict attribute_map = { 'name': 'name', 'payload': 'payload' - } +} # type: Dict def __init__(self, name=None, payload=None): # type: (Optional[str], Optional[object]) -> None @@ -55,7 +55,7 @@ def __init__(self, name=None, payload=None): :param payload: :type payload: (optional) object """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.name = name self.payload = payload @@ -63,7 +63,7 @@ def __init__(self, name=None, payload=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/proactive_events/proactive_events_service_client.py b/ask-sdk-model/ask_sdk_model/services/proactive_events/proactive_events_service_client.py index a54ff7d..000cbda 100644 --- a/ask-sdk-model/ask_sdk_model/services/proactive_events/proactive_events_service_client.py +++ b/ask-sdk-model/ask_sdk_model/services/proactive_events/proactive_events_service_client.py @@ -28,7 +28,7 @@ if typing.TYPE_CHECKING: - from typing import Dict, List, Union + from typing import Dict, List, Union, Any from datetime import datetime from ask_sdk_model.services.proactive_events.error import Error from ask_sdk_model.services.proactive_events.create_proactive_event_request import CreateProactiveEventRequest @@ -54,7 +54,7 @@ def __init__(self, api_configuration, authentication_configuration): authentication_configuration=authentication_configuration) def create_proactive_event(self, create_proactive_event_request, stage, **kwargs): - # type: (CreateProactiveEventRequest, SkillStage) -> Union[Error] + # type: (CreateProactiveEventRequest, SkillStage, **Any) -> Union[Error] """ Create a new proactive event in live stage. @@ -77,11 +77,11 @@ def create_proactive_event(self, create_proactive_event_request, stage, **kwargs resource_path += "/stages/development" resource_path = resource_path.replace('{format}', 'json') - path_params = {} + path_params = {} # type: Dict - query_params = [] + query_params = [] # type: List - header_params = [] + header_params = [] # type: List body_params = None if 'create_proactive_event_request' in params: @@ -94,7 +94,7 @@ def create_proactive_event(self, create_proactive_event_request, stage, **kwargs authorization_value = "Bearer " + access_token header_params.append(('Authorization', authorization_value)) - error_definitions = [] + error_definitions = [] # type: List error_definitions.append(ServiceClientResponse(response_type=None, status_code=202, message="Request accepted")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.proactive_events.error.Error", status_code=400, message="A required parameter is not present or is incorrectly formatted, or the requested creation of a resource has already been completed by a previous request. ")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.proactive_events.error.Error", status_code=403, message="The authentication token is invalid or doesn't have authentication to access the resource")) diff --git a/ask-sdk-model/ask_sdk_model/services/proactive_events/py.typed b/ask-sdk-model/ask_sdk_model/services/proactive_events/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/services/proactive_events/relevant_audience.py b/ask-sdk-model/ask_sdk_model/services/proactive_events/relevant_audience.py index 12f2d37..9055dde 100644 --- a/ask-sdk-model/ask_sdk_model/services/proactive_events/relevant_audience.py +++ b/ask-sdk-model/ask_sdk_model/services/proactive_events/relevant_audience.py @@ -40,12 +40,12 @@ class RelevantAudience(object): deserialized_types = { 'object_type': 'ask_sdk_model.services.proactive_events.relevant_audience_type.RelevantAudienceType', 'payload': 'object' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'payload': 'payload' - } +} # type: Dict def __init__(self, object_type=None, payload=None): # type: (Optional[RelevantAudienceType], Optional[object]) -> None @@ -56,7 +56,7 @@ def __init__(self, object_type=None, payload=None): :param payload: If relevantAudience.type is set to Multicast, then the payload object is empty. Otherwise, the userId value for which the event is targeted is required. :type payload: (optional) object """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.object_type = object_type self.payload = payload @@ -64,7 +64,7 @@ def __init__(self, object_type=None, payload=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/py.typed b/ask-sdk-model/ask_sdk_model/services/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/services/reminder_management/alert_info.py b/ask-sdk-model/ask_sdk_model/services/reminder_management/alert_info.py index 1bc6ece..1289eee 100644 --- a/ask-sdk-model/ask_sdk_model/services/reminder_management/alert_info.py +++ b/ask-sdk-model/ask_sdk_model/services/reminder_management/alert_info.py @@ -37,11 +37,11 @@ class AlertInfo(object): """ deserialized_types = { 'spoken_info': 'ask_sdk_model.services.reminder_management.spoken_info.SpokenInfo' - } + } # type: Dict attribute_map = { 'spoken_info': 'spokenInfo' - } +} # type: Dict def __init__(self, spoken_info=None): # type: (Optional[SpokenInfo]) -> None @@ -50,14 +50,14 @@ def __init__(self, spoken_info=None): :param spoken_info: :type spoken_info: (optional) ask_sdk_model.services.reminder_management.spoken_info.SpokenInfo """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.spoken_info = spoken_info def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/reminder_management/alert_info_spoken_info.py b/ask-sdk-model/ask_sdk_model/services/reminder_management/alert_info_spoken_info.py index 0ed1def..17c8579 100644 --- a/ask-sdk-model/ask_sdk_model/services/reminder_management/alert_info_spoken_info.py +++ b/ask-sdk-model/ask_sdk_model/services/reminder_management/alert_info_spoken_info.py @@ -37,11 +37,11 @@ class SpokenInfo(object): """ deserialized_types = { 'content': 'list[ask_sdk_model.services.reminder_management.spoken_text.SpokenText]' - } + } # type: Dict attribute_map = { 'content': 'content' - } +} # type: Dict def __init__(self, content=None): # type: (Optional[List[SpokenText]]) -> None @@ -50,14 +50,14 @@ def __init__(self, content=None): :param content: :type content: (optional) list[ask_sdk_model.services.reminder_management.spoken_text.SpokenText] """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.content = content def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/reminder_management/error.py b/ask-sdk-model/ask_sdk_model/services/reminder_management/error.py index dcae98e..02f32c5 100644 --- a/ask-sdk-model/ask_sdk_model/services/reminder_management/error.py +++ b/ask-sdk-model/ask_sdk_model/services/reminder_management/error.py @@ -37,12 +37,12 @@ class Error(object): deserialized_types = { 'code': 'str', 'message': 'str' - } + } # type: Dict attribute_map = { 'code': 'code', 'message': 'message' - } +} # type: Dict def __init__(self, code=None, message=None): # type: (Optional[str], Optional[str]) -> None @@ -53,7 +53,7 @@ def __init__(self, code=None, message=None): :param message: Detailed error message :type message: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.code = code self.message = message @@ -61,7 +61,7 @@ def __init__(self, code=None, message=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/reminder_management/event.py b/ask-sdk-model/ask_sdk_model/services/reminder_management/event.py index d4e85e5..8df8bc0 100644 --- a/ask-sdk-model/ask_sdk_model/services/reminder_management/event.py +++ b/ask-sdk-model/ask_sdk_model/services/reminder_management/event.py @@ -38,12 +38,12 @@ class Event(object): deserialized_types = { 'status': 'ask_sdk_model.services.reminder_management.status.Status', 'alert_token': 'str' - } + } # type: Dict attribute_map = { 'status': 'status', 'alert_token': 'alertToken' - } +} # type: Dict def __init__(self, status=None, alert_token=None): # type: (Optional[Status], Optional[str]) -> None @@ -54,7 +54,7 @@ def __init__(self, status=None, alert_token=None): :param alert_token: :type alert_token: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.status = status self.alert_token = alert_token @@ -62,7 +62,7 @@ def __init__(self, status=None, alert_token=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/reminder_management/get_reminder_response.py b/ask-sdk-model/ask_sdk_model/services/reminder_management/get_reminder_response.py index 0966624..9cd6f81 100644 --- a/ask-sdk-model/ask_sdk_model/services/reminder_management/get_reminder_response.py +++ b/ask-sdk-model/ask_sdk_model/services/reminder_management/get_reminder_response.py @@ -62,7 +62,7 @@ class GetReminderResponse(Reminder): 'alert_info': 'ask_sdk_model.services.reminder_management.alert_info.AlertInfo', 'push_notification': 'ask_sdk_model.services.reminder_management.push_notification.PushNotification', 'version': 'str' - } + } # type: Dict attribute_map = { 'alert_token': 'alertToken', @@ -73,7 +73,7 @@ class GetReminderResponse(Reminder): 'alert_info': 'alertInfo', 'push_notification': 'pushNotification', 'version': 'version' - } +} # type: Dict def __init__(self, alert_token=None, created_time=None, updated_time=None, status=None, trigger=None, alert_info=None, push_notification=None, version=None): # type: (Optional[str], Optional[datetime], Optional[datetime], Optional[Status], Optional[Trigger], Optional[AlertInfo], Optional[PushNotification], Optional[str]) -> None @@ -96,14 +96,14 @@ def __init__(self, alert_token=None, created_time=None, updated_time=None, statu :param version: Version of reminder alert :type version: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str super(GetReminderResponse, self).__init__(alert_token=alert_token, created_time=created_time, updated_time=updated_time, status=status, trigger=trigger, alert_info=alert_info, push_notification=push_notification, version=version) def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/reminder_management/get_reminders_response.py b/ask-sdk-model/ask_sdk_model/services/reminder_management/get_reminders_response.py index 8bf23f5..8098ade 100644 --- a/ask-sdk-model/ask_sdk_model/services/reminder_management/get_reminders_response.py +++ b/ask-sdk-model/ask_sdk_model/services/reminder_management/get_reminders_response.py @@ -43,13 +43,13 @@ class GetRemindersResponse(object): 'total_count': 'str', 'alerts': 'list[ask_sdk_model.services.reminder_management.reminder.Reminder]', 'links': 'str' - } + } # type: Dict attribute_map = { 'total_count': 'totalCount', 'alerts': 'alerts', 'links': 'links' - } +} # type: Dict def __init__(self, total_count=None, alerts=None, links=None): # type: (Optional[str], Optional[List[Reminder]], Optional[str]) -> None @@ -62,7 +62,7 @@ def __init__(self, total_count=None, alerts=None, links=None): :param links: Link to retrieve next set of alerts if total count is greater than max results :type links: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.total_count = total_count self.alerts = alerts @@ -71,7 +71,7 @@ def __init__(self, total_count=None, alerts=None, links=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/reminder_management/push_notification.py b/ask-sdk-model/ask_sdk_model/services/reminder_management/push_notification.py index 3862d05..cb663ad 100644 --- a/ask-sdk-model/ask_sdk_model/services/reminder_management/push_notification.py +++ b/ask-sdk-model/ask_sdk_model/services/reminder_management/push_notification.py @@ -37,11 +37,11 @@ class PushNotification(object): """ deserialized_types = { 'status': 'ask_sdk_model.services.reminder_management.push_notification_status.PushNotificationStatus' - } + } # type: Dict attribute_map = { 'status': 'status' - } +} # type: Dict def __init__(self, status=None): # type: (Optional[PushNotificationStatus]) -> None @@ -50,14 +50,14 @@ def __init__(self, status=None): :param status: :type status: (optional) ask_sdk_model.services.reminder_management.push_notification_status.PushNotificationStatus """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.status = status def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/reminder_management/py.typed b/ask-sdk-model/ask_sdk_model/services/reminder_management/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/services/reminder_management/recurrence.py b/ask-sdk-model/ask_sdk_model/services/reminder_management/recurrence.py index 90d23c1..2eb3a75 100644 --- a/ask-sdk-model/ask_sdk_model/services/reminder_management/recurrence.py +++ b/ask-sdk-model/ask_sdk_model/services/reminder_management/recurrence.py @@ -44,13 +44,13 @@ class Recurrence(object): 'freq': 'ask_sdk_model.services.reminder_management.recurrence_freq.RecurrenceFreq', 'by_day': 'list[ask_sdk_model.services.reminder_management.recurrence_day.RecurrenceDay]', 'interval': 'int' - } + } # type: Dict attribute_map = { 'freq': 'freq', 'by_day': 'byDay', 'interval': 'interval' - } +} # type: Dict def __init__(self, freq=None, by_day=None, interval=None): # type: (Optional[RecurrenceFreq], Optional[List[RecurrenceDay]], Optional[int]) -> None @@ -63,7 +63,7 @@ def __init__(self, freq=None, by_day=None, interval=None): :param interval: contains a positive integer representing at which intervals the recurrence rule repeats :type interval: (optional) int """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.freq = freq self.by_day = by_day @@ -72,7 +72,7 @@ def __init__(self, freq=None, by_day=None, interval=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder.py b/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder.py index 867f7b0..75482e6 100644 --- a/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder.py +++ b/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder.py @@ -61,7 +61,7 @@ class Reminder(object): 'alert_info': 'ask_sdk_model.services.reminder_management.alert_info.AlertInfo', 'push_notification': 'ask_sdk_model.services.reminder_management.push_notification.PushNotification', 'version': 'str' - } + } # type: Dict attribute_map = { 'alert_token': 'alertToken', @@ -72,7 +72,7 @@ class Reminder(object): 'alert_info': 'alertInfo', 'push_notification': 'pushNotification', 'version': 'version' - } +} # type: Dict def __init__(self, alert_token=None, created_time=None, updated_time=None, status=None, trigger=None, alert_info=None, push_notification=None, version=None): # type: (Optional[str], Optional[datetime], Optional[datetime], Optional[Status], Optional[Trigger], Optional[AlertInfo], Optional[PushNotification], Optional[str]) -> None @@ -95,7 +95,7 @@ def __init__(self, alert_token=None, created_time=None, updated_time=None, statu :param version: Version of reminder alert :type version: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.alert_token = alert_token self.created_time = created_time @@ -109,7 +109,7 @@ def __init__(self, alert_token=None, created_time=None, updated_time=None, statu def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder_created_event_request.py b/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder_created_event_request.py index 5eb44d4..95a7dd3 100644 --- a/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder_created_event_request.py +++ b/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder_created_event_request.py @@ -46,7 +46,7 @@ class ReminderCreatedEventRequest(Request): 'timestamp': 'datetime', 'locale': 'str', 'body': 'ask_sdk_model.services.reminder_management.event.Event' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -54,7 +54,7 @@ class ReminderCreatedEventRequest(Request): 'timestamp': 'timestamp', 'locale': 'locale', 'body': 'body' - } +} # type: Dict def __init__(self, request_id=None, timestamp=None, locale=None, body=None): # type: (Optional[str], Optional[datetime], Optional[str], Optional[Event]) -> None @@ -69,7 +69,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, body=None): :param body: :type body: (optional) ask_sdk_model.services.reminder_management.event.Event """ - self.__discriminator_value = "Reminders.ReminderCreated" + self.__discriminator_value = "Reminders.ReminderCreated" # type: str self.object_type = self.__discriminator_value super(ReminderCreatedEventRequest, self).__init__(object_type=self.__discriminator_value, request_id=request_id, timestamp=timestamp, locale=locale) @@ -78,7 +78,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, body=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder_deleted_event.py b/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder_deleted_event.py index 63d9438..a16edfb 100644 --- a/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder_deleted_event.py +++ b/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder_deleted_event.py @@ -34,11 +34,11 @@ class ReminderDeletedEvent(object): """ deserialized_types = { 'alert_tokens': 'list[str]' - } + } # type: Dict attribute_map = { 'alert_tokens': 'alertTokens' - } +} # type: Dict def __init__(self, alert_tokens=None): # type: (Optional[List[object]]) -> None @@ -47,14 +47,14 @@ def __init__(self, alert_tokens=None): :param alert_tokens: :type alert_tokens: (optional) list[str] """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.alert_tokens = alert_tokens def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder_deleted_event_request.py b/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder_deleted_event_request.py index 199ed22..bc59edf 100644 --- a/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder_deleted_event_request.py +++ b/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder_deleted_event_request.py @@ -46,7 +46,7 @@ class ReminderDeletedEventRequest(Request): 'timestamp': 'datetime', 'locale': 'str', 'body': 'ask_sdk_model.services.reminder_management.reminder_deleted_event.ReminderDeletedEvent' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -54,7 +54,7 @@ class ReminderDeletedEventRequest(Request): 'timestamp': 'timestamp', 'locale': 'locale', 'body': 'body' - } +} # type: Dict def __init__(self, request_id=None, timestamp=None, locale=None, body=None): # type: (Optional[str], Optional[datetime], Optional[str], Optional[ReminderDeletedEvent]) -> None @@ -69,7 +69,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, body=None): :param body: :type body: (optional) ask_sdk_model.services.reminder_management.reminder_deleted_event.ReminderDeletedEvent """ - self.__discriminator_value = "Reminders.ReminderDeleted" + self.__discriminator_value = "Reminders.ReminderDeleted" # type: str self.object_type = self.__discriminator_value super(ReminderDeletedEventRequest, self).__init__(object_type=self.__discriminator_value, request_id=request_id, timestamp=timestamp, locale=locale) @@ -78,7 +78,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, body=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder_management_service_client.py b/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder_management_service_client.py index 394ebf7..c3d28c3 100644 --- a/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder_management_service_client.py +++ b/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder_management_service_client.py @@ -25,7 +25,7 @@ if typing.TYPE_CHECKING: - from typing import Dict, List, Union + from typing import Dict, List, Union, Any from datetime import datetime from ask_sdk_model.services.reminder_management.get_reminders_response import GetRemindersResponse from ask_sdk_model.services.reminder_management.get_reminder_response import GetReminderResponse @@ -49,7 +49,7 @@ def __init__(self, api_configuration): super(ReminderManagementServiceClient, self).__init__(api_configuration) def delete_reminder(self, alert_token, **kwargs): - # type: (str) -> Union[Error] + # type: (str, **Any) -> Union[Error] """ This API is invoked by the skill to delete a single reminder. @@ -70,13 +70,13 @@ def delete_reminder(self, alert_token, **kwargs): resource_path = '/v1/alerts/reminders/{alertToken}' resource_path = resource_path.replace('{format}', 'json') - path_params = {} + path_params = {} # type: Dict if 'alert_token' in params: path_params['alertToken'] = params['alert_token'] - query_params = [] + query_params = [] # type: List - header_params = [] + header_params = [] # type: List body_params = None header_params.append(('Content-type', 'application/json')) @@ -85,7 +85,7 @@ def delete_reminder(self, alert_token, **kwargs): authorization_value = "Bearer " + self._authorization_value header_params.append(("Authorization", authorization_value)) - error_definitions = [] + error_definitions = [] # type: List error_definitions.append(ServiceClientResponse(response_type=None, status_code=200, message="Success")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.reminder_management.error.Error", status_code=401, message="UserAuthenticationException. Request is not authorized/authenticated e.g. If customer does not have permission to create a reminder.")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.reminder_management.error.Error", status_code=429, message="RateExceededException e.g. When the skill is throttled for exceeding the max rate")) @@ -103,7 +103,7 @@ def delete_reminder(self, alert_token, **kwargs): response_type=None) def get_reminder(self, alert_token, **kwargs): - # type: (str) -> Union[GetReminderResponse, Error] + # type: (str, **Any) -> Union[GetReminderResponse, Error] """ This API is invoked by the skill to get a single reminder. @@ -124,13 +124,13 @@ def get_reminder(self, alert_token, **kwargs): resource_path = '/v1/alerts/reminders/{alertToken}' resource_path = resource_path.replace('{format}', 'json') - path_params = {} + path_params = {} # type: Dict if 'alert_token' in params: path_params['alertToken'] = params['alert_token'] - query_params = [] + query_params = [] # type: List - header_params = [] + header_params = [] # type: List body_params = None header_params.append(('Content-type', 'application/json')) @@ -139,7 +139,7 @@ def get_reminder(self, alert_token, **kwargs): authorization_value = "Bearer " + self._authorization_value header_params.append(("Authorization", authorization_value)) - error_definitions = [] + error_definitions = [] # type: List error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.reminder_management.get_reminder_response.GetReminderResponse", status_code=200, message="Success")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.reminder_management.error.Error", status_code=401, message="UserAuthenticationException. Request is not authorized/authenticated e.g. If customer does not have permission to create a reminder.")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.reminder_management.error.Error", status_code=429, message="RateExceededException e.g. When the skill is throttled for exceeding the max rate")) @@ -157,7 +157,7 @@ def get_reminder(self, alert_token, **kwargs): response_type="ask_sdk_model.services.reminder_management.get_reminder_response.GetReminderResponse") def update_reminder(self, alert_token, reminder_request, **kwargs): - # type: (str, ReminderRequest) -> Union[ReminderResponse, Error] + # type: (str, ReminderRequest, **Any) -> Union[ReminderResponse, Error] """ This API is invoked by the skill to update a reminder. @@ -184,13 +184,13 @@ def update_reminder(self, alert_token, reminder_request, **kwargs): resource_path = '/v1/alerts/reminders/{alertToken}' resource_path = resource_path.replace('{format}', 'json') - path_params = {} + path_params = {} # type: Dict if 'alert_token' in params: path_params['alertToken'] = params['alert_token'] - query_params = [] + query_params = [] # type: List - header_params = [] + header_params = [] # type: List body_params = None if 'reminder_request' in params: @@ -201,7 +201,7 @@ def update_reminder(self, alert_token, reminder_request, **kwargs): authorization_value = "Bearer " + self._authorization_value header_params.append(("Authorization", authorization_value)) - error_definitions = [] + error_definitions = [] # type: List error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.reminder_management.reminder_response.ReminderResponse", status_code=200, message="Success")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.reminder_management.error.Error", status_code=400, message="Bad Request")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.reminder_management.error.Error", status_code=404, message="NotFoundException e.g. Retured when reminder is not found")) @@ -221,7 +221,7 @@ def update_reminder(self, alert_token, reminder_request, **kwargs): response_type="ask_sdk_model.services.reminder_management.reminder_response.ReminderResponse") def get_reminders(self, **kwargs): - # type: () -> Union[GetRemindersResponse, Error] + # type: (**Any) -> Union[GetRemindersResponse, Error] """ This API is invoked by the skill to get a all reminders created by the caller. @@ -236,11 +236,11 @@ def get_reminders(self, **kwargs): resource_path = '/v1/alerts/reminders/' resource_path = resource_path.replace('{format}', 'json') - path_params = {} + path_params = {} # type: Dict - query_params = [] + query_params = [] # type: List - header_params = [] + header_params = [] # type: List body_params = None header_params.append(('Content-type', 'application/json')) @@ -249,7 +249,7 @@ def get_reminders(self, **kwargs): authorization_value = "Bearer " + self._authorization_value header_params.append(("Authorization", authorization_value)) - error_definitions = [] + error_definitions = [] # type: List error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.reminder_management.get_reminders_response.GetRemindersResponse", status_code=200, message="Success")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.reminder_management.error.Error", status_code=401, message="UserAuthenticationException. Request is not authorized/authenticated e.g. If customer does not have permission to create a reminder.")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.reminder_management.error.Error", status_code=429, message="RateExceededException e.g. When the skill is throttled for exceeding the max rate")) @@ -267,7 +267,7 @@ def get_reminders(self, **kwargs): response_type="ask_sdk_model.services.reminder_management.get_reminders_response.GetRemindersResponse") def create_reminder(self, reminder_request, **kwargs): - # type: (ReminderRequest) -> Union[ReminderResponse, Error] + # type: (ReminderRequest, **Any) -> Union[ReminderResponse, Error] """ This API is invoked by the skill to create a new reminder. @@ -288,11 +288,11 @@ def create_reminder(self, reminder_request, **kwargs): resource_path = '/v1/alerts/reminders/' resource_path = resource_path.replace('{format}', 'json') - path_params = {} + path_params = {} # type: Dict - query_params = [] + query_params = [] # type: List - header_params = [] + header_params = [] # type: List body_params = None if 'reminder_request' in params: @@ -303,7 +303,7 @@ def create_reminder(self, reminder_request, **kwargs): authorization_value = "Bearer " + self._authorization_value header_params.append(("Authorization", authorization_value)) - error_definitions = [] + error_definitions = [] # type: List error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.reminder_management.reminder_response.ReminderResponse", status_code=200, message="Success")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.reminder_management.error.Error", status_code=400, message="Bad Request")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.reminder_management.error.Error", status_code=403, message="Forbidden")) diff --git a/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder_request.py b/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder_request.py index 270da96..14777c4 100644 --- a/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder_request.py +++ b/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder_request.py @@ -48,14 +48,14 @@ class ReminderRequest(object): 'trigger': 'ask_sdk_model.services.reminder_management.trigger.Trigger', 'alert_info': 'ask_sdk_model.services.reminder_management.alert_info.AlertInfo', 'push_notification': 'ask_sdk_model.services.reminder_management.push_notification.PushNotification' - } + } # type: Dict attribute_map = { 'request_time': 'requestTime', 'trigger': 'trigger', 'alert_info': 'alertInfo', 'push_notification': 'pushNotification' - } +} # type: Dict def __init__(self, request_time=None, trigger=None, alert_info=None, push_notification=None): # type: (Optional[datetime], Optional[Trigger], Optional[AlertInfo], Optional[PushNotification]) -> None @@ -70,7 +70,7 @@ def __init__(self, request_time=None, trigger=None, alert_info=None, push_notifi :param push_notification: :type push_notification: (optional) ask_sdk_model.services.reminder_management.push_notification.PushNotification """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.request_time = request_time self.trigger = trigger @@ -80,7 +80,7 @@ def __init__(self, request_time=None, trigger=None, alert_info=None, push_notifi def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder_response.py b/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder_response.py index cb79640..697b3ed 100644 --- a/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder_response.py +++ b/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder_response.py @@ -52,7 +52,7 @@ class ReminderResponse(object): 'status': 'ask_sdk_model.services.reminder_management.status.Status', 'version': 'str', 'href': 'str' - } + } # type: Dict attribute_map = { 'alert_token': 'alertToken', @@ -61,7 +61,7 @@ class ReminderResponse(object): 'status': 'status', 'version': 'version', 'href': 'href' - } +} # type: Dict def __init__(self, alert_token=None, created_time=None, updated_time=None, status=None, version=None, href=None): # type: (Optional[str], Optional[str], Optional[str], Optional[Status], Optional[str], Optional[str]) -> None @@ -80,7 +80,7 @@ def __init__(self, alert_token=None, created_time=None, updated_time=None, statu :param href: URI to retrieve the created alert :type href: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.alert_token = alert_token self.created_time = created_time @@ -92,7 +92,7 @@ def __init__(self, alert_token=None, created_time=None, updated_time=None, statu def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder_started_event_request.py b/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder_started_event_request.py index eac9a22..3557cb0 100644 --- a/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder_started_event_request.py +++ b/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder_started_event_request.py @@ -46,7 +46,7 @@ class ReminderStartedEventRequest(Request): 'timestamp': 'datetime', 'locale': 'str', 'body': 'ask_sdk_model.services.reminder_management.event.Event' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -54,7 +54,7 @@ class ReminderStartedEventRequest(Request): 'timestamp': 'timestamp', 'locale': 'locale', 'body': 'body' - } +} # type: Dict def __init__(self, request_id=None, timestamp=None, locale=None, body=None): # type: (Optional[str], Optional[datetime], Optional[str], Optional[Event]) -> None @@ -69,7 +69,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, body=None): :param body: :type body: (optional) ask_sdk_model.services.reminder_management.event.Event """ - self.__discriminator_value = "Reminders.ReminderStarted" + self.__discriminator_value = "Reminders.ReminderStarted" # type: str self.object_type = self.__discriminator_value super(ReminderStartedEventRequest, self).__init__(object_type=self.__discriminator_value, request_id=request_id, timestamp=timestamp, locale=locale) @@ -78,7 +78,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, body=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder_status_changed_event_request.py b/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder_status_changed_event_request.py index ec39ea9..aa99b50 100644 --- a/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder_status_changed_event_request.py +++ b/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder_status_changed_event_request.py @@ -46,7 +46,7 @@ class ReminderStatusChangedEventRequest(Request): 'timestamp': 'datetime', 'locale': 'str', 'body': 'ask_sdk_model.services.reminder_management.event.Event' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -54,7 +54,7 @@ class ReminderStatusChangedEventRequest(Request): 'timestamp': 'timestamp', 'locale': 'locale', 'body': 'body' - } +} # type: Dict def __init__(self, request_id=None, timestamp=None, locale=None, body=None): # type: (Optional[str], Optional[datetime], Optional[str], Optional[Event]) -> None @@ -69,7 +69,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, body=None): :param body: :type body: (optional) ask_sdk_model.services.reminder_management.event.Event """ - self.__discriminator_value = "Reminders.ReminderStatusChanged" + self.__discriminator_value = "Reminders.ReminderStatusChanged" # type: str self.object_type = self.__discriminator_value super(ReminderStatusChangedEventRequest, self).__init__(object_type=self.__discriminator_value, request_id=request_id, timestamp=timestamp, locale=locale) @@ -78,7 +78,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, body=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder_updated_event_request.py b/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder_updated_event_request.py index 2d56df9..792e000 100644 --- a/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder_updated_event_request.py +++ b/ask-sdk-model/ask_sdk_model/services/reminder_management/reminder_updated_event_request.py @@ -46,7 +46,7 @@ class ReminderUpdatedEventRequest(Request): 'timestamp': 'datetime', 'locale': 'str', 'body': 'ask_sdk_model.services.reminder_management.event.Event' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -54,7 +54,7 @@ class ReminderUpdatedEventRequest(Request): 'timestamp': 'timestamp', 'locale': 'locale', 'body': 'body' - } +} # type: Dict def __init__(self, request_id=None, timestamp=None, locale=None, body=None): # type: (Optional[str], Optional[datetime], Optional[str], Optional[Event]) -> None @@ -69,7 +69,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, body=None): :param body: :type body: (optional) ask_sdk_model.services.reminder_management.event.Event """ - self.__discriminator_value = "Reminders.ReminderUpdated" + self.__discriminator_value = "Reminders.ReminderUpdated" # type: str self.object_type = self.__discriminator_value super(ReminderUpdatedEventRequest, self).__init__(object_type=self.__discriminator_value, request_id=request_id, timestamp=timestamp, locale=locale) @@ -78,7 +78,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, body=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/reminder_management/spoken_text.py b/ask-sdk-model/ask_sdk_model/services/reminder_management/spoken_text.py index e6abff8..aace3cd 100644 --- a/ask-sdk-model/ask_sdk_model/services/reminder_management/spoken_text.py +++ b/ask-sdk-model/ask_sdk_model/services/reminder_management/spoken_text.py @@ -40,13 +40,13 @@ class SpokenText(object): 'locale': 'str', 'ssml': 'str', 'text': 'str' - } + } # type: Dict attribute_map = { 'locale': 'locale', 'ssml': 'ssml', 'text': 'text' - } +} # type: Dict def __init__(self, locale=None, ssml=None, text=None): # type: (Optional[str], Optional[str], Optional[str]) -> None @@ -59,7 +59,7 @@ def __init__(self, locale=None, ssml=None, text=None): :param text: Spoken text in plain text format. :type text: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.locale = locale self.ssml = ssml @@ -68,7 +68,7 @@ def __init__(self, locale=None, ssml=None, text=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/reminder_management/trigger.py b/ask-sdk-model/ask_sdk_model/services/reminder_management/trigger.py index af37e6b..0e0a0c1 100644 --- a/ask-sdk-model/ask_sdk_model/services/reminder_management/trigger.py +++ b/ask-sdk-model/ask_sdk_model/services/reminder_management/trigger.py @@ -50,7 +50,7 @@ class Trigger(object): 'offset_in_seconds': 'int', 'time_zone_id': 'str', 'recurrence': 'ask_sdk_model.services.reminder_management.recurrence.Recurrence' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -58,7 +58,7 @@ class Trigger(object): 'offset_in_seconds': 'offsetInSeconds', 'time_zone_id': 'timeZoneId', 'recurrence': 'recurrence' - } +} # type: Dict def __init__(self, object_type=None, scheduled_time=None, offset_in_seconds=None, time_zone_id=None, recurrence=None): # type: (Optional[TriggerType], Optional[datetime], Optional[int], Optional[str], Optional[Recurrence]) -> None @@ -75,7 +75,7 @@ def __init__(self, object_type=None, scheduled_time=None, offset_in_seconds=None :param recurrence: :type recurrence: (optional) ask_sdk_model.services.reminder_management.recurrence.Recurrence """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.object_type = object_type self.scheduled_time = scheduled_time @@ -86,7 +86,7 @@ def __init__(self, object_type=None, scheduled_time=None, offset_in_seconds=None def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/serializer.py b/ask-sdk-model/ask_sdk_model/services/serializer.py index 48b020d..886d9f0 100644 --- a/ask-sdk-model/ask_sdk_model/services/serializer.py +++ b/ask-sdk-model/ask_sdk_model/services/serializer.py @@ -15,7 +15,7 @@ from abc import ABCMeta, abstractmethod if typing.TYPE_CHECKING: - from typing import TypeVar + from typing import TypeVar, Optional, Union T = TypeVar('T') @@ -36,7 +36,7 @@ def serialize(self, obj): @abstractmethod def deserialize(self, payload, obj_type): - # type: (str, T) -> T + # type: (Optional[str], Union[str,T]) -> T """Deserializes the payload to object of provided obj_type. :param payload: String to deserialize diff --git a/ask-sdk-model/ask_sdk_model/services/service_client_factory.py b/ask-sdk-model/ask_sdk_model/services/service_client_factory.py index 7019708..6900b66 100644 --- a/ask-sdk-model/ask_sdk_model/services/service_client_factory.py +++ b/ask-sdk-model/ask_sdk_model/services/service_client_factory.py @@ -24,6 +24,7 @@ from .monetization import MonetizationServiceClient from .proactive_events import ProactiveEventsServiceClient from .reminder_management import ReminderManagementServiceClient +from .skill_messaging import SkillMessagingServiceClient from .ups import UpsServiceClient if typing.TYPE_CHECKING: @@ -52,7 +53,7 @@ def get_device_address_service(self): return DeviceAddressServiceClient(self.api_configuration) except Exception as e: raise ValueError( - "ServiceClientFactory Error while initializing DeviceAddressServiceClient: " + e) + "ServiceClientFactory Error while initializing DeviceAddressServiceClient: " + str(e)) def get_directive_service(self): # type: () -> DirectiveServiceClient @@ -66,7 +67,7 @@ def get_directive_service(self): return DirectiveServiceClient(self.api_configuration) except Exception as e: raise ValueError( - "ServiceClientFactory Error while initializing DirectiveServiceClient: " + e) + "ServiceClientFactory Error while initializing DirectiveServiceClient: " + str(e)) def get_list_management_service(self): # type: () -> ListManagementServiceClient @@ -80,7 +81,7 @@ def get_list_management_service(self): return ListManagementServiceClient(self.api_configuration) except Exception as e: raise ValueError( - "ServiceClientFactory Error while initializing ListManagementServiceClient: " + e) + "ServiceClientFactory Error while initializing ListManagementServiceClient: " + str(e)) def get_monetization_service(self): # type: () -> MonetizationServiceClient @@ -94,7 +95,7 @@ def get_monetization_service(self): return MonetizationServiceClient(self.api_configuration) except Exception as e: raise ValueError( - "ServiceClientFactory Error while initializing MonetizationServiceClient: " + e) + "ServiceClientFactory Error while initializing MonetizationServiceClient: " + str(e)) def get_reminder_management_service(self): # type: () -> ReminderManagementServiceClient @@ -108,7 +109,7 @@ def get_reminder_management_service(self): return ReminderManagementServiceClient(self.api_configuration) except Exception as e: raise ValueError( - "ServiceClientFactory Error while initializing ReminderManagementServiceClient: " + e) + "ServiceClientFactory Error while initializing ReminderManagementServiceClient: " + str(e)) def get_ups_service(self): # type: () -> UpsServiceClient @@ -122,5 +123,5 @@ def get_ups_service(self): return UpsServiceClient(self.api_configuration) except Exception as e: raise ValueError( - "ServiceClientFactory Error while initializing UpsServiceClient: " + e) + "ServiceClientFactory Error while initializing UpsServiceClient: " + str(e)) diff --git a/ask-sdk-model/ask_sdk_model/services/service_exception.py b/ask-sdk-model/ask_sdk_model/services/service_exception.py index 9f2bedf..bb43f03 100644 --- a/ask-sdk-model/ask_sdk_model/services/service_exception.py +++ b/ask-sdk-model/ask_sdk_model/services/service_exception.py @@ -14,7 +14,7 @@ import typing if typing.TypeVar: - from typing import TypeVar, List, Tuple + from typing import TypeVar, List, Tuple, Optional T = TypeVar('T') @@ -32,7 +32,7 @@ class ServiceException(Exception): """ def __init__(self, message, status_code, headers, body): - # type: (str, int, List[Tuple[str, str]], T) -> None + # type: (str, int, Optional[List[Tuple[str, str]]], Optional[T]) -> None """ Exception thrown by a Service client when an error response was received or some operation failed. diff --git a/ask-sdk-model/ask_sdk_model/services/skill_messaging/__init__.py b/ask-sdk-model/ask_sdk_model/services/skill_messaging/__init__.py new file mode 100644 index 0000000..5daa7ba --- /dev/null +++ b/ask-sdk-model/ask_sdk_model/services/skill_messaging/__init__.py @@ -0,0 +1,19 @@ +# coding: utf-8 + +# +# Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the 'License'). You may not use this file +# except in compliance with the License. A copy of the License is located at +# +# http://aws.amazon.com/apache2.0/ +# +# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for +# the specific language governing permissions and limitations under the License. +# +from __future__ import absolute_import + +from .error import Error +from .skill_messaging_service_client import SkillMessagingServiceClient +from .send_skill_messaging_request import SendSkillMessagingRequest diff --git a/ask-sdk-model/ask_sdk_model/services/skill_messaging/error.py b/ask-sdk-model/ask_sdk_model/services/skill_messaging/error.py new file mode 100644 index 0000000..03408ac --- /dev/null +++ b/ask-sdk-model/ask_sdk_model/services/skill_messaging/error.py @@ -0,0 +1,112 @@ +# coding: utf-8 + +# +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file +# except in compliance with the License. A copy of the License is located at +# +# http://aws.amazon.com/apache2.0/ +# +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for +# the specific language governing permissions and limitations under the License. +# + +import pprint +import re # noqa: F401 +import six +import typing +from enum import Enum + + +if typing.TYPE_CHECKING: + from typing import Dict, List, Optional + from datetime import datetime + + +class Error(object): + """ + + :param code: + :type code: (optional) int + :param message: + :type message: (optional) str + + """ + deserialized_types = { + 'code': 'int', + 'message': 'str' + } # type: Dict + + attribute_map = { + 'code': 'code', + 'message': 'message' +} # type: Dict + + def __init__(self, code=None, message=None): + # type: (Optional[int], Optional[str]) -> None + """ + + :param code: + :type code: (optional) int + :param message: + :type message: (optional) str + """ + self.__discriminator_value = None # type: str + + self.code = code + self.message = message + + def to_dict(self): + # type: () -> Dict[str, object] + """Returns the model properties as a dict""" + result = {} # type: Dict + + for attr, _ in six.iteritems(self.deserialized_types): + value = getattr(self, attr) + if isinstance(value, list): + result[attr] = list(map( + lambda x: x.to_dict() if hasattr(x, "to_dict") else + x.value if isinstance(x, Enum) else x, + value + )) + elif isinstance(value, Enum): + result[attr] = value.value + elif hasattr(value, "to_dict"): + result[attr] = value.to_dict() + elif isinstance(value, dict): + result[attr] = dict(map( + lambda item: (item[0], item[1].to_dict()) + if hasattr(item[1], "to_dict") else + (item[0], item[1].value) + if isinstance(item[1], Enum) else item, + value.items() + )) + else: + result[attr] = value + + return result + + def to_str(self): + # type: () -> str + """Returns the string representation of the model""" + return pprint.pformat(self.to_dict()) + + def __repr__(self): + # type: () -> str + """For `print` and `pprint`""" + return self.to_str() + + def __eq__(self, other): + # type: (object) -> bool + """Returns true if both objects are equal""" + if not isinstance(other, Error): + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + # type: (object) -> bool + """Returns true if both objects are not equal""" + return not self == other diff --git a/ask-sdk-model/ask_sdk_model/services/skill_messaging/py.typed b/ask-sdk-model/ask_sdk_model/services/skill_messaging/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/services/skill_messaging/send_skill_messaging_request.py b/ask-sdk-model/ask_sdk_model/services/skill_messaging/send_skill_messaging_request.py new file mode 100644 index 0000000..3091d42 --- /dev/null +++ b/ask-sdk-model/ask_sdk_model/services/skill_messaging/send_skill_messaging_request.py @@ -0,0 +1,114 @@ +# coding: utf-8 + +# +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file +# except in compliance with the License. A copy of the License is located at +# +# http://aws.amazon.com/apache2.0/ +# +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for +# the specific language governing permissions and limitations under the License. +# + +import pprint +import re # noqa: F401 +import six +import typing +from enum import Enum + + +if typing.TYPE_CHECKING: + from typing import Dict, List, Optional + from datetime import datetime + + +class SendSkillMessagingRequest(object): + """ + The message that needs to be sent to the skill + + + :param data: The payload data to send with the message. The data must be in the form of JSON-formatted key-value pairs. Both keys and values must be of type String. The total size of the data cannot be greater than 6KB. For calculation purposes, this includes keys and values, the quotes that surround them, the \":\" character that separates them, the commas that separate the pairs, and the opening and closing braces around the field. However, any whitespace between key/value pairs is not included in the calculation of the payload size. If the message does not include payload data, as in the case of a sync message, you can pass in an empty JSON object \"{}\". + :type data: (optional) object + :param expires_after_seconds: The number of seconds that the message will be retained to retry if message delivery is not successful. Allowed values are from 60 (1 minute) to 86400 (1 day), inclusive. The default is 3600 (1 hour). Multiple retries may occur during this interval. The retry logic is exponential. The first retry executes after 30 seconds, and this time period doubles on every retry. The retries will end when the total time elapsed since the message was first sent has exceeded the value you provided for expiresAfterSeconds. Message expiry is rarely a problem if the message handler has been set up correctly. With a correct setup, you will receive the message once promptly. This mechanism for retries is provided as a safeguard in case your skill goes down during a message delivery. + :type expires_after_seconds: (optional) int + + """ + deserialized_types = { + 'data': 'object', + 'expires_after_seconds': 'int' + } # type: Dict + + attribute_map = { + 'data': 'data', + 'expires_after_seconds': 'expiresAfterSeconds' +} # type: Dict + + def __init__(self, data=None, expires_after_seconds=None): + # type: (Optional[object], Optional[int]) -> None + """The message that needs to be sent to the skill + + :param data: The payload data to send with the message. The data must be in the form of JSON-formatted key-value pairs. Both keys and values must be of type String. The total size of the data cannot be greater than 6KB. For calculation purposes, this includes keys and values, the quotes that surround them, the \":\" character that separates them, the commas that separate the pairs, and the opening and closing braces around the field. However, any whitespace between key/value pairs is not included in the calculation of the payload size. If the message does not include payload data, as in the case of a sync message, you can pass in an empty JSON object \"{}\". + :type data: (optional) object + :param expires_after_seconds: The number of seconds that the message will be retained to retry if message delivery is not successful. Allowed values are from 60 (1 minute) to 86400 (1 day), inclusive. The default is 3600 (1 hour). Multiple retries may occur during this interval. The retry logic is exponential. The first retry executes after 30 seconds, and this time period doubles on every retry. The retries will end when the total time elapsed since the message was first sent has exceeded the value you provided for expiresAfterSeconds. Message expiry is rarely a problem if the message handler has been set up correctly. With a correct setup, you will receive the message once promptly. This mechanism for retries is provided as a safeguard in case your skill goes down during a message delivery. + :type expires_after_seconds: (optional) int + """ + self.__discriminator_value = None # type: str + + self.data = data + self.expires_after_seconds = expires_after_seconds + + def to_dict(self): + # type: () -> Dict[str, object] + """Returns the model properties as a dict""" + result = {} # type: Dict + + for attr, _ in six.iteritems(self.deserialized_types): + value = getattr(self, attr) + if isinstance(value, list): + result[attr] = list(map( + lambda x: x.to_dict() if hasattr(x, "to_dict") else + x.value if isinstance(x, Enum) else x, + value + )) + elif isinstance(value, Enum): + result[attr] = value.value + elif hasattr(value, "to_dict"): + result[attr] = value.to_dict() + elif isinstance(value, dict): + result[attr] = dict(map( + lambda item: (item[0], item[1].to_dict()) + if hasattr(item[1], "to_dict") else + (item[0], item[1].value) + if isinstance(item[1], Enum) else item, + value.items() + )) + else: + result[attr] = value + + return result + + def to_str(self): + # type: () -> str + """Returns the string representation of the model""" + return pprint.pformat(self.to_dict()) + + def __repr__(self): + # type: () -> str + """For `print` and `pprint`""" + return self.to_str() + + def __eq__(self, other): + # type: (object) -> bool + """Returns true if both objects are equal""" + if not isinstance(other, SendSkillMessagingRequest): + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + # type: (object) -> bool + """Returns true if both objects are not equal""" + return not self == other diff --git a/ask-sdk-model/ask_sdk_model/services/skill_messaging/skill_messaging_service_client.py b/ask-sdk-model/ask_sdk_model/services/skill_messaging/skill_messaging_service_client.py new file mode 100644 index 0000000..0e6ee3a --- /dev/null +++ b/ask-sdk-model/ask_sdk_model/services/skill_messaging/skill_messaging_service_client.py @@ -0,0 +1,120 @@ +# coding: utf-8 + +# +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file +# except in compliance with the License. A copy of the License is located at +# +# http://aws.amazon.com/apache2.0/ +# +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for +# the specific language governing permissions and limitations under the License. +# + +import sys +import os +import re +import six +import typing + +from ask_sdk_model.services.base_service_client import BaseServiceClient +from ask_sdk_model.services.api_configuration import ApiConfiguration +from ask_sdk_model.services.service_client_response import ServiceClientResponse +from ask_sdk_model.services.authentication_configuration import AuthenticationConfiguration +from ask_sdk_model.services.lwa.lwa_client import LwaClient + + +if typing.TYPE_CHECKING: + from typing import Dict, List, Union, Any + from datetime import datetime + from ask_sdk_model.services.skill_messaging.send_skill_messaging_request import SendSkillMessagingRequest + from ask_sdk_model.services.skill_messaging.error import Error + + +class SkillMessagingServiceClient(BaseServiceClient): + """ServiceClient for calling the SkillMessagingService APIs. + + :param api_configuration: Instance of :py:class:`ask_sdk_model.services.api_configuration.ApiConfiguration` + :type api_configuration: ask_sdk_model.services.api_configuration.ApiConfiguration + """ + def __init__(self, api_configuration, authentication_configuration): + # type: (ApiConfiguration, AuthenticationConfiguration) -> None + """ + :param api_configuration: Instance of :py:class:`ask_sdk_model.services.api_configuration.ApiConfiguration` + :type api_configuration: ask_sdk_model.services.api_configuration.ApiConfiguration + :param authentication_configuration: Instance of :py:class:`ask_sdk_model.services.authentication_configuration.AuthenticationConfiguration` + :type api_configuration: ask_sdk_model.services.authentication_configuration.AuthenticationConfiguration + """ + super(SkillMessagingServiceClient, self).__init__(api_configuration) + self._lwa_service_client = LwaClient( + api_configuration=api_configuration, + authentication_configuration=authentication_configuration) + + def send_skill_message(self, user_id, send_skill_messaging_request, **kwargs): + # type: (str, SendSkillMessagingRequest, **Any) -> Union[Error] + """ + Send a message request to a skill for a specified user. + + :param user_id: (required) The user Id for the specific user to send the message + :type user_id: str + :param send_skill_messaging_request: (required) Message Request to be sent to the skill. + :type send_skill_messaging_request: ask_sdk_model.services.skill_messaging.send_skill_messaging_request.SendSkillMessagingRequest + :rtype: None + """ + operation_name = "send_skill_message" + params = locals() + for key, val in six.iteritems(params['kwargs']): + params[key] = val + del params['kwargs'] + # verify the required parameter 'user_id' is set + if ('user_id' not in params) or (params['user_id'] is None): + raise ValueError( + "Missing the required parameter `user_id` when calling `" + operation_name + "`") + # verify the required parameter 'send_skill_messaging_request' is set + if ('send_skill_messaging_request' not in params) or (params['send_skill_messaging_request'] is None): + raise ValueError( + "Missing the required parameter `send_skill_messaging_request` when calling `" + operation_name + "`") + + resource_path = '/v1/skillmessages/users/{userId}' + resource_path = resource_path.replace('{format}', 'json') + + path_params = {} # type: Dict + if 'user_id' in params: + path_params['userId'] = params['user_id'] + + query_params = [] # type: List + + header_params = [] # type: List + + body_params = None + if 'send_skill_messaging_request' in params: + body_params = params['send_skill_messaging_request'] + header_params.append(('Content-type', 'application/json')) + + # Authentication setting + access_token = self._lwa_service_client.get_access_token_for_scope( + "alexa:skill_messaging") + authorization_value = "Bearer " + access_token + header_params.append(('Authorization', authorization_value)) + + error_definitions = [] # type: List + error_definitions.append(ServiceClientResponse(response_type=None, status_code=202, message="Message has been successfully accepted, and will be sent to the skill ")) + error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.skill_messaging.error.Error", status_code=400, message="Data is missing or not valid ")) + error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.skill_messaging.error.Error", status_code=403, message="The skill messaging authentication token is expired or not valid ")) + error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.skill_messaging.error.Error", status_code=404, message="The passed userId does not exist ")) + error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.skill_messaging.error.Error", status_code=429, message="The requester has exceeded their maximum allowable rate of messages ")) + error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.skill_messaging.error.Error", status_code=500, message="The SkillMessaging service encountered an internal error for a valid request. ")) + error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.skill_messaging.error.Error", status_code=0, message="Unexpected error")) + + self.invoke( + method="POST", + endpoint=self._api_endpoint, + path=resource_path, + path_params=path_params, + query_params=query_params, + header_params=header_params, + body=body_params, + response_definitions=error_definitions, + response_type=None) diff --git a/ask-sdk-model/ask_sdk_model/services/ups/error.py b/ask-sdk-model/ask_sdk_model/services/ups/error.py index 75aa0cf..4b35bcb 100644 --- a/ask-sdk-model/ask_sdk_model/services/ups/error.py +++ b/ask-sdk-model/ask_sdk_model/services/ups/error.py @@ -38,12 +38,12 @@ class Error(object): deserialized_types = { 'code': 'ask_sdk_model.services.ups.error_code.ErrorCode', 'message': 'str' - } + } # type: Dict attribute_map = { 'code': 'code', 'message': 'message' - } +} # type: Dict def __init__(self, code=None, message=None): # type: (Optional[ErrorCode], Optional[str]) -> None @@ -54,7 +54,7 @@ def __init__(self, code=None, message=None): :param message: A human readable description of error. :type message: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.code = code self.message = message @@ -62,7 +62,7 @@ def __init__(self, code=None, message=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/ups/phone_number.py b/ask-sdk-model/ask_sdk_model/services/ups/phone_number.py index 2cb1a87..20ea882 100644 --- a/ask-sdk-model/ask_sdk_model/services/ups/phone_number.py +++ b/ask-sdk-model/ask_sdk_model/services/ups/phone_number.py @@ -37,12 +37,12 @@ class PhoneNumber(object): deserialized_types = { 'country_code': 'str', 'phone_number': 'str' - } + } # type: Dict attribute_map = { 'country_code': 'countryCode', 'phone_number': 'phoneNumber' - } +} # type: Dict def __init__(self, country_code=None, phone_number=None): # type: (Optional[str], Optional[str]) -> None @@ -53,7 +53,7 @@ def __init__(self, country_code=None, phone_number=None): :param phone_number: :type phone_number: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.country_code = country_code self.phone_number = phone_number @@ -61,7 +61,7 @@ def __init__(self, country_code=None, phone_number=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/services/ups/py.typed b/ask-sdk-model/ask_sdk_model/services/ups/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/services/ups/ups_service_client.py b/ask-sdk-model/ask_sdk_model/services/ups/ups_service_client.py index 87d372b..b99c2d5 100644 --- a/ask-sdk-model/ask_sdk_model/services/ups/ups_service_client.py +++ b/ask-sdk-model/ask_sdk_model/services/ups/ups_service_client.py @@ -25,7 +25,7 @@ if typing.TYPE_CHECKING: - from typing import Dict, List, Union + from typing import Dict, List, Union, Any from datetime import datetime from ask_sdk_model.services.ups.phone_number import PhoneNumber from ask_sdk_model.services.ups.distance_units import DistanceUnits @@ -49,7 +49,7 @@ def __init__(self, api_configuration): super(UpsServiceClient, self).__init__(api_configuration) def get_profile_email(self, **kwargs): - # type: () -> Union[str, Error] + # type: (**Any) -> Union[str, Error] """ Gets the email address of the customer associated with the current enablement. Requires customer consent for scopes: [alexa::profile:email:read] @@ -64,11 +64,11 @@ def get_profile_email(self, **kwargs): resource_path = '/v2/accounts/~current/settings/Profile.email' resource_path = resource_path.replace('{format}', 'json') - path_params = {} + path_params = {} # type: Dict - query_params = [] + query_params = [] # type: List - header_params = [] + header_params = [] # type: List body_params = None header_params.append(('Content-type', 'application/json')) @@ -77,7 +77,7 @@ def get_profile_email(self, **kwargs): authorization_value = "Bearer " + self._authorization_value header_params.append(("Authorization", authorization_value)) - error_definitions = [] + error_definitions = [] # type: List error_definitions.append(ServiceClientResponse(response_type="str", status_code=200, message="Successfully retrieved the requested information.")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.ups.error.Error", status_code=204, message="The query did not return any results.")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.ups.error.Error", status_code=401, message="The authentication token is malformed or invalid.")) @@ -97,7 +97,7 @@ def get_profile_email(self, **kwargs): response_type="str") def get_profile_given_name(self, **kwargs): - # type: () -> Union[str, Error] + # type: (**Any) -> Union[str, Error] """ Gets the given name (first name) of the customer associated with the current enablement. Requires customer consent for scopes: [alexa::profile:given_name:read] @@ -112,11 +112,11 @@ def get_profile_given_name(self, **kwargs): resource_path = '/v2/accounts/~current/settings/Profile.givenName' resource_path = resource_path.replace('{format}', 'json') - path_params = {} + path_params = {} # type: Dict - query_params = [] + query_params = [] # type: List - header_params = [] + header_params = [] # type: List body_params = None header_params.append(('Content-type', 'application/json')) @@ -125,7 +125,7 @@ def get_profile_given_name(self, **kwargs): authorization_value = "Bearer " + self._authorization_value header_params.append(("Authorization", authorization_value)) - error_definitions = [] + error_definitions = [] # type: List error_definitions.append(ServiceClientResponse(response_type="str", status_code=200, message="Successfully retrieved the requested information.")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.ups.error.Error", status_code=204, message="The query did not return any results.")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.ups.error.Error", status_code=401, message="The authentication token is malformed or invalid.")) @@ -145,7 +145,7 @@ def get_profile_given_name(self, **kwargs): response_type="str") def get_profile_mobile_number(self, **kwargs): - # type: () -> Union[PhoneNumber, Error] + # type: (**Any) -> Union[PhoneNumber, Error] """ Gets the mobile phone number of the customer associated with the current enablement. Requires customer consent for scopes: [alexa::profile:mobile_number:read] @@ -160,11 +160,11 @@ def get_profile_mobile_number(self, **kwargs): resource_path = '/v2/accounts/~current/settings/Profile.mobileNumber' resource_path = resource_path.replace('{format}', 'json') - path_params = {} + path_params = {} # type: Dict - query_params = [] + query_params = [] # type: List - header_params = [] + header_params = [] # type: List body_params = None header_params.append(('Content-type', 'application/json')) @@ -173,7 +173,7 @@ def get_profile_mobile_number(self, **kwargs): authorization_value = "Bearer " + self._authorization_value header_params.append(("Authorization", authorization_value)) - error_definitions = [] + error_definitions = [] # type: List error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.ups.phone_number.PhoneNumber", status_code=200, message="Successfully retrieved the requested information.")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.ups.error.Error", status_code=204, message="The query did not return any results.")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.ups.error.Error", status_code=401, message="The authentication token is malformed or invalid.")) @@ -193,7 +193,7 @@ def get_profile_mobile_number(self, **kwargs): response_type="ask_sdk_model.services.ups.phone_number.PhoneNumber") def get_profile_name(self, **kwargs): - # type: () -> Union[str, Error] + # type: (**Any) -> Union[str, Error] """ Gets the full name of the customer associated with the current enablement. Requires customer consent for scopes: [alexa::profile:name:read] @@ -208,11 +208,11 @@ def get_profile_name(self, **kwargs): resource_path = '/v2/accounts/~current/settings/Profile.name' resource_path = resource_path.replace('{format}', 'json') - path_params = {} + path_params = {} # type: Dict - query_params = [] + query_params = [] # type: List - header_params = [] + header_params = [] # type: List body_params = None header_params.append(('Content-type', 'application/json')) @@ -221,7 +221,7 @@ def get_profile_name(self, **kwargs): authorization_value = "Bearer " + self._authorization_value header_params.append(("Authorization", authorization_value)) - error_definitions = [] + error_definitions = [] # type: List error_definitions.append(ServiceClientResponse(response_type="str", status_code=200, message="Successfully retrieved the requested information.")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.ups.error.Error", status_code=204, message="The query did not return any results.")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.ups.error.Error", status_code=401, message="The authentication token is malformed or invalid.")) @@ -241,7 +241,7 @@ def get_profile_name(self, **kwargs): response_type="str") def get_system_distance_units(self, device_id, **kwargs): - # type: (str) -> Union[Error, DistanceUnits] + # type: (str, **Any) -> Union[Error, DistanceUnits] """ Gets the distance measurement unit of the device. Does not require explict customer consent. @@ -262,13 +262,13 @@ def get_system_distance_units(self, device_id, **kwargs): resource_path = '/v2/devices/{deviceId}/settings/System.distanceUnits' resource_path = resource_path.replace('{format}', 'json') - path_params = {} + path_params = {} # type: Dict if 'device_id' in params: path_params['deviceId'] = params['device_id'] - query_params = [] + query_params = [] # type: List - header_params = [] + header_params = [] # type: List body_params = None header_params.append(('Content-type', 'application/json')) @@ -277,7 +277,7 @@ def get_system_distance_units(self, device_id, **kwargs): authorization_value = "Bearer " + self._authorization_value header_params.append(("Authorization", authorization_value)) - error_definitions = [] + error_definitions = [] # type: List error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.ups.distance_units.DistanceUnits", status_code=200, message="Successfully get the setting")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.ups.error.Error", status_code=204, message="The query did not return any results.")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.ups.error.Error", status_code=401, message="The authentication token is malformed or invalid.")) @@ -297,7 +297,7 @@ def get_system_distance_units(self, device_id, **kwargs): response_type="ask_sdk_model.services.ups.distance_units.DistanceUnits") def get_system_temperature_unit(self, device_id, **kwargs): - # type: (str) -> Union[TemperatureUnit, Error] + # type: (str, **Any) -> Union[TemperatureUnit, Error] """ Gets the temperature measurement units of the device. Does not require explict customer consent. @@ -318,13 +318,13 @@ def get_system_temperature_unit(self, device_id, **kwargs): resource_path = '/v2/devices/{deviceId}/settings/System.temperatureUnit' resource_path = resource_path.replace('{format}', 'json') - path_params = {} + path_params = {} # type: Dict if 'device_id' in params: path_params['deviceId'] = params['device_id'] - query_params = [] + query_params = [] # type: List - header_params = [] + header_params = [] # type: List body_params = None header_params.append(('Content-type', 'application/json')) @@ -333,7 +333,7 @@ def get_system_temperature_unit(self, device_id, **kwargs): authorization_value = "Bearer " + self._authorization_value header_params.append(("Authorization", authorization_value)) - error_definitions = [] + error_definitions = [] # type: List error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.ups.temperature_unit.TemperatureUnit", status_code=200, message="Successfully get the setting")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.ups.error.Error", status_code=204, message="The query did not return any results.")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.ups.error.Error", status_code=401, message="The authentication token is malformed or invalid.")) @@ -353,7 +353,7 @@ def get_system_temperature_unit(self, device_id, **kwargs): response_type="ask_sdk_model.services.ups.temperature_unit.TemperatureUnit") def get_system_time_zone(self, device_id, **kwargs): - # type: (str) -> Union[str, Error] + # type: (str, **Any) -> Union[str, Error] """ Gets the time zone of the device. Does not require explict customer consent. @@ -374,13 +374,13 @@ def get_system_time_zone(self, device_id, **kwargs): resource_path = '/v2/devices/{deviceId}/settings/System.timeZone' resource_path = resource_path.replace('{format}', 'json') - path_params = {} + path_params = {} # type: Dict if 'device_id' in params: path_params['deviceId'] = params['device_id'] - query_params = [] + query_params = [] # type: List - header_params = [] + header_params = [] # type: List body_params = None header_params.append(('Content-type', 'application/json')) @@ -389,7 +389,7 @@ def get_system_time_zone(self, device_id, **kwargs): authorization_value = "Bearer " + self._authorization_value header_params.append(("Authorization", authorization_value)) - error_definitions = [] + error_definitions = [] # type: List error_definitions.append(ServiceClientResponse(response_type="str", status_code=200, message="Successfully get the setting")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.ups.error.Error", status_code=204, message="The query did not return any results.")) error_definitions.append(ServiceClientResponse(response_type="ask_sdk_model.services.ups.error.Error", status_code=401, message="The authentication token is malformed or invalid.")) diff --git a/ask-sdk-model/ask_sdk_model/session.py b/ask-sdk-model/ask_sdk_model/session.py index 1e20a44..c39ca31 100644 --- a/ask-sdk-model/ask_sdk_model/session.py +++ b/ask-sdk-model/ask_sdk_model/session.py @@ -50,7 +50,7 @@ class Session(object): 'user': 'ask_sdk_model.user.User', 'attributes': 'dict(str, object)', 'application': 'ask_sdk_model.application.Application' - } + } # type: Dict attribute_map = { 'new': 'new', @@ -58,7 +58,7 @@ class Session(object): 'user': 'user', 'attributes': 'attributes', 'application': 'application' - } +} # type: Dict def __init__(self, new=None, session_id=None, user=None, attributes=None, application=None): # type: (Optional[bool], Optional[str], Optional[User], Optional[Dict[str, object]], Optional[Application]) -> None @@ -75,7 +75,7 @@ def __init__(self, new=None, session_id=None, user=None, attributes=None, applic :param application: :type application: (optional) ask_sdk_model.application.Application """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.new = new self.session_id = session_id @@ -86,7 +86,7 @@ def __init__(self, new=None, session_id=None, user=None, attributes=None, applic def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/session_ended_error.py b/ask-sdk-model/ask_sdk_model/session_ended_error.py index c9cef0b..f52faa7 100644 --- a/ask-sdk-model/ask_sdk_model/session_ended_error.py +++ b/ask-sdk-model/ask_sdk_model/session_ended_error.py @@ -40,12 +40,12 @@ class SessionEndedError(object): deserialized_types = { 'object_type': 'ask_sdk_model.session_ended_error_type.SessionEndedErrorType', 'message': 'str' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'message': 'message' - } +} # type: Dict def __init__(self, object_type=None, message=None): # type: (Optional[SessionEndedErrorType], Optional[str]) -> None @@ -56,7 +56,7 @@ def __init__(self, object_type=None, message=None): :param message: A string providing more information about the error. :type message: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.object_type = object_type self.message = message @@ -64,7 +64,7 @@ def __init__(self, object_type=None, message=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/session_ended_request.py b/ask-sdk-model/ask_sdk_model/session_ended_request.py index 2352ae9..fe2b030 100644 --- a/ask-sdk-model/ask_sdk_model/session_ended_request.py +++ b/ask-sdk-model/ask_sdk_model/session_ended_request.py @@ -52,7 +52,7 @@ class SessionEndedRequest(Request): 'locale': 'str', 'reason': 'ask_sdk_model.session_ended_reason.SessionEndedReason', 'error': 'ask_sdk_model.session_ended_error.SessionEndedError' - } + } # type: Dict attribute_map = { 'object_type': 'type', @@ -61,7 +61,7 @@ class SessionEndedRequest(Request): 'locale': 'locale', 'reason': 'reason', 'error': 'error' - } +} # type: Dict def __init__(self, request_id=None, timestamp=None, locale=None, reason=None, error=None): # type: (Optional[str], Optional[datetime], Optional[str], Optional[SessionEndedReason], Optional[SessionEndedError]) -> None @@ -78,7 +78,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, reason=None, er :param error: An error object providing more information about the error that occurred. :type error: (optional) ask_sdk_model.session_ended_error.SessionEndedError """ - self.__discriminator_value = "SessionEndedRequest" + self.__discriminator_value = "SessionEndedRequest" # type: str self.object_type = self.__discriminator_value super(SessionEndedRequest, self).__init__(object_type=self.__discriminator_value, request_id=request_id, timestamp=timestamp, locale=locale) @@ -88,7 +88,7 @@ def __init__(self, request_id=None, timestamp=None, locale=None, reason=None, er def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/slot.py b/ask-sdk-model/ask_sdk_model/slot.py index 047c3f7..13c45b1 100644 --- a/ask-sdk-model/ask_sdk_model/slot.py +++ b/ask-sdk-model/ask_sdk_model/slot.py @@ -45,14 +45,14 @@ class Slot(object): 'value': 'str', 'confirmation_status': 'ask_sdk_model.slot_confirmation_status.SlotConfirmationStatus', 'resolutions': 'ask_sdk_model.slu.entityresolution.resolutions.Resolutions' - } + } # type: Dict attribute_map = { 'name': 'name', 'value': 'value', 'confirmation_status': 'confirmationStatus', 'resolutions': 'resolutions' - } +} # type: Dict def __init__(self, name=None, value=None, confirmation_status=None, resolutions=None): # type: (Optional[str], Optional[str], Optional[SlotConfirmationStatus], Optional[Resolutions]) -> None @@ -67,7 +67,7 @@ def __init__(self, name=None, value=None, confirmation_status=None, resolutions= :param resolutions: Contains the results of entity resolution. These are organized by authority. An authority represents the source for the data provided for the slot. For a custom slot type, the authority is the slot type you defined. :type resolutions: (optional) ask_sdk_model.slu.entityresolution.resolutions.Resolutions """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.name = name self.value = value @@ -77,7 +77,7 @@ def __init__(self, name=None, value=None, confirmation_status=None, resolutions= def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/slu/entityresolution/py.typed b/ask-sdk-model/ask_sdk_model/slu/entityresolution/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/slu/entityresolution/resolution.py b/ask-sdk-model/ask_sdk_model/slu/entityresolution/resolution.py index 0d48f20..fa8aa8f 100644 --- a/ask-sdk-model/ask_sdk_model/slu/entityresolution/resolution.py +++ b/ask-sdk-model/ask_sdk_model/slu/entityresolution/resolution.py @@ -44,13 +44,13 @@ class Resolution(object): 'authority': 'str', 'status': 'ask_sdk_model.slu.entityresolution.status.Status', 'values': 'list[ask_sdk_model.slu.entityresolution.value_wrapper.ValueWrapper]' - } + } # type: Dict attribute_map = { 'authority': 'authority', 'status': 'status', 'values': 'values' - } +} # type: Dict def __init__(self, authority=None, status=None, values=None): # type: (Optional[str], Optional[Status], Optional[List[ValueWrapper]]) -> None @@ -63,7 +63,7 @@ def __init__(self, authority=None, status=None, values=None): :param values: :type values: (optional) list[ask_sdk_model.slu.entityresolution.value_wrapper.ValueWrapper] """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.authority = authority self.status = status @@ -72,7 +72,7 @@ def __init__(self, authority=None, status=None, values=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/slu/entityresolution/resolutions.py b/ask-sdk-model/ask_sdk_model/slu/entityresolution/resolutions.py index 3c5abf3..25a6ea3 100644 --- a/ask-sdk-model/ask_sdk_model/slu/entityresolution/resolutions.py +++ b/ask-sdk-model/ask_sdk_model/slu/entityresolution/resolutions.py @@ -37,11 +37,11 @@ class Resolutions(object): """ deserialized_types = { 'resolutions_per_authority': 'list[ask_sdk_model.slu.entityresolution.resolution.Resolution]' - } + } # type: Dict attribute_map = { 'resolutions_per_authority': 'resolutionsPerAuthority' - } +} # type: Dict def __init__(self, resolutions_per_authority=None): # type: (Optional[List[Resolution]]) -> None @@ -50,14 +50,14 @@ def __init__(self, resolutions_per_authority=None): :param resolutions_per_authority: :type resolutions_per_authority: (optional) list[ask_sdk_model.slu.entityresolution.resolution.Resolution] """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.resolutions_per_authority = resolutions_per_authority def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/slu/entityresolution/status.py b/ask-sdk-model/ask_sdk_model/slu/entityresolution/status.py index a90e30e..1c20ab3 100644 --- a/ask-sdk-model/ask_sdk_model/slu/entityresolution/status.py +++ b/ask-sdk-model/ask_sdk_model/slu/entityresolution/status.py @@ -35,11 +35,11 @@ class Status(object): """ deserialized_types = { 'code': 'ask_sdk_model.slu.entityresolution.status_code.StatusCode' - } + } # type: Dict attribute_map = { 'code': 'code' - } +} # type: Dict def __init__(self, code=None): # type: (Optional[StatusCode]) -> None @@ -48,14 +48,14 @@ def __init__(self, code=None): :param code: Indication of the results of attempting to resolve the user utterance against the defined slot types. :type code: (optional) ask_sdk_model.slu.entityresolution.status_code.StatusCode """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.code = code def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/slu/entityresolution/value.py b/ask-sdk-model/ask_sdk_model/slu/entityresolution/value.py index d01e16d..9a96cb5 100644 --- a/ask-sdk-model/ask_sdk_model/slu/entityresolution/value.py +++ b/ask-sdk-model/ask_sdk_model/slu/entityresolution/value.py @@ -39,12 +39,12 @@ class Value(object): deserialized_types = { 'name': 'str', 'id': 'str' - } + } # type: Dict attribute_map = { 'name': 'name', 'id': 'id' - } +} # type: Dict def __init__(self, name=None, id=None): # type: (Optional[str], Optional[str]) -> None @@ -55,7 +55,7 @@ def __init__(self, name=None, id=None): :param id: The id for the resolution value. :type id: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.name = name self.id = id @@ -63,7 +63,7 @@ def __init__(self, name=None, id=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/slu/entityresolution/value_wrapper.py b/ask-sdk-model/ask_sdk_model/slu/entityresolution/value_wrapper.py index 638bfa5..9e46f5b 100644 --- a/ask-sdk-model/ask_sdk_model/slu/entityresolution/value_wrapper.py +++ b/ask-sdk-model/ask_sdk_model/slu/entityresolution/value_wrapper.py @@ -37,11 +37,11 @@ class ValueWrapper(object): """ deserialized_types = { 'value': 'ask_sdk_model.slu.entityresolution.value.Value' - } + } # type: Dict attribute_map = { 'value': 'value' - } +} # type: Dict def __init__(self, value=None): # type: (Optional[Value]) -> None @@ -50,14 +50,14 @@ def __init__(self, value=None): :param value: :type value: (optional) ask_sdk_model.slu.entityresolution.value.Value """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.value = value def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/slu/py.typed b/ask-sdk-model/ask_sdk_model/slu/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/supported_interfaces.py b/ask-sdk-model/ask_sdk_model/supported_interfaces.py index b2ec23a..51d9a2e 100644 --- a/ask-sdk-model/ask_sdk_model/supported_interfaces.py +++ b/ask-sdk-model/ask_sdk_model/supported_interfaces.py @@ -53,7 +53,7 @@ class SupportedInterfaces(object): 'display': 'ask_sdk_model.interfaces.display.display_interface.DisplayInterface', 'video_app': 'ask_sdk_model.interfaces.videoapp.video_app_interface.VideoAppInterface', 'geolocation': 'ask_sdk_model.interfaces.geolocation.geolocation_interface.GeolocationInterface' - } + } # type: Dict attribute_map = { 'alexa_presentation_apl': 'Alexa.Presentation.APL', @@ -61,7 +61,7 @@ class SupportedInterfaces(object): 'display': 'Display', 'video_app': 'VideoApp', 'geolocation': 'Geolocation' - } +} # type: Dict def __init__(self, alexa_presentation_apl=None, audio_player=None, display=None, video_app=None, geolocation=None): # type: (Optional[AlexaPresentationAplInterface], Optional[AudioPlayerInterface], Optional[DisplayInterface], Optional[VideoAppInterface], Optional[GeolocationInterface]) -> None @@ -78,7 +78,7 @@ def __init__(self, alexa_presentation_apl=None, audio_player=None, display=None, :param geolocation: :type geolocation: (optional) ask_sdk_model.interfaces.geolocation.geolocation_interface.GeolocationInterface """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.alexa_presentation_apl = alexa_presentation_apl self.audio_player = audio_player @@ -89,7 +89,7 @@ def __init__(self, alexa_presentation_apl=None, audio_player=None, display=None, def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/ui/ask_for_permissions_consent_card.py b/ask-sdk-model/ask_sdk_model/ui/ask_for_permissions_consent_card.py index b3cd238..6d8ae77 100644 --- a/ask-sdk-model/ask_sdk_model/ui/ask_for_permissions_consent_card.py +++ b/ask-sdk-model/ask_sdk_model/ui/ask_for_permissions_consent_card.py @@ -36,12 +36,12 @@ class AskForPermissionsConsentCard(Card): deserialized_types = { 'object_type': 'str', 'permissions': 'list[str]' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'permissions': 'permissions' - } +} # type: Dict def __init__(self, permissions=None): # type: (Optional[List[object]]) -> None @@ -50,7 +50,7 @@ def __init__(self, permissions=None): :param permissions: :type permissions: (optional) list[str] """ - self.__discriminator_value = "AskForPermissionsConsent" + self.__discriminator_value = "AskForPermissionsConsent" # type: str self.object_type = self.__discriminator_value super(AskForPermissionsConsentCard, self).__init__(object_type=self.__discriminator_value) @@ -59,7 +59,7 @@ def __init__(self, permissions=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/ui/card.py b/ask-sdk-model/ask_sdk_model/ui/card.py index 6e595b2..51747e0 100644 --- a/ask-sdk-model/ask_sdk_model/ui/card.py +++ b/ask-sdk-model/ask_sdk_model/ui/card.py @@ -48,11 +48,11 @@ class Card(object): """ deserialized_types = { 'object_type': 'str' - } + } # type: Dict attribute_map = { 'object_type': 'type' - } +} # type: Dict discriminator_value_class_map = { 'LinkAccount': 'ask_sdk_model.ui.link_account_card.LinkAccountCard', @@ -73,13 +73,13 @@ def __init__(self, object_type=None): :param object_type: :type object_type: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.object_type = object_type @classmethod def get_real_child_model(cls, data): - # type: (Dict[str, str]) -> str + # type: (Dict[str, str]) -> Optional[str] """Returns the real base class specified by the discriminator""" discriminator_value = data[cls.json_discriminator_key] return cls.discriminator_value_class_map.get(discriminator_value) @@ -87,7 +87,7 @@ def get_real_child_model(cls, data): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/ui/image.py b/ask-sdk-model/ask_sdk_model/ui/image.py index 23df03e..fc64a40 100644 --- a/ask-sdk-model/ask_sdk_model/ui/image.py +++ b/ask-sdk-model/ask_sdk_model/ui/image.py @@ -37,12 +37,12 @@ class Image(object): deserialized_types = { 'small_image_url': 'str', 'large_image_url': 'str' - } + } # type: Dict attribute_map = { 'small_image_url': 'smallImageUrl', 'large_image_url': 'largeImageUrl' - } +} # type: Dict def __init__(self, small_image_url=None, large_image_url=None): # type: (Optional[str], Optional[str]) -> None @@ -53,7 +53,7 @@ def __init__(self, small_image_url=None, large_image_url=None): :param large_image_url: :type large_image_url: (optional) str """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.small_image_url = small_image_url self.large_image_url = large_image_url @@ -61,7 +61,7 @@ def __init__(self, small_image_url=None, large_image_url=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/ui/link_account_card.py b/ask-sdk-model/ask_sdk_model/ui/link_account_card.py index c38754e..b819979 100644 --- a/ask-sdk-model/ask_sdk_model/ui/link_account_card.py +++ b/ask-sdk-model/ask_sdk_model/ui/link_account_card.py @@ -33,18 +33,18 @@ class LinkAccountCard(Card): """ deserialized_types = { 'object_type': 'str' - } + } # type: Dict attribute_map = { 'object_type': 'type' - } +} # type: Dict def __init__(self): # type: () -> None """ """ - self.__discriminator_value = "LinkAccount" + self.__discriminator_value = "LinkAccount" # type: str self.object_type = self.__discriminator_value super(LinkAccountCard, self).__init__(object_type=self.__discriminator_value) @@ -52,7 +52,7 @@ def __init__(self): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/ui/output_speech.py b/ask-sdk-model/ask_sdk_model/ui/output_speech.py index 25c0d39..1f56db5 100644 --- a/ask-sdk-model/ask_sdk_model/ui/output_speech.py +++ b/ask-sdk-model/ask_sdk_model/ui/output_speech.py @@ -48,12 +48,12 @@ class OutputSpeech(object): deserialized_types = { 'object_type': 'str', 'play_behavior': 'ask_sdk_model.ui.play_behavior.PlayBehavior' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'play_behavior': 'playBehavior' - } +} # type: Dict discriminator_value_class_map = { 'SSML': 'ask_sdk_model.ui.ssml_output_speech.SsmlOutputSpeech', @@ -74,14 +74,14 @@ def __init__(self, object_type=None, play_behavior=None): :param play_behavior: :type play_behavior: (optional) ask_sdk_model.ui.play_behavior.PlayBehavior """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.object_type = object_type self.play_behavior = play_behavior @classmethod def get_real_child_model(cls, data): - # type: (Dict[str, str]) -> str + # type: (Dict[str, str]) -> Optional[str] """Returns the real base class specified by the discriminator""" discriminator_value = data[cls.json_discriminator_key] return cls.discriminator_value_class_map.get(discriminator_value) @@ -89,7 +89,7 @@ def get_real_child_model(cls, data): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/ui/plain_text_output_speech.py b/ask-sdk-model/ask_sdk_model/ui/plain_text_output_speech.py index 4d6dbc4..985dfed 100644 --- a/ask-sdk-model/ask_sdk_model/ui/plain_text_output_speech.py +++ b/ask-sdk-model/ask_sdk_model/ui/plain_text_output_speech.py @@ -40,13 +40,13 @@ class PlainTextOutputSpeech(OutputSpeech): 'object_type': 'str', 'play_behavior': 'ask_sdk_model.ui.play_behavior.PlayBehavior', 'text': 'str' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'play_behavior': 'playBehavior', 'text': 'text' - } +} # type: Dict def __init__(self, play_behavior=None, text=None): # type: (Optional[PlayBehavior], Optional[str]) -> None @@ -57,7 +57,7 @@ def __init__(self, play_behavior=None, text=None): :param text: :type text: (optional) str """ - self.__discriminator_value = "PlainText" + self.__discriminator_value = "PlainText" # type: str self.object_type = self.__discriminator_value super(PlainTextOutputSpeech, self).__init__(object_type=self.__discriminator_value, play_behavior=play_behavior) @@ -66,7 +66,7 @@ def __init__(self, play_behavior=None, text=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/ui/py.typed b/ask-sdk-model/ask_sdk_model/ui/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/ask-sdk-model/ask_sdk_model/ui/reprompt.py b/ask-sdk-model/ask_sdk_model/ui/reprompt.py index ba49658..99da87d 100644 --- a/ask-sdk-model/ask_sdk_model/ui/reprompt.py +++ b/ask-sdk-model/ask_sdk_model/ui/reprompt.py @@ -35,11 +35,11 @@ class Reprompt(object): """ deserialized_types = { 'output_speech': 'ask_sdk_model.ui.output_speech.OutputSpeech' - } + } # type: Dict attribute_map = { 'output_speech': 'outputSpeech' - } +} # type: Dict def __init__(self, output_speech=None): # type: (Optional[OutputSpeech]) -> None @@ -48,14 +48,14 @@ def __init__(self, output_speech=None): :param output_speech: :type output_speech: (optional) ask_sdk_model.ui.output_speech.OutputSpeech """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.output_speech = output_speech def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/ui/simple_card.py b/ask-sdk-model/ask_sdk_model/ui/simple_card.py index 0c5a8bf..c3b5edf 100644 --- a/ask-sdk-model/ask_sdk_model/ui/simple_card.py +++ b/ask-sdk-model/ask_sdk_model/ui/simple_card.py @@ -39,13 +39,13 @@ class SimpleCard(Card): 'object_type': 'str', 'title': 'str', 'content': 'str' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'title': 'title', 'content': 'content' - } +} # type: Dict def __init__(self, title=None, content=None): # type: (Optional[str], Optional[str]) -> None @@ -56,7 +56,7 @@ def __init__(self, title=None, content=None): :param content: :type content: (optional) str """ - self.__discriminator_value = "Simple" + self.__discriminator_value = "Simple" # type: str self.object_type = self.__discriminator_value super(SimpleCard, self).__init__(object_type=self.__discriminator_value) @@ -66,7 +66,7 @@ def __init__(self, title=None, content=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/ui/ssml_output_speech.py b/ask-sdk-model/ask_sdk_model/ui/ssml_output_speech.py index 4d24b86..6e90080 100644 --- a/ask-sdk-model/ask_sdk_model/ui/ssml_output_speech.py +++ b/ask-sdk-model/ask_sdk_model/ui/ssml_output_speech.py @@ -40,13 +40,13 @@ class SsmlOutputSpeech(OutputSpeech): 'object_type': 'str', 'play_behavior': 'ask_sdk_model.ui.play_behavior.PlayBehavior', 'ssml': 'str' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'play_behavior': 'playBehavior', 'ssml': 'ssml' - } +} # type: Dict def __init__(self, play_behavior=None, ssml=None): # type: (Optional[PlayBehavior], Optional[str]) -> None @@ -57,7 +57,7 @@ def __init__(self, play_behavior=None, ssml=None): :param ssml: :type ssml: (optional) str """ - self.__discriminator_value = "SSML" + self.__discriminator_value = "SSML" # type: str self.object_type = self.__discriminator_value super(SsmlOutputSpeech, self).__init__(object_type=self.__discriminator_value, play_behavior=play_behavior) @@ -66,7 +66,7 @@ def __init__(self, play_behavior=None, ssml=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/ui/standard_card.py b/ask-sdk-model/ask_sdk_model/ui/standard_card.py index 2213464..d8cc8ed 100644 --- a/ask-sdk-model/ask_sdk_model/ui/standard_card.py +++ b/ask-sdk-model/ask_sdk_model/ui/standard_card.py @@ -43,14 +43,14 @@ class StandardCard(Card): 'title': 'str', 'text': 'str', 'image': 'ask_sdk_model.ui.image.Image' - } + } # type: Dict attribute_map = { 'object_type': 'type', 'title': 'title', 'text': 'text', 'image': 'image' - } +} # type: Dict def __init__(self, title=None, text=None, image=None): # type: (Optional[str], Optional[str], Optional[Image]) -> None @@ -63,7 +63,7 @@ def __init__(self, title=None, text=None, image=None): :param image: :type image: (optional) ask_sdk_model.ui.image.Image """ - self.__discriminator_value = "Standard" + self.__discriminator_value = "Standard" # type: str self.object_type = self.__discriminator_value super(StandardCard, self).__init__(object_type=self.__discriminator_value) @@ -74,7 +74,7 @@ def __init__(self, title=None, text=None, image=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr) diff --git a/ask-sdk-model/ask_sdk_model/user.py b/ask-sdk-model/ask_sdk_model/user.py index 541241c..c1d3859 100644 --- a/ask-sdk-model/ask_sdk_model/user.py +++ b/ask-sdk-model/ask_sdk_model/user.py @@ -43,13 +43,13 @@ class User(object): 'user_id': 'str', 'access_token': 'str', 'permissions': 'ask_sdk_model.permissions.Permissions' - } + } # type: Dict attribute_map = { 'user_id': 'userId', 'access_token': 'accessToken', 'permissions': 'permissions' - } +} # type: Dict def __init__(self, user_id=None, access_token=None, permissions=None): # type: (Optional[str], Optional[str], Optional[Permissions]) -> None @@ -62,7 +62,7 @@ def __init__(self, user_id=None, access_token=None, permissions=None): :param permissions: :type permissions: (optional) ask_sdk_model.permissions.Permissions """ - self.__discriminator_value = None + self.__discriminator_value = None # type: str self.user_id = user_id self.access_token = access_token @@ -71,7 +71,7 @@ def __init__(self, user_id=None, access_token=None, permissions=None): def to_dict(self): # type: () -> Dict[str, object] """Returns the model properties as a dict""" - result = {} + result = {} # type: Dict for attr, _ in six.iteritems(self.deserialized_types): value = getattr(self, attr)