Query lint

sdk/monitor/azure-monitor-query/azure/monitor/query/__init__.py

@@ -40,7 +40,6 @@
     "MetricNamespace",
     "MetricDefinition",
     "MetricsResult",
-    "LocalizableString",
     "MetricsMetadataValue",
     "TimeSeriesElement",
     "Metric",

sdk/monitor/azure-monitor-query/azure/monitor/query/_log_query_client.py

@@ -5,8 +5,6 @@
 # license information.
 # --------------------------------------------------------------------------
 
-from http.client import HTTPResponse
-from time import time
 from typing import TYPE_CHECKING, Any, Union, Sequence, Dict
 from azure.core.exceptions import HttpResponseError
 
@@ -98,7 +96,7 @@ def query(self, workspace_id, query, **kwargs):
         )
 
         try:
-            return LogsQueryResults._from_generated(self._query_op.execute(
+            return LogsQueryResults._from_generated(self._query_op.execute( # pylint: disable=protected-access
                 workspace_id=workspace_id,
                 body=body,
                 prefer=prefer,
@@ -124,7 +122,9 @@ def batch_query(self, queries, **kwargs):
         except (KeyError, TypeError):
             pass
         batch = BatchRequest(requests=queries)
-        return LogsBatchResults._from_generated(self._query_op.batch(batch, **kwargs))
+        return LogsBatchResults._from_generated( # pylint: disable=protected-access
+            self._query_op.batch(batch, **kwargs)
+            )
 
     def close(self):
         # type: () -> None

sdk/monitor/azure-monitor-query/azure/monitor/query/_metrics_query_client.py

@@ -13,13 +13,13 @@
     MonitorQueryClient,
 )
 
-from ._models import MetricsResult
+from ._models import MetricsResult, MetricDefinition
 from ._helpers import get_metrics_authentication_policy
 
 if TYPE_CHECKING:
     from azure.core.credentials import TokenCredential
     from azure.core.paging import ItemPaged
-    from ._models import MetricsResult, MetricNamespace, MetricDefinition
+    from ._models import MetricNamespace
 
 
 class MetricsClient(object):
@@ -85,7 +85,7 @@ def query(self, resource_uri, metricnames, **kwargs):
         """
         kwargs.setdefault("metricnames", ",".join(metricnames))
         generated = self._metrics_op.list(resource_uri, connection_verify=False, **kwargs)
-        return MetricsResult._from_generated(generated)
+        return MetricsResult._from_generated(generated) # pylint: disable=protected-access
 
     def list_metric_namespaces(self, resource_uri, **kwargs):
         # type: (str, Any) -> ItemPaged[MetricNamespace]
@@ -115,7 +115,9 @@ def list_metric_definitions(self, resource_uri, metricnamespace=None, **kwargs):
         :raises: ~azure.core.exceptions.HttpResponseError
         """
         kwargs.setdefault("metricnamespace", metricnamespace)
-        return self._namespace_op.list(resource_uri, **kwargs)
+        return MetricDefinition._from_generated( # pylint: disable=protected-access
+            self._namespace_op.list(resource_uri, **kwargs)
+        )
 
     def close(self):
         # type: () -> None

sdk/monitor/azure-monitor-query/azure/monitor/query/_models.py

@@ -5,9 +5,8 @@
 # license information.
 # --------------------------------------------------------------------------
 
-from logging import error
 import uuid
-from typing import Any, Optional, Dict, List
+from typing import Any, Optional, List
 
 from ._generated.models import (
     Column as InternalColumn,
@@ -24,10 +23,10 @@ class LogsQueryResultTable(object):
 
     All required parameters must be populated in order to send to Azure.
 
-    :keyword name: Required. The name of the table.
-    :paramtype name: str
-    :keyword columns: Required. The list of columns in this table.
-    :paramtype columns: list[~azure.monitor.query.LogsQueryResultColumn]
+    :param name: Required. The name of the table.
+    :type name: str
+    :param columns: Required. The list of columns in this table.
+    :type columns: list[~azure.monitor.query.LogsQueryResultColumn]
     :keyword rows: Required. The resulting rows from this query.
     :paramtype rows: list[list[str]]
     """
@@ -36,11 +35,9 @@ def __init__(self, name, columns, rows):
         self.name = name
         self.columns = columns
         self.rows = rows
-    
+
     @classmethod
     def _from_generated(cls, generated):
-        if not generated:
-            return cls()
         return cls(
             name=generated.name,
             columns=[LogsQueryResultColumn(name=col.name, type=col.type) for col in generated.columns],
@@ -95,7 +92,11 @@ def _from_generated(cls, generated):
                 target=generated.errors.target
                 )
         if generated.tables is not None:
-            tables=[LogsQueryResultTable._from_generated(table) for table in generated.tables]
+            tables=[
+                LogsQueryResultTable._from_generated( # pylint: disable=protected-access
+                    table
+                    ) for table in generated.tables
+                ]
         return cls(
             tables=tables,
             error=error
@@ -143,7 +144,7 @@ def _from_generated(cls, generated):
             interval=generated.interval,
             namespace=generated.namespace,
             resourceregion=generated.resourceregion,
-            metrics=[Metric._from_generated(m) for m in generated.value]
+            metrics=[Metric._from_generated(m) for m in generated.value] # pylint: disable=protected-access
         )
 
 class LogsQueryRequest(InternalLogQueryRequest):
@@ -233,7 +234,7 @@ def _from_generated(cls, generated):
         return cls(
             id=generated.id,
             status=generated.status,
-            body=LogsQueryResults._from_generated(generated.body)
+            body=LogsQueryResults._from_generated(generated.body) # pylint: disable=protected-access
         )
 
 class LogsBatchResults(InternalBatchResponse):
@@ -254,8 +255,10 @@ def _from_generated(cls, generated):
         if not generated:
             return cls()
         return cls(
-            responses=[LogsQueryResult._from_generated(resp) for resp in generated.responses],
-            error=LogsBatchResultError._from_generated(generated.error)
+            responses=[
+                LogsQueryResult._from_generated(rsp) for rsp in generated.responses # pylint: disable=protected-access
+                ],
+            error=LogsBatchResultError._from_generated(generated.error) # pylint: disable=protected-access
         )
 
 
@@ -400,7 +403,11 @@ def _from_generated(cls, generated):
             unit=generated.unit,
             primary_aggregation_type=generated.primary_aggregation_type,
             supported_aggregation_types=generated.supported_aggregation_types,
-            metric_availabilities=[MetricAvailability._from_generated(val) for val in generated.metric_availabilities],
+            metric_availabilities=[
+                MetricAvailability._from_generated( # pylint: disable=protected-access
+                    val
+                    ) for val in generated.metric_availabilities
+                ],
             id=generated.id,
             dimensions=[d.value for d in generated.dimensions]
         )
@@ -487,7 +494,9 @@ def _from_generated(cls, generated):
             type=generated.type,
             name=generated.name.value,
             unit=generated.unit,
-            timeseries=[TimeSeriesElement._from_generated(t) for t in generated.timeseries]
+            timeseries=[
+                TimeSeriesElement._from_generated(t) for t in generated.timeseries # pylint: disable=protected-access
+                ]
         )
 
 
@@ -519,8 +528,12 @@ def _from_generated(cls, generated):
         if not generated:
             return cls()
         return cls(
-            metadata_values=[MetricsMetadataValue._from_generated(mval) for mval in generated.metadatavalues],
-            data=[MetricValue._from_generated(val) for val in generated.data]
+            metadata_values=[
+                MetricsMetadataValue._from_generated( # pylint: disable=protected-access
+                    mval
+                    ) for mval in generated.metadatavalues
+                ],
+            data=[MetricValue._from_generated(val) for val in generated.data] # pylint: disable=protected-access
         )
 
 class MetricsMetadataValue(object):

sdk/monitor/azure-monitor-query/azure/monitor/query/aio/_log_query_client_async.py

@@ -7,16 +7,15 @@
 
 from typing import TYPE_CHECKING, Any, Union, Sequence, Dict
 from azure.core.exceptions import HttpResponseError
+from azure.core.credentials_async import TokenCredential
+
 
 from .._generated.aio._monitor_query_client import MonitorQueryClient
 
 from .._generated.models import BatchRequest
 from .._helpers import get_authentication_policy, process_error
 from .._models import LogsQueryResults, LogsQueryRequest, LogsQueryBody, LogsBatchResults
 
-if TYPE_CHECKING:
-    from azure.core.credentials import TokenCredential
-
 
 class LogsClient(object):
     """LogsClient
@@ -93,7 +92,7 @@ async def query(self, workspace_id: str, query: str, **kwargs: Any) -> LogsQuery
         )
 
         try:
-            return await LogsQueryResults._from_generated(self._query_op.execute(
+            return await LogsQueryResults._from_generated(self._query_op.execute( # pylint: disable=protected-access
                 workspace_id=workspace_id,
                 body=body,
                 prefer=prefer,
@@ -122,7 +121,9 @@ async def batch_query(
         except (KeyError, TypeError):
             pass
         batch = BatchRequest(requests=queries)
-        return await LogsBatchResults._from_generated(self._query_op.batch(batch, **kwargs))
+        return await LogsBatchResults._from_generated( # pylint: disable=protected-access
+            self._query_op.batch(batch, **kwargs)
+            )
 
     async def __aenter__(self) -> "LogsClient":
         await self._client.__aenter__()

sdk/monitor/azure-monitor-query/azure/monitor/query/aio/_metrics_query_client_async.py

@@ -12,13 +12,13 @@
 from .._generated.aio._monitor_query_client import (
     MonitorQueryClient,
 )
-
+from .._models import MetricsResult, MetricDefinition
 from .._helpers import get_authentication_policy
 
 if TYPE_CHECKING:
     from azure.core.credentials import TokenCredential
     from azure.core.paging import ItemPaged
-    from .._models import MetricsResult, MetricNamespace, MetricDefinition
+    from .._models import MetricNamespace
 
 
 class MetricsClient(object):
@@ -82,7 +82,8 @@ async def query(self, resource_uri, metricnames, **kwargs):
         :raises: ~azure.core.exceptions.HttpResponseError
         """
         kwargs.setdefault("metricnames", ",".join(metricnames))
-        return await self._metrics_op.list(resource_uri, connection_verify=False, **kwargs)
+        generated = await self._metrics_op.list(resource_uri, connection_verify=False, **kwargs)
+        return MetricsResult._from_generated(generated) # pylint: disable=protected-access
 
     async def list_metric_namespaces(self, resource_uri, **kwargs):
         # type: (str, Any) -> ItemPaged[MetricNamespace]
@@ -111,7 +112,9 @@ async def list_metric_definitions(self, resource_uri, **kwargs):
         :rtype: ~azure.core.paging.ItemPaged[~azure.monitor.query.MetricDefinition]
         :raises: ~azure.core.exceptions.HttpResponseError
         """
-        return await self._namespace_op.list(resource_uri, **kwargs)
+        return await MetricDefinition._from_generated( # pylint: disable=protected-access
+            self._namespace_op.list(resource_uri, **kwargs)
+        )
 
     async def __aenter__(self) -> "MetricsClient":
         await self._client.__aenter__()