airbyte-cdk 6.48.7.dev2__py3-none-any.whl → 6.48.8__py3-none-any.whl

airbyte_cdk/cli/airbyte_cdk/_connector.py

@@ -44,11 +44,14 @@ from types import ModuleType
 
 import rich_click as click
 
-# from airbyte_cdk.test.standard_tests import pytest_hooks
-from airbyte_cdk.cli.airbyte_cdk._util import resolve_connector_name_and_directory
-from airbyte_cdk.test.standard_tests.test_resources import find_connector_root_from_name
 from airbyte_cdk.test.standard_tests.util import create_connector_test_suite
 
+# from airbyte_cdk.test.standard_tests import pytest_hooks
+from airbyte_cdk.utils.connector_paths import (
+    find_connector_root_from_name,
+    resolve_connector_name_and_directory,
+)
+
 click.rich_click.TEXT_MARKUP = "markdown"
 
 pytest: ModuleType | None
@@ -63,7 +66,7 @@ except ImportError:
 
 TEST_FILE_TEMPLATE = '''
 # Copyright (c) 2025 Airbyte, Inc., all rights reserved.
-"""FAST Airbyte Standard Tests for the source_pokeapi_w_components source."""
+"""FAST Airbyte Standard Tests for the {connector_name} source."""
 
 #from airbyte_cdk.test.standard_tests import {base_class_name}
 from airbyte_cdk.test.standard_tests.util import create_connector_test_suite
@@ -78,7 +81,7 @@ TestSuite = create_connector_test_suite(
 )
 
 # class TestSuite({base_class_name}):
-#     """Test suite for the source_pokeapi_w_components source.
+#     """Test suite for the {connector_name} source.
 
 #     This class inherits from SourceTestSuiteBase and implements all of the tests in the suite.
 
@@ -98,15 +101,11 @@ def connector_cli_group() -> None:
 
 
 @connector_cli_group.command()
-@click.option(
-    "--connector-name",
+@click.argument(
+    "connector",
+    required=False,
     type=str,
-    help="Name of the connector to test. Ignored if --connector-directory is provided.",
-)
-@click.option(
-    "--connector-directory",
-    type=click.Path(exists=True, file_okay=False, path_type=Path),
-    help="Path to the connector directory.",
+    metavar="[CONNECTOR]",
 )
 @click.option(
     "--collect-only",
@@ -115,8 +114,7 @@ def connector_cli_group() -> None:
     help="Only collect tests, do not run them.",
 )
 def test(
-    connector_name: str | None = None,
-    connector_directory: Path | None = None,
+    connector: str | Path | None = None,
     *,
     collect_only: bool = False,
 ) -> None:
@@ -124,6 +122,9 @@ def test(
 
     This command runs the standard connector tests for a specific connector.
 
+    [CONNECTOR] can be a connector name (e.g. 'source-pokeapi'), a path to a connector directory, or omitted to use the current working directory.
+    If a string containing '/' is provided, it is treated as a path. Otherwise, it is treated as a connector name.
+
     If no connector name or directory is provided, we will look within the current working
     directory. If the current working directory is not a connector directory (e.g. starting
     with 'source-') and no connector name or path is provided, the process will fail.
@@ -133,10 +134,7 @@ def test(
             "pytest is not installed. Please install pytest to run the connector tests."
         )
     click.echo("Connector test command executed.")
-    connector_name, connector_directory = resolve_connector_name_and_directory(
-        connector_name=connector_name,
-        connector_directory=connector_directory,
-    )
+    connector_name, connector_directory = resolve_connector_name_and_directory(connector)
 
     connector_test_suite = create_connector_test_suite(
         connector_name=connector_name if not connector_directory else None,
@@ -152,7 +150,7 @@ def test(
 
     file_text = TEST_FILE_TEMPLATE.format(
         base_class_name=connector_test_suite.__bases__[0].__name__,
-        connector_directory=str(connector_directory),
+        connector_name=connector_name,
     )
     test_file_path = Path() / ".tmp" / "integration_tests/test_airbyte_standards.py"
     test_file_path = test_file_path.resolve().absolute()

airbyte_cdk/cli/airbyte_cdk/_image.py

@@ -10,8 +10,8 @@ from pathlib import Path
 
 import rich_click as click
 
-from airbyte_cdk.cli.airbyte_cdk._util import resolve_connector_name_and_directory
 from airbyte_cdk.models.connector_metadata import MetadataFile
+from airbyte_cdk.utils.connector_paths import resolve_connector_name_and_directory
 from airbyte_cdk.utils.docker import (
     ConnectorImageBuildError,
     build_connector_image,
@@ -28,30 +28,30 @@ def image_cli_group() -> None:
 
 
 @image_cli_group.command()
-@click.option(
-    "--connector-name",
+@click.argument(
+    "connector",
+    required=False,
     type=str,
-    help="Name of the connector to test. Ignored if --connector-directory is provided.",
-)
-@click.option(
-    "--connector-directory",
-    type=click.Path(exists=True, file_okay=False, path_type=Path),
-    help="Path to the connector directory.",
+    metavar="[CONNECTOR]",
 )
 @click.option("--tag", default="dev", help="Tag to apply to the built image (default: dev)")
 @click.option("--no-verify", is_flag=True, help="Skip verification of the built image")
+@click.option(
+    "--dockerfile",
+    type=click.Path(exists=True, file_okay=True, path_type=Path),
+    help="Optional. Override the Dockerfile used for building the image.",
+)
 def build(
-    connector_name: str | None = None,
-    connector_directory: Path | None = None,
+    connector: str | None = None,
     *,
     tag: str = "dev",
     no_verify: bool = False,
+    dockerfile: Path | None = None,
 ) -> None:
     """Build a connector Docker image.
 
-    This command builds a Docker image for a connector, using either
-    the connector's Dockerfile or a base image specified in the metadata.
-    The image is built for both AMD64 and ARM64 architectures.
+    [CONNECTOR] can be a connector name (e.g. 'source-pokeapi'), a path to a connector directory, or omitted to use the current working directory.
+    If a string containing '/' is provided, it is treated as a path. Otherwise, it is treated as a connector name.
     """
     if not verify_docker_installation():
         click.echo(
@@ -59,10 +59,7 @@ def build(
         )
         sys.exit(1)
 
-    connector_name, connector_directory = resolve_connector_name_and_directory(
-        connector_name=connector_name,
-        connector_directory=connector_directory,
-    )
+    connector_name, connector_directory = resolve_connector_name_and_directory(connector)
 
     metadata_file_path: Path = connector_directory / "metadata.yaml"
     try:
@@ -81,6 +78,7 @@ def build(
             metadata=metadata,
             tag=tag,
             no_verify=no_verify,
+            dockerfile_override=dockerfile or None,
         )
     except ConnectorImageBuildError as e:
         click.echo(

airbyte_cdk/cli/airbyte_cdk/_secrets.py

@@ -43,7 +43,7 @@ from click import style
 from rich.console import Console
 from rich.table import Table
 
-from airbyte_cdk.cli.airbyte_cdk._util import (
+from airbyte_cdk.utils.connector_paths import (
     resolve_connector_name,
     resolve_connector_name_and_directory,
 )
@@ -73,15 +73,11 @@ def secrets_cli_group() -> None:
 
 
 @secrets_cli_group.command()
-@click.option(
-    "--connector-name",
+@click.argument(
+    "connector",
+    required=False,
     type=str,
-    help="Name of the connector to fetch secrets for. Ignored if --connector-directory is provided.",
-)
-@click.option(
-    "--connector-directory",
-    type=click.Path(exists=True, file_okay=False, path_type=Path),
-    help="Path to the connector directory.",
+    metavar="[CONNECTOR]",
 )
 @click.option(
     "--gcp-project-id",
@@ -97,8 +93,7 @@ def secrets_cli_group() -> None:
     default=False,
 )
 def fetch(
-    connector_name: str | None = None,
-    connector_directory: Path | None = None,
+    connector: str | Path | None = None,
     gcp_project_id: str = AIRBYTE_INTERNAL_GCP_PROJECT,
     print_ci_secrets_masks: bool = False,
 ) -> None:
@@ -107,6 +102,9 @@ def fetch(
     This command fetches secrets for a connector from Google Secret Manager and writes them
     to the connector's secrets directory.
 
+    [CONNECTOR] can be a connector name (e.g. 'source-pokeapi'), a path to a connector directory, or omitted to use the current working directory.
+    If a string containing '/' is provided, it is treated as a path. Otherwise, it is treated as a connector name.
+
     If no connector name or directory is provided, we will look within the current working
     directory. If the current working directory is not a connector directory (e.g. starting
     with 'source-') and no connector name or path is provided, the process will fail.
@@ -114,17 +112,14 @@ def fetch(
     The `--print-ci-secrets-masks` option will print the GitHub CI mask for the secrets.
     This is useful for masking secrets in CI logs.
 
-    WARNING: This action causes the secrets to be printed in clear text to `STDOUT`. For security
-    reasons, this function will only execute if the `CI` environment variable is set. Otherwise,
-    masks will not be printed.
+    WARNING: The `--print-ci-secrets-masks` option causes the secrets to be printed in clear text to
+    `STDOUT`. For security reasons, this argument will be ignored if the `CI` environment
+    variable is not set.
     """
     click.echo("Fetching secrets...", err=True)
 
     client = _get_gsm_secrets_client()
-    connector_name, connector_directory = resolve_connector_name_and_directory(
-        connector_name=connector_name,
-        connector_directory=connector_directory,
-    )
+    connector_name, connector_directory = resolve_connector_name_and_directory(connector)
     secrets_dir = _get_secrets_dir(
         connector_directory=connector_directory,
         connector_name=connector_name,
@@ -289,21 +284,7 @@ def _get_secrets_dir(
     connector_name: str,
     ensure_exists: bool = True,
 ) -> Path:
-    try:
-        connector_name, connector_directory = resolve_connector_name_and_directory(
-            connector_name=connector_name,
-            connector_directory=connector_directory,
-        )
-    except FileNotFoundError as e:
-        raise FileNotFoundError(
-            f"Could not find connector directory for '{connector_name}'. "
-            "Please provide the --connector-directory option with the path to the connector. "
-            "Note: This command requires either running from within a connector directory, "
-            "being in the airbyte monorepo, or explicitly providing the connector directory path."
-        ) from e
-    except ValueError as e:
-        raise ValueError(str(e))
-
+    _ = connector_name  # Unused, but it may be used in the future for logging
     secrets_dir = connector_directory / "secrets"
     if ensure_exists:
         secrets_dir.mkdir(parents=True, exist_ok=True)

airbyte_cdk/destinations/destination.py

@@ -10,18 +10,15 @@ from abc import ABC, abstractmethod
 from typing import Any, Iterable, List, Mapping
 
 import orjson
-from airbyte_protocol_dataclasses.models import (
-    AirbyteMessage,
-    ConfiguredAirbyteCatalog,
-    DestinationCatalog,
-    Type,
-)
 
 from airbyte_cdk.connector import Connector
 from airbyte_cdk.exception_handler import init_uncaught_exception_handler
 from airbyte_cdk.models import (
+    AirbyteMessage,
     AirbyteMessageSerializer,
+    ConfiguredAirbyteCatalog,
     ConfiguredAirbyteCatalogSerializer,
+    Type,
 )
 from airbyte_cdk.sources.utils.schema_helpers import check_config_against_spec_or_exit
 from airbyte_cdk.utils.traced_exception import AirbyteTracedException
@@ -29,74 +26,8 @@ from airbyte_cdk.utils.traced_exception import AirbyteTracedException
 logger = logging.getLogger("airbyte")
 
 
-def parse_args(args: List[str]) -> argparse.Namespace:
-    """
-    :param args: commandline arguments
-    :return:
-    """
-
-    parent_parser = argparse.ArgumentParser(add_help=False)
-    parent_parser.add_argument(
-        "--debug", action="store_true", help="enables detailed debug logs related to the sync"
-    )
-    main_parser = argparse.ArgumentParser()
-    subparsers = main_parser.add_subparsers(title="commands", dest="command")
-
-    # spec
-    subparsers.add_parser(
-        "spec", help="outputs the json configuration specification", parents=[parent_parser]
-    )
-
-    # check
-    check_parser = subparsers.add_parser(
-        "check", help="checks the config can be used to connect", parents=[parent_parser]
-    )
-    required_check_parser = check_parser.add_argument_group("required named arguments")
-    required_check_parser.add_argument(
-        "--config", type=str, required=True, help="path to the json configuration file"
-    )
-
-    # discover
-    discover_parser = subparsers.add_parser(
-        "discover",
-        help="discover the objects available in the destination",
-        parents=[parent_parser],
-    )
-    required_discover_parser = discover_parser.add_argument_group("required named arguments")
-    required_discover_parser.add_argument(
-        "--config", type=str, required=True, help="path to the json configuration file"
-    )
-
-    # write
-    write_parser = subparsers.add_parser(
-        "write", help="Writes data to the destination", parents=[parent_parser]
-    )
-    write_required = write_parser.add_argument_group("required named arguments")
-    write_required.add_argument(
-        "--config", type=str, required=True, help="path to the JSON configuration file"
-    )
-    write_required.add_argument(
-        "--catalog", type=str, required=True, help="path to the configured catalog JSON file"
-    )
-
-    parsed_args = main_parser.parse_args(args)
-    cmd = parsed_args.command
-    if not cmd:
-        raise Exception("No command entered. ")
-    elif cmd not in ["spec", "check", "discover", "write"]:
-        # This is technically dead code since parse_args() would fail if this was the case
-        # But it's non-obvious enough to warrant placing it here anyways
-        raise Exception(f"Unknown command entered: {cmd}")
-
-    return parsed_args
-
-
 class Destination(Connector, ABC):
-    VALID_CMDS = {"spec", "check", "discover", "write"}
-
-    def discover(self) -> DestinationCatalog:
-        """Implement to define what objects are available in the destination"""
-        raise NotImplementedError("Discover method is not implemented")
+    VALID_CMDS = {"spec", "check", "write"}
 
     @abstractmethod
     def write(
@@ -137,9 +68,52 @@ class Destination(Connector, ABC):
         )
         logger.info("Writing complete.")
 
-    @staticmethod
-    def parse_args(args: List[str]) -> argparse.Namespace:
-        return parse_args(args)
+    def parse_args(self, args: List[str]) -> argparse.Namespace:
+        """
+        :param args: commandline arguments
+        :return:
+        """
+
+        parent_parser = argparse.ArgumentParser(add_help=False)
+        main_parser = argparse.ArgumentParser()
+        subparsers = main_parser.add_subparsers(title="commands", dest="command")
+
+        # spec
+        subparsers.add_parser(
+            "spec", help="outputs the json configuration specification", parents=[parent_parser]
+        )
+
+        # check
+        check_parser = subparsers.add_parser(
+            "check", help="checks the config can be used to connect", parents=[parent_parser]
+        )
+        required_check_parser = check_parser.add_argument_group("required named arguments")
+        required_check_parser.add_argument(
+            "--config", type=str, required=True, help="path to the json configuration file"
+        )
+
+        # write
+        write_parser = subparsers.add_parser(
+            "write", help="Writes data to the destination", parents=[parent_parser]
+        )
+        write_required = write_parser.add_argument_group("required named arguments")
+        write_required.add_argument(
+            "--config", type=str, required=True, help="path to the JSON configuration file"
+        )
+        write_required.add_argument(
+            "--catalog", type=str, required=True, help="path to the configured catalog JSON file"
+        )
+
+        parsed_args = main_parser.parse_args(args)
+        cmd = parsed_args.command
+        if not cmd:
+            raise Exception("No command entered. ")
+        elif cmd not in ["spec", "check", "write"]:
+            # This is technically dead code since parse_args() would fail if this was the case
+            # But it's non-obvious enough to warrant placing it here anyways
+            raise Exception(f"Unknown command entered: {cmd}")
+
+        return parsed_args
 
     def run_cmd(self, parsed_args: argparse.Namespace) -> Iterable[AirbyteMessage]:
         cmd = parsed_args.command
@@ -163,8 +137,6 @@ class Destination(Connector, ABC):
 
         if cmd == "check":
             yield self._run_check(config=config)
-        elif cmd == "discover":
-            yield AirbyteMessage(type=Type.DESTINATION_CATALOG, destination_catalog=self.discover())
         elif cmd == "write":
             # Wrap in UTF-8 to override any other input encodings
             wrapped_stdin = io.TextIOWrapper(sys.stdin.buffer, encoding="utf-8")

airbyte_cdk/models/__init__.py

@@ -35,10 +35,6 @@ from .airbyte_protocol import (
     ConfiguredAirbyteCatalog,
     ConfiguredAirbyteStream,
     ConnectorSpecification,
-    DestinationCatalog,
-    DestinationObject,
-    DestinationObjectProperty,
-    DestinationOperation,
     DestinationSyncMode,
     EstimateType,
     FailureType,

airbyte_cdk/models/airbyte_protocol_serializers.py

@@ -1,7 +1,9 @@
 # Copyright (c) 2024 Airbyte, Inc., all rights reserved.
 from typing import Any, Dict
 
-from airbyte_protocol_dataclasses.models import (  # type: ignore[attr-defined] # all classes are imported to airbyte_protocol via *
+from serpyco_rs import CustomType, Serializer
+
+from .airbyte_protocol import (  # type: ignore[attr-defined] # all classes are imported to airbyte_protocol via *
     AirbyteMessage,
     AirbyteStateBlob,
     AirbyteStateMessage,
@@ -10,7 +12,6 @@ from airbyte_protocol_dataclasses.models import (  # type: ignore[attr-defined]
     ConfiguredAirbyteStream,
     ConnectorSpecification,
 )
-from serpyco_rs import CustomType, Serializer
 
 
 class AirbyteStateBlobType(CustomType[AirbyteStateBlob, Dict[str, Any]]):

airbyte_cdk/sources/declarative/models/base_model_with_deprecations.py

@@ -4,6 +4,10 @@
 # WHEN DEPRECATED FIELDS ARE ACCESSED
 
 import warnings
+
+# ignore the SyntaxWarning in the Airbyte log messages, during the string evaluation
+warnings.filterwarnings("ignore", category=SyntaxWarning)
+
 from typing import Any, List
 
 from pydantic.v1 import BaseModel
@@ -12,9 +16,10 @@ from airbyte_cdk.connector_builder.models import LogMessage as ConnectorBuilderL
 
 # format the warning message
 warnings.formatwarning = (
-    lambda message, category, *args, **kwargs: f"{category.__name__}: {message}"
+    lambda message, category, *args, **kwargs: f"{category.__name__}: {message}\n"
 )
 
+
 FIELDS_TAG = "__fields__"
 DEPRECATED = "deprecated"
 DEPRECATION_MESSAGE = "deprecation_message"

airbyte_cdk/sources/declarative/schema/dynamic_schema_loader.py

@@ -1,10 +1,11 @@
 #
 # Copyright (c) 2024 Airbyte, Inc., all rights reserved.
 #
-from abc import ABC, abstractmethod
+
+
 from copy import deepcopy
 from dataclasses import InitVar, dataclass, field
-from typing import Any, Dict, List, Mapping, MutableMapping, Optional, Union
+from typing import Any, List, Mapping, MutableMapping, Optional, Union
 
 import dpath
 from typing_extensions import deprecated
@@ -15,7 +16,7 @@ from airbyte_cdk.sources.declarative.retrievers.retriever import Retriever
 from airbyte_cdk.sources.declarative.schema.schema_loader import SchemaLoader
 from airbyte_cdk.sources.declarative.transformations import RecordTransformation
 from airbyte_cdk.sources.source import ExperimentalClassWarning
-from airbyte_cdk.sources.types import Config
+from airbyte_cdk.sources.types import Config, StreamSlice, StreamState
 
 AIRBYTE_DATA_TYPES: Mapping[str, MutableMapping[str, Any]] = {
     "string": {"type": ["null", "string"]},
@@ -113,38 +114,6 @@ class SchemaTypeIdentifier:
         )
 
 
-@deprecated("This class is experimental. Use at your own risk.", category=ExperimentalClassWarning)
-class AdditionalPropertyFieldsInferrer(ABC):
-    """
-    Infers additional fields to be added to each property. For example, if this inferrer returns {"toto": "tata"}, a property that would have looked like this:
-    ```
-        "properties": {
-            "Id": {
-                "type": ["null", "string"],
-            },
-            <...>
-        }
-    ```
-    ... will look like this:
-        ```
-        "properties": {
-            "Id": {
-                "type": ["null", "string"],
-                "toto": "tata"
-            },
-            <...>
-        }
-    ```
-    """
-
-    @abstractmethod
-    def infer(self, property_definition: MutableMapping[str, Any]) -> MutableMapping[str, Any]:
-        """
-        Infers additional property fields from the given property definition.
-        """
-        pass
-
-
 @deprecated("This class is experimental. Use at your own risk.", category=ExperimentalClassWarning)
 @dataclass
 class DynamicSchemaLoader(SchemaLoader):
@@ -157,8 +126,6 @@ class DynamicSchemaLoader(SchemaLoader):
     parameters: InitVar[Mapping[str, Any]]
     schema_type_identifier: SchemaTypeIdentifier
     schema_transformations: List[RecordTransformation] = field(default_factory=lambda: [])
-    additional_property_fields_inferrer: Optional[AdditionalPropertyFieldsInferrer] = None
-    allow_additional_properties: bool = True
 
     def get_json_schema(self) -> Mapping[str, Any]:
         """
@@ -182,26 +149,22 @@ class DynamicSchemaLoader(SchemaLoader):
                 property_definition,
                 self.schema_type_identifier.type_pointer,
             )
-
-            value.update(
-                self.additional_property_fields_inferrer.infer(property_definition)
-                if self.additional_property_fields_inferrer
-                else {}
-            )
             properties[key] = value
 
-        transformed_properties = self._transform(properties)
+        transformed_properties = self._transform(properties, {})
 
         return {
             "$schema": "https://json-schema.org/draft-07/schema#",
             "type": "object",
-            "additionalProperties": self.allow_additional_properties,
+            "additionalProperties": True,
             "properties": transformed_properties,
         }
 
     def _transform(
         self,
         properties: Mapping[str, Any],
+        stream_state: StreamState,
+        stream_slice: Optional[StreamSlice] = None,
     ) -> Mapping[str, Any]:
         for transformation in self.schema_transformations:
             transformation.transform(
@@ -227,7 +190,7 @@ class DynamicSchemaLoader(SchemaLoader):
         self,
         raw_schema: MutableMapping[str, Any],
         field_type_path: Optional[List[Union[InterpolatedString, str]]],
-    ) -> Dict[str, Any]:
+    ) -> Union[Mapping[str, Any], List[Mapping[str, Any]]]:
         """
         Determines the JSON Schema type for a field, supporting nullable and combined types.
         """
@@ -257,7 +220,7 @@ class DynamicSchemaLoader(SchemaLoader):
                 f"Invalid data type. Available string or two items list of string. Got {mapped_field_type}."
             )
 
-    def _resolve_complex_type(self, complex_type: ComplexFieldType) -> Dict[str, Any]:
+    def _resolve_complex_type(self, complex_type: ComplexFieldType) -> Mapping[str, Any]:
         if not complex_type.items:
             return self._get_airbyte_type(complex_type.field_type)
 
@@ -292,14 +255,14 @@ class DynamicSchemaLoader(SchemaLoader):
         return field_type
 
     @staticmethod
-    def _get_airbyte_type(field_type: str) -> Dict[str, Any]:
+    def _get_airbyte_type(field_type: str) -> MutableMapping[str, Any]:
         """
         Maps a field type to its corresponding Airbyte type definition.
         """
         if field_type not in AIRBYTE_DATA_TYPES:
             raise ValueError(f"Invalid Airbyte data type: {field_type}")
 
-        return deepcopy(AIRBYTE_DATA_TYPES[field_type])  # type: ignore  # a copy of a dict should be a dict, not a MutableMapping
+        return deepcopy(AIRBYTE_DATA_TYPES[field_type])
 
     def _extract_data(
         self,

airbyte_cdk/test/catalog_builder.py

@@ -2,8 +2,6 @@
 
 from typing import Any, Dict, List, Union, overload
 
-from airbyte_protocol_dataclasses.models import DestinationSyncMode
-
 from airbyte_cdk.models import (
     ConfiguredAirbyteCatalog,
     ConfiguredAirbyteStream,
@@ -34,12 +32,6 @@ class ConfiguredAirbyteStreamBuilder:
         self._stream["sync_mode"] = sync_mode.name
         return self
 
-    def with_destination_sync_mode(
-        self, sync_mode: DestinationSyncMode
-    ) -> "ConfiguredAirbyteStreamBuilder":
-        self._stream["destination_sync_mode"] = sync_mode.name
-        return self
-
     def with_primary_key(self, pk: List[List[str]]) -> "ConfiguredAirbyteStreamBuilder":
         self._stream["primary_key"] = pk
         self._stream["stream"]["source_defined_primary_key"] = pk  # type: ignore  # we assume that self._stream["stream"] is a Dict[str, Any]
@@ -66,7 +58,7 @@ class CatalogBuilder:
     def with_stream(
         self,
         name: Union[str, ConfiguredAirbyteStreamBuilder],
-        sync_mode: SyncMode = SyncMode.full_refresh,
+        sync_mode: Union[SyncMode, None] = None,
     ) -> "CatalogBuilder":
         # As we are introducing a fully fledge ConfiguredAirbyteStreamBuilder, we would like to deprecate the previous interface
         # with_stream(str, SyncMode)

airbyte_cdk/test/entrypoint_wrapper.py

@@ -82,6 +82,10 @@ class EntrypointOutput:
     def state_messages(self) -> List[AirbyteMessage]:
         return self._get_message_by_types([Type.STATE])
 
+    @property
+    def spec_messages(self) -> List[AirbyteMessage]:
+        return self._get_message_by_types([Type.SPEC])
+
     @property
     def connection_status_messages(self) -> List[AirbyteMessage]:
         return self._get_message_by_types([Type.CONNECTION_STATUS])

airbyte_cdk/test/mock_http/request.py

@@ -72,11 +72,7 @@ class HttpRequest:
         elif isinstance(body, bytes):
             return json.loads(body.decode())  # type: ignore  # assumes return type of Mapping[str, Any]
         elif isinstance(body, str):
-            try:
-                return json.loads(body)  # type: ignore  # assumes return type of Mapping[str, Any]
-            except json.JSONDecodeError:
-                # one of the body is a mapping while the other isn't so comparison should fail anyway
-                return None
+            return json.loads(body)  # type: ignore  # assumes return type of Mapping[str, Any]
         return None
 
     @staticmethod