airbyte-cdk 6.45.0__py3-none-any.whl → 6.45.0.dev4101__py3-none-any.whl

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
@@ -54,11 +54,7 @@ from airbyte_cdk.sources.declarative.auth.token_provider import (
     SessionTokenProvider,
     TokenProvider,
 )
-from airbyte_cdk.sources.declarative.checks import (
-    CheckDynamicStream,
-    CheckStream,
-    DynamicStreamCheckConfig,
-)
+from airbyte_cdk.sources.declarative.checks import CheckDynamicStream, CheckStream
 from airbyte_cdk.sources.declarative.concurrency_level import ConcurrencyLevel
 from airbyte_cdk.sources.declarative.datetime.min_max_datetime import MinMaxDatetime
 from airbyte_cdk.sources.declarative.declarative_stream import DeclarativeStream
@@ -106,7 +102,6 @@ from airbyte_cdk.sources.declarative.migrations.legacy_to_per_partition_state_mi
 )
 from airbyte_cdk.sources.declarative.models import (
     CustomStateMigration,
-    GzipDecoder,
 )
 from airbyte_cdk.sources.declarative.models.declarative_component_schema import (
     AddedFieldDefinition as AddedFieldDefinitionModel,
@@ -223,10 +218,10 @@ from airbyte_cdk.sources.declarative.models.declarative_component_schema import
     DynamicSchemaLoader as DynamicSchemaLoaderModel,
 )
 from airbyte_cdk.sources.declarative.models.declarative_component_schema import (
-    DynamicStreamCheckConfig as DynamicStreamCheckConfigModel,
+    ExponentialBackoffStrategy as ExponentialBackoffStrategyModel,
 )
 from airbyte_cdk.sources.declarative.models.declarative_component_schema import (
-    ExponentialBackoffStrategy as ExponentialBackoffStrategyModel,
+    FileUploader as FileUploaderModel,
 )
 from airbyte_cdk.sources.declarative.models.declarative_component_schema import (
     FixedWindowCallRatePolicy as FixedWindowCallRatePolicyModel,
@@ -234,12 +229,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,
-)
 from airbyte_cdk.sources.declarative.models.declarative_component_schema import (
     GzipDecoder as GzipDecoderModel,
 )
@@ -327,18 +316,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,
 )
@@ -410,7 +387,6 @@ from airbyte_cdk.sources.declarative.parsers.custom_code_compiler import (
 )
 from airbyte_cdk.sources.declarative.partition_routers import (
     CartesianProductStreamSlicer,
-    GroupingPartitionRouter,
     ListPartitionRouter,
     PartitionRouter,
     SinglePartitionRouter,
@@ -447,17 +423,6 @@ from airbyte_cdk.sources.declarative.requesters.paginators.strategies import (
     PageIncrement,
     StopConditionPaginationStrategyDecorator,
 )
-from airbyte_cdk.sources.declarative.requesters.query_properties import (
-    PropertiesFromEndpoint,
-    PropertyChunking,
-    QueryProperties,
-)
-from airbyte_cdk.sources.declarative.requesters.query_properties.property_chunking import (
-    PropertyLimitType,
-)
-from airbyte_cdk.sources.declarative.requesters.query_properties.strategies import (
-    GroupByKey,
-)
 from airbyte_cdk.sources.declarative.requesters.request_option import RequestOptionType
 from airbyte_cdk.sources.declarative.requesters.request_options import (
     DatetimeBasedRequestOptionsProvider,
@@ -479,6 +444,7 @@ from airbyte_cdk.sources.declarative.retrievers import (
     SimpleRetriever,
     SimpleRetrieverTestReadDecorator,
 )
+from airbyte_cdk.sources.declarative.retrievers.file_uploader import FileUploader
 from airbyte_cdk.sources.declarative.schema import (
     ComplexFieldType,
     DefaultSchemaLoader,
@@ -592,7 +558,6 @@ class ModelToComponentFactory:
             BasicHttpAuthenticatorModel: self.create_basic_http_authenticator,
             BearerAuthenticatorModel: self.create_bearer_authenticator,
             CheckStreamModel: self.create_check_stream,
-            DynamicStreamCheckConfigModel: self.create_dynamic_stream_check_config,
             CheckDynamicStreamModel: self.create_check_dynamic_stream,
             CompositeErrorHandlerModel: self.create_composite_error_handler,
             ConcurrencyLevelModel: self.create_concurrency_level,
@@ -622,7 +587,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,
@@ -652,9 +616,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,
@@ -675,12 +636,12 @@ class ModelToComponentFactory:
             ComponentMappingDefinitionModel: self.create_components_mapping_definition,
             ZipfileDecoderModel: self.create_zipfile_decoder,
             HTTPAPIBudgetModel: self.create_http_api_budget,
+            FileUploaderModel: self.create_file_uploader,
             FixedWindowCallRatePolicyModel: self.create_fixed_window_call_rate_policy,
             MovingWindowCallRatePolicyModel: self.create_moving_window_call_rate_policy,
             UnlimitedCallRatePolicyModel: self.create_unlimited_call_rate_policy,
             RateModel: self.create_rate,
             HttpRequestRegexMatcherModel: self.create_http_request_matcher,
-            GroupingPartitionRouterModel: self.create_grouping_partition_router,
         }
 
         # Needed for the case where we need to perform a second parse on the fields of a custom component
@@ -974,36 +935,8 @@ class ModelToComponentFactory:
         )
 
     @staticmethod
-    def create_dynamic_stream_check_config(
-        model: DynamicStreamCheckConfigModel, config: Config, **kwargs: Any
-    ) -> DynamicStreamCheckConfig:
-        return DynamicStreamCheckConfig(
-            dynamic_stream_name=model.dynamic_stream_name,
-            stream_count=model.stream_count or 0,
-        )
-
-    def create_check_stream(
-        self, model: CheckStreamModel, config: Config, **kwargs: Any
-    ) -> CheckStream:
-        if model.dynamic_streams_check_configs is None and model.stream_names is None:
-            raise ValueError(
-                "Expected either stream_names or dynamic_streams_check_configs to be set for CheckStream"
-            )
-
-        dynamic_streams_check_configs = (
-            [
-                self._create_component_from_model(model=dynamic_stream_check_config, config=config)
-                for dynamic_stream_check_config in model.dynamic_streams_check_configs
-            ]
-            if model.dynamic_streams_check_configs
-            else []
-        )
-
-        return CheckStream(
-            stream_names=model.stream_names or [],
-            dynamic_streams_check_configs=dynamic_streams_check_configs,
-            parameters={},
-        )
+    def create_check_stream(model: CheckStreamModel, config: Config, **kwargs: Any) -> CheckStream:
+        return CheckStream(stream_names=model.stream_names, parameters={})
 
     @staticmethod
     def create_check_dynamic_stream(
@@ -1426,9 +1359,6 @@ class ModelToComponentFactory:
         )
         stream_state = self.apply_stream_state_migrations(stream_state_migrations, stream_state)
 
-        # Per-partition state doesn't make sense for GroupingPartitionRouter, so force the global state
-        use_global_cursor = isinstance(partition_router, GroupingPartitionRouter)
-
         # Return the concurrent cursor and state converter
         return ConcurrentPerPartitionCursor(
             cursor_factory=cursor_factory,
@@ -1440,7 +1370,6 @@ class ModelToComponentFactory:
             connector_state_manager=state_manager,
             connector_state_converter=connector_state_converter,
             cursor_field=cursor_field,
-            use_global_cursor=use_global_cursor,
         )
 
     @staticmethod
@@ -1826,6 +1755,11 @@ class ModelToComponentFactory:
                 transformations.append(
                     self._create_component_from_model(model=transformation_model, config=config)
                 )
+        file_uploader = None
+        if model.file_uploader:
+            file_uploader = self._create_component_from_model(
+                model=model.file_uploader, config=config
+            )
 
         retriever = self._create_component_from_model(
             model=model.retriever,
@@ -1837,6 +1771,7 @@ class ModelToComponentFactory:
             stop_condition_on_cursor=stop_condition_on_cursor,
             client_side_incremental_sync=client_side_incremental_sync,
             transformations=transformations,
+            file_uploader=file_uploader,
             incremental_sync=model.incremental_sync,
         )
         cursor_field = model.incremental_sync.cursor_field if model.incremental_sync else None
@@ -2113,8 +2048,8 @@ class ModelToComponentFactory:
             parameters=model.parameters or {},
         )
 
-    @staticmethod
     def create_response_to_file_extractor(
+        self,
         model: ResponseToFileExtractorModel,
         **kwargs: Any,
     ) -> ResponseToFileExtractor:
@@ -2128,17 +2063,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,
-        use_cache: Optional[bool] = None,
         *,
         name: str,
     ) -> HttpRequester:
@@ -2171,7 +2100,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 {},
         )
@@ -2179,7 +2107,7 @@ class ModelToComponentFactory:
         assert model.use_cache is not None  # for mypy
         assert model.http_method is not None  # for mypy
 
-        should_use_cache = (model.use_cache or bool(use_cache)) and not self._disable_cache
+        use_cache = model.use_cache and not self._disable_cache
 
         return HttpRequester(
             name=name,
@@ -2194,7 +2122,7 @@ class ModelToComponentFactory:
             disable_retries=self._disable_retries,
             parameters=model.parameters or {},
             message_repository=self._message_repository,
-            use_cache=should_use_cache,
+            use_cache=use_cache,
             decoder=decoder,
             stream_response=decoder.is_stream_response() if decoder else False,
         )
@@ -2298,11 +2226,10 @@ class ModelToComponentFactory:
         retriever = self._create_component_from_model(
             model=model.retriever,
             config=config,
-            name="dynamic_properties",
+            name="",
             primary_key=None,
             stream_slicer=combined_slicers,
             transformations=[],
-            use_cache=True,
         )
         schema_type_identifier = self._create_component_from_model(
             model.schema_type_identifier, config=config, parameters=model.parameters or {}
@@ -2640,79 +2567,6 @@ class ModelToComponentFactory:
             lazy_read_pointer=model_lazy_read_pointer,
         )
 
-    def create_properties_from_endpoint(
-        self, model: PropertiesFromEndpointModel, config: Config, **kwargs: Any
-    ) -> PropertiesFromEndpoint:
-        retriever = self._create_component_from_model(
-            model=model.retriever,
-            config=config,
-            name="dynamic_properties",
-            primary_key=None,
-            stream_slicer=None,
-            transformations=[],
-            use_cache=True,  # Enable caching on the HttpRequester/HttpClient because the properties endpoint will be called for every slice being processed, and it is highly unlikely for the response to different
-        )
-        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
@@ -2759,6 +2613,7 @@ class ModelToComponentFactory:
         transformations: List[RecordTransformation] | None = None,
         decoder: Decoder | None = None,
         client_side_incremental_sync: Dict[str, Any] | None = None,
+        file_uploader: Optional[FileUploader] = None,
         **kwargs: Any,
     ) -> RecordSelector:
         extractor = self._create_component_from_model(
@@ -2796,6 +2651,7 @@ class ModelToComponentFactory:
             config=config,
             record_filter=record_filter,
             transformations=transformations or [],
+            file_uploader=file_uploader,
             schema_normalization=schema_normalization,
             parameters=model.parameters or {},
             transform_before_filtering=transform_before_filtering,
@@ -2853,12 +2709,12 @@ class ModelToComponentFactory:
         stop_condition_on_cursor: bool = False,
         client_side_incremental_sync: Optional[Dict[str, Any]] = None,
         transformations: List[RecordTransformation],
+        file_uploader: Optional[FileUploader] = None,
         incremental_sync: Optional[
             Union[
                 IncrementingCountCursorModel, DatetimeBasedCursorModel, CustomIncrementalSyncModel
             ]
         ] = None,
-        use_cache: Optional[bool] = None,
         **kwargs: Any,
     ) -> SimpleRetriever:
         decoder = (
@@ -2866,6 +2722,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,
@@ -2873,57 +2732,7 @@ class ModelToComponentFactory:
             decoder=decoder,
             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():
-                # When translating JSON schema into Pydantic models, enforcing types for arrays containing both
-                # concrete string complex object definitions like QueryProperties would get resolved to Union[str, Any].
-                # This adds the extra validation that we couldn't get for free in Pydantic model generation
-                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 only supports defining one QueryProperties field, but found {len(query_properties_definitions)} usages"
-                )
-
-            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,
-            name=name,
-            query_properties_key=query_properties_key,
-            use_cache=use_cache,
-            config=config,
+            file_uploader=file_uploader,
         )
         url_base = (
             model.requester.url_base
@@ -3030,21 +2839,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"
-        }
-
     def create_state_delegating_stream(
         self,
         model: StateDelegatingStreamModel,
@@ -3290,11 +3087,8 @@ class ModelToComponentFactory:
                 stream_slices,
                 self._job_tracker,
                 self._message_repository,
-                # FIXME work would need to be done here in order to detect if a stream as a parent stream that is bulk
                 has_bulk_parent=False,
-                # set the `job_max_retry` to 1 for the `Connector Builder`` use-case.
-                # `None` == default retry is set to 3 attempts, under the hood.
-                job_max_retry=1 if self._emit_connector_builder_messages else None,
+                # FIXME work would need to be done here in order to detect if a stream as a parent stream that is bulk
             ),
             stream_slicer=stream_slicer,
             config=config,
@@ -3538,6 +3332,30 @@ class ModelToComponentFactory:
             matchers=matchers,
         )
 
+    def create_file_uploader(
+        self, model: FileUploaderModel, config: Config, **kwargs: Any
+    ) -> FileUploader:
+        name = "File Uploader"
+        requester = self._create_component_from_model(
+            model=model.requester,
+            config=config,
+            name=name,
+            **kwargs,
+        )
+        download_target_extractor = self._create_component_from_model(
+            model=model.download_target_extractor,
+            config=config,
+            name=name,
+            **kwargs,
+        )
+        return FileUploader(
+            requester=requester,
+            download_target_extractor=download_target_extractor,
+            config=config,
+            parameters=model.parameters or {},
+            filename_extractor=model.filename_extractor if model.filename_extractor else None,
+        )
+
     def create_moving_window_call_rate_policy(
         self, model: MovingWindowCallRatePolicyModel, config: Config, **kwargs: Any
     ) -> MovingWindowCallRatePolicy:
@@ -3587,34 +3405,3 @@ class ModelToComponentFactory:
         self._api_budget = self.create_component(
             model_type=HTTPAPIBudgetModel, component_definition=component_definition, config=config
         )
-
-    def create_grouping_partition_router(
-        self, model: GroupingPartitionRouterModel, config: Config, **kwargs: Any
-    ) -> GroupingPartitionRouter:
-        underlying_router = self._create_component_from_model(
-            model=model.underlying_partition_router, config=config
-        )
-        if model.group_size < 1:
-            raise ValueError(f"Group size must be greater than 0, got {model.group_size}")
-
-        # Request options in underlying partition routers are not supported for GroupingPartitionRouter
-        # because they are specific to individual partitions and cannot be aggregated or handled
-        # when grouping, potentially leading to incorrect API calls. Any request customization
-        # should be managed at the stream level through the requester's configuration.
-        if isinstance(underlying_router, SubstreamPartitionRouter):
-            if any(
-                parent_config.request_option
-                for parent_config in underlying_router.parent_stream_configs
-            ):
-                raise ValueError("Request options are not supported for GroupingPartitionRouter.")
-
-        if isinstance(underlying_router, ListPartitionRouter):
-            if underlying_router.request_option:
-                raise ValueError("Request options are not supported for GroupingPartitionRouter.")
-
-        return GroupingPartitionRouter(
-            group_size=model.group_size,
-            underlying_partition_router=underlying_router,
-            deduplicate=model.deduplicate if model.deduplicate is not None else True,
-            config=config,
-        )

airbyte_cdk/sources/declarative/partition_routers/__init__.py

@@ -8,9 +8,6 @@ from airbyte_cdk.sources.declarative.partition_routers.async_job_partition_route
 from airbyte_cdk.sources.declarative.partition_routers.cartesian_product_stream_slicer import (
     CartesianProductStreamSlicer,
 )
-from airbyte_cdk.sources.declarative.partition_routers.grouping_partition_router import (
-    GroupingPartitionRouter,
-)
 from airbyte_cdk.sources.declarative.partition_routers.list_partition_router import (
     ListPartitionRouter,
 )
@@ -25,7 +22,6 @@ from airbyte_cdk.sources.declarative.partition_routers.substream_partition_route
 __all__ = [
     "AsyncJobPartitionRouter",
     "CartesianProductStreamSlicer",
-    "GroupingPartitionRouter",
     "ListPartitionRouter",
     "SinglePartitionRouter",
     "SubstreamPartitionRouter",

airbyte_cdk/sources/declarative/partition_routers/substream_partition_router.py

@@ -374,11 +374,7 @@ class SubstreamPartitionRouter(PartitionRouter):
         # Ignore per-partition states or invalid formats.
         if isinstance(substream_state, (list, dict)) or len(substream_state_values) != 1:
             # If a global state is present under the key "state", use its first value.
-            if (
-                "state" in stream_state
-                and isinstance(stream_state["state"], dict)
-                and stream_state["state"] != {}
-            ):
+            if "state" in stream_state and isinstance(stream_state["state"], dict):
                 substream_state = list(stream_state["state"].values())[0]
             else:
                 return {}

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 {}