diff --git a/sdk/cognitivelanguage/azure-ai-language-conversations/azure/ai/language/conversations/authoring/_operations/_operations.py b/sdk/cognitivelanguage/azure-ai-language-conversations/azure/ai/language/conversations/authoring/_operations/_operations.py index fd3ae0412989..4f96bb04ebef 100644 --- a/sdk/cognitivelanguage/azure-ai-language-conversations/azure/ai/language/conversations/authoring/_operations/_operations.py +++ b/sdk/cognitivelanguage/azure-ai-language-conversations/azure/ai/language/conversations/authoring/_operations/_operations.py @@ -8,6 +8,7 @@ # -------------------------------------------------------------------------- import sys from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, cast, overload +from urllib.parse import parse_qs, urljoin, urlparse from azure.core.exceptions import ( ClientAuthenticationError, @@ -40,9 +41,7 @@ _SERIALIZER.client_side_validation = False -def build_list_projects_request( - *, top: Optional[int] = None, skip: Optional[int] = None, maxpagesize: Optional[int] = None, **kwargs: Any -) -> HttpRequest: +def build_list_projects_request(*, top: Optional[int] = None, skip: Optional[int] = None, **kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -57,8 +56,6 @@ def build_list_projects_request( _params["top"] = _SERIALIZER.query("top", top, "int") if skip is not None: _params["skip"] = _SERIALIZER.query("skip", skip, "int") - if maxpagesize is not None: - _params["maxpagesize"] = _SERIALIZER.query("maxpagesize", maxpagesize, "int") _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers @@ -236,12 +233,7 @@ def build_train_request(project_name: str, **kwargs: Any) -> HttpRequest: def build_list_deployments_request( - project_name: str, - *, - top: Optional[int] = None, - skip: Optional[int] = None, - maxpagesize: Optional[int] = None, - **kwargs: Any + project_name: str, *, top: Optional[int] = None, skip: Optional[int] = None, **kwargs: Any ) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -262,8 +254,6 @@ def build_list_deployments_request( _params["top"] = _SERIALIZER.query("top", top, "int") if skip is not None: _params["skip"] = _SERIALIZER.query("skip", skip, "int") - if maxpagesize is not None: - _params["maxpagesize"] = _SERIALIZER.query("maxpagesize", maxpagesize, "int") _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers @@ -481,12 +471,7 @@ def build_get_import_project_job_status_request(project_name: str, job_id: str, def build_list_trained_models_request( - project_name: str, - *, - top: Optional[int] = None, - skip: Optional[int] = None, - maxpagesize: Optional[int] = None, - **kwargs: Any + project_name: str, *, top: Optional[int] = None, skip: Optional[int] = None, **kwargs: Any ) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -507,8 +492,6 @@ def build_list_trained_models_request( _params["top"] = _SERIALIZER.query("top", top, "int") if skip is not None: _params["skip"] = _SERIALIZER.query("skip", skip, "int") - if maxpagesize is not None: - _params["maxpagesize"] = _SERIALIZER.query("maxpagesize", maxpagesize, "int") _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers @@ -574,7 +557,6 @@ def build_list_model_evaluation_results_request( string_index_type: str, top: Optional[int] = None, skip: Optional[int] = None, - maxpagesize: Optional[int] = None, **kwargs: Any ) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) @@ -598,8 +580,6 @@ def build_list_model_evaluation_results_request( _params["top"] = _SERIALIZER.query("top", top, "int") if skip is not None: _params["skip"] = _SERIALIZER.query("skip", skip, "int") - if maxpagesize is not None: - _params["maxpagesize"] = _SERIALIZER.query("maxpagesize", maxpagesize, "int") _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers @@ -638,12 +618,7 @@ def build_get_model_evaluation_summary_request( def build_list_training_jobs_request( - project_name: str, - *, - top: Optional[int] = None, - skip: Optional[int] = None, - maxpagesize: Optional[int] = None, - **kwargs: Any + project_name: str, *, top: Optional[int] = None, skip: Optional[int] = None, **kwargs: Any ) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -664,8 +639,6 @@ def build_list_training_jobs_request( _params["top"] = _SERIALIZER.query("top", top, "int") if skip is not None: _params["skip"] = _SERIALIZER.query("skip", skip, "int") - if maxpagesize is not None: - _params["maxpagesize"] = _SERIALIZER.query("maxpagesize", maxpagesize, "int") _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers @@ -749,12 +722,7 @@ def build_get_project_deletion_job_status_request(job_id: str, **kwargs: Any) -> def build_list_supported_languages_request( - *, - project_kind: str, - top: Optional[int] = None, - skip: Optional[int] = None, - maxpagesize: Optional[int] = None, - **kwargs: Any + *, project_kind: str, top: Optional[int] = None, skip: Optional[int] = None, **kwargs: Any ) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -771,8 +739,6 @@ def build_list_supported_languages_request( _params["top"] = _SERIALIZER.query("top", top, "int") if skip is not None: _params["skip"] = _SERIALIZER.query("skip", skip, "int") - if maxpagesize is not None: - _params["maxpagesize"] = _SERIALIZER.query("maxpagesize", maxpagesize, "int") _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers @@ -787,7 +753,6 @@ def build_list_supported_prebuilt_entities_request( multilingual: Optional[bool] = None, top: Optional[int] = None, skip: Optional[int] = None, - maxpagesize: Optional[int] = None, **kwargs: Any ) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) @@ -808,8 +773,6 @@ def build_list_supported_prebuilt_entities_request( _params["top"] = _SERIALIZER.query("top", top, "int") if skip is not None: _params["skip"] = _SERIALIZER.query("skip", skip, "int") - if maxpagesize is not None: - _params["maxpagesize"] = _SERIALIZER.query("maxpagesize", maxpagesize, "int") _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers @@ -819,12 +782,7 @@ def build_list_supported_prebuilt_entities_request( def build_list_training_config_versions_request( - *, - project_kind: str, - top: Optional[int] = None, - skip: Optional[int] = None, - maxpagesize: Optional[int] = None, - **kwargs: Any + *, project_kind: str, top: Optional[int] = None, skip: Optional[int] = None, **kwargs: Any ) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -841,8 +799,6 @@ def build_list_training_config_versions_request( _params["top"] = _SERIALIZER.query("top", top, "int") if skip is not None: _params["skip"] = _SERIALIZER.query("skip", skip, "int") - if maxpagesize is not None: - _params["maxpagesize"] = _SERIALIZER.query("maxpagesize", maxpagesize, "int") _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers @@ -853,9 +809,7 @@ def build_list_training_config_versions_request( class ConversationAuthoringClientOperationsMixin(MixinABC): # pylint: disable=too-many-public-methods @distributed_trace - def list_projects( - self, *, top: Optional[int] = None, skip: Optional[int] = None, maxpagesize: Optional[int] = None, **kwargs: Any - ) -> Iterable[JSON]: + def list_projects(self, *, top: Optional[int] = None, skip: Optional[int] = None, **kwargs: Any) -> Iterable[JSON]: """Lists the existing projects. :keyword top: The maximum number of resources to return from the collection. Default value is @@ -864,9 +818,6 @@ def list_projects( :keyword skip: An offset into the collection of the first resource to be returned. Default value is None. :paramtype skip: int - :keyword maxpagesize: The maximum number of resources to include in a single response. Default - value is None. - :paramtype maxpagesize: int :return: An iterator like instance of JSON object :rtype: ~azure.core.paging.ItemPaged[JSON] :raises ~azure.core.exceptions.HttpResponseError: @@ -914,7 +865,6 @@ def prepare_request(next_link=None): request = build_list_projects_request( top=top, skip=skip, - maxpagesize=maxpagesize, api_version=self._config.api_version, headers=_headers, params=_params, @@ -927,7 +877,11 @@ def prepare_request(next_link=None): request.url = self._client.format_url(request.url, **path_format_arguments) # type: ignore else: - request = HttpRequest("GET", next_link) + # make call to next link with the client's api-version + _parsed_next_link = urlparse(next_link) + _next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query)) + _next_request_params["api-version"] = self._config.api_version + request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params) path_format_arguments = { "Endpoint": self._serialize.url( "self._config.endpoint", self._config.endpoint, "str", skip_quote=True @@ -2524,13 +2478,7 @@ def get_long_running_output(pipeline_response): @distributed_trace def list_deployments( - self, - project_name: str, - *, - top: Optional[int] = None, - skip: Optional[int] = None, - maxpagesize: Optional[int] = None, - **kwargs: Any + self, project_name: str, *, top: Optional[int] = None, skip: Optional[int] = None, **kwargs: Any ) -> Iterable[JSON]: """Lists the deployments belonging to a project. @@ -2542,9 +2490,6 @@ def list_deployments( :keyword skip: An offset into the collection of the first resource to be returned. Default value is None. :paramtype skip: int - :keyword maxpagesize: The maximum number of resources to include in a single response. Default - value is None. - :paramtype maxpagesize: int :return: An iterator like instance of JSON object :rtype: ~azure.core.paging.ItemPaged[JSON] :raises ~azure.core.exceptions.HttpResponseError: @@ -2581,7 +2526,6 @@ def prepare_request(next_link=None): project_name=project_name, top=top, skip=skip, - maxpagesize=maxpagesize, api_version=self._config.api_version, headers=_headers, params=_params, @@ -2594,7 +2538,11 @@ def prepare_request(next_link=None): request.url = self._client.format_url(request.url, **path_format_arguments) # type: ignore else: - request = HttpRequest("GET", next_link) + # make call to next link with the client's api-version + _parsed_next_link = urlparse(next_link) + _next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query)) + _next_request_params["api-version"] = self._config.api_version + request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params) path_format_arguments = { "Endpoint": self._serialize.url( "self._config.endpoint", self._config.endpoint, "str", skip_quote=True @@ -3949,13 +3897,7 @@ def get_import_project_job_status(self, project_name: str, job_id: str, **kwargs @distributed_trace def list_trained_models( - self, - project_name: str, - *, - top: Optional[int] = None, - skip: Optional[int] = None, - maxpagesize: Optional[int] = None, - **kwargs: Any + self, project_name: str, *, top: Optional[int] = None, skip: Optional[int] = None, **kwargs: Any ) -> Iterable[JSON]: """Lists the trained models belonging to a project. @@ -3967,9 +3909,6 @@ def list_trained_models( :keyword skip: An offset into the collection of the first resource to be returned. Default value is None. :paramtype skip: int - :keyword maxpagesize: The maximum number of resources to include in a single response. Default - value is None. - :paramtype maxpagesize: int :return: An iterator like instance of JSON object :rtype: ~azure.core.paging.ItemPaged[JSON] :raises ~azure.core.exceptions.HttpResponseError: @@ -4005,7 +3944,6 @@ def prepare_request(next_link=None): project_name=project_name, top=top, skip=skip, - maxpagesize=maxpagesize, api_version=self._config.api_version, headers=_headers, params=_params, @@ -4018,7 +3956,11 @@ def prepare_request(next_link=None): request.url = self._client.format_url(request.url, **path_format_arguments) # type: ignore else: - request = HttpRequest("GET", next_link) + # make call to next link with the client's api-version + _parsed_next_link = urlparse(next_link) + _next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query)) + _next_request_params["api-version"] = self._config.api_version + request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params) path_format_arguments = { "Endpoint": self._serialize.url( "self._config.endpoint", self._config.endpoint, "str", skip_quote=True @@ -4175,7 +4117,6 @@ def list_model_evaluation_results( string_index_type: str, top: Optional[int] = None, skip: Optional[int] = None, - maxpagesize: Optional[int] = None, **kwargs: Any ) -> Iterable[JSON]: """Gets the detailed results of the evaluation for a trained model. This includes the raw @@ -4194,9 +4135,6 @@ def list_model_evaluation_results( :keyword skip: An offset into the collection of the first resource to be returned. Default value is None. :paramtype skip: int - :keyword maxpagesize: The maximum number of resources to include in a single response. Default - value is None. - :paramtype maxpagesize: int :return: An iterator like instance of JSON object :rtype: ~azure.core.paging.ItemPaged[JSON] :raises ~azure.core.exceptions.HttpResponseError: @@ -4257,7 +4195,6 @@ def prepare_request(next_link=None): string_index_type=string_index_type, top=top, skip=skip, - maxpagesize=maxpagesize, api_version=self._config.api_version, headers=_headers, params=_params, @@ -4270,7 +4207,11 @@ def prepare_request(next_link=None): request.url = self._client.format_url(request.url, **path_format_arguments) # type: ignore else: - request = HttpRequest("GET", next_link) + # make call to next link with the client's api-version + _parsed_next_link = urlparse(next_link) + _next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query)) + _next_request_params["api-version"] = self._config.api_version + request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params) path_format_arguments = { "Endpoint": self._serialize.url( "self._config.endpoint", self._config.endpoint, "str", skip_quote=True @@ -4448,13 +4389,7 @@ def get_model_evaluation_summary(self, project_name: str, trained_model_label: s @distributed_trace def list_training_jobs( - self, - project_name: str, - *, - top: Optional[int] = None, - skip: Optional[int] = None, - maxpagesize: Optional[int] = None, - **kwargs: Any + self, project_name: str, *, top: Optional[int] = None, skip: Optional[int] = None, **kwargs: Any ) -> Iterable[JSON]: """Lists the non-expired training jobs created for a project. @@ -4466,9 +4401,6 @@ def list_training_jobs( :keyword skip: An offset into the collection of the first resource to be returned. Default value is None. :paramtype skip: int - :keyword maxpagesize: The maximum number of resources to include in a single response. Default - value is None. - :paramtype maxpagesize: int :return: An iterator like instance of JSON object :rtype: ~azure.core.paging.ItemPaged[JSON] :raises ~azure.core.exceptions.HttpResponseError: @@ -4579,7 +4511,6 @@ def prepare_request(next_link=None): project_name=project_name, top=top, skip=skip, - maxpagesize=maxpagesize, api_version=self._config.api_version, headers=_headers, params=_params, @@ -4592,7 +4523,11 @@ def prepare_request(next_link=None): request.url = self._client.format_url(request.url, **path_format_arguments) # type: ignore else: - request = HttpRequest("GET", next_link) + # make call to next link with the client's api-version + _parsed_next_link = urlparse(next_link) + _next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query)) + _next_request_params["api-version"] = self._config.api_version + request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params) path_format_arguments = { "Endpoint": self._serialize.url( "self._config.endpoint", self._config.endpoint, "str", skip_quote=True @@ -5085,13 +5020,7 @@ def get_project_deletion_job_status(self, job_id: str, **kwargs: Any) -> JSON: @distributed_trace def list_supported_languages( - self, - *, - project_kind: str, - top: Optional[int] = None, - skip: Optional[int] = None, - maxpagesize: Optional[int] = None, - **kwargs: Any + self, *, project_kind: str, top: Optional[int] = None, skip: Optional[int] = None, **kwargs: Any ) -> Iterable[JSON]: """Lists the supported languages for the given project type. @@ -5104,9 +5033,6 @@ def list_supported_languages( :keyword skip: An offset into the collection of the first resource to be returned. Default value is None. :paramtype skip: int - :keyword maxpagesize: The maximum number of resources to include in a single response. Default - value is None. - :paramtype maxpagesize: int :return: An iterator like instance of JSON object :rtype: ~azure.core.paging.ItemPaged[JSON] :raises ~azure.core.exceptions.HttpResponseError: @@ -5137,7 +5063,6 @@ def prepare_request(next_link=None): project_kind=project_kind, top=top, skip=skip, - maxpagesize=maxpagesize, api_version=self._config.api_version, headers=_headers, params=_params, @@ -5150,7 +5075,11 @@ def prepare_request(next_link=None): request.url = self._client.format_url(request.url, **path_format_arguments) # type: ignore else: - request = HttpRequest("GET", next_link) + # make call to next link with the client's api-version + _parsed_next_link = urlparse(next_link) + _next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query)) + _next_request_params["api-version"] = self._config.api_version + request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params) path_format_arguments = { "Endpoint": self._serialize.url( "self._config.endpoint", self._config.endpoint, "str", skip_quote=True @@ -5191,7 +5120,6 @@ def list_supported_prebuilt_entities( multilingual: Optional[bool] = None, top: Optional[int] = None, skip: Optional[int] = None, - maxpagesize: Optional[int] = None, **kwargs: Any ) -> Iterable[JSON]: """Lists the supported prebuilt entities that can be used while creating composed entities. @@ -5209,9 +5137,6 @@ def list_supported_prebuilt_entities( :keyword skip: An offset into the collection of the first resource to be returned. Default value is None. :paramtype skip: int - :keyword maxpagesize: The maximum number of resources to include in a single response. Default - value is None. - :paramtype maxpagesize: int :return: An iterator like instance of JSON object :rtype: ~azure.core.paging.ItemPaged[JSON] :raises ~azure.core.exceptions.HttpResponseError: @@ -5242,7 +5167,6 @@ def prepare_request(next_link=None): multilingual=multilingual, top=top, skip=skip, - maxpagesize=maxpagesize, api_version=self._config.api_version, headers=_headers, params=_params, @@ -5255,7 +5179,11 @@ def prepare_request(next_link=None): request.url = self._client.format_url(request.url, **path_format_arguments) # type: ignore else: - request = HttpRequest("GET", next_link) + # make call to next link with the client's api-version + _parsed_next_link = urlparse(next_link) + _next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query)) + _next_request_params["api-version"] = self._config.api_version + request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params) path_format_arguments = { "Endpoint": self._serialize.url( "self._config.endpoint", self._config.endpoint, "str", skip_quote=True @@ -5290,13 +5218,7 @@ def get_next(next_link=None): @distributed_trace def list_training_config_versions( - self, - *, - project_kind: str, - top: Optional[int] = None, - skip: Optional[int] = None, - maxpagesize: Optional[int] = None, - **kwargs: Any + self, *, project_kind: str, top: Optional[int] = None, skip: Optional[int] = None, **kwargs: Any ) -> Iterable[JSON]: """Lists the support training config version for a given project type. @@ -5309,9 +5231,6 @@ def list_training_config_versions( :keyword skip: An offset into the collection of the first resource to be returned. Default value is None. :paramtype skip: int - :keyword maxpagesize: The maximum number of resources to include in a single response. Default - value is None. - :paramtype maxpagesize: int :return: An iterator like instance of JSON object :rtype: ~azure.core.paging.ItemPaged[JSON] :raises ~azure.core.exceptions.HttpResponseError: @@ -5342,7 +5261,6 @@ def prepare_request(next_link=None): project_kind=project_kind, top=top, skip=skip, - maxpagesize=maxpagesize, api_version=self._config.api_version, headers=_headers, params=_params, @@ -5355,7 +5273,11 @@ def prepare_request(next_link=None): request.url = self._client.format_url(request.url, **path_format_arguments) # type: ignore else: - request = HttpRequest("GET", next_link) + # make call to next link with the client's api-version + _parsed_next_link = urlparse(next_link) + _next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query)) + _next_request_params["api-version"] = self._config.api_version + request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params) path_format_arguments = { "Endpoint": self._serialize.url( "self._config.endpoint", self._config.endpoint, "str", skip_quote=True diff --git a/sdk/cognitivelanguage/azure-ai-language-conversations/azure/ai/language/conversations/authoring/aio/_operations/_operations.py b/sdk/cognitivelanguage/azure-ai-language-conversations/azure/ai/language/conversations/authoring/aio/_operations/_operations.py index 349e501601f3..e023ff47ad92 100644 --- a/sdk/cognitivelanguage/azure-ai-language-conversations/azure/ai/language/conversations/authoring/aio/_operations/_operations.py +++ b/sdk/cognitivelanguage/azure-ai-language-conversations/azure/ai/language/conversations/authoring/aio/_operations/_operations.py @@ -8,6 +8,7 @@ # -------------------------------------------------------------------------- import sys from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +from urllib.parse import parse_qs, urljoin, urlparse from azure.core.async_paging import AsyncItemPaged, AsyncList from azure.core.exceptions import ( @@ -70,7 +71,7 @@ class ConversationAuthoringClientOperationsMixin(MixinABC): # pylint: disable=too-many-public-methods @distributed_trace def list_projects( - self, *, top: Optional[int] = None, skip: Optional[int] = None, maxpagesize: Optional[int] = None, **kwargs: Any + self, *, top: Optional[int] = None, skip: Optional[int] = None, **kwargs: Any ) -> AsyncIterable[JSON]: """Lists the existing projects. @@ -80,9 +81,6 @@ def list_projects( :keyword skip: An offset into the collection of the first resource to be returned. Default value is None. :paramtype skip: int - :keyword maxpagesize: The maximum number of resources to include in a single response. Default - value is None. - :paramtype maxpagesize: int :return: An iterator like instance of JSON object :rtype: ~azure.core.async_paging.AsyncItemPaged[JSON] :raises ~azure.core.exceptions.HttpResponseError: @@ -130,7 +128,6 @@ def prepare_request(next_link=None): request = build_list_projects_request( top=top, skip=skip, - maxpagesize=maxpagesize, api_version=self._config.api_version, headers=_headers, params=_params, @@ -143,7 +140,11 @@ def prepare_request(next_link=None): request.url = self._client.format_url(request.url, **path_format_arguments) # type: ignore else: - request = HttpRequest("GET", next_link) + # make call to next link with the client's api-version + _parsed_next_link = urlparse(next_link) + _next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query)) + _next_request_params["api-version"] = self._config.api_version + request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params) path_format_arguments = { "Endpoint": self._serialize.url( "self._config.endpoint", self._config.endpoint, "str", skip_quote=True @@ -1746,13 +1747,7 @@ def get_long_running_output(pipeline_response): @distributed_trace def list_deployments( - self, - project_name: str, - *, - top: Optional[int] = None, - skip: Optional[int] = None, - maxpagesize: Optional[int] = None, - **kwargs: Any + self, project_name: str, *, top: Optional[int] = None, skip: Optional[int] = None, **kwargs: Any ) -> AsyncIterable[JSON]: """Lists the deployments belonging to a project. @@ -1764,9 +1759,6 @@ def list_deployments( :keyword skip: An offset into the collection of the first resource to be returned. Default value is None. :paramtype skip: int - :keyword maxpagesize: The maximum number of resources to include in a single response. Default - value is None. - :paramtype maxpagesize: int :return: An iterator like instance of JSON object :rtype: ~azure.core.async_paging.AsyncItemPaged[JSON] :raises ~azure.core.exceptions.HttpResponseError: @@ -1803,7 +1795,6 @@ def prepare_request(next_link=None): project_name=project_name, top=top, skip=skip, - maxpagesize=maxpagesize, api_version=self._config.api_version, headers=_headers, params=_params, @@ -1816,7 +1807,11 @@ def prepare_request(next_link=None): request.url = self._client.format_url(request.url, **path_format_arguments) # type: ignore else: - request = HttpRequest("GET", next_link) + # make call to next link with the client's api-version + _parsed_next_link = urlparse(next_link) + _next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query)) + _next_request_params["api-version"] = self._config.api_version + request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params) path_format_arguments = { "Endpoint": self._serialize.url( "self._config.endpoint", self._config.endpoint, "str", skip_quote=True @@ -3182,13 +3177,7 @@ async def get_import_project_job_status(self, project_name: str, job_id: str, ** @distributed_trace def list_trained_models( - self, - project_name: str, - *, - top: Optional[int] = None, - skip: Optional[int] = None, - maxpagesize: Optional[int] = None, - **kwargs: Any + self, project_name: str, *, top: Optional[int] = None, skip: Optional[int] = None, **kwargs: Any ) -> AsyncIterable[JSON]: """Lists the trained models belonging to a project. @@ -3200,9 +3189,6 @@ def list_trained_models( :keyword skip: An offset into the collection of the first resource to be returned. Default value is None. :paramtype skip: int - :keyword maxpagesize: The maximum number of resources to include in a single response. Default - value is None. - :paramtype maxpagesize: int :return: An iterator like instance of JSON object :rtype: ~azure.core.async_paging.AsyncItemPaged[JSON] :raises ~azure.core.exceptions.HttpResponseError: @@ -3238,7 +3224,6 @@ def prepare_request(next_link=None): project_name=project_name, top=top, skip=skip, - maxpagesize=maxpagesize, api_version=self._config.api_version, headers=_headers, params=_params, @@ -3251,7 +3236,11 @@ def prepare_request(next_link=None): request.url = self._client.format_url(request.url, **path_format_arguments) # type: ignore else: - request = HttpRequest("GET", next_link) + # make call to next link with the client's api-version + _parsed_next_link = urlparse(next_link) + _next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query)) + _next_request_params["api-version"] = self._config.api_version + request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params) path_format_arguments = { "Endpoint": self._serialize.url( "self._config.endpoint", self._config.endpoint, "str", skip_quote=True @@ -3408,7 +3397,6 @@ def list_model_evaluation_results( string_index_type: str, top: Optional[int] = None, skip: Optional[int] = None, - maxpagesize: Optional[int] = None, **kwargs: Any ) -> AsyncIterable[JSON]: """Gets the detailed results of the evaluation for a trained model. This includes the raw @@ -3427,9 +3415,6 @@ def list_model_evaluation_results( :keyword skip: An offset into the collection of the first resource to be returned. Default value is None. :paramtype skip: int - :keyword maxpagesize: The maximum number of resources to include in a single response. Default - value is None. - :paramtype maxpagesize: int :return: An iterator like instance of JSON object :rtype: ~azure.core.async_paging.AsyncItemPaged[JSON] :raises ~azure.core.exceptions.HttpResponseError: @@ -3490,7 +3475,6 @@ def prepare_request(next_link=None): string_index_type=string_index_type, top=top, skip=skip, - maxpagesize=maxpagesize, api_version=self._config.api_version, headers=_headers, params=_params, @@ -3503,7 +3487,11 @@ def prepare_request(next_link=None): request.url = self._client.format_url(request.url, **path_format_arguments) # type: ignore else: - request = HttpRequest("GET", next_link) + # make call to next link with the client's api-version + _parsed_next_link = urlparse(next_link) + _next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query)) + _next_request_params["api-version"] = self._config.api_version + request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params) path_format_arguments = { "Endpoint": self._serialize.url( "self._config.endpoint", self._config.endpoint, "str", skip_quote=True @@ -3681,13 +3669,7 @@ async def get_model_evaluation_summary(self, project_name: str, trained_model_la @distributed_trace def list_training_jobs( - self, - project_name: str, - *, - top: Optional[int] = None, - skip: Optional[int] = None, - maxpagesize: Optional[int] = None, - **kwargs: Any + self, project_name: str, *, top: Optional[int] = None, skip: Optional[int] = None, **kwargs: Any ) -> AsyncIterable[JSON]: """Lists the non-expired training jobs created for a project. @@ -3699,9 +3681,6 @@ def list_training_jobs( :keyword skip: An offset into the collection of the first resource to be returned. Default value is None. :paramtype skip: int - :keyword maxpagesize: The maximum number of resources to include in a single response. Default - value is None. - :paramtype maxpagesize: int :return: An iterator like instance of JSON object :rtype: ~azure.core.async_paging.AsyncItemPaged[JSON] :raises ~azure.core.exceptions.HttpResponseError: @@ -3812,7 +3791,6 @@ def prepare_request(next_link=None): project_name=project_name, top=top, skip=skip, - maxpagesize=maxpagesize, api_version=self._config.api_version, headers=_headers, params=_params, @@ -3825,7 +3803,11 @@ def prepare_request(next_link=None): request.url = self._client.format_url(request.url, **path_format_arguments) # type: ignore else: - request = HttpRequest("GET", next_link) + # make call to next link with the client's api-version + _parsed_next_link = urlparse(next_link) + _next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query)) + _next_request_params["api-version"] = self._config.api_version + request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params) path_format_arguments = { "Endpoint": self._serialize.url( "self._config.endpoint", self._config.endpoint, "str", skip_quote=True @@ -4319,13 +4301,7 @@ async def get_project_deletion_job_status(self, job_id: str, **kwargs: Any) -> J @distributed_trace def list_supported_languages( - self, - *, - project_kind: str, - top: Optional[int] = None, - skip: Optional[int] = None, - maxpagesize: Optional[int] = None, - **kwargs: Any + self, *, project_kind: str, top: Optional[int] = None, skip: Optional[int] = None, **kwargs: Any ) -> AsyncIterable[JSON]: """Lists the supported languages for the given project type. @@ -4338,9 +4314,6 @@ def list_supported_languages( :keyword skip: An offset into the collection of the first resource to be returned. Default value is None. :paramtype skip: int - :keyword maxpagesize: The maximum number of resources to include in a single response. Default - value is None. - :paramtype maxpagesize: int :return: An iterator like instance of JSON object :rtype: ~azure.core.async_paging.AsyncItemPaged[JSON] :raises ~azure.core.exceptions.HttpResponseError: @@ -4371,7 +4344,6 @@ def prepare_request(next_link=None): project_kind=project_kind, top=top, skip=skip, - maxpagesize=maxpagesize, api_version=self._config.api_version, headers=_headers, params=_params, @@ -4384,7 +4356,11 @@ def prepare_request(next_link=None): request.url = self._client.format_url(request.url, **path_format_arguments) # type: ignore else: - request = HttpRequest("GET", next_link) + # make call to next link with the client's api-version + _parsed_next_link = urlparse(next_link) + _next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query)) + _next_request_params["api-version"] = self._config.api_version + request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params) path_format_arguments = { "Endpoint": self._serialize.url( "self._config.endpoint", self._config.endpoint, "str", skip_quote=True @@ -4425,7 +4401,6 @@ def list_supported_prebuilt_entities( multilingual: Optional[bool] = None, top: Optional[int] = None, skip: Optional[int] = None, - maxpagesize: Optional[int] = None, **kwargs: Any ) -> AsyncIterable[JSON]: """Lists the supported prebuilt entities that can be used while creating composed entities. @@ -4443,9 +4418,6 @@ def list_supported_prebuilt_entities( :keyword skip: An offset into the collection of the first resource to be returned. Default value is None. :paramtype skip: int - :keyword maxpagesize: The maximum number of resources to include in a single response. Default - value is None. - :paramtype maxpagesize: int :return: An iterator like instance of JSON object :rtype: ~azure.core.async_paging.AsyncItemPaged[JSON] :raises ~azure.core.exceptions.HttpResponseError: @@ -4476,7 +4448,6 @@ def prepare_request(next_link=None): multilingual=multilingual, top=top, skip=skip, - maxpagesize=maxpagesize, api_version=self._config.api_version, headers=_headers, params=_params, @@ -4489,7 +4460,11 @@ def prepare_request(next_link=None): request.url = self._client.format_url(request.url, **path_format_arguments) # type: ignore else: - request = HttpRequest("GET", next_link) + # make call to next link with the client's api-version + _parsed_next_link = urlparse(next_link) + _next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query)) + _next_request_params["api-version"] = self._config.api_version + request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params) path_format_arguments = { "Endpoint": self._serialize.url( "self._config.endpoint", self._config.endpoint, "str", skip_quote=True @@ -4524,13 +4499,7 @@ async def get_next(next_link=None): @distributed_trace def list_training_config_versions( - self, - *, - project_kind: str, - top: Optional[int] = None, - skip: Optional[int] = None, - maxpagesize: Optional[int] = None, - **kwargs: Any + self, *, project_kind: str, top: Optional[int] = None, skip: Optional[int] = None, **kwargs: Any ) -> AsyncIterable[JSON]: """Lists the support training config version for a given project type. @@ -4543,9 +4512,6 @@ def list_training_config_versions( :keyword skip: An offset into the collection of the first resource to be returned. Default value is None. :paramtype skip: int - :keyword maxpagesize: The maximum number of resources to include in a single response. Default - value is None. - :paramtype maxpagesize: int :return: An iterator like instance of JSON object :rtype: ~azure.core.async_paging.AsyncItemPaged[JSON] :raises ~azure.core.exceptions.HttpResponseError: @@ -4576,7 +4542,6 @@ def prepare_request(next_link=None): project_kind=project_kind, top=top, skip=skip, - maxpagesize=maxpagesize, api_version=self._config.api_version, headers=_headers, params=_params, @@ -4589,7 +4554,11 @@ def prepare_request(next_link=None): request.url = self._client.format_url(request.url, **path_format_arguments) # type: ignore else: - request = HttpRequest("GET", next_link) + # make call to next link with the client's api-version + _parsed_next_link = urlparse(next_link) + _next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query)) + _next_request_params["api-version"] = self._config.api_version + request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params) path_format_arguments = { "Endpoint": self._serialize.url( "self._config.endpoint", self._config.endpoint, "str", skip_quote=True