airbyte-cdk 6.43.0.dev0__py3-none-any.whl → 6.43.1__py3-none-any.whl

airbyte_cdk/connector_builder/connector_builder_handler.py

@@ -4,7 +4,7 @@
 
 
 from dataclasses import asdict, dataclass, field
-from typing import Any, List, Mapping
+from typing import Any, Dict, List, Mapping
 
 from airbyte_cdk.connector_builder.test_reader import TestReader
 from airbyte_cdk.models import (
@@ -27,30 +27,34 @@ from airbyte_cdk.utils.traced_exception import AirbyteTracedException
 DEFAULT_MAXIMUM_NUMBER_OF_PAGES_PER_SLICE = 5
 DEFAULT_MAXIMUM_NUMBER_OF_SLICES = 5
 DEFAULT_MAXIMUM_RECORDS = 100
+DEFAULT_MAXIMUM_STREAMS = 100
 
 MAX_PAGES_PER_SLICE_KEY = "max_pages_per_slice"
 MAX_SLICES_KEY = "max_slices"
 MAX_RECORDS_KEY = "max_records"
+MAX_STREAMS_KEY = "max_streams"
 
 
 @dataclass
-class TestReadLimits:
+class TestLimits:
     max_records: int = field(default=DEFAULT_MAXIMUM_RECORDS)
     max_pages_per_slice: int = field(default=DEFAULT_MAXIMUM_NUMBER_OF_PAGES_PER_SLICE)
     max_slices: int = field(default=DEFAULT_MAXIMUM_NUMBER_OF_SLICES)
+    max_streams: int = field(default=DEFAULT_MAXIMUM_STREAMS)
 
 
-def get_limits(config: Mapping[str, Any]) -> TestReadLimits:
+def get_limits(config: Mapping[str, Any]) -> TestLimits:
     command_config = config.get("__test_read_config", {})
     max_pages_per_slice = (
         command_config.get(MAX_PAGES_PER_SLICE_KEY) or DEFAULT_MAXIMUM_NUMBER_OF_PAGES_PER_SLICE
     )
     max_slices = command_config.get(MAX_SLICES_KEY) or DEFAULT_MAXIMUM_NUMBER_OF_SLICES
     max_records = command_config.get(MAX_RECORDS_KEY) or DEFAULT_MAXIMUM_RECORDS
-    return TestReadLimits(max_records, max_pages_per_slice, max_slices)
+    max_streams = command_config.get(MAX_STREAMS_KEY) or DEFAULT_MAXIMUM_STREAMS
+    return TestLimits(max_records, max_pages_per_slice, max_slices, max_streams)
 
 
-def create_source(config: Mapping[str, Any], limits: TestReadLimits) -> ManifestDeclarativeSource:
+def create_source(config: Mapping[str, Any], limits: TestLimits) -> ManifestDeclarativeSource:
     manifest = config["__injected_declarative_manifest"]
     return ManifestDeclarativeSource(
         config=config,
@@ -71,7 +75,7 @@ def read_stream(
     config: Mapping[str, Any],
     configured_catalog: ConfiguredAirbyteCatalog,
     state: List[AirbyteStateMessage],
-    limits: TestReadLimits,
+    limits: TestLimits,
 ) -> AirbyteMessage:
     try:
         test_read_handler = TestReader(
@@ -117,13 +121,23 @@ def resolve_manifest(source: ManifestDeclarativeSource) -> AirbyteMessage:
         return error.as_airbyte_message()
 
 
-def full_resolve_manifest(source: ManifestDeclarativeSource) -> AirbyteMessage:
+def full_resolve_manifest(source: ManifestDeclarativeSource, limits: TestLimits) -> AirbyteMessage:
     try:
         manifest = {**source.resolved_manifest}
         streams = manifest.get("streams", [])
         for stream in streams:
             stream["dynamic_stream_name"] = None
-        streams.extend(source.dynamic_streams)
+
+        mapped_streams: Dict[str, List[Dict[str, Any]]] = {}
+        for stream in source.dynamic_streams:
+            generated_streams = mapped_streams.setdefault(stream["dynamic_stream_name"], [])
+
+            if len(generated_streams) < limits.max_streams:
+                generated_streams += [stream]
+
+        for generated_streams_list in mapped_streams.values():
+            streams.extend(generated_streams_list)
+
         manifest["streams"] = streams
         return AirbyteMessage(
             type=Type.RECORD,

airbyte_cdk/connector_builder/main.py

@@ -10,7 +10,7 @@ import orjson
 
 from airbyte_cdk.connector import BaseConnector
 from airbyte_cdk.connector_builder.connector_builder_handler import (
-    TestReadLimits,
+    TestLimits,
     create_source,
     full_resolve_manifest,
     get_limits,
@@ -73,7 +73,7 @@ def handle_connector_builder_request(
     config: Mapping[str, Any],
     catalog: Optional[ConfiguredAirbyteCatalog],
     state: List[AirbyteStateMessage],
-    limits: TestReadLimits,
+    limits: TestLimits,
 ) -> AirbyteMessage:
     if command == "resolve_manifest":
         return resolve_manifest(source)
@@ -83,7 +83,7 @@ def handle_connector_builder_request(
         ), "`test_read` requires a valid `ConfiguredAirbyteCatalog`, got None."
         return read_stream(source, config, catalog, state, limits)
     elif command == "full_resolve_manifest":
-        return full_resolve_manifest(source)
+        return full_resolve_manifest(source, limits)
     else:
         raise ValueError(f"Unrecognized command {command}.")
 

airbyte_cdk/sources/declarative/declarative_component_schema.yaml

@@ -1023,15 +1023,6 @@ definitions:
       $parameters:
         type: object
         additionalProperties: true
-  EmitPartialRecordMergeStrategy:
-    title: Emit Partial Record
-    description: Record merge strategy where in the case where multiple requests are needed to retrieve all properties, properties are not consolidated back into a single record and are instead emitted as separate groups of properties. This strategy should only be used when records do not have a unique identifier like a primary key.
-    required:
-      - type
-    properties:
-      type:
-        type: string
-        enum: [EmitPartialRecordMergeStrategy]
   JwtAuthenticator:
     title: JWT Authenticator
     description: Authenticator for requests using JWT authentication flow.
@@ -1740,30 +1731,6 @@ definitions:
       $parameters:
         type: object
         additionalProperties: true
-  GroupByKeyMergeStrategy:
-    title: Group by Key
-    description: Record merge strategy that combines records according to fields on the record.
-    required:
-      - type
-      - key
-    properties:
-      type:
-        type: string
-        enum: [GroupByKeyMergeStrategy]
-      key:
-        title: Key
-        description: The name of the field on the record whose value will be used to group properties that were retrieved through multiple API requests.
-        anyOf:
-          - type: string
-          - type: array
-            items:
-              type: string
-        examples:
-          - "id"
-          - ["parent_id", "end_date"]
-      $parameters:
-        type: object
-        additionalProperties: true
   SessionTokenAuthenticator:
     type: object
     required:
@@ -1983,9 +1950,7 @@ definitions:
           - type: string
           - type: object
             additionalProperties:
-              anyOf:
-                - type: string
-                - $ref": "#/definitions/QueryProperties"
+              type: string
         interpolation_context:
           - next_page_token
           - stream_interval
@@ -3003,98 +2968,6 @@ definitions:
     examples:
       - id
       - ["code", "type"]
-  PropertiesFromEndpoint:
-    title: Properties from Endpoint
-    description: Defines the behavior for fetching the list of properties from an API that will be loaded into the requests to extract records.
-    type: object
-    required:
-      - type
-      - property_field_path
-      - retriever
-    properties:
-      type:
-        type: string
-        enum: [PropertiesFromEndpoint]
-      property_field_path:
-        description: Describes the path to the field that should be extracted
-        type: array
-        items:
-          type: string
-        examples:
-          - ["name"]
-        interpolation_context:
-          - config
-          - parameters
-      retriever:
-        description: Requester component that describes how to fetch the properties to query from a remote API endpoint.
-        anyOf:
-          - "$ref": "#/definitions/CustomRetriever"
-          - "$ref": "#/definitions/SimpleRetriever"
-      $parameters:
-        type: object
-        additionalProperties: true
-  PropertyChunking:
-    title: Property Chunking
-    description: For APIs with restrictions on the amount of properties that can be requester per request, property chunking can be applied to make multiple requests with a subset of the properties.
-    type: object
-    required:
-      - type
-      - property_limit_type
-    properties:
-      type:
-        type: string
-        enum: [PropertyChunking]
-      property_limit_type:
-        title: Property Limit Type
-        description: The type used to determine the maximum number of properties per chunk
-        enum:
-          - characters
-          - property_count
-      property_limit:
-        title: Property Limit
-        description: The maximum amount of properties that can be retrieved per request according to the limit type.
-        type: integer
-      record_merge_strategy:
-        title: Record Merge Strategy
-        description: Dictates how to records that require multiple requests to get all properties should be emitted to the destination
-        anyOf:
-          - "$ref": "#/definitions/EmitPartialRecordMergeStrategy"
-          - "$ref": "#/definitions/GroupByKeyMergeStrategy"
-      $parameters:
-        type: object
-        additionalProperties: true
-  QueryProperties:
-    title: Query Properties
-    description: For APIs that require explicit specification of the properties to query for, this component specifies which property fields and how they are supplied to outbound requests.
-    type: object
-    required:
-      - type
-      - property_list
-    properties:
-      type:
-        type: string
-        enum: [QueryProperties]
-      property_list:
-        title: Property List
-        description: The set of properties that will be queried for in the outbound request. This can either be statically defined or dynamic based on an API endpoint
-        anyOf:
-          - type: array
-            items:
-              type: string
-          - "$ref": "#/definitions/PropertiesFromEndpoint"
-      always_include_properties:
-        title: Always Include Properties
-        description: The list of properties that should be included in every set of properties when multiple chunks of properties are being requested.
-        type: array
-        items:
-          type: string
-      property_chunking:
-        title: Property Chunking
-        description: Defines how query properties will be grouped into smaller sets for APIs with limitations on the number of properties fetched per API request.
-        "$ref": "#/definitions/PropertyChunking"
-      $parameters:
-        type: object
-        additionalProperties: true
   RecordFilter:
     title: Record Filter
     description: Filter applied on a list of records.

airbyte_cdk/sources/declarative/manifest_declarative_source.py

@@ -397,6 +397,12 @@ class ManifestDeclarativeSource(DeclarativeSource):
             for dynamic_stream in components_resolver.resolve_components(
                 stream_template_config=stream_template_config
             ):
+                dynamic_stream = {
+                    **ManifestComponentTransformer().propagate_types_and_parameters(
+                        "", dynamic_stream, {}, use_parent_parameters=True
+                    )
+                }
+
                 if "type" not in dynamic_stream:
                     dynamic_stream["type"] = "DeclarativeStream"
 

airbyte_cdk/sources/declarative/models/declarative_component_schema.py

@@ -1,5 +1,3 @@
-# Copyright (c) 2025 Airbyte, Inc., all rights reserved.
-
 # generated by datamodel-codegen:
 #   filename:  declarative_component_schema.yaml
 
@@ -345,10 +343,6 @@ class Clamping(BaseModel):
     target_details: Optional[Dict[str, Any]] = None
 
 
-class EmitPartialRecordMergeStrategy(BaseModel):
-    type: Literal["EmitPartialRecordMergeStrategy"]
-
-
 class Algorithm(Enum):
     HS256 = "HS256"
     HS384 = "HS384"
@@ -722,17 +716,6 @@ class ExponentialBackoffStrategy(BaseModel):
     parameters: Optional[Dict[str, Any]] = Field(None, alias="$parameters")
 
 
-class GroupByKeyMergeStrategy(BaseModel):
-    type: Literal["GroupByKeyMergeStrategy"]
-    key: Union[str, List[str]] = Field(
-        ...,
-        description="The name of the field on the record whose value will be used to group properties that were retrieved through multiple API requests.",
-        examples=["id", ["parent_id", "end_date"]],
-        title="Key",
-    )
-    parameters: Optional[Dict[str, Any]] = Field(None, alias="$parameters")
-
-
 class SessionTokenRequestBearerAuthenticator(BaseModel):
     type: Literal["Bearer"]
 
@@ -1204,33 +1187,6 @@ class PrimaryKey(BaseModel):
     )
 
 
-class PropertyLimitType(Enum):
-    characters = "characters"
-    property_count = "property_count"
-
-
-class PropertyChunking(BaseModel):
-    type: Literal["PropertyChunking"]
-    property_limit_type: PropertyLimitType = Field(
-        ...,
-        description="The type used to determine the maximum number of properties per chunk",
-        title="Property Limit Type",
-    )
-    property_limit: Optional[int] = Field(
-        None,
-        description="The maximum amount of properties that can be retrieved per request according to the limit type.",
-        title="Property Limit",
-    )
-    record_merge_strategy: Optional[
-        Union[EmitPartialRecordMergeStrategy, GroupByKeyMergeStrategy]
-    ] = Field(
-        None,
-        description="Dictates how to records that require multiple requests to get all properties should be emitted to the destination",
-        title="Record Merge Strategy",
-    )
-    parameters: Optional[Dict[str, Any]] = Field(None, alias="$parameters")
-
-
 class RecordFilter(BaseModel):
     type: Literal["RecordFilter"]
     condition: Optional[str] = Field(
@@ -2218,7 +2174,7 @@ class HttpRequester(BaseModel):
         examples=[{"Output-Format": "JSON"}, {"Version": "{{ config['version'] }}"}],
         title="Request Headers",
     )
-    request_parameters: Optional[Union[str, Dict[str, Union[str, Any]]]] = Field(
+    request_parameters: Optional[Union[str, Dict[str, str]]] = Field(
         None,
         description="Specifies the query parameters that should be set on an outgoing HTTP request given the inputs.",
         examples=[
@@ -2308,40 +2264,6 @@ class ParentStreamConfig(BaseModel):
     parameters: Optional[Dict[str, Any]] = Field(None, alias="$parameters")
 
 
-class PropertiesFromEndpoint(BaseModel):
-    type: Literal["PropertiesFromEndpoint"]
-    property_field_path: List[str] = Field(
-        ...,
-        description="Describes the path to the field that should be extracted",
-        examples=[["name"]],
-    )
-    retriever: Union[CustomRetriever, SimpleRetriever] = Field(
-        ...,
-        description="Requester component that describes how to fetch the properties to query from a remote API endpoint.",
-    )
-    parameters: Optional[Dict[str, Any]] = Field(None, alias="$parameters")
-
-
-class QueryProperties(BaseModel):
-    type: Literal["QueryProperties"]
-    property_list: Union[List[str], PropertiesFromEndpoint] = Field(
-        ...,
-        description="The set of properties that will be queried for in the outbound request. This can either be statically defined or dynamic based on an API endpoint",
-        title="Property List",
-    )
-    always_include_properties: Optional[List[str]] = Field(
-        None,
-        description="The list of properties that should be included in every set of properties when multiple chunks of properties are being requested.",
-        title="Always Include Properties",
-    )
-    property_chunking: Optional[PropertyChunking] = Field(
-        None,
-        description="Defines how query properties will be grouped into smaller sets for APIs with limitations on the number of properties fetched per API request.",
-        title="Property Chunking",
-    )
-    parameters: Optional[Dict[str, Any]] = Field(None, alias="$parameters")
-
-
 class StateDelegatingStream(BaseModel):
     type: Literal["StateDelegatingStream"]
     name: str = Field(..., description="The stream name.", example=["Users"], title="Name")
@@ -2590,6 +2512,5 @@ DeclarativeStream.update_forward_refs()
 SessionTokenAuthenticator.update_forward_refs()
 DynamicSchemaLoader.update_forward_refs()
 ParentStreamConfig.update_forward_refs()
-PropertiesFromEndpoint.update_forward_refs()
 SimpleRetriever.update_forward_refs()
 AsyncRetriever.update_forward_refs()

airbyte_cdk/sources/declarative/parsers/manifest_component_transformer.py

@@ -4,7 +4,7 @@
 
 import copy
 import typing
-from typing import Any, Mapping
+from typing import Any, Mapping, Optional
 
 PARAMETERS_STR = "$parameters"
 
@@ -94,6 +94,7 @@ class ManifestComponentTransformer:
         parent_field_identifier: str,
         declarative_component: Mapping[str, Any],
         parent_parameters: Mapping[str, Any],
+        use_parent_parameters: Optional[bool] = None,
     ) -> Mapping[str, Any]:
         """
         Recursively transforms the specified declarative component and subcomponents to propagate parameters and insert the
@@ -103,6 +104,7 @@ class ManifestComponentTransformer:
         :param declarative_component: The current component that is having type and parameters added
         :param parent_field_identifier: The name of the field of the current component coming from the parent component
         :param parent_parameters: The parameters set on parent components defined before the current component
+        :param use_parent_parameters: If set, parent parameters will be used as the source of truth when key names are the same
         :return: A deep copy of the transformed component with types and parameters persisted to it
         """
         propagated_component = dict(copy.deepcopy(declarative_component))
@@ -130,7 +132,11 @@ class ManifestComponentTransformer:
         # level take precedence
         current_parameters = dict(copy.deepcopy(parent_parameters))
         component_parameters = propagated_component.pop(PARAMETERS_STR, {})
-        current_parameters = {**current_parameters, **component_parameters}
+        current_parameters = (
+            {**component_parameters, **current_parameters}
+            if use_parent_parameters
+            else {**current_parameters, **component_parameters}
+        )
 
         # Parameters should be applied to the current component fields with the existing field taking precedence over parameters if
         # both exist
@@ -145,7 +151,10 @@ class ManifestComponentTransformer:
                 excluded_parameter = current_parameters.pop(field_name, None)
                 parent_type_field_identifier = f"{propagated_component.get('type')}.{field_name}"
                 propagated_component[field_name] = self.propagate_types_and_parameters(
-                    parent_type_field_identifier, field_value, current_parameters
+                    parent_type_field_identifier,
+                    field_value,
+                    current_parameters,
+                    use_parent_parameters=use_parent_parameters,
                 )
                 if excluded_parameter:
                     current_parameters[field_name] = excluded_parameter
@@ -158,7 +167,10 @@ class ManifestComponentTransformer:
                             f"{propagated_component.get('type')}.{field_name}"
                         )
                         field_value[i] = self.propagate_types_and_parameters(
-                            parent_type_field_identifier, element, current_parameters
+                            parent_type_field_identifier,
+                            element,
+                            current_parameters,
+                            use_parent_parameters=use_parent_parameters,
                         )
                 if excluded_parameter:
                     current_parameters[field_name] = excluded_parameter

airbyte_cdk/sources/declarative/parsers/model_to_component_factory.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2025 Airbyte, Inc., all rights reserved.
+# Copyright (c) 2023 Airbyte, Inc., all rights reserved.
 #
 
 from __future__ import annotations
@@ -227,9 +227,6 @@ from airbyte_cdk.sources.declarative.models.declarative_component_schema import
 from airbyte_cdk.sources.declarative.models.declarative_component_schema import (
     FlattenFields as FlattenFieldsModel,
 )
-from airbyte_cdk.sources.declarative.models.declarative_component_schema import (
-    GroupByKeyMergeStrategy as GroupByKeyMergeStrategyModel,
-)
 from airbyte_cdk.sources.declarative.models.declarative_component_schema import (
     GroupingPartitionRouter as GroupingPartitionRouterModel,
 )
@@ -320,18 +317,6 @@ from airbyte_cdk.sources.declarative.models.declarative_component_schema import
 from airbyte_cdk.sources.declarative.models.declarative_component_schema import (
     ParentStreamConfig as ParentStreamConfigModel,
 )
-from airbyte_cdk.sources.declarative.models.declarative_component_schema import (
-    PropertiesFromEndpoint as PropertiesFromEndpointModel,
-)
-from airbyte_cdk.sources.declarative.models.declarative_component_schema import (
-    PropertyChunking as PropertyChunkingModel,
-)
-from airbyte_cdk.sources.declarative.models.declarative_component_schema import (
-    PropertyLimitType as PropertyLimitTypeModel,
-)
-from airbyte_cdk.sources.declarative.models.declarative_component_schema import (
-    QueryProperties as QueryPropertiesModel,
-)
 from airbyte_cdk.sources.declarative.models.declarative_component_schema import (
     Rate as RateModel,
 )
@@ -440,15 +425,6 @@ from airbyte_cdk.sources.declarative.requesters.paginators.strategies import (
     PageIncrement,
     StopConditionPaginationStrategyDecorator,
 )
-from airbyte_cdk.sources.declarative.requesters.query_properties import (
-    GroupByKey,
-    PropertiesFromEndpoint,
-    PropertyChunking,
-    QueryProperties,
-)
-from airbyte_cdk.sources.declarative.requesters.query_properties.property_chunking import (
-    PropertyLimitType,
-)
 from airbyte_cdk.sources.declarative.requesters.request_option import RequestOptionType
 from airbyte_cdk.sources.declarative.requesters.request_options import (
     DatetimeBasedRequestOptionsProvider,
@@ -612,7 +588,6 @@ class ModelToComponentFactory:
             ResponseToFileExtractorModel: self.create_response_to_file_extractor,
             ExponentialBackoffStrategyModel: self.create_exponential_backoff_strategy,
             SessionTokenAuthenticatorModel: self.create_session_token_authenticator,
-            GroupByKeyMergeStrategyModel: self.create_group_by_key,
             HttpRequesterModel: self.create_http_requester,
             HttpResponseFilterModel: self.create_http_response_filter,
             InlineSchemaLoaderModel: self.create_inline_schema_loader,
@@ -642,9 +617,6 @@ class ModelToComponentFactory:
             OffsetIncrementModel: self.create_offset_increment,
             PageIncrementModel: self.create_page_increment,
             ParentStreamConfigModel: self.create_parent_stream_config,
-            PropertiesFromEndpointModel: self.create_properties_from_endpoint,
-            PropertyChunkingModel: self.create_property_chunking,
-            QueryPropertiesModel: self.create_query_properties,
             RecordFilterModel: self.create_record_filter,
             RecordSelectorModel: self.create_record_selector,
             RemoveFieldsModel: self.create_remove_fields,
@@ -2075,8 +2047,8 @@ class ModelToComponentFactory:
             parameters=model.parameters or {},
         )
 
-    @staticmethod
     def create_response_to_file_extractor(
+        self,
         model: ResponseToFileExtractorModel,
         **kwargs: Any,
     ) -> ResponseToFileExtractor:
@@ -2090,16 +2062,11 @@ class ModelToComponentFactory:
             factor=model.factor or 5, parameters=model.parameters or {}, config=config
         )
 
-    @staticmethod
-    def create_group_by_key(model: GroupByKeyMergeStrategyModel, config: Config) -> GroupByKey:
-        return GroupByKey(model.key, config=config, parameters=model.parameters or {})
-
     def create_http_requester(
         self,
         model: HttpRequesterModel,
         config: Config,
         decoder: Decoder = JsonDecoder(parameters={}),
-        query_properties_key: Optional[str] = None,
         *,
         name: str,
     ) -> HttpRequester:
@@ -2132,7 +2099,6 @@ class ModelToComponentFactory:
             request_body_json=model.request_body_json,
             request_headers=model.request_headers,
             request_parameters=model.request_parameters,
-            query_properties_key=query_properties_key,
             config=config,
             parameters=model.parameters or {},
         )
@@ -2600,79 +2566,6 @@ class ModelToComponentFactory:
             lazy_read_pointer=model_lazy_read_pointer,
         )
 
-    def create_properties_from_endpoint(
-        self, model: PropertiesFromEndpointModel, config: Config, **kwargs: Any
-    ) -> PropertiesFromEndpoint:
-        name = "property_retriever"
-        retriever = self._create_component_from_model(
-            model=model.retriever,
-            config=config,
-            name=name,
-            primary_key=None,
-            stream_slicer=None,
-            transformations=[],
-        )
-        return PropertiesFromEndpoint(
-            property_field_path=model.property_field_path,
-            retriever=retriever,
-            config=config,
-            parameters=model.parameters or {},
-        )
-
-    def create_property_chunking(
-        self, model: PropertyChunkingModel, config: Config, **kwargs: Any
-    ) -> PropertyChunking:
-        record_merge_strategy = (
-            self._create_component_from_model(
-                model=model.record_merge_strategy, config=config, **kwargs
-            )
-            if model.record_merge_strategy
-            else None
-        )
-
-        property_limit_type: PropertyLimitType
-        match model.property_limit_type:
-            case PropertyLimitTypeModel.property_count:
-                property_limit_type = PropertyLimitType.property_count
-            case PropertyLimitTypeModel.characters:
-                property_limit_type = PropertyLimitType.characters
-            case _:
-                raise ValueError(f"Invalid PropertyLimitType {property_limit_type}")
-
-        return PropertyChunking(
-            property_limit_type=property_limit_type,
-            property_limit=model.property_limit,
-            record_merge_strategy=record_merge_strategy,
-            config=config,
-            parameters=model.parameters or {},
-        )
-
-    def create_query_properties(
-        self, model: QueryPropertiesModel, config: Config, **kwargs: Any
-    ) -> QueryProperties:
-        if isinstance(model.property_list, list):
-            property_list = model.property_list
-        else:
-            property_list = self._create_component_from_model(
-                model=model.property_list, config=config, **kwargs
-            )
-
-        property_chunking = (
-            self._create_component_from_model(
-                model=model.property_chunking, config=config, **kwargs
-            )
-            if model.property_chunking
-            else None
-        )
-
-        return QueryProperties(
-            property_list=property_list,
-            always_include_properties=model.always_include_properties,
-            property_chunking=property_chunking,
-            config=config,
-            parameters=model.parameters or {},
-        )
-
     @staticmethod
     def create_record_filter(
         model: RecordFilterModel, config: Config, **kwargs: Any
@@ -2825,6 +2718,9 @@ class ModelToComponentFactory:
             if model.decoder
             else JsonDecoder(parameters={})
         )
+        requester = self._create_component_from_model(
+            model=model.requester, decoder=decoder, config=config, name=name
+        )
         record_selector = self._create_component_from_model(
             model=model.record_selector,
             name=name,
@@ -2833,53 +2729,6 @@ class ModelToComponentFactory:
             transformations=transformations,
             client_side_incremental_sync=client_side_incremental_sync,
         )
-
-        query_properties: Optional[QueryProperties] = None
-        query_properties_key: Optional[str] = None
-        if (
-            hasattr(model.requester, "request_parameters")
-            and model.requester.request_parameters
-            and isinstance(model.requester.request_parameters, Mapping)
-        ):
-            query_properties_definitions = []
-            for key, request_parameter in model.requester.request_parameters.items():
-                if (
-                    isinstance(request_parameter, Mapping)
-                    and request_parameter.get("type") == "QueryProperties"
-                ):
-                    query_properties_key = key
-                    query_properties_definitions.append(request_parameter)
-                elif not isinstance(request_parameter, str):
-                    raise ValueError(
-                        f"Each element of request_parameters should be of type str or QueryProperties, but received {request_parameter.get('type')}"
-                    )
-
-            if len(query_properties_definitions) > 1:
-                raise ValueError(
-                    f"request_parameters should only define one QueryProperties field, but found {len(query_properties_definitions)}"
-                )
-
-            if len(query_properties_definitions) == 1:
-                query_properties = self.create_component(
-                    model_type=QueryPropertiesModel,
-                    component_definition=query_properties_definitions[0],
-                    config=config,
-                )
-
-            # Removes QueryProperties components from the interpolated mappings because it will be resolved in
-            # the provider from the slice directly instead of through jinja interpolation
-            if isinstance(model.requester.request_parameters, Mapping):
-                model.requester.request_parameters = self._remove_query_properties(
-                    model.requester.request_parameters
-                )
-
-        requester = self._create_component_from_model(
-            model=model.requester,
-            decoder=decoder,
-            query_properties_key=query_properties_key,
-            config=config,
-            name=name,
-        )
         url_base = (
             model.requester.url_base
             if hasattr(model.requester, "url_base")
@@ -2985,42 +2834,9 @@ class ModelToComponentFactory:
             cursor=cursor,
             config=config,
             ignore_stream_slicer_parameters_on_paginated_requests=ignore_stream_slicer_parameters_on_paginated_requests,
-            additional_query_properties=query_properties,
             parameters=model.parameters or {},
         )
 
-    @staticmethod
-    def _remove_query_properties(
-        request_parameters: Mapping[str, Union[Any, str]],
-    ) -> Mapping[str, Union[Any, str]]:
-        return {
-            parameter_field: request_parameter
-            for parameter_field, request_parameter in request_parameters.items()
-            if not isinstance(request_parameter, Mapping)
-            or not request_parameter.get("type") == "QueryProperties"
-        }
-
-    @staticmethod
-    def _translate_query_properties_to_interpolated_strings(
-        request_parameters: Mapping[str, Union[Any, str]],
-    ) -> Mapping[str, Union[Any, str]]:
-        # todo blai: remove this since unused
-        new_request_parameters = dict()
-        for key, request_parameter in request_parameters.items():
-            if (
-                isinstance(request_parameter, Mapping)
-                and request_parameter.get("type") == "QueryProperties"
-            ):
-                # This may seem like this could be combined into the above conditional, but this is separated
-                # so that we do not add the properties into the new request_parameters mapping
-                if request_parameter.get("inject_into"):
-                    new_request_parameters[key] = (
-                        "{{ stream_partition.extra_fields['query_properties'] }}"
-                    )
-            else:
-                new_request_parameters[key] = request_parameter
-        return new_request_parameters
-
     def create_state_delegating_stream(
         self,
         model: StateDelegatingStreamModel,

airbyte_cdk/sources/declarative/requesters/request_options/interpolated_request_options_provider.py

@@ -1,9 +1,9 @@
 #
-# Copyright (c) 2025 Airbyte, Inc., all rights reserved.
+# Copyright (c) 2023 Airbyte, Inc., all rights reserved.
 #
 
 from dataclasses import InitVar, dataclass, field
-from typing import Any, List, Mapping, MutableMapping, Optional, Union
+from typing import Any, Mapping, MutableMapping, Optional, Union
 
 from airbyte_cdk.sources.declarative.interpolation.interpolated_nested_mapping import NestedMapping
 from airbyte_cdk.sources.declarative.requesters.request_options.interpolated_nested_request_input_provider import (
@@ -40,7 +40,6 @@ class InterpolatedRequestOptionsProvider(RequestOptionsProvider):
     request_headers: Optional[RequestInput] = None
     request_body_data: Optional[RequestInput] = None
     request_body_json: Optional[NestedMapping] = None
-    query_properties_key: Optional[str] = None
 
     def __post_init__(self, parameters: Mapping[str, Any]) -> None:
         if self.request_parameters is None:
@@ -84,28 +83,6 @@ class InterpolatedRequestOptionsProvider(RequestOptionsProvider):
             valid_value_types=ValidRequestTypes,
         )
         if isinstance(interpolated_value, dict):
-            if self.query_properties_key:
-                if not stream_slice:
-                    raise ValueError(
-                        "stream_slice should not be None if query properties in requests is enabled. Please contact Airbyte Support"
-                    )
-                elif (
-                    "query_properties" not in stream_slice.extra_fields
-                    or stream_slice.extra_fields.get("query_properties") is None
-                ):
-                    raise ValueError(
-                        "QueryProperties component is defined but stream_partition does not contain query_properties. Please contact Airbyte Support"
-                    )
-                elif not isinstance(stream_slice.extra_fields.get("query_properties"), List):
-                    raise ValueError(
-                        "QueryProperties component is defined but stream_slice.extra_fields.query_properties is not a List. Please contact Airbyte Support"
-                    )
-                interpolated_value = {
-                    **interpolated_value,
-                    self.query_properties_key: ",".join(
-                        stream_slice.extra_fields.get("query_properties")  # type: ignore  # Earlier type checks validate query_properties type
-                    ),
-                }
             return interpolated_value
         return {}
 

airbyte_cdk/sources/declarative/retrievers/simple_retriever.py

@@ -1,9 +1,8 @@
 #
-# Copyright (c) 2025 Airbyte, Inc., all rights reserved.
+# Copyright (c) 2023 Airbyte, Inc., all rights reserved.
 #
 
 import json
-from collections import defaultdict
 from dataclasses import InitVar, dataclass, field
 from functools import partial
 from itertools import islice
@@ -13,7 +12,6 @@ from typing import (
     Iterable,
     List,
     Mapping,
-    MutableMapping,
     Optional,
     Set,
     Tuple,
@@ -33,7 +31,6 @@ from airbyte_cdk.sources.declarative.partition_routers.single_partition_router i
 )
 from airbyte_cdk.sources.declarative.requesters.paginators.no_pagination import NoPagination
 from airbyte_cdk.sources.declarative.requesters.paginators.paginator import Paginator
-from airbyte_cdk.sources.declarative.requesters.query_properties import QueryProperties
 from airbyte_cdk.sources.declarative.requesters.request_options import (
     DefaultRequestOptionsProvider,
     RequestOptionsProvider,
@@ -91,7 +88,6 @@ class SimpleRetriever(Retriever):
     )
     cursor: Optional[DeclarativeCursor] = None
     ignore_stream_slicer_parameters_on_paginated_requests: bool = False
-    additional_query_properties: Optional[QueryProperties] = None
 
     def __post_init__(self, parameters: Mapping[str, Any]) -> None:
         self._paginator = self.paginator or NoPagination(parameters=parameters)
@@ -449,108 +445,43 @@ class SimpleRetriever(Retriever):
         :param stream_slice: The stream slice to read data for
         :return: The records read from the API source
         """
-
-        if self.additional_query_properties:
-            property_chunks = list(
-                self.additional_query_properties.get_request_property_chunks(
-                    stream_slice=stream_slice
-                )
-            )
-            has_multiple_chunks = self.additional_query_properties.has_multiple_chunks(
-                stream_slice=stream_slice
-            )
-        else:
-            property_chunks = [[""]]
-            has_multiple_chunks = False
-        merged_records: MutableMapping[str, Any] = defaultdict(dict)
         _slice = stream_slice or StreamSlice(partition={}, cursor_slice={})  # None-check
+
         most_recent_record_from_slice = None
+        record_generator = partial(
+            self._parse_records,
+            stream_slice=stream_slice,
+            stream_state=self.state or {},
+            records_schema=records_schema,
+        )
 
-        if self.additional_query_properties:
-            for properties in property_chunks:
-                _slice = StreamSlice(
-                    partition=_slice.partition or {},
-                    cursor_slice=_slice.cursor_slice or {},
-                    extra_fields={"query_properties": properties},
-                )  # None-check
-
-                record_generator = partial(
-                    self._parse_records,
-                    stream_slice=_slice,
-                    stream_state=self.state or {},
-                    records_schema=records_schema,
-                )
+        if self.cursor and isinstance(self.cursor, ResumableFullRefreshCursor):
+            stream_state = self.state
 
-                for stream_data in self._read_pages(record_generator, self.state, _slice):
-                    current_record = self._extract_record(stream_data, _slice)
-                    if self.cursor and current_record:
-                        self.cursor.observe(_slice, current_record)
-
-                    # Latest record read, not necessarily within slice boundaries.
-                    # TODO Remove once all custom components implement `observe` method.
-                    # https://github.com/airbytehq/airbyte-internal-issues/issues/6955
-                    most_recent_record_from_slice = self._get_most_recent_record(
-                        most_recent_record_from_slice, current_record, _slice
-                    )
-
-                    # Record merging should only be done if there are multiple property chunks. Otherwise,
-                    # yielding immediately is more efficient so records can be emitted immediately
-                    if (
-                        has_multiple_chunks
-                        and self.additional_query_properties.property_chunking
-                        and current_record
-                    ):
-                        merge_key = (
-                            self.additional_query_properties.property_chunking.get_merge_key(
-                                current_record
-                            )
-                        )
-                        merged_records[merge_key].update(current_record)
-                    else:
-                        yield stream_data
-            if self.cursor:
-                self.cursor.close_slice(_slice, most_recent_record_from_slice)
+            # Before syncing the RFR stream, we check if the job's prior attempt was successful and don't need to
+            # fetch more records. The platform deletes stream state for full refresh streams before starting a
+            # new job, so we don't need to worry about this value existing for the initial attempt
+            if stream_state.get(FULL_REFRESH_SYNC_COMPLETE_KEY):
+                return
 
-            if has_multiple_chunks:
-                yield from merged_records.values()
+            yield from self._read_single_page(record_generator, stream_state, _slice)
         else:
-            _slice = stream_slice or StreamSlice(partition={}, cursor_slice={})  # None-check
-
-            most_recent_record_from_slice = None
-            record_generator = partial(
-                self._parse_records,
-                stream_slice=stream_slice,
-                stream_state=self.state or {},
-                records_schema=records_schema,
-            )
-
-            if self.cursor and isinstance(self.cursor, ResumableFullRefreshCursor):
-                stream_state = self.state
-
-                # Before syncing the RFR stream, we check if the job's prior attempt was successful and don't need to
-                # fetch more records. The platform deletes stream state for full refresh streams before starting a
-                # new job, so we don't need to worry about this value existing for the initial attempt
-                if stream_state.get(FULL_REFRESH_SYNC_COMPLETE_KEY):
-                    return
+            for stream_data in self._read_pages(record_generator, self.state, _slice):
+                current_record = self._extract_record(stream_data, _slice)
+                if self.cursor and current_record:
+                    self.cursor.observe(_slice, current_record)
+
+                # Latest record read, not necessarily within slice boundaries.
+                # TODO Remove once all custom components implement `observe` method.
+                # https://github.com/airbytehq/airbyte-internal-issues/issues/6955
+                most_recent_record_from_slice = self._get_most_recent_record(
+                    most_recent_record_from_slice, current_record, _slice
+                )
+                yield stream_data
 
-                yield from self._read_single_page(record_generator, stream_state, _slice)
-            else:
-                for stream_data in self._read_pages(record_generator, self.state, _slice):
-                    current_record = self._extract_record(stream_data, _slice)
-                    if self.cursor and current_record:
-                        self.cursor.observe(_slice, current_record)
-
-                    # Latest record read, not necessarily within slice boundaries.
-                    # TODO Remove once all custom components implement `observe` method.
-                    # https://github.com/airbytehq/airbyte-internal-issues/issues/6955
-                    most_recent_record_from_slice = self._get_most_recent_record(
-                        most_recent_record_from_slice, current_record, _slice
-                    )
-                    yield stream_data
-
-                if self.cursor:
-                    self.cursor.close_slice(_slice, most_recent_record_from_slice)
-            return
+            if self.cursor:
+                self.cursor.close_slice(_slice, most_recent_record_from_slice)
+        return
 
     def _get_most_recent_record(
         self,

airbyte_cdk/sources/declarative/transformations/add_fields.py

@@ -139,7 +139,9 @@ class AddFields(RecordTransformation):
             valid_types = (parsed_field.value_type,) if parsed_field.value_type else None
             value = parsed_field.value.eval(config, valid_types=valid_types, **kwargs)
             is_empty_condition = not self.condition
-            if is_empty_condition or self._filter_interpolator.eval(config, value=value, **kwargs):
+            if is_empty_condition or self._filter_interpolator.eval(
+                config, value=value, path=parsed_field.path, **kwargs
+            ):
                 dpath.new(record, parsed_field.path, value)
 
     def __eq__(self, other: Any) -> bool:

{airbyte_cdk-6.43.0.dev0.dist-info → airbyte_cdk-6.43.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: airbyte-cdk
-Version: 6.43.0.dev0
+Version: 6.43.1
 Summary: A framework for writing Airbyte Connectors.
 Home-page: https://airbyte.com
 License: MIT

{airbyte_cdk-6.43.0.dev0.dist-info → airbyte_cdk-6.43.1.dist-info}/RECORD

@@ -7,8 +7,8 @@ airbyte_cdk/config_observation.py,sha256=7SSPxtN0nXPkm4euGNcTTr1iLbwUL01jy-24V1H
 airbyte_cdk/connector.py,sha256=bO23kdGRkl8XKFytOgrrWFc_VagteTHVEF6IsbizVkM,4224
 airbyte_cdk/connector_builder/README.md,sha256=Hw3wvVewuHG9-QgsAq1jDiKuLlStDxKBz52ftyNRnBw,1665
 airbyte_cdk/connector_builder/__init__.py,sha256=4Hw-PX1-VgESLF16cDdvuYCzGJtHntThLF4qIiULWeo,61
-airbyte_cdk/connector_builder/connector_builder_handler.py,sha256=nifmVvtl_CEwlKwzsCZQ6YALXaRoGOF0XfBCiFUfjJE,5168
-airbyte_cdk/connector_builder/main.py,sha256=YnOgXuY9O2SwAtrbhzoOTI8oN8tGERJWQdnl1Bm5HOw,3839
+airbyte_cdk/connector_builder/connector_builder_handler.py,sha256=gwFpZHmvFrMB9NMlRuRfq0KEkbPaFucCB8k1DL20Wmw,5769
+airbyte_cdk/connector_builder/main.py,sha256=7hE4GG8yTLSas_nUuANsPJQVBZyOK-l_1Q0vf0FjY5o,3839
 airbyte_cdk/connector_builder/models.py,sha256=9pIZ98LW_d6fRS39VdnUOf3cxGt4TkC5MJ0_OrzcCRk,1578
 airbyte_cdk/connector_builder/test_reader/__init__.py,sha256=iTwBMoI9vaJotEgpqZbFjlxRcbxXYypSVJ9YxeHk7wc,120
 airbyte_cdk/connector_builder/test_reader/helpers.py,sha256=Iczn-_iczS2CaIAunWwyFcX0uLTra8Wh9JVfzm1Gfxo,26765
@@ -71,7 +71,7 @@ airbyte_cdk/sources/declarative/concurrent_declarative_source.py,sha256=uhy0dRkA
 airbyte_cdk/sources/declarative/datetime/__init__.py,sha256=4Hw-PX1-VgESLF16cDdvuYCzGJtHntThLF4qIiULWeo,61
 airbyte_cdk/sources/declarative/datetime/datetime_parser.py,sha256=_zGNGq31RNy_0QBLt_EcTvgPyhj7urPdx6oA3M5-r3o,3150
 airbyte_cdk/sources/declarative/datetime/min_max_datetime.py,sha256=0BHBtDNQZfvwM45-tY5pNlTcKAFSGGNxemoi0Jic-0E,5785
-airbyte_cdk/sources/declarative/declarative_component_schema.yaml,sha256=-7gyAzojFjdkQ0IyKUwYyT91uwSSRO2pstlVjHyEaGc,158041
+airbyte_cdk/sources/declarative/declarative_component_schema.yaml,sha256=twYvmNco0B7R8N5QXcTc1tbqWFB_7b-_i149LJbMss8,153129
 airbyte_cdk/sources/declarative/declarative_source.py,sha256=nF7wBqFd3AQmEKAm4CnIo29CJoQL562cJGSCeL8U8bA,1531
 airbyte_cdk/sources/declarative/declarative_stream.py,sha256=dCRlddBUSaJmBNBz1pSO1r2rTw8AP5d2_vlmIeGs2gg,10767
 airbyte_cdk/sources/declarative/decoders/__init__.py,sha256=JHb_0d3SE6kNY10mxA5YBEKPeSbsWYjByq1gUQxepoE,953
@@ -109,18 +109,18 @@ airbyte_cdk/sources/declarative/interpolation/interpolated_string.py,sha256=CQkH
 airbyte_cdk/sources/declarative/interpolation/interpolation.py,sha256=9IoeuWam3L6GyN10L6U8xNWXmkt9cnahSDNkez1OmFY,982
 airbyte_cdk/sources/declarative/interpolation/jinja.py,sha256=UQeuS4Vpyp4hlOn-R3tRyeBX0e9IoV6jQ6gH-Jz8lY0,7182
 airbyte_cdk/sources/declarative/interpolation/macros.py,sha256=CF2L_r73TCd1Wssq9_tjFPb4c872QM8oW6NL-DIR0h4,5226
-airbyte_cdk/sources/declarative/manifest_declarative_source.py,sha256=kFfyVpX-babuF4YzUHm7xfx_3M4M-GwJsrOWuez1z9Q,18894
+airbyte_cdk/sources/declarative/manifest_declarative_source.py,sha256=tUe54Xgy7dq-a7HNaPogk6AXlVeqQXHWde6_8_Xy0ow,19130
 airbyte_cdk/sources/declarative/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 airbyte_cdk/sources/declarative/migrations/legacy_to_per_partition_state_migration.py,sha256=iemy3fKLczcU0-Aor7tx5jcT6DRedKMqyK7kCOp01hg,3924
 airbyte_cdk/sources/declarative/migrations/state_migration.py,sha256=KWPjealMLKSMtajXgkdGgKg7EmTLR-CqqD7UIh0-eDU,794
 airbyte_cdk/sources/declarative/models/__init__.py,sha256=nUFxNCiKeYRVXuZEKA7GD-lTHxsiKcQ8FitZjKhPIvE,100
-airbyte_cdk/sources/declarative/models/declarative_component_schema.py,sha256=NYVuwCA-ot13weNOCc0_0DTjhiMUR8eHsRFdtrANnRo,111561
+airbyte_cdk/sources/declarative/models/declarative_component_schema.py,sha256=nzQqJjBo8wFUF9gqF9E52zDsEDQGpG46aWylViTcAJU,108372
 airbyte_cdk/sources/declarative/parsers/__init__.py,sha256=ZnqYNxHsKCgO38IwB34RQyRMXTs4GTvlRi3ImKnIioo,61
 airbyte_cdk/sources/declarative/parsers/custom_code_compiler.py,sha256=nlVvHC511NUyDEEIRBkoeDTAvLqKNp-hRy8D19z8tdk,5941
 airbyte_cdk/sources/declarative/parsers/custom_exceptions.py,sha256=Rir9_z3Kcd5Es0-LChrzk-0qubAsiK_RSEnLmK2OXm8,553
-airbyte_cdk/sources/declarative/parsers/manifest_component_transformer.py,sha256=CXwTfD3wSQq3okcqwigpprbHhSURUokh4GK2OmOyKC8,9132
+airbyte_cdk/sources/declarative/parsers/manifest_component_transformer.py,sha256=4C15MKV-zOrMVQAm4FyohDsrJUBCSpMv5tZw0SK3aeI,9685
 airbyte_cdk/sources/declarative/parsers/manifest_reference_resolver.py,sha256=IWUOdF03o-aQn0Occo1BJCxU0Pz-QILk5L67nzw2thw,6803
-airbyte_cdk/sources/declarative/parsers/model_to_component_factory.py,sha256=64HO1wnBw5NjitXgYn3e-GVfum0zrQrpmLGlzC3mLJg,157514
+airbyte_cdk/sources/declarative/parsers/model_to_component_factory.py,sha256=APJkP5dmDU4aIaj7w3quGjrP1cV3MMp2gxbTckhOVRA,149720
 airbyte_cdk/sources/declarative/partition_routers/__init__.py,sha256=TBC9AkGaUqHm2IKHMPN6punBIcY5tWGULowcLoAVkfw,1109
 airbyte_cdk/sources/declarative/partition_routers/async_job_partition_router.py,sha256=VelO7zKqKtzMJ35jyFeg0ypJLQC0plqqIBNXoBW1G2E,3001
 airbyte_cdk/sources/declarative/partition_routers/cartesian_product_stream_slicer.py,sha256=c5cuVFM6NFkuQqG8Z5IwkBuwDrvXZN1CunUOM_L0ezg,6892
@@ -156,18 +156,13 @@ airbyte_cdk/sources/declarative/requesters/paginators/strategies/offset_incremen
 airbyte_cdk/sources/declarative/requesters/paginators/strategies/page_increment.py,sha256=Z2i6a-oKMmOTxHxsTVSnyaShkJ3u8xZw1xIJdx2yxss,2731
 airbyte_cdk/sources/declarative/requesters/paginators/strategies/pagination_strategy.py,sha256=ZBshGQNr5Bb_V8dqnWRISqdXFcjm1CKIXnlfbRhNl8g,1308
 airbyte_cdk/sources/declarative/requesters/paginators/strategies/stop_condition.py,sha256=LoKXdUbSgHEtSwtA8DFrnX6SpQbRVVwreY8NguTKTcI,2229
-airbyte_cdk/sources/declarative/requesters/query_properties/__init__.py,sha256=6Da7wsYQxzWWgpkisj47YbMPtj1sgg1b_60qTspO_Pw,604
-airbyte_cdk/sources/declarative/requesters/query_properties/group_by_key.py,sha256=7uVXFwzR5Q5ngkwAtW8x3QBK963Ub1Qpo2vapF8IIc0,659
-airbyte_cdk/sources/declarative/requesters/query_properties/properties_from_endpoint.py,sha256=Rz4CViWqDGKCCZ8eYbb5yVlF-ElXmBmMZqhYglFxGqA,1395
-airbyte_cdk/sources/declarative/requesters/query_properties/property_chunking.py,sha256=o9Jq-7mBC8ahPii5EngA0h4gBB8UV0xxZbifG9otrIk,2254
-airbyte_cdk/sources/declarative/requesters/query_properties/query_properties.py,sha256=6xULj0wzHzc8l6jV-v-fOtbeli8peBfvyeSLtioN0-0,1672
 airbyte_cdk/sources/declarative/requesters/request_option.py,sha256=Bl0gxGWudmwT3FXBozTN00WYle2jd6ry_S1YylCnwqM,4825
 airbyte_cdk/sources/declarative/requesters/request_options/__init__.py,sha256=WCwpKqM4wKqy-DHJaCHbKAlFqRVOqMi9K5qonxIfi_Y,809
 airbyte_cdk/sources/declarative/requesters/request_options/datetime_based_request_options_provider.py,sha256=31nG6_0igidJFQon37-WeQkTpG3g2A5ZmlluI3ilZdE,3632
 airbyte_cdk/sources/declarative/requesters/request_options/default_request_options_provider.py,sha256=SRROdPJZ5kuqHLOlkh115pWP9nDGfDxRYPgH9oD3hPo,1798
 airbyte_cdk/sources/declarative/requesters/request_options/interpolated_nested_request_input_provider.py,sha256=86YozYuBDfu0t9NbevIvQoGU0vqTP4rt3dRSTsHz3PA,2269
 airbyte_cdk/sources/declarative/requesters/request_options/interpolated_request_input_provider.py,sha256=rR00kE64U2yL0McU1gPr4_W5_sLUqwDgL3Nvj691nRU,2884
-airbyte_cdk/sources/declarative/requesters/request_options/interpolated_request_options_provider.py,sha256=dRlG1IyEOVzWFw7wm-8TBPn7JUtZw3jz6oAoH5yuuf0,6375
+airbyte_cdk/sources/declarative/requesters/request_options/interpolated_request_options_provider.py,sha256=vOsdHfWHiTFc89WENHPv1hcxLgdzycMXVT_IEtLuhfs,5012
 airbyte_cdk/sources/declarative/requesters/request_options/request_options_provider.py,sha256=8YRiDzjYvqJ-aMmKFcjqzv_-e8OZ5QG_TbpZ-nuCu6s,2590
 airbyte_cdk/sources/declarative/requesters/request_path.py,sha256=S3MeFvcaQrMbOkSY2W2VbXLNomqt_3eXqVd9ZhgNwUs,299
 airbyte_cdk/sources/declarative/requesters/requester.py,sha256=OcDzuCBgD1owK_lBPG0KbRRHRn9kzbuRveU4HejDiv4,5116
@@ -178,7 +173,7 @@ airbyte_cdk/sources/declarative/resolvers/http_components_resolver.py,sha256=Aio
 airbyte_cdk/sources/declarative/retrievers/__init__.py,sha256=nQepwG_RfW53sgwvK5dLPqfCx0VjsQ83nYoPjBMAaLM,527
 airbyte_cdk/sources/declarative/retrievers/async_retriever.py,sha256=6oZtnCHm9NdDvjTSrVwPQOXGSdETSIR7eWH2vFjM7jI,4855
 airbyte_cdk/sources/declarative/retrievers/retriever.py,sha256=XPLs593Xv8c5cKMc37XzUAYmzlXd1a7eSsspM-CMuWA,1696
-airbyte_cdk/sources/declarative/retrievers/simple_retriever.py,sha256=QjkKOvvuP62f9J4RcfKTSYCP69lJBndhJCTdeRXO0LQ,31090
+airbyte_cdk/sources/declarative/retrievers/simple_retriever.py,sha256=p6O4FYS7zzPq6uQT2NVnughUjI66tePaXVlyhCAyyv0,27746
 airbyte_cdk/sources/declarative/schema/__init__.py,sha256=xU45UvM5O4c1PSM13UHpCdh5hpW3HXy9vRRGEiAC1rg,795
 airbyte_cdk/sources/declarative/schema/default_schema_loader.py,sha256=KTACrIE23a83wsm3Rd9Eb4K6-20lrGqYxTHNp9yxsso,1820
 airbyte_cdk/sources/declarative/schema/dynamic_schema_loader.py,sha256=J8Q_iJYhcSQLWyt0bTZCbDAGpxt9G8FCc6Q9jtGsNzw,10703
@@ -191,7 +186,7 @@ airbyte_cdk/sources/declarative/stream_slicers/__init__.py,sha256=sI9vhc95RwJYOn
 airbyte_cdk/sources/declarative/stream_slicers/declarative_partition_generator.py,sha256=RW1Q44ml-VWeMl4lNcV6EfyzrzCZkjj-hd0Omx_n_n4,3405
 airbyte_cdk/sources/declarative/stream_slicers/stream_slicer.py,sha256=SOkIPBi2Wu7yxIvA15yFzUAB95a3IzA8LPq5DEqHQQc,725
 airbyte_cdk/sources/declarative/transformations/__init__.py,sha256=CPJ8TlMpiUmvG3624VYu_NfTzxwKcfBjM2Q2wJ7fkSA,919
-airbyte_cdk/sources/declarative/transformations/add_fields.py,sha256=vxLh0ekB0i_m8GYFpSad9T4S7eRxxtqZaigHLGVoltA,5366
+airbyte_cdk/sources/declarative/transformations/add_fields.py,sha256=Eg1jQtRObgzxbtySTQs5uEZIjEklsoHFxYSPf78x6Ng,5420
 airbyte_cdk/sources/declarative/transformations/dpath_flatten_fields.py,sha256=I8oXPAOFhBV1mW_ufMn8Ii7oMbtect0sfLcpBNrKzzw,2374
 airbyte_cdk/sources/declarative/transformations/flatten_fields.py,sha256=yT3owG6rMKaRX-LJ_T-jSTnh1B5NoAHyH4YZN9yOvE8,1758
 airbyte_cdk/sources/declarative/transformations/keys_replace_transformation.py,sha256=vbIn6ump-Ut6g20yMub7PFoPBhOKVtrHSAUdcOUdLfw,1999
@@ -364,9 +359,9 @@ airbyte_cdk/utils/slice_hasher.py,sha256=EDxgROHDbfG-QKQb59m7h_7crN1tRiawdf5uU7G
 airbyte_cdk/utils/spec_schema_transformations.py,sha256=-5HTuNsnDBAhj-oLeQXwpTGA0HdcjFOf2zTEMUTTg_Y,816
 airbyte_cdk/utils/stream_status_utils.py,sha256=ZmBoiy5HVbUEHAMrUONxZvxnvfV9CesmQJLDTAIWnWw,1171
 airbyte_cdk/utils/traced_exception.py,sha256=C8uIBuCL_E4WnBAOPSxBicD06JAldoN9fGsQDp463OY,6292
-airbyte_cdk-6.43.0.dev0.dist-info/LICENSE.txt,sha256=Wfe61S4BaGPj404v8lrAbvhjYR68SHlkzeYrg3_bbuM,1051
-airbyte_cdk-6.43.0.dev0.dist-info/LICENSE_SHORT,sha256=aqF6D1NcESmpn-cqsxBtszTEnHKnlsp8L4x9wAh3Nxg,55
-airbyte_cdk-6.43.0.dev0.dist-info/METADATA,sha256=Gkcyw6S5UfIDRNpbltYuPPi5GdcRkjEv0DaPDpChh9g,6076
-airbyte_cdk-6.43.0.dev0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-airbyte_cdk-6.43.0.dev0.dist-info/entry_points.txt,sha256=fj-e3PAQvsxsQzyyq8UkG1k8spunWnD4BAH2AwlR6NM,95
-airbyte_cdk-6.43.0.dev0.dist-info/RECORD,,
+airbyte_cdk-6.43.1.dist-info/LICENSE.txt,sha256=Wfe61S4BaGPj404v8lrAbvhjYR68SHlkzeYrg3_bbuM,1051
+airbyte_cdk-6.43.1.dist-info/LICENSE_SHORT,sha256=aqF6D1NcESmpn-cqsxBtszTEnHKnlsp8L4x9wAh3Nxg,55
+airbyte_cdk-6.43.1.dist-info/METADATA,sha256=Zrfti0WPq-_VsjOASQALX5Gctg83yqECVMd-zOsyLOM,6071
+airbyte_cdk-6.43.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+airbyte_cdk-6.43.1.dist-info/entry_points.txt,sha256=fj-e3PAQvsxsQzyyq8UkG1k8spunWnD4BAH2AwlR6NM,95
+airbyte_cdk-6.43.1.dist-info/RECORD,,

airbyte_cdk/sources/declarative/requesters/query_properties/__init__.py

@@ -1,14 +0,0 @@
-# Copyright (c) 2025 Airbyte, Inc., all rights reserved.
-
-from airbyte_cdk.sources.declarative.requesters.query_properties.group_by_key import GroupByKey
-from airbyte_cdk.sources.declarative.requesters.query_properties.properties_from_endpoint import (
-    PropertiesFromEndpoint,
-)
-from airbyte_cdk.sources.declarative.requesters.query_properties.property_chunking import (
-    PropertyChunking,
-)
-from airbyte_cdk.sources.declarative.requesters.query_properties.query_properties import (
-    QueryProperties,
-)
-
-__all__ = ["GroupByKey", "PropertiesFromEndpoint", "PropertyChunking", "QueryProperties"]

airbyte_cdk/sources/declarative/requesters/query_properties/group_by_key.py

@@ -1,24 +0,0 @@
-# Copyright (c) 2025 Airbyte, Inc., all rights reserved.
-
-from dataclasses import InitVar, dataclass
-from typing import Any, List, Mapping, Union
-
-from airbyte_cdk.sources.types import Config, Record
-
-
-@dataclass
-class GroupByKey:
-    """
-    tbd
-    """
-
-    key: Union[str, List[str]]
-    parameters: InitVar[Mapping[str, Any]]
-    config: Config
-
-    def __post_init__(self, parameters: Mapping[str, Any]) -> None:
-        self._keys = [self.key] if isinstance(self.key, str) else self.key
-
-    def get_group_key(self, record: Record) -> str:
-        resolved_keys = [str(record.data.get(key)) for key in self._keys]
-        return ",".join(resolved_keys)

airbyte_cdk/sources/declarative/requesters/query_properties/properties_from_endpoint.py

@@ -1,40 +0,0 @@
-# Copyright (c) 2025 Airbyte, Inc., all rights reserved.
-
-from dataclasses import InitVar, dataclass
-from typing import Any, Iterable, List, Mapping, Optional, Union
-
-import dpath
-
-from airbyte_cdk.sources.declarative.interpolation import InterpolatedString
-from airbyte_cdk.sources.declarative.retrievers import Retriever
-from airbyte_cdk.sources.types import Config, StreamSlice
-
-
-@dataclass
-class PropertiesFromEndpoint:
-    """
-    tbd
-    """
-
-    property_field_path: List[str]
-    retriever: Retriever
-    config: Config
-    parameters: InitVar[Mapping[str, Any]]
-
-    def __post_init__(self, parameters: Mapping[str, Any]) -> None:
-        self._property_field_path = [
-            InterpolatedString(string=property_field, parameters=parameters)
-            for property_field in self.property_field_path
-        ]
-
-    def get_properties_from_endpoint(self, stream_slice: Optional[StreamSlice]) -> Iterable[str]:
-        response_properties = self.retriever.read_records(
-            records_schema={}, stream_slice=stream_slice
-        )
-        for property_obj in response_properties:
-            path = [
-                node.eval(self.config) if not isinstance(node, str) else node
-                for node in self._property_field_path
-            ]
-
-            yield dpath.get(property_obj, path)  # type: ignore # extracted will be a MutableMapping, given input data structure

airbyte_cdk/sources/declarative/requesters/query_properties/property_chunking.py

@@ -1,65 +0,0 @@
-# Copyright (c) 2025 Airbyte, Inc., all rights reserved.
-
-from dataclasses import InitVar, dataclass
-from enum import Enum
-from typing import Any, Iterable, List, Mapping, Optional
-
-from airbyte_cdk.sources.declarative.requesters.query_properties import GroupByKey
-from airbyte_cdk.sources.types import Config, Record
-
-
-class PropertyLimitType(Enum):
-    """
-    yeah
-    """
-
-    characters = "characters"
-    property_count = "property_count"
-
-
-@dataclass
-class PropertyChunking:
-    """
-    tbd
-    """
-
-    property_limit_type: PropertyLimitType
-    property_limit: Optional[int]
-    record_merge_strategy: Optional[
-        GroupByKey
-    ]  # This should eventually be some sort of interface or type
-    parameters: InitVar[Mapping[str, Any]]
-    config: Config
-
-    def __post_init__(self, parameters: Mapping[str, Any]) -> None:
-        self._record_merge_strategy = self.record_merge_strategy or GroupByKey(
-            key="id", config=self.config, parameters=parameters
-        )
-
-    def get_request_property_chunks(
-        self, property_fields: Iterable[str], always_include_properties: Optional[List[str]]
-    ) -> Iterable[List[str]]:
-        if not self.property_limit:
-            single_property_chunk = list(property_fields)
-            if always_include_properties:
-                single_property_chunk.extend(always_include_properties)
-            yield single_property_chunk
-            return
-        current_chunk = list(always_include_properties) if always_include_properties else []
-        chunk_size = 0
-        for property_field in property_fields:
-            property_field_size = (
-                len(property_field)
-                if self.property_limit_type == PropertyLimitType.characters
-                else 1
-            )
-            if chunk_size + property_field_size > self.property_limit:
-                yield current_chunk
-                current_chunk = list(always_include_properties) if always_include_properties else []
-                chunk_size = 0
-            current_chunk.append(property_field)
-            chunk_size += property_field_size
-        yield current_chunk
-
-    def get_merge_key(self, record: Record) -> str:
-        return self._record_merge_strategy.get_group_key(record=record)

airbyte_cdk/sources/declarative/requesters/query_properties/query_properties.py

@@ -1,48 +0,0 @@
-# Copyright (c) 2025 Airbyte, Inc., all rights reserved.
-
-from dataclasses import InitVar, dataclass
-from typing import Any, Iterable, List, Mapping, Optional, Union
-
-from airbyte_cdk.sources.declarative.requesters.query_properties import (
-    PropertiesFromEndpoint,
-    PropertyChunking,
-)
-from airbyte_cdk.sources.types import Config, StreamSlice
-
-
-@dataclass
-class QueryProperties:
-    """
-    tbd
-    """
-
-    property_list: Optional[Union[List[str], PropertiesFromEndpoint]]
-    always_include_properties: Optional[List[str]]
-    property_chunking: Optional[PropertyChunking]
-    config: Config
-    parameters: InitVar[Mapping[str, Any]]
-
-    def get_request_property_chunks(
-        self, stream_slice: Optional[StreamSlice] = None
-    ) -> Iterable[List[str]]:
-        fields: Union[Iterable[str], List[str]]
-        if isinstance(self.property_list, PropertiesFromEndpoint):
-            fields = self.property_list.get_properties_from_endpoint(stream_slice=stream_slice)
-        else:
-            fields = self.property_list if self.property_list else []
-
-        if self.property_chunking:
-            yield from self.property_chunking.get_request_property_chunks(
-                property_fields=fields, always_include_properties=self.always_include_properties
-            )
-        else:
-            yield from [list(fields)]
-
-    def has_multiple_chunks(self, stream_slice: Optional[StreamSlice]) -> bool:
-        property_chunks = iter(self.get_request_property_chunks(stream_slice=stream_slice))
-        try:
-            next(property_chunks)
-            next(property_chunks)
-            return True
-        except StopIteration:
-            return False