add x-ms-text

ChangeLog.md

@@ -12,6 +12,10 @@ Modelerfour version: 4.15.378
 Autorest Core version: 3.0.6287
 Modelerfour version: 4.15.378
 
+**New Features**
+
+- Add support for `x-ms-text` XML extension  #722
+
 **Bug Fixes**
 
 - Correctly have default behavior of csv for array query parameters when collection format is not specified in the swagger

README.md

@@ -28,7 +28,7 @@ AutoRest needs the below config to pick this up as a plug-in - see https://githu
 pass-thru:
   - model-deduplicator
   - subset-reducer
-version: 3.0.6287
+version: 3.0.6302
 use-extension:
   "@autorest/modelerfour": "4.15.378"
 

autorest/codegen/models/base_schema.py

@@ -46,6 +46,8 @@ def xml_serialization_ctxt(self) -> Optional[str]:
             attrs_list.append(f"'prefix': '{self.xml_metadata['prefix']}'")
         if self.xml_metadata.get("namespace", False):
             attrs_list.append(f"'ns': '{self.xml_metadata['namespace']}'")
+        if self.xml_metadata.get("extensions", {}).get("x-ms-text", False):
+            attrs_list.append(f"'text': True")
         return ", ".join(attrs_list)
 
     def imports(self) -> FileImport:  # pylint: disable=no-self-use

package.json

@@ -27,7 +27,7 @@
   },
   "devDependencies": {
     "@autorest/autorest": "^3.0.0",
-    "@microsoft.azure/autorest.testserver": "^2.10.53"
+    "@microsoft.azure/autorest.testserver": "^2.10.54"
   },
   "files": [
     "autorest/**/*.py",

test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/aio/operations_async/_duration_operations_async.py

@@ -92,7 +92,7 @@ async def put_positive_duration(
     ) -> None:
         """Put a positive duration value.
 
-        :param duration_body:
+        :param duration_body: duration body.
         :type duration_body: ~datetime.timedelta
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: None, or the result of cls(response)

test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/operations/_duration_operations.py

@@ -98,7 +98,7 @@ def put_positive_duration(
         # type: (...) -> None
         """Put a positive duration value.
 
-        :param duration_body:
+        :param duration_body: duration body.
         :type duration_body: ~datetime.timedelta
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: None, or the result of cls(response)

test/vanilla/AcceptanceTests/asynctests/test_xml.py

@@ -189,3 +189,9 @@ async def test_acls(self, client):
         assert len(acls) == 1
         assert acls[0].id == 'MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTI='
         await _assert_with_log(client.xml.put_acls, acls)
+
+    @pytest.mark.asyncio
+    async def test_xms_text(self, client):
+        xml_object = await client.xml.get_xms_text()
+        assert xml_object.language == "english"
+        assert xml_object.content == "I am text"

test/vanilla/AcceptanceTests/test_xml.py

@@ -183,3 +183,8 @@ def test_models(self):
         else:
             from xmlservice.models._models import Error as ErrorPy2
             assert Error == ErrorPy2
+
+    def test_xms_text(self, client):
+        xml_object = client.xml.get_xms_text()
+        assert xml_object.language == "english"
+        assert xml_object.content == "I am text"

test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/aio/operations_async/_date_operations_async.py

@@ -221,7 +221,7 @@ async def put_max_date(
     ) -> None:
         """Put max date value 9999-12-31.
 
-        :param date_body:
+        :param date_body: date body.
         :type date_body: ~datetime.date
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: None, or the result of cls(response)
@@ -312,7 +312,7 @@ async def put_min_date(
     ) -> None:
         """Put min date value 0000-01-01.
 
-        :param date_body:
+        :param date_body: date body.
         :type date_body: ~datetime.date
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: None, or the result of cls(response)

test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/operations/_date_operations.py

@@ -230,7 +230,7 @@ def put_max_date(
         # type: (...) -> None
         """Put max date value 9999-12-31.
 
-        :param date_body:
+        :param date_body: date body.
         :type date_body: ~datetime.date
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: None, or the result of cls(response)
@@ -323,7 +323,7 @@ def put_min_date(
         # type: (...) -> None
         """Put min date value 0000-01-01.
 
-        :param date_body:
+        :param date_body: date body.
         :type date_body: ~datetime.date
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: None, or the result of cls(response)

test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/aio/operations_async/_datetime_operations_async.py

@@ -221,7 +221,7 @@ async def put_utc_max_date_time(
     ) -> None:
         """Put max datetime value 9999-12-31T23:59:59.999Z.
 
-        :param datetime_body:
+        :param datetime_body: datetime body.
         :type datetime_body: ~datetime.datetime
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: None, or the result of cls(response)
@@ -272,7 +272,7 @@ async def put_utc_max_date_time7_digits(
         This is against the recommendation that asks for 3 digits, but allow to test what happens in
         that scenario.
 
-        :param datetime_body:
+        :param datetime_body: datetime body.
         :type datetime_body: ~datetime.datetime
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: None, or the result of cls(response)
@@ -452,7 +452,7 @@ async def put_local_positive_offset_max_date_time(
     ) -> None:
         """Put max datetime value with positive numoffset 9999-12-31t23:59:59.999+14:00.
 
-        :param datetime_body:
+        :param datetime_body: datetime body.
         :type datetime_body: ~datetime.datetime
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: None, or the result of cls(response)
@@ -586,7 +586,7 @@ async def put_local_negative_offset_max_date_time(
     ) -> None:
         """Put max datetime value with positive numoffset 9999-12-31t23:59:59.999-14:00.
 
-        :param datetime_body:
+        :param datetime_body: datetime body.
         :type datetime_body: ~datetime.datetime
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: None, or the result of cls(response)
@@ -720,7 +720,7 @@ async def put_utc_min_date_time(
     ) -> None:
         """Put min datetime value 0001-01-01T00:00:00Z.
 
-        :param datetime_body:
+        :param datetime_body: datetime body.
         :type datetime_body: ~datetime.datetime
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: None, or the result of cls(response)
@@ -811,7 +811,7 @@ async def put_local_positive_offset_min_date_time(
     ) -> None:
         """Put min datetime value 0001-01-01T00:00:00+14:00.
 
-        :param datetime_body:
+        :param datetime_body: datetime body.
         :type datetime_body: ~datetime.datetime
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: None, or the result of cls(response)
@@ -902,7 +902,7 @@ async def put_local_negative_offset_min_date_time(
     ) -> None:
         """Put min datetime value 0001-01-01T00:00:00-14:00.
 
-        :param datetime_body:
+        :param datetime_body: datetime body.
         :type datetime_body: ~datetime.datetime
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: None, or the result of cls(response)

test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/operations/_datetime_operations.py

@@ -230,7 +230,7 @@ def put_utc_max_date_time(
         # type: (...) -> None
         """Put max datetime value 9999-12-31T23:59:59.999Z.
 
-        :param datetime_body:
+        :param datetime_body: datetime body.
         :type datetime_body: ~datetime.datetime
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: None, or the result of cls(response)
@@ -282,7 +282,7 @@ def put_utc_max_date_time7_digits(
         This is against the recommendation that asks for 3 digits, but allow to test what happens in
         that scenario.
 
-        :param datetime_body:
+        :param datetime_body: datetime body.
         :type datetime_body: ~datetime.datetime
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: None, or the result of cls(response)
@@ -466,7 +466,7 @@ def put_local_positive_offset_max_date_time(
         # type: (...) -> None
         """Put max datetime value with positive numoffset 9999-12-31t23:59:59.999+14:00.
 
-        :param datetime_body:
+        :param datetime_body: datetime body.
         :type datetime_body: ~datetime.datetime
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: None, or the result of cls(response)
@@ -603,7 +603,7 @@ def put_local_negative_offset_max_date_time(
         # type: (...) -> None
         """Put max datetime value with positive numoffset 9999-12-31t23:59:59.999-14:00.
 
-        :param datetime_body:
+        :param datetime_body: datetime body.
         :type datetime_body: ~datetime.datetime
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: None, or the result of cls(response)
@@ -740,7 +740,7 @@ def put_utc_min_date_time(
         # type: (...) -> None
         """Put min datetime value 0001-01-01T00:00:00Z.
 
-        :param datetime_body:
+        :param datetime_body: datetime body.
         :type datetime_body: ~datetime.datetime
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: None, or the result of cls(response)
@@ -833,7 +833,7 @@ def put_local_positive_offset_min_date_time(
         # type: (...) -> None
         """Put min datetime value 0001-01-01T00:00:00+14:00.
 
-        :param datetime_body:
+        :param datetime_body: datetime body.
         :type datetime_body: ~datetime.datetime
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: None, or the result of cls(response)
@@ -926,7 +926,7 @@ def put_local_negative_offset_min_date_time(
         # type: (...) -> None
         """Put min datetime value 0001-01-01T00:00:00-14:00.
 
-        :param datetime_body:
+        :param datetime_body: datetime body.
         :type datetime_body: ~datetime.datetime
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: None, or the result of cls(response)

test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/aio/operations_async/_datetimerfc1123_operations_async.py

@@ -221,7 +221,7 @@ async def put_utc_max_date_time(
     ) -> None:
         """Put max datetime value Fri, 31 Dec 9999 23:59:59 GMT.
 
-        :param datetime_body:
+        :param datetime_body: datetime body.
         :type datetime_body: ~datetime.datetime
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: None, or the result of cls(response)
@@ -355,7 +355,7 @@ async def put_utc_min_date_time(
     ) -> None:
         """Put min datetime value Mon, 1 Jan 0001 00:00:00 GMT.
 
-        :param datetime_body:
+        :param datetime_body: datetime body.
         :type datetime_body: ~datetime.datetime
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: None, or the result of cls(response)

test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/operations/_datetimerfc1123_operations.py

@@ -230,7 +230,7 @@ def put_utc_max_date_time(
         # type: (...) -> None
         """Put max datetime value Fri, 31 Dec 9999 23:59:59 GMT.
 
-        :param datetime_body:
+        :param datetime_body: datetime body.
         :type datetime_body: ~datetime.datetime
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: None, or the result of cls(response)
@@ -367,7 +367,7 @@ def put_utc_min_date_time(
         # type: (...) -> None
         """Put min datetime value Mon, 1 Jan 0001 00:00:00 GMT.
 
-        :param datetime_body:
+        :param datetime_body: datetime body.
         :type datetime_body: ~datetime.datetime
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: None, or the result of cls(response)

test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/aio/operations_async/_duration_operations_async.py

@@ -92,7 +92,7 @@ async def put_positive_duration(
     ) -> None:
         """Put a positive duration value.
 
-        :param duration_body:
+        :param duration_body: duration body.
         :type duration_body: ~datetime.timedelta
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: None, or the result of cls(response)

test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/operations/_duration_operations.py

@@ -98,7 +98,7 @@ def put_positive_duration(
         # type: (...) -> None
         """Put a positive duration value.
 
-        :param duration_body:
+        :param duration_body: duration body.
         :type duration_body: ~datetime.timedelta
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: None, or the result of cls(response)

test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/aio/operations_async/_int_operations_async.py

@@ -307,7 +307,7 @@ async def put_max32(
     ) -> None:
         """Put max int32 value.
 
-        :param int_body:
+        :param int_body: int body.
         :type int_body: int
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: None, or the result of cls(response)
@@ -355,7 +355,7 @@ async def put_max64(
     ) -> None:
         """Put max int64 value.
 
-        :param int_body:
+        :param int_body: int body.
         :type int_body: long
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: None, or the result of cls(response)
@@ -403,7 +403,7 @@ async def put_min32(
     ) -> None:
         """Put min int32 value.
 
-        :param int_body:
+        :param int_body: int body.
         :type int_body: int
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: None, or the result of cls(response)
@@ -451,7 +451,7 @@ async def put_min64(
     ) -> None:
         """Put min int64 value.
 
-        :param int_body:
+        :param int_body: int body.
         :type int_body: long
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: None, or the result of cls(response)
@@ -542,7 +542,7 @@ async def put_unix_time_date(
     ) -> None:
         """Put datetime encoded as Unix time.
 
-        :param int_body:
+        :param int_body: int body.
         :type int_body: ~datetime.datetime
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: None, or the result of cls(response)

test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/operations/_int_operations.py

@@ -318,7 +318,7 @@ def put_max32(
         # type: (...) -> None
         """Put max int32 value.
 
-        :param int_body:
+        :param int_body: int body.
         :type int_body: int
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: None, or the result of cls(response)
@@ -367,7 +367,7 @@ def put_max64(
         # type: (...) -> None
         """Put max int64 value.
 
-        :param int_body:
+        :param int_body: int body.
         :type int_body: long
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: None, or the result of cls(response)
@@ -416,7 +416,7 @@ def put_min32(
         # type: (...) -> None
         """Put min int32 value.
 
-        :param int_body:
+        :param int_body: int body.
         :type int_body: int
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: None, or the result of cls(response)
@@ -465,7 +465,7 @@ def put_min64(
         # type: (...) -> None
         """Put min int64 value.
 
-        :param int_body:
+        :param int_body: int body.
         :type int_body: long
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: None, or the result of cls(response)
@@ -558,7 +558,7 @@ def put_unix_time_date(
         # type: (...) -> None
         """Put datetime encoded as Unix time.
 
-        :param int_body:
+        :param int_body: int body.
         :type int_body: ~datetime.datetime
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: None, or the result of cls(response)

test/vanilla/Expected/AcceptanceTests/Validation/validation/aio/operations_async/_auto_rest_validation_test_operations_async.py

@@ -47,7 +47,7 @@ async def validation_of_method_parameters(
         url = self.validation_of_method_parameters.metadata['url']  # type: ignore
         path_format_arguments = {
             'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
-            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=10, min_length=3, pattern=r'[a-zA-Z0-9]+'),
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=10, min_length=3, pattern=r'[a-zA-Z0-9']+'),
             'id': self._serialize.url("id", id, 'int', maximum=1000, minimum=100, multiple=10),
         }
         url = self._client.format_url(url, **path_format_arguments)

test/vanilla/Expected/AcceptanceTests/Validation/validation/operations/_auto_rest_validation_test_operations.py

@@ -52,7 +52,7 @@ def validation_of_method_parameters(
         url = self.validation_of_method_parameters.metadata['url']  # type: ignore
         path_format_arguments = {
             'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
-            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=10, min_length=3, pattern=r'[a-zA-Z0-9]+'),
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=10, min_length=3, pattern=r'[a-zA-Z0-9']+'),
             'id': self._serialize.url("id", id, 'int', maximum=1000, minimum=100, multiple=10),
         }
         url = self._client.format_url(url, **path_format_arguments)