From 64df8b9c7f685bc7d4b35ec1817685354b385dbc Mon Sep 17 00:00:00 2001 From: Kevin Zheng Date: Thu, 6 Jun 2024 15:16:57 +0000 Subject: [PATCH 1/3] fix: Added type hints to CloudLoggingHandler constructor --- google/cloud/logging_v2/handlers/handlers.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/google/cloud/logging_v2/handlers/handlers.py b/google/cloud/logging_v2/handlers/handlers.py index 06e131442..9b6e13eec 100644 --- a/google/cloud/logging_v2/handlers/handlers.py +++ b/google/cloud/logging_v2/handlers/handlers.py @@ -18,12 +18,17 @@ import json import logging -from google.cloud.logging_v2.handlers.transports import BackgroundThreadTransport +from typing import Optional, IO + +from google.cloud.logging_v2.client import Client +from google.cloud.logging_v2.handlers.transports import BackgroundThreadTransport, Transport from google.cloud.logging_v2.handlers._monitored_resources import ( detect_resource, add_resource_labels, ) from google.cloud.logging_v2.handlers._helpers import get_request_data +from google.cloud.logging_v2.resource import Resource + DEFAULT_LOGGER_NAME = "python" @@ -147,13 +152,13 @@ class CloudLoggingHandler(logging.StreamHandler): def __init__( self, - client, + client: Client, *, - name=DEFAULT_LOGGER_NAME, - transport=BackgroundThreadTransport, - resource=None, - labels=None, - stream=None, + name: str=DEFAULT_LOGGER_NAME, + transport: Transport=BackgroundThreadTransport, + resource: Resource=None, + labels: Optional[dict]=None, + stream: Optional[IO]=None, **kwargs, ): """ From 2440bd20d4132686766c7db83492c0e0a7cf3c32 Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Thu, 6 Jun 2024 15:19:56 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20po?= =?UTF-8?q?st-processor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --- google/cloud/logging_v2/handlers/handlers.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/google/cloud/logging_v2/handlers/handlers.py b/google/cloud/logging_v2/handlers/handlers.py index 9b6e13eec..03761271b 100644 --- a/google/cloud/logging_v2/handlers/handlers.py +++ b/google/cloud/logging_v2/handlers/handlers.py @@ -21,7 +21,10 @@ from typing import Optional, IO from google.cloud.logging_v2.client import Client -from google.cloud.logging_v2.handlers.transports import BackgroundThreadTransport, Transport +from google.cloud.logging_v2.handlers.transports import ( + BackgroundThreadTransport, + Transport, +) from google.cloud.logging_v2.handlers._monitored_resources import ( detect_resource, add_resource_labels, @@ -154,11 +157,11 @@ def __init__( self, client: Client, *, - name: str=DEFAULT_LOGGER_NAME, - transport: Transport=BackgroundThreadTransport, - resource: Resource=None, - labels: Optional[dict]=None, - stream: Optional[IO]=None, + name: str = DEFAULT_LOGGER_NAME, + transport: Transport = BackgroundThreadTransport, + resource: Resource = None, + labels: Optional[dict] = None, + stream: Optional[IO] = None, **kwargs, ): """ From b7ecaf67eac5054e4d97f3da0b61c4957331087a Mon Sep 17 00:00:00 2001 From: Kevin Zheng <147537668+gkevinzheng@users.noreply.github.com> Date: Thu, 6 Jun 2024 11:40:26 -0400 Subject: [PATCH 3/3] Removed Client typing due to circular imports --- google/cloud/logging_v2/handlers/handlers.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/google/cloud/logging_v2/handlers/handlers.py b/google/cloud/logging_v2/handlers/handlers.py index 03761271b..5b11bfe30 100644 --- a/google/cloud/logging_v2/handlers/handlers.py +++ b/google/cloud/logging_v2/handlers/handlers.py @@ -20,7 +20,6 @@ from typing import Optional, IO -from google.cloud.logging_v2.client import Client from google.cloud.logging_v2.handlers.transports import ( BackgroundThreadTransport, Transport, @@ -155,7 +154,7 @@ class CloudLoggingHandler(logging.StreamHandler): def __init__( self, - client: Client, + client, *, name: str = DEFAULT_LOGGER_NAME, transport: Transport = BackgroundThreadTransport,