Merge branch 'pnilan/feat/implement-validators' into pnilan/feat/extend-spec-class-for-config-migrations

Author: pnilan

airbyte_cdk/sources/declarative/transformations/config_transformations/__init__.py

@@ -2,8 +2,8 @@
 # Copyright (c) 2025 Airbyte, Inc., all rights reserved.
 #
 
-from .add_fields import AddFields
-from .remap_field import RemapField
-from .remove_fields import RemoveFields
+from .add_fields import ConfigAddFields
+from .remap_field import ConfigRemapField
+from .remove_fields import ConfigRemoveFields
 
-__all__ = ["RemapField", "AddFields", "RemoveFields"]
+__all__ = ["ConfigRemapField", "ConfigAddFields", "ConfigRemoveFields"]

airbyte_cdk/sources/declarative/transformations/config_transformations/add_fields.py

@@ -34,15 +34,15 @@ class ParsedAddFieldDefinition:
 
 
 @dataclass
-class AddFields(ConfigTransformation):
+class ConfigAddFields(ConfigTransformation):
     """
     Transformation which adds fields to a config. The path of the added field can be nested. Adding nested fields will create all
     necessary parent objects (like mkdir -p).
 
     This transformation has access to the config being transformed.
 
     Examples of instantiating this transformation via YAML:
-    - type: AddFields
+    - type: ConfigAddFields
       fields:
         # hardcoded constant
         - path: ["path"]
@@ -113,8 +113,7 @@ def transform(
         for parsed_field in self._parsed_fields:
             valid_types = (parsed_field.value_type,) if parsed_field.value_type else None
             value = parsed_field.value.eval(config, valid_types=valid_types)
-            is_empty_condition = not self.condition
-            if is_empty_condition or self._filter_interpolator.eval(
+            if not self.condition or self._filter_interpolator.eval(
                 config, value=value, path=parsed_field.path
             ):
                 dpath.new(config, parsed_field.path, value)

airbyte_cdk/sources/declarative/transformations/config_transformations/remap_field.py

@@ -2,23 +2,26 @@
 # Copyright (c) 2025 Airbyte, Inc., all rights reserved.
 #
 
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from typing import Any, List, Mapping, MutableMapping, Union
 
+from airbyte_cdk.sources.declarative.interpolation.interpolated_boolean import InterpolatedBoolean
+from airbyte_cdk.sources.declarative.interpolation.interpolated_mapping import InterpolatedMapping
 from airbyte_cdk.sources.declarative.interpolation.interpolated_string import InterpolatedString
 from airbyte_cdk.sources.declarative.transformations.config_transformations.config_transformation import (
     ConfigTransformation,
 )
 
 
 @dataclass
-class RemapField(ConfigTransformation):
+class ConfigRemapField(ConfigTransformation):
     """
     Transformation that remaps a field's value to another value based on a static map.
     """
 
     map: Mapping[str, Any]
     field_path: List[Union[InterpolatedString, str]]
+    config: Mapping[str, Any] = field(default_factory=dict)
 
     def __post_init__(self) -> None:
         if not self.field_path:
@@ -31,6 +34,7 @@ def __post_init__(self) -> None:
                 self._field_path[path_index] = InterpolatedString.create(
                     self.field_path[path_index], parameters={}
                 )
+        self._map = InterpolatedMapping(self.map, parameters={}).eval(config=self.config)
 
     def transform(
         self,
@@ -51,10 +55,10 @@ def transform(
                 return
             current = current[component]
 
-            if not isinstance(current, Mapping):
+            if not isinstance(current, MutableMapping):
                 return
 
         field_name = path_components[-1]
 
-        if field_name in current and current[field_name] in self.map:
-            current[field_name] = self.map[current[field_name]]
+        if field_name in current and current[field_name] in self._map:
+            current[field_name] = self._map[current[field_name]]

airbyte_cdk/sources/declarative/transformations/config_transformations/remove_fields.py

@@ -1,7 +1,6 @@
 #
 # Copyright (c) 2025 Airbyte, Inc., all rights reserved.
 #
-import logging
 from dataclasses import dataclass
 from typing import Any, List, MutableMapping
 
@@ -14,11 +13,9 @@
 )
 from airbyte_cdk.sources.types import FieldPointer
 
-logger = logging.getLogger("airbyte")
-
 
 @dataclass
-class RemoveFields(ConfigTransformation):
+class ConfigRemoveFields(ConfigTransformation):
     """
     A transformation which removes fields from a config. The fields removed are designated using FieldPointers.
     During transformation, if a field or any of its parents does not exist in the config, no error is thrown.
@@ -67,6 +64,3 @@ def transform(
                 dpath.delete(config, pointer)
             except dpath.exceptions.PathNotFound:
                 pass
-            except Exception as e:
-                logger.error(f"Error removing field {pointer}: {e}")
-                raise e

…onfig_transformations/test_add_fields.py …ransformations/test_config_add_fields.pyunit_tests/sources/declarative/transformations/config_transformations/test_add_fields.py renamed to unit_tests/sources/declarative/transformations/config_transformations/test_config_add_fields.py unit_tests/sources/declarative/transformations/config_transformations/test_add_fields.py renamed to unit_tests/sources/declarative/transformations/config_transformations/test_config_add_fields.py

@@ -6,7 +6,9 @@
 
 from airbyte_cdk.sources.declarative.transformations.config_transformations.add_fields import (
     AddedFieldDefinition,
-    AddFields,
+)
+from airbyte_cdk.sources.declarative.transformations.config_transformations.add_fields import (
+    ConfigAddFields as AddFields,
 )
 
 

…nfig_transformations/test_remap_field.py …ansformations/test_config_remap_field.pyunit_tests/sources/declarative/transformations/config_transformations/test_remap_field.py renamed to unit_tests/sources/declarative/transformations/config_transformations/test_config_remap_field.py unit_tests/sources/declarative/transformations/config_transformations/test_remap_field.py renamed to unit_tests/sources/declarative/transformations/config_transformations/test_config_remap_field.py

@@ -3,25 +3,26 @@
 
 import pytest
 
-from airbyte_cdk.sources.declarative.transformations.config_transformations.remap_field import (
-    RemapField,
+from airbyte_cdk.sources.declarative.transformations.config_transformations import (
+    ConfigRemapField as RemapField,
 )
 
 
 class TestRemapField(TestCase):
     def test_given_valid_inputs_when_transform_then_field_is_remapped(self):
-        remap_transform = RemapField(
-            field_path=["authorization", "auth_type"],
-            map={"client_credentials": "oauth2", "api_key": "key_auth"},
-        )
-
         config = {
             "authorization": {
                 "auth_type": "client_credentials",
                 "client_id": "12345",
                 "client_secret": "secret",
             }
         }
+        remap_transform = RemapField(
+            field_path=["authorization", "auth_type"],
+            map={"client_credentials": "oauth2", "api_key": "key_auth"},
+            config=config,
+        )
+
         original_config = deepcopy(config)
 
         remap_transform.transform(config)
@@ -110,3 +111,21 @@ def test_multiple_transformations_applied_in_sequence(self):
 
         assert config["auth"]["type"] == "oauth2"
         assert config["environment"] == "development"
+
+    def test_amazon_seller_partner_marketplace_remap_with_interpolated_mapping(self):
+        mapping = {
+            "endpoint": {
+                "ES": "{{ 'https://sellingpartnerapi' if config.environment == 'production' else 'https://sandbox.sellingpartnerapi' }}-eu.amazon.com",
+            }
+        }
+        sandbox_config = {"environment": "sandbox", "marketplace": "ES"}
+        production_config = {"environment": "production", "marketplace": "ES"}
+        RemapField(
+            field_path=["marketplace"], map=mapping["endpoint"], config=sandbox_config
+        ).transform(sandbox_config)
+        RemapField(
+            field_path=["marketplace"], map=mapping["endpoint"], config=production_config
+        ).transform(production_config)
+
+        assert sandbox_config["marketplace"] == "https://sandbox.sellingpartnerapi-eu.amazon.com"
+        assert production_config["marketplace"] == "https://sellingpartnerapi-eu.amazon.com"

…ig_transformations/test_remove_fields.py …sformations/test_config_remove_fields.pyunit_tests/sources/declarative/transformations/config_transformations/test_remove_fields.py renamed to unit_tests/sources/declarative/transformations/config_transformations/test_config_remove_fields.py unit_tests/sources/declarative/transformations/config_transformations/test_remove_fields.py renamed to unit_tests/sources/declarative/transformations/config_transformations/test_config_remove_fields.py

@@ -2,10 +2,8 @@
 # Copyright (c) 2025 Airbyte, Inc., all rights reserved.
 #
 
-import pytest
-
 from airbyte_cdk.sources.declarative.transformations.config_transformations.remove_fields import (
-    RemoveFields,
+    ConfigRemoveFields as RemoveFields,
 )