airbyte-cdk 6.7.0__py3-none-any.whl → 6.7.0.dev5__py3-none-any.whl

airbyte_cdk/sources/declarative/extractors/record_selector.py

@@ -3,14 +3,12 @@
 #
 
 from dataclasses import InitVar, dataclass, field
-from typing import Any, Iterable, List, Mapping, Optional, Union
+from typing import Any, Iterable, List, Mapping, Optional
 
 import requests
-
 from airbyte_cdk.sources.declarative.extractors.http_selector import HttpSelector
 from airbyte_cdk.sources.declarative.extractors.record_extractor import RecordExtractor
 from airbyte_cdk.sources.declarative.extractors.record_filter import RecordFilter
-from airbyte_cdk.sources.declarative.interpolation import InterpolatedString
 from airbyte_cdk.sources.declarative.models import SchemaNormalization
 from airbyte_cdk.sources.declarative.transformations import RecordTransformation
 from airbyte_cdk.sources.types import Config, Record, StreamSlice, StreamState
@@ -39,34 +37,11 @@ class RecordSelector(HttpSelector):
     config: Config
     parameters: InitVar[Mapping[str, Any]]
     schema_normalization: TypeTransformer
-    name: str
-    _name: Union[InterpolatedString, str] = field(init=False, repr=False, default="")
     record_filter: Optional[RecordFilter] = None
     transformations: List[RecordTransformation] = field(default_factory=lambda: [])
 
     def __post_init__(self, parameters: Mapping[str, Any]) -> None:
         self._parameters = parameters
-        self._name = (
-            InterpolatedString(self._name, parameters=parameters)
-            if isinstance(self._name, str)
-            else self._name
-        )
-
-    @property  # type: ignore
-    def name(self) -> str:
-        """
-        :return: Stream name
-        """
-        return (
-            str(self._name.eval(self.config))
-            if isinstance(self._name, InterpolatedString)
-            else self._name
-        )
-
-    @name.setter
-    def name(self, value: str) -> None:
-        if not isinstance(value, property):
-            self._name = value
 
     def select_records(
         self,
@@ -110,7 +85,7 @@ class RecordSelector(HttpSelector):
         transformed_data = self._transform(filtered_data, stream_state, stream_slice)
         normalized_data = self._normalize_by_schema(transformed_data, schema=records_schema)
         for data in normalized_data:
-            yield Record(data=data, stream_name=self.name, associated_slice=stream_slice)
+            yield Record(data, stream_slice)
 
     def _normalize_by_schema(
         self, records: Iterable[Mapping[str, Any]], schema: Optional[Mapping[str, Any]]
@@ -150,9 +125,6 @@ class RecordSelector(HttpSelector):
         for record in records:
             for transformation in self.transformations:
                 transformation.transform(
-                    record,  # type: ignore  # record has type Mapping[str, Any], but Dict[str, Any] expected
-                    config=self.config,
-                    stream_state=stream_state,
-                    stream_slice=stream_slice,
-                )
+                    record, config=self.config, stream_state=stream_state, stream_slice=stream_slice
+                )  # type: ignore  # record has type Mapping[str, Any], but Dict[str, Any] expected
             yield record

airbyte_cdk/sources/declarative/extractors/response_to_file_extractor.py

@@ -10,9 +10,8 @@ from typing import Any, Dict, Iterable, Mapping, Optional, Tuple
 
 import pandas as pd
 import requests
-from numpy import nan
-
 from airbyte_cdk.sources.declarative.extractors.record_extractor import RecordExtractor
+from numpy import nan
 
 EMPTY_STR: str = ""
 DEFAULT_ENCODING: str = "utf-8"

airbyte_cdk/sources/declarative/incremental/datetime_based_cursor.py

@@ -7,8 +7,6 @@ from dataclasses import InitVar, dataclass, field
 from datetime import timedelta
 from typing import Any, Callable, Iterable, List, Mapping, MutableMapping, Optional, Union
 
-from isodate import Duration, duration_isoformat, parse_duration
-
 from airbyte_cdk.models import AirbyteLogMessage, AirbyteMessage, Level, Type
 from airbyte_cdk.sources.declarative.datetime.datetime_parser import DatetimeParser
 from airbyte_cdk.sources.declarative.datetime.min_max_datetime import MinMaxDatetime
@@ -21,6 +19,7 @@ from airbyte_cdk.sources.declarative.requesters.request_option import (
 )
 from airbyte_cdk.sources.message import MessageRepository
 from airbyte_cdk.sources.types import Config, Record, StreamSlice, StreamState
+from isodate import Duration, duration_isoformat, parse_duration
 
 
 @dataclass

airbyte_cdk/sources/declarative/incremental/global_substream_cursor.py

@@ -340,11 +340,8 @@ class GlobalSubstreamCursor(DeclarativeCursor):
     @staticmethod
     def _convert_record_to_cursor_record(record: Record) -> Record:
         return Record(
-            data=record.data,
-            stream_name=record.stream_name,
-            associated_slice=StreamSlice(
-                partition={}, cursor_slice=record.associated_slice.cursor_slice
-            )
+            record.data,
+            StreamSlice(partition={}, cursor_slice=record.associated_slice.cursor_slice)
             if record.associated_slice
             else None,
         )

airbyte_cdk/sources/declarative/incremental/per_partition_cursor.py

@@ -325,11 +325,8 @@ class PerPartitionCursor(DeclarativeCursor):
     @staticmethod
     def _convert_record_to_cursor_record(record: Record) -> Record:
         return Record(
-            data=record.data,
-            stream_name=record.stream_name,
-            associated_slice=StreamSlice(
-                partition={}, cursor_slice=record.associated_slice.cursor_slice
-            )
+            record.data,
+            StreamSlice(partition={}, cursor_slice=record.associated_slice.cursor_slice)
             if record.associated_slice
             else None,
         )

airbyte_cdk/sources/declarative/incremental/per_partition_with_global.py

@@ -194,7 +194,9 @@ class PerPartitionWithGlobalCursor(DeclarativeCursor):
         )
 
     def should_be_synced(self, record: Record) -> bool:
-        return self._get_active_cursor().should_be_synced(record)
+        return self._global_cursor.should_be_synced(
+            record
+        ) or self._per_partition_cursor.should_be_synced(record)
 
     def is_greater_than_or_equal(self, first: Record, second: Record) -> bool:
         return self._global_cursor.is_greater_than_or_equal(first, second)

airbyte_cdk/sources/declarative/interpolation/jinja.py

@@ -6,15 +6,14 @@ import ast
 from functools import cache
 from typing import Any, Mapping, Optional, Tuple, Type
 
-from jinja2 import meta
-from jinja2.environment import Template
-from jinja2.exceptions import UndefinedError
-from jinja2.sandbox import SandboxedEnvironment
-
 from airbyte_cdk.sources.declarative.interpolation.filters import filters
 from airbyte_cdk.sources.declarative.interpolation.interpolation import Interpolation
 from airbyte_cdk.sources.declarative.interpolation.macros import macros
 from airbyte_cdk.sources.types import Config
+from jinja2 import meta
+from jinja2.environment import Template
+from jinja2.exceptions import UndefinedError
+from jinja2.sandbox import SandboxedEnvironment
 
 
 class StreamPartitionAccessEnvironment(SandboxedEnvironment):

airbyte_cdk/sources/declarative/manifest_declarative_source.py

@@ -8,12 +8,9 @@ import pkgutil
 from copy import deepcopy
 from importlib import metadata
 from typing import Any, Dict, Iterator, List, Mapping, Optional
+from packaging.version import Version, InvalidVersion
 
 import yaml
-from jsonschema.exceptions import ValidationError
-from jsonschema.validators import validate
-from packaging.version import InvalidVersion, Version
-
 from airbyte_cdk.models import (
     AirbyteConnectionStatus,
     AirbyteMessage,
@@ -47,6 +44,8 @@ from airbyte_cdk.sources.utils.slice_logger import (
     DebugSliceLogger,
     SliceLogger,
 )
+from jsonschema.exceptions import ValidationError
+from jsonschema.validators import validate
 
 
 class ManifestDeclarativeSource(DeclarativeSource):

airbyte_cdk/sources/declarative/migrations/legacy_to_per_partition_state_migration.py

@@ -5,9 +5,9 @@ from typing import Any, Mapping
 from airbyte_cdk.sources.declarative.interpolation.interpolated_string import InterpolatedString
 from airbyte_cdk.sources.declarative.migrations.state_migration import StateMigration
 from airbyte_cdk.sources.declarative.models import (
-    CustomIncrementalSync,
     DatetimeBasedCursor,
     SubstreamPartitionRouter,
+    CustomIncrementalSync,
 )
 from airbyte_cdk.sources.declarative.models.declarative_component_schema import ParentStreamConfig
 

airbyte_cdk/sources/declarative/parsers/model_to_component_factory.py

@@ -25,9 +25,6 @@ from typing import (
     get_type_hints,
 )
 
-from isodate import parse_duration
-from pydantic.v1 import BaseModel
-
 from airbyte_cdk.models import FailureType, Level
 from airbyte_cdk.sources.connector_state_manager import ConnectorStateManager
 from airbyte_cdk.sources.declarative.async_job.job_orchestrator import AsyncJobOrchestrator
@@ -370,6 +367,8 @@ from airbyte_cdk.sources.streams.concurrent.state_converters.datetime_stream_sta
 from airbyte_cdk.sources.streams.http.error_handlers.response_models import ResponseAction
 from airbyte_cdk.sources.types import Config
 from airbyte_cdk.sources.utils.transform import TransformConfig, TypeTransformer
+from isodate import parse_duration
+from pydantic.v1 import BaseModel
 
 ComponentDefinition = Mapping[str, Any]
 
@@ -1781,7 +1780,6 @@ class ModelToComponentFactory:
         self,
         model: RecordSelectorModel,
         config: Config,
-        name: str,
         *,
         transformations: List[RecordTransformation],
         decoder: Optional[Decoder] = None,
@@ -1812,7 +1810,6 @@ class ModelToComponentFactory:
 
         return RecordSelector(
             extractor=extractor,
-            name=name,
             config=config,
             record_filter=record_filter,
             transformations=transformations,
@@ -1883,7 +1880,6 @@ class ModelToComponentFactory:
         )
         record_selector = self._create_component_from_model(
             model=model.record_selector,
-            name=name,
             config=config,
             decoder=decoder,
             transformations=transformations,
@@ -2038,7 +2034,6 @@ class ModelToComponentFactory:
             requester=download_requester,
             record_selector=RecordSelector(
                 extractor=ResponseToFileExtractor(),
-                name=name,
                 record_filter=None,
                 transformations=[],
                 schema_normalization=TypeTransformer(TransformConfig.NoTransform),

airbyte_cdk/sources/declarative/partition_routers/substream_partition_router.py

@@ -7,7 +7,6 @@ from dataclasses import InitVar, dataclass
 from typing import TYPE_CHECKING, Any, Iterable, List, Mapping, Optional, Union
 
 import dpath
-
 from airbyte_cdk.models import AirbyteMessage
 from airbyte_cdk.models import Type as MessageType
 from airbyte_cdk.sources.declarative.interpolation.interpolated_string import InterpolatedString

airbyte_cdk/sources/declarative/requesters/error_handlers/backoff_strategies/constant_backoff_strategy.py

@@ -6,7 +6,6 @@ from dataclasses import InitVar, dataclass
 from typing import Any, Mapping, Optional, Union
 
 import requests
-
 from airbyte_cdk.sources.declarative.interpolation.interpolated_string import InterpolatedString
 from airbyte_cdk.sources.streams.http.error_handlers import BackoffStrategy
 from airbyte_cdk.sources.types import Config

airbyte_cdk/sources/declarative/requesters/error_handlers/backoff_strategies/exponential_backoff_strategy.py

@@ -6,7 +6,6 @@ from dataclasses import InitVar, dataclass
 from typing import Any, Mapping, Optional, Union
 
 import requests
-
 from airbyte_cdk.sources.declarative.interpolation.interpolated_string import InterpolatedString
 from airbyte_cdk.sources.streams.http.error_handlers import BackoffStrategy
 from airbyte_cdk.sources.types import Config

airbyte_cdk/sources/declarative/requesters/error_handlers/backoff_strategies/wait_time_from_header_backoff_strategy.py

@@ -7,7 +7,6 @@ from dataclasses import InitVar, dataclass
 from typing import Any, Mapping, Optional, Union
 
 import requests
-
 from airbyte_cdk.models import FailureType
 from airbyte_cdk.sources.declarative.interpolation.interpolated_string import InterpolatedString
 from airbyte_cdk.sources.declarative.requesters.error_handlers.backoff_strategies.header_helper import (

airbyte_cdk/sources/declarative/requesters/error_handlers/backoff_strategies/wait_until_time_from_header_backoff_strategy.py

@@ -9,7 +9,6 @@ from dataclasses import InitVar, dataclass
 from typing import Any, Mapping, Optional, Union
 
 import requests
-
 from airbyte_cdk.sources.declarative.interpolation.interpolated_string import InterpolatedString
 from airbyte_cdk.sources.declarative.requesters.error_handlers.backoff_strategies.header_helper import (
     get_numeric_value_from_header,

airbyte_cdk/sources/declarative/requesters/error_handlers/composite_error_handler.py

@@ -6,7 +6,6 @@ from dataclasses import InitVar, dataclass
 from typing import Any, List, Mapping, Optional, Union
 
 import requests
-
 from airbyte_cdk.sources.streams.http.error_handlers import ErrorHandler
 from airbyte_cdk.sources.streams.http.error_handlers.response_models import (
     ErrorResolution,

airbyte_cdk/sources/declarative/requesters/error_handlers/default_error_handler.py

@@ -6,7 +6,6 @@ from dataclasses import InitVar, dataclass, field
 from typing import Any, List, Mapping, MutableMapping, Optional, Union
 
 import requests
-
 from airbyte_cdk.sources.declarative.requesters.error_handlers.default_http_response_filter import (
     DefaultHttpResponseFilter,
 )

airbyte_cdk/sources/declarative/requesters/error_handlers/default_http_response_filter.py

@@ -5,7 +5,6 @@
 from typing import Optional, Union
 
 import requests
-
 from airbyte_cdk.sources.declarative.requesters.error_handlers.http_response_filter import (
     HttpResponseFilter,
 )

airbyte_cdk/sources/declarative/requesters/error_handlers/http_response_filter.py

@@ -6,7 +6,6 @@ from dataclasses import InitVar, dataclass
 from typing import Any, Mapping, Optional, Set, Union
 
 import requests
-
 from airbyte_cdk.models import FailureType
 from airbyte_cdk.sources.declarative.interpolation import InterpolatedString
 from airbyte_cdk.sources.declarative.interpolation.interpolated_boolean import InterpolatedBoolean

airbyte_cdk/sources/declarative/requesters/http_job_repository.py

@@ -6,8 +6,6 @@ from datetime import timedelta
 from typing import Any, Dict, Iterable, Mapping, Optional
 
 import requests
-from requests import Response
-
 from airbyte_cdk import AirbyteMessage
 from airbyte_cdk.logger import lazy_log
 from airbyte_cdk.models import FailureType, Type
@@ -25,6 +23,7 @@ from airbyte_cdk.sources.declarative.requesters.requester import Requester
 from airbyte_cdk.sources.declarative.retrievers.simple_retriever import SimpleRetriever
 from airbyte_cdk.sources.types import Record, StreamSlice
 from airbyte_cdk.utils import AirbyteTracedException
+from requests import Response
 
 LOGGER = logging.getLogger("airbyte")
 

airbyte_cdk/sources/declarative/requesters/http_requester.py

@@ -9,7 +9,6 @@ from typing import Any, Callable, Mapping, MutableMapping, Optional, Union
 from urllib.parse import urljoin
 
 import requests
-
 from airbyte_cdk.sources.declarative.auth.declarative_authenticator import (
     DeclarativeAuthenticator,
     NoAuth,

airbyte_cdk/sources/declarative/requesters/paginators/default_paginator.py

@@ -6,7 +6,6 @@ from dataclasses import InitVar, dataclass, field
 from typing import Any, Mapping, MutableMapping, Optional, Union
 
 import requests
-
 from airbyte_cdk.sources.declarative.decoders import (
     Decoder,
     JsonDecoder,

airbyte_cdk/sources/declarative/requesters/paginators/no_pagination.py

@@ -6,7 +6,6 @@ from dataclasses import InitVar, dataclass
 from typing import Any, Mapping, MutableMapping, Optional, Union
 
 import requests
-
 from airbyte_cdk.sources.declarative.requesters.paginators.paginator import Paginator
 from airbyte_cdk.sources.types import Record, StreamSlice, StreamState
 

airbyte_cdk/sources/declarative/requesters/paginators/paginator.py

@@ -7,7 +7,6 @@ from dataclasses import dataclass
 from typing import Any, Mapping, Optional
 
 import requests
-
 from airbyte_cdk.sources.declarative.requesters.request_options.request_options_provider import (
     RequestOptionsProvider,
 )

airbyte_cdk/sources/declarative/requesters/paginators/strategies/cursor_pagination_strategy.py

@@ -6,7 +6,6 @@ from dataclasses import InitVar, dataclass, field
 from typing import Any, Dict, Mapping, Optional, Union
 
 import requests
-
 from airbyte_cdk.sources.declarative.decoders import (
     Decoder,
     JsonDecoder,

airbyte_cdk/sources/declarative/requesters/paginators/strategies/offset_increment.py

@@ -6,7 +6,6 @@ from dataclasses import InitVar, dataclass, field
 from typing import Any, Mapping, Optional, Union
 
 import requests
-
 from airbyte_cdk.sources.declarative.decoders import (
     Decoder,
     JsonDecoder,

airbyte_cdk/sources/declarative/requesters/paginators/strategies/page_increment.py

@@ -6,7 +6,6 @@ from dataclasses import InitVar, dataclass
 from typing import Any, Mapping, Optional, Union
 
 import requests
-
 from airbyte_cdk.sources.declarative.interpolation import InterpolatedString
 from airbyte_cdk.sources.declarative.requesters.paginators.strategies.pagination_strategy import (
     PaginationStrategy,

airbyte_cdk/sources/declarative/requesters/paginators/strategies/pagination_strategy.py

@@ -7,7 +7,6 @@ from dataclasses import dataclass
 from typing import Any, Optional
 
 import requests
-
 from airbyte_cdk.sources.types import Record
 
 

airbyte_cdk/sources/declarative/requesters/paginators/strategies/stop_condition.py

@@ -6,12 +6,10 @@ from abc import ABC, abstractmethod
 from typing import Any, Optional
 
 import requests
-
 from airbyte_cdk.sources.declarative.incremental.declarative_cursor import DeclarativeCursor
 from airbyte_cdk.sources.declarative.requesters.paginators.strategies.pagination_strategy import (
     PaginationStrategy,
 )
-from airbyte_cdk.sources.streams.concurrent.cursor import ConcurrentCursor
 from airbyte_cdk.sources.types import Record
 
 
@@ -27,11 +25,7 @@ class PaginationStopCondition(ABC):
 
 
 class CursorStopCondition(PaginationStopCondition):
-    def __init__(
-        self,
-        cursor: DeclarativeCursor
-        | ConcurrentCursor,  # migrate to use both old and concurrent versions
-    ):
+    def __init__(self, cursor: DeclarativeCursor):
         self._cursor = cursor
 
     def is_met(self, record: Record) -> bool:
@@ -52,8 +46,8 @@ class StopConditionPaginationStrategyDecorator(PaginationStrategy):
             return None
         return self._delegate.next_page_token(response, last_page_size, last_record)
 
-    def reset(self, reset_value: Optional[Any] = None) -> None:
-        self._delegate.reset(reset_value)
+    def reset(self) -> None:
+        self._delegate.reset()
 
     def get_page_size(self) -> Optional[int]:
         return self._delegate.get_page_size()

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

@@ -5,8 +5,6 @@
 from dataclasses import InitVar, dataclass, field
 from typing import Any, Mapping, MutableMapping, Optional, Union
 
-from deprecated import deprecated
-
 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 (
     InterpolatedNestedRequestInputProvider,
@@ -19,6 +17,7 @@ from airbyte_cdk.sources.declarative.requesters.request_options.request_options_
 )
 from airbyte_cdk.sources.source import ExperimentalClassWarning
 from airbyte_cdk.sources.types import Config, StreamSlice, StreamState
+from deprecated import deprecated
 
 RequestInput = Union[str, Mapping[str, str]]
 ValidRequestTypes = (str, list)

airbyte_cdk/sources/declarative/requesters/requester.py

@@ -7,7 +7,6 @@ from enum import Enum
 from typing import Any, Callable, Mapping, MutableMapping, Optional, Union
 
 import requests
-
 from airbyte_cdk.sources.declarative.auth.declarative_authenticator import DeclarativeAuthenticator
 from airbyte_cdk.sources.declarative.requesters.request_options.request_options_provider import (
     RequestOptionsProvider,

airbyte_cdk/sources/declarative/retrievers/async_retriever.py

@@ -4,8 +4,6 @@
 from dataclasses import InitVar, dataclass, field
 from typing import Any, Callable, Iterable, Mapping, Optional
 
-from deprecated.classic import deprecated
-
 from airbyte_cdk.models import FailureType
 from airbyte_cdk.sources.declarative.async_job.job_orchestrator import (
     AsyncJobOrchestrator,
@@ -19,6 +17,7 @@ from airbyte_cdk.sources.source import ExperimentalClassWarning
 from airbyte_cdk.sources.streams.core import StreamData
 from airbyte_cdk.sources.types import Config, StreamSlice, StreamState
 from airbyte_cdk.utils.traced_exception import AirbyteTracedException
+from deprecated.classic import deprecated
 
 
 @deprecated("This class is experimental. Use at your own risk.", category=ExperimentalClassWarning)

airbyte_cdk/sources/declarative/retrievers/simple_retriever.py

@@ -20,7 +20,6 @@ from typing import (
 )
 
 import requests
-
 from airbyte_cdk.models import AirbyteMessage
 from airbyte_cdk.sources.declarative.extractors.http_selector import HttpSelector
 from airbyte_cdk.sources.declarative.incremental import ResumableFullRefreshCursor
@@ -468,9 +467,8 @@ class SimpleRetriever(Retriever):
         else:
             return None
 
-    def _extract_record(
-        self, stream_data: StreamData, stream_slice: StreamSlice
-    ) -> Optional[Record]:
+    @staticmethod
+    def _extract_record(stream_data: StreamData, stream_slice: StreamSlice) -> Optional[Record]:
         """
         As we allow the output of _read_pages to be StreamData, it can be multiple things. Therefore, we need to filter out and normalize
         to data to streamline the rest of the process.
@@ -479,15 +477,9 @@ class SimpleRetriever(Retriever):
             # Record is not part of `StreamData` but is the most common implementation of `Mapping[str, Any]` which is part of `StreamData`
             return stream_data
         elif isinstance(stream_data, (dict, Mapping)):
-            return Record(
-                data=dict(stream_data), associated_slice=stream_slice, stream_name=self.name
-            )
+            return Record(dict(stream_data), stream_slice)
         elif isinstance(stream_data, AirbyteMessage) and stream_data.record:
-            return Record(
-                data=stream_data.record.data,  # type:ignore # AirbyteMessage always has record.data
-                associated_slice=stream_slice,
-                stream_name=self.name,
-            )
+            return Record(stream_data.record.data, stream_slice)
         return None
 
     # stream_slices is defined with arguments on http stream and fixing this has a long tail of dependencies. Will be resolved by the decoupling of http stream and simple retriever

airbyte_cdk/sources/declarative/stream_slicers/declarative_partition_generator.py

@@ -1,13 +1,14 @@
 # Copyright (c) 2024 Airbyte, Inc., all rights reserved.
 
-from typing import Any, Callable, Iterable, Mapping, Optional
+from typing import Iterable, Optional, Mapping, Any, Callable
 
 from airbyte_cdk.sources.declarative.retrievers import Retriever
 from airbyte_cdk.sources.message import MessageRepository
 from airbyte_cdk.sources.streams.concurrent.partitions.partition import Partition
 from airbyte_cdk.sources.streams.concurrent.partitions.partition_generator import PartitionGenerator
+from airbyte_cdk.sources.streams.concurrent.partitions.record import Record
 from airbyte_cdk.sources.streams.concurrent.partitions.stream_slicer import StreamSlicer
-from airbyte_cdk.sources.types import Record, StreamSlice
+from airbyte_cdk.sources.types import StreamSlice
 from airbyte_cdk.utils.slice_hasher import SliceHasher
 
 
@@ -58,11 +59,7 @@ class DeclarativePartition(Partition):
     def read(self) -> Iterable[Record]:
         for stream_data in self._retriever.read_records(self._json_schema, self._stream_slice):
             if isinstance(stream_data, Mapping):
-                yield Record(
-                    data=stream_data,
-                    stream_name=self.stream_name(),
-                    associated_slice=self._stream_slice,
-                )
+                yield Record(stream_data, self)
             else:
                 self._message_repository.emit_message(stream_data)
 

airbyte_cdk/sources/declarative/transformations/add_fields.py

@@ -6,7 +6,6 @@ from dataclasses import InitVar, dataclass, field
 from typing import Any, Dict, List, Mapping, Optional, Type, Union
 
 import dpath
-
 from airbyte_cdk.sources.declarative.interpolation.interpolated_string import InterpolatedString
 from airbyte_cdk.sources.declarative.transformations import RecordTransformation
 from airbyte_cdk.sources.types import Config, FieldPointer, StreamSlice, StreamState

airbyte_cdk/sources/declarative/transformations/remove_fields.py

@@ -7,7 +7,6 @@ from typing import Any, Dict, List, Mapping, Optional
 
 import dpath
 import dpath.exceptions
-
 from airbyte_cdk.sources.declarative.interpolation.interpolated_boolean import InterpolatedBoolean
 from airbyte_cdk.sources.declarative.transformations import RecordTransformation
 from airbyte_cdk.sources.types import Config, FieldPointer, StreamSlice, StreamState

airbyte_cdk/sources/declarative/yaml_declarative_source.py

@@ -6,7 +6,6 @@ import pkgutil
 from typing import Any, List, Mapping, Optional
 
 import yaml
-
 from airbyte_cdk.models import AirbyteStateMessage, ConfiguredAirbyteCatalog
 from airbyte_cdk.sources.declarative.concurrent_declarative_source import (
     ConcurrentDeclarativeSource,

airbyte_cdk/sources/embedded/tools.py

@@ -5,7 +5,6 @@
 from typing import Any, Callable, Dict, Iterable, Optional
 
 import dpath
-
 from airbyte_cdk.models import AirbyteStream
 
 

airbyte_cdk/sources/file_based/config/abstract_file_based_spec.py

@@ -7,11 +7,10 @@ from abc import abstractmethod
 from typing import Any, Dict, List, Literal, Optional, Union
 
 import dpath
-from pydantic.v1 import AnyUrl, BaseModel, Field
-
 from airbyte_cdk import OneOfOptionConfig
 from airbyte_cdk.sources.file_based.config.file_based_stream_config import FileBasedStreamConfig
 from airbyte_cdk.sources.utils import schema_helpers
+from pydantic.v1 import AnyUrl, BaseModel, Field
 
 
 class DeliverRecords(BaseModel):

airbyte_cdk/sources/file_based/config/avro_format.py

@@ -3,9 +3,8 @@
 #
 
 
-from pydantic.v1 import BaseModel, Field
-
 from airbyte_cdk.utils.oneof_option_config import OneOfOptionConfig
+from pydantic.v1 import BaseModel, Field
 
 
 class AvroFormat(BaseModel):

airbyte_cdk/sources/file_based/config/csv_format.py

@@ -6,11 +6,10 @@ import codecs
 from enum import Enum
 from typing import Any, Dict, List, Optional, Set, Union
 
+from airbyte_cdk.utils.oneof_option_config import OneOfOptionConfig
 from pydantic.v1 import BaseModel, Field, root_validator, validator
 from pydantic.v1.error_wrappers import ValidationError
 
-from airbyte_cdk.utils.oneof_option_config import OneOfOptionConfig
-
 
 class InferenceType(Enum):
     NONE = "None"