airbyte-source-google-search-console 1.5.16.dev202505021903__py3-none-any.whl → 1.5.17__py3-none-any.whl

{airbyte_source_google_search_console-1.5.16.dev202505021903.dist-info → airbyte_source_google_search_console-1.5.17.dist-info}/METADATA

@@ -1,19 +1,19 @@
 Metadata-Version: 2.3
 Name: airbyte-source-google-search-console
-Version: 1.5.16.dev202505021903
+Version: 1.5.17
 Summary: Source implementation for Google Search Console.
 License: Elv2
 Author: Airbyte
 Author-email: contact@airbyte.io
-Requires-Python: >=3.9,<3.12
+Requires-Python: >=3.10,<3.12
 Classifier: License :: Other/Proprietary License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Requires-Dist: airbyte-cdk (>=1,<2)
+Requires-Dist: airbyte-cdk (>=6,<7)
 Requires-Dist: google-api-python-client (==2.105.0)
 Requires-Dist: google-auth (==2.23.3)
+Requires-Dist: pendulum (>=3.1.0,<4.0.0)
 Project-URL: Documentation, https://docs.airbyte.com/integrations/sources/google-search-console
 Project-URL: Homepage, https://airbyte.com
 Project-URL: Repository, https://github.com/airbytehq/airbyte

{airbyte_source_google_search_console-1.5.16.dev202505021903.dist-info → airbyte_source_google_search_console-1.5.17.dist-info}/RECORD

@@ -1,5 +1,5 @@
 source_google_search_console/__init__.py,sha256=HQCPu-CK7XmVDtP9rmTdB2XyraVCc6pv9pw38-O8y48,1191
-source_google_search_console/config_migrations.py,sha256=9C8QoELMAxt8NHiEY4fZMCYy5PwoOSUd6vSwoC1B3FM,4135
+source_google_search_console/config_migrations.py,sha256=Cl4SUdJpAf6wMM_vVhqjjU89NfUq9LIGJ9zNrWiBk-A,4235
 source_google_search_console/exceptions.py,sha256=iD3jYC4WxVCEKGsqQ7Vaj1tbjhJZ4S5mnSDnwFJdsIQ,1097
 source_google_search_console/run.py,sha256=q6O2iXoxtrdgtodCaanqTO2eKzUvXF2iDCfmCxaPE24,462
 source_google_search_console/schemas/search_analytics_all_fields.json,sha256=iQxRh_c_yz3uGofqpo1KX571TMmzYjKScb0PtI6SN_Q,1729
@@ -17,10 +17,10 @@ source_google_search_console/schemas/search_analytics_site_report_by_site.json,s
 source_google_search_console/schemas/sitemaps.json,sha256=coyPSZCAfzMheybfRp4WPAZCp5JF2KGRF2rWK8oC080,1775
 source_google_search_console/schemas/sites.json,sha256=WNiCRuStPL1YkJiFa8FEbNJmqaERAOf9Yow6ygIumvo,383
 source_google_search_console/service_account_authenticator.py,sha256=gjUxt0xFxj82uviCQNTsA1Jlee__UDhYNjE7bRO1G0U,1227
-source_google_search_console/source.py,sha256=Dv6es7XWq-eTinrjUI7wAsUU49mOlYsRiXh_OzqNkW4,10204
-source_google_search_console/spec.json,sha256=2fFxbgga6veaSiQyfkoyAtVraSk8FgSGjDyT7T5ctBQ,8764
-source_google_search_console/streams.py,sha256=E2Ib6AU0V5LCmA846_7ekIOmsrV2KX8VONWXMdhB3pc,19917
-airbyte_source_google_search_console-1.5.16.dev202505021903.dist-info/METADATA,sha256=13H2rlconrDe1NF9D_0a8lOgT4N09qaNlLQesbFRMMU,5646
-airbyte_source_google_search_console-1.5.16.dev202505021903.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-airbyte_source_google_search_console-1.5.16.dev202505021903.dist-info/entry_points.txt,sha256=DMcgc9bCX-Vt6hm_68pa77qS3eGdeMhg-UdlFc-XKUM,85
-airbyte_source_google_search_console-1.5.16.dev202505021903.dist-info/RECORD,,
+source_google_search_console/source.py,sha256=8n10_agSa2rvPvEyBvOfOpmpEardbEhi3H0vlK2A4_g,10002
+source_google_search_console/spec.json,sha256=WYtFvaSqWYGm1Dt2yV9G92U78Q94rh9oarbxJe3H7xo,8470
+source_google_search_console/streams.py,sha256=WyClF4v6w5ZdYL9Ses_ITBzMNd6CQLaNKU64HtFMcfE,19920
+airbyte_source_google_search_console-1.5.17.dist-info/METADATA,sha256=_Li00CZRIE5xrS4lhgd4Oz9pR5qpSpaKcuWLaO8wwdI,5622
+airbyte_source_google_search_console-1.5.17.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+airbyte_source_google_search_console-1.5.17.dist-info/entry_points.txt,sha256=DMcgc9bCX-Vt6hm_68pa77qS3eGdeMhg-UdlFc-XKUM,85
+airbyte_source_google_search_console-1.5.17.dist-info/RECORD,,

{airbyte_source_google_search_console-1.5.16.dev202505021903.dist-info → airbyte_source_google_search_console-1.5.17.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.2
+Generator: poetry-core 2.1.3
 Root-Is-Purelib: true
 Tag: py3-none-any

source_google_search_console/config_migrations.py

@@ -6,8 +6,11 @@
 import logging
 from typing import Any, List, Mapping
 
+import orjson
+
 from airbyte_cdk.config_observation import create_connector_config_control_message
 from airbyte_cdk.entrypoint import AirbyteEntrypoint
+from airbyte_cdk.models import AirbyteMessageSerializer
 from airbyte_cdk.sources import Source
 from airbyte_cdk.sources.message import InMemoryMessageRepository, MessageRepository
 
@@ -77,7 +80,7 @@ class MigrateCustomReports:
         cls.message_repository.emit_message(create_connector_config_control_message(migrated_config))
         # emit the Airbyte Control Message from message queue to stdout
         for message in cls.message_repository._message_queue:
-            print(message.json(exclude_unset=True))
+            print(orjson.dumps(AirbyteMessageSerializer.dump(message)).decode())
 
     @classmethod
     def migrate(cls, args: List[str], source: Source) -> None:

source_google_search_console/source.py

@@ -49,7 +49,6 @@ custom_reports_schema = {
         "properties": {
             "name": {"type": "string", "minLength": 1},
             "dimensions": {"type": "array", "items": {"type": "string", "minLength": 1}},
-            "aggregation_type": {"type": "string", "enum": ["auto", "by_page", "by_property"], "default": "auto"},
         },
         "required": ["name", "dimensions"],
     },
@@ -196,9 +195,7 @@ class SourceGoogleSearchConsole(AbstractSource):
 
     def get_custom_reports(self, config: Mapping[str, Any], stream_config: Mapping[str, Any]) -> List[Optional[Stream]]:
         return [
-            type(report["name"], (SearchAnalyticsByCustomDimensions,), {})(
-                dimensions=report["dimensions"], aggregation_type=report.get("aggregation_type", "auto"), **stream_config
-            )
+            type(report["name"], (SearchAnalyticsByCustomDimensions,), {})(dimensions=report["dimensions"], **stream_config)
             for report in config.get("custom_reports_array", [])
         ]
 

source_google_search_console/spec.json

@@ -144,13 +144,6 @@
               },
               "default": ["date"],
               "minItems": 0
-            },
-            "aggregation_type": {
-              "title": "Aggregation Type",
-              "description": "The type of aggregation to apply to the report.",
-              "type": "string",
-              "enum": ["auto", "by_page", "by_property"],
-              "default": "auto"
             }
           },
           "required": ["name", "dimensions"]

source_google_search_console/streams.py

@@ -81,7 +81,7 @@ class GoogleSearchConsole(HttpStream, ABC):
                 self.logger.error(f"Stream `{self.name}`. {error.get('message')}. Trying with `aggregationType = auto` instead.")
                 self.aggregation_type = QueryAggregationType.auto
                 setattr(self, "raise_on_http_errors", False)
-        return super().should_retry(response)
+        return response.status_code == 429 or 500 <= response.status_code < 600
 
 
 class Sites(GoogleSearchConsole):
@@ -90,6 +90,7 @@ class Sites(GoogleSearchConsole):
     """
 
     primary_key = None
+    is_resumable = False
 
     def path(
         self,
@@ -107,6 +108,7 @@ class Sitemaps(GoogleSearchConsole):
 
     primary_key = None
     data_field = "sitemap"
+    is_resumable = False
 
     def path(
         self,
@@ -384,7 +386,7 @@ class SearchByKeyword(SearchAnalytics):
     def stream_slices(
         self, sync_mode: SyncMode, cursor_field: List[str] = None, stream_state: Mapping[str, Any] = None
     ) -> Iterable[Optional[Mapping[str, Any]]]:
-        search_appearance_stream = SearchAppearance(self._session.auth, self._site_urls, self._start_date, self._end_date)
+        search_appearance_stream = SearchAppearance(self._http_client._session.auth, self._site_urls, self._start_date, self._end_date)
 
         for stream_slice in super().stream_slices(sync_mode, cursor_field, stream_state):
             keywords_records = search_appearance_stream.read_records(
@@ -458,10 +460,9 @@ class SearchAnalyticsByCustomDimensions(SearchAnalytics):
 
     primary_key = None
 
-    def __init__(self, dimensions: List[str], aggregation_type: str, *args, **kwargs):
+    def __init__(self, dimensions: List[str], *args, **kwargs):
         super(SearchAnalyticsByCustomDimensions, self).__init__(*args, **kwargs)
         self.dimensions = dimensions + [dimension for dimension in self.DEFAULT_DIMENSIONS if dimension not in dimensions]
-        self.aggregation_type = QueryAggregationType[aggregation_type]
         # Assign the dimensions as PK for the custom report stream.
         # Site URL and Search Type are included in the API call thus affect the resulting data.
         # `site_url` is a required URL param for making API calls;