diff --git a/sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/_client.py b/sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/_client.py index 4de5b0b1c9ba..0fa83ac210ca 100644 --- a/sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/_client.py +++ b/sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/_client.py @@ -37,7 +37,7 @@ class LogsIngestionClient(LogsIngestionClientOperationsMixin): # pylint: disabl def __init__(self, endpoint: str, credential: "TokenCredential", **kwargs: Any) -> None: _endpoint = "{endpoint}" self._config = LogsIngestionClientConfiguration(endpoint=endpoint, credential=credential, **kwargs) - self._client = PipelineClient(base_url=_endpoint, config=self._config, **kwargs) + self._client: PipelineClient = PipelineClient(base_url=_endpoint, config=self._config, **kwargs) self._serialize = Serializer() self._deserialize = Deserializer() diff --git a/sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/_configuration.py b/sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/_configuration.py index a698264653dc..6ee3316401d7 100644 --- a/sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/_configuration.py +++ b/sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/_configuration.py @@ -53,7 +53,7 @@ def __init__(self, endpoint: str, credential: "TokenCredential", **kwargs: Any) self.credential = credential self.api_version = api_version self.credential_scopes = kwargs.pop("credential_scopes", ["user_impersonation"]) - kwargs.setdefault("sdk_moniker", "logsingestionclient/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "monitor-ingestion/{}".format(VERSION)) self._configure(**kwargs) def _configure(self, **kwargs: Any) -> None: diff --git a/sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/_operations/_operations.py b/sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/_operations/_operations.py index 4cb6de736995..5532b509cfd4 100644 --- a/sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/_operations/_operations.py +++ b/sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/_operations/_operations.py @@ -155,8 +155,9 @@ def upload( # pylint: disable=inconsistent-return-statements } request.url = self._client.format_url(request.url, **path_format_arguments) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response diff --git a/sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/_patch.py b/sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/_patch.py index d9c5953a143f..760ab659d0fe 100644 --- a/sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/_patch.py +++ b/sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/_patch.py @@ -38,10 +38,7 @@ def __init__(self, endpoint: str, credential: "TokenCredential", **kwargs: Any) ) -__all__ = [ - "LogsIngestionClient", - "LogsUploadError" -] +__all__ = ["LogsIngestionClient", "LogsUploadError"] def patch_sdk(): diff --git a/sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/_serialization.py b/sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/_serialization.py index f17c068e833e..842ae727fbbc 100644 --- a/sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/_serialization.py +++ b/sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/_serialization.py @@ -629,7 +629,7 @@ def _serialize(self, target_obj, data_type=None, **kwargs): if xml_desc.get("attr", False): if xml_ns: ET.register_namespace(xml_prefix, xml_ns) - xml_name = "{}{}".format(xml_ns, xml_name) + xml_name = "{{{}}}{}".format(xml_ns, xml_name) serialized.set(xml_name, new_attr) # type: ignore continue if xml_desc.get("text", False): @@ -1271,7 +1271,7 @@ def _extract_name_from_internal_type(internal_type): xml_name = internal_type_xml_map.get("name", internal_type.__name__) xml_ns = internal_type_xml_map.get("ns", None) if xml_ns: - xml_name = "{}{}".format(xml_ns, xml_name) + xml_name = "{{{}}}{}".format(xml_ns, xml_name) return xml_name @@ -1295,7 +1295,7 @@ def xml_key_extractor(attr, attr_desc, data): # Integrate namespace if necessary xml_ns = xml_desc.get("ns", internal_type_xml_map.get("ns", None)) if xml_ns: - xml_name = "{}{}".format(xml_ns, xml_name) + xml_name = "{{{}}}{}".format(xml_ns, xml_name) # If it's an attribute, that's simple if xml_desc.get("attr", False): diff --git a/sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/_version.py b/sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/_version.py index c2ff736f63ea..961c76eb77c1 100644 --- a/sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/_version.py +++ b/sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/_version.py @@ -1,12 +1,9 @@ # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# +# Licensed under the MIT License. See License.txt in the project root for license information. # Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- VERSION = "1.0.1" diff --git a/sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/aio/_client.py b/sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/aio/_client.py index d096cbaebc60..87fc7e77c01d 100644 --- a/sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/aio/_client.py +++ b/sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/aio/_client.py @@ -37,7 +37,7 @@ class LogsIngestionClient(LogsIngestionClientOperationsMixin): # pylint: disabl def __init__(self, endpoint: str, credential: "AsyncTokenCredential", **kwargs: Any) -> None: _endpoint = "{endpoint}" self._config = LogsIngestionClientConfiguration(endpoint=endpoint, credential=credential, **kwargs) - self._client = AsyncPipelineClient(base_url=_endpoint, config=self._config, **kwargs) + self._client: AsyncPipelineClient = AsyncPipelineClient(base_url=_endpoint, config=self._config, **kwargs) self._serialize = Serializer() self._deserialize = Deserializer() diff --git a/sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/aio/_configuration.py b/sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/aio/_configuration.py index d86dca4f5361..f55b3853a5e2 100644 --- a/sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/aio/_configuration.py +++ b/sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/aio/_configuration.py @@ -53,7 +53,7 @@ def __init__(self, endpoint: str, credential: "AsyncTokenCredential", **kwargs: self.credential = credential self.api_version = api_version self.credential_scopes = kwargs.pop("credential_scopes", ["user_impersonation"]) - kwargs.setdefault("sdk_moniker", "logsingestionclient/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "monitor-ingestion/{}".format(VERSION)) self._configure(**kwargs) def _configure(self, **kwargs: Any) -> None: diff --git a/sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/aio/_operations/_operations.py b/sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/aio/_operations/_operations.py index 093cd6a408a3..73f8805f3fc6 100644 --- a/sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/aio/_operations/_operations.py +++ b/sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/aio/_operations/_operations.py @@ -109,8 +109,9 @@ async def upload( # pylint: disable=inconsistent-return-statements } request.url = self._client.format_url(request.url, **path_format_arguments) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response diff --git a/sdk/monitor/azure-monitor-ingestion/swagger/README.PYTHON.md b/sdk/monitor/azure-monitor-ingestion/swagger/README.PYTHON.md index 6eec665569fd..f8c05590229a 100644 --- a/sdk/monitor/azure-monitor-ingestion/swagger/README.PYTHON.md +++ b/sdk/monitor/azure-monitor-ingestion/swagger/README.PYTHON.md @@ -8,7 +8,7 @@ title: LogsIngestionClient description: Azure Monitor Data Collection Python Client generated-metadata: false - +package-name: azure-monitor-ingestion license-header: MICROSOFT_MIT_NO_VERSION no-namespace-folders: true output-folder: ../azure/monitor/ingestion @@ -18,4 +18,5 @@ input-file: python: true version-tolerant: true python3-only: true +black: true ``` diff --git a/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/_client.py b/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/_client.py index 83104ea5b1db..8676cdaf8f1e 100644 --- a/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/_client.py +++ b/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/_client.py @@ -32,7 +32,7 @@ def __init__( # pylint: disable=missing-client-constructor-parameter-credential self, *, endpoint: str = "https://api.loganalytics.io/v1", **kwargs: Any ) -> None: self._config = MonitorQueryClientConfiguration(**kwargs) - self._client = PipelineClient(base_url=endpoint, config=self._config, **kwargs) + self._client: PipelineClient = PipelineClient(base_url=endpoint, config=self._config, **kwargs) self._serialize = Serializer() self._deserialize = Deserializer() @@ -69,5 +69,5 @@ def __enter__(self) -> "MonitorQueryClient": self._client.__enter__() return self - def __exit__(self, *exc_details) -> None: + def __exit__(self, *exc_details: Any) -> None: self._client.__exit__(*exc_details) diff --git a/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/_configuration.py b/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/_configuration.py index e3e5f536083c..6df725166980 100644 --- a/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/_configuration.py +++ b/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/_configuration.py @@ -24,7 +24,7 @@ class MonitorQueryClientConfiguration(Configuration): # pylint: disable=too-man def __init__(self, **kwargs: Any) -> None: super(MonitorQueryClientConfiguration, self).__init__(**kwargs) - kwargs.setdefault("sdk_moniker", "monitorqueryclient/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "monitor-query/{}".format(VERSION)) self._configure(**kwargs) def _configure(self, **kwargs: Any) -> None: diff --git a/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/_serialization.py b/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/_serialization.py index 4842ef347dd2..842ae727fbbc 100644 --- a/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/_serialization.py +++ b/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/_serialization.py @@ -64,6 +64,7 @@ import isodate # type: ignore from azure.core.exceptions import DeserializationError, SerializationError, raise_with_traceback +from azure.core.serialization import NULL as AzureCoreNull _BOM = codecs.BOM_UTF8.decode(encoding="utf-8") @@ -628,7 +629,7 @@ def _serialize(self, target_obj, data_type=None, **kwargs): if xml_desc.get("attr", False): if xml_ns: ET.register_namespace(xml_prefix, xml_ns) - xml_name = "{}{}".format(xml_ns, xml_name) + xml_name = "{{{}}}{}".format(xml_ns, xml_name) serialized.set(xml_name, new_attr) # type: ignore continue if xml_desc.get("text", False): @@ -802,6 +803,8 @@ def serialize_data(self, data, data_type, **kwargs): raise ValueError("No value for given attribute") try: + if data is AzureCoreNull: + return None if data_type in self.basic_types.values(): return self.serialize_basic(data, data_type, **kwargs) @@ -1268,7 +1271,7 @@ def _extract_name_from_internal_type(internal_type): xml_name = internal_type_xml_map.get("name", internal_type.__name__) xml_ns = internal_type_xml_map.get("ns", None) if xml_ns: - xml_name = "{}{}".format(xml_ns, xml_name) + xml_name = "{{{}}}{}".format(xml_ns, xml_name) return xml_name @@ -1292,7 +1295,7 @@ def xml_key_extractor(attr, attr_desc, data): # Integrate namespace if necessary xml_ns = xml_desc.get("ns", internal_type_xml_map.get("ns", None)) if xml_ns: - xml_name = "{}{}".format(xml_ns, xml_name) + xml_name = "{{{}}}{}".format(xml_ns, xml_name) # If it's an attribute, that's simple if xml_desc.get("attr", False): diff --git a/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/aio/_client.py b/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/aio/_client.py index b59ccc213f24..e02c0501bf92 100644 --- a/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/aio/_client.py +++ b/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/aio/_client.py @@ -32,7 +32,7 @@ def __init__( # pylint: disable=missing-client-constructor-parameter-credential self, *, endpoint: str = "https://api.loganalytics.io/v1", **kwargs: Any ) -> None: self._config = MonitorQueryClientConfiguration(**kwargs) - self._client = AsyncPipelineClient(base_url=endpoint, config=self._config, **kwargs) + self._client: AsyncPipelineClient = AsyncPipelineClient(base_url=endpoint, config=self._config, **kwargs) self._serialize = Serializer() self._deserialize = Deserializer() @@ -69,5 +69,5 @@ async def __aenter__(self) -> "MonitorQueryClient": await self._client.__aenter__() return self - async def __aexit__(self, *exc_details) -> None: + async def __aexit__(self, *exc_details: Any) -> None: await self._client.__aexit__(*exc_details) diff --git a/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/aio/_configuration.py b/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/aio/_configuration.py index c49ef3feb535..dd0c06c273e1 100644 --- a/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/aio/_configuration.py +++ b/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/aio/_configuration.py @@ -24,7 +24,7 @@ class MonitorQueryClientConfiguration(Configuration): # pylint: disable=too-man def __init__(self, **kwargs: Any) -> None: super(MonitorQueryClientConfiguration, self).__init__(**kwargs) - kwargs.setdefault("sdk_moniker", "monitorqueryclient/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "monitor-query/{}".format(VERSION)) self._configure(**kwargs) def _configure(self, **kwargs: Any) -> None: diff --git a/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/aio/operations/_operations.py b/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/aio/operations/_operations.py index 45e80077a29f..9d3d19f83ae4 100644 --- a/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/aio/operations/_operations.py +++ b/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/aio/operations/_operations.py @@ -153,8 +153,9 @@ async def get( ) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -368,7 +369,7 @@ async def execute( :type workspace_id: str :param body: The Analytics query. Learn more about the `Analytics query syntax `_. Is - either a model type or a IO type. Required. + either a JSON type or a IO type. Required. :type body: JSON or IO :keyword prefer: Optional. The prefer header to set server timeout, query statistics and visualization information. Default value is None. @@ -383,6 +384,18 @@ async def execute( Example: .. code-block:: python + # JSON input template you can fill out and use as your body input. + body = { + "query": "str", # The query to execute. Required. + "timespan": "str", # Optional. Optional. The timespan over which to query + data. This is an ISO8601 time period value. This timespan is applied in addition + to any that are specified in the query expression. + "workspaces": [ + "str" # Optional. A list of workspaces that are included in the + query. + ] + } + # response body for status code(s): 200 response == { "tables": [ @@ -463,8 +476,9 @@ async def execute( ) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -701,7 +715,7 @@ async def batch(self, body: Union[JSON, IO], **kwargs: Any) -> JSON: `_ is an example for using POST with an Analytics query. - :param body: The batch request body. Is either a model type or a IO type. Required. + :param body: The batch request body. Is either a JSON type or a IO type. Required. :type body: JSON or IO :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. Default value is None. @@ -713,6 +727,34 @@ async def batch(self, body: Union[JSON, IO], **kwargs: Any) -> JSON: Example: .. code-block:: python + # JSON input template you can fill out and use as your body input. + body = { + "requests": [ + { + "body": { + "query": "str", # The query to execute. Required. + "timespan": "str", # Optional. Optional. The + timespan over which to query data. This is an ISO8601 time period + value. This timespan is applied in addition to any that are + specified in the query expression. + "workspaces": [ + "str" # Optional. A list of workspaces that + are included in the query. + ] + }, + "id": "str", # The error details. Required. + "workspace": "str", # Workspace Id to be included in the + query. Required. + "headers": { + "str": "str" # Optional. Dictionary of + :code:``. + }, + "method": "str", # Optional. "POST" + "path": "str" # Optional. "/query" + } + ] + } + # response body for status code(s): 200 response == { "responses": [ @@ -814,8 +856,9 @@ async def batch(self, body: Union[JSON, IO], **kwargs: Any) -> JSON: ) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -1230,8 +1273,9 @@ async def get(self, workspace_id: str, **kwargs: Any) -> JSON: ) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -1628,8 +1672,9 @@ async def post(self, workspace_id: str, **kwargs: Any) -> JSON: ) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response diff --git a/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/metrics/_client.py b/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/metrics/_client.py index 2fe19ae4421c..b48fd8ec7b7b 100644 --- a/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/metrics/_client.py +++ b/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/metrics/_client.py @@ -34,7 +34,7 @@ def __init__( # pylint: disable=missing-client-constructor-parameter-credential self, *, endpoint: str = "https://management.azure.com", **kwargs: Any ) -> None: self._config = MonitorMetricsClientConfiguration(**kwargs) - self._client = PipelineClient(base_url=endpoint, config=self._config, **kwargs) + self._client: PipelineClient = PipelineClient(base_url=endpoint, config=self._config, **kwargs) self._serialize = Serializer() self._deserialize = Deserializer() @@ -76,5 +76,5 @@ def __enter__(self) -> "MonitorMetricsClient": self._client.__enter__() return self - def __exit__(self, *exc_details) -> None: + def __exit__(self, *exc_details: Any) -> None: self._client.__exit__(*exc_details) diff --git a/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/metrics/_configuration.py b/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/metrics/_configuration.py index 954c57dcb284..b85bd1306d43 100644 --- a/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/metrics/_configuration.py +++ b/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/metrics/_configuration.py @@ -24,7 +24,7 @@ class MonitorMetricsClientConfiguration(Configuration): # pylint: disable=too-m def __init__(self, **kwargs: Any) -> None: super(MonitorMetricsClientConfiguration, self).__init__(**kwargs) - kwargs.setdefault("sdk_moniker", "monitormetricsclient/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "monitor-query/{}".format(VERSION)) self._configure(**kwargs) def _configure(self, **kwargs: Any) -> None: diff --git a/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/metrics/_serialization.py b/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/metrics/_serialization.py index 4842ef347dd2..842ae727fbbc 100644 --- a/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/metrics/_serialization.py +++ b/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/metrics/_serialization.py @@ -64,6 +64,7 @@ import isodate # type: ignore from azure.core.exceptions import DeserializationError, SerializationError, raise_with_traceback +from azure.core.serialization import NULL as AzureCoreNull _BOM = codecs.BOM_UTF8.decode(encoding="utf-8") @@ -628,7 +629,7 @@ def _serialize(self, target_obj, data_type=None, **kwargs): if xml_desc.get("attr", False): if xml_ns: ET.register_namespace(xml_prefix, xml_ns) - xml_name = "{}{}".format(xml_ns, xml_name) + xml_name = "{{{}}}{}".format(xml_ns, xml_name) serialized.set(xml_name, new_attr) # type: ignore continue if xml_desc.get("text", False): @@ -802,6 +803,8 @@ def serialize_data(self, data, data_type, **kwargs): raise ValueError("No value for given attribute") try: + if data is AzureCoreNull: + return None if data_type in self.basic_types.values(): return self.serialize_basic(data, data_type, **kwargs) @@ -1268,7 +1271,7 @@ def _extract_name_from_internal_type(internal_type): xml_name = internal_type_xml_map.get("name", internal_type.__name__) xml_ns = internal_type_xml_map.get("ns", None) if xml_ns: - xml_name = "{}{}".format(xml_ns, xml_name) + xml_name = "{{{}}}{}".format(xml_ns, xml_name) return xml_name @@ -1292,7 +1295,7 @@ def xml_key_extractor(attr, attr_desc, data): # Integrate namespace if necessary xml_ns = xml_desc.get("ns", internal_type_xml_map.get("ns", None)) if xml_ns: - xml_name = "{}{}".format(xml_ns, xml_name) + xml_name = "{{{}}}{}".format(xml_ns, xml_name) # If it's an attribute, that's simple if xml_desc.get("attr", False): diff --git a/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/metrics/aio/_client.py b/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/metrics/aio/_client.py index e3ef49af5d9a..85448951155a 100644 --- a/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/metrics/aio/_client.py +++ b/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/metrics/aio/_client.py @@ -34,7 +34,7 @@ def __init__( # pylint: disable=missing-client-constructor-parameter-credential self, *, endpoint: str = "https://management.azure.com", **kwargs: Any ) -> None: self._config = MonitorMetricsClientConfiguration(**kwargs) - self._client = AsyncPipelineClient(base_url=endpoint, config=self._config, **kwargs) + self._client: AsyncPipelineClient = AsyncPipelineClient(base_url=endpoint, config=self._config, **kwargs) self._serialize = Serializer() self._deserialize = Deserializer() @@ -76,5 +76,5 @@ async def __aenter__(self) -> "MonitorMetricsClient": await self._client.__aenter__() return self - async def __aexit__(self, *exc_details) -> None: + async def __aexit__(self, *exc_details: Any) -> None: await self._client.__aexit__(*exc_details) diff --git a/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/metrics/aio/_configuration.py b/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/metrics/aio/_configuration.py index 952948f25446..dc2d7c46dadc 100644 --- a/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/metrics/aio/_configuration.py +++ b/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/metrics/aio/_configuration.py @@ -24,7 +24,7 @@ class MonitorMetricsClientConfiguration(Configuration): # pylint: disable=too-m def __init__(self, **kwargs: Any) -> None: super(MonitorMetricsClientConfiguration, self).__init__(**kwargs) - kwargs.setdefault("sdk_moniker", "monitormetricsclient/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "monitor-query/{}".format(VERSION)) self._configure(**kwargs) def _configure(self, **kwargs: Any) -> None: diff --git a/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/metrics/aio/operations/_operations.py b/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/metrics/aio/operations/_operations.py index a5960252515b..9d075be9706f 100644 --- a/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/metrics/aio/operations/_operations.py +++ b/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/metrics/aio/operations/_operations.py @@ -167,8 +167,9 @@ async def extract_data(pipeline_response): async def get_next(next_link=None): request = prepare_request(next_link) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -370,8 +371,9 @@ async def list( ) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -480,8 +482,9 @@ async def extract_data(pipeline_response): async def get_next(next_link=None): request = prepare_request(next_link) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response diff --git a/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/metrics/operations/_operations.py b/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/metrics/operations/_operations.py index 1bf5f6582068..5f4b4039f207 100644 --- a/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/metrics/operations/_operations.py +++ b/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/metrics/operations/_operations.py @@ -279,8 +279,9 @@ def extract_data(pipeline_response): def get_next(next_link=None): request = prepare_request(next_link) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -482,8 +483,9 @@ def list( ) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -592,8 +594,9 @@ def extract_data(pipeline_response): def get_next(next_link=None): request = prepare_request(next_link) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response diff --git a/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/operations/_operations.py b/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/operations/_operations.py index 74097102590c..b448b2e7be5c 100644 --- a/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/operations/_operations.py +++ b/sdk/monitor/azure-monitor-query/azure/monitor/query/_generated/operations/_operations.py @@ -257,8 +257,9 @@ def get( ) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -470,7 +471,7 @@ def execute(self, workspace_id: str, body: Union[JSON, IO], *, prefer: Optional[ :type workspace_id: str :param body: The Analytics query. Learn more about the `Analytics query syntax `_. Is - either a model type or a IO type. Required. + either a JSON type or a IO type. Required. :type body: JSON or IO :keyword prefer: Optional. The prefer header to set server timeout, query statistics and visualization information. Default value is None. @@ -485,6 +486,18 @@ def execute(self, workspace_id: str, body: Union[JSON, IO], *, prefer: Optional[ Example: .. code-block:: python + # JSON input template you can fill out and use as your body input. + body = { + "query": "str", # The query to execute. Required. + "timespan": "str", # Optional. Optional. The timespan over which to query + data. This is an ISO8601 time period value. This timespan is applied in addition + to any that are specified in the query expression. + "workspaces": [ + "str" # Optional. A list of workspaces that are included in the + query. + ] + } + # response body for status code(s): 200 response == { "tables": [ @@ -565,8 +578,9 @@ def execute(self, workspace_id: str, body: Union[JSON, IO], *, prefer: Optional[ ) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -803,7 +817,7 @@ def batch(self, body: Union[JSON, IO], **kwargs: Any) -> JSON: `_ is an example for using POST with an Analytics query. - :param body: The batch request body. Is either a model type or a IO type. Required. + :param body: The batch request body. Is either a JSON type or a IO type. Required. :type body: JSON or IO :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. Default value is None. @@ -815,6 +829,34 @@ def batch(self, body: Union[JSON, IO], **kwargs: Any) -> JSON: Example: .. code-block:: python + # JSON input template you can fill out and use as your body input. + body = { + "requests": [ + { + "body": { + "query": "str", # The query to execute. Required. + "timespan": "str", # Optional. Optional. The + timespan over which to query data. This is an ISO8601 time period + value. This timespan is applied in addition to any that are + specified in the query expression. + "workspaces": [ + "str" # Optional. A list of workspaces that + are included in the query. + ] + }, + "id": "str", # The error details. Required. + "workspace": "str", # Workspace Id to be included in the + query. Required. + "headers": { + "str": "str" # Optional. Dictionary of + :code:``. + }, + "method": "str", # Optional. "POST" + "path": "str" # Optional. "/query" + } + ] + } + # response body for status code(s): 200 response == { "responses": [ @@ -916,8 +958,9 @@ def batch(self, body: Union[JSON, IO], **kwargs: Any) -> JSON: ) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -1332,8 +1375,9 @@ def get(self, workspace_id: str, **kwargs: Any) -> JSON: ) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -1730,8 +1774,9 @@ def post(self, workspace_id: str, **kwargs: Any) -> JSON: ) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response diff --git a/sdk/monitor/azure-monitor-query/swagger/README.PYTHON.md b/sdk/monitor/azure-monitor-query/swagger/README.PYTHON.md index 004e9472eb34..f3808a31c598 100644 --- a/sdk/monitor/azure-monitor-query/swagger/README.PYTHON.md +++ b/sdk/monitor/azure-monitor-query/swagger/README.PYTHON.md @@ -9,6 +9,7 @@ title: MonitorQueryClient description: Azure Monitor Query Python Client generated-metadata: false license-header: MICROSOFT_MIT_NO_VERSION +package-name: azure-monitor-query no-namespace-folders: true python: true version-tolerant: true