[Monitor Ingestion] Improve samples typing (#33721)

Regenerated using the tox `generate` environment with the
`autorest-post-process` setting enabled. This allows mypy to be
happy with methods found in _patch.py but not _operations.py.

Samples were also updated to make pyright and mypy happy in the typing
checks.

Signed-off-by: Paul Van Eck <[email protected]>

Author: pvaneck

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

@@ -6,18 +6,16 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from ._client import LogsIngestionClient
+from ._patch import LogsIngestionClient
 
-try:
-    from ._patch import __all__ as _patch_all
-    from ._patch import *  # pylint: disable=unused-wildcard-import
-except ImportError:
-    _patch_all = []
+
+from ._patch import LogsUploadError
 from ._patch import patch_sdk as _patch_sdk
 
 __all__ = [
+    "LogsUploadError",
     "LogsIngestionClient",
 ]
-__all__.extend([p for p in _patch_all if p not in __all__])
+
 
 _patch_sdk()

sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/_operations/__init__.py

@@ -6,14 +6,13 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from ._operations import LogsIngestionClientOperationsMixin
+from ._patch import LogsIngestionClientOperationsMixin
+
 
-from ._patch import __all__ as _patch_all
-from ._patch import *  # pylint: disable=unused-wildcard-import
 from ._patch import patch_sdk as _patch_sdk
 
 __all__ = [
     "LogsIngestionClientOperationsMixin",
 ]
-__all__.extend([p for p in _patch_all if p not in __all__])
+
 _patch_sdk()

sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/aio/__init__.py

@@ -6,18 +6,14 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from ._client import LogsIngestionClient
+from ._patch import LogsIngestionClient
+
 
-try:
-    from ._patch import __all__ as _patch_all
-    from ._patch import *  # pylint: disable=unused-wildcard-import
-except ImportError:
-    _patch_all = []
 from ._patch import patch_sdk as _patch_sdk
 
 __all__ = [
     "LogsIngestionClient",
 ]
-__all__.extend([p for p in _patch_all if p not in __all__])
+
 
 _patch_sdk()

sdk/monitor/azure-monitor-ingestion/azure/monitor/ingestion/aio/_operations/__init__.py

@@ -6,14 +6,13 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from ._operations import LogsIngestionClientOperationsMixin
+from ._patch import LogsIngestionClientOperationsMixin
+
 
-from ._patch import __all__ as _patch_all
-from ._patch import *  # pylint: disable=unused-wildcard-import
 from ._patch import patch_sdk as _patch_sdk
 
 __all__ = [
     "LogsIngestionClientOperationsMixin",
 ]
-__all__.extend([p for p in _patch_all if p not in __all__])
+
 _patch_sdk()

sdk/monitor/azure-monitor-ingestion/pyproject.toml

@@ -1,3 +1,5 @@
 [tool.azure-sdk-build]
-type_check_samples = false
 strict_sphinx = true
+
+[tool.generate]
+autorest-post-process = true

sdk/monitor/azure-monitor-ingestion/samples/async_samples/sample_custom_error_callback_async.py

@@ -28,6 +28,7 @@
 
 import asyncio
 import os
+from typing import List, MutableMapping, cast
 
 from azure.core.exceptions import HttpResponseError
 from azure.identity.aio import DefaultAzureCredential
@@ -38,18 +39,18 @@
 async def send_logs():
     endpoint = os.environ["DATA_COLLECTION_ENDPOINT"]
     rule_id = os.environ["LOGS_DCR_RULE_ID"]
-    body = [
-        {"Time": "2021-12-08T23:51:14.1104269Z", "Computer": "Computer1", "AdditionalContext": "sabhyrav-2"},
-        {"Time": "2021-12-08T23:51:14.1104269Z", "Computer": "Computer2", "AdditionalContext": "sabhyrav"},
+    body: List[MutableMapping[str, str]] = [
+        {"Time": "2021-12-08T23:51:14.1104269Z", "Computer": "Computer1", "AdditionalContext": "context-2"},
+        {"Time": "2021-12-08T23:51:14.1104269Z", "Computer": "Computer2", "AdditionalContext": "context"},
     ]
     credential = DefaultAzureCredential()
 
-    failed_logs = []
+    failed_logs: List[MutableMapping[str, str]] = []
 
     # Sample callback that stores the logs that failed to upload.
     async def on_error_save(error: LogsUploadError) -> None:
         print("Log chunk failed to upload with error: ", error.error)
-        failed_logs.extend(error.failed_logs)
+        failed_logs.extend(cast(List[MutableMapping[str, str]], error.failed_logs))
 
     # Sample callback that just ignores the error.
     async def on_error_pass(_) -> None:
@@ -58,7 +59,7 @@ async def on_error_pass(_) -> None:
     # Sample callback that raises the error if it corresponds to a specific HTTP error code.
     # This aborts the rest of the upload.
     async def on_error_abort(error: LogsUploadError) -> None:
-        if isinstance(error.error, HttpResponseError) and error.error.status_code in (400, 401, 403):
+        if isinstance(error.error, HttpResponseError) and cast(HttpResponseError, error.error).status_code in (400, 401, 403):
             print("Aborting upload...")
             raise error.error
 

sdk/monitor/azure-monitor-ingestion/samples/async_samples/sample_send_small_logs_async.py

@@ -28,6 +28,7 @@
 
 import asyncio
 import os
+from typing import List, MutableMapping
 
 from azure.core.exceptions import HttpResponseError
 from azure.identity.aio import DefaultAzureCredential
@@ -37,9 +38,9 @@
 async def send_logs():
     endpoint = os.environ["DATA_COLLECTION_ENDPOINT"]
     rule_id = os.environ["LOGS_DCR_RULE_ID"]
-    body = [
-        {"Time": "2021-12-08T23:51:14.1104269Z", "Computer": "Computer1", "AdditionalContext": "sabhyrav-2"},
-        {"Time": "2021-12-08T23:51:14.1104269Z", "Computer": "Computer2", "AdditionalContext": "sabhyrav"},
+    body: List[MutableMapping[str, str]] = [
+        {"Time": "2021-12-08T23:51:14.1104269Z", "Computer": "Computer1", "AdditionalContext": "context-2"},
+        {"Time": "2021-12-08T23:51:14.1104269Z", "Computer": "Computer2", "AdditionalContext": "context"},
     ]
     credential = DefaultAzureCredential()
 

sdk/monitor/azure-monitor-ingestion/samples/async_samples/sample_upload_file_contents_async.py

@@ -49,7 +49,7 @@ async def upload_file_contents() -> None:
     async with client:
         # Option 1: Upload the file contents by passing in the file stream. With this option, no chunking is done, and the
         # file contents are uploaded as is through one request. Subject to size service limits.
-        with open(FILE_PATH, "r") as f:
+        with open(FILE_PATH, "rb") as f:
             try:
                 await client.upload(
                     rule_id=os.environ["LOGS_DCR_RULE_ID"], stream_name=os.environ["LOGS_DCR_STREAM_NAME"], logs=f

sdk/monitor/azure-monitor-ingestion/samples/sample_custom_error_callback.py

@@ -27,6 +27,7 @@
 """
 
 import os
+from typing import List, MutableMapping, cast
 
 from azure.core.exceptions import HttpResponseError
 from azure.identity import DefaultAzureCredential
@@ -39,17 +40,17 @@
 client = LogsIngestionClient(endpoint=endpoint, credential=credential, logging_enable=True)
 
 rule_id = os.environ["LOGS_DCR_RULE_ID"]
-body = [
+body: List[MutableMapping[str, str]] = [
     {"Time": "2021-12-08T23:51:14.1104269Z", "Computer": "Computer1", "AdditionalContext": "context-2"},
     {"Time": "2021-12-08T23:51:14.1104269Z", "Computer": "Computer2", "AdditionalContext": "context"},
 ]
 
-failed_logs = []
+failed_logs: List[MutableMapping[str, str]]  = []
 
 # Sample callback that stores the logs that failed to upload.
 def on_error_save(error: LogsUploadError) -> None:
     print("Log chunk failed to upload with error: ", error.error)
-    failed_logs.extend(error.failed_logs)
+    failed_logs.extend(cast(List[MutableMapping[str, str]], error.failed_logs))
 
 
 # Sample callback that just ignores the error.
@@ -60,7 +61,7 @@ def on_error_pass(_) -> None:
 # Sample callback that raises the error if it corresponds to a specific HTTP error code.
 # This aborts the rest of the upload.
 def on_error_abort(error: LogsUploadError) -> None:
-    if isinstance(error.error, HttpResponseError) and error.error.status_code in (400, 401, 403):
+    if isinstance(error.error, HttpResponseError) and cast(HttpResponseError, error.error).status_code in (400, 401, 403):
         print("Aborting upload...")
         raise error.error
 

sdk/monitor/azure-monitor-ingestion/samples/sample_send_small_logs.py

@@ -27,6 +27,7 @@
 """
 
 import os
+from typing import List, MutableMapping
 
 from azure.core.exceptions import HttpResponseError
 from azure.identity import DefaultAzureCredential
@@ -39,7 +40,7 @@
 client = LogsIngestionClient(endpoint=endpoint, credential=credential, logging_enable=True)
 
 rule_id = os.environ["LOGS_DCR_RULE_ID"]
-body = [
+body: List[MutableMapping[str, str]] = [
     {"Time": "2021-12-08T23:51:14.1104269Z", "Computer": "Computer1", "AdditionalContext": "context-2"},
     {"Time": "2021-12-08T23:51:14.1104269Z", "Computer": "Computer2", "AdditionalContext": "context"},
 ]