Minor release 1.2.0

ask-sdk-model/CHANGELOG.rst

@@ -45,3 +45,8 @@ CHANGELOG
 
 * Update Skill Event Models to include additional attributes like 'eventPublishingTime' etc.
 
+1.2.0
+~~~~~
+
+* Models for "PrintRequest" and "ReservationRequest" in Skill Connections.
+

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.1.0'
+__version__ = '1.2.0'
 __author__ = 'Alexa Skills Kit'
 __author_email__ = 'ask-sdk-dynamic@amazon.com'
 __license__ = 'Apache 2.0'

ask-sdk-model/ask_sdk_model/interfaces/connections/entities/__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 .base_entity import BaseEntity
+from .postal_address import PostalAddress
+from .restaurant import Restaurant

ask-sdk-model/ask_sdk_model/interfaces/connections/entities/base_entity.py

@@ -0,0 +1,139 @@
+# 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.
+#
+
+import pprint
+import re  # noqa: F401
+import six
+import typing
+from enum import Enum
+from abc import ABCMeta, abstractmethod
+
+
+if typing.TYPE_CHECKING:
+    from typing import Dict, List, Optional
+    from datetime import datetime
+
+
+class BaseEntity(object):
+    """
+
+    :param object_type: 
+    :type object_type: (optional) str
+    :param version: version of the request
+    :type version: (optional) str
+
+    .. note::
+
+        This is an abstract class. Use the following mapping, to figure out
+        the model class to be instantiated, that sets ``@type`` variable.
+
+        | Restaurant: :py:class:`ask_sdk_model.interfaces.connections.entities.restaurant.Restaurant`,
+        |
+        | PostalAddress: :py:class:`ask_sdk_model.interfaces.connections.entities.postal_address.PostalAddress`
+
+    """
+    deserialized_types = {
+        'object_type': 'str',
+        'version': 'str'
+    }
+
+    attribute_map = {
+        'object_type': '@type',
+        'version': '@version'
+    }
+
+    discriminator_value_class_map = {
+        'Restaurant': 'ask_sdk_model.interfaces.connections.entities.restaurant.Restaurant',
+        'PostalAddress': 'ask_sdk_model.interfaces.connections.entities.postal_address.PostalAddress'
+    }
+
+    json_discriminator_key = "@type"
+
+    __metaclass__ = ABCMeta
+
+    @abstractmethod
+    def __init__(self, object_type=None, version=None):
+        # type: (Optional[str], Optional[str]) -> None
+        """
+
+        :param object_type: 
+        :type object_type: (optional) str
+        :param version: version of the request
+        :type version: (optional) str
+        """
+        self.__discriminator_value = None
+
+        self.object_type = object_type
+        self.version = version
+
+    @classmethod
+    def get_real_child_model(cls, data):
+        # type: (Dict[str, str]) -> 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)
+
+    def to_dict(self):
+        # type: () -> Dict[str, object]
+        """Returns the model properties as a dict"""
+        result = {}
+
+        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, BaseEntity):
+            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

ask-sdk-model/ask_sdk_model/interfaces/connections/entities/postal_address.py

@@ -0,0 +1,146 @@
+# 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.
+#
+
+import pprint
+import re  # noqa: F401
+import six
+import typing
+from enum import Enum
+from ask_sdk_model.interfaces.connections.entities.base_entity import BaseEntity
+
+
+if typing.TYPE_CHECKING:
+    from typing import Dict, List, Optional
+    from datetime import datetime
+
+
+class PostalAddress(BaseEntity):
+    """
+    Postal Address
+
+
+    :param version: version of the request
+    :type version: (optional) str
+    :param street_address: street address
+    :type street_address: (optional) str
+    :param locality: locality/city
+    :type locality: (optional) str
+    :param region: state/region
+    :type region: (optional) str
+    :param postal_code: postal/zip code
+    :type postal_code: (optional) str
+    :param country: country
+    :type country: (optional) str
+
+    """
+    deserialized_types = {
+        'object_type': 'str',
+        'version': 'str',
+        'street_address': 'str',
+        'locality': 'str',
+        'region': 'str',
+        'postal_code': 'str',
+        'country': 'str'
+    }
+
+    attribute_map = {
+        'object_type': '@type',
+        'version': '@version',
+        'street_address': 'streetAddress',
+        'locality': 'locality',
+        'region': 'region',
+        'postal_code': 'postalCode',
+        'country': 'country'
+    }
+
+    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
+        """Postal Address
+
+        :param version: version of the request
+        :type version: (optional) str
+        :param street_address: street address
+        :type street_address: (optional) str
+        :param locality: locality/city
+        :type locality: (optional) str
+        :param region: state/region
+        :type region: (optional) str
+        :param postal_code: postal/zip code
+        :type postal_code: (optional) str
+        :param country: country
+        :type country: (optional) str
+        """
+        self.__discriminator_value = "PostalAddress"
+
+        self.object_type = self.__discriminator_value
+        super(PostalAddress, self).__init__(object_type=self.__discriminator_value, version=version)
+        self.street_address = street_address
+        self.locality = locality
+        self.region = region
+        self.postal_code = postal_code
+        self.country = country
+
+    def to_dict(self):
+        # type: () -> Dict[str, object]
+        """Returns the model properties as a dict"""
+        result = {}
+
+        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, PostalAddress):
+            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