fix circular import issue

Author: aaronsteers

airbyte_cdk/test/entrypoint_wrapper.py

@@ -44,7 +44,7 @@
     Type,
 )
 from airbyte_cdk.sources import Source
-from airbyte_cdk.test.standard_tests.models.scenario import ExpectedOutcome
+from airbyte_cdk.test.models.scenario import ExpectedOutcome
 
 
 class EntrypointOutput:

airbyte_cdk/test/models/__init__.py

@@ -0,0 +1,10 @@
+# Copyright (c) 2025 Airbyte, Inc., all rights reserved.
+"""Models used for standard tests."""
+
+from airbyte_cdk.test.models.outcome import ExpectedOutcome
+from airbyte_cdk.test.models.scenario import ConnectorTestScenario
+
+__all__ = [
+    "ConnectorTestScenario",
+    "ExpectedOutcome",
+]

airbyte_cdk/test/models/outcome.py

@@ -0,0 +1,45 @@
+# Copyright (c) 2024 Airbyte, Inc., all rights reserved.
+"""Run acceptance tests in PyTest.
+
+These tests leverage the same `acceptance-test-config.yml` configuration files as the
+acceptance tests in CAT, but they run in PyTest instead of CAT. This allows us to run
+the acceptance tests in the same local environment as we are developing in, speeding
+up iteration cycles.
+"""
+
+from __future__ import annotations
+
+from enum import Enum, auto
+
+
+class ExpectedOutcome(Enum):
+    """Enum to represent the expected outcome of a test scenario.
+
+    Class supports comparisons to a boolean or None.
+    """
+
+    EXPECT_EXCEPTION = auto()
+    EXPECT_SUCCESS = auto()
+    ALLOW_ANY = auto()
+
+    @classmethod
+    def from_status_str(cls, status: str | None) -> ExpectedOutcome:
+        """Convert a status string to an ExpectedOutcome."""
+        if status is None:
+            return ExpectedOutcome.ALLOW_ANY
+
+        try:
+            return {
+                "succeed": ExpectedOutcome.EXPECT_SUCCESS,
+                "failed": ExpectedOutcome.EXPECT_EXCEPTION,
+            }[status]
+        except KeyError as ex:
+            raise ValueError(f"Invalid status '{status}'. Expected 'succeed' or 'failed'.") from ex
+
+    def expect_exception(self) -> bool:
+        """Return whether the expectation is that an exception should be raised."""
+        return self == ExpectedOutcome.EXPECT_EXCEPTION
+
+    def expect_success(self) -> bool:
+        """Return whether the expectation is that the test should succeed without exceptions."""
+        return self == ExpectedOutcome.EXPECT_SUCCESS

…k/test/standard_tests/models/scenario.py airbyte_cdk/test/models/scenario.pyairbyte_cdk/test/standard_tests/models/scenario.py renamed to airbyte_cdk/test/models/scenario.py airbyte_cdk/test/standard_tests/models/scenario.py renamed to airbyte_cdk/test/models/scenario.py

@@ -9,45 +9,13 @@
 
 from __future__ import annotations
 
-from enum import Enum, auto
 from pathlib import Path  # noqa: TC003  # Pydantic needs this (don't move to 'if typing' block)
 from typing import Any, Literal, cast
 
 import yaml
 from pydantic import BaseModel, ConfigDict
 
-
-class ExpectedOutcome(Enum):
-    """Enum to represent the expected outcome of a test scenario.
-
-    Class supports comparisons to a boolean or None.
-    """
-
-    EXPECT_EXCEPTION = auto()
-    EXPECT_SUCCESS = auto()
-    ALLOW_ANY = auto()
-
-    @classmethod
-    def from_status_str(cls, status: str | None) -> ExpectedOutcome:
-        """Convert a status string to an ExpectedOutcome."""
-        if status is None:
-            return ExpectedOutcome.ALLOW_ANY
-
-        try:
-            return {
-                "succeed": ExpectedOutcome.EXPECT_SUCCESS,
-                "failed": ExpectedOutcome.EXPECT_EXCEPTION,
-            }[status]
-        except KeyError as ex:
-            raise ValueError(f"Invalid status '{status}'. Expected 'succeed' or 'failed'.") from ex
-
-    def expect_exception(self) -> bool:
-        """Return whether the expectation is that an exception should be raised."""
-        return self == ExpectedOutcome.EXPECT_EXCEPTION
-
-    def expect_success(self) -> bool:
-        """Return whether the expectation is that the test should succeed without exceptions."""
-        return self == ExpectedOutcome.EXPECT_SUCCESS
+from airbyte_cdk.test.models.outcome import ExpectedOutcome
 
 
 class ConnectorTestScenario(BaseModel):

airbyte_cdk/test/standard_tests/_job_runner.py

@@ -16,7 +16,7 @@
     Status,
 )
 from airbyte_cdk.test import entrypoint_wrapper
-from airbyte_cdk.test.standard_tests.models import (
+from airbyte_cdk.test.models import (
     ConnectorTestScenario,
 )
 

airbyte_cdk/test/standard_tests/connector_base.py

@@ -20,10 +20,10 @@
     Type,
 )
 from airbyte_cdk.test import entrypoint_wrapper
-from airbyte_cdk.test.standard_tests._job_runner import IConnector, run_test_job
-from airbyte_cdk.test.standard_tests.models import (
+from airbyte_cdk.test.models import (
     ConnectorTestScenario,
 )
+from airbyte_cdk.test.standard_tests._job_runner import IConnector, run_test_job
 from airbyte_cdk.utils.connector_paths import (
     ACCEPTANCE_TEST_CONFIG,
     find_connector_root,

airbyte_cdk/test/standard_tests/declarative_sources.py

@@ -9,8 +9,8 @@
 from airbyte_cdk.sources.declarative.concurrent_declarative_source import (
     ConcurrentDeclarativeSource,
 )
+from airbyte_cdk.test.models import ConnectorTestScenario
 from airbyte_cdk.test.standard_tests._job_runner import IConnector
-from airbyte_cdk.test.standard_tests.models import ConnectorTestScenario
 from airbyte_cdk.test.standard_tests.source_base import SourceTestSuiteBase
 from airbyte_cdk.utils.connector_paths import MANIFEST_YAML
 

airbyte_cdk/test/standard_tests/models/__init__.py

@@ -2,6 +2,7 @@
 """Base class for source test suites."""
 
 from dataclasses import asdict
+from typing import TYPE_CHECKING
 
 from airbyte_cdk.models import (
     AirbyteMessage,
@@ -12,14 +13,16 @@
     SyncMode,
     Type,
 )
-from airbyte_cdk.test import entrypoint_wrapper
+from airbyte_cdk.test.models import (
+    ConnectorTestScenario,
+)
 from airbyte_cdk.test.standard_tests._job_runner import run_test_job
 from airbyte_cdk.test.standard_tests.connector_base import (
     ConnectorTestSuiteBase,
 )
-from airbyte_cdk.test.standard_tests.models import (
-    ConnectorTestScenario,
-)
+
+if TYPE_CHECKING:
+    from airbyte_cdk.test import entrypoint_wrapper
 
 
 class SourceTestSuiteBase(ConnectorTestSuiteBase):

airbyte_cdk/test/standard_tests/source_base.py

@@ -6,7 +6,7 @@
 from airbyte_cdk.models import AirbyteStateMessage, ConfiguredAirbyteCatalog, SyncMode
 from airbyte_cdk.test.catalog_builder import CatalogBuilder
 from airbyte_cdk.test.entrypoint_wrapper import EntrypointOutput, read
-from airbyte_cdk.test.standard_tests.models.scenario import ExpectedOutcome
+from airbyte_cdk.test.models.outcome import ExpectedOutcome
 
 
 def catalog(stream_name: str, sync_mode: SyncMode) -> ConfiguredAirbyteCatalog: