airbyte-cdk 6.8.1rc10__py3-none-any.whl → 6.8.2rc1__py3-none-any.whl

airbyte_cdk/sources/declarative/concurrent_declarative_source.py

@@ -181,13 +181,9 @@ class ConcurrentDeclarativeSource(ManifestDeclarativeSource, Generic[TState]):
 
         state_manager = ConnectorStateManager(state=self._state)  # type: ignore  # state is always in the form of List[AirbyteStateMessage]. The ConnectorStateManager should use generics, but this can be done later
 
-        # Combine streams and dynamic_streams. Note: both cannot be empty at the same time,
-        # and this is validated during the initialization of the source.
-        streams = self._stream_configs(self._source_config) + self._dynamic_stream_configs(
-            self._source_config, config
-        )
-
-        name_to_stream_mapping = {stream["name"]: stream for stream in streams}
+        name_to_stream_mapping = {
+            stream["name"]: stream for stream in self.resolved_manifest["streams"]
+        }
 
         for declarative_stream in self.streams(config=config):
             # Some low-code sources use a combination of DeclarativeStream and regular Python streams. We can't inspect
@@ -195,7 +191,7 @@ class ConcurrentDeclarativeSource(ManifestDeclarativeSource, Generic[TState]):
             # so we need to treat them as synchronous
             if (
                 isinstance(declarative_stream, DeclarativeStream)
-                and name_to_stream_mapping[declarative_stream.name]["retriever"]["type"]
+                and name_to_stream_mapping[declarative_stream.name].get("retriever")["type"]
                 == "SimpleRetriever"
             ):
                 incremental_sync_component_definition = name_to_stream_mapping[
@@ -204,7 +200,7 @@ class ConcurrentDeclarativeSource(ManifestDeclarativeSource, Generic[TState]):
 
                 partition_router_component_definition = (
                     name_to_stream_mapping[declarative_stream.name]
-                    .get("retriever", {})
+                    .get("retriever")
                     .get("partition_router")
                 )
                 is_without_partition_router_or_cursor = not bool(
@@ -226,7 +222,7 @@ class ConcurrentDeclarativeSource(ManifestDeclarativeSource, Generic[TState]):
                     cursor = self._constructor.create_concurrent_cursor_from_datetime_based_cursor(
                         state_manager=state_manager,
                         model_type=DatetimeBasedCursorModel,
-                        component_definition=incremental_sync_component_definition,  # type: ignore  # Not None because of the if condition above
+                        component_definition=incremental_sync_component_definition,
                         stream_name=declarative_stream.name,
                         stream_namespace=declarative_stream.namespace,
                         config=config or {},
@@ -309,11 +305,10 @@ class ConcurrentDeclarativeSource(ManifestDeclarativeSource, Generic[TState]):
     def _is_datetime_incremental_without_partition_routing(
         self,
         declarative_stream: DeclarativeStream,
-        incremental_sync_component_definition: Mapping[str, Any] | None,
+        incremental_sync_component_definition: Mapping[str, Any],
     ) -> bool:
         return (
-            incremental_sync_component_definition is not None
-            and bool(incremental_sync_component_definition)
+            bool(incremental_sync_component_definition)
             and incremental_sync_component_definition.get("type", "")
             == DatetimeBasedCursorModel.__name__
             and self._stream_supports_concurrent_partition_processing(

airbyte_cdk/sources/declarative/declarative_component_schema.yaml

@@ -7,12 +7,8 @@ version: 1.0.0
 required:
   - type
   - check
+  - streams
   - version
-anyOf:
-  - required:
-      - streams
-  - required:
-      - dynamic_streams
 properties:
   type:
     type: string
@@ -23,10 +19,6 @@ properties:
     type: array
     items:
       "$ref": "#/definitions/DeclarativeStream"
-  dynamic_streams:
-    type: array
-    items:
-      "$ref": "#/definitions/DynamicDeclarativeStream"
   version:
     type: string
     description: The version of the Airbyte CDK used to build and test the source.
@@ -1329,7 +1321,7 @@ definitions:
         type: array
         items:
           - type: string
-        interpolation_context:
+        interpolation_content:
           - config
         examples:
           - ["data"]
@@ -2903,96 +2895,6 @@ definitions:
       $parameters:
         type: object
         additionalProperties: true
-  ComponentMappingDefinition:
-    title: Component Mapping Definition
-    description: (This component is experimental. Use at your own risk.) Specifies a mapping definition to update or add fields in a record or configuration. This allows dynamic mapping of data by interpolating values into the template based on provided contexts.
-    type: object
-    required:
-      - type
-      - field_path
-      - value
-    properties:
-      type:
-        type: string
-        enum: [ComponentMappingDefinition]
-      field_path:
-        title: Field Path
-        description: A list of potentially nested fields indicating the full path where value will be added or updated.
-        type: array
-        items:
-          - type: string
-        interpolation_context:
-          - config
-          - components_values
-          - stream_template_config
-        examples:
-          - ["data"]
-          - ["data", "records"]
-          - ["data", "{{ parameters.name }}"]
-          - ["data", "*", "record"]
-      value:
-        title: Value
-        description: The dynamic or static value to assign to the key. Interpolated values can be used to dynamically determine the value during runtime.
-        type: string
-        interpolation_context:
-          - config
-          - stream_template_config
-          - components_values
-        examples:
-          - "{{ components_values['updates'] }}"
-          - "{{ components_values['MetaData']['LastUpdatedTime'] }}"
-          - "{{ config['segment_id'] }}"
-      value_type:
-        title: Value Type
-        description: The expected data type of the value. If omitted, the type will be inferred from the value provided.
-        "$ref": "#/definitions/ValueType"
-      $parameters:
-        type: object
-        additionalProperties: true
-  HttpComponentsResolver:
-    type: object
-    description: (This component is experimental. Use at your own risk.) Component resolve and populates stream templates with components fetched via an HTTP retriever.
-    properties:
-      type:
-        type: string
-        enum: [HttpComponentsResolver]
-      retriever:
-        title: Retriever
-        description: Component used to coordinate how records are extracted across stream slices and request pages.
-        anyOf:
-          - "$ref": "#/definitions/AsyncRetriever"
-          - "$ref": "#/definitions/CustomRetriever"
-          - "$ref": "#/definitions/SimpleRetriever"
-      components_mapping:
-        type: array
-        items:
-          "$ref": "#/definitions/ComponentMappingDefinition"
-      $parameters:
-        type: object
-        additionalProperties: true
-    required:
-      - type
-      - retriever
-      - components_mapping
-  DynamicDeclarativeStream:
-    type: object
-    description: (This component is experimental. Use at your own risk.) A component that described how will be created declarative streams based on stream template.
-    properties:
-      type:
-        type: string
-        enum: [DynamicDeclarativeStream]
-      stream_template:
-        title: Stream Template
-        description: Reference to the stream template.
-        "$ref": "#/definitions/DeclarativeStream"
-      components_resolver:
-        title: Components Resolver
-        description: Component resolve and populates stream templates with components values.
-        "$ref": "#/definitions/HttpComponentsResolver"
-    required:
-      - type
-      - stream_template
-      - components_resolver
 interpolation:
   variables:
     - title: config

airbyte_cdk/sources/declarative/manifest_declarative_source.py

@@ -39,7 +39,6 @@ from airbyte_cdk.sources.declarative.parsers.manifest_reference_resolver import
 from airbyte_cdk.sources.declarative.parsers.model_to_component_factory import (
     ModelToComponentFactory,
 )
-from airbyte_cdk.sources.declarative.resolvers import COMPONENTS_RESOLVER_TYPE_MAPPING
 from airbyte_cdk.sources.message import MessageRepository
 from airbyte_cdk.sources.streams.core import Stream
 from airbyte_cdk.sources.types import ConnectionDefinition
@@ -121,10 +120,7 @@ class ManifestDeclarativeSource(DeclarativeSource):
         self._emit_manifest_debug_message(
             extra_args={"source_name": self.name, "parsed_config": json.dumps(self._source_config)}
         )
-
-        stream_configs = self._stream_configs(self._source_config) + self._dynamic_stream_configs(
-            self._source_config, config
-        )
+        stream_configs = self._stream_configs(self._source_config)
 
         source_streams = [
             self._constructor.create_component(
@@ -238,8 +234,7 @@ class ManifestDeclarativeSource(DeclarativeSource):
             )
 
         streams = self._source_config.get("streams")
-        dynamic_streams = self._source_config.get("dynamic_streams")
-        if not (streams or dynamic_streams):
+        if not streams:
             raise ValidationError(
                 f"A valid manifest should have at least one stream defined. Got {streams}"
             )
@@ -308,51 +303,5 @@ class ManifestDeclarativeSource(DeclarativeSource):
                 s["type"] = "DeclarativeStream"
         return stream_configs
 
-    def _dynamic_stream_configs(
-        self, manifest: Mapping[str, Any], config: Mapping[str, Any]
-    ) -> List[Dict[str, Any]]:
-        dynamic_stream_definitions: List[Dict[str, Any]] = manifest.get("dynamic_streams", [])
-        dynamic_stream_configs: List[Dict[str, Any]] = []
-
-        for dynamic_definition in dynamic_stream_definitions:
-            components_resolver_config = dynamic_definition["components_resolver"]
-
-            if not components_resolver_config:
-                raise ValueError(
-                    f"Missing 'components_resolver' in dynamic definition: {dynamic_definition}"
-                )
-
-            resolver_type = components_resolver_config.get("type")
-            if not resolver_type:
-                raise ValueError(
-                    f"Missing 'type' in components resolver configuration: {components_resolver_config}"
-                )
-
-            if resolver_type not in COMPONENTS_RESOLVER_TYPE_MAPPING:
-                raise ValueError(
-                    f"Invalid components resolver type '{resolver_type}'. "
-                    f"Expected one of {list(COMPONENTS_RESOLVER_TYPE_MAPPING.keys())}."
-                )
-
-            if "retriever" in components_resolver_config:
-                components_resolver_config["retriever"]["requester"]["use_cache"] = True
-
-            # Create a resolver for dynamic components based on type
-            components_resolver = self._constructor.create_component(
-                COMPONENTS_RESOLVER_TYPE_MAPPING[resolver_type], components_resolver_config, config
-            )
-
-            stream_template_config = dynamic_definition["stream_template"]
-
-            for dynamic_stream in components_resolver.resolve_components(
-                stream_template_config=stream_template_config
-            ):
-                if "type" not in dynamic_stream:
-                    dynamic_stream["type"] = "DeclarativeStream"
-
-                dynamic_stream_configs.append(dynamic_stream)
-
-        return dynamic_stream_configs
-
     def _emit_manifest_debug_message(self, extra_args: dict[str, Any]) -> None:
         self.logger.debug("declarative source created from manifest", extra=extra_args)

airbyte_cdk/sources/declarative/models/declarative_component_schema.py

@@ -1158,37 +1158,6 @@ class WaitUntilTimeFromHeader(BaseModel):
     parameters: Optional[Dict[str, Any]] = Field(None, alias="$parameters")
 
 
-class ComponentMappingDefinition(BaseModel):
-    type: Literal["ComponentMappingDefinition"]
-    field_path: List[str] = Field(
-        ...,
-        description="A list of potentially nested fields indicating the full path where value will be added or updated.",
-        examples=[
-            ["data"],
-            ["data", "records"],
-            ["data", "{{ parameters.name }}"],
-            ["data", "*", "record"],
-        ],
-        title="Field Path",
-    )
-    value: str = Field(
-        ...,
-        description="The dynamic or static value to assign to the key. Interpolated values can be used to dynamically determine the value during runtime.",
-        examples=[
-            "{{ components_values['updates'] }}",
-            "{{ components_values['MetaData']['LastUpdatedTime'] }}",
-            "{{ config['segment_id'] }}",
-        ],
-        title="Value",
-    )
-    value_type: Optional[ValueType] = Field(
-        None,
-        description="The expected data type of the value. If omitted, the type will be inferred from the value provided.",
-        title="Value Type",
-    )
-    parameters: Optional[Dict[str, Any]] = Field(None, alias="$parameters")
-
-
 class AddedFieldDefinition(BaseModel):
     type: Literal["AddedFieldDefinition"]
     path: List[str] = Field(
@@ -1486,40 +1455,13 @@ class CompositeErrorHandler(BaseModel):
     parameters: Optional[Dict[str, Any]] = Field(None, alias="$parameters")
 
 
-class DeclarativeSource1(BaseModel):
+class DeclarativeSource(BaseModel):
     class Config:
         extra = Extra.forbid
 
     type: Literal["DeclarativeSource"]
     check: CheckStream
     streams: List[DeclarativeStream]
-    dynamic_streams: Optional[List[DynamicDeclarativeStream]] = None
-    version: str = Field(
-        ...,
-        description="The version of the Airbyte CDK used to build and test the source.",
-    )
-    schemas: Optional[Schemas] = None
-    definitions: Optional[Dict[str, Any]] = None
-    spec: Optional[Spec] = None
-    concurrency_level: Optional[ConcurrencyLevel] = None
-    metadata: Optional[Dict[str, Any]] = Field(
-        None,
-        description="For internal Airbyte use only - DO NOT modify manually. Used by consumers of declarative manifests for storing related metadata.",
-    )
-    description: Optional[str] = Field(
-        None,
-        description="A description of the connector. It will be presented on the Source documentation page.",
-    )
-
-
-class DeclarativeSource2(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    type: Literal["DeclarativeSource"]
-    check: CheckStream
-    streams: Optional[List[DeclarativeStream]] = None
-    dynamic_streams: List[DynamicDeclarativeStream]
     version: str = Field(
         ...,
         description="The version of the Airbyte CDK used to build and test the source.",
@@ -1538,17 +1480,6 @@ class DeclarativeSource2(BaseModel):
     )
 
 
-class DeclarativeSource(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    __root__: Union[DeclarativeSource1, DeclarativeSource2] = Field(
-        ...,
-        description="An API source that extracts data according to its declarative components.",
-        title="DeclarativeSource",
-    )
-
-
 class SelectiveAuthenticator(BaseModel):
     class Config:
         extra = Extra.allow
@@ -1952,32 +1883,8 @@ class SubstreamPartitionRouter(BaseModel):
     parameters: Optional[Dict[str, Any]] = Field(None, alias="$parameters")
 
 
-class HttpComponentsResolver(BaseModel):
-    type: Literal["HttpComponentsResolver"]
-    retriever: Union[AsyncRetriever, CustomRetriever, SimpleRetriever] = Field(
-        ...,
-        description="Component used to coordinate how records are extracted across stream slices and request pages.",
-        title="Retriever",
-    )
-    components_mapping: List[ComponentMappingDefinition]
-    parameters: Optional[Dict[str, Any]] = Field(None, alias="$parameters")
-
-
-class DynamicDeclarativeStream(BaseModel):
-    type: Literal["DynamicDeclarativeStream"]
-    stream_template: DeclarativeStream = Field(
-        ..., description="Reference to the stream template.", title="Stream Template"
-    )
-    components_resolver: HttpComponentsResolver = Field(
-        ...,
-        description="Component resolve and populates stream templates with components values.",
-        title="Components Resolver",
-    )
-
-
 CompositeErrorHandler.update_forward_refs()
-DeclarativeSource1.update_forward_refs()
-DeclarativeSource2.update_forward_refs()
+DeclarativeSource.update_forward_refs()
 SelectiveAuthenticator.update_forward_refs()
 DeclarativeStream.update_forward_refs()
 SessionTokenAuthenticator.update_forward_refs()

airbyte_cdk/sources/declarative/parsers/manifest_component_transformer.py

@@ -31,12 +31,6 @@ DEFAULT_MODEL_TYPES: Mapping[str, str] = {
     # DeclarativeStream
     "DeclarativeStream.retriever": "SimpleRetriever",
     "DeclarativeStream.schema_loader": "JsonFileSchemaLoader",
-    # DynamicDeclarativeStream
-    "DynamicDeclarativeStream.stream_template": "DeclarativeStream",
-    "DynamicDeclarativeStream.components_resolver": "HttpComponentsResolver",
-    # HttpComponentsResolver
-    "HttpComponentsResolver.retriever": "SimpleRetriever",
-    "HttpComponentsResolver.components_mapping": "ComponentMappingDefinition",
     # DefaultErrorHandler
     "DefaultErrorHandler.response_filters": "HttpResponseFilter",
     # DefaultPaginator

airbyte_cdk/sources/declarative/parsers/model_to_component_factory.py

@@ -119,9 +119,6 @@ from airbyte_cdk.sources.declarative.models.declarative_component_schema import
 from airbyte_cdk.sources.declarative.models.declarative_component_schema import (
     CheckStream as CheckStreamModel,
 )
-from airbyte_cdk.sources.declarative.models.declarative_component_schema import (
-    ComponentMappingDefinition as ComponentMappingDefinitionModel,
-)
 from airbyte_cdk.sources.declarative.models.declarative_component_schema import (
     CompositeErrorHandler as CompositeErrorHandlerModel,
 )
@@ -194,9 +191,6 @@ from airbyte_cdk.sources.declarative.models.declarative_component_schema import
 from airbyte_cdk.sources.declarative.models.declarative_component_schema import (
     GzipJsonDecoder as GzipJsonDecoderModel,
 )
-from airbyte_cdk.sources.declarative.models.declarative_component_schema import (
-    HttpComponentsResolver as HttpComponentsResolverModel,
-)
 from airbyte_cdk.sources.declarative.models.declarative_component_schema import (
     HttpRequester as HttpRequesterModel,
 )
@@ -304,7 +298,6 @@ from airbyte_cdk.sources.declarative.models.declarative_component_schema import
 from airbyte_cdk.sources.declarative.partition_routers import (
     CartesianProductStreamSlicer,
     ListPartitionRouter,
-    PartitionRouter,
     SinglePartitionRouter,
     SubstreamPartitionRouter,
 )
@@ -345,10 +338,6 @@ from airbyte_cdk.sources.declarative.requesters.request_options import (
 )
 from airbyte_cdk.sources.declarative.requesters.request_path import RequestPath
 from airbyte_cdk.sources.declarative.requesters.requester import HttpMethod
-from airbyte_cdk.sources.declarative.resolvers import (
-    ComponentMappingDefinition,
-    HttpComponentsResolver,
-)
 from airbyte_cdk.sources.declarative.retrievers import (
     AsyncRetriever,
     SimpleRetriever,
@@ -478,8 +467,6 @@ class ModelToComponentFactory:
             WaitTimeFromHeaderModel: self.create_wait_time_from_header,
             WaitUntilTimeFromHeaderModel: self.create_wait_until_time_from_header,
             AsyncRetrieverModel: self.create_async_retriever,
-            HttpComponentsResolverModel: self.create_http_components_resolver,
-            ComponentMappingDefinitionModel: self.create_components_mapping_definition,
         }
 
         # Needed for the case where we need to perform a second parse on the fields of a custom component
@@ -1294,20 +1281,19 @@ class ModelToComponentFactory:
             parameters=model.parameters or {},
         )
 
-    def _build_stream_slicer_from_partition_router(
-        self,
-        model: Union[AsyncRetrieverModel, CustomRetrieverModel, SimpleRetrieverModel],
-        config: Config,
-    ) -> Optional[PartitionRouter]:
+    def _merge_stream_slicers(
+        self, model: DeclarativeStreamModel, config: Config
+    ) -> Optional[StreamSlicer]:
+        stream_slicer = None
         if (
-            hasattr(model, "partition_router")
-            and isinstance(model, SimpleRetrieverModel)
-            and model.partition_router
+            hasattr(model.retriever, "partition_router")
+            and isinstance(model.retriever, SimpleRetrieverModel)
+            and model.retriever.partition_router
         ):
-            stream_slicer_model = model.partition_router
+            stream_slicer_model = model.retriever.partition_router
 
             if isinstance(stream_slicer_model, list):
-                return CartesianProductStreamSlicer(
+                stream_slicer = CartesianProductStreamSlicer(
                     [
                         self._create_component_from_model(model=slicer, config=config)
                         for slicer in stream_slicer_model
@@ -1315,24 +1301,9 @@ class ModelToComponentFactory:
                     parameters={},
                 )
             else:
-                return self._create_component_from_model(model=stream_slicer_model, config=config)  # type: ignore[no-any-return]
-                # Will be created PartitionRouter as stream_slicer_model is model.partition_router
-        return None
-
-    def _build_resumable_cursor_from_paginator(
-        self,
-        model: Union[AsyncRetrieverModel, CustomRetrieverModel, SimpleRetrieverModel],
-        stream_slicer: Optional[StreamSlicer],
-    ) -> Optional[StreamSlicer]:
-        if hasattr(model, "paginator") and model.paginator and not stream_slicer:
-            # For the regular Full-Refresh streams, we use the high level `ResumableFullRefreshCursor`
-            return ResumableFullRefreshCursor(parameters={})
-        return None
-
-    def _merge_stream_slicers(
-        self, model: DeclarativeStreamModel, config: Config
-    ) -> Optional[StreamSlicer]:
-        stream_slicer = self._build_stream_slicer_from_partition_router(model.retriever, config)
+                stream_slicer = self._create_component_from_model(
+                    model=stream_slicer_model, config=config
+                )
 
         if model.incremental_sync and stream_slicer:
             incremental_sync_model = model.incremental_sync
@@ -1375,7 +1346,15 @@ class ModelToComponentFactory:
                 ),
                 partition_router=stream_slicer,
             )
-        return self._build_resumable_cursor_from_paginator(model.retriever, stream_slicer)
+        elif (
+            hasattr(model.retriever, "paginator")
+            and model.retriever.paginator
+            and not stream_slicer
+        ):
+            # For the regular Full-Refresh streams, we use the high level `ResumableFullRefreshCursor`
+            return ResumableFullRefreshCursor(parameters={})
+        else:
+            return None
 
     def create_default_error_handler(
         self, model: DefaultErrorHandlerModel, config: Config, **kwargs: Any
@@ -2239,56 +2218,3 @@ class ModelToComponentFactory:
 
     def _evaluate_log_level(self, emit_connector_builder_messages: bool) -> Level:
         return Level.DEBUG if emit_connector_builder_messages else Level.INFO
-
-    @staticmethod
-    def create_components_mapping_definition(
-        model: ComponentMappingDefinitionModel, config: Config, **kwargs: Any
-    ) -> ComponentMappingDefinition:
-        interpolated_value = InterpolatedString.create(
-            model.value, parameters=model.parameters or {}
-        )
-        field_path = [
-            InterpolatedString.create(path, parameters=model.parameters or {})
-            for path in model.field_path
-        ]
-        return ComponentMappingDefinition(
-            field_path=field_path,  # type: ignore[arg-type] # field_path can be str and InterpolatedString
-            value=interpolated_value,
-            value_type=ModelToComponentFactory._json_schema_type_name_to_type(model.value_type),
-            parameters=model.parameters or {},
-        )
-
-    def create_http_components_resolver(
-        self, model: HttpComponentsResolverModel, config: Config
-    ) -> Any:
-        stream_slicer = self._build_stream_slicer_from_partition_router(model.retriever, config)
-        combined_slicers = self._build_resumable_cursor_from_paginator(
-            model.retriever, stream_slicer
-        )
-
-        retriever = self._create_component_from_model(
-            model=model.retriever,
-            config=config,
-            name="",
-            primary_key=None,
-            stream_slicer=combined_slicers,
-            transformations=[],
-        )
-
-        components_mapping = [
-            self._create_component_from_model(
-                model=components_mapping_definition_model,
-                value_type=ModelToComponentFactory._json_schema_type_name_to_type(
-                    components_mapping_definition_model.value_type
-                ),
-                config=config,
-            )
-            for components_mapping_definition_model in model.components_mapping
-        ]
-
-        return HttpComponentsResolver(
-            retriever=retriever,
-            config=config,
-            components_mapping=components_mapping,
-            parameters=model.parameters or {},
-        )

airbyte_cdk/sources/declarative/partition_routers/__init__.py

@@ -6,6 +6,5 @@ from airbyte_cdk.sources.declarative.partition_routers.cartesian_product_stream_
 from airbyte_cdk.sources.declarative.partition_routers.list_partition_router import ListPartitionRouter
 from airbyte_cdk.sources.declarative.partition_routers.single_partition_router import SinglePartitionRouter
 from airbyte_cdk.sources.declarative.partition_routers.substream_partition_router import SubstreamPartitionRouter
-from airbyte_cdk.sources.declarative.partition_routers.partition_router import PartitionRouter
 
-__all__ = ["CartesianProductStreamSlicer", "ListPartitionRouter", "SinglePartitionRouter", "SubstreamPartitionRouter", "PartitionRouter"]
+__all__ = ["CartesianProductStreamSlicer", "ListPartitionRouter", "SinglePartitionRouter", "SubstreamPartitionRouter"]

{airbyte_cdk-6.8.1rc10.dist-info → airbyte_cdk-6.8.2rc1.dist-info}/METADATA

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

{airbyte_cdk-6.8.1rc10.dist-info → airbyte_cdk-6.8.2rc1.dist-info}/RECORD

@@ -62,11 +62,11 @@ airbyte_cdk/sources/declarative/checks/check_stream.py,sha256=dAA-UhmMj0WLXCkRQr
 airbyte_cdk/sources/declarative/checks/connection_checker.py,sha256=MBRJo6WJlZQHpIfOGaNOkkHUmgUl_4wDM6VPo41z5Ss,1383
 airbyte_cdk/sources/declarative/concurrency_level/__init__.py,sha256=5XUqrmlstYlMM0j6crktlKQwALek0uiz2D3WdM46MyA,191
 airbyte_cdk/sources/declarative/concurrency_level/concurrency_level.py,sha256=YIwCTCpOr_QSNW4ltQK0yUGWInI8PKNY216HOOegYLk,2101
-airbyte_cdk/sources/declarative/concurrent_declarative_source.py,sha256=9OXOFzG5PBL_MHEJg4ETE0TXfXeuhvv-at38AN3wWEM,23323
+airbyte_cdk/sources/declarative/concurrent_declarative_source.py,sha256=UAkFzFJ62tq7qWfudLLt-Sj-EhOJquYPd-FrwMBSA9I,22928
 airbyte_cdk/sources/declarative/datetime/__init__.py,sha256=l9LG7Qm6e5r_qgqfVKnx3mXYtg1I9MmMjomVIPfU4XA,177
 airbyte_cdk/sources/declarative/datetime/datetime_parser.py,sha256=SX9JjdesN1edN2WVUVMzU_ptqp2QB1OnsnjZ4mwcX7w,2579
 airbyte_cdk/sources/declarative/datetime/min_max_datetime.py,sha256=0BHBtDNQZfvwM45-tY5pNlTcKAFSGGNxemoi0Jic-0E,5785
-airbyte_cdk/sources/declarative/declarative_component_schema.yaml,sha256=kZkGoasVzufDE2BkFo_7DVO6xHL9kueNBjddtl-7kaU,124134
+airbyte_cdk/sources/declarative/declarative_component_schema.yaml,sha256=Q6zOEKvgAjMUsu89VmNteMhqdP0XwO9WWfA6-rMVn6A,120545
 airbyte_cdk/sources/declarative/declarative_source.py,sha256=nF7wBqFd3AQmEKAm4CnIo29CJoQL562cJGSCeL8U8bA,1531
 airbyte_cdk/sources/declarative/declarative_stream.py,sha256=JRyNeOIpsFu4ztVZsN6sncqUEIqIE-bUkD2TPgbMgk0,10375
 airbyte_cdk/sources/declarative/decoders/__init__.py,sha256=hNlhaB5FjNC6IfJyglj5ZJWkYD2nEAukMDmzRz5PC6o,671
@@ -99,18 +99,18 @@ airbyte_cdk/sources/declarative/interpolation/interpolated_string.py,sha256=LYEZ
 airbyte_cdk/sources/declarative/interpolation/interpolation.py,sha256=-V5UddGm69UKEB6o_O1EIES9kfY8FV_X4Ji8w1yOuSA,981
 airbyte_cdk/sources/declarative/interpolation/jinja.py,sha256=gcihTEnfD_6sUivxOomoY5r7VMAGqVVnK_HEsid9Y5k,6605
 airbyte_cdk/sources/declarative/interpolation/macros.py,sha256=jf24RK-1fBhTYDpcGEakZtGNNJfG5NS8CCF5bEgNmRo,3977
-airbyte_cdk/sources/declarative/manifest_declarative_source.py,sha256=-v3GvuTVHwUonrfUwDj3wYKaZjX6hTyKmMBRgEzj-j0,15201
+airbyte_cdk/sources/declarative/manifest_declarative_source.py,sha256=FEOmFo2mwdpmO8pH9jnw-sUAnijjuigZWYqH_0Gq9oQ,12919
 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=6iAzpGmUrhwEUQcCL5bW-FXuLXPMeFqs_GR4B1rS3ZE,88511
+airbyte_cdk/sources/declarative/models/declarative_component_schema.py,sha256=tZcVSMRJ5-5MoX4ejpXxt5E2suqiQ5AwprQWQiWHhho,85060
 airbyte_cdk/sources/declarative/parsers/__init__.py,sha256=ZnqYNxHsKCgO38IwB34RQyRMXTs4GTvlRi3ImKnIioo,61
 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=0jfi-ogL-rOVORTIYnu64wNfh1L8fYaLVDWzJ2zGdi8,8799
+airbyte_cdk/sources/declarative/parsers/manifest_component_transformer.py,sha256=jVZ3ZV5YZrmDNIX5cM2mugXmnbH27zHRcD22_3oatpo,8454
 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=lS2oKfkND54u66hocc2BycS-AIYIbkn4npq6CFRNokc,99573
-airbyte_cdk/sources/declarative/partition_routers/__init__.py,sha256=1NjaZoGAIefvWwj6wx-LOKIXXWS-UnBlZFnuR7y6uYA,745
+airbyte_cdk/sources/declarative/parsers/model_to_component_factory.py,sha256=tO7xkv4y5iH6wGkj5As1T5ItUQxlw6cLflHAH48PKwc,96355
+airbyte_cdk/sources/declarative/partition_routers/__init__.py,sha256=8uGos2u7TFTx_EJBdcjdUGn3Eyx6jUuEa1_VB8UP_dI,631
 airbyte_cdk/sources/declarative/partition_routers/cartesian_product_stream_slicer.py,sha256=c5cuVFM6NFkuQqG8Z5IwkBuwDrvXZN1CunUOM_L0ezg,6892
 airbyte_cdk/sources/declarative/partition_routers/list_partition_router.py,sha256=t7pRdFWfFWJtQQG19c9PVeMODyO2BknRTakpM5U9N-8,4844
 airbyte_cdk/sources/declarative/partition_routers/partition_router.py,sha256=YyEIzdmLd1FjbVP3QbQ2VFCLW_P-OGbVh6VpZShp54k,2218
@@ -152,9 +152,6 @@ airbyte_cdk/sources/declarative/requesters/request_options/interpolated_request_
 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=iVVpXQ4KEd9OyZNwmOofMvx7_06i8ZRxGo3aNTrEQLM,4946
-airbyte_cdk/sources/declarative/resolvers/__init__.py,sha256=8cL--3WCJvtKVIIAqKWoIEhmmf3FemB7PlsnO0Mx_cY,688
-airbyte_cdk/sources/declarative/resolvers/components_resolver.py,sha256=KPjKc0yb9artL4ZkeqN8RmEykHH6FJgqXD7fCEnh1X0,1936
-airbyte_cdk/sources/declarative/resolvers/http_components_resolver.py,sha256=ZA2vrHQKfXNMcH3x1iuyFOTGNzYDhUFT2qcaiOzSK0A,4271
 airbyte_cdk/sources/declarative/retrievers/__init__.py,sha256=FVQpUGVwp2Gibk4gp07VmLKX5AafUlsZWFSrDpUDuJM,443
 airbyte_cdk/sources/declarative/retrievers/async_retriever.py,sha256=WDFnjrXLz3-YEjFhmlMkWAn9AJvnZ0mk9FyC8DAhEYk,4976
 airbyte_cdk/sources/declarative/retrievers/retriever.py,sha256=XPLs593Xv8c5cKMc37XzUAYmzlXd1a7eSsspM-CMuWA,1696
@@ -333,8 +330,8 @@ airbyte_cdk/utils/slice_hasher.py,sha256=-pHexlNYoWYPnXNH-M7HEbjmeJe9Zk7SJijdQ7d
 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.8.1rc10.dist-info/LICENSE.txt,sha256=Wfe61S4BaGPj404v8lrAbvhjYR68SHlkzeYrg3_bbuM,1051
-airbyte_cdk-6.8.1rc10.dist-info/METADATA,sha256=i53fFfpGsjm1cqFsNkeZRHZ9cetCNkHK942sFUpjJMk,6111
-airbyte_cdk-6.8.1rc10.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-airbyte_cdk-6.8.1rc10.dist-info/entry_points.txt,sha256=fj-e3PAQvsxsQzyyq8UkG1k8spunWnD4BAH2AwlR6NM,95
-airbyte_cdk-6.8.1rc10.dist-info/RECORD,,
+airbyte_cdk-6.8.2rc1.dist-info/LICENSE.txt,sha256=Wfe61S4BaGPj404v8lrAbvhjYR68SHlkzeYrg3_bbuM,1051
+airbyte_cdk-6.8.2rc1.dist-info/METADATA,sha256=u5k6gz5XLQCQmR3CLeP-StHB8_iV6QhEqLuuBvh1G1w,6110
+airbyte_cdk-6.8.2rc1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+airbyte_cdk-6.8.2rc1.dist-info/entry_points.txt,sha256=fj-e3PAQvsxsQzyyq8UkG1k8spunWnD4BAH2AwlR6NM,95
+airbyte_cdk-6.8.2rc1.dist-info/RECORD,,

airbyte_cdk/sources/declarative/resolvers/__init__.py

@@ -1,13 +0,0 @@
-#
-# Copyright (c) 2024 Airbyte, Inc., all rights reserved.
-#
-
-from airbyte_cdk.sources.declarative.resolvers.components_resolver import ComponentsResolver, ComponentMappingDefinition, ResolvedComponentMappingDefinition
-from airbyte_cdk.sources.declarative.resolvers.http_components_resolver import HttpComponentsResolver
-from airbyte_cdk.sources.declarative.models import HttpComponentsResolver as HttpComponentsResolverModel
-
-COMPONENTS_RESOLVER_TYPE_MAPPING = {
-    "HttpComponentsResolver": HttpComponentsResolverModel
-}
-
-__all__ = ["ComponentsResolver", "HttpComponentsResolver", "ComponentMappingDefinition", "ResolvedComponentMappingDefinition", "COMPONENTS_RESOLVER_TYPE_MAPPING"]

airbyte_cdk/sources/declarative/resolvers/components_resolver.py

@@ -1,55 +0,0 @@
-#
-# Copyright (c) 2024 Airbyte, Inc., all rights reserved.
-#
-
-from abc import ABC, abstractmethod
-from dataclasses import InitVar, dataclass
-from typing import Any, Dict, Iterable, List, Mapping, Optional, Type, Union
-
-from typing_extensions import deprecated
-
-from airbyte_cdk.sources.declarative.interpolation import InterpolatedString
-from airbyte_cdk.sources.source import ExperimentalClassWarning
-
-
-@dataclass(frozen=True)
-class ComponentMappingDefinition:
-    """Defines the configuration for mapping a component in a stream. This class specifies
-    what field in the stream template should be updated with value, supporting dynamic interpolation
-    and type enforcement."""
-
-    field_path: List["InterpolatedString"]
-    value: Union["InterpolatedString", str]
-    value_type: Optional[Type[Any]]
-    parameters: InitVar[Mapping[str, Any]]
-
-
-@dataclass(frozen=True)
-class ResolvedComponentMappingDefinition:
-    """Defines resolved configuration for mapping a component in a stream. This class specifies
-    what field in the stream template should be updated with value, supporting dynamic interpolation
-    and type enforcement."""
-
-    field_path: List["InterpolatedString"]
-    value: "InterpolatedString"
-    value_type: Optional[Type[Any]]
-    parameters: InitVar[Mapping[str, Any]]
-
-
-@deprecated("This class is experimental. Use at your own risk.", category=ExperimentalClassWarning)
-@dataclass
-class ComponentsResolver(ABC):
-    """
-    Abstract base class for resolving components in a stream template.
-    """
-
-    @abstractmethod
-    def resolve_components(
-        self, stream_template_config: Dict[str, Any]
-    ) -> Iterable[Dict[str, Any]]:
-        """
-        Maps and populates values into a stream template configuration.
-        :param stream_template_config: The stream template with placeholders for components.
-        :yields: The resolved stream config with populated values.
-        """
-        pass

airbyte_cdk/sources/declarative/resolvers/http_components_resolver.py

@@ -1,106 +0,0 @@
-#
-# Copyright (c) 2024 Airbyte, Inc., all rights reserved.
-#
-
-from copy import deepcopy
-from dataclasses import InitVar, dataclass, field
-from typing import Any, Dict, Iterable, List, Mapping
-
-import dpath
-from typing_extensions import deprecated
-
-from airbyte_cdk.sources.declarative.interpolation import InterpolatedString
-from airbyte_cdk.sources.declarative.resolvers.components_resolver import (
-    ComponentMappingDefinition,
-    ComponentsResolver,
-    ResolvedComponentMappingDefinition,
-)
-from airbyte_cdk.sources.declarative.retrievers.retriever import Retriever
-from airbyte_cdk.sources.source import ExperimentalClassWarning
-from airbyte_cdk.sources.types import Config
-
-
-@deprecated("This class is experimental. Use at your own risk.", category=ExperimentalClassWarning)
-@dataclass
-class HttpComponentsResolver(ComponentsResolver):
-    """
-    Resolves and populates stream templates with components fetched via an HTTP retriever.
-
-    Attributes:
-        retriever (Retriever): The retriever used to fetch data from an API.
-        config (Config): Configuration object for the resolver.
-        components_mapping (List[ComponentMappingDefinition]): List of mappings to resolve.
-        parameters (InitVar[Mapping[str, Any]]): Additional parameters for interpolation.
-    """
-
-    retriever: Retriever
-    config: Config
-    components_mapping: List[ComponentMappingDefinition]
-    parameters: InitVar[Mapping[str, Any]]
-    _resolved_components: List[ResolvedComponentMappingDefinition] = field(
-        init=False, repr=False, default_factory=list
-    )
-
-    def __post_init__(self, parameters: Mapping[str, Any]) -> None:
-        """
-        Initializes and parses component mappings, converting them to resolved definitions.
-
-        Args:
-            parameters (Mapping[str, Any]): Parameters for interpolation.
-        """
-        for component_mapping in self.components_mapping:
-            if isinstance(component_mapping.value, (str, InterpolatedString)):
-                interpolated_value = (
-                    InterpolatedString.create(component_mapping.value, parameters=parameters)
-                    if isinstance(component_mapping.value, str)
-                    else component_mapping.value
-                )
-
-                field_path = [
-                    InterpolatedString.create(path, parameters=parameters)
-                    for path in component_mapping.field_path
-                ]
-
-                self._resolved_components.append(
-                    ResolvedComponentMappingDefinition(
-                        field_path=field_path,
-                        value=interpolated_value,
-                        value_type=component_mapping.value_type,
-                        parameters=parameters,
-                    )
-                )
-            else:
-                raise ValueError(
-                    f"Expected a string or InterpolatedString for value in mapping: {component_mapping}"
-                )
-
-    def resolve_components(
-        self, stream_template_config: Dict[str, Any]
-    ) -> Iterable[Dict[str, Any]]:
-        """
-        Resolves components in the stream template configuration by populating values.
-
-        Args:
-            stream_template_config (Dict[str, Any]): Stream template to populate.
-
-        Yields:
-            Dict[str, Any]: Updated configurations with resolved components.
-        """
-        kwargs = {"stream_template_config": stream_template_config}
-
-        for components_values in self.retriever.read_records({}):
-            updated_config = deepcopy(stream_template_config)
-            kwargs["components_values"] = components_values  # type: ignore[assignment] # component_values will always be of type Mapping[str, Any]
-
-            for resolved_component in self._resolved_components:
-                valid_types = (
-                    (resolved_component.value_type,) if resolved_component.value_type else None
-                )
-                value = resolved_component.value.eval(
-                    self.config, valid_types=valid_types, **kwargs
-                )
-
-                path = [path.eval(self.config, **kwargs) for path in resolved_component.field_path]
-                dpath.set(updated_config, path, value)
-
-            yield updated_config