airbyte-source-google-ads 4.2.2__tar.gz → 4.2.4__tar.gz

{airbyte_source_google_ads-4.2.2 → airbyte_source_google_ads-4.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: airbyte-source-google-ads
-Version: 4.2.2
+Version: 4.2.4
 Summary: Source implementation for Google Ads.
 Home-page: https://airbyte.com
 License: Elv2

{airbyte_source_google_ads-4.2.2 → airbyte_source_google_ads-4.2.4}/pyproject.toml

@@ -3,7 +3,7 @@ requires = [ "poetry-core>=1.0.0",]
 build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
-version = "4.2.2"
+version = "4.2.4"
 name = "airbyte-source-google-ads"
 description = "Source implementation for Google Ads."
 authors = [ "Airbyte <contact@airbyte.io>",]

{airbyte_source_google_ads-4.2.2 → airbyte_source_google_ads-4.2.4}/source_google_ads/components.py

@@ -10,7 +10,7 @@ import threading
 from dataclasses import dataclass, field
 from datetime import datetime, timedelta
 from itertools import groupby
-from typing import Any, Callable, Dict, Generator, Iterable, List, Mapping, MutableMapping, Optional, Tuple, Union
+from typing import Any, Callable, ClassVar, Dict, Generator, Iterable, List, Mapping, MutableMapping, Optional, Set, Tuple, Union
 
 import anyascii
 import requests
@@ -147,6 +147,55 @@ class FlattenNestedDictsTransformation(RecordTransformation):
             _flatten(top_key, nested)
 
 
+@dataclass
+class SerializeMessageFieldsTransformation(RecordTransformation):
+    """
+    Serializes MESSAGE-type fields (nested dict values) to JSON strings before
+    flattening occurs. This prevents FlattenNestedDictsTransformation from
+    recursively flattening MESSAGE fields like change_event.old_resource and
+    change_event.new_resource, which would create sub-keys not present in
+    the schema and cause the original field values to be lost (returned as NULL).
+
+    This transformation must run AFTER KeysToSnakeCaseGoogleAdsTransformation
+    and BEFORE FlattenNestedDictsTransformation in the custom query stream
+    transformation chain.
+
+    The set of MESSAGE-type field names is populated by
+    CustomGAQuerySchemaLoader.get_json_schema() during stream initialization
+    and stored on the CustomGAQuerySchemaLoader class.
+    """
+
+    def transform(
+        self,
+        record: Dict[str, Any],
+        config: Optional[Config] = None,
+        stream_state: Optional[StreamState] = None,
+        stream_slice: Optional[StreamSlice] = None,
+    ) -> None:
+        message_fields: set = CustomGAQuerySchemaLoader._all_message_fields
+        if not message_fields:
+            return
+
+        for field_name in message_fields:
+            parts = field_name.split(".")
+            current = record
+            for part in parts[:-1]:
+                if isinstance(current, dict) and part in current:
+                    current = current[part]
+                else:
+                    current = None
+                    break
+
+            if current is not None and isinstance(current, dict):
+                last_part = parts[-1]
+                if last_part in current:
+                    value = current[last_part]
+                    if isinstance(value, dict):
+                        current[last_part] = json.dumps(value)
+                    elif isinstance(value, list):
+                        current[last_part] = [json.dumps(item) if isinstance(item, dict) else item for item in value]
+
+
 class DoubleQuotedDictTypeTransformer(TypeTransformer):
     """
     Convert arrays of dicts into JSON-formatted string arrays using double quotes only
@@ -928,6 +977,7 @@ class CustomGAQuerySchemaLoader(SchemaLoader):
 
     _google_ads_client: Optional[GoogleAds] = None
     _client_lock = threading.Lock()
+    _all_message_fields: ClassVar[Set[str]] = set()
 
     def __post_init__(self):
         self._cursor_field = InterpolatedString.create(self.cursor_field, parameters={}) if self.cursor_field else None
@@ -964,10 +1014,14 @@ class CustomGAQuerySchemaLoader(SchemaLoader):
         fields = self._get_list_of_fields()
         fields_metadata = self.google_ads_client(self.config).get_fields_metadata(fields)
 
+        message_fields: set = set()
         for field, field_metadata in fields_metadata.items():
+            if field_metadata.data_type.name == "MESSAGE":
+                message_fields.add(field)
             field_value = self._build_field_value(field, field_metadata)
             local_json_schema["properties"][field] = field_value
 
+        CustomGAQuerySchemaLoader._all_message_fields = CustomGAQuerySchemaLoader._all_message_fields | message_fields
         return local_json_schema
 
     def _build_field_value(self, field: str, field_metadata) -> Any:

{airbyte_source_google_ads-4.2.2 → airbyte_source_google_ads-4.2.4}/source_google_ads/manifest.yaml

@@ -425,6 +425,8 @@ definitions:
     transformations:
       - type: CustomTransformation
         class_name: "source_google_ads.components.KeysToSnakeCaseGoogleAdsTransformation"
+      - type: CustomTransformation
+        class_name: "source_google_ads.components.SerializeMessageFieldsTransformation"
       - type: CustomTransformation
         class_name: "source_google_ads.components.FlattenNestedDictsTransformation"
       - type: AddFields

{airbyte_source_google_ads-4.2.2 → airbyte_source_google_ads-4.2.4}/source_google_ads/utils.py

@@ -109,10 +109,11 @@ def traced_exception(
                 )
 
         elif is_error_type(query_error, QueryErrorEnum.QueryError.UNRECOGNIZED_FIELD):
+            query_label = f'"{query_name}" ' if query_name else ""
             message = (
-                f"The Custom Query: `{query_name}` has {error.message.lower()} Please make sure the field exists or name entered is valid."
+                f"Custom query {query_label}references an unrecognized field for the queried resource."
+                " Verify all selected fields are valid for the resource."
             )
-            # additionally log the error for visability during `check_connection` in UI.
             logger.error(message)
 
         elif query_error: