diff --git a/.chronus/changes/optimize-pipeline-for-complete-test-cases-2026-3-30-10-57-36.md b/.chronus/changes/optimize-pipeline-for-complete-test-cases-2026-3-30-10-57-36.md new file mode 100644 index 0000000000..a919188e1a --- /dev/null +++ b/.chronus/changes/optimize-pipeline-for-complete-test-cases-2026-3-30-10-57-36.md @@ -0,0 +1,8 @@ +--- +changeKind: internal +packages: + - "@autorest/python" + - "@azure-tools/typespec-python" +--- + +add baseline of generated code before regenerate to contain necessary customized code for some specific test cases diff --git a/.chronus/changes/python-fix-paging-list-typing-2026-4-28-5-36-18.md b/.chronus/changes/python-fix-paging-list-typing-2026-4-28-5-36-18.md new file mode 100644 index 0000000000..069905bbfe --- /dev/null +++ b/.chronus/changes/python-fix-paging-list-typing-2026-4-28-5-36-18.md @@ -0,0 +1,8 @@ +--- +changeKind: fix +packages: + - "@autorest/python" + - "@azure-tools/typespec-python" +--- + +Fix typing in generated paging operations when an operation is named `list` and the page item is a collection type. The return type annotation now correctly uses the `List` alias (e.g. `AsyncItemPaged[List[str]]`) instead of the built-in `list` (which would shadow the operation name) to stay consistent with other annotations in the same file. diff --git a/packages/autorest.python/package.json b/packages/autorest.python/package.json index b7f259c887..7cf451e689 100644 --- a/packages/autorest.python/package.json +++ b/packages/autorest.python/package.json @@ -29,7 +29,7 @@ }, "homepage": "https://github.com/Azure/autorest.python/blob/main/README.md", "dependencies": { - "@typespec/http-client-python": "https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNjI0NjE0NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.28.3.tgz", + "@typespec/http-client-python": "https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNjI3ODE4NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.28.3.tgz", "@autorest/system-requirements": "~1.0.2", "fs-extra": "~11.2.0", "tsx": "^4.21.0" diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/aio/operations/_paging_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/aio/operations/_paging_operations.py index 8f07bdbf87..5a3c143731 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/aio/operations/_paging_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/aio/operations/_paging_operations.py @@ -89,7 +89,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get_no_item_name_pages(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def get_no_item_name_pages(self, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation that must return result of the default 'value' node. :return: An iterator like instance of either Product or the result of cls(response) @@ -163,7 +163,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def get_empty_next_link_name_pages(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def get_empty_next_link_name_pages(self, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation that gets an empty next link and should stop after page 1. :return: An iterator like instance of either Product or the result of cls(response) @@ -237,7 +237,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def get_null_next_link_name_pages(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def get_null_next_link_name_pages(self, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation that must ignore any kind of nextLink, and stop after page 1. :return: An iterator like instance of either Product or the result of cls(response) @@ -311,7 +311,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def get_single_pages(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def get_single_pages(self, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation that finishes on the first call without a nextlink. :return: An iterator like instance of either Product or the result of cls(response) @@ -387,7 +387,7 @@ async def get_next(next_link=None): @distributed_trace def get_single_pages_with_body_params( self, name: Optional[str] = None, **kwargs: Any - ) -> AsyncItemPaged["_models.Product"]: + ) -> AsyncItemPaged[_models.Product]: """A paging operation that finishes on the first call with body params without a nextlink. :param name: Default value is None. @@ -468,7 +468,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def first_response_empty(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def first_response_empty(self, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation whose first response's items list is empty, but still returns a next link. Second (and final) call, will give you an items list of 1. @@ -548,7 +548,7 @@ def get_multiple_pages( client_request_id: Optional[str] = None, paging_get_multiple_pages_options: Optional[_models.PagingGetMultiplePagesOptions] = None, **kwargs: Any - ) -> AsyncItemPaged["_models.Product"]: + ) -> AsyncItemPaged[_models.Product]: """A paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -635,7 +635,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def get_with_query_params(self, required_query_parameter: int, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def get_with_query_params(self, required_query_parameter: int, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation that includes a next operation. It has a different query parameter from it's next operation nextOperationWithQueryParams. Returns a ProductResult. @@ -707,7 +707,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def duplicate_params(self, filter: Optional[str] = None, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def duplicate_params(self, filter: Optional[str] = None, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """Define ``filter`` as a query param for all calls. However, the returned next link will also include the ``filter`` as part of it. Make sure you don't end up duplicating the ``filter`` param in the url sent. @@ -788,7 +788,7 @@ async def get_next(next_link=None): @distributed_trace def page_with_max_page_size( self, maxpagesize: Literal["5"] = "5", **kwargs: Any - ) -> AsyncItemPaged["_models.Product"]: + ) -> AsyncItemPaged[_models.Product]: """Paging with max page size. We don't want to. :param maxpagesize: Max page size query param. Don't send. Known values are "5" and None. @@ -871,7 +871,7 @@ def get_odata_multiple_pages( client_request_id: Optional[str] = None, paging_get_odata_multiple_pages_options: Optional[_models.PagingGetOdataMultiplePagesOptions] = None, **kwargs: Any - ) -> AsyncItemPaged["_models.Product"]: + ) -> AsyncItemPaged[_models.Product]: """A paging operation that includes a nextLink in odata format that has 10 pages. :param client_request_id: Default value is None. @@ -963,7 +963,7 @@ def get_multiple_pages_with_offset( paging_get_multiple_pages_with_offset_options: _models.PagingGetMultiplePagesWithOffsetOptions, client_request_id: Optional[str] = None, **kwargs: Any - ) -> AsyncItemPaged["_models.Product"]: + ) -> AsyncItemPaged[_models.Product]: """A paging operation that includes a nextLink that has 10 pages. :param paging_get_multiple_pages_with_offset_options: Parameter group. Required. @@ -1053,7 +1053,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def get_multiple_pages_retry_first(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def get_multiple_pages_retry_first(self, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation that fails on the first call with 500 and then retries and then get a response including a nextLink that has 10 pages. @@ -1128,7 +1128,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def get_multiple_pages_retry_second(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def get_multiple_pages_retry_second(self, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually. @@ -1203,7 +1203,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def get_single_pages_failure(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def get_single_pages_failure(self, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation that receives a 400 on the first call. :return: An iterator like instance of either Product or the result of cls(response) @@ -1277,7 +1277,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def get_multiple_pages_failure(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def get_multiple_pages_failure(self, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation that receives a 400 on the second call. :return: An iterator like instance of either Product or the result of cls(response) @@ -1351,7 +1351,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def get_multiple_pages_failure_uri(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def get_multiple_pages_failure_uri(self, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation that receives an invalid nextLink. :return: An iterator like instance of either Product or the result of cls(response) @@ -1427,7 +1427,7 @@ async def get_next(next_link=None): @distributed_trace def get_multiple_pages_fragment_next_link( self, api_version: str, tenant: str, **kwargs: Any - ) -> AsyncItemPaged["_models.Product"]: + ) -> AsyncItemPaged[_models.Product]: """A paging operation that doesn't return a full URL, just a fragment. :param api_version: Sets the api version to use. Required. @@ -1502,7 +1502,7 @@ async def get_next(next_link=None): @distributed_trace def get_multiple_pages_fragment_with_grouping_next_link( # pylint: disable=name-too-long self, custom_parameter_group: _models.CustomParameterGroup, **kwargs: Any - ) -> AsyncItemPaged["_models.Product"]: + ) -> AsyncItemPaged[_models.Product]: """A paging operation that doesn't return a full URL, just a fragment with parameters grouped. :param custom_parameter_group: Parameter group. Required. @@ -1645,7 +1645,7 @@ async def begin_get_multiple_pages_lro( client_request_id: Optional[str] = None, paging_get_multiple_pages_lro_options: Optional[_models.PagingGetMultiplePagesLroOptions] = None, **kwargs: Any - ) -> AsyncCustomPoller[AsyncItemPaged["_models.Product"]]: + ) -> AsyncCustomPoller[AsyncItemPaged[_models.Product]]: """A long-running paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -1762,18 +1762,18 @@ async def internal_get_next(next_link=None): else: polling_method = polling if cont_token: - return AsyncCustomPoller[AsyncItemPaged["_models.Product"]].from_continuation_token( + return AsyncCustomPoller[AsyncItemPaged[_models.Product]].from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, deserialization_callback=get_long_running_output, ) - return AsyncCustomPoller[AsyncItemPaged["_models.Product"]]( + return AsyncCustomPoller[AsyncItemPaged[_models.Product]]( self._client, raw_result, get_long_running_output, polling_method # type: ignore ) @distributed_trace - def append_api_version(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def append_api_version(self, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation with api version. When calling the next link, you want to append your client's api version to the next link. @@ -1850,7 +1850,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def replace_api_version(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def replace_api_version(self, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation with api version. When calling the next link, you want to reformat it and override the returned api version with your client's api version. @@ -1929,7 +1929,7 @@ async def get_next(next_link=None): @distributed_trace def get_paging_model_with_item_name_with_xms_client_name( # pylint: disable=name-too-long self, **kwargs: Any - ) -> AsyncItemPaged["_models.Product"]: + ) -> AsyncItemPaged[_models.Product]: """A paging operation that returns a paging model whose item name is is overriden by x-ms-client-name 'indexes'. diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/operations/_paging_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/operations/_paging_operations.py index 2900224a13..a01d2028d3 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/operations/_paging_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/operations/_paging_operations.py @@ -549,7 +549,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get_no_item_name_pages(self, **kwargs: Any) -> ItemPaged["_models.Product"]: + def get_no_item_name_pages(self, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation that must return result of the default 'value' node. :return: An iterator like instance of either Product or the result of cls(response) @@ -623,7 +623,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def get_empty_next_link_name_pages(self, **kwargs: Any) -> ItemPaged["_models.Product"]: + def get_empty_next_link_name_pages(self, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation that gets an empty next link and should stop after page 1. :return: An iterator like instance of either Product or the result of cls(response) @@ -697,7 +697,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def get_null_next_link_name_pages(self, **kwargs: Any) -> ItemPaged["_models.Product"]: + def get_null_next_link_name_pages(self, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation that must ignore any kind of nextLink, and stop after page 1. :return: An iterator like instance of either Product or the result of cls(response) @@ -771,7 +771,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def get_single_pages(self, **kwargs: Any) -> ItemPaged["_models.Product"]: + def get_single_pages(self, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation that finishes on the first call without a nextlink. :return: An iterator like instance of either Product or the result of cls(response) @@ -847,7 +847,7 @@ def get_next(next_link=None): @distributed_trace def get_single_pages_with_body_params( self, name: Optional[str] = None, **kwargs: Any - ) -> ItemPaged["_models.Product"]: + ) -> ItemPaged[_models.Product]: """A paging operation that finishes on the first call with body params without a nextlink. :param name: Default value is None. @@ -928,7 +928,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def first_response_empty(self, **kwargs: Any) -> ItemPaged["_models.Product"]: + def first_response_empty(self, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation whose first response's items list is empty, but still returns a next link. Second (and final) call, will give you an items list of 1. @@ -1008,7 +1008,7 @@ def get_multiple_pages( client_request_id: Optional[str] = None, paging_get_multiple_pages_options: Optional[_models.PagingGetMultiplePagesOptions] = None, **kwargs: Any, - ) -> ItemPaged["_models.Product"]: + ) -> ItemPaged[_models.Product]: """A paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -1095,7 +1095,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def get_with_query_params(self, required_query_parameter: int, **kwargs: Any) -> ItemPaged["_models.Product"]: + def get_with_query_params(self, required_query_parameter: int, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation that includes a next operation. It has a different query parameter from it's next operation nextOperationWithQueryParams. Returns a ProductResult. @@ -1167,7 +1167,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def duplicate_params(self, filter: Optional[str] = None, **kwargs: Any) -> ItemPaged["_models.Product"]: + def duplicate_params(self, filter: Optional[str] = None, **kwargs: Any) -> ItemPaged[_models.Product]: """Define ``filter`` as a query param for all calls. However, the returned next link will also include the ``filter`` as part of it. Make sure you don't end up duplicating the ``filter`` param in the url sent. @@ -1246,7 +1246,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def page_with_max_page_size(self, maxpagesize: Literal["5"] = "5", **kwargs: Any) -> ItemPaged["_models.Product"]: + def page_with_max_page_size(self, maxpagesize: Literal["5"] = "5", **kwargs: Any) -> ItemPaged[_models.Product]: """Paging with max page size. We don't want to. :param maxpagesize: Max page size query param. Don't send. Known values are "5" and None. @@ -1329,7 +1329,7 @@ def get_odata_multiple_pages( client_request_id: Optional[str] = None, paging_get_odata_multiple_pages_options: Optional[_models.PagingGetOdataMultiplePagesOptions] = None, **kwargs: Any, - ) -> ItemPaged["_models.Product"]: + ) -> ItemPaged[_models.Product]: """A paging operation that includes a nextLink in odata format that has 10 pages. :param client_request_id: Default value is None. @@ -1421,7 +1421,7 @@ def get_multiple_pages_with_offset( paging_get_multiple_pages_with_offset_options: _models.PagingGetMultiplePagesWithOffsetOptions, client_request_id: Optional[str] = None, **kwargs: Any, - ) -> ItemPaged["_models.Product"]: + ) -> ItemPaged[_models.Product]: """A paging operation that includes a nextLink that has 10 pages. :param paging_get_multiple_pages_with_offset_options: Parameter group. Required. @@ -1511,7 +1511,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def get_multiple_pages_retry_first(self, **kwargs: Any) -> ItemPaged["_models.Product"]: + def get_multiple_pages_retry_first(self, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation that fails on the first call with 500 and then retries and then get a response including a nextLink that has 10 pages. @@ -1586,7 +1586,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def get_multiple_pages_retry_second(self, **kwargs: Any) -> ItemPaged["_models.Product"]: + def get_multiple_pages_retry_second(self, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually. @@ -1661,7 +1661,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def get_single_pages_failure(self, **kwargs: Any) -> ItemPaged["_models.Product"]: + def get_single_pages_failure(self, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation that receives a 400 on the first call. :return: An iterator like instance of either Product or the result of cls(response) @@ -1735,7 +1735,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def get_multiple_pages_failure(self, **kwargs: Any) -> ItemPaged["_models.Product"]: + def get_multiple_pages_failure(self, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation that receives a 400 on the second call. :return: An iterator like instance of either Product or the result of cls(response) @@ -1809,7 +1809,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def get_multiple_pages_failure_uri(self, **kwargs: Any) -> ItemPaged["_models.Product"]: + def get_multiple_pages_failure_uri(self, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation that receives an invalid nextLink. :return: An iterator like instance of either Product or the result of cls(response) @@ -1885,7 +1885,7 @@ def get_next(next_link=None): @distributed_trace def get_multiple_pages_fragment_next_link( self, api_version: str, tenant: str, **kwargs: Any - ) -> ItemPaged["_models.Product"]: + ) -> ItemPaged[_models.Product]: """A paging operation that doesn't return a full URL, just a fragment. :param api_version: Sets the api version to use. Required. @@ -1960,7 +1960,7 @@ def get_next(next_link=None): @distributed_trace def get_multiple_pages_fragment_with_grouping_next_link( # pylint: disable=name-too-long self, custom_parameter_group: _models.CustomParameterGroup, **kwargs: Any - ) -> ItemPaged["_models.Product"]: + ) -> ItemPaged[_models.Product]: """A paging operation that doesn't return a full URL, just a fragment with parameters grouped. :param custom_parameter_group: Parameter group. Required. @@ -2103,7 +2103,7 @@ def begin_get_multiple_pages_lro( client_request_id: Optional[str] = None, paging_get_multiple_pages_lro_options: Optional[_models.PagingGetMultiplePagesLroOptions] = None, **kwargs: Any, - ) -> CustomPoller[ItemPaged["_models.Product"]]: + ) -> CustomPoller[ItemPaged[_models.Product]]: """A long-running paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -2220,18 +2220,18 @@ def internal_get_next(next_link=None): else: polling_method = polling if cont_token: - return CustomPoller[ItemPaged["_models.Product"]].from_continuation_token( + return CustomPoller[ItemPaged[_models.Product]].from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, deserialization_callback=get_long_running_output, ) - return CustomPoller[ItemPaged["_models.Product"]]( + return CustomPoller[ItemPaged[_models.Product]]( self._client, raw_result, get_long_running_output, polling_method # type: ignore ) @distributed_trace - def append_api_version(self, **kwargs: Any) -> ItemPaged["_models.Product"]: + def append_api_version(self, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation with api version. When calling the next link, you want to append your client's api version to the next link. @@ -2308,7 +2308,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def replace_api_version(self, **kwargs: Any) -> ItemPaged["_models.Product"]: + def replace_api_version(self, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation with api version. When calling the next link, you want to reformat it and override the returned api version with your client's api version. @@ -2387,7 +2387,7 @@ def get_next(next_link=None): @distributed_trace def get_paging_model_with_item_name_with_xms_client_name( # pylint: disable=name-too-long self, **kwargs: Any - ) -> ItemPaged["_models.Product"]: + ) -> ItemPaged[_models.Product]: """A paging operation that returns a paging model whose item name is is overriden by x-ms-client-name 'indexes'. diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/operations/_paging_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/operations/_paging_operations.py index 3c43ba5668..bcf45b66a6 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/operations/_paging_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/operations/_paging_operations.py @@ -57,7 +57,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get_pages_partial_url(self, account_name: str, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def get_pages_partial_url(self, account_name: str, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation that combines custom url, paging and partial URL and expect to concat after host. @@ -128,7 +128,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def get_pages_partial_url_operation(self, account_name: str, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def get_pages_partial_url_operation(self, account_name: str, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation that combines custom url, paging and partial URL with next operation. :param account_name: Account Name. Required. diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/operations/_paging_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/operations/_paging_operations.py index 92fd573b5f..2b4a3e0b21 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/operations/_paging_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/operations/_paging_operations.py @@ -105,7 +105,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get_pages_partial_url(self, account_name: str, **kwargs: Any) -> ItemPaged["_models.Product"]: + def get_pages_partial_url(self, account_name: str, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation that combines custom url, paging and partial URL and expect to concat after host. @@ -176,7 +176,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def get_pages_partial_url_operation(self, account_name: str, **kwargs: Any) -> ItemPaged["_models.Product"]: + def get_pages_partial_url_operation(self, account_name: str, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation that combines custom url, paging and partial URL with next operation. :param account_name: Account Name. Required. diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/paging/aio/operations/_paging_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/paging/aio/operations/_paging_operations.py index 830fdf4da0..8609697582 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/paging/aio/operations/_paging_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/paging/aio/operations/_paging_operations.py @@ -87,7 +87,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get_no_item_name_pages(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def get_no_item_name_pages(self, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation that must return result of the default 'value' node. :return: An iterator like instance of either Product or the result of cls(response) @@ -161,7 +161,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def get_empty_next_link_name_pages(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def get_empty_next_link_name_pages(self, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation that gets an empty next link and should stop after page 1. :return: An iterator like instance of either Product or the result of cls(response) @@ -235,7 +235,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def get_null_next_link_name_pages(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def get_null_next_link_name_pages(self, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation that must ignore any kind of nextLink, and stop after page 1. :return: An iterator like instance of either Product or the result of cls(response) @@ -309,7 +309,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def get_single_pages(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def get_single_pages(self, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation that finishes on the first call without a nextlink. :return: An iterator like instance of either Product or the result of cls(response) @@ -385,7 +385,7 @@ async def get_next(next_link=None): @distributed_trace def get_single_pages_with_body_params( self, name: Optional[str] = None, **kwargs: Any - ) -> AsyncItemPaged["_models.Product"]: + ) -> AsyncItemPaged[_models.Product]: """A paging operation that finishes on the first call with body params without a nextlink. :param name: Default value is None. @@ -466,7 +466,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def first_response_empty(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def first_response_empty(self, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation whose first response's items list is empty, but still returns a next link. Second (and final) call, will give you an items list of 1. @@ -546,7 +546,7 @@ def get_multiple_pages( client_request_id: Optional[str] = None, paging_get_multiple_pages_options: Optional[_models.PagingGetMultiplePagesOptions] = None, **kwargs: Any - ) -> AsyncItemPaged["_models.Product"]: + ) -> AsyncItemPaged[_models.Product]: """A paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -633,7 +633,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def get_with_query_params(self, required_query_parameter: int, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def get_with_query_params(self, required_query_parameter: int, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation that includes a next operation. It has a different query parameter from it's next operation nextOperationWithQueryParams. Returns a ProductResult. @@ -705,7 +705,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def duplicate_params(self, filter: Optional[str] = None, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def duplicate_params(self, filter: Optional[str] = None, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """Define ``filter`` as a query param for all calls. However, the returned next link will also include the ``filter`` as part of it. Make sure you don't end up duplicating the ``filter`` param in the url sent. @@ -786,7 +786,7 @@ async def get_next(next_link=None): @distributed_trace def page_with_max_page_size( self, maxpagesize: Literal["5"] = "5", **kwargs: Any - ) -> AsyncItemPaged["_models.Product"]: + ) -> AsyncItemPaged[_models.Product]: """Paging with max page size. We don't want to. :param maxpagesize: Max page size query param. Don't send. Known values are "5" and None. @@ -869,7 +869,7 @@ def get_odata_multiple_pages( client_request_id: Optional[str] = None, paging_get_odata_multiple_pages_options: Optional[_models.PagingGetOdataMultiplePagesOptions] = None, **kwargs: Any - ) -> AsyncItemPaged["_models.Product"]: + ) -> AsyncItemPaged[_models.Product]: """A paging operation that includes a nextLink in odata format that has 10 pages. :param client_request_id: Default value is None. @@ -961,7 +961,7 @@ def get_multiple_pages_with_offset( paging_get_multiple_pages_with_offset_options: _models.PagingGetMultiplePagesWithOffsetOptions, client_request_id: Optional[str] = None, **kwargs: Any - ) -> AsyncItemPaged["_models.Product"]: + ) -> AsyncItemPaged[_models.Product]: """A paging operation that includes a nextLink that has 10 pages. :param paging_get_multiple_pages_with_offset_options: Parameter group. Required. @@ -1051,7 +1051,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def get_multiple_pages_retry_first(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def get_multiple_pages_retry_first(self, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation that fails on the first call with 500 and then retries and then get a response including a nextLink that has 10 pages. @@ -1126,7 +1126,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def get_multiple_pages_retry_second(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def get_multiple_pages_retry_second(self, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually. @@ -1201,7 +1201,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def get_single_pages_failure(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def get_single_pages_failure(self, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation that receives a 400 on the first call. :return: An iterator like instance of either Product or the result of cls(response) @@ -1275,7 +1275,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def get_multiple_pages_failure(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def get_multiple_pages_failure(self, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation that receives a 400 on the second call. :return: An iterator like instance of either Product or the result of cls(response) @@ -1349,7 +1349,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def get_multiple_pages_failure_uri(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def get_multiple_pages_failure_uri(self, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation that receives an invalid nextLink. :return: An iterator like instance of either Product or the result of cls(response) @@ -1425,7 +1425,7 @@ async def get_next(next_link=None): @distributed_trace def get_multiple_pages_fragment_next_link( self, api_version: str, tenant: str, **kwargs: Any - ) -> AsyncItemPaged["_models.Product"]: + ) -> AsyncItemPaged[_models.Product]: """A paging operation that doesn't return a full URL, just a fragment. :param api_version: Sets the api version to use. Required. @@ -1500,7 +1500,7 @@ async def get_next(next_link=None): @distributed_trace def get_multiple_pages_fragment_with_grouping_next_link( # pylint: disable=name-too-long self, custom_parameter_group: _models.CustomParameterGroup, **kwargs: Any - ) -> AsyncItemPaged["_models.Product"]: + ) -> AsyncItemPaged[_models.Product]: """A paging operation that doesn't return a full URL, just a fragment with parameters grouped. :param custom_parameter_group: Parameter group. Required. @@ -1643,7 +1643,7 @@ async def begin_get_multiple_pages_lro( client_request_id: Optional[str] = None, paging_get_multiple_pages_lro_options: Optional[_models.PagingGetMultiplePagesLroOptions] = None, **kwargs: Any - ) -> AsyncLROPoller[AsyncItemPaged["_models.Product"]]: + ) -> AsyncLROPoller[AsyncItemPaged[_models.Product]]: """A long-running paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -1760,18 +1760,18 @@ async def internal_get_next(next_link=None): else: polling_method = polling if cont_token: - return AsyncLROPoller[AsyncItemPaged["_models.Product"]].from_continuation_token( + return AsyncLROPoller[AsyncItemPaged[_models.Product]].from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, deserialization_callback=get_long_running_output, ) - return AsyncLROPoller[AsyncItemPaged["_models.Product"]]( + return AsyncLROPoller[AsyncItemPaged[_models.Product]]( self._client, raw_result, get_long_running_output, polling_method # type: ignore ) @distributed_trace - def append_api_version(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def append_api_version(self, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation with api version. When calling the next link, you want to append your client's api version to the next link. @@ -1848,7 +1848,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def replace_api_version(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def replace_api_version(self, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation with api version. When calling the next link, you want to reformat it and override the returned api version with your client's api version. @@ -1927,7 +1927,7 @@ async def get_next(next_link=None): @distributed_trace def get_paging_model_with_item_name_with_xms_client_name( # pylint: disable=name-too-long self, **kwargs: Any - ) -> AsyncItemPaged["_models.Product"]: + ) -> AsyncItemPaged[_models.Product]: """A paging operation that returns a paging model whose item name is is overriden by x-ms-client-name 'indexes'. diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/paging/operations/_paging_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/paging/operations/_paging_operations.py index f819ede3db..a77700941d 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/paging/operations/_paging_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/paging/operations/_paging_operations.py @@ -547,7 +547,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get_no_item_name_pages(self, **kwargs: Any) -> ItemPaged["_models.Product"]: + def get_no_item_name_pages(self, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation that must return result of the default 'value' node. :return: An iterator like instance of either Product or the result of cls(response) @@ -621,7 +621,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def get_empty_next_link_name_pages(self, **kwargs: Any) -> ItemPaged["_models.Product"]: + def get_empty_next_link_name_pages(self, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation that gets an empty next link and should stop after page 1. :return: An iterator like instance of either Product or the result of cls(response) @@ -695,7 +695,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def get_null_next_link_name_pages(self, **kwargs: Any) -> ItemPaged["_models.Product"]: + def get_null_next_link_name_pages(self, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation that must ignore any kind of nextLink, and stop after page 1. :return: An iterator like instance of either Product or the result of cls(response) @@ -769,7 +769,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def get_single_pages(self, **kwargs: Any) -> ItemPaged["_models.Product"]: + def get_single_pages(self, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation that finishes on the first call without a nextlink. :return: An iterator like instance of either Product or the result of cls(response) @@ -845,7 +845,7 @@ def get_next(next_link=None): @distributed_trace def get_single_pages_with_body_params( self, name: Optional[str] = None, **kwargs: Any - ) -> ItemPaged["_models.Product"]: + ) -> ItemPaged[_models.Product]: """A paging operation that finishes on the first call with body params without a nextlink. :param name: Default value is None. @@ -926,7 +926,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def first_response_empty(self, **kwargs: Any) -> ItemPaged["_models.Product"]: + def first_response_empty(self, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation whose first response's items list is empty, but still returns a next link. Second (and final) call, will give you an items list of 1. @@ -1006,7 +1006,7 @@ def get_multiple_pages( client_request_id: Optional[str] = None, paging_get_multiple_pages_options: Optional[_models.PagingGetMultiplePagesOptions] = None, **kwargs: Any, - ) -> ItemPaged["_models.Product"]: + ) -> ItemPaged[_models.Product]: """A paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -1093,7 +1093,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def get_with_query_params(self, required_query_parameter: int, **kwargs: Any) -> ItemPaged["_models.Product"]: + def get_with_query_params(self, required_query_parameter: int, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation that includes a next operation. It has a different query parameter from it's next operation nextOperationWithQueryParams. Returns a ProductResult. @@ -1165,7 +1165,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def duplicate_params(self, filter: Optional[str] = None, **kwargs: Any) -> ItemPaged["_models.Product"]: + def duplicate_params(self, filter: Optional[str] = None, **kwargs: Any) -> ItemPaged[_models.Product]: """Define ``filter`` as a query param for all calls. However, the returned next link will also include the ``filter`` as part of it. Make sure you don't end up duplicating the ``filter`` param in the url sent. @@ -1244,7 +1244,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def page_with_max_page_size(self, maxpagesize: Literal["5"] = "5", **kwargs: Any) -> ItemPaged["_models.Product"]: + def page_with_max_page_size(self, maxpagesize: Literal["5"] = "5", **kwargs: Any) -> ItemPaged[_models.Product]: """Paging with max page size. We don't want to. :param maxpagesize: Max page size query param. Don't send. Known values are "5" and None. @@ -1327,7 +1327,7 @@ def get_odata_multiple_pages( client_request_id: Optional[str] = None, paging_get_odata_multiple_pages_options: Optional[_models.PagingGetOdataMultiplePagesOptions] = None, **kwargs: Any, - ) -> ItemPaged["_models.Product"]: + ) -> ItemPaged[_models.Product]: """A paging operation that includes a nextLink in odata format that has 10 pages. :param client_request_id: Default value is None. @@ -1419,7 +1419,7 @@ def get_multiple_pages_with_offset( paging_get_multiple_pages_with_offset_options: _models.PagingGetMultiplePagesWithOffsetOptions, client_request_id: Optional[str] = None, **kwargs: Any, - ) -> ItemPaged["_models.Product"]: + ) -> ItemPaged[_models.Product]: """A paging operation that includes a nextLink that has 10 pages. :param paging_get_multiple_pages_with_offset_options: Parameter group. Required. @@ -1509,7 +1509,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def get_multiple_pages_retry_first(self, **kwargs: Any) -> ItemPaged["_models.Product"]: + def get_multiple_pages_retry_first(self, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation that fails on the first call with 500 and then retries and then get a response including a nextLink that has 10 pages. @@ -1584,7 +1584,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def get_multiple_pages_retry_second(self, **kwargs: Any) -> ItemPaged["_models.Product"]: + def get_multiple_pages_retry_second(self, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually. @@ -1659,7 +1659,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def get_single_pages_failure(self, **kwargs: Any) -> ItemPaged["_models.Product"]: + def get_single_pages_failure(self, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation that receives a 400 on the first call. :return: An iterator like instance of either Product or the result of cls(response) @@ -1733,7 +1733,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def get_multiple_pages_failure(self, **kwargs: Any) -> ItemPaged["_models.Product"]: + def get_multiple_pages_failure(self, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation that receives a 400 on the second call. :return: An iterator like instance of either Product or the result of cls(response) @@ -1807,7 +1807,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def get_multiple_pages_failure_uri(self, **kwargs: Any) -> ItemPaged["_models.Product"]: + def get_multiple_pages_failure_uri(self, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation that receives an invalid nextLink. :return: An iterator like instance of either Product or the result of cls(response) @@ -1883,7 +1883,7 @@ def get_next(next_link=None): @distributed_trace def get_multiple_pages_fragment_next_link( self, api_version: str, tenant: str, **kwargs: Any - ) -> ItemPaged["_models.Product"]: + ) -> ItemPaged[_models.Product]: """A paging operation that doesn't return a full URL, just a fragment. :param api_version: Sets the api version to use. Required. @@ -1958,7 +1958,7 @@ def get_next(next_link=None): @distributed_trace def get_multiple_pages_fragment_with_grouping_next_link( # pylint: disable=name-too-long self, custom_parameter_group: _models.CustomParameterGroup, **kwargs: Any - ) -> ItemPaged["_models.Product"]: + ) -> ItemPaged[_models.Product]: """A paging operation that doesn't return a full URL, just a fragment with parameters grouped. :param custom_parameter_group: Parameter group. Required. @@ -2101,7 +2101,7 @@ def begin_get_multiple_pages_lro( client_request_id: Optional[str] = None, paging_get_multiple_pages_lro_options: Optional[_models.PagingGetMultiplePagesLroOptions] = None, **kwargs: Any, - ) -> LROPoller[ItemPaged["_models.Product"]]: + ) -> LROPoller[ItemPaged[_models.Product]]: """A long-running paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -2218,18 +2218,18 @@ def internal_get_next(next_link=None): else: polling_method = polling if cont_token: - return LROPoller[ItemPaged["_models.Product"]].from_continuation_token( + return LROPoller[ItemPaged[_models.Product]].from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, deserialization_callback=get_long_running_output, ) - return LROPoller[ItemPaged["_models.Product"]]( + return LROPoller[ItemPaged[_models.Product]]( self._client, raw_result, get_long_running_output, polling_method # type: ignore ) @distributed_trace - def append_api_version(self, **kwargs: Any) -> ItemPaged["_models.Product"]: + def append_api_version(self, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation with api version. When calling the next link, you want to append your client's api version to the next link. @@ -2306,7 +2306,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def replace_api_version(self, **kwargs: Any) -> ItemPaged["_models.Product"]: + def replace_api_version(self, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation with api version. When calling the next link, you want to reformat it and override the returned api version with your client's api version. @@ -2385,7 +2385,7 @@ def get_next(next_link=None): @distributed_trace def get_paging_model_with_item_name_with_xms_client_name( # pylint: disable=name-too-long self, **kwargs: Any - ) -> ItemPaged["_models.Product"]: + ) -> ItemPaged[_models.Product]: """A paging operation that returns a paging model whose item name is is overriden by x-ms-client-name 'indexes'. diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/aio/operations/_paging_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/aio/operations/_paging_operations.py index d0993e5ecb..6e4a183376 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/aio/operations/_paging_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/aio/operations/_paging_operations.py @@ -86,7 +86,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get_no_item_name_pages(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def get_no_item_name_pages(self, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation that must return result of the default 'value' node. :return: An iterator like instance of either Product or the result of cls(response) @@ -160,7 +160,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def get_empty_next_link_name_pages(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def get_empty_next_link_name_pages(self, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation that gets an empty next link and should stop after page 1. :return: An iterator like instance of either Product or the result of cls(response) @@ -234,7 +234,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def get_null_next_link_name_pages(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def get_null_next_link_name_pages(self, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation that must ignore any kind of nextLink, and stop after page 1. :return: An iterator like instance of either Product or the result of cls(response) @@ -308,7 +308,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def get_single_pages(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def get_single_pages(self, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation that finishes on the first call without a nextlink. :return: An iterator like instance of either Product or the result of cls(response) @@ -384,7 +384,7 @@ async def get_next(next_link=None): @distributed_trace def get_single_pages_with_body_params( self, name: Optional[str] = None, **kwargs: Any - ) -> AsyncItemPaged["_models.Product"]: + ) -> AsyncItemPaged[_models.Product]: """A paging operation that finishes on the first call with body params without a nextlink. :param name: Default value is None. @@ -465,7 +465,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def first_response_empty(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def first_response_empty(self, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation whose first response's items list is empty, but still returns a next link. Second (and final) call, will give you an items list of 1. @@ -545,7 +545,7 @@ def get_multiple_pages( client_request_id: Optional[str] = None, paging_get_multiple_pages_options: Optional[_models.PagingGetMultiplePagesOptions] = None, **kwargs: Any - ) -> AsyncItemPaged["_models.Product"]: + ) -> AsyncItemPaged[_models.Product]: """A paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -631,7 +631,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def get_with_query_params(self, required_query_parameter: int, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def get_with_query_params(self, required_query_parameter: int, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation that includes a next operation. It has a different query parameter from it's next operation nextOperationWithQueryParams. Returns a ProductResult. @@ -703,7 +703,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def duplicate_params(self, filter: Optional[str] = None, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def duplicate_params(self, filter: Optional[str] = None, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """Define ``filter`` as a query param for all calls. However, the returned next link will also include the ``filter`` as part of it. Make sure you don't end up duplicating the ``filter`` param in the url sent. @@ -784,7 +784,7 @@ async def get_next(next_link=None): @distributed_trace def page_with_max_page_size( self, maxpagesize: Literal["5"] = "5", **kwargs: Any - ) -> AsyncItemPaged["_models.Product"]: + ) -> AsyncItemPaged[_models.Product]: """Paging with max page size. We don't want to. :param maxpagesize: Max page size query param. Don't send. Known values are "5" and None. @@ -867,7 +867,7 @@ def get_odata_multiple_pages( client_request_id: Optional[str] = None, paging_get_odata_multiple_pages_options: Optional[_models.PagingGetOdataMultiplePagesOptions] = None, **kwargs: Any - ) -> AsyncItemPaged["_models.Product"]: + ) -> AsyncItemPaged[_models.Product]: """A paging operation that includes a nextLink in odata format that has 10 pages. :param client_request_id: Default value is None. @@ -959,7 +959,7 @@ def get_multiple_pages_with_offset( paging_get_multiple_pages_with_offset_options: _models.PagingGetMultiplePagesWithOffsetOptions, client_request_id: Optional[str] = None, **kwargs: Any - ) -> AsyncItemPaged["_models.Product"]: + ) -> AsyncItemPaged[_models.Product]: """A paging operation that includes a nextLink that has 10 pages. :param paging_get_multiple_pages_with_offset_options: Parameter group. Required. @@ -1049,7 +1049,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def get_multiple_pages_retry_first(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def get_multiple_pages_retry_first(self, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation that fails on the first call with 500 and then retries and then get a response including a nextLink that has 10 pages. @@ -1124,7 +1124,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def get_multiple_pages_retry_second(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def get_multiple_pages_retry_second(self, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually. @@ -1199,7 +1199,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def get_single_pages_failure(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def get_single_pages_failure(self, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation that receives a 400 on the first call. :return: An iterator like instance of either Product or the result of cls(response) @@ -1273,7 +1273,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def get_multiple_pages_failure(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def get_multiple_pages_failure(self, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation that receives a 400 on the second call. :return: An iterator like instance of either Product or the result of cls(response) @@ -1347,7 +1347,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def get_multiple_pages_failure_uri(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def get_multiple_pages_failure_uri(self, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation that receives an invalid nextLink. :return: An iterator like instance of either Product or the result of cls(response) @@ -1423,7 +1423,7 @@ async def get_next(next_link=None): @distributed_trace def get_multiple_pages_fragment_next_link( self, api_version: str, tenant: str, **kwargs: Any - ) -> AsyncItemPaged["_models.Product"]: + ) -> AsyncItemPaged[_models.Product]: """A paging operation that doesn't return a full URL, just a fragment. :param api_version: Sets the api version to use. Required. @@ -1498,7 +1498,7 @@ async def get_next(next_link=None): @distributed_trace def get_multiple_pages_fragment_with_grouping_next_link( # pylint: disable=name-too-long self, custom_parameter_group: _models.CustomParameterGroup, **kwargs: Any - ) -> AsyncItemPaged["_models.Product"]: + ) -> AsyncItemPaged[_models.Product]: """A paging operation that doesn't return a full URL, just a fragment with parameters grouped. :param custom_parameter_group: Parameter group. Required. @@ -1641,7 +1641,7 @@ async def begin_get_multiple_pages_lro( client_request_id: Optional[str] = None, paging_get_multiple_pages_lro_options: Optional[_models.PagingGetMultiplePagesLroOptions] = None, **kwargs: Any - ) -> AsyncLROPoller[AsyncItemPaged["_models.Product"]]: + ) -> AsyncLROPoller[AsyncItemPaged[_models.Product]]: """A long-running paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -1757,18 +1757,18 @@ async def internal_get_next(next_link=None): else: polling_method = polling if cont_token: - return AsyncLROPoller[AsyncItemPaged["_models.Product"]].from_continuation_token( + return AsyncLROPoller[AsyncItemPaged[_models.Product]].from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, deserialization_callback=get_long_running_output, ) - return AsyncLROPoller[AsyncItemPaged["_models.Product"]]( + return AsyncLROPoller[AsyncItemPaged[_models.Product]]( self._client, raw_result, get_long_running_output, polling_method # type: ignore ) @distributed_trace - def append_api_version(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def append_api_version(self, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation with api version. When calling the next link, you want to append your client's api version to the next link. @@ -1845,7 +1845,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def replace_api_version(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def replace_api_version(self, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """A paging operation with api version. When calling the next link, you want to reformat it and override the returned api version with your client's api version. @@ -1924,7 +1924,7 @@ async def get_next(next_link=None): @distributed_trace def get_paging_model_with_item_name_with_xms_client_name( # pylint: disable=name-too-long self, **kwargs: Any - ) -> AsyncItemPaged["_models.Product"]: + ) -> AsyncItemPaged[_models.Product]: """A paging operation that returns a paging model whose item name is is overriden by x-ms-client-name 'indexes'. diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/operations/_paging_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/operations/_paging_operations.py index 2acb7a5fec..2993114d21 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/operations/_paging_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/operations/_paging_operations.py @@ -546,7 +546,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get_no_item_name_pages(self, **kwargs: Any) -> ItemPaged["_models.Product"]: + def get_no_item_name_pages(self, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation that must return result of the default 'value' node. :return: An iterator like instance of either Product or the result of cls(response) @@ -620,7 +620,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def get_empty_next_link_name_pages(self, **kwargs: Any) -> ItemPaged["_models.Product"]: + def get_empty_next_link_name_pages(self, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation that gets an empty next link and should stop after page 1. :return: An iterator like instance of either Product or the result of cls(response) @@ -694,7 +694,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def get_null_next_link_name_pages(self, **kwargs: Any) -> ItemPaged["_models.Product"]: + def get_null_next_link_name_pages(self, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation that must ignore any kind of nextLink, and stop after page 1. :return: An iterator like instance of either Product or the result of cls(response) @@ -768,7 +768,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def get_single_pages(self, **kwargs: Any) -> ItemPaged["_models.Product"]: + def get_single_pages(self, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation that finishes on the first call without a nextlink. :return: An iterator like instance of either Product or the result of cls(response) @@ -844,7 +844,7 @@ def get_next(next_link=None): @distributed_trace def get_single_pages_with_body_params( self, name: Optional[str] = None, **kwargs: Any - ) -> ItemPaged["_models.Product"]: + ) -> ItemPaged[_models.Product]: """A paging operation that finishes on the first call with body params without a nextlink. :param name: Default value is None. @@ -925,7 +925,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def first_response_empty(self, **kwargs: Any) -> ItemPaged["_models.Product"]: + def first_response_empty(self, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation whose first response's items list is empty, but still returns a next link. Second (and final) call, will give you an items list of 1. @@ -1005,7 +1005,7 @@ def get_multiple_pages( client_request_id: Optional[str] = None, paging_get_multiple_pages_options: Optional[_models.PagingGetMultiplePagesOptions] = None, **kwargs: Any, - ) -> ItemPaged["_models.Product"]: + ) -> ItemPaged[_models.Product]: """A paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -1091,7 +1091,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def get_with_query_params(self, required_query_parameter: int, **kwargs: Any) -> ItemPaged["_models.Product"]: + def get_with_query_params(self, required_query_parameter: int, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation that includes a next operation. It has a different query parameter from it's next operation nextOperationWithQueryParams. Returns a ProductResult. @@ -1163,7 +1163,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def duplicate_params(self, filter: Optional[str] = None, **kwargs: Any) -> ItemPaged["_models.Product"]: + def duplicate_params(self, filter: Optional[str] = None, **kwargs: Any) -> ItemPaged[_models.Product]: """Define ``filter`` as a query param for all calls. However, the returned next link will also include the ``filter`` as part of it. Make sure you don't end up duplicating the ``filter`` param in the url sent. @@ -1242,7 +1242,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def page_with_max_page_size(self, maxpagesize: Literal["5"] = "5", **kwargs: Any) -> ItemPaged["_models.Product"]: + def page_with_max_page_size(self, maxpagesize: Literal["5"] = "5", **kwargs: Any) -> ItemPaged[_models.Product]: """Paging with max page size. We don't want to. :param maxpagesize: Max page size query param. Don't send. Known values are "5" and None. @@ -1325,7 +1325,7 @@ def get_odata_multiple_pages( client_request_id: Optional[str] = None, paging_get_odata_multiple_pages_options: Optional[_models.PagingGetOdataMultiplePagesOptions] = None, **kwargs: Any, - ) -> ItemPaged["_models.Product"]: + ) -> ItemPaged[_models.Product]: """A paging operation that includes a nextLink in odata format that has 10 pages. :param client_request_id: Default value is None. @@ -1417,7 +1417,7 @@ def get_multiple_pages_with_offset( paging_get_multiple_pages_with_offset_options: _models.PagingGetMultiplePagesWithOffsetOptions, client_request_id: Optional[str] = None, **kwargs: Any, - ) -> ItemPaged["_models.Product"]: + ) -> ItemPaged[_models.Product]: """A paging operation that includes a nextLink that has 10 pages. :param paging_get_multiple_pages_with_offset_options: Parameter group. Required. @@ -1507,7 +1507,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def get_multiple_pages_retry_first(self, **kwargs: Any) -> ItemPaged["_models.Product"]: + def get_multiple_pages_retry_first(self, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation that fails on the first call with 500 and then retries and then get a response including a nextLink that has 10 pages. @@ -1582,7 +1582,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def get_multiple_pages_retry_second(self, **kwargs: Any) -> ItemPaged["_models.Product"]: + def get_multiple_pages_retry_second(self, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually. @@ -1657,7 +1657,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def get_single_pages_failure(self, **kwargs: Any) -> ItemPaged["_models.Product"]: + def get_single_pages_failure(self, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation that receives a 400 on the first call. :return: An iterator like instance of either Product or the result of cls(response) @@ -1731,7 +1731,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def get_multiple_pages_failure(self, **kwargs: Any) -> ItemPaged["_models.Product"]: + def get_multiple_pages_failure(self, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation that receives a 400 on the second call. :return: An iterator like instance of either Product or the result of cls(response) @@ -1805,7 +1805,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def get_multiple_pages_failure_uri(self, **kwargs: Any) -> ItemPaged["_models.Product"]: + def get_multiple_pages_failure_uri(self, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation that receives an invalid nextLink. :return: An iterator like instance of either Product or the result of cls(response) @@ -1881,7 +1881,7 @@ def get_next(next_link=None): @distributed_trace def get_multiple_pages_fragment_next_link( self, api_version: str, tenant: str, **kwargs: Any - ) -> ItemPaged["_models.Product"]: + ) -> ItemPaged[_models.Product]: """A paging operation that doesn't return a full URL, just a fragment. :param api_version: Sets the api version to use. Required. @@ -1956,7 +1956,7 @@ def get_next(next_link=None): @distributed_trace def get_multiple_pages_fragment_with_grouping_next_link( # pylint: disable=name-too-long self, custom_parameter_group: _models.CustomParameterGroup, **kwargs: Any - ) -> ItemPaged["_models.Product"]: + ) -> ItemPaged[_models.Product]: """A paging operation that doesn't return a full URL, just a fragment with parameters grouped. :param custom_parameter_group: Parameter group. Required. @@ -2099,7 +2099,7 @@ def begin_get_multiple_pages_lro( client_request_id: Optional[str] = None, paging_get_multiple_pages_lro_options: Optional[_models.PagingGetMultiplePagesLroOptions] = None, **kwargs: Any, - ) -> LROPoller[ItemPaged["_models.Product"]]: + ) -> LROPoller[ItemPaged[_models.Product]]: """A long-running paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -2214,18 +2214,18 @@ def internal_get_next(next_link=None): else: polling_method = polling if cont_token: - return LROPoller[ItemPaged["_models.Product"]].from_continuation_token( + return LROPoller[ItemPaged[_models.Product]].from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, deserialization_callback=get_long_running_output, ) - return LROPoller[ItemPaged["_models.Product"]]( + return LROPoller[ItemPaged[_models.Product]]( self._client, raw_result, get_long_running_output, polling_method # type: ignore ) @distributed_trace - def append_api_version(self, **kwargs: Any) -> ItemPaged["_models.Product"]: + def append_api_version(self, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation with api version. When calling the next link, you want to append your client's api version to the next link. @@ -2302,7 +2302,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def replace_api_version(self, **kwargs: Any) -> ItemPaged["_models.Product"]: + def replace_api_version(self, **kwargs: Any) -> ItemPaged[_models.Product]: """A paging operation with api version. When calling the next link, you want to reformat it and override the returned api version with your client's api version. @@ -2381,7 +2381,7 @@ def get_next(next_link=None): @distributed_trace def get_paging_model_with_item_name_with_xms_client_name( # pylint: disable=name-too-long self, **kwargs: Any - ) -> ItemPaged["_models.Product"]: + ) -> ItemPaged[_models.Product]: """A paging operation that returns a paging model whose item name is is overriden by x-ms-client-name 'indexes'. diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/aio/operations/_storage_accounts_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/aio/operations/_storage_accounts_operations.py index 2fa9c74d86..ac0326e56e 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/aio/operations/_storage_accounts_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/aio/operations/_storage_accounts_operations.py @@ -711,7 +711,7 @@ async def list_keys(self, resource_group_name: str, account_name: str, **kwargs: return deserialized # type: ignore @distributed_trace - def list(self, **kwargs: Any) -> AsyncItemPaged["_models.StorageAccount"]: + def list(self, **kwargs: Any) -> AsyncItemPaged[_models.StorageAccount]: """Lists all the storage accounts available under the subscription. Note that storage keys are not returned; use the ListKeys operation for this. @@ -789,9 +789,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def list_by_resource_group( - self, resource_group_name: str, **kwargs: Any - ) -> AsyncItemPaged["_models.StorageAccount"]: + def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> AsyncItemPaged[_models.StorageAccount]: """Lists all the storage accounts available under the given resource group. Note that storage keys are not returned; use the ListKeys operation for this. diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/operations/_storage_accounts_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/operations/_storage_accounts_operations.py index 85f6403a24..4d45ae8fae 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/operations/_storage_accounts_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/operations/_storage_accounts_operations.py @@ -973,7 +973,7 @@ def list_keys(self, resource_group_name: str, account_name: str, **kwargs: Any) return deserialized # type: ignore @distributed_trace - def list(self, **kwargs: Any) -> ItemPaged["_models.StorageAccount"]: + def list(self, **kwargs: Any) -> ItemPaged[_models.StorageAccount]: """Lists all the storage accounts available under the subscription. Note that storage keys are not returned; use the ListKeys operation for this. @@ -1051,7 +1051,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> ItemPaged["_models.StorageAccount"]: + def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> ItemPaged[_models.StorageAccount]: """Lists all the storage accounts available under the given resource group. Note that storage keys are not returned; use the ListKeys operation for this. diff --git a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/_operations/_operations.py b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/_operations/_operations.py index 6a304ad951..0d6875a30b 100644 --- a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/_operations/_operations.py +++ b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/_operations/_operations.py @@ -281,7 +281,7 @@ def post_model(self, mode: str, input: Union[_models.Input, IO[bytes]], **kwargs return deserialized # type: ignore @distributed_trace - def get_pages(self, mode: str, **kwargs: Any) -> ItemPaged["_models.Product"]: + def get_pages(self, mode: str, **kwargs: Any) -> ItemPaged[_models.Product]: """Get pages that you will either return to users in pages of raw bodies, or pages of models following growup. diff --git a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/aio/_operations/_operations.py b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/aio/_operations/_operations.py index 1e75d881e7..7a23f91d7f 100644 --- a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/aio/_operations/_operations.py +++ b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/aio/_operations/_operations.py @@ -208,7 +208,7 @@ async def post_model(self, mode: str, input: Union[_models.Input, IO[bytes]], ** return deserialized # type: ignore @distributed_trace - def get_pages(self, mode: str, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: + def get_pages(self, mode: str, **kwargs: Any) -> AsyncItemPaged[_models.Product]: """Get pages that you will either return to users in pages of raw bodies, or pages of models following growup. diff --git a/packages/typespec-python/package.json b/packages/typespec-python/package.json index 3f352348a4..c0fb981dbf 100644 --- a/packages/typespec-python/package.json +++ b/packages/typespec-python/package.json @@ -65,7 +65,7 @@ "@typespec/xml": ">=0.81.0 <1.0.0" }, "dependencies": { - "@typespec/http-client-python": "https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNjI0NjE0NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.28.3.tgz", + "@typespec/http-client-python": "https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNjI3ODE4NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.28.3.tgz", "fs-extra": "~11.2.0", "js-yaml": "~4.1.0", "semver": "~7.6.2", diff --git a/packages/typespec-python/tests/generated/azure/azure-client-generator-core-next-link-verb/specs/azure/clientgenerator/core/nextlinkverb/_operations/_operations.py b/packages/typespec-python/tests/generated/azure/azure-client-generator-core-next-link-verb/specs/azure/clientgenerator/core/nextlinkverb/_operations/_operations.py index 922e9b867c..f6c374970f 100644 --- a/packages/typespec-python/tests/generated/azure/azure-client-generator-core-next-link-verb/specs/azure/clientgenerator/core/nextlinkverb/_operations/_operations.py +++ b/packages/typespec-python/tests/generated/azure/azure-client-generator-core-next-link-verb/specs/azure/clientgenerator/core/nextlinkverb/_operations/_operations.py @@ -55,7 +55,7 @@ class _NextLinkVerbClientOperationsMixin( ): @distributed_trace - def list_items(self, **kwargs: Any) -> ItemPaged["_models.Test"]: + def list_items(self, **kwargs: Any) -> ItemPaged[_models.Test]: """list_items. :return: An iterator like instance of Test diff --git a/packages/typespec-python/tests/generated/azure/azure-client-generator-core-next-link-verb/specs/azure/clientgenerator/core/nextlinkverb/aio/_operations/_operations.py b/packages/typespec-python/tests/generated/azure/azure-client-generator-core-next-link-verb/specs/azure/clientgenerator/core/nextlinkverb/aio/_operations/_operations.py index c9f9513b77..9fd7b4ed89 100644 --- a/packages/typespec-python/tests/generated/azure/azure-client-generator-core-next-link-verb/specs/azure/clientgenerator/core/nextlinkverb/aio/_operations/_operations.py +++ b/packages/typespec-python/tests/generated/azure/azure-client-generator-core-next-link-verb/specs/azure/clientgenerator/core/nextlinkverb/aio/_operations/_operations.py @@ -38,7 +38,7 @@ class _NextLinkVerbClientOperationsMixin( ): @distributed_trace - def list_items(self, **kwargs: Any) -> AsyncItemPaged["_models.Test"]: + def list_items(self, **kwargs: Any) -> AsyncItemPaged[_models.Test]: """list_items. :return: An iterator like instance of Test diff --git a/packages/typespec-python/tests/generated/azure/azure-core-basic/specs/azure/core/basic/_operations/_operations.py b/packages/typespec-python/tests/generated/azure/azure-core-basic/specs/azure/core/basic/_operations/_operations.py index 6f30d678fe..9b9b3f5e5f 100644 --- a/packages/typespec-python/tests/generated/azure/azure-core-basic/specs/azure/core/basic/_operations/_operations.py +++ b/packages/typespec-python/tests/generated/azure/azure-core-basic/specs/azure/core/basic/_operations/_operations.py @@ -575,7 +575,7 @@ def list( select: Optional[List[str]] = None, expand: Optional[List[str]] = None, **kwargs: Any - ) -> ItemPaged["_models.User"]: + ) -> ItemPaged[_models.User]: """Lists all users. Lists all Users. diff --git a/packages/typespec-python/tests/generated/azure/azure-core-basic/specs/azure/core/basic/aio/_operations/_operations.py b/packages/typespec-python/tests/generated/azure/azure-core-basic/specs/azure/core/basic/aio/_operations/_operations.py index eb81e1b004..1f5b431448 100644 --- a/packages/typespec-python/tests/generated/azure/azure-core-basic/specs/azure/core/basic/aio/_operations/_operations.py +++ b/packages/typespec-python/tests/generated/azure/azure-core-basic/specs/azure/core/basic/aio/_operations/_operations.py @@ -404,7 +404,7 @@ def list( select: Optional[List[str]] = None, expand: Optional[List[str]] = None, **kwargs: Any - ) -> AsyncItemPaged["_models.User"]: + ) -> AsyncItemPaged[_models.User]: """Lists all users. Lists all Users. diff --git a/packages/typespec-python/tests/generated/azure/azure-core-page/specs/azure/core/page/aio/operations/_operations.py b/packages/typespec-python/tests/generated/azure/azure-core-page/specs/azure/core/page/aio/operations/_operations.py index 82f8c6301b..e8733ce922 100644 --- a/packages/typespec-python/tests/generated/azure/azure-core-page/specs/azure/core/page/aio/operations/_operations.py +++ b/packages/typespec-python/tests/generated/azure/azure-core-page/specs/azure/core/page/aio/operations/_operations.py @@ -65,7 +65,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def list_first_item(self, **kwargs: Any) -> AsyncItemPaged["_models.FirstItem"]: + def list_first_item(self, **kwargs: Any) -> AsyncItemPaged[_models.FirstItem]: """Two operations with two different page item types should be successfully generated. Should generate model for FirstItem. @@ -154,7 +154,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def list_second_item(self, **kwargs: Any) -> AsyncItemPaged["_models.SecondItem"]: + def list_second_item(self, **kwargs: Any) -> AsyncItemPaged[_models.SecondItem]: """Two operations with two different page item types should be successfully generated. Should generate model for SecondItem. @@ -248,7 +248,7 @@ class _PageClientOperationsMixin( ): @distributed_trace - def list_with_page(self, **kwargs: Any) -> AsyncItemPaged["_models.User"]: + def list_with_page(self, **kwargs: Any) -> AsyncItemPaged[_models.User]: """List with Azure.Core.Page<>. :return: An iterator like instance of User @@ -343,7 +343,7 @@ def list_with_parameters( another: Optional[Union[str, _models.ListItemInputExtensibleEnum]] = None, content_type: str = "application/json", **kwargs: Any - ) -> AsyncItemPaged["_models.User"]: + ) -> AsyncItemPaged[_models.User]: """List with extensible enum parameter Azure.Core.Page<>. :param body_input: The body of the input. Required. @@ -367,7 +367,7 @@ def list_with_parameters( another: Optional[Union[str, _models.ListItemInputExtensibleEnum]] = None, content_type: str = "application/json", **kwargs: Any - ) -> AsyncItemPaged["_models.User"]: + ) -> AsyncItemPaged[_models.User]: """List with extensible enum parameter Azure.Core.Page<>. :param body_input: The body of the input. Required. @@ -391,7 +391,7 @@ def list_with_parameters( another: Optional[Union[str, _models.ListItemInputExtensibleEnum]] = None, content_type: str = "application/json", **kwargs: Any - ) -> AsyncItemPaged["_models.User"]: + ) -> AsyncItemPaged[_models.User]: """List with extensible enum parameter Azure.Core.Page<>. :param body_input: The body of the input. Required. @@ -414,7 +414,7 @@ def list_with_parameters( *, another: Optional[Union[str, _models.ListItemInputExtensibleEnum]] = None, **kwargs: Any - ) -> AsyncItemPaged["_models.User"]: + ) -> AsyncItemPaged[_models.User]: """List with extensible enum parameter Azure.Core.Page<>. :param body_input: The body of the input. Is one of the following types: ListItemInputBody, @@ -518,7 +518,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def list_with_custom_page_model(self, **kwargs: Any) -> AsyncItemPaged["_models.User"]: + def list_with_custom_page_model(self, **kwargs: Any) -> AsyncItemPaged[_models.User]: """List with custom page model. :return: An iterator like instance of User @@ -608,7 +608,7 @@ async def get_next(next_link=None): @distributed_trace def with_parameterized_next_link( self, *, select: str, include_pending: Optional[bool] = None, **kwargs: Any - ) -> AsyncItemPaged["_models.User"]: + ) -> AsyncItemPaged[_models.User]: """List with parameterized next link that re-injects parameters. :keyword select: Required. @@ -705,7 +705,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def with_relative_next_link(self, **kwargs: Any) -> AsyncItemPaged["_models.User"]: + def with_relative_next_link(self, **kwargs: Any) -> AsyncItemPaged[_models.User]: """List with relative nextLink URL that requires endpoint resolution. :return: An iterator like instance of User diff --git a/packages/typespec-python/tests/generated/azure/azure-core-page/specs/azure/core/page/operations/_operations.py b/packages/typespec-python/tests/generated/azure/azure-core-page/specs/azure/core/page/operations/_operations.py index 4d8f44f4ae..d657a92e73 100644 --- a/packages/typespec-python/tests/generated/azure/azure-core-page/specs/azure/core/page/operations/_operations.py +++ b/packages/typespec-python/tests/generated/azure/azure-core-page/specs/azure/core/page/operations/_operations.py @@ -200,7 +200,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def list_first_item(self, **kwargs: Any) -> ItemPaged["_models.FirstItem"]: + def list_first_item(self, **kwargs: Any) -> ItemPaged[_models.FirstItem]: """Two operations with two different page item types should be successfully generated. Should generate model for FirstItem. @@ -289,7 +289,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def list_second_item(self, **kwargs: Any) -> ItemPaged["_models.SecondItem"]: + def list_second_item(self, **kwargs: Any) -> ItemPaged[_models.SecondItem]: """Two operations with two different page item types should be successfully generated. Should generate model for SecondItem. @@ -381,7 +381,7 @@ def get_next(next_link=None): class _PageClientOperationsMixin(ClientMixinABC[PipelineClient[HttpRequest, HttpResponse], PageClientConfiguration]): @distributed_trace - def list_with_page(self, **kwargs: Any) -> ItemPaged["_models.User"]: + def list_with_page(self, **kwargs: Any) -> ItemPaged[_models.User]: """List with Azure.Core.Page<>. :return: An iterator like instance of User @@ -476,7 +476,7 @@ def list_with_parameters( another: Optional[Union[str, _models.ListItemInputExtensibleEnum]] = None, content_type: str = "application/json", **kwargs: Any, - ) -> ItemPaged["_models.User"]: + ) -> ItemPaged[_models.User]: """List with extensible enum parameter Azure.Core.Page<>. :param body_input: The body of the input. Required. @@ -500,7 +500,7 @@ def list_with_parameters( another: Optional[Union[str, _models.ListItemInputExtensibleEnum]] = None, content_type: str = "application/json", **kwargs: Any, - ) -> ItemPaged["_models.User"]: + ) -> ItemPaged[_models.User]: """List with extensible enum parameter Azure.Core.Page<>. :param body_input: The body of the input. Required. @@ -524,7 +524,7 @@ def list_with_parameters( another: Optional[Union[str, _models.ListItemInputExtensibleEnum]] = None, content_type: str = "application/json", **kwargs: Any, - ) -> ItemPaged["_models.User"]: + ) -> ItemPaged[_models.User]: """List with extensible enum parameter Azure.Core.Page<>. :param body_input: The body of the input. Required. @@ -547,7 +547,7 @@ def list_with_parameters( *, another: Optional[Union[str, _models.ListItemInputExtensibleEnum]] = None, **kwargs: Any, - ) -> ItemPaged["_models.User"]: + ) -> ItemPaged[_models.User]: """List with extensible enum parameter Azure.Core.Page<>. :param body_input: The body of the input. Is one of the following types: ListItemInputBody, @@ -651,7 +651,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def list_with_custom_page_model(self, **kwargs: Any) -> ItemPaged["_models.User"]: + def list_with_custom_page_model(self, **kwargs: Any) -> ItemPaged[_models.User]: """List with custom page model. :return: An iterator like instance of User @@ -741,7 +741,7 @@ def get_next(next_link=None): @distributed_trace def with_parameterized_next_link( self, *, select: str, include_pending: Optional[bool] = None, **kwargs: Any - ) -> ItemPaged["_models.User"]: + ) -> ItemPaged[_models.User]: """List with parameterized next link that re-injects parameters. :keyword select: Required. @@ -838,7 +838,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def with_relative_next_link(self, **kwargs: Any) -> ItemPaged["_models.User"]: + def with_relative_next_link(self, **kwargs: Any) -> ItemPaged[_models.User]: """List with relative nextLink URL that requires endpoint resolution. :return: An iterator like instance of User diff --git a/packages/typespec-python/tests/generated/azure/azure-payload-pageable/specs/azure/payload/pageable/_operations/_operations.py b/packages/typespec-python/tests/generated/azure/azure-payload-pageable/specs/azure/payload/pageable/_operations/_operations.py index b3d2ee7b4a..67d98e6f76 100644 --- a/packages/typespec-python/tests/generated/azure/azure-payload-pageable/specs/azure/payload/pageable/_operations/_operations.py +++ b/packages/typespec-python/tests/generated/azure/azure-payload-pageable/specs/azure/payload/pageable/_operations/_operations.py @@ -61,7 +61,7 @@ class _PageableClientOperationsMixin( ): @distributed_trace - def list(self, **kwargs: Any) -> ItemPaged["_models.User"]: + def list(self, **kwargs: Any) -> ItemPaged[_models.User]: """List users. :return: An iterator like instance of User diff --git a/packages/typespec-python/tests/generated/azure/azure-payload-pageable/specs/azure/payload/pageable/aio/_operations/_operations.py b/packages/typespec-python/tests/generated/azure/azure-payload-pageable/specs/azure/payload/pageable/aio/_operations/_operations.py index 2f97c0eaf7..5fe2f8cbb2 100644 --- a/packages/typespec-python/tests/generated/azure/azure-payload-pageable/specs/azure/payload/pageable/aio/_operations/_operations.py +++ b/packages/typespec-python/tests/generated/azure/azure-payload-pageable/specs/azure/payload/pageable/aio/_operations/_operations.py @@ -39,7 +39,7 @@ class _PageableClientOperationsMixin( ): @distributed_trace - def list(self, **kwargs: Any) -> AsyncItemPaged["_models.User"]: + def list(self, **kwargs: Any) -> AsyncItemPaged[_models.User]: """List users. :return: An iterator like instance of User diff --git a/packages/typespec-python/tests/generated/azure/azure-resource-manager-method-subscription-id/azure/resourcemanager/methodsubscriptionid/aio/operations/_operations.py b/packages/typespec-python/tests/generated/azure/azure-resource-manager-method-subscription-id/azure/resourcemanager/methodsubscriptionid/aio/operations/_operations.py index eb34250827..03430e4899 100644 --- a/packages/typespec-python/tests/generated/azure/azure-resource-manager-method-subscription-id/azure/resourcemanager/methodsubscriptionid/aio/operations/_operations.py +++ b/packages/typespec-python/tests/generated/azure/azure-resource-manager-method-subscription-id/azure/resourcemanager/methodsubscriptionid/aio/operations/_operations.py @@ -135,7 +135,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def list(self, **kwargs: Any) -> AsyncItemPaged["_models.Operation"]: + def list(self, **kwargs: Any) -> AsyncItemPaged[_models.Operation]: """List the operations for the provider. :return: An iterator like instance of Operation diff --git a/packages/typespec-python/tests/generated/azure/azure-resource-manager-method-subscription-id/azure/resourcemanager/methodsubscriptionid/operations/_operations.py b/packages/typespec-python/tests/generated/azure/azure-resource-manager-method-subscription-id/azure/resourcemanager/methodsubscriptionid/operations/_operations.py index 6734276568..cef9e7f75b 100644 --- a/packages/typespec-python/tests/generated/azure/azure-resource-manager-method-subscription-id/azure/resourcemanager/methodsubscriptionid/operations/_operations.py +++ b/packages/typespec-python/tests/generated/azure/azure-resource-manager-method-subscription-id/azure/resourcemanager/methodsubscriptionid/operations/_operations.py @@ -462,7 +462,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def list(self, **kwargs: Any) -> ItemPaged["_models.Operation"]: + def list(self, **kwargs: Any) -> ItemPaged[_models.Operation]: """List the operations for the provider. :return: An iterator like instance of Operation diff --git a/packages/typespec-python/tests/generated/azure/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/aio/operations/_operations.py b/packages/typespec-python/tests/generated/azure/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/aio/operations/_operations.py index 7789a53650..2fc0efdabb 100644 --- a/packages/typespec-python/tests/generated/azure/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/aio/operations/_operations.py +++ b/packages/typespec-python/tests/generated/azure/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/aio/operations/_operations.py @@ -76,7 +76,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def list(self, **kwargs: Any) -> AsyncItemPaged["_models.Operation"]: + def list(self, **kwargs: Any) -> AsyncItemPaged[_models.Operation]: """List the operations for the provider. :return: An iterator like instance of Operation @@ -1347,7 +1347,7 @@ async def _post_paging_lro_initial( @distributed_trace_async async def begin_post_paging_lro( self, resource_group_name: str, product_name: str, **kwargs: Any - ) -> AsyncLROPoller[AsyncItemPaged["_models.Product"]]: + ) -> AsyncLROPoller[AsyncItemPaged[_models.Product]]: """A long-running resource action. :param resource_group_name: The name of the resource group. The name is case insensitive. @@ -1482,13 +1482,13 @@ async def internal_get_next(next_link=None): else: polling_method = polling if cont_token: - return AsyncLROPoller[AsyncItemPaged["_models.Product"]].from_continuation_token( + return AsyncLROPoller[AsyncItemPaged[_models.Product]].from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, deserialization_callback=get_long_running_output, ) - return AsyncLROPoller[AsyncItemPaged["_models.Product"]]( + return AsyncLROPoller[AsyncItemPaged[_models.Product]]( self._client, raw_result, get_long_running_output, polling_method # type: ignore ) diff --git a/packages/typespec-python/tests/generated/azure/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/operations/_operations.py b/packages/typespec-python/tests/generated/azure/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/operations/_operations.py index 3449396e4e..fa56a3d4b5 100644 --- a/packages/typespec-python/tests/generated/azure/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/operations/_operations.py +++ b/packages/typespec-python/tests/generated/azure/azure-resource-manager-operation-templates/azure/resourcemanager/operationtemplates/operations/_operations.py @@ -400,7 +400,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def list(self, **kwargs: Any) -> ItemPaged["_models.Operation"]: + def list(self, **kwargs: Any) -> ItemPaged[_models.Operation]: """List the operations for the provider. :return: An iterator like instance of Operation @@ -1665,7 +1665,7 @@ def _post_paging_lro_initial(self, resource_group_name: str, product_name: str, @distributed_trace def begin_post_paging_lro( self, resource_group_name: str, product_name: str, **kwargs: Any - ) -> LROPoller[ItemPaged["_models.Product"]]: + ) -> LROPoller[ItemPaged[_models.Product]]: """A long-running resource action. :param resource_group_name: The name of the resource group. The name is case insensitive. @@ -1800,13 +1800,13 @@ def internal_get_next(next_link=None): else: polling_method = polling if cont_token: - return LROPoller[ItemPaged["_models.Product"]].from_continuation_token( + return LROPoller[ItemPaged[_models.Product]].from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, deserialization_callback=get_long_running_output, ) - return LROPoller[ItemPaged["_models.Product"]]( + return LROPoller[ItemPaged[_models.Product]]( self._client, raw_result, get_long_running_output, polling_method # type: ignore ) diff --git a/packages/typespec-python/tests/generated/azure/azure-resource-manager-resources/azure/resourcemanager/resources/aio/operations/_operations.py b/packages/typespec-python/tests/generated/azure/azure-resource-manager-resources/azure/resourcemanager/resources/aio/operations/_operations.py index ca5d1df089..7127939d53 100644 --- a/packages/typespec-python/tests/generated/azure/azure-resource-manager-resources/azure/resourcemanager/resources/aio/operations/_operations.py +++ b/packages/typespec-python/tests/generated/azure/azure-resource-manager-resources/azure/resourcemanager/resources/aio/operations/_operations.py @@ -763,7 +763,7 @@ def get_long_running_output(pipeline_response): # pylint: disable=inconsistent- @distributed_trace def list_by_resource_group( self, resource_group_name: str, **kwargs: Any - ) -> AsyncItemPaged["_models.TopLevelTrackedResource"]: + ) -> AsyncItemPaged[_models.TopLevelTrackedResource]: """List TopLevelTrackedResource resources by resource group. :param resource_group_name: The name of the resource group. The name is case insensitive. @@ -861,7 +861,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def list_by_subscription(self, **kwargs: Any) -> AsyncItemPaged["_models.TopLevelTrackedResource"]: + def list_by_subscription(self, **kwargs: Any) -> AsyncItemPaged[_models.TopLevelTrackedResource]: """List TopLevelTrackedResource resources by subscription ID. :return: An iterator like instance of TopLevelTrackedResource @@ -1853,7 +1853,7 @@ def get_long_running_output(pipeline_response): # pylint: disable=inconsistent- @distributed_trace def list_by_top_level_tracked_resource( self, resource_group_name: str, top_level_tracked_resource_name: str, **kwargs: Any - ) -> AsyncItemPaged["_models.NestedProxyResource"]: + ) -> AsyncItemPaged[_models.NestedProxyResource]: """List NestedProxyResource resources by TopLevelTrackedResource. :param resource_group_name: The name of the resource group. The name is case insensitive. @@ -2410,7 +2410,7 @@ async def update( @distributed_trace def list_by_resource_group( self, resource_group_name: str, **kwargs: Any - ) -> AsyncItemPaged["_models.SingletonTrackedResource"]: + ) -> AsyncItemPaged[_models.SingletonTrackedResource]: """List SingletonTrackedResource resources by resource group. :param resource_group_name: The name of the resource group. The name is case insensitive. @@ -3060,7 +3060,7 @@ async def delete(self, resource_uri: str, extensions_resource_name: str, **kwarg return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def list_by_scope(self, resource_uri: str, **kwargs: Any) -> AsyncItemPaged["_models.ExtensionsResource"]: + def list_by_scope(self, resource_uri: str, **kwargs: Any) -> AsyncItemPaged[_models.ExtensionsResource]: """List ExtensionsResource resources by parent. :param resource_uri: The fully qualified Azure Resource manager identifier of the resource. @@ -3632,7 +3632,7 @@ async def delete(self, location: str, location_resource_name: str, **kwargs: Any return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def list_by_location(self, location: str, **kwargs: Any) -> AsyncItemPaged["_models.LocationResource"]: + def list_by_location(self, location: str, **kwargs: Any) -> AsyncItemPaged[_models.LocationResource]: """List LocationResource resources by SubscriptionLocationResource. :param location: The name of the Azure region. Required. diff --git a/packages/typespec-python/tests/generated/azure/azure-resource-manager-resources/azure/resourcemanager/resources/operations/_operations.py b/packages/typespec-python/tests/generated/azure/azure-resource-manager-resources/azure/resourcemanager/resources/operations/_operations.py index 8f06d69e7f..b5f00ca802 100644 --- a/packages/typespec-python/tests/generated/azure/azure-resource-manager-resources/azure/resourcemanager/resources/operations/_operations.py +++ b/packages/typespec-python/tests/generated/azure/azure-resource-manager-resources/azure/resourcemanager/resources/operations/_operations.py @@ -1495,7 +1495,7 @@ def get_long_running_output(pipeline_response): # pylint: disable=inconsistent- @distributed_trace def list_by_resource_group( self, resource_group_name: str, **kwargs: Any - ) -> ItemPaged["_models.TopLevelTrackedResource"]: + ) -> ItemPaged[_models.TopLevelTrackedResource]: """List TopLevelTrackedResource resources by resource group. :param resource_group_name: The name of the resource group. The name is case insensitive. @@ -1593,7 +1593,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def list_by_subscription(self, **kwargs: Any) -> ItemPaged["_models.TopLevelTrackedResource"]: + def list_by_subscription(self, **kwargs: Any) -> ItemPaged[_models.TopLevelTrackedResource]: """List TopLevelTrackedResource resources by subscription ID. :return: An iterator like instance of TopLevelTrackedResource @@ -2585,7 +2585,7 @@ def get_long_running_output(pipeline_response): # pylint: disable=inconsistent- @distributed_trace def list_by_top_level_tracked_resource( self, resource_group_name: str, top_level_tracked_resource_name: str, **kwargs: Any - ) -> ItemPaged["_models.NestedProxyResource"]: + ) -> ItemPaged[_models.NestedProxyResource]: """List NestedProxyResource resources by TopLevelTrackedResource. :param resource_group_name: The name of the resource group. The name is case insensitive. @@ -3142,7 +3142,7 @@ def update( @distributed_trace def list_by_resource_group( self, resource_group_name: str, **kwargs: Any - ) -> ItemPaged["_models.SingletonTrackedResource"]: + ) -> ItemPaged[_models.SingletonTrackedResource]: """List SingletonTrackedResource resources by resource group. :param resource_group_name: The name of the resource group. The name is case insensitive. @@ -3794,7 +3794,7 @@ def delete( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def list_by_scope(self, resource_uri: str, **kwargs: Any) -> ItemPaged["_models.ExtensionsResource"]: + def list_by_scope(self, resource_uri: str, **kwargs: Any) -> ItemPaged[_models.ExtensionsResource]: """List ExtensionsResource resources by parent. :param resource_uri: The fully qualified Azure Resource manager identifier of the resource. @@ -4368,7 +4368,7 @@ def delete( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def list_by_location(self, location: str, **kwargs: Any) -> ItemPaged["_models.LocationResource"]: + def list_by_location(self, location: str, **kwargs: Any) -> ItemPaged[_models.LocationResource]: """List LocationResource resources by SubscriptionLocationResource. :param location: The name of the Azure region. Required. diff --git a/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/pagesize/aio/operations/_operations.py b/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/pagesize/aio/operations/_operations.py index 0b6f53780a..ea7b6f2513 100644 --- a/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/pagesize/aio/operations/_operations.py +++ b/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/pagesize/aio/operations/_operations.py @@ -53,7 +53,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def list_without_continuation(self, **kwargs: Any) -> AsyncItemPaged["_models3.Pet"]: + def list_without_continuation(self, **kwargs: Any) -> AsyncItemPaged[_models3.Pet]: """list_without_continuation. :return: An iterator like instance of Pet @@ -126,7 +126,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def list_with_page_size(self, *, page_size: Optional[int] = None, **kwargs: Any) -> AsyncItemPaged["_models3.Pet"]: + def list_with_page_size(self, *, page_size: Optional[int] = None, **kwargs: Any) -> AsyncItemPaged[_models3.Pet]: """list_with_page_size. :keyword page_size: Default value is None. diff --git a/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/pagesize/operations/_operations.py b/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/pagesize/operations/_operations.py index db14719506..6c7ee4de88 100644 --- a/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/pagesize/operations/_operations.py +++ b/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/pagesize/operations/_operations.py @@ -88,7 +88,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def list_without_continuation(self, **kwargs: Any) -> ItemPaged["_models2.Pet"]: + def list_without_continuation(self, **kwargs: Any) -> ItemPaged[_models2.Pet]: """list_without_continuation. :return: An iterator like instance of Pet @@ -161,7 +161,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def list_with_page_size(self, *, page_size: Optional[int] = None, **kwargs: Any) -> ItemPaged["_models2.Pet"]: + def list_with_page_size(self, *, page_size: Optional[int] = None, **kwargs: Any) -> ItemPaged[_models2.Pet]: """list_with_page_size. :keyword page_size: Default value is None. diff --git a/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/serverdrivenpagination/aio/operations/_operations.py b/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/serverdrivenpagination/aio/operations/_operations.py index 54dbc2edf5..16d7809032 100644 --- a/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/serverdrivenpagination/aio/operations/_operations.py +++ b/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/serverdrivenpagination/aio/operations/_operations.py @@ -63,7 +63,7 @@ def __init__(self, *args, **kwargs) -> None: ) @distributed_trace - def link(self, **kwargs: Any) -> AsyncItemPaged["_models3.Pet"]: + def link(self, **kwargs: Any) -> AsyncItemPaged[_models3.Pet]: """link. :return: An iterator like instance of Pet @@ -136,7 +136,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def link_string(self, **kwargs: Any) -> AsyncItemPaged["_models3.Pet"]: + def link_string(self, **kwargs: Any) -> AsyncItemPaged[_models3.Pet]: """link_string. :return: An iterator like instance of Pet @@ -209,7 +209,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def nested_link(self, **kwargs: Any) -> AsyncItemPaged["_models3.Pet"]: + def nested_link(self, **kwargs: Any) -> AsyncItemPaged[_models3.Pet]: """nested_link. :return: An iterator like instance of Pet diff --git a/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/serverdrivenpagination/alternateinitialverb/aio/operations/_operations.py b/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/serverdrivenpagination/alternateinitialverb/aio/operations/_operations.py index e862bb9ebc..64fe7f1375 100644 --- a/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/serverdrivenpagination/alternateinitialverb/aio/operations/_operations.py +++ b/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/serverdrivenpagination/alternateinitialverb/aio/operations/_operations.py @@ -57,7 +57,7 @@ def __init__(self, *args, **kwargs) -> None: @overload def post( self, body: _models2.Filter, *, content_type: str = "application/json", **kwargs: Any - ) -> AsyncItemPaged["_models4.Pet"]: + ) -> AsyncItemPaged[_models4.Pet]: """post. :param body: Required. @@ -73,7 +73,7 @@ def post( @overload def post( self, body: JSON, *, content_type: str = "application/json", **kwargs: Any - ) -> AsyncItemPaged["_models4.Pet"]: + ) -> AsyncItemPaged[_models4.Pet]: """post. :param body: Required. @@ -89,7 +89,7 @@ def post( @overload def post( self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any - ) -> AsyncItemPaged["_models4.Pet"]: + ) -> AsyncItemPaged[_models4.Pet]: """post. :param body: Required. @@ -103,7 +103,7 @@ def post( """ @distributed_trace - def post(self, body: Union[_models2.Filter, JSON, IO[bytes]], **kwargs: Any) -> AsyncItemPaged["_models4.Pet"]: + def post(self, body: Union[_models2.Filter, JSON, IO[bytes]], **kwargs: Any) -> AsyncItemPaged[_models4.Pet]: """post. :param body: Is one of the following types: Filter, JSON, IO[bytes] Required. diff --git a/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/serverdrivenpagination/alternateinitialverb/operations/_operations.py b/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/serverdrivenpagination/alternateinitialverb/operations/_operations.py index 2bb6f125c3..155e2a7268 100644 --- a/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/serverdrivenpagination/alternateinitialverb/operations/_operations.py +++ b/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/serverdrivenpagination/alternateinitialverb/operations/_operations.py @@ -78,7 +78,7 @@ def __init__(self, *args, **kwargs) -> None: @overload def post( self, body: _models1.Filter, *, content_type: str = "application/json", **kwargs: Any - ) -> ItemPaged["_models3.Pet"]: + ) -> ItemPaged[_models3.Pet]: """post. :param body: Required. @@ -92,7 +92,7 @@ def post( """ @overload - def post(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> ItemPaged["_models3.Pet"]: + def post(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> ItemPaged[_models3.Pet]: """post. :param body: Required. @@ -108,7 +108,7 @@ def post(self, body: JSON, *, content_type: str = "application/json", **kwargs: @overload def post( self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any - ) -> ItemPaged["_models3.Pet"]: + ) -> ItemPaged[_models3.Pet]: """post. :param body: Required. @@ -122,7 +122,7 @@ def post( """ @distributed_trace - def post(self, body: Union[_models1.Filter, JSON, IO[bytes]], **kwargs: Any) -> ItemPaged["_models3.Pet"]: + def post(self, body: Union[_models1.Filter, JSON, IO[bytes]], **kwargs: Any) -> ItemPaged[_models3.Pet]: """post. :param body: Is one of the following types: Filter, JSON, IO[bytes] Required. diff --git a/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/serverdrivenpagination/continuationtoken/aio/operations/_operations.py b/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/serverdrivenpagination/continuationtoken/aio/operations/_operations.py index 825cb17115..d58c9092ee 100644 --- a/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/serverdrivenpagination/continuationtoken/aio/operations/_operations.py +++ b/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/serverdrivenpagination/continuationtoken/aio/operations/_operations.py @@ -59,7 +59,7 @@ def __init__(self, *args, **kwargs) -> None: @distributed_trace def request_query_response_body( self, *, foo: Optional[str] = None, bar: Optional[str] = None, **kwargs: Any - ) -> AsyncItemPaged["_models4.Pet"]: + ) -> AsyncItemPaged[_models4.Pet]: """request_query_response_body. :keyword foo: Default value is None. @@ -128,7 +128,7 @@ async def get_next(_continuation_token=None): @distributed_trace def request_header_response_body( self, *, foo: Optional[str] = None, bar: Optional[str] = None, **kwargs: Any - ) -> AsyncItemPaged["_models4.Pet"]: + ) -> AsyncItemPaged[_models4.Pet]: """request_header_response_body. :keyword foo: Default value is None. @@ -197,7 +197,7 @@ async def get_next(_continuation_token=None): @distributed_trace def request_query_response_header( self, *, foo: Optional[str] = None, bar: Optional[str] = None, **kwargs: Any - ) -> AsyncItemPaged["_models4.Pet"]: + ) -> AsyncItemPaged[_models4.Pet]: """request_query_response_header. :keyword foo: Default value is None. @@ -266,7 +266,7 @@ async def get_next(_continuation_token=None): @distributed_trace def request_header_response_header( self, *, foo: Optional[str] = None, bar: Optional[str] = None, **kwargs: Any - ) -> AsyncItemPaged["_models4.Pet"]: + ) -> AsyncItemPaged[_models4.Pet]: """request_header_response_header. :keyword foo: Default value is None. @@ -335,7 +335,7 @@ async def get_next(_continuation_token=None): @distributed_trace def request_query_nested_response_body( self, *, foo: Optional[str] = None, bar: Optional[str] = None, **kwargs: Any - ) -> AsyncItemPaged["_models4.Pet"]: + ) -> AsyncItemPaged[_models4.Pet]: """request_query_nested_response_body. :keyword foo: Default value is None. @@ -404,7 +404,7 @@ async def get_next(_continuation_token=None): @distributed_trace def request_header_nested_response_body( self, *, foo: Optional[str] = None, bar: Optional[str] = None, **kwargs: Any - ) -> AsyncItemPaged["_models4.Pet"]: + ) -> AsyncItemPaged[_models4.Pet]: """request_header_nested_response_body. :keyword foo: Default value is None. diff --git a/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/serverdrivenpagination/continuationtoken/operations/_operations.py b/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/serverdrivenpagination/continuationtoken/operations/_operations.py index 4dc09d9ece..6c769281c3 100644 --- a/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/serverdrivenpagination/continuationtoken/operations/_operations.py +++ b/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/serverdrivenpagination/continuationtoken/operations/_operations.py @@ -206,7 +206,7 @@ def __init__(self, *args, **kwargs) -> None: @distributed_trace def request_query_response_body( self, *, foo: Optional[str] = None, bar: Optional[str] = None, **kwargs: Any - ) -> ItemPaged["_models3.Pet"]: + ) -> ItemPaged[_models3.Pet]: """request_query_response_body. :keyword foo: Default value is None. @@ -275,7 +275,7 @@ def get_next(_continuation_token=None): @distributed_trace def request_header_response_body( self, *, foo: Optional[str] = None, bar: Optional[str] = None, **kwargs: Any - ) -> ItemPaged["_models3.Pet"]: + ) -> ItemPaged[_models3.Pet]: """request_header_response_body. :keyword foo: Default value is None. @@ -344,7 +344,7 @@ def get_next(_continuation_token=None): @distributed_trace def request_query_response_header( self, *, foo: Optional[str] = None, bar: Optional[str] = None, **kwargs: Any - ) -> ItemPaged["_models3.Pet"]: + ) -> ItemPaged[_models3.Pet]: """request_query_response_header. :keyword foo: Default value is None. @@ -413,7 +413,7 @@ def get_next(_continuation_token=None): @distributed_trace def request_header_response_header( self, *, foo: Optional[str] = None, bar: Optional[str] = None, **kwargs: Any - ) -> ItemPaged["_models3.Pet"]: + ) -> ItemPaged[_models3.Pet]: """request_header_response_header. :keyword foo: Default value is None. @@ -482,7 +482,7 @@ def get_next(_continuation_token=None): @distributed_trace def request_query_nested_response_body( self, *, foo: Optional[str] = None, bar: Optional[str] = None, **kwargs: Any - ) -> ItemPaged["_models3.Pet"]: + ) -> ItemPaged[_models3.Pet]: """request_query_nested_response_body. :keyword foo: Default value is None. @@ -551,7 +551,7 @@ def get_next(_continuation_token=None): @distributed_trace def request_header_nested_response_body( self, *, foo: Optional[str] = None, bar: Optional[str] = None, **kwargs: Any - ) -> ItemPaged["_models3.Pet"]: + ) -> ItemPaged[_models3.Pet]: """request_header_nested_response_body. :keyword foo: Default value is None. diff --git a/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/serverdrivenpagination/operations/_operations.py b/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/serverdrivenpagination/operations/_operations.py index 2a626166b7..0553b4c5dd 100644 --- a/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/serverdrivenpagination/operations/_operations.py +++ b/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/serverdrivenpagination/operations/_operations.py @@ -104,7 +104,7 @@ def __init__(self, *args, **kwargs) -> None: ) @distributed_trace - def link(self, **kwargs: Any) -> ItemPaged["_models2.Pet"]: + def link(self, **kwargs: Any) -> ItemPaged[_models2.Pet]: """link. :return: An iterator like instance of Pet @@ -177,7 +177,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def link_string(self, **kwargs: Any) -> ItemPaged["_models2.Pet"]: + def link_string(self, **kwargs: Any) -> ItemPaged[_models2.Pet]: """link_string. :return: An iterator like instance of Pet @@ -250,7 +250,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) @distributed_trace - def nested_link(self, **kwargs: Any) -> ItemPaged["_models2.Pet"]: + def nested_link(self, **kwargs: Any) -> ItemPaged[_models2.Pet]: """nested_link. :return: An iterator like instance of Pet diff --git a/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/xmlpagination/aio/operations/_operations.py b/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/xmlpagination/aio/operations/_operations.py index 5c94b4e944..75b2eda355 100644 --- a/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/xmlpagination/aio/operations/_operations.py +++ b/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/xmlpagination/aio/operations/_operations.py @@ -54,7 +54,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def list_with_continuation(self, **kwargs: Any) -> AsyncItemPaged["_models3.XmlPet"]: + def list_with_continuation(self, **kwargs: Any) -> AsyncItemPaged[_models3.XmlPet]: """list_with_continuation. :return: An iterator like instance of XmlPet @@ -116,7 +116,7 @@ async def get_next(_continuation_token=None): return AsyncItemPaged(get_next, extract_data) @distributed_trace - def list_with_next_link(self, **kwargs: Any) -> AsyncItemPaged["_models3.XmlPet"]: + def list_with_next_link(self, **kwargs: Any) -> AsyncItemPaged[_models3.XmlPet]: """list_with_next_link. :return: An iterator like instance of XmlPet diff --git a/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/xmlpagination/operations/_operations.py b/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/xmlpagination/operations/_operations.py index f8c0ebb955..8e4f98da6a 100644 --- a/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/xmlpagination/operations/_operations.py +++ b/packages/typespec-python/tests/generated/azure/payload-pageable/payload/pageable/xmlpagination/operations/_operations.py @@ -89,7 +89,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def list_with_continuation(self, **kwargs: Any) -> ItemPaged["_models2.XmlPet"]: + def list_with_continuation(self, **kwargs: Any) -> ItemPaged[_models2.XmlPet]: """list_with_continuation. :return: An iterator like instance of XmlPet @@ -151,7 +151,7 @@ def get_next(_continuation_token=None): return ItemPaged(get_next, extract_data) @distributed_trace - def list_with_next_link(self, **kwargs: Any) -> ItemPaged["_models2.XmlPet"]: + def list_with_next_link(self, **kwargs: Any) -> ItemPaged[_models2.XmlPet]: """list_with_next_link. :return: An iterator like instance of XmlPet diff --git a/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/pagesize/aio/operations/_operations.py b/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/pagesize/aio/operations/_operations.py index d35c74fe73..5417cc6d7e 100644 --- a/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/pagesize/aio/operations/_operations.py +++ b/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/pagesize/aio/operations/_operations.py @@ -45,7 +45,7 @@ def __init__(self, *args, **kwargs) -> None: self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") - def list_without_continuation(self, **kwargs: Any) -> AsyncItemPaged["_models3.Pet"]: + def list_without_continuation(self, **kwargs: Any) -> AsyncItemPaged[_models3.Pet]: """list_without_continuation. :return: An iterator like instance of Pet @@ -115,7 +115,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - def list_with_page_size(self, *, page_size: Optional[int] = None, **kwargs: Any) -> AsyncItemPaged["_models3.Pet"]: + def list_with_page_size(self, *, page_size: Optional[int] = None, **kwargs: Any) -> AsyncItemPaged[_models3.Pet]: """list_with_page_size. :keyword page_size: Default value is None. diff --git a/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/pagesize/operations/_operations.py b/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/pagesize/operations/_operations.py index b0dab2abbd..5bcec88780 100644 --- a/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/pagesize/operations/_operations.py +++ b/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/pagesize/operations/_operations.py @@ -80,7 +80,7 @@ def __init__(self, *args, **kwargs) -> None: self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") - def list_without_continuation(self, **kwargs: Any) -> ItemPaged["_models2.Pet"]: + def list_without_continuation(self, **kwargs: Any) -> ItemPaged[_models2.Pet]: """list_without_continuation. :return: An iterator like instance of Pet @@ -150,7 +150,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - def list_with_page_size(self, *, page_size: Optional[int] = None, **kwargs: Any) -> ItemPaged["_models2.Pet"]: + def list_with_page_size(self, *, page_size: Optional[int] = None, **kwargs: Any) -> ItemPaged[_models2.Pet]: """list_with_page_size. :keyword page_size: Default value is None. diff --git a/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/serverdrivenpagination/aio/operations/_operations.py b/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/serverdrivenpagination/aio/operations/_operations.py index 3558fb477e..8158a4762f 100644 --- a/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/serverdrivenpagination/aio/operations/_operations.py +++ b/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/serverdrivenpagination/aio/operations/_operations.py @@ -55,7 +55,7 @@ def __init__(self, *args, **kwargs) -> None: self._client, self._config, self._serialize, self._deserialize ) - def link(self, **kwargs: Any) -> AsyncItemPaged["_models3.Pet"]: + def link(self, **kwargs: Any) -> AsyncItemPaged[_models3.Pet]: """link. :return: An iterator like instance of Pet @@ -125,7 +125,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - def link_string(self, **kwargs: Any) -> AsyncItemPaged["_models3.Pet"]: + def link_string(self, **kwargs: Any) -> AsyncItemPaged[_models3.Pet]: """link_string. :return: An iterator like instance of Pet @@ -195,7 +195,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - def nested_link(self, **kwargs: Any) -> AsyncItemPaged["_models3.Pet"]: + def nested_link(self, **kwargs: Any) -> AsyncItemPaged[_models3.Pet]: """nested_link. :return: An iterator like instance of Pet diff --git a/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/serverdrivenpagination/alternateinitialverb/aio/operations/_operations.py b/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/serverdrivenpagination/alternateinitialverb/aio/operations/_operations.py index ca84347d5e..653426caeb 100644 --- a/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/serverdrivenpagination/alternateinitialverb/aio/operations/_operations.py +++ b/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/serverdrivenpagination/alternateinitialverb/aio/operations/_operations.py @@ -50,7 +50,7 @@ def __init__(self, *args, **kwargs) -> None: @overload def post( self, body: _models2.Filter, *, content_type: str = "application/json", **kwargs: Any - ) -> AsyncItemPaged["_models4.Pet"]: + ) -> AsyncItemPaged[_models4.Pet]: """post. :param body: Required. @@ -66,7 +66,7 @@ def post( @overload def post( self, body: JSON, *, content_type: str = "application/json", **kwargs: Any - ) -> AsyncItemPaged["_models4.Pet"]: + ) -> AsyncItemPaged[_models4.Pet]: """post. :param body: Required. @@ -82,7 +82,7 @@ def post( @overload def post( self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any - ) -> AsyncItemPaged["_models4.Pet"]: + ) -> AsyncItemPaged[_models4.Pet]: """post. :param body: Required. @@ -95,7 +95,7 @@ def post( :raises ~corehttp.exceptions.HttpResponseError: """ - def post(self, body: Union[_models2.Filter, JSON, IO[bytes]], **kwargs: Any) -> AsyncItemPaged["_models4.Pet"]: + def post(self, body: Union[_models2.Filter, JSON, IO[bytes]], **kwargs: Any) -> AsyncItemPaged[_models4.Pet]: """post. :param body: Is one of the following types: Filter, JSON, IO[bytes] Required. diff --git a/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/serverdrivenpagination/alternateinitialverb/operations/_operations.py b/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/serverdrivenpagination/alternateinitialverb/operations/_operations.py index 13e06bde7c..660963990c 100644 --- a/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/serverdrivenpagination/alternateinitialverb/operations/_operations.py +++ b/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/serverdrivenpagination/alternateinitialverb/operations/_operations.py @@ -71,7 +71,7 @@ def __init__(self, *args, **kwargs) -> None: @overload def post( self, body: _models1.Filter, *, content_type: str = "application/json", **kwargs: Any - ) -> ItemPaged["_models3.Pet"]: + ) -> ItemPaged[_models3.Pet]: """post. :param body: Required. @@ -85,7 +85,7 @@ def post( """ @overload - def post(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> ItemPaged["_models3.Pet"]: + def post(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> ItemPaged[_models3.Pet]: """post. :param body: Required. @@ -101,7 +101,7 @@ def post(self, body: JSON, *, content_type: str = "application/json", **kwargs: @overload def post( self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any - ) -> ItemPaged["_models3.Pet"]: + ) -> ItemPaged[_models3.Pet]: """post. :param body: Required. @@ -114,7 +114,7 @@ def post( :raises ~corehttp.exceptions.HttpResponseError: """ - def post(self, body: Union[_models1.Filter, JSON, IO[bytes]], **kwargs: Any) -> ItemPaged["_models3.Pet"]: + def post(self, body: Union[_models1.Filter, JSON, IO[bytes]], **kwargs: Any) -> ItemPaged[_models3.Pet]: """post. :param body: Is one of the following types: Filter, JSON, IO[bytes] Required. diff --git a/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/serverdrivenpagination/continuationtoken/aio/operations/_operations.py b/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/serverdrivenpagination/continuationtoken/aio/operations/_operations.py index 26842f4962..1a42bbaa1f 100644 --- a/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/serverdrivenpagination/continuationtoken/aio/operations/_operations.py +++ b/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/serverdrivenpagination/continuationtoken/aio/operations/_operations.py @@ -51,7 +51,7 @@ def __init__(self, *args, **kwargs) -> None: def request_query_response_body( self, *, foo: Optional[str] = None, bar: Optional[str] = None, **kwargs: Any - ) -> AsyncItemPaged["_models4.Pet"]: + ) -> AsyncItemPaged[_models4.Pet]: """request_query_response_body. :keyword foo: Default value is None. @@ -117,7 +117,7 @@ async def get_next(_continuation_token=None): def request_header_response_body( self, *, foo: Optional[str] = None, bar: Optional[str] = None, **kwargs: Any - ) -> AsyncItemPaged["_models4.Pet"]: + ) -> AsyncItemPaged[_models4.Pet]: """request_header_response_body. :keyword foo: Default value is None. @@ -183,7 +183,7 @@ async def get_next(_continuation_token=None): def request_query_response_header( self, *, foo: Optional[str] = None, bar: Optional[str] = None, **kwargs: Any - ) -> AsyncItemPaged["_models4.Pet"]: + ) -> AsyncItemPaged[_models4.Pet]: """request_query_response_header. :keyword foo: Default value is None. @@ -249,7 +249,7 @@ async def get_next(_continuation_token=None): def request_header_response_header( self, *, foo: Optional[str] = None, bar: Optional[str] = None, **kwargs: Any - ) -> AsyncItemPaged["_models4.Pet"]: + ) -> AsyncItemPaged[_models4.Pet]: """request_header_response_header. :keyword foo: Default value is None. @@ -315,7 +315,7 @@ async def get_next(_continuation_token=None): def request_query_nested_response_body( self, *, foo: Optional[str] = None, bar: Optional[str] = None, **kwargs: Any - ) -> AsyncItemPaged["_models4.Pet"]: + ) -> AsyncItemPaged[_models4.Pet]: """request_query_nested_response_body. :keyword foo: Default value is None. @@ -381,7 +381,7 @@ async def get_next(_continuation_token=None): def request_header_nested_response_body( self, *, foo: Optional[str] = None, bar: Optional[str] = None, **kwargs: Any - ) -> AsyncItemPaged["_models4.Pet"]: + ) -> AsyncItemPaged[_models4.Pet]: """request_header_nested_response_body. :keyword foo: Default value is None. diff --git a/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/serverdrivenpagination/continuationtoken/operations/_operations.py b/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/serverdrivenpagination/continuationtoken/operations/_operations.py index 809117db1a..76664a6a2a 100644 --- a/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/serverdrivenpagination/continuationtoken/operations/_operations.py +++ b/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/serverdrivenpagination/continuationtoken/operations/_operations.py @@ -198,7 +198,7 @@ def __init__(self, *args, **kwargs) -> None: def request_query_response_body( self, *, foo: Optional[str] = None, bar: Optional[str] = None, **kwargs: Any - ) -> ItemPaged["_models3.Pet"]: + ) -> ItemPaged[_models3.Pet]: """request_query_response_body. :keyword foo: Default value is None. @@ -264,7 +264,7 @@ def get_next(_continuation_token=None): def request_header_response_body( self, *, foo: Optional[str] = None, bar: Optional[str] = None, **kwargs: Any - ) -> ItemPaged["_models3.Pet"]: + ) -> ItemPaged[_models3.Pet]: """request_header_response_body. :keyword foo: Default value is None. @@ -330,7 +330,7 @@ def get_next(_continuation_token=None): def request_query_response_header( self, *, foo: Optional[str] = None, bar: Optional[str] = None, **kwargs: Any - ) -> ItemPaged["_models3.Pet"]: + ) -> ItemPaged[_models3.Pet]: """request_query_response_header. :keyword foo: Default value is None. @@ -396,7 +396,7 @@ def get_next(_continuation_token=None): def request_header_response_header( self, *, foo: Optional[str] = None, bar: Optional[str] = None, **kwargs: Any - ) -> ItemPaged["_models3.Pet"]: + ) -> ItemPaged[_models3.Pet]: """request_header_response_header. :keyword foo: Default value is None. @@ -462,7 +462,7 @@ def get_next(_continuation_token=None): def request_query_nested_response_body( self, *, foo: Optional[str] = None, bar: Optional[str] = None, **kwargs: Any - ) -> ItemPaged["_models3.Pet"]: + ) -> ItemPaged[_models3.Pet]: """request_query_nested_response_body. :keyword foo: Default value is None. @@ -528,7 +528,7 @@ def get_next(_continuation_token=None): def request_header_nested_response_body( self, *, foo: Optional[str] = None, bar: Optional[str] = None, **kwargs: Any - ) -> ItemPaged["_models3.Pet"]: + ) -> ItemPaged[_models3.Pet]: """request_header_nested_response_body. :keyword foo: Default value is None. diff --git a/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/serverdrivenpagination/operations/_operations.py b/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/serverdrivenpagination/operations/_operations.py index e875452d7d..622a7da44a 100644 --- a/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/serverdrivenpagination/operations/_operations.py +++ b/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/serverdrivenpagination/operations/_operations.py @@ -96,7 +96,7 @@ def __init__(self, *args, **kwargs) -> None: self._client, self._config, self._serialize, self._deserialize ) - def link(self, **kwargs: Any) -> ItemPaged["_models2.Pet"]: + def link(self, **kwargs: Any) -> ItemPaged[_models2.Pet]: """link. :return: An iterator like instance of Pet @@ -166,7 +166,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - def link_string(self, **kwargs: Any) -> ItemPaged["_models2.Pet"]: + def link_string(self, **kwargs: Any) -> ItemPaged[_models2.Pet]: """link_string. :return: An iterator like instance of Pet @@ -236,7 +236,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - def nested_link(self, **kwargs: Any) -> ItemPaged["_models2.Pet"]: + def nested_link(self, **kwargs: Any) -> ItemPaged[_models2.Pet]: """nested_link. :return: An iterator like instance of Pet diff --git a/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/xmlpagination/aio/operations/_operations.py b/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/xmlpagination/aio/operations/_operations.py index a13e9ab261..dce0d75b31 100644 --- a/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/xmlpagination/aio/operations/_operations.py +++ b/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/xmlpagination/aio/operations/_operations.py @@ -46,7 +46,7 @@ def __init__(self, *args, **kwargs) -> None: self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") - def list_with_continuation(self, **kwargs: Any) -> AsyncItemPaged["_models3.XmlPet"]: + def list_with_continuation(self, **kwargs: Any) -> AsyncItemPaged[_models3.XmlPet]: """list_with_continuation. :return: An iterator like instance of XmlPet @@ -105,7 +105,7 @@ async def get_next(_continuation_token=None): return AsyncItemPaged(get_next, extract_data) - def list_with_next_link(self, **kwargs: Any) -> AsyncItemPaged["_models3.XmlPet"]: + def list_with_next_link(self, **kwargs: Any) -> AsyncItemPaged[_models3.XmlPet]: """list_with_next_link. :return: An iterator like instance of XmlPet diff --git a/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/xmlpagination/operations/_operations.py b/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/xmlpagination/operations/_operations.py index 1ffab76298..84c8cd8110 100644 --- a/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/xmlpagination/operations/_operations.py +++ b/packages/typespec-python/tests/generated/unbranded/payload-pageable/payload/pageable/xmlpagination/operations/_operations.py @@ -81,7 +81,7 @@ def __init__(self, *args, **kwargs) -> None: self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") - def list_with_continuation(self, **kwargs: Any) -> ItemPaged["_models2.XmlPet"]: + def list_with_continuation(self, **kwargs: Any) -> ItemPaged[_models2.XmlPet]: """list_with_continuation. :return: An iterator like instance of XmlPet @@ -140,7 +140,7 @@ def get_next(_continuation_token=None): return ItemPaged(get_next, extract_data) - def list_with_next_link(self, **kwargs: Any) -> ItemPaged["_models2.XmlPet"]: + def list_with_next_link(self, **kwargs: Any) -> ItemPaged[_models2.XmlPet]: """list_with_next_link. :return: An iterator like instance of XmlPet diff --git a/packages/typespec-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_client_default_value_async.py b/packages/typespec-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_client_default_value_async.py index 99060e4f09..f4bbaaae04 100644 --- a/packages/typespec-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_client_default_value_async.py +++ b/packages/typespec-python/tests/mock_api/azure/asynctests/test_azure_client_generator_core_client_default_value_async.py @@ -15,16 +15,15 @@ async def client(): yield client -# will reopen after bug fixed -# @pytest.mark.asyncio -# async def test_put_model_property(client: ClientDefaultValueClient): -# """Test case 1: @clientDefaultValue for model property.""" -# body = ModelWithDefaultValues(name="test") -# result = await client.put_model_property(body=body) -# assert result.name == "test" -# assert result.timeout == 30 -# assert result.tier == "standard" -# assert result.retry is True +@pytest.mark.asyncio +async def test_put_model_property(client: ClientDefaultValueClient): + """Test case 1: @clientDefaultValue for model property.""" + body = ModelWithDefaultValues(name="test") + result = await client.put_model_property(body=body) + assert result.name == "test" + assert result.timeout == 30 + assert result.tier == "standard" + assert result.retry is True @pytest.mark.asyncio diff --git a/packages/typespec-python/tests/mock_api/azure/test_azure_client_generator_core_client_default_value.py b/packages/typespec-python/tests/mock_api/azure/test_azure_client_generator_core_client_default_value.py index 8b05d5eb9c..730c6a74b3 100644 --- a/packages/typespec-python/tests/mock_api/azure/test_azure_client_generator_core_client_default_value.py +++ b/packages/typespec-python/tests/mock_api/azure/test_azure_client_generator_core_client_default_value.py @@ -14,15 +14,14 @@ def client(): yield client -# will reopen after bug fixed -# def test_put_model_property(client: ClientDefaultValueClient): -# """Test case 1: @clientDefaultValue for model property.""" -# body = ModelWithDefaultValues(name="test") -# result = client.put_model_property(body=body) -# assert result.name == "test" -# assert result.timeout == 30 -# assert result.tier == "standard" -# assert result.retry is True +def test_put_model_property(client: ClientDefaultValueClient): + """Test case 1: @clientDefaultValue for model property.""" + body = ModelWithDefaultValues(name="test") + result = client.put_model_property(body=body) + assert result.name == "test" + assert result.timeout == 30 + assert result.tier == "standard" + assert result.retry is True def test_get_operation_parameter(client: ClientDefaultValueClient): diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c5012562de..bf98c430e3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -60,8 +60,8 @@ importers: specifier: ~1.0.2 version: 1.0.2 '@typespec/http-client-python': - specifier: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNjI0NjE0NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.28.3.tgz - version: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNjI0NjE0NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.28.3.tgz(y2blksstlsblh3iqmgy3brbone) + specifier: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNjI3ODE4NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.28.3.tgz + version: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNjI3ODE4NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.28.3.tgz(y2blksstlsblh3iqmgy3brbone) fs-extra: specifier: ~11.2.0 version: 11.2.0 @@ -82,8 +82,8 @@ importers: packages/typespec-python: dependencies: '@typespec/http-client-python': - specifier: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNjI0NjE0NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.28.3.tgz - version: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNjI0NjE0NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.28.3.tgz(y2blksstlsblh3iqmgy3brbone) + specifier: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNjI3ODE4NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.28.3.tgz + version: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNjI3ODE4NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.28.3.tgz(y2blksstlsblh3iqmgy3brbone) fs-extra: specifier: ~11.2.0 version: 11.2.0 @@ -1723,8 +1723,8 @@ packages: peerDependencies: '@typespec/compiler': ^1.11.0 - '@typespec/http-client-python@https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNjI0NjE0NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.28.3.tgz': - resolution: {tarball: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNjI0NjE0NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.28.3.tgz} + '@typespec/http-client-python@https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNjI3ODE4NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.28.3.tgz': + resolution: {tarball: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNjI3ODE4NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.28.3.tgz} version: 0.28.3 engines: {node: '>=20.0.0'} peerDependencies: @@ -6708,7 +6708,7 @@ snapshots: dependencies: '@typespec/compiler': 1.11.0(@types/node@25.0.10) - '@typespec/http-client-python@https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNjI0NjE0NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.28.3.tgz(y2blksstlsblh3iqmgy3brbone)': + '@typespec/http-client-python@https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNjI3ODE4NC9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.28.3.tgz(y2blksstlsblh3iqmgy3brbone)': dependencies: '@azure-tools/typespec-autorest': 0.67.0(7o3sem7p6i3t4jykacdovvl7ii) '@azure-tools/typespec-azure-core': 0.67.0(@typespec/compiler@1.11.0(@types/node@25.0.10))(@typespec/http@1.11.0(@typespec/compiler@1.11.0(@types/node@25.0.10))(@typespec/streams@0.81.0(@typespec/compiler@1.11.0(@types/node@25.0.10))))(@typespec/rest@0.81.0(@typespec/compiler@1.11.0(@types/node@25.0.10))(@typespec/http@1.11.0(@typespec/compiler@1.11.0(@types/node@25.0.10))(@typespec/streams@0.81.0(@typespec/compiler@1.11.0(@types/node@25.0.10)))))