cleaning out annoying usages importing dependencies from airbyte_cdk without a path

Author: brianjlai

airbyte_cdk/sources/declarative/concurrent_declarative_source.py

@@ -81,8 +81,7 @@
 from airbyte_cdk.sources.declarative.spec.spec import Spec
 from airbyte_cdk.sources.declarative.types import Config, ConnectionDefinition
 from airbyte_cdk.sources.message.concurrent_repository import ConcurrentMessageRepository
-from airbyte_cdk.sources.message.repository import InMemoryMessageRepository, MessageRepository
-from airbyte_cdk.sources.streams import Stream
+from airbyte_cdk.sources.message.repository import InMemoryMessageRepository
 from airbyte_cdk.sources.streams.concurrent.abstract_stream import AbstractStream
 from airbyte_cdk.sources.streams.concurrent.partitions.types import QueueItem
 from airbyte_cdk.sources.utils.slice_logger import (
@@ -386,7 +385,7 @@ def discover(self, logger: logging.Logger, config: Mapping[str, Any]) -> Airbyte
         )
 
     # todo: add PR comment about whether we can change the signature to List[AbstractStream]
-    def streams(self, config: Mapping[str, Any]) -> List[Union[Stream, AbstractStream]]:  # type: ignore  # we are migrating away from the AbstractSource and are expecting that this will only be called by ConcurrentDeclarativeSource or the Connector Builder
+    def streams(self, config: Mapping[str, Any]) -> List[AbstractStream]:  # type: ignore  # we are migrating away from the AbstractSource and are expecting that this will only be called by ConcurrentDeclarativeSource or the Connector Builder
         """
         The `streams` method is used as part of the AbstractSource in the following cases:
         * ConcurrentDeclarativeSource.check -> ManifestDeclarativeSource.check -> AbstractSource.check -> DeclarativeSource.check_connection -> CheckStream.check_connection -> streams

airbyte_cdk/sources/declarative/parsers/model_to_component_factory.py

@@ -1972,7 +1972,7 @@ def create_datetime_based_cursor(
 
     def create_default_stream(
         self, model: DeclarativeStreamModel, config: Config, is_parent: bool = False, **kwargs: Any
-    ) -> Union[DeclarativeStream, AbstractStream]:
+    ) -> AbstractStream:
         primary_key = model.primary_key.__root__ if model.primary_key else None
 
         partition_router = self._build_stream_slicer_from_partition_router(

airbyte_cdk/sources/declarative/requesters/http_job_repository.py

@@ -1,4 +1,5 @@
-# Copyright (c) 2024 Airbyte, Inc., all rights reserved.
+# Copyright (c) 2025 Airbyte, Inc., all rights reserved.
+
 import logging
 import uuid
 from dataclasses import dataclass, field
@@ -8,9 +9,8 @@
 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
+from airbyte_cdk.models import AirbyteMessage, FailureType, Type
 from airbyte_cdk.sources.declarative.async_job.job import AsyncJob
 from airbyte_cdk.sources.declarative.async_job.repository import AsyncJobRepository
 from airbyte_cdk.sources.declarative.async_job.status import AsyncJobStatus

airbyte_cdk/sources/declarative/transformations/keys_replace_transformation.py

@@ -5,7 +5,7 @@
 from dataclasses import InitVar, dataclass
 from typing import Any, Dict, Mapping, Optional
 
-from airbyte_cdk import InterpolatedString
+from airbyte_cdk.sources.declarative.interpolation import InterpolatedString
 from airbyte_cdk.sources.declarative.transformations import RecordTransformation
 from airbyte_cdk.sources.types import Config, StreamSlice, StreamState
 

unit_tests/sources/declarative/async_job/test_integration.py

@@ -5,28 +5,26 @@
 from typing import Any, Iterable, List, Mapping, Optional, Set, Tuple
 from unittest import TestCase, mock
 
-from airbyte_cdk import (
-    AbstractSource,
-    DeclarativeStream,
-    SinglePartitionRouter,
-    Stream,
-    StreamSlice,
-)
+from airbyte_cdk.legacy.sources.declarative.declarative_stream import DeclarativeStream
 from airbyte_cdk.models import ConnectorSpecification
+from airbyte_cdk.sources import AbstractSource
 from airbyte_cdk.sources.declarative.async_job.job import AsyncJob
 from airbyte_cdk.sources.declarative.async_job.job_orchestrator import AsyncJobOrchestrator
 from airbyte_cdk.sources.declarative.async_job.job_tracker import JobTracker
 from airbyte_cdk.sources.declarative.async_job.repository import AsyncJobRepository
 from airbyte_cdk.sources.declarative.async_job.status import AsyncJobStatus
 from airbyte_cdk.sources.declarative.extractors.record_extractor import RecordExtractor
 from airbyte_cdk.sources.declarative.extractors.record_selector import RecordSelector
+from airbyte_cdk.sources.declarative.partition_routers import SinglePartitionRouter
 from airbyte_cdk.sources.declarative.partition_routers.async_job_partition_router import (
     AsyncJobPartitionRouter,
 )
 from airbyte_cdk.sources.declarative.retrievers.async_retriever import AsyncRetriever
 from airbyte_cdk.sources.declarative.schema import InlineSchemaLoader
 from airbyte_cdk.sources.declarative.stream_slicers import StreamSlicer
 from airbyte_cdk.sources.message import NoopMessageRepository
+from airbyte_cdk.sources.streams import Stream
+from airbyte_cdk.sources.types import StreamSlice
 from airbyte_cdk.sources.utils.transform import TransformConfig, TypeTransformer
 from airbyte_cdk.test.catalog_builder import CatalogBuilder, ConfiguredAirbyteStreamBuilder
 from airbyte_cdk.test.entrypoint_wrapper import read

unit_tests/sources/declarative/async_job/test_job_orchestrator.py

@@ -10,7 +10,6 @@
 
 import pytest
 
-from airbyte_cdk import AirbyteTracedException, StreamSlice
 from airbyte_cdk.models import FailureType
 from airbyte_cdk.sources.declarative.async_job.job import AsyncJob, AsyncJobStatus
 from airbyte_cdk.sources.declarative.async_job.job_orchestrator import (
@@ -21,6 +20,8 @@
 from airbyte_cdk.sources.declarative.async_job.repository import AsyncJobRepository
 from airbyte_cdk.sources.message import MessageRepository
 from airbyte_cdk.sources.streams.http.http_client import MessageRepresentationAirbyteTracedErrors
+from airbyte_cdk.sources.types import StreamSlice
+from airbyte_cdk.utils import AirbyteTracedException
 
 _ANY_STREAM_SLICE = Mock()
 _A_STREAM_SLICE = Mock()

unit_tests/sources/declarative/decoders/test_decoders_memory_usage.py

@@ -8,12 +8,12 @@
 import pytest
 import requests
 
-from airbyte_cdk import YamlDeclarativeSource
 from airbyte_cdk.models import SyncMode
 from airbyte_cdk.sources.declarative.models import DeclarativeStream as DeclarativeStreamModel
 from airbyte_cdk.sources.declarative.parsers.model_to_component_factory import (
     ModelToComponentFactory,
 )
+from airbyte_cdk.sources.declarative.yaml_declarative_source import YamlDeclarativeSource
 
 
 @pytest.mark.slow

unit_tests/sources/declarative/extractors/test_dpath_extractor.py

@@ -8,8 +8,7 @@
 import pytest
 import requests
 
-from airbyte_cdk import Decoder
-from airbyte_cdk.sources.declarative.decoders import CompositeRawDecoder
+from airbyte_cdk.sources.declarative.decoders import CompositeRawDecoder, Decoder
 from airbyte_cdk.sources.declarative.decoders.composite_raw_decoder import JsonLineParser
 from airbyte_cdk.sources.declarative.decoders.json_decoder import (
     IterableDecoder,

unit_tests/sources/declarative/interpolation/test_jinja.py

@@ -8,8 +8,8 @@
 from freezegun import freeze_time
 from jinja2.exceptions import TemplateSyntaxError
 
-from airbyte_cdk import StreamSlice
 from airbyte_cdk.sources.declarative.interpolation.jinja import JinjaInterpolation
+from airbyte_cdk.sources.types import StreamSlice
 from airbyte_cdk.utils import AirbyteTracedException
 
 interpolation = JinjaInterpolation()

unit_tests/sources/declarative/parsers/test_model_to_component_factory.py

@@ -14,7 +14,6 @@
 from freezegun.api import FakeDatetime
 from pydantic.v1 import ValidationError
 
-from airbyte_cdk import AirbyteTracedException
 from airbyte_cdk.legacy.sources.declarative.declarative_stream import DeclarativeStream
 from airbyte_cdk.legacy.sources.declarative.incremental import DatetimeBasedCursor
 from airbyte_cdk.models import (
@@ -175,6 +174,7 @@
     SingleUseRefreshTokenOauth2Authenticator,
 )
 from airbyte_cdk.sources.types import StreamSlice
+from airbyte_cdk.utils import AirbyteTracedException
 from airbyte_cdk.utils.datetime_helpers import AirbyteDateTime, ab_datetime_now, ab_datetime_parse
 from unit_tests.sources.declarative.parsers.testing_components import (
     TestingCustomSubstreamPartitionRouter,