airbyte-source-google-search-console 1.5.2__py3-none-any.whl → 1.5.4__py3-none-any.whl

{airbyte_source_google_search_console-1.5.2.dist-info → airbyte_source_google_search_console-1.5.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: airbyte-source-google-search-console
-Version: 1.5.2
+Version: 1.5.4
 Summary: Source implementation for Google Search Console.
 Home-page: https://airbyte.com
 License: Elv2

{airbyte_source_google_search_console-1.5.2.dist-info → airbyte_source_google_search_console-1.5.4.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=ocSisT5IYegoZf4atsGm9u2lJCdmeSf_9o4q7YN3vD4,1225
 source_google_search_console/source.py,sha256=S0IIPPiI6ixHMIaezNQO7sfIqVio2_xyQZWPhzhxS_4,10000
 source_google_search_console/spec.json,sha256=WYtFvaSqWYGm1Dt2yV9G92U78Q94rh9oarbxJe3H7xo,8470
-source_google_search_console/streams.py,sha256=avllhiXP9DGuFBdiYEaaiKCog0bzskeRISCXGxSqiT4,19120
-airbyte_source_google_search_console-1.5.2.dist-info/METADATA,sha256=phWnN8xTd_4Rc-d2-Q1z0TiHYx33DSfB1mTAdZuYfWg,5617
-airbyte_source_google_search_console-1.5.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-airbyte_source_google_search_console-1.5.2.dist-info/entry_points.txt,sha256=DMcgc9bCX-Vt6hm_68pa77qS3eGdeMhg-UdlFc-XKUM,85
-airbyte_source_google_search_console-1.5.2.dist-info/RECORD,,
+source_google_search_console/streams.py,sha256=uknk6Fuq47NxuLfElV6Wbk5qXxtMRC1XxQNFRLMQyq8,19821
+airbyte_source_google_search_console-1.5.4.dist-info/METADATA,sha256=E5ELQRPrYeMeZEn-UtJsfGUmdeVibVBwBCno7l4nadE,5617
+airbyte_source_google_search_console-1.5.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+airbyte_source_google_search_console-1.5.4.dist-info/entry_points.txt,sha256=DMcgc9bCX-Vt6hm_68pa77qS3eGdeMhg-UdlFc-XKUM,85
+airbyte_source_google_search_console-1.5.4.dist-info/RECORD,,

source_google_search_console/streams.py

@@ -374,8 +374,28 @@ class SearchByKeyword(SearchAnalytics):
     """
     Adds searchAppearance value to dimensionFilterGroups in json body
     https://developers.google.com/webmaster-tools/v1/how-tos/all-your-data#search-appearance-data
+
+    groupType: "and" - Whether all filters in this group must return true ("and"), or one or more must return true (not yet supported).
+    filters: {"dimension": "searchAppearance", "operator": "equals", "expression": keyword}
     """
 
+    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):
+            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}]
+
+                yield stream_slice
+
     def request_body_json(
         self,
         stream_state: Mapping[str, Any] = None,
@@ -383,16 +403,7 @@ 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)
-
-        stream = SearchAppearance(self._session.auth, self._site_urls, self._start_date, self._end_date)
-        keywords_records = stream.read_records(sync_mode=SyncMode.full_refresh, stream_state=stream_state, stream_slice=stream_slice)
-        keywords = {record["searchAppearance"] for record in keywords_records}
-        filters = []
-        for keyword in keywords:
-            filters.append({"dimension": "searchAppearance", "operator": "equals", "expression": keyword})
-
-        data["dimensionFilterGroups"] = [{"filters": filters}]
-
+        data["dimensionFilterGroups"] = stream_slice["dimensionFilterGroups"]
         return data