Skip to content

Commit

Permalink
make msrest thirdparty import (#1147)
Browse files Browse the repository at this point in the history
  • Loading branch information
@iscai-msft
iscai-msft authored Feb 9, 2022
1 parent 56b9e23 commit b41e78f
Show file tree
Hide file tree
Showing 828 changed files with 1,655 additions and 850 deletions.
4 changes: 2 additions & 2 deletions autorest/codegen/models/client.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ def pipeline_class(self, async_mode: bool) -> str:
def _imports_shared(self, async_mode: bool) -> FileImport:
file_import = FileImport()

file_import.add_submodule_import("msrest", "Serializer", ImportType.AZURECORE)
file_import.add_submodule_import("msrest", "Deserializer", ImportType.AZURECORE)
file_import.add_submodule_import("msrest", "Serializer", ImportType.THIRDPARTY)
file_import.add_submodule_import("msrest", "Deserializer", ImportType.THIRDPARTY)
file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, TypingSection.CONDITIONAL)

any_optional_gp = any(not gp.required for gp in self.parameters)
Expand Down
2 changes: 1 addition & 1 deletion autorest/codegen/models/request_builder.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ def imports(self) -> FileImport:
file_import.add_submodule_import(
"typing", "Any", ImportType.STDLIB, typing_section=TypingSection.CONDITIONAL
)
file_import.add_submodule_import("msrest", "Serializer", ImportType.AZURECORE)
file_import.add_submodule_import("msrest", "Serializer", ImportType.THIRDPARTY)
if self.parameters.has_body and (
self.code_model.options["builders_visibility"] != "embedded" or
self.code_model.options["add_python3_operation_files"]
Expand Down
3 changes: 2 additions & 1 deletion ...zure_key_credential/generated/azure/key/credential/sample/_auto_rest_head_test_service.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
from copy import deepcopy
from typing import TYPE_CHECKING

from azure.core import PipelineClient
from msrest import Deserializer, Serializer

from azure.core import PipelineClient

from ._configuration import AutoRestHeadTestServiceConfiguration
from .operations import HttpSuccessOperations

Expand Down
3 changes: 2 additions & 1 deletion ..._key_credential/generated/azure/key/credential/sample/aio/_auto_rest_head_test_service.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@
from copy import deepcopy
from typing import Any, Awaitable, TYPE_CHECKING

from msrest import Deserializer, Serializer

from azure.core import AsyncPipelineClient
from azure.core.credentials import AzureKeyCredential
from azure.core.rest import AsyncHttpResponse, HttpRequest
from msrest import Deserializer, Serializer

from ._configuration import AutoRestHeadTestServiceConfiguration
from .operations import HttpSuccessOperations
Expand Down
3 changes: 2 additions & 1 deletion ...y_credential/generated/azure/key/credential/sample/operations/_http_success_operations.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@
# --------------------------------------------------------------------------
from typing import TYPE_CHECKING

from msrest import Serializer

from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error
from azure.core.pipeline import PipelineResponse
from azure.core.pipeline.transport import HttpResponse
from azure.core.rest import HttpRequest
from azure.core.tracing.decorator import distributed_trace
from msrest import Serializer

from .._vendor import _convert_request

Expand Down
3 changes: 2 additions & 1 deletion .../samples/specification/basic/generated/azure/basic/sample/_auto_rest_head_test_service.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
from copy import deepcopy
from typing import TYPE_CHECKING

from azure.core import PipelineClient
from msrest import Deserializer, Serializer

from azure.core import PipelineClient

from ._configuration import AutoRestHeadTestServiceConfiguration
from .operations import HttpSuccessOperations

Expand Down
3 changes: 2 additions & 1 deletion ...ples/specification/basic/generated/azure/basic/sample/aio/_auto_rest_head_test_service.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
from copy import deepcopy
from typing import Any, Awaitable, TYPE_CHECKING

from msrest import Deserializer, Serializer

from azure.core import AsyncPipelineClient
from azure.core.rest import AsyncHttpResponse, HttpRequest
from msrest import Deserializer, Serializer

from ._configuration import AutoRestHeadTestServiceConfiguration
from .operations import HttpSuccessOperations
Expand Down
3 changes: 2 additions & 1 deletion ...s/specification/basic/generated/azure/basic/sample/operations/_http_success_operations.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@
# --------------------------------------------------------------------------
from typing import TYPE_CHECKING

from msrest import Serializer

from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error
from azure.core.pipeline import PipelineResponse
from azure.core.pipeline.transport import HttpResponse
from azure.core.rest import HttpRequest
from azure.core.tracing.decorator import distributed_trace
from msrest import Serializer

from .._vendor import _convert_request

Expand Down
3 changes: 2 additions & 1 deletion ...les/specification/directives/generated/azure/directives/sample/_polling_paging_example.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
from copy import deepcopy
from typing import TYPE_CHECKING

from azure.core import PipelineClient
from msrest import Deserializer, Serializer

from azure.core import PipelineClient

from . import models
from ._configuration import PollingPagingExampleConfiguration
from .operations import PollingPagingExampleOperationsMixin
Expand Down
3 changes: 2 additions & 1 deletion ...specification/directives/generated/azure/directives/sample/aio/_polling_paging_example.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
from copy import deepcopy
from typing import Any, Awaitable

from msrest import Deserializer, Serializer

from azure.core import AsyncPipelineClient
from azure.core.rest import AsyncHttpResponse, HttpRequest
from msrest import Deserializer, Serializer

from .. import models
from ._configuration import PollingPagingExampleConfiguration
Expand Down
3 changes: 2 additions & 1 deletion ...ctives/generated/azure/directives/sample/operations/_polling_paging_example_operations.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@
# --------------------------------------------------------------------------
from typing import TYPE_CHECKING

from msrest import Serializer

from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error
from azure.core.pipeline import PipelineResponse
from azure.core.pipeline.transport import HttpResponse
from azure.core.polling import NoPolling, PollingMethod
from azure.core.rest import HttpRequest
from azure.core.tracing.decorator import distributed_trace
from msrest import Serializer
from my.library import CustomDefaultPollingMethod, CustomPager, CustomPoller

from .. import models as _models
Expand Down
3 changes: 2 additions & 1 deletion ...ples/specification/management/generated/azure/mgmt/sample/_auto_rest_head_test_service.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
from copy import deepcopy
from typing import TYPE_CHECKING

from azure.mgmt.core import ARMPipelineClient
from msrest import Deserializer, Serializer

from azure.mgmt.core import ARMPipelineClient

from ._configuration import AutoRestHeadTestServiceConfiguration
from .operations import HttpSuccessOperations

Expand Down
3 changes: 2 additions & 1 deletion .../specification/management/generated/azure/mgmt/sample/aio/_auto_rest_head_test_service.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
from copy import deepcopy
from typing import Any, Awaitable, TYPE_CHECKING

from msrest import Deserializer, Serializer

from azure.core.rest import AsyncHttpResponse, HttpRequest
from azure.mgmt.core import AsyncARMPipelineClient
from msrest import Deserializer, Serializer

from ._configuration import AutoRestHeadTestServiceConfiguration
from .operations import HttpSuccessOperations
Expand Down
3 changes: 2 additions & 1 deletion ...ecification/management/generated/azure/mgmt/sample/operations/_http_success_operations.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@
# --------------------------------------------------------------------------
from typing import TYPE_CHECKING

from msrest import Serializer

from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error
from azure.core.pipeline import PipelineResponse
from azure.core.pipeline.transport import HttpResponse
from azure.core.rest import HttpRequest
from azure.core.tracing.decorator import distributed_trace
from azure.mgmt.core.exceptions import ARMErrorFormat
from msrest import Serializer

from .._vendor import _convert_request

Expand Down
3 changes: 2 additions & 1 deletion ...amples/specification/multiapi/generated/azure/multiapi/sample/_multiapi_service_client.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@

from typing import TYPE_CHECKING

from msrest import Deserializer, Serializer

from azure.mgmt.core import ARMPipelineClient
from azure.profiles import KnownProfiles, ProfileDefinition
from azure.profiles.multiapiclient import MultiApiClientMixin
from msrest import Deserializer, Serializer

from ._configuration import MultiapiServiceClientConfiguration
from ._operations_mixin import MultiapiServiceClientOperationsMixin
Expand Down
3 changes: 2 additions & 1 deletion ...es/specification/multiapi/generated/azure/multiapi/sample/aio/_multiapi_service_client.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@

from typing import Any, Optional, TYPE_CHECKING

from msrest import Deserializer, Serializer

from azure.mgmt.core import AsyncARMPipelineClient
from azure.profiles import KnownProfiles, ProfileDefinition
from azure.profiles.multiapiclient import MultiApiClientMixin
from msrest import Deserializer, Serializer

from ._configuration import MultiapiServiceClientConfiguration
from ._operations_mixin import MultiapiServiceClientOperationsMixin
Expand Down
4 changes: 2 additions & 2 deletions docs/samples/specification/multiapi/generated/azure/multiapi/sample/v1/_metadata.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"azure_arm": true,
"has_lro_operations": true,
"client_side_validation": false,
"sync_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"msrest\": [\"Deserializer\", \"Serializer\"], \"azure.mgmt.core\": [\"ARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"MultiapiServiceClientConfiguration\"], \"._operations_mixin\": [\"MultiapiServiceClientOperationsMixin\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}",
"async_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"], \"azure.core.credentials\": [\"TokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"msrest\": [\"Deserializer\", \"Serializer\"], \"azure.mgmt.core\": [\"AsyncARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"MultiapiServiceClientConfiguration\"], \"._operations_mixin\": [\"MultiapiServiceClientOperationsMixin\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}"
"sync_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"azure.mgmt.core\": [\"ARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"MultiapiServiceClientConfiguration\"], \"._operations_mixin\": [\"MultiapiServiceClientOperationsMixin\"]}, \"thirdparty\": {\"msrest\": [\"Deserializer\", \"Serializer\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}",
"async_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"], \"azure.core.credentials\": [\"TokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"azure.mgmt.core\": [\"AsyncARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"MultiapiServiceClientConfiguration\"], \"._operations_mixin\": [\"MultiapiServiceClientOperationsMixin\"]}, \"thirdparty\": {\"msrest\": [\"Deserializer\", \"Serializer\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}"
},
"global_parameters": {
"sync": {
Expand Down
3 changes: 2 additions & 1 deletion ...les/specification/multiapi/generated/azure/multiapi/sample/v1/_multiapi_service_client.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
from copy import deepcopy
from typing import TYPE_CHECKING

from azure.mgmt.core import ARMPipelineClient
from msrest import Deserializer, Serializer

from azure.mgmt.core import ARMPipelineClient

from . import models
from ._configuration import MultiapiServiceClientConfiguration
from .operations import MultiapiServiceClientOperationsMixin, OperationGroupOneOperations
Expand Down
3 changes: 2 additions & 1 deletion ...specification/multiapi/generated/azure/multiapi/sample/v1/aio/_multiapi_service_client.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
from copy import deepcopy
from typing import Any, Awaitable, TYPE_CHECKING

from msrest import Deserializer, Serializer

from azure.core.rest import AsyncHttpResponse, HttpRequest
from azure.mgmt.core import AsyncARMPipelineClient
from msrest import Deserializer, Serializer

from .. import models
from ._configuration import MultiapiServiceClientConfiguration
Expand Down
3 changes: 2 additions & 1 deletion ...iapi/generated/azure/multiapi/sample/v1/operations/_multiapi_service_client_operations.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
# --------------------------------------------------------------------------
from typing import TYPE_CHECKING

from msrest import Serializer

from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error
from azure.core.paging import ItemPaged
from azure.core.pipeline import PipelineResponse
Expand All @@ -17,7 +19,6 @@
from azure.core.tracing.decorator import distributed_trace
from azure.mgmt.core.exceptions import ARMErrorFormat
from azure.mgmt.core.polling.arm_polling import ARMPolling
from msrest import Serializer

from .. import models as _models
from .._vendor import _convert_request
Expand Down
3 changes: 2 additions & 1 deletion ...multiapi/generated/azure/multiapi/sample/v1/operations/_operation_group_one_operations.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@
# --------------------------------------------------------------------------
from typing import TYPE_CHECKING

from msrest import Serializer

from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error
from azure.core.pipeline import PipelineResponse
from azure.core.pipeline.transport import HttpResponse
from azure.core.rest import HttpRequest
from azure.core.tracing.decorator import distributed_trace
from azure.mgmt.core.exceptions import ARMErrorFormat
from msrest import Serializer

from .. import models as _models
from .._vendor import _convert_request
Expand Down
4 changes: 2 additions & 2 deletions docs/samples/specification/multiapi/generated/azure/multiapi/sample/v2/_metadata.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"azure_arm": true,
"has_lro_operations": false,
"client_side_validation": false,
"sync_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"msrest\": [\"Deserializer\", \"Serializer\"], \"azure.mgmt.core\": [\"ARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"MultiapiServiceClientConfiguration\"], \"._operations_mixin\": [\"MultiapiServiceClientOperationsMixin\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}",
"async_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"], \"azure.core.credentials\": [\"TokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"msrest\": [\"Deserializer\", \"Serializer\"], \"azure.mgmt.core\": [\"AsyncARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"MultiapiServiceClientConfiguration\"], \"._operations_mixin\": [\"MultiapiServiceClientOperationsMixin\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}"
"sync_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"azure.mgmt.core\": [\"ARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"MultiapiServiceClientConfiguration\"], \"._operations_mixin\": [\"MultiapiServiceClientOperationsMixin\"]}, \"thirdparty\": {\"msrest\": [\"Deserializer\", \"Serializer\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}",
"async_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"], \"azure.core.credentials\": [\"TokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"azure.mgmt.core\": [\"AsyncARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"MultiapiServiceClientConfiguration\"], \"._operations_mixin\": [\"MultiapiServiceClientOperationsMixin\"]}, \"thirdparty\": {\"msrest\": [\"Deserializer\", \"Serializer\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}"
},
"global_parameters": {
"sync": {
Expand Down
3 changes: 2 additions & 1 deletion ...les/specification/multiapi/generated/azure/multiapi/sample/v2/_multiapi_service_client.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
from copy import deepcopy
from typing import TYPE_CHECKING

from azure.mgmt.core import ARMPipelineClient
from msrest import Deserializer, Serializer

from azure.mgmt.core import ARMPipelineClient

from . import models
from ._configuration import MultiapiServiceClientConfiguration
from .operations import MultiapiServiceClientOperationsMixin, OperationGroupOneOperations, OperationGroupTwoOperations
Expand Down
3 changes: 2 additions & 1 deletion ...specification/multiapi/generated/azure/multiapi/sample/v2/aio/_multiapi_service_client.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
from copy import deepcopy
from typing import Any, Awaitable, TYPE_CHECKING

from msrest import Deserializer, Serializer

from azure.core.rest import AsyncHttpResponse, HttpRequest
from azure.mgmt.core import AsyncARMPipelineClient
from msrest import Deserializer, Serializer

from .. import models
from ._configuration import MultiapiServiceClientConfiguration
Expand Down
3 changes: 2 additions & 1 deletion ...iapi/generated/azure/multiapi/sample/v2/operations/_multiapi_service_client_operations.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@
# --------------------------------------------------------------------------
from typing import TYPE_CHECKING

from msrest import Serializer

from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error
from azure.core.pipeline import PipelineResponse
from azure.core.pipeline.transport import HttpResponse
from azure.core.rest import HttpRequest
from azure.core.tracing.decorator import distributed_trace
from azure.mgmt.core.exceptions import ARMErrorFormat
from msrest import Serializer

from .. import models as _models
from .._vendor import _convert_request
Expand Down
3 changes: 2 additions & 1 deletion ...multiapi/generated/azure/multiapi/sample/v2/operations/_operation_group_one_operations.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@
# --------------------------------------------------------------------------
from typing import TYPE_CHECKING

from msrest import Serializer

from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error
from azure.core.pipeline import PipelineResponse
from azure.core.pipeline.transport import HttpResponse
from azure.core.rest import HttpRequest
from azure.core.tracing.decorator import distributed_trace
from azure.mgmt.core.exceptions import ARMErrorFormat
from msrest import Serializer

from .. import models as _models
from .._vendor import _convert_request
Expand Down
3 changes: 2 additions & 1 deletion ...multiapi/generated/azure/multiapi/sample/v2/operations/_operation_group_two_operations.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@
# --------------------------------------------------------------------------
from typing import TYPE_CHECKING

from msrest import Serializer

from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error
from azure.core.pipeline import PipelineResponse
from azure.core.pipeline.transport import HttpResponse
from azure.core.rest import HttpRequest
from azure.core.tracing.decorator import distributed_trace
from azure.mgmt.core.exceptions import ARMErrorFormat
from msrest import Serializer

from .. import models as _models
from .._vendor import _convert_request
Expand Down
Loading

0 comments on commit b41e78f

Please sign in to comment.