airbyte-source-google-search-console 1.5.16.dev202503142015__py3-none-any.whl → 1.5.16.dev202503252224__py3-none-any.whl

{airbyte_source_google_search_console-1.5.16.dev202503142015.dist-info → airbyte_source_google_search_console-1.5.16.dev202503252224.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: airbyte-source-google-search-console
-Version: 1.5.16.dev202503142015
+Version: 1.5.16.dev202503252224
 Summary: Source implementation for Google Search Console.
 License: Elv2
 Author: Airbyte

{airbyte_source_google_search_console-1.5.16.dev202503142015.dist-info → airbyte_source_google_search_console-1.5.16.dev202503252224.dist-info}/RECORD

@@ -19,8 +19,8 @@ source_google_search_console/schemas/sites.json,sha256=WNiCRuStPL1YkJiFa8FEbNJmq
 source_google_search_console/service_account_authenticator.py,sha256=gjUxt0xFxj82uviCQNTsA1Jlee__UDhYNjE7bRO1G0U,1227
 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=argw9ECCf7nInvrg_B5BgWa59gqL_ecvpFGbWf6tCsE,22275
-airbyte_source_google_search_console-1.5.16.dev202503142015.dist-info/METADATA,sha256=VPW3sTOMZUXbxtWilCnJ1rGS59MEmx5_orqs4Mh1fGM,5646
-airbyte_source_google_search_console-1.5.16.dev202503142015.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-airbyte_source_google_search_console-1.5.16.dev202503142015.dist-info/entry_points.txt,sha256=DMcgc9bCX-Vt6hm_68pa77qS3eGdeMhg-UdlFc-XKUM,85
-airbyte_source_google_search_console-1.5.16.dev202503142015.dist-info/RECORD,,
+source_google_search_console/streams.py,sha256=7C9E8gYpzU4VdQGsrS2AqjQTdMjeQ3mS3iAfvywADek,20436
+airbyte_source_google_search_console-1.5.16.dev202503252224.dist-info/METADATA,sha256=llHA_zmljhs2_GK5_vKBp_TJj7mgizzaB_kFodADb_A,5646
+airbyte_source_google_search_console-1.5.16.dev202503252224.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+airbyte_source_google_search_console-1.5.16.dev202503252224.dist-info/entry_points.txt,sha256=DMcgc9bCX-Vt6hm_68pa77qS3eGdeMhg-UdlFc-XKUM,85
+airbyte_source_google_search_console-1.5.16.dev202503252224.dist-info/RECORD,,

source_google_search_console/streams.py

@@ -371,20 +371,6 @@ class SearchAppearance(SearchAnalytics):
     primary_key = None
     dimensions = ["searchAppearance"]
 
-    def request_body_json(
-        self,
-        stream_state: Mapping[str, Any] = None,
-        stream_slice: Mapping[str, Any] = None,
-        next_page_token: Mapping[str, Any] = None,
-    ) -> Optional[Union[Dict[str, Any], str]]:
-        data = super().request_body_json(stream_state, stream_slice, next_page_token)
-
-        fields_to_remove = ["aggregationType", "startRow", "rowLimit", "dataState"]
-        for field in fields_to_remove:
-            data.pop(field, None)
-
-        return data
-
 
 class SearchByKeyword(SearchAnalytics):
     """
@@ -395,24 +381,28 @@ class SearchByKeyword(SearchAnalytics):
     filters: {"dimension": "searchAppearance", "operator": "equals", "expression": keyword}
     """
 
-    search_types = ["web", "news", "image", "video", "discover", "googleNews"]
-
     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)
 
-        for stream_slice in super().stream_slices(sync_mode, cursor_field, stream_state):    
+        for stream_slice in super().stream_slices(sync_mode, cursor_field, stream_state):
             keywords_records = search_appearance_stream.read_records(
                 sync_mode=SyncMode.full_refresh, stream_state=stream_state, stream_slice=stream_slice
             )
-            keywords = {record["searchAppearance"] for record in keywords_records}
-
-            for keyword in keywords:
-                filters = {"dimension": "searchAppearance", "operator": "equals", "expression": keyword}
-                stream_slice["dimensionFilterGroups"] = [{"groupType": "and", "filters": filters}]
-                stream_slice["dimensions"] = self.dimensions
-
+            # Safely extract keywords, handling cases where "searchAppearance" might be missing
+            keywords = {record["searchAppearance"] for record in keywords_records if "searchAppearance" in record}
+
+            if keywords:
+                # If keywords exist, yield a slice for each keyword with filters
+                for keyword in keywords:
+                    filters = {"dimension": "searchAppearance", "operator": "equals", "expression": keyword}
+                    # Create a copy to avoid modifying the original stream_slice
+                    stream_slice_with_filter = stream_slice.copy()
+                    stream_slice_with_filter["dimensionFilterGroups"] = [{"groupType": "and", "filters": [filters]}]
+                    yield stream_slice_with_filter
+            else:
+                # If no keywords are found, yield the base slice without filters
                 yield stream_slice
 
     def request_body_json(
@@ -422,25 +412,14 @@ class SearchByKeyword(SearchAnalytics):
         next_page_token: Mapping[str, Any] = None,
     ) -> Optional[Union[Dict[str, Any], str]]:
         data = super().request_body_json(stream_state, stream_slice, next_page_token)
-        data["dimensionFilterGroups"] = stream_slice["dimensionFilterGroups"]
+        if "dimensionFilterGroups" in stream_slice:
+            data["dimensionFilterGroups"] = stream_slice["dimensionFilterGroups"]
         return data
 
 
 class SearchAnalyticsKeywordPageReport(SearchByKeyword):
     primary_key = ["site_url", "date", "country", "device", "query", "page", "search_type"]
     dimensions = ["date", "country", "device", "query", "page"]
-    def stream_slices(
-        self, sync_mode: SyncMode, cursor_field: List[str] = None, stream_state: Mapping[str, Any] = None
-    ) -> Iterable[Optional[Mapping[str, Any]]]:
-        return super(SearchByKeyword, self).stream_slices(sync_mode, cursor_field, stream_state)
-
-    def request_body_json(
-        self,
-        stream_state: Mapping[str, Any] = None,
-        stream_slice: Mapping[str, Any] = None,
-        next_page_token: Mapping[str, Any] = None,
-    ) -> Optional[Union[Dict[str, Any], str]]:
-        return super(SearchByKeyword, self).request_body_json(stream_state, stream_slice, next_page_token)
 
 
 class SearchAnalyticsKeywordSiteReportByPage(SearchByKeyword):
@@ -448,35 +427,11 @@ class SearchAnalyticsKeywordSiteReportByPage(SearchByKeyword):
     dimensions = ["date", "country", "device", "query"]
     aggregation_type = QueryAggregationType.by_page
 
-    def stream_slices(self, sync_mode, cursor_field=None, stream_state=None):
-        for stream_slice in super(SearchByKeyword, self).stream_slices(sync_mode, cursor_field, stream_state):
-                yield stream_slice
-
-    def request_body_json(
-        self,
-        stream_state: Mapping[str, Any] = None,
-        stream_slice: Mapping[str, Any] = None,
-        next_page_token: Mapping[str, Any] = None,
-    ) -> Optional[Union[Dict[str, Any], str]]:
-        return super(SearchByKeyword, self).request_body_json(stream_state, stream_slice, next_page_token)
 
 class SearchAnalyticsKeywordSiteReportBySite(SearchByKeyword):
     primary_key = ["site_url", "date", "country", "device", "query", "search_type"]
     dimensions = ["date", "country", "device", "query"]
     aggregation_type = QueryAggregationType.by_property
-    def stream_slices(
-        self, sync_mode: SyncMode, cursor_field: List[str] = None, stream_state: Mapping[str, Any] = None
-    ) -> Iterable[Optional[Mapping[str, Any]]]:
-        return super(SearchByKeyword, self).stream_slices(sync_mode, cursor_field, stream_state)
-    
-    def request_body_json(
-        self,
-        stream_state: Mapping[str, Any] = None,
-        stream_slice: Mapping[str, Any] = None,
-        next_page_token: Mapping[str, Any] = None,
-    ) -> Optional[Union[Dict[str, Any], str]]:
-        return super(SearchByKeyword, self).request_body_json(stream_state, stream_slice, next_page_token)
-
 
 
 class SearchAnalyticsSiteReportBySite(SearchAnalytics):