airbyte-source-google-search-console 1.5.2__tar.gz → 1.5.4__tar.gz

{airbyte_source_google_search_console-1.5.2 → airbyte_source_google_search_console-1.5.4}/PKG-INFO

@@ -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 → airbyte_source_google_search_console-1.5.4}/pyproject.toml

@@ -5,7 +5,7 @@ requires = [
 build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
-version = "1.5.2"
+version = "1.5.4"
 name = "airbyte-source-google-search-console"
 description = "Source implementation for Google Search Console."
 authors = [

{airbyte_source_google_search_console-1.5.2 → airbyte_source_google_search_console-1.5.4}/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