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

airbyte_cdk/cli/source_declarative_manifest/_run.py

@@ -25,8 +25,6 @@ from datetime import datetime
 from pathlib import Path
 from typing import Any, cast
 
-from orjson import orjson
-
 from airbyte_cdk.entrypoint import AirbyteEntrypoint, launch
 from airbyte_cdk.models import (
     AirbyteErrorTraceMessage,
@@ -44,6 +42,7 @@ from airbyte_cdk.sources.declarative.concurrent_declarative_source import (
 )
 from airbyte_cdk.sources.declarative.yaml_declarative_source import YamlDeclarativeSource
 from airbyte_cdk.sources.source import TState
+from orjson import orjson
 
 
 class SourceLocalYaml(YamlDeclarativeSource):

airbyte_cdk/config_observation.py

@@ -10,8 +10,6 @@ import time
 from copy import copy
 from typing import Any, List, MutableMapping
 
-from orjson import orjson
-
 from airbyte_cdk.models import (
     AirbyteControlConnectorConfigMessage,
     AirbyteControlMessage,
@@ -20,6 +18,7 @@ from airbyte_cdk.models import (
     OrchestratorType,
     Type,
 )
+from orjson import orjson
 
 
 class ObservedDict(dict):  # type: ignore # disallow_any_generics is set to True, and dict is equivalent to dict[Any]

airbyte_cdk/connector.py

@@ -11,7 +11,6 @@ from abc import ABC, abstractmethod
 from typing import Any, Generic, Mapping, Optional, Protocol, TypeVar
 
 import yaml
-
 from airbyte_cdk.models import (
     AirbyteConnectionStatus,
     ConnectorSpecification,

airbyte_cdk/connector_builder/connector_builder_handler.py

@@ -12,8 +12,8 @@ from airbyte_cdk.models import (
     AirbyteRecordMessage,
     AirbyteStateMessage,
     ConfiguredAirbyteCatalog,
-    Type,
 )
+from airbyte_cdk.models import Type
 from airbyte_cdk.models import Type as MessageType
 from airbyte_cdk.sources.declarative.declarative_source import DeclarativeSource
 from airbyte_cdk.sources.declarative.manifest_declarative_source import ManifestDeclarativeSource

airbyte_cdk/connector_builder/main.py

@@ -6,8 +6,6 @@
 import sys
 from typing import Any, List, Mapping, Optional, Tuple
 
-from orjson import orjson
-
 from airbyte_cdk.connector import BaseConnector
 from airbyte_cdk.connector_builder.connector_builder_handler import (
     TestReadLimits,
@@ -27,6 +25,7 @@ from airbyte_cdk.models import (
 from airbyte_cdk.sources.declarative.manifest_declarative_source import ManifestDeclarativeSource
 from airbyte_cdk.sources.source import Source
 from airbyte_cdk.utils.traced_exception import AirbyteTracedException
+from orjson import orjson
 
 
 def get_config_and_catalog_from_args(

airbyte_cdk/destinations/destination.py

@@ -9,8 +9,6 @@ import sys
 from abc import ABC, abstractmethod
 from typing import Any, Iterable, List, Mapping
 
-from orjson import orjson
-
 from airbyte_cdk.connector import Connector
 from airbyte_cdk.exception_handler import init_uncaught_exception_handler
 from airbyte_cdk.models import (
@@ -22,6 +20,7 @@ from airbyte_cdk.models import (
 )
 from airbyte_cdk.sources.utils.schema_helpers import check_config_against_spec_or_exit
 from airbyte_cdk.utils.traced_exception import AirbyteTracedException
+from orjson import orjson
 
 logger = logging.getLogger("airbyte")
 

airbyte_cdk/destinations/vector_db_based/config.py

@@ -5,10 +5,9 @@
 from typing import Any, Dict, List, Literal, Optional, Union
 
 import dpath
-from pydantic.v1 import BaseModel, Field
-
 from airbyte_cdk.utils.oneof_option_config import OneOfOptionConfig
 from airbyte_cdk.utils.spec_schema_transformations import resolve_refs
+from pydantic.v1 import BaseModel, Field
 
 
 class SeparatorSplitterConfigModel(BaseModel):

airbyte_cdk/destinations/vector_db_based/document_processor.py

@@ -8,10 +8,6 @@ from dataclasses import dataclass
 from typing import Any, Dict, List, Mapping, Optional, Tuple
 
 import dpath
-from langchain.text_splitter import Language, RecursiveCharacterTextSplitter
-from langchain.utils import stringify_dict
-from langchain_core.documents.base import Document
-
 from airbyte_cdk.destinations.vector_db_based.config import (
     ProcessingConfigModel,
     SeparatorSplitterConfigModel,
@@ -25,6 +21,9 @@ from airbyte_cdk.models import (
     DestinationSyncMode,
 )
 from airbyte_cdk.utils.traced_exception import AirbyteTracedException, FailureType
+from langchain.text_splitter import Language, RecursiveCharacterTextSplitter
+from langchain.utils import stringify_dict
+from langchain_core.documents.base import Document
 
 METADATA_STREAM_FIELD = "_ab_stream"
 METADATA_RECORD_ID_FIELD = "_ab_record_id"

airbyte_cdk/destinations/vector_db_based/embedder.py

@@ -7,11 +7,6 @@ from abc import ABC, abstractmethod
 from dataclasses import dataclass
 from typing import List, Optional, Union, cast
 
-from langchain.embeddings.cohere import CohereEmbeddings
-from langchain.embeddings.fake import FakeEmbeddings
-from langchain.embeddings.localai import LocalAIEmbeddings
-from langchain.embeddings.openai import OpenAIEmbeddings
-
 from airbyte_cdk.destinations.vector_db_based.config import (
     AzureOpenAIEmbeddingConfigModel,
     CohereEmbeddingConfigModel,
@@ -24,6 +19,10 @@ from airbyte_cdk.destinations.vector_db_based.config import (
 from airbyte_cdk.destinations.vector_db_based.utils import create_chunks, format_exception
 from airbyte_cdk.models import AirbyteRecordMessage
 from airbyte_cdk.utils.traced_exception import AirbyteTracedException, FailureType
+from langchain.embeddings.cohere import CohereEmbeddings
+from langchain.embeddings.fake import FakeEmbeddings
+from langchain.embeddings.localai import LocalAIEmbeddings
+from langchain.embeddings.openai import OpenAIEmbeddings
 
 
 @dataclass

airbyte_cdk/entrypoint.py

@@ -16,9 +16,6 @@ from typing import Any, DefaultDict, Iterable, List, Mapping, Optional
 from urllib.parse import urlparse
 
 import requests
-from orjson import orjson
-from requests import PreparedRequest, Response, Session
-
 from airbyte_cdk.connector import TConfig
 from airbyte_cdk.exception_handler import init_uncaught_exception_handler
 from airbyte_cdk.logger import init_logger
@@ -41,6 +38,8 @@ from airbyte_cdk.utils import is_cloud_environment, message_utils
 from airbyte_cdk.utils.airbyte_secrets_utils import get_secrets, update_secrets
 from airbyte_cdk.utils.constants import ENV_REQUEST_CACHE_PATH
 from airbyte_cdk.utils.traced_exception import AirbyteTracedException
+from orjson import orjson
+from requests import PreparedRequest, Response, Session
 
 logger = init_logger("airbyte")
 

airbyte_cdk/logger.py

@@ -7,8 +7,6 @@ import logging
 import logging.config
 from typing import Any, Callable, Mapping, Optional, Tuple
 
-from orjson import orjson
-
 from airbyte_cdk.models import (
     AirbyteLogMessage,
     AirbyteMessage,
@@ -17,6 +15,7 @@ from airbyte_cdk.models import (
     Type,
 )
 from airbyte_cdk.utils.airbyte_secrets_utils import filter_secrets
+from orjson import orjson
 
 LOGGING_CONFIG = {
     "version": 1,

airbyte_cdk/models/airbyte_protocol.py

@@ -5,11 +5,10 @@
 from dataclasses import InitVar, dataclass
 from typing import Annotated, Any, Dict, List, Mapping, Optional, Union
 
+from airbyte_cdk.models.file_transfer_record_message import AirbyteFileTransferRecordMessage
 from airbyte_protocol_dataclasses.models import *  # noqa: F403  # Allow '*'
 from serpyco_rs.metadata import Alias
 
-from airbyte_cdk.models.file_transfer_record_message import AirbyteFileTransferRecordMessage
-
 # ruff: noqa: F405  # ignore fuzzy import issues with 'import *'
 
 

airbyte_cdk/sources/concurrent_source/concurrent_read_processor.py

@@ -17,8 +17,8 @@ from airbyte_cdk.sources.streams.concurrent.abstract_stream import AbstractStrea
 from airbyte_cdk.sources.streams.concurrent.partition_enqueuer import PartitionEnqueuer
 from airbyte_cdk.sources.streams.concurrent.partition_reader import PartitionReader
 from airbyte_cdk.sources.streams.concurrent.partitions.partition import Partition
+from airbyte_cdk.sources.streams.concurrent.partitions.record import Record
 from airbyte_cdk.sources.streams.concurrent.partitions.types import PartitionCompleteSentinel
-from airbyte_cdk.sources.types import Record
 from airbyte_cdk.sources.utils.record_helper import stream_data_to_airbyte_message
 from airbyte_cdk.sources.utils.slice_logger import SliceLogger
 from airbyte_cdk.utils import AirbyteTracedException
@@ -147,11 +147,11 @@ class ConcurrentReadProcessor:
         # AbstractStreams are expected to return data as they are expected.
         # Any transformation on the data should be done before reaching this point
         message = stream_data_to_airbyte_message(
-            stream_name=record.stream_name,
+            stream_name=record.partition.stream_name(),
             data_or_message=record.data,
             is_file_transfer_message=record.is_file_transfer_message,
         )
-        stream = self._stream_name_to_instance[record.stream_name]
+        stream = self._stream_name_to_instance[record.partition.stream_name()]
 
         if message.type == MessageType.RECORD:
             if self._record_counter[stream.name] == 0:

airbyte_cdk/sources/concurrent_source/concurrent_source.py

@@ -18,11 +18,11 @@ from airbyte_cdk.sources.streams.concurrent.abstract_stream import AbstractStrea
 from airbyte_cdk.sources.streams.concurrent.partition_enqueuer import PartitionEnqueuer
 from airbyte_cdk.sources.streams.concurrent.partition_reader import PartitionReader
 from airbyte_cdk.sources.streams.concurrent.partitions.partition import Partition
+from airbyte_cdk.sources.streams.concurrent.partitions.record import Record
 from airbyte_cdk.sources.streams.concurrent.partitions.types import (
     PartitionCompleteSentinel,
     QueueItem,
 )
-from airbyte_cdk.sources.types import Record
 from airbyte_cdk.sources.utils.slice_logger import DebugSliceLogger, SliceLogger
 
 

airbyte_cdk/sources/config.py

@@ -4,9 +4,8 @@
 
 from typing import Any, Dict
 
-from pydantic.v1 import BaseModel
-
 from airbyte_cdk.sources.utils.schema_helpers import expand_refs, rename_key
+from pydantic.v1 import BaseModel
 
 
 class BaseConfig(BaseModel):

airbyte_cdk/sources/declarative/auth/jwt.py

@@ -8,7 +8,6 @@ from datetime import datetime
 from typing import Any, Mapping, Optional, Union
 
 import jwt
-
 from airbyte_cdk.sources.declarative.auth.declarative_authenticator import DeclarativeAuthenticator
 from airbyte_cdk.sources.declarative.interpolation.interpolated_boolean import InterpolatedBoolean
 from airbyte_cdk.sources.declarative.interpolation.interpolated_mapping import InterpolatedMapping

airbyte_cdk/sources/declarative/auth/oauth.py

@@ -6,7 +6,6 @@ from dataclasses import InitVar, dataclass, field
 from typing import Any, List, Mapping, Optional, Union
 
 import pendulum
-
 from airbyte_cdk.sources.declarative.auth.declarative_authenticator import DeclarativeAuthenticator
 from airbyte_cdk.sources.declarative.interpolation.interpolated_mapping import InterpolatedMapping
 from airbyte_cdk.sources.declarative.interpolation.interpolated_string import InterpolatedString

airbyte_cdk/sources/declarative/auth/selective_authenticator.py

@@ -6,7 +6,6 @@ from dataclasses import dataclass
 from typing import Any, List, Mapping
 
 import dpath
-
 from airbyte_cdk.sources.declarative.auth.declarative_authenticator import DeclarativeAuthenticator
 
 

airbyte_cdk/sources/declarative/auth/token.py

@@ -8,8 +8,6 @@ from dataclasses import InitVar, dataclass
 from typing import Any, Mapping, Union
 
 import requests
-from cachetools import TTLCache, cached
-
 from airbyte_cdk.sources.declarative.auth.declarative_authenticator import DeclarativeAuthenticator
 from airbyte_cdk.sources.declarative.auth.token_provider import TokenProvider
 from airbyte_cdk.sources.declarative.interpolation.interpolated_string import InterpolatedString
@@ -18,6 +16,7 @@ from airbyte_cdk.sources.declarative.requesters.request_option import (
     RequestOptionType,
 )
 from airbyte_cdk.sources.types import Config
+from cachetools import TTLCache, cached
 
 
 @dataclass

airbyte_cdk/sources/declarative/auth/token_provider.py

@@ -10,9 +10,6 @@ from typing import Any, List, Mapping, Optional, Union
 
 import dpath
 import pendulum
-from isodate import Duration
-from pendulum import DateTime
-
 from airbyte_cdk.sources.declarative.decoders.decoder import Decoder
 from airbyte_cdk.sources.declarative.decoders.json_decoder import JsonDecoder
 from airbyte_cdk.sources.declarative.exceptions import ReadException
@@ -21,6 +18,8 @@ from airbyte_cdk.sources.declarative.requesters.requester import Requester
 from airbyte_cdk.sources.http_logger import format_http_message
 from airbyte_cdk.sources.message import MessageRepository, NoopMessageRepository
 from airbyte_cdk.sources.types import Config
+from isodate import Duration
+from pendulum import DateTime
 
 
 class TokenProvider:

airbyte_cdk/sources/declarative/concurrent_declarative_source.py

@@ -3,7 +3,7 @@
 #
 
 import logging
-from typing import Any, Callable, Generic, Iterator, List, Mapping, Optional, Tuple, Union
+from typing import Any, Generic, Iterator, List, Mapping, Optional, Tuple, Union, Callable
 
 from airbyte_cdk.models import (
     AirbyteCatalog,
@@ -27,16 +27,14 @@ from airbyte_cdk.sources.declarative.models.declarative_component_schema import
 )
 from airbyte_cdk.sources.declarative.models.declarative_component_schema import (
     DatetimeBasedCursor as DatetimeBasedCursorModel,
-)
-from airbyte_cdk.sources.declarative.models.declarative_component_schema import (
     DeclarativeStream as DeclarativeStreamModel,
 )
 from airbyte_cdk.sources.declarative.parsers.model_to_component_factory import (
-    ComponentDefinition,
     ModelToComponentFactory,
+    ComponentDefinition,
 )
 from airbyte_cdk.sources.declarative.requesters import HttpRequester
-from airbyte_cdk.sources.declarative.retrievers import Retriever, SimpleRetriever
+from airbyte_cdk.sources.declarative.retrievers import SimpleRetriever, Retriever
 from airbyte_cdk.sources.declarative.stream_slicers.declarative_partition_generator import (
     DeclarativePartitionFactory,
     StreamSlicerPartitionGenerator,
@@ -44,6 +42,7 @@ from airbyte_cdk.sources.declarative.stream_slicers.declarative_partition_genera
 from airbyte_cdk.sources.declarative.transformations.add_fields import AddFields
 from airbyte_cdk.sources.declarative.types import ConnectionDefinition
 from airbyte_cdk.sources.source import TState
+from airbyte_cdk.sources.types import Config, StreamState
 from airbyte_cdk.sources.streams import Stream
 from airbyte_cdk.sources.streams.concurrent.abstract_stream import AbstractStream
 from airbyte_cdk.sources.streams.concurrent.availability_strategy import (
@@ -51,7 +50,6 @@ from airbyte_cdk.sources.streams.concurrent.availability_strategy import (
 )
 from airbyte_cdk.sources.streams.concurrent.default_stream import DefaultStream
 from airbyte_cdk.sources.streams.concurrent.helpers import get_primary_key_from_stream
-from airbyte_cdk.sources.types import Config, StreamState
 
 
 class ConcurrentDeclarativeSource(ManifestDeclarativeSource, Generic[TState]):

airbyte_cdk/sources/declarative/declarative_component_schema.yaml

@@ -2790,21 +2790,21 @@ interpolation:
         - created_at: "2020-01-01 00:00:00.000+00:00"
         - updated_at: "2020-01-02 00:00:00.000+00:00"
   macros:
-    - title: now_utc
+    - title: Now (UTC)
       description: Returns the current date and time in the UTC timezone.
       arguments: {}
       return_type: Datetime
       examples:
         - "'{{ now_utc() }}' -> '2021-09-01 00:00:00+00:00'"
         - "'{{ now_utc().strftime('%Y-%m-%d') }}' -> '2021-09-01'"
-    - title: today_utc
+    - title: Today (UTC)
       description: Returns the current date in UTC timezone. The output is a date object.
       arguments: {}
       return_type: Date
       examples:
         - "'{{ today_utc() }}' -> '2021-09-01'"
         - "'{{ today_utc().strftime('%Y/%m/%d')}}' -> '2021/09/01'"
-    - title: timestamp
+    - title: Timestamp
       description: Converts a number or a string representing a datetime (formatted as ISO8601) to a timestamp. If the input is a number, it is converted to an int. If no timezone is specified, the string is interpreted as UTC.
       arguments:
         datetime: A string formatted as ISO8601 or an integer representing a unix timestamp
@@ -2815,7 +2815,7 @@ interpolation:
         - "'{{ timestamp('2022-02-28T00:00:00Z') }}' -> 1646006400"
         - "'{{ timestamp('2022-02-28 00:00:00Z') }}' -> 1646006400"
         - "'{{ timestamp('2022-02-28T00:00:00-08:00') }}' -> 1646035200"
-    - title: max
+    - title: Max
       description: Returns the largest object of a iterable, or or two or more arguments.
       arguments:
         args: iterable or a sequence of two or more arguments
@@ -2823,7 +2823,7 @@ interpolation:
       examples:
         - "'{{ max(2, 3) }}' -> 3"
         - "'{{ max([2, 3]) }}' -> 3"
-    - title: day_delta
+    - title: Day Delta
       description: Returns the datetime of now() + num_days.
       arguments:
         num_days: The number of days to add to now
@@ -2833,8 +2833,8 @@ interpolation:
         - "'{{ day_delta(1) }}' -> '2021-09-02T00:00:00.000000+0000'"
         - "'{{ day_delta(-1) }}' -> '2021-08-31:00:00.000000+0000'"
         - "'{{ day_delta(25, format='%Y-%m-%d') }}' -> '2021-09-02'"
-    - title: duration
-      description: Converts an ISO8601 duration to datetime timedelta.
+    - title: Duration
+      description: Converts an ISO8601 duratioin to datetime.timedelta.
       arguments:
         duration_string: "A string representing an ISO8601 duration. See https://www.digi.com/resources/documentation/digidocs//90001488-13/reference/r_iso_8601_duration_format.htm for more details."
       return_type: datetime.timedelta
@@ -2842,7 +2842,7 @@ interpolation:
         - "'{{ duration('P1D') }}' -> '1 day, 0:00:00'"
         - "'{{ duration('P6DT23H') }}' -> '6 days, 23:00:00'"
         - "'{{ (now_utc() - duration('P1D')).strftime('%Y-%m-%dT%H:%M:%SZ') }}' -> '2021-08-31T00:00:00Z'"
-    - title: format_datetime
+    - title: Format Datetime
       description: Converts a datetime or a datetime-string to the specified format.
       arguments:
         datetime: The datetime object or a string to convert. If datetime is a string, it must be formatted as ISO8601.
@@ -2854,7 +2854,7 @@ interpolation:
         - "{{ format_datetime(config['start_date'], '%Y-%m-%dT%H:%M:%S.%fZ') }}"
         - "{{ format_datetime(config['start_date'], '%Y-%m-%dT%H:%M:%S.%fZ', '%a, %d %b %Y %H:%M:%S %z') }}"
   filters:
-    - title: hash
+    - title: Hash
       description: Convert the specified value to a hashed string.
       arguments:
         hash_type: Valid hash type for converts ('md5' as default value).
@@ -2864,26 +2864,26 @@ interpolation:
         - "{{ 'Test client_secret' | hash() }} -> '3032d57a12f76b61a820e47b9a5a0cbb'"
         - "{{ 'Test client_secret' | hash('md5') }} -> '3032d57a12f76b61a820e47b9a5a0cbb'"
         - "{{ 'Test client_secret' | hash('md5', salt='salt') }} -> '5011a0168579c2d94cbbe1c6ad14327c'"
-    - title: base64encode
+    - title: Base64 encoder
       description: Convert the specified value to a string in the base64 format.
       arguments: {}
       return_type: str
       examples:
         - "{{ 'Test client_secret' | base64encode }} -> 'VGVzdCBjbGllbnRfc2VjcmV0'"
-    - title: base64decode
+    - title: Base64 decoder
       description: Decodes the specified base64 format value into a common string.
       arguments: {}
       return_type: str
       examples:
         - "{{ 'ZmFrZSByZWZyZXNoX3Rva2VuIHZhbHVl' | base64decode }} -> 'fake refresh_token value'"
-    - title: string
+    - title: String
       description: Converts the specified value to a string.
       arguments: {}
       return_type: str
       examples:
         - '{{ 1 | string }} -> "1"'
         - '{{ ["hello", "world" | string }} -> "["hello", "world"]"'
-    - title: regex_search
+    - title: Regex Search
       description: Match the input string against a regular expression and return the first match.
       arguments:
         regex: The regular expression to search for. It must include a capture group.

airbyte_cdk/sources/declarative/decoders/json_decoder.py

@@ -5,12 +5,11 @@ import codecs
 import logging
 from dataclasses import InitVar, dataclass
 from gzip import decompress
-from typing import Any, Generator, List, Mapping, MutableMapping, Optional
+from typing import Any, Generator, Mapping, MutableMapping, List, Optional
 
-import orjson
 import requests
-
 from airbyte_cdk.sources.declarative.decoders.decoder import Decoder
+import orjson
 
 logger = logging.getLogger("airbyte")
 

airbyte_cdk/sources/declarative/decoders/noop_decoder.py

@@ -4,7 +4,6 @@ import logging
 from typing import Any, Generator, Mapping
 
 import requests
-
 from airbyte_cdk.sources.declarative.decoders.decoder import Decoder
 
 logger = logging.getLogger("airbyte")

airbyte_cdk/sources/declarative/decoders/pagination_decoder_decorator.py

@@ -7,7 +7,6 @@ from dataclasses import dataclass
 from typing import Any, Generator, MutableMapping
 
 import requests
-
 from airbyte_cdk.sources.declarative.decoders import Decoder
 
 logger = logging.getLogger("airbyte")

airbyte_cdk/sources/declarative/decoders/xml_decoder.py

@@ -9,7 +9,6 @@ from xml.parsers.expat import ExpatError
 
 import requests
 import xmltodict
-
 from airbyte_cdk.sources.declarative.decoders.decoder import Decoder
 
 logger = logging.getLogger("airbyte")

airbyte_cdk/sources/declarative/extractors/dpath_extractor.py

@@ -7,7 +7,6 @@ from typing import Any, Iterable, List, Mapping, MutableMapping, Union
 
 import dpath
 import requests
-
 from airbyte_cdk.sources.declarative.decoders import Decoder, JsonDecoder
 from airbyte_cdk.sources.declarative.extractors.record_extractor import RecordExtractor
 from airbyte_cdk.sources.declarative.interpolation.interpolated_string import InterpolatedString

airbyte_cdk/sources/declarative/extractors/http_selector.py

@@ -6,7 +6,6 @@ from abc import abstractmethod
 from typing import Any, Iterable, Mapping, Optional
 
 import requests
-
 from airbyte_cdk.sources.types import Record, StreamSlice, StreamState
 
 

airbyte_cdk/sources/declarative/extractors/record_filter.py

@@ -1,6 +1,7 @@
 #
 # Copyright (c) 2023 Airbyte, Inc., all rights reserved.
 #
+import datetime
 from dataclasses import InitVar, dataclass
 from typing import Any, Iterable, Mapping, Optional, Union
 
@@ -10,7 +11,7 @@ from airbyte_cdk.sources.declarative.incremental import (
     PerPartitionWithGlobalCursor,
 )
 from airbyte_cdk.sources.declarative.interpolation.interpolated_boolean import InterpolatedBoolean
-from airbyte_cdk.sources.types import Config, Record, StreamSlice, StreamState
+from airbyte_cdk.sources.types import Config, StreamSlice, StreamState
 
 
 @dataclass
@@ -67,6 +68,20 @@ class ClientSideIncrementalRecordFilterDecorator(RecordFilter):
         self._date_time_based_cursor = date_time_based_cursor
         self._substream_cursor = substream_cursor
 
+    @property
+    def _cursor_field(self) -> str:
+        return self._date_time_based_cursor.cursor_field.eval(self._date_time_based_cursor.config)  # type: ignore # eval returns a string in this context
+
+    @property
+    def _start_date_from_config(self) -> datetime.datetime:
+        return self._date_time_based_cursor._start_datetime.get_datetime(
+            self._date_time_based_cursor.config
+        )
+
+    @property
+    def _end_datetime(self) -> datetime.datetime:
+        return self._date_time_based_cursor.select_best_end_datetime()
+
     def filter_records(
         self,
         records: Iterable[Mapping[str, Any]],
@@ -74,14 +89,16 @@ class ClientSideIncrementalRecordFilterDecorator(RecordFilter):
         stream_slice: Optional[StreamSlice] = None,
         next_page_token: Optional[Mapping[str, Any]] = None,
     ) -> Iterable[Mapping[str, Any]]:
+        state_value = self._get_state_value(
+            stream_state, stream_slice or StreamSlice(partition={}, cursor_slice={})
+        )
+        filter_date: datetime.datetime = self._get_filter_date(state_value)
         records = (
             record
             for record in records
-            if (self._substream_cursor or self._date_time_based_cursor).should_be_synced(
-                # Record is created on the fly to align with cursors interface; stream name is ignored as we don't need it here
-                # Record stream name is empty cause it is not used durig the filtering
-                Record(data=record, associated_slice=stream_slice, stream_name="")
-            )
+            if self._end_datetime
+            >= self._date_time_based_cursor.parse_date(record[self._cursor_field])
+            >= filter_date
         )
         if self.condition:
             records = super().filter_records(
@@ -91,3 +108,28 @@ class ClientSideIncrementalRecordFilterDecorator(RecordFilter):
                 next_page_token=next_page_token,
             )
         yield from records
+
+    def _get_state_value(
+        self, stream_state: StreamState, stream_slice: StreamSlice
+    ) -> Optional[str]:
+        """
+        Return cursor_value or None in case it was not found.
+        Cursor_value may be empty if:
+            1. It is an initial sync => no stream_state exist at all.
+            2. In Parent-child stream, and we already make initial sync, so stream_state is present.
+               During the second read, we receive one extra record from parent and therefore no stream_state for this record will be found.
+
+        :param StreamState stream_state: State
+        :param StreamSlice stream_slice: Current Stream slice
+        :return Optional[str]: cursor_value in case it was found, otherwise None.
+        """
+        state = (self._substream_cursor or self._date_time_based_cursor).select_state(stream_slice)
+
+        return state.get(self._cursor_field) if state else None
+
+    def _get_filter_date(self, state_value: Optional[str]) -> datetime.datetime:
+        start_date_parsed = self._start_date_from_config
+        if state_value:
+            return max(start_date_parsed, self._date_time_based_cursor.parse_date(state_value))
+        else:
+            return start_date_parsed