@typespec/http-client-python 0.27.1 → 0.28.0

package/generator/pygen/codegen/templates/model_base.py.jinja2

@@ -527,6 +527,8 @@ class _MyMutableMapping(MutableMapping[str, typing.Any]):
         return self._data.setdefault(key, default)
 
     def __eq__(self, other: typing.Any) -> bool:
+        if isinstance(other, _MyMutableMapping):
+            return self._data == other._data
         try:
             other_model = self.__class__(other)
         except Exception:
@@ -650,6 +652,9 @@ class Model(_MyMutableMapping):
                         if len(items) > 0:
                             existed_attr_keys.append(xml_name)
                             dict_to_pass[rf._rest_name] = _deserialize(rf._type, items)
+                        elif not rf._is_optional:
+                            existed_attr_keys.append(xml_name)
+                            dict_to_pass[rf._rest_name] = []
                         continue
 
                     # text element is primitive type
@@ -928,6 +933,8 @@ def _get_deserialize_callable_from_annotation(  # pylint: disable=too-many-retur
     # is it optional?
     try:
         if any(a is _NONE_TYPE for a in annotation.__args__):  # pyright: ignore
+            if rf:
+                rf._is_optional = True
             if len(annotation.__args__) <= 2:  # pyright: ignore
                 if_obj_deserializer = _get_deserialize_callable_from_annotation(
                     next(a for a in annotation.__args__ if a is not _NONE_TYPE), module, rf  # pyright: ignore
@@ -1020,16 +1027,20 @@ def _deserialize_with_callable(
                 return float(value.text) if value.text else None
             if deserializer is bool:
                 return value.text == "true" if value.text else None
+            if deserializer and deserializer in _DESERIALIZE_MAPPING.values():
+                return deserializer(value.text) if value.text else None
+            if deserializer and deserializer in _DESERIALIZE_MAPPING_WITHFORMAT.values():
+                return deserializer(value.text) if value.text else None
         if deserializer is None:
             return value
         if deserializer in [int, float, bool]:
             return deserializer(value)
         if isinstance(deserializer, CaseInsensitiveEnumMeta):
             try:
-                return deserializer(value)
+                return deserializer(value.text if isinstance(value, ET.Element) else value)
             except ValueError:
                 # for unknown value, return raw value
-                return value
+                return value.text if isinstance(value, ET.Element) else value
         if isinstance(deserializer, type) and issubclass(deserializer, Model):
             return deserializer._deserialize(value, [])
         return typing.cast(typing.Callable[[typing.Any], typing.Any], deserializer)(value)
@@ -1084,9 +1095,7 @@ def _failsafe_deserialize_xml(
       return None
 
 
-{% if code_model.has_padded_model_property %}
 # pylint: disable=too-many-instance-attributes
-{% endif %}
 class _RestField:
     def __init__(
         self,
@@ -1109,6 +1118,7 @@ class _RestField:
         self._is_discriminator = is_discriminator
         self._visibility = visibility
         self._is_model = False
+        self._is_optional = False
         self._default = default
         self._format = format
         self._is_multipart_file_input = is_multipart_file_input

package/generator/pygen/preprocess/__init__.py

@@ -4,6 +4,7 @@
 # license information.
 # --------------------------------------------------------------------------
 """The preprocessing autorest plugin."""
+
 import copy
 from typing import Callable, Any, Optional
 
@@ -21,7 +22,6 @@ from ..utils import (
     get_body_type_for_description,
     JSON_REGEXP,
     KNOWN_TYPES,
-    update_enum_value,
 )
 
 
@@ -267,30 +267,18 @@ class PreProcessPlugin(YamlUpdatePlugin):
                 add_redefined_builtin_info(property["clientName"], property)
             if type.get("name"):
                 pad_type = PadType.MODEL if type["type"] == "model" else PadType.ENUM_CLASS
-                name = self.pad_reserved_words(type["name"], pad_type, type)
-                type["name"] = name[0].upper() + name[1:]
+                if type["type"] != "enumvalue":
+                    name = self.pad_reserved_words(type["name"], pad_type, type)
+                    type["name"] = name[0].upper() + name[1:]
                 type["description"] = update_description(type.get("description", ""), type["name"])
                 type["snakeCaseName"] = to_snake_case(type["name"])
             if type.get("values"):
-                # we're enums
-                values_to_add = []
+                # we're enums - enum values are UPPER_CASE so no padding needed for reserved words
                 for value in type["values"]:
-                    padded_name = self.pad_reserved_words(value["name"].lower(), PadType.ENUM_VALUE, value).upper()
-                    if self.version_tolerant:
-                        if padded_name[0] in "0123456789":
-                            padded_name = "ENUM_" + padded_name
-                            value["name"] = padded_name
-                    else:
-                        if value["name"] != padded_name:
-                            values_to_add.append(
-                                update_enum_value(
-                                    name=padded_name,
-                                    value=value["value"],
-                                    description=value["description"],
-                                    enum_type=value["enumType"],
-                                )
-                            )
-                type["values"].extend(values_to_add)
+                    upper_name = value["name"].upper()
+                    if upper_name[0] in "0123456789":
+                        upper_name = "ENUM_" + upper_name
+                        value["name"] = upper_name
 
         # add type for reference
         for v in HEADERS_CONVERT_IN_METHOD.values():

package/generator/pygen/preprocess/python_mappings.py

@@ -56,7 +56,6 @@ class PadType(str, Enum):
     ENUM_CLASS = "Enum"
     METHOD = "_method"
     PARAMETER = "_parameter"
-    ENUM_VALUE = "_enum"
     PROPERTY = "_property"
     OPERATION_GROUP = "Operations"
 
@@ -183,7 +182,6 @@ RESERVED_WORDS = {
     PadType.MODEL: ["enum", *_always_reserved],
     PadType.PROPERTY: ["self", *_always_reserved],
     PadType.ENUM_CLASS: ["enum", *_always_reserved],
-    PadType.ENUM_VALUE: ["mro", *_always_reserved],
     PadType.OPERATION_GROUP: [*_always_reserved],
 }
 

package/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_flatten_async.py

@@ -6,10 +6,13 @@
 import pytest
 from specs.azure.clientgenerator.core.flattenproperty.aio import FlattenPropertyClient
 from specs.azure.clientgenerator.core.flattenproperty.models import (
-    FlattenModel,
+    ChildFlattenModel,
     ChildModel,
+    FlattenModel,
+    FlattenUnknownModel,
     NestedFlattenModel,
-    ChildFlattenModel,
+    Solution,
+    SolutionProperties,
 )
 
 
@@ -46,6 +49,25 @@ async def test_put_nested_flatten_model(client: FlattenPropertyClient):
     )
 
 
+@pytest.mark.asyncio
+async def test_put_flatten_unknown_model(client: FlattenPropertyClient):
+    result = await client.put_flatten_unknown_model(FlattenUnknownModel(name="foo"))
+    assert result.name == "test"
+    assert result.properties == {"key1": "value1", "key2": "value2"}
+
+
+@pytest.mark.asyncio
+async def test_put_flatten_read_only_model(client: FlattenPropertyClient):
+    result = await client.put_flatten_read_only_model(Solution(name="foo"))
+    assert result == Solution(
+        name="foo",
+        properties=SolutionProperties(solution_id="solution1", title="Solution Title", content="Solution Content"),
+    )
+    assert result.solution_id == "solution1"
+    assert result.title == "Solution Title"
+    assert result.content == "Solution Content"
+
+
 @pytest.mark.asyncio  # ============test for compatibility ============
 async def test_dpg_model_common():
     flatten_model = FlattenModel(name="hello", properties=ChildModel(age=0, description="test"))

package/generator/test/azure/mock_api_tests/asynctests/test_azure_core_page_async.py

@@ -66,3 +66,15 @@ async def test_list_with_parameterized_next_link(client: aio.PageClient):
     assert result[0].name == "User1"
     assert result[1].id == 2
     assert result[1].name == "User2"
+
+
+@pytest.mark.asyncio
+async def test_list_with_relative_next_link(client: aio.PageClient):
+    result = [item async for item in client.with_relative_next_link()]
+    assert len(result) == 2
+    assert result[0].id == 1
+    assert result[0].name == "User1"
+    assert result[0].etag == "11bdc430-65e8-45ad-81d9-8ffa60d55b59"
+    assert result[1].id == 2
+    assert result[1].name == "User2"
+    assert result[1].etag == "11bdc430-65e8-45ad-81d9-8ffa60d55b59"

package/generator/test/azure/mock_api_tests/asynctests/test_special_words_async.py

@@ -63,3 +63,9 @@ async def test_model_properties_dict_methods(client: SpecialWordsClient):
 @pytest.mark.asyncio
 async def test_model_properties_with_list(client: SpecialWordsClient):
     await client.model_properties.with_list(models.ModelWithList(list="ok"))
+
+
+@pytest.mark.asyncio
+async def test_extensible_strings(client: SpecialWordsClient):
+    for enum_value in models.ExtensibleString:
+        assert enum_value == await client.extensible_strings.put_extensible_string_value(body=enum_value)

package/generator/test/azure/mock_api_tests/test_azure_client_generator_core_flatten.py

@@ -6,10 +6,13 @@
 import pytest
 from specs.azure.clientgenerator.core.flattenproperty import FlattenPropertyClient
 from specs.azure.clientgenerator.core.flattenproperty.models import (
-    FlattenModel,
+    ChildFlattenModel,
     ChildModel,
+    FlattenModel,
+    FlattenUnknownModel,
     NestedFlattenModel,
-    ChildFlattenModel,
+    Solution,
+    SolutionProperties,
 )
 
 
@@ -41,6 +44,23 @@ def test_put_nested_flatten_model(client: FlattenPropertyClient):
     )
 
 
+def test_put_flatten_unknown_model(client: FlattenPropertyClient):
+    result = client.put_flatten_unknown_model(FlattenUnknownModel(name="foo"))
+    assert result.name == "test"
+    assert result.properties == {"key1": "value1", "key2": "value2"}
+
+
+def test_put_flatten_read_only_model(client: FlattenPropertyClient):
+    result = client.put_flatten_read_only_model(Solution(name="foo"))
+    assert result == Solution(
+        name="foo",
+        properties=SolutionProperties(solution_id="solution1", title="Solution Title", content="Solution Content"),
+    )
+    assert result.solution_id == "solution1"
+    assert result.title == "Solution Title"
+    assert result.content == "Solution Content"
+
+
 # ============test for compatibility ============
 def test_dpg_model_common():
     flatten_model = FlattenModel(name="hello", properties=ChildModel(age=0, description="test"))

package/generator/test/azure/mock_api_tests/test_azure_core_page.py

@@ -58,3 +58,14 @@ def test_list_with_parameterized_next_link(client: PageClient):
     assert result[0].name == "User1"
     assert result[1].id == 2
     assert result[1].name == "User2"
+
+
+def test_list_with_relative_next_link(client: PageClient):
+    result = list(client.with_relative_next_link())
+    assert len(result) == 2
+    assert result[0].id == 1
+    assert result[0].name == "User1"
+    assert result[0].etag == "11bdc430-65e8-45ad-81d9-8ffa60d55b59"
+    assert result[1].id == 2
+    assert result[1].name == "User2"
+    assert result[1].etag == "11bdc430-65e8-45ad-81d9-8ffa60d55b59"

package/generator/test/azure/mock_api_tests/test_clear_output_folder.py

@@ -12,3 +12,12 @@ def test_clear_output_folder():
     folder = GENERATED_PATH / "authentication-api-key/authentication/apikey/_operations"
     assert folder.exists(), "Operations folder should exist"
     assert not (folder / "to_be_deleted.py").exists(), "File to_be_deleted.py should be deleted after regeneration"
+
+    if (GENERATED_PATH / "generation-subdir").exists():
+        assert (GENERATED_PATH / "generation-subdir/generated_tests").exists()
+        assert not (GENERATED_PATH / "generation-subdir/generated_tests/to_be_deleted.py").exists()
+
+        assert (GENERATED_PATH / "generation-subdir/generation/subdir/_generated").exists()
+        assert not (GENERATED_PATH / "generation-subdir/generation/subdir/_generated/to_be_deleted.py").exists()
+
+        assert (GENERATED_PATH / "generation-subdir/generation/subdir/to_be_kept.py").exists()

package/generator/test/azure/mock_api_tests/test_special_words.py

@@ -56,3 +56,8 @@ def test_model_properties_dict_methods(client: SpecialWordsClient):
 
 def test_model_properties_with_list(client: SpecialWordsClient):
     client.model_properties.with_list(models.ModelWithList(list="ok"))
+
+
+def test_extensible_strings(client: SpecialWordsClient):
+    for enum_value in models.ExtensibleString:
+        assert enum_value == client.extensible_strings.put_extensible_string_value(body=enum_value)

package/generator/test/azure/requirements.txt

@@ -2,6 +2,7 @@
 -e ../../
 azure-mgmt-core==1.6.0
 
+# === common azure dependencies across repos ===
 # only for azure
 -e ./generated/azure-client-generator-core-access
 -e ./generated/azure-client-generator-core-api-version-header
@@ -55,8 +56,9 @@ azure-mgmt-core==1.6.0
 -e ./generated/resiliency-srv-driven1
 -e ./generated/resiliency-srv-driven2
 -e ./generated/service-multi-service
+# === end common azure dependencies across repos ===
 
-# common test case
+# === common test dependencies across repos ===
 -e ./generated/authentication-api-key
 -e ./generated/authentication-http-custom
 -e ./generated/authentication-noauth-union
@@ -121,3 +123,4 @@ azure-mgmt-core==1.6.0
 -e ./generated/versioning-renamedfrom
 -e ./generated/versioning-returntypechangedfrom
 -e ./generated/versioning-typechangedfrom
+# === end common test dependencies across repos ===

package/generator/test/generic_mock_api_tests/asynctests/test_authentication_async.py

@@ -9,7 +9,7 @@ from authentication.http.custom.aio import CustomClient
 from authentication.oauth2.aio import OAuth2Client
 from authentication.union.aio import UnionClient
 from setuppy.authentication.union.aio import UnionClient as SetuppyUnionClient
-
+from authentication.noauth.union.aio import UnionClient as NoauthUnionClient
 
 # Utilities functions
 
@@ -113,6 +113,18 @@ async def test_union_tokenvalid(oauth2_client, union_client_type):
     await client.valid_token(enforce_https=False)
 
 
+@pytest.mark.asyncio
+async def test_noauth_union_valid_no_auth():
+    client = NoauthUnionClient()
+    await client.valid_no_auth()
+
+
+@pytest.mark.asyncio
+async def test_noauth_union_valid_token(oauth2_client):
+    client = oauth2_client(NoauthUnionClient)
+    await client.valid_token(enforce_https=False)
+
+
 @pytest.mark.asyncio
 async def test_http_custom_valid(http_custom_client):
     client = http_custom_client()

package/generator/test/generic_mock_api_tests/asynctests/test_encode_bytes_async.py

@@ -13,7 +13,6 @@ from encode.bytes.models import (
     Base64urlArrayBytesProperty,
 )
 
-
 FILE_FOLDER = Path(__file__).parent.parent
 
 
@@ -98,6 +97,12 @@ async def test_header(client: BytesClient):
     )
 
 
+@pytest.fixture
+def png_data() -> bytes:
+    with open(str(FILE_FOLDER / "data/image.png"), "rb") as file_in:
+        return file_in.read()
+
+
 @pytest.mark.asyncio
 async def test_request_body(client: BytesClient, png_data: bytes):
     await client.request_body.default(

package/generator/test/generic_mock_api_tests/asynctests/test_payload_xml_async.py

@@ -3,6 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
+import datetime
 import pytest
 from payload.xml.aio import XmlClient
 from payload.xml.models import (
@@ -18,6 +19,8 @@ from payload.xml.models import (
     ModelWithText,
     ModelWithDictionary,
     ModelWithEncodedNames,
+    ModelWithEnum,
+    ModelWithDatetime,
 )
 
 
@@ -119,6 +122,24 @@ async def test_model_with_encoded_names(client: XmlClient):
     await client.model_with_encoded_names_value.put(model)
 
 
+@pytest.mark.asyncio
+async def test_model_with_enum(client: XmlClient):
+    model = ModelWithEnum(status="success")
+    assert await client.model_with_enum_value.get() == model
+    await client.model_with_enum_value.put(model)
+
+
+@pytest.mark.asyncio
+async def test_model_with_datetime(client: XmlClient):
+    model = ModelWithDatetime(
+        rfc3339=datetime.datetime(2022, 8, 26, 18, 38, 0, tzinfo=datetime.timezone.utc),
+        rfc7231=datetime.datetime(2022, 8, 26, 14, 38, 0, tzinfo=datetime.timezone.utc),
+    )
+    result = await client.model_with_datetime_value.get()
+    assert result.rfc3339 == model.rfc3339
+    assert result.rfc7231 == model.rfc7231
+
+
 @pytest.mark.asyncio
 async def test_xml_error_value(client: XmlClient, core_library):
     with pytest.raises(core_library.exceptions.HttpResponseError) as ex:

package/generator/test/generic_mock_api_tests/test_authentication.py

@@ -8,9 +8,9 @@ from authentication.apikey import ApiKeyClient
 from authentication.oauth2 import OAuth2Client
 from authentication.union import UnionClient
 from setuppy.authentication.union import UnionClient as SetuppyUnionClient
+from authentication.noauth.union import UnionClient as NoauthUnionClient
 from authentication.http.custom import CustomClient
 
-
 # Utilities functions
 
 
@@ -107,6 +107,16 @@ def test_union_tokenvalid(oauth2_client, union_client_type):
     client.valid_token(enforce_https=False)
 
 
+def test_noauth_union_valid_no_auth():
+    client = NoauthUnionClient()
+    client.valid_no_auth()
+
+
+def test_noauth_union_valid_token(oauth2_client):
+    client = oauth2_client(NoauthUnionClient)
+    client.valid_token(enforce_https=False)
+
+
 def test_http_custom_valid(http_custom_client):
     client = http_custom_client()
     client.valid()

package/generator/test/generic_mock_api_tests/test_encode_bytes.py

@@ -95,6 +95,12 @@ def test_header(client: BytesClient):
     )
 
 
+@pytest.fixture
+def png_data() -> bytes:
+    with open(str(FILE_FOLDER / "data/image.png"), "rb") as file_in:
+        return file_in.read()
+
+
 def test_request_body(client: BytesClient, png_data: bytes):
     client.request_body.default(
         value=png_data,

package/generator/test/generic_mock_api_tests/test_payload_xml.py

@@ -3,6 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
+import datetime
 import pytest
 from payload.xml import XmlClient
 from payload.xml.models import (
@@ -18,6 +19,8 @@ from payload.xml.models import (
     ModelWithText,
     ModelWithDictionary,
     ModelWithEncodedNames,
+    ModelWithEnum,
+    ModelWithDatetime,
 )
 
 
@@ -107,6 +110,22 @@ def test_model_with_encoded_names(client: XmlClient):
     client.model_with_encoded_names_value.put(model)
 
 
+def test_model_with_enum(client: XmlClient):
+    model = ModelWithEnum(status="success")
+    assert client.model_with_enum_value.get() == model
+    client.model_with_enum_value.put(model)
+
+
+def test_model_with_datetime(client: XmlClient):
+    model = ModelWithDatetime(
+        rfc3339=datetime.datetime(2022, 8, 26, 18, 38, 0, tzinfo=datetime.timezone.utc),
+        rfc7231=datetime.datetime(2022, 8, 26, 14, 38, 0, tzinfo=datetime.timezone.utc),
+    )
+    result = client.model_with_datetime_value.get()
+    assert result.rfc3339 == model.rfc3339
+    assert result.rfc7231 == model.rfc7231
+
+
 def test_xml_error_value(client: XmlClient, core_library):
     with pytest.raises(core_library.exceptions.HttpResponseError) as ex:
         client.xml_error_value.get()

package/generator/test/unbranded/mock_api_tests/asynctests/test_special_words_async.py

@@ -7,6 +7,7 @@ import pytest
 from specialwords.aio import SpecialWordsClient
 from specialwords.models import models
 from specialwords.modelproperties import models as model_properties_models
+from specialwords.extensiblestrings import models as extensible_strings_models
 
 
 @pytest.fixture
@@ -64,3 +65,9 @@ async def test_model_properties_dict_methods(client: SpecialWordsClient):
 @pytest.mark.asyncio
 async def test_model_properties_with_list(client: SpecialWordsClient):
     await client.model_properties.with_list(model_properties_models.ModelWithList(list="ok"))
+
+
+@pytest.mark.asyncio
+async def test_extensible_strings(client: SpecialWordsClient):
+    for enum_value in extensible_strings_models.ExtensibleString:
+        assert enum_value == await client.extensible_strings.put_extensible_string_value(body=enum_value)

package/generator/test/unbranded/mock_api_tests/test_special_words.py

@@ -7,6 +7,7 @@ import pytest
 from specialwords import SpecialWordsClient
 from specialwords.models import models
 from specialwords.modelproperties import models as model_properties_models
+from specialwords.extensiblestrings import models as extensible_strings_models
 
 
 @pytest.fixture
@@ -58,3 +59,8 @@ def test_model_properties_dict_methods(client: SpecialWordsClient):
 
 def test_model_properties_with_list(client: SpecialWordsClient):
     client.model_properties.with_list(model_properties_models.ModelWithList(list="ok"))
+
+
+def test_extensible_strings(client: SpecialWordsClient):
+    for enum_value in extensible_strings_models.ExtensibleString:
+        assert enum_value == client.extensible_strings.put_extensible_string_value(body=enum_value)

package/generator/test/unbranded/mock_api_tests/test_unbranded.py

@@ -54,11 +54,12 @@ def test_sensitive_word():
     check_folder = (Path(os.path.dirname(__file__)) / "../generated").resolve()
     assert [] == check_sensitive_word(check_folder, "azure")
     # after update spector, it shall also equal to []
-    assert sorted(
-        [
-            "authentication-oauth2",
-            "authentication-noauth-union",
-            "authentication-union",
-            "setuppy-authentication-union",
-        ]
-    ) == sorted(check_sensitive_word(check_folder, "microsoft"))
+    expected = [
+        "authentication-oauth2",
+        "authentication-noauth-union",
+        "authentication-union",
+        "setuppy-authentication-union",
+    ]
+    if (check_folder / "generation-subdir").exists():
+        expected.append("generation-subdir")
+    assert sorted(expected) == sorted(check_sensitive_word(check_folder, "microsoft"))

package/generator/test/unbranded/requirements.txt

@@ -1,7 +1,7 @@
 -r ../dev_requirements.txt
 -e ../../
 
-# common test case
+# === common test dependencies across repos ===
 -e ./generated/authentication-api-key
 -e ./generated/authentication-http-custom
 -e ./generated/authentication-noauth-union
@@ -66,3 +66,4 @@
 -e ./generated/versioning-renamedfrom
 -e ./generated/versioning-returntypechangedfrom
 -e ./generated/versioning-typechangedfrom
+# === end common test dependencies across repos ===

package/generator/test/unittests/test_enums.py

@@ -4,6 +4,7 @@
 # license information.
 # --------------------------------------------------------------------------
 from enum import Enum, EnumMeta
+from specialwords.extensiblestrings import models as extensible_strings_models
 
 
 class _CaseInsensitiveEnumMeta(EnumMeta):
@@ -50,3 +51,39 @@ def test_find():
 def test_join():
     assert EnumsWithCallableNames.JOIN == "join"
     assert callable(EnumsWithCallableNames.join)
+
+
+def test_extensible_strings_enum_with_special_words():
+    assert extensible_strings_models.ExtensibleString.AND == "and"
+    assert extensible_strings_models.ExtensibleString.AS == "as"
+    assert extensible_strings_models.ExtensibleString.ASSERT == "assert"
+    assert extensible_strings_models.ExtensibleString.ASYNC == "async"
+    assert extensible_strings_models.ExtensibleString.AWAIT == "await"
+    assert extensible_strings_models.ExtensibleString.BREAK == "break"
+    assert extensible_strings_models.ExtensibleString.CLASS == "class"
+    assert extensible_strings_models.ExtensibleString.CONSTRUCTOR == "constructor"
+    assert extensible_strings_models.ExtensibleString.CONTINUE == "continue"
+    assert extensible_strings_models.ExtensibleString.DEF == "def"
+    assert extensible_strings_models.ExtensibleString.DEL == "del"
+    assert extensible_strings_models.ExtensibleString.ELIF == "elif"
+    assert extensible_strings_models.ExtensibleString.ELSE == "else"
+    assert extensible_strings_models.ExtensibleString.EXCEPT == "except"
+    assert extensible_strings_models.ExtensibleString.EXEC == "exec"
+    assert extensible_strings_models.ExtensibleString.FINALLY == "finally"
+    assert extensible_strings_models.ExtensibleString.FOR == "for"
+    assert extensible_strings_models.ExtensibleString.FROM == "from"
+    assert extensible_strings_models.ExtensibleString.GLOBAL == "global"
+    assert extensible_strings_models.ExtensibleString.IF == "if"
+    assert extensible_strings_models.ExtensibleString.IMPORT == "import"
+    assert extensible_strings_models.ExtensibleString.IN == "in"
+    assert extensible_strings_models.ExtensibleString.IS == "is"
+    assert extensible_strings_models.ExtensibleString.LAMBDA == "lambda"
+    assert extensible_strings_models.ExtensibleString.NOT == "not"
+    assert extensible_strings_models.ExtensibleString.OR == "or"
+    assert extensible_strings_models.ExtensibleString.PASS == "pass"
+    assert extensible_strings_models.ExtensibleString.RAISE == "raise"
+    assert extensible_strings_models.ExtensibleString.RETURN == "return"
+    assert extensible_strings_models.ExtensibleString.TRY == "try"
+    assert extensible_strings_models.ExtensibleString.WHILE == "while"
+    assert extensible_strings_models.ExtensibleString.WITH == "with"
+    assert extensible_strings_models.ExtensibleString.YIELD == "yield"