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

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

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

{airbyte_source_google_search_console-1.5.16.dev202503120000.dist-info → airbyte_source_google_search_console-1.5.16.dev202503142015.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=OQJ8kQS_QZBkHZE3KNNpqNCDuixE9jeQ91PkJwv9o6E,19695
-airbyte_source_google_search_console-1.5.16.dev202503120000.dist-info/METADATA,sha256=1fH-_BgBDDe1MejjqIvGZPqTPy_m-LxmlfFr9uMgwAc,5646
-airbyte_source_google_search_console-1.5.16.dev202503120000.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-airbyte_source_google_search_console-1.5.16.dev202503120000.dist-info/entry_points.txt,sha256=DMcgc9bCX-Vt6hm_68pa77qS3eGdeMhg-UdlFc-XKUM,85
-airbyte_source_google_search_console-1.5.16.dev202503120000.dist-info/RECORD,,
+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

@@ -378,12 +378,14 @@ class SearchAppearance(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)
-        
+
         fields_to_remove = ["aggregationType", "startRow", "rowLimit", "dataState"]
         for field in fields_to_remove:
             data.pop(field, None)
-    
+
         return data
+
+
 class SearchByKeyword(SearchAnalytics):
     """
     Adds searchAppearance value to dimensionFilterGroups in json body
@@ -392,13 +394,26 @@ class SearchByKeyword(SearchAnalytics):
     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}
     """
+
     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]]]:
-        for stream_slice in super().stream_slices(sync_mode, cursor_field, stream_state):
-            yield stream_slice
+        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}]
+                stream_slice["dimensions"] = self.dimensions
+
+                yield stream_slice
 
     def request_body_json(
         self,
@@ -407,12 +422,25 @@ 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"]
         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):
@@ -420,11 +448,35 @@ 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):