Skip to content

Commit 1a88218

Browse files
authored
regen with new deserialization diff (#3328)
1 parent 659ffcb commit 1a88218

File tree

204 files changed

+422
-408
lines changed
  • .chronus/changes
  • packages
    • autorest.python
    • typespec-python
      • test
        • azure/generated
          • authentication-api-key/authentication/apikey/_utils
          • authentication-http-custom/authentication/http/custom/_utils
          • authentication-noauth-union/authentication/noauth/union/_utils
          • authentication-oauth2/authentication/oauth2/_utils
          • authentication-union/authentication/union/_utils
          • azure-client-generator-core-access/specs/azure/clientgenerator/core/access/_utils
          • azure-client-generator-core-alternate-type/specs/azure/clientgenerator/core/alternatetype/_utils
          • azure-client-generator-core-api-version-header/client/alternateapiversion/service/header/_utils
          • azure-client-generator-core-api-version-path/client/alternateapiversion/service/path/_utils
          • azure-client-generator-core-api-version-query/client/alternateapiversion/service/query/_utils
          • azure-client-generator-core-client-default-value/specs/azure/clientgenerator/core/clientdefaultvalue/_utils
          • azure-client-generator-core-client-initialization/specs/azure/clientgenerator/core/clientinitialization/_utils
          • azure-client-generator-core-client-location-move-method-parameter-to-client/specs/azure/clientgenerator/core/clientlocation/parameter/_utils
          • azure-client-generator-core-client-location-move-to-existing-sub-client/specs/azure/clientgenerator/core/clientlocation/subclient/_utils
          • azure-client-generator-core-client-location-move-to-new-sub-client/specs/azure/clientgenerator/core/clientlocation/newsubclient/_utils
          • azure-client-generator-core-client-location-move-to-root-client/specs/azure/clientgenerator/core/clientlocation/rootclient/_utils
          • azure-client-generator-core-deserialize-empty-string-as-null/specs/azure/clientgenerator/core/emptystring/_utils
          • azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/_utils
          • azure-client-generator-core-hierarchy-building/specs/azure/clientgenerator/core/hierarchybuilding/_utils
          • azure-client-generator-core-override/specs/azure/clientgenerator/core/override/_utils
          • azure-client-generator-core-usage/specs/azure/clientgenerator/core/usage/_utils
          • azure-core-basic/specs/azure/core/basic/_utils
          • azure-core-lro-rpc/specs/azure/core/lro/rpc/_utils
          • azure-core-lro-standard/specs/azure/core/lro/standard/_utils
          • azure-core-model/specs/azure/core/model/_utils
          • azure-core-page/specs/azure/core/page/_utils
          • azure-core-scalar/specs/azure/core/scalar/_utils
          • azure-core-traits/specs/azure/core/traits/_utils
          • azure-encode-duration/specs/azure/encode/duration/_utils
          • azure-example-basic/specs/azure/example/basic/_utils
          • azure-payload-pageable/specs/azure/payload/pageable/_utils
          • azure-resource-manager-common-properties/azure/resourcemanager/commonproperties/_utils
          • azure-resource-manager-large-header/azure/resourcemanager/largeheader/_utils
          • azure-resource-manager-method-subscription-id/azure/resourcemanager/methodsubscriptionid/_utils
          • azure-resource-manager-multi-service-older-versions/azure/resourcemanager/multiserviceolderversions/combined/_utils
          • azure-resource-manager-multi-service-shared-models/azure/resourcemanager/multiservicesharedmodels/combined/_utils
          • azure-resource-manager-multi-service/azure/resourcemanager/multiservice/combined/_utils
          • azure-resource-manager-non-resource/azure/resourcemanager/nonresource/_utils
          • azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/_utils
          • azure-resource-manager-resources/azure/resourcemanager/resources/_utils
          • azure-special-headers-client-request-id/azure/specialheaders/xmsclientrequestid/_utils
          • azure-versioning-previewversion/specs/azure/versioning/previewversion/_utils
          • client-namespace
          • client-naming-enum-conflict/client/naming/enumconflict/_utils
          • client-naming/client/naming/main/_utils
          • client-overload/client/overload/_utils
          • client-structure-clientoperationgroup/client/structure/clientoperationgroup/_utils
          • client-structure-default/client/structure/service/_utils
          • client-structure-multiclient/client/structure/multiclient/_utils
          • client-structure-renamedoperation/client/structure/renamedoperation/_utils
          • client-structure-twooperationgroup/client/structure/twooperationgroup/_utils
          • encode-array/encode/array/_utils
          • encode-bytes
          • encode-datetime/encode/datetime/_utils
          • encode-duration/encode/duration/_utils
          • encode-numeric/encode/numeric/_utils
          • generation-subdir/generation/subdir/_generated/_utils
          • headasbooleanfalse/headasbooleanfalse/_utils
          • headasbooleantrue/headasbooleantrue/_utils
          • parameters-basic/parameters/basic/_utils
          • parameters-body-optionality/parameters/bodyoptionality/_utils
          • parameters-collection-format/parameters/collectionformat/_utils
          • parameters-path/parameters/path/_utils
          • parameters-query/parameters/query/_utils
          • parameters-spread/parameters/spread/_utils
          • payload-content-negotiation/payload/contentnegotiation/_utils
          • payload-json-merge-patch/payload/jsonmergepatch/_utils
          • payload-media-type/payload/mediatype/_utils
          • payload-multipart/payload/multipart/_utils
          • payload-pageable/payload/pageable/_utils
          • payload-xml/payload/xml/_utils
          • resiliency-srv-driven1/resiliency/srv/driven1/_utils
          • resiliency-srv-driven2/resiliency/srv/driven2/_utils
          • response-status-code-range/response/statuscoderange/_utils
          • routes/routes/_utils
          • serialization-encoded-name-json/serialization/encodedname/json/_utils
          • server-endpoint-not-defined/server/endpoint/notdefined/_utils
          • server-path-multiple
          • server-path-single/server/path/single/_utils
          • server-versions-not-versioned/server/versions/notversioned/_utils
          • server-versions-versioned/server/versions/versioned/_utils
          • service-multi-service/service/multiservice/_utils
          • setuppy-authentication-union/setuppy/authentication/union/_utils
          • special-headers-conditional-request/specialheaders/conditionalrequest/_utils
          • special-headers-repeatability/specialheaders/repeatability/_utils
          • special-words/specialwords/_utils
          • specs-documentation/specs/documentation/_utils
          • streaming-jsonl/streaming/jsonl/_utils
          • typetest-array/typetest/array/_utils
          • typetest-dictionary/typetest/dictionary/_utils
          • typetest-discriminatedunion/typetest/discriminatedunion/_utils
          • typetest-enum-extensible/typetest/enum/extensible/_utils
          • typetest-enum-fixed/typetest/enum/fixed/_utils
          • typetest-model-empty/typetest/model/empty/_utils
          • typetest-model-enumdiscriminator/typetest/model/enumdiscriminator/_utils
          • typetest-model-nesteddiscriminator/typetest/model/nesteddiscriminator/_utils
          • typetest-model-notdiscriminated/typetest/model/notdiscriminated/_utils
          • typetest-model-recursive/typetest/model/recursive/_utils
          • typetest-model-singlediscriminator/typetest/model/singlediscriminator/_utils
          • typetest-model-usage/typetest/model/usage/_utils
          • typetest-model-visibility/typetest/model/visibility/_utils
          • typetest-property-additionalproperties/typetest/property/additionalproperties/_utils
          • typetest-property-nullable/typetest/property/nullable/_utils
          • typetest-property-optional/typetest/property/optional/_utils
          • typetest-property-valuetypes/typetest/property/valuetypes/_utils
          • typetest-scalar/typetest/scalar/_utils
          • typetest-union/typetest/union/_utils
          • versioning-added/versioning/added/_utils
          • versioning-madeoptional/versioning/madeoptional/_utils
          • versioning-removed/versioning/removed/_utils
          • versioning-renamedfrom/versioning/renamedfrom/_utils
          • versioning-returntypechangedfrom/versioning/returntypechangedfrom/_utils
          • versioning-typechangedfrom/versioning/typechangedfrom/_utils
        • unbranded/generated

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

204 files changed

+422
-408
lines changed
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
changeKind: fix
3+
packages:
4+
- "@autorest/python"
5+
- "@azure-tools/typespec-python"
6+
---
7+
8+
Catch all deserialization errors when deserializing error response models

packages/autorest.python/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
},
3030
"homepage": "https://github.com/Azure/autorest.python/blob/main/README.md",
3131
"dependencies": {
32-
"@typespec/http-client-python": "https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTgyNTIxNC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.26.2.tgz",
32+
"@typespec/http-client-python": "https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTgzMjcxMS9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.26.2.tgz",
3333
"@autorest/system-requirements": "~1.0.2",
3434
"fs-extra": "~11.2.0",
3535
"tsx": "~4.19.1"
@@ -47,4 +47,4 @@
4747
"requirements.txt",
4848
"generator/"
4949
]
50-
}
50+
}

packages/typespec-python/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"js-yaml": "~4.1.0",
6868
"semver": "~7.6.2",
6969
"tsx": "~4.19.1",
70-
"@typespec/http-client-python": "https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTgyNTIxNC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.26.2.tgz",
70+
"@typespec/http-client-python": "https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTgzMjcxMS9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.26.2.tgz",
7171
"fs-extra": "~11.2.0"
7272
},
7373
"devDependencies": {
@@ -103,4 +103,4 @@
103103
"chalk": "5.3.0",
104104
"@types/fs-extra": "11.0.4"
105105
}
106-
}
106+
}

packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/_utils/model_base.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1023,7 +1023,7 @@ def _failsafe_deserialize(
10231023
) -> typing.Any:
10241024
try:
10251025
return _deserialize(deserializer, response.json(), module, rf, format)
1026-
except DeserializationError:
1026+
except Exception: # pylint: disable=broad-except
10271027
_LOGGER.warning(
10281028
"Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True
10291029
)
@@ -1036,7 +1036,7 @@ def _failsafe_deserialize_xml(
10361036
) -> typing.Any:
10371037
try:
10381038
return _deserialize_xml(deserializer, response.text())
1039-
except DeserializationError:
1039+
except Exception: # pylint: disable=broad-except
10401040
_LOGGER.warning(
10411041
"Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True
10421042
)

packages/typespec-python/test/azure/generated/authentication-http-custom/authentication/http/custom/_utils/model_base.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1023,7 +1023,7 @@ def _failsafe_deserialize(
10231023
) -> typing.Any:
10241024
try:
10251025
return _deserialize(deserializer, response.json(), module, rf, format)
1026-
except DeserializationError:
1026+
except Exception: # pylint: disable=broad-except
10271027
_LOGGER.warning(
10281028
"Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True
10291029
)
@@ -1036,7 +1036,7 @@ def _failsafe_deserialize_xml(
10361036
) -> typing.Any:
10371037
try:
10381038
return _deserialize_xml(deserializer, response.text())
1039-
except DeserializationError:
1039+
except Exception: # pylint: disable=broad-except
10401040
_LOGGER.warning(
10411041
"Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True
10421042
)

packages/typespec-python/test/azure/generated/authentication-noauth-union/authentication/noauth/union/_utils/model_base.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1023,7 +1023,7 @@ def _failsafe_deserialize(
10231023
) -> typing.Any:
10241024
try:
10251025
return _deserialize(deserializer, response.json(), module, rf, format)
1026-
except DeserializationError:
1026+
except Exception: # pylint: disable=broad-except
10271027
_LOGGER.warning(
10281028
"Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True
10291029
)
@@ -1036,7 +1036,7 @@ def _failsafe_deserialize_xml(
10361036
) -> typing.Any:
10371037
try:
10381038
return _deserialize_xml(deserializer, response.text())
1039-
except DeserializationError:
1039+
except Exception: # pylint: disable=broad-except
10401040
_LOGGER.warning(
10411041
"Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True
10421042
)

packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/_utils/model_base.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1023,7 +1023,7 @@ def _failsafe_deserialize(
10231023
) -> typing.Any:
10241024
try:
10251025
return _deserialize(deserializer, response.json(), module, rf, format)
1026-
except DeserializationError:
1026+
except Exception: # pylint: disable=broad-except
10271027
_LOGGER.warning(
10281028
"Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True
10291029
)
@@ -1036,7 +1036,7 @@ def _failsafe_deserialize_xml(
10361036
) -> typing.Any:
10371037
try:
10381038
return _deserialize_xml(deserializer, response.text())
1039-
except DeserializationError:
1039+
except Exception: # pylint: disable=broad-except
10401040
_LOGGER.warning(
10411041
"Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True
10421042
)

packages/typespec-python/test/azure/generated/authentication-union/authentication/union/_utils/model_base.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1023,7 +1023,7 @@ def _failsafe_deserialize(
10231023
) -> typing.Any:
10241024
try:
10251025
return _deserialize(deserializer, response.json(), module, rf, format)
1026-
except DeserializationError:
1026+
except Exception: # pylint: disable=broad-except
10271027
_LOGGER.warning(
10281028
"Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True
10291029
)
@@ -1036,7 +1036,7 @@ def _failsafe_deserialize_xml(
10361036
) -> typing.Any:
10371037
try:
10381038
return _deserialize_xml(deserializer, response.text())
1039-
except DeserializationError:
1039+
except Exception: # pylint: disable=broad-except
10401040
_LOGGER.warning(
10411041
"Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True
10421042
)

packages/typespec-python/test/azure/generated/azure-client-generator-core-access/specs/azure/clientgenerator/core/access/_utils/model_base.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1023,7 +1023,7 @@ def _failsafe_deserialize(
10231023
) -> typing.Any:
10241024
try:
10251025
return _deserialize(deserializer, response.json(), module, rf, format)
1026-
except DeserializationError:
1026+
except Exception: # pylint: disable=broad-except
10271027
_LOGGER.warning(
10281028
"Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True
10291029
)
@@ -1036,7 +1036,7 @@ def _failsafe_deserialize_xml(
10361036
) -> typing.Any:
10371037
try:
10381038
return _deserialize_xml(deserializer, response.text())
1039-
except DeserializationError:
1039+
except Exception: # pylint: disable=broad-except
10401040
_LOGGER.warning(
10411041
"Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True
10421042
)

packages/typespec-python/test/azure/generated/azure-client-generator-core-alternate-type/specs/azure/clientgenerator/core/alternatetype/_utils/model_base.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,7 +1037,7 @@ def _failsafe_deserialize(
10371037
) -> typing.Any:
10381038
try:
10391039
return _deserialize(deserializer, response.json(), module, rf, format)
1040-
except DeserializationError:
1040+
except Exception: # pylint: disable=broad-except
10411041
_LOGGER.warning(
10421042
"Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True
10431043
)
@@ -1050,7 +1050,7 @@ def _failsafe_deserialize_xml(
10501050
) -> typing.Any:
10511051
try:
10521052
return _deserialize_xml(deserializer, response.text())
1053-
except DeserializationError:
1053+
except Exception: # pylint: disable=broad-except
10541054
_LOGGER.warning(
10551055
"Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True
10561056
)

0 commit comments

Comments
 (0)