Merge branch 'main' into lmossman/another-reordering

Author: lmossman

.github/pr-welcome-community.md

@@ -0,0 +1,32 @@
+## 👋 Welcome to the Airbyte Python CDK!
+
+Thank you for your contribution from **{{ .repo_name }}**! We're excited to have you in the Airbyte community.
+
+### Testing This CDK Version
+
+You can test this version of the CDK using the following:
+
+```bash
+# Run the CLI from this branch:
+uvx 'git+https://github.com/airbytehq/airbyte-python-cdk.git@{{ .branch_name }}#egg=airbyte-python-cdk[dev]' --help
+
+# Update a connector to use the CDK from this branch ref:
+cd airbyte-integrations/connectors/source-example
+poe use-cdk-branch {{ .branch_name }}
+```
+
+### Helpful Resources
+
+- [Contributing Guidelines](https://docs.airbyte.com/contributing-to-airbyte/)
+- [CDK API Reference](https://airbytehq.github.io/airbyte-python-cdk/)
+
+### PR Slash Commands
+
+As needed or by request, Airbyte Maintainers can execute the following slash commands on your PR:
+
+- `/autofix` - Fixes most formatting and linting issues
+- `/poetry-lock` - Updates poetry.lock file
+- `/test` - Runs connector tests with the updated CDK
+
+If you have any questions, feel free to ask in the PR comments or join our [Slack community](https://airbytehq.slack.com/).
+

.github/pr-welcome-internal.md

@@ -0,0 +1,31 @@
+## 👋 Greetings, Airbyte Team Member!
+
+Here are some helpful tips and reminders for your convenience.
+
+### Testing This CDK Version
+
+You can test this version of the CDK using the following:
+
+```bash
+# Run the CLI from this branch:
+uvx 'git+https://github.com/airbytehq/airbyte-python-cdk.git@{{ .branch_name }}#egg=airbyte-python-cdk[dev]' --help
+
+# Update a connector to use the CDK from this branch ref:
+cd airbyte-integrations/connectors/source-example
+poe use-cdk-branch {{ .branch_name }}
+```
+
+### Helpful Resources
+
+- [CDK API Reference](https://airbytehq.github.io/airbyte-python-cdk/)
+
+### PR Slash Commands
+
+Airbyte Maintainers can execute the following slash commands on your PR:
+
+- `/autofix` - Fixes most formatting and linting issues
+- `/poetry-lock` - Updates poetry.lock file
+- `/test` - Runs connector tests with the updated CDK
+- `/poe <command>` - Runs any poe command in the CDK environment
+
+[📝 _Edit this welcome message._](https://github.com/airbytehq/airbyte-python-cdk/blob/main/.github/pr-welcome-internal.md)

.github/workflows/connector-tests.yml

@@ -75,9 +75,12 @@ jobs:
           - connector: source-google-drive
             cdk_extra: file-based
           - connector: destination-motherduck
-            cdk_extra: sql
-          - connector: source-amplitude
-            cdk_extra: n/a
+            # For now, we mark as 'n/a' to always test this connector
+            cdk_extra: n/a  # change to 'sql' to test less often
+          # source-amplitude failing for unrelated issue "date too far back"
+          # e.g. https://github.com/airbytehq/airbyte-python-cdk/actions/runs/16053716569/job/45302638848?pr=639
+          # - connector: source-amplitude
+          #   cdk_extra: n/a
           - connector: source-intercom
             cdk_extra: n/a
           - connector: source-pokeapi

.github/workflows/python_lint.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Install dependencies
         run: poetry install --all-extras
 
-      # Job-specifc step(s):
+      # Job-specific step(s):
       - name: Run lint check
         run: poetry run ruff check .
 
@@ -49,9 +49,9 @@ jobs:
       - name: Install dependencies
         run: poetry install --all-extras
 
-      # Job-specifc step(s):
+      # Job-specific step(s):
       - name: Check code format
-        run: poetry run ruff format --check .
+        run: poetry run ruff format --diff .
 
   mypy-check:
     name: MyPy Check

.github/workflows/welcome-message.yml

@@ -0,0 +1,46 @@
+name: Community PR Welcome Message
+
+# This workflow automatically adds a welcome message to PRs from community contributors (forks)
+# It includes CDK usage instructions and other helpful resources for testing changes
+#
+# MANUAL TESTING INSTRUCTIONS:
+# To manually test this workflow, temporarily uncomment the "synchronize" event type as a workflow trigger.
+# Then the workflow will run for all new commits.
+#
+# Before merging, remember to again comment-out the "synchronize" clause and uncomment the `if:` condition.
+
+on:
+  pull_request:
+    types:
+      - opened
+      - reopened
+      # Toggle this line, uncommenting for testing:
+      # - synchronize
+
+jobs:
+  welcome-contributor:
+    name: PR Welcome Message
+    permissions:
+      contents: read
+      issues: write
+      pull-requests: write
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Render template
+        id: template
+        uses: chuhlomin/[email protected]
+        with:
+          # Use a different template for internal vs forks (community)
+          template: ${{ github.event.pull_request.head.repo.fork == true && '.github/pr-welcome-community.md' || '.github/pr-welcome-internal.md' }}
+          vars: |
+            repo_name: ${{ github.event.pull_request.head.repo.full_name }}
+            branch_name: ${{ github.event.pull_request.head.ref }}
+
+      - name: Create comment
+        uses: peter-evans/create-or-update-comment@v4
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          body: ${{ steps.template.outputs.result }}

airbyte_cdk/cli/airbyte_cdk/_connector.py

@@ -67,7 +67,7 @@
 
 TEST_FILE_TEMPLATE = '''
 # Copyright (c) 2025 Airbyte, Inc., all rights reserved.
-"""FAST Airbyte Standard Tests for the {connector_name} source."""
+"""FAST Airbyte Standard Tests for the {connector_name} connector."""
 
 #from airbyte_cdk.test.standard_tests import {base_class_name}
 from airbyte_cdk.test.standard_tests.util import create_connector_test_suite
@@ -81,11 +81,13 @@
     connector_directory=Path(),
 )
 
+# Uncomment the following lines to create a custom test suite class:
+#
 # class TestSuite({base_class_name}):
-#     """Test suite for the {connector_name} source.
-
-#     This class inherits from SourceTestSuiteBase and implements all of the tests in the suite.
-
+#     """Test suite for the `{connector_name}` connector.
+#
+#     This class inherits from `{base_class_name}` and implements all of the tests in the suite.
+#
 #     As long as the class name starts with "Test", pytest will automatically discover and run the
 #     tests in this class.
 #     """

airbyte_cdk/sources/declarative/declarative_component_schema.yaml

@@ -2043,9 +2043,15 @@ definitions:
           - "$ref": "#/definitions/NoAuth"
           - "$ref": "#/definitions/LegacySessionTokenAuthenticator"
       fetch_properties_from_endpoint:
+        deprecated: true
+        deprecation_message: "Use `query_properties` field instead."
         title: Fetch Properties from Endpoint
         description: Allows for retrieving a dynamic set of properties from an API endpoint which can be injected into outbound request using the stream_partition.extra_fields.
         "$ref": "#/definitions/PropertiesFromEndpoint"
+      query_properties:
+        title: Query Properties
+        description: For APIs that require explicit specification of the properties to query for, this component will take a static or dynamic set of properties (which can be optionally split into chunks) and allow them to be injected into an outbound request by accessing stream_partition.extra_fields.
+        "$ref": "#/definitions/QueryProperties"
       request_parameters:
         title: Query Parameters
         description: Specifies the query parameters that should be set on an outgoing HTTP request given the inputs.
@@ -4235,6 +4241,11 @@ definitions:
           - "$ref": "#/definitions/HttpComponentsResolver"
           - "$ref": "#/definitions/ConfigComponentsResolver"
           - "$ref": "#/definitions/ParametrizedComponentsResolver"
+      use_parent_parameters:
+        title: Use Parent Parameters
+        description: Whether or not to prioritize parent parameters over component parameters when constructing dynamic streams. Defaults to true for backward compatibility.
+        type: boolean
+        default: true
     required:
       - type
       - stream_template

airbyte_cdk/sources/declarative/interpolation/macros.py

@@ -4,6 +4,7 @@
 
 import builtins
 import datetime
+import re
 import typing
 from typing import Optional, Union
 from urllib.parse import quote_plus
@@ -194,6 +195,18 @@ def sanitize_url(value: str) -> str:
     return sanitization_strategy(value)
 
 
+def camel_case_to_snake_case(value: str) -> str:
+    """
+     Converts CamelCase strings to snake_case format
+
+     Usage:
+    `"{{ camel_case_to_snake_case('CamelCase') }}"`
+     :param value: string to convert from CamelCase to snake_case
+     :return: snake_case formatted string
+    """
+    return re.sub(r"(?<!^)(?=[A-Z])", "_", value).lower()
+
+
 _macros_list = [
     now_utc,
     today_utc,
@@ -206,5 +219,6 @@ def sanitize_url(value: str) -> str:
     today_with_timezone,
     str_to_datetime,
     sanitize_url,
+    camel_case_to_snake_case,
 ]
 macros = {f.__name__: f for f in _macros_list}

airbyte_cdk/sources/declarative/manifest_declarative_source.py

@@ -553,9 +553,13 @@ def _dynamic_stream_configs(
             for dynamic_stream in components_resolver.resolve_components(
                 stream_template_config=stream_template_config
             ):
+                # Get the use_parent_parameters configuration from the dynamic definition
+                # Default to True for backward compatibility, since connectors were already using it by default when this param was added
+                use_parent_parameters = dynamic_definition.get("use_parent_parameters", True)
+
                 dynamic_stream = {
                     **ManifestComponentTransformer().propagate_types_and_parameters(
-                        "", dynamic_stream, {}, use_parent_parameters=True
+                        "", dynamic_stream, {}, use_parent_parameters=use_parent_parameters
                     )
                 }
 

airbyte_cdk/sources/declarative/models/declarative_component_schema.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2025 Airbyte, Inc., all rights reserved.
+
 # generated by datamodel-codegen:
 #   filename:  declarative_component_schema.yaml
 
@@ -2541,9 +2543,16 @@ class HttpRequester(BaseModelWithDeprecations):
     )
     fetch_properties_from_endpoint: Optional[PropertiesFromEndpoint] = Field(
         None,
+        deprecated=True,
+        deprecation_message="Use `query_properties` field instead.",
         description="Allows for retrieving a dynamic set of properties from an API endpoint which can be injected into outbound request using the stream_partition.extra_fields.",
         title="Fetch Properties from Endpoint",
     )
+    query_properties: Optional[QueryProperties] = Field(
+        None,
+        description="For APIs that require explicit specification of the properties to query for, this component will take a static or dynamic set of properties (which can be optionally split into chunks) and allow them to be injected into an outbound request by accessing stream_partition.extra_fields.",
+        title="Query Properties",
+    )
     request_parameters: Optional[Union[Dict[str, Union[str, QueryProperties]], str]] = Field(
         None,
         description="Specifies the query parameters that should be set on an outgoing HTTP request given the inputs.",
@@ -2958,6 +2967,11 @@ class DynamicDeclarativeStream(BaseModel):
         description="Component resolve and populates stream templates with components values.",
         title="Components Resolver",
     )
+    use_parent_parameters: Optional[bool] = Field(
+        True,
+        description="Whether or not to prioritize parent parameters over component parameters when constructing dynamic streams. Defaults to true for backward compatibility.",
+        title="Use Parent Parameters",
+    )
 
 
 ComplexFieldType.update_forward_refs()