airbyte-source-google-sheets 0.5.6__py3-none-any.whl → 0.5.9__py3-none-any.whl

{airbyte_source_google_sheets-0.5.6.dist-info → airbyte_source_google_sheets-0.5.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: airbyte-source-google-sheets
-Version: 0.5.6
+Version: 0.5.9
 Summary: Source implementation for Google Sheets.
 Home-page: https://airbyte.com
 License: Elv2

{airbyte_source_google_sheets-0.5.6.dist-info → airbyte_source_google_sheets-0.5.9.dist-info}/RECORD

@@ -1,14 +1,14 @@
 source_google_sheets/__init__.py,sha256=-aGVMRfrgWjYad3_cHofIptEEa5WMQzTvFD92HevQfw,73
 source_google_sheets/client.py,sha256=k7AAS0XbHdKDIywgrRMTpKMcKYQfHOjAi2s-MjDRqQs,2391
-source_google_sheets/helpers.py,sha256=_CJ6qQDd7bbOwUCVyEXCrRDVZS18pLira399Hg8cpZY,10501
+source_google_sheets/helpers.py,sha256=kKXop3YyQ3jPYlWgWW3GmRPxDmnuoHZ4joa3rQLCxUQ,10642
 source_google_sheets/models/__init__.py,sha256=Z-4MTpxG5t2jGhXzs4PPoIOa83zw3jRnUDx0N9Puv3s,61
 source_google_sheets/models/spreadsheet.py,sha256=ebGZ39_QKT6Lrf7Hblo3pdjswFhoEzF8vno2TmEMyUU,1109
 source_google_sheets/models/spreadsheet_values.py,sha256=OFbSvgeo5LnfMy6BURtDvWfRsJn7GN2AYMVkNQNkE-o,437
 source_google_sheets/run.py,sha256=_f5-LNqMzBuHtCD1YoUBxnA0fszgqmdNGcN7y_AmXU0,237
-source_google_sheets/source.py,sha256=odyYsqyilj-5cwGVfX10GTcm7XfH4L02VD_sb3doChU,12714
+source_google_sheets/source.py,sha256=GbBxrW40DPIEFEzI_3jvRUS_1vYMqKAcAYA43oXRLJ8,13049
 source_google_sheets/spec.yaml,sha256=WrPdH2xLCdyM-kY-pRqbwICcNPhv8nqnb2gdbslTsaQ,5141
 source_google_sheets/utils.py,sha256=ZB5lboyffiuuQdSarqe8AqBGEyiQpxiOfxqcU7Ght8A,2289
-airbyte_source_google_sheets-0.5.6.dist-info/METADATA,sha256=k9-g4ubU7dS2yTQ3ciCZs2GJg_Od6_-cyqcVbm63i4M,5537
-airbyte_source_google_sheets-0.5.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-airbyte_source_google_sheets-0.5.6.dist-info/entry_points.txt,sha256=Dtsfjohe5IPUFyqojk49SIoP7CifCTlNLG_pgivzppo,69
-airbyte_source_google_sheets-0.5.6.dist-info/RECORD,,
+airbyte_source_google_sheets-0.5.9.dist-info/METADATA,sha256=m2pnwVstyOH0NGKYxzKwY6z1KsDXVSn57oQsNj3yOTo,5537
+airbyte_source_google_sheets-0.5.9.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+airbyte_source_google_sheets-0.5.9.dist-info/entry_points.txt,sha256=Dtsfjohe5IPUFyqojk49SIoP7CifCTlNLG_pgivzppo,69
+airbyte_source_google_sheets-0.5.9.dist-info/RECORD,,

source_google_sheets/helpers.py

@@ -9,7 +9,6 @@ from collections import defaultdict
 from datetime import datetime
 from typing import Dict, FrozenSet, Iterable, List, Tuple
 
-from airbyte_cdk.logger import AirbyteLogger
 from airbyte_cdk.models.airbyte_protocol import AirbyteRecordMessage, AirbyteStream, ConfiguredAirbyteCatalog, SyncMode
 from google.oauth2 import credentials as client_account
 from google.oauth2 import service_account
@@ -43,7 +42,7 @@ class Helpers(object):
             return client_account.Credentials.from_authorized_user_info(info=credentials)
 
     @staticmethod
-    def headers_to_airbyte_stream(logger: AirbyteLogger, sheet_name: str, header_row_values: List[str]) -> AirbyteStream:
+    def headers_to_airbyte_stream(logger: logging.Logger, sheet_name: str, header_row_values: List[str]) -> AirbyteStream:
         """
         Parses sheet headers from the provided row. This method assumes that data is contiguous
         i.e: every cell contains a value and the first cell which does not contain a value denotes the end
@@ -194,7 +193,9 @@ class Helpers(object):
                 non_grid_sheets.append(sheet_title)
 
         if non_grid_sheets:
-            AirbyteLogger().log("WARN", "Skip non-grid sheets: " + ", ".join(non_grid_sheets))
+            # logging.getLogger(...).log() expects an integer level. The level for WARN is 30
+            # Reference: https://docs.python.org/3.10/library/logging.html#levels
+            logging.getLogger("airbyte").log(30, "Skip non-grid sheets: " + ", ".join(non_grid_sheets))
 
         return grid_sheets
 

source_google_sheets/source.py

@@ -4,10 +4,10 @@
 
 
 import json
+import logging
 import socket
 from typing import Any, Generator, List, Mapping, MutableMapping, Optional, Union
 
-from airbyte_cdk.logger import AirbyteLogger
 from airbyte_cdk.models import FailureType
 from airbyte_cdk.models.airbyte_protocol import (
     AirbyteCatalog,
@@ -45,7 +45,7 @@ class SourceGoogleSheets(Source):
     Spreadsheets API Reference: https://developers.google.com/sheets/api/reference/rest/v4/spreadsheets
     """
 
-    def check(self, logger: AirbyteLogger, config: json) -> AirbyteConnectionStatus:
+    def check(self, logger: logging.Logger, config: json) -> AirbyteConnectionStatus:
         # Check involves verifying that the specified spreadsheet is reachable with our credentials.
         try:
             client = GoogleSheetsClient(self.get_credentials(config))
@@ -110,7 +110,7 @@ class SourceGoogleSheets(Source):
 
         return AirbyteConnectionStatus(status=Status.SUCCEEDED)
 
-    def discover(self, logger: AirbyteLogger, config: json) -> AirbyteCatalog:
+    def discover(self, logger: logging.Logger, config: json) -> AirbyteCatalog:
         client = GoogleSheetsClient(self.get_credentials(config))
         spreadsheet_id = Helpers.get_spreadsheet_id(config["spreadsheet_id"])
         try:
@@ -143,10 +143,17 @@ class SourceGoogleSheets(Source):
                     failure_type=FailureType.config_error,
                 ) from err
             raise Exception(f"Could not discover the schema of your spreadsheet. {error_description}. {err.reason}.")
+        except google_exceptions.GoogleAuthError as err:
+            message = "Access to the spreadsheet expired or was revoked. Re-authenticate to restore access."
+            raise AirbyteTracedException(
+                message=message,
+                internal_message=message,
+                failure_type=FailureType.config_error,
+            ) from err
 
     def _read(
         self,
-        logger: AirbyteLogger,
+        logger: logging.Logger,
         config: json,
         catalog: ConfiguredAirbyteCatalog,
         state: Union[List[AirbyteStateMessage], MutableMapping[str, Any]] = None,
@@ -227,7 +234,7 @@ class SourceGoogleSheets(Source):
 
     def read(
         self,
-        logger: AirbyteLogger,
+        logger: logging.Logger,
         config: json,
         catalog: ConfiguredAirbyteCatalog,
         state: Union[List[AirbyteStateMessage], MutableMapping[str, Any]] = None,