commit prev wip

Author: aaronsteers

airbyte_cdk/test/entrypoint_wrapper.py

@@ -159,9 +159,19 @@ def is_not_in_logs(self, pattern: str) -> bool:
 
 def _run_command(
     source: Source,
-    args: list[str],
-    expected_outcome: ExpectedOutcome,
+    args: List[str],
+    expecting_exception: bool | None = None,  # Deprecated, use `expected_outcome` instead.
+    *,
+    expected_outcome: ExpectedOutcome | None = None
 ) -> EntrypointOutput:
+    """Internal function to run a command with the AirbyteEntrypoint.
+
+    Note: Even though this function is private, some connectors do call it directly.
+
+    Note: The `expecting_exception` arg is now deprecated in favor of the tri-state
+    `expected_outcome` arg. The old argument is supported (for now) for backwards compatibility.
+    """
+    expected_outcome = expected_outcome or ExpectedOutcome.from_expecting_exception_bool(expecting_exception)
     log_capture_buffer = StringIO()
     stream_handler = logging.StreamHandler(log_capture_buffer)
     stream_handler.setLevel(logging.INFO)
@@ -194,8 +204,9 @@ def _run_command(
 def discover(
     source: Source,
     config: Mapping[str, Any],
+    expecting_exception: bool | None = None,  # Deprecated, use `expected_outcome` instead.
     *,
-    expected_outcome: ExpectedOutcome = ExpectedOutcome.EXPECT_SUCCESS,
+    expected_outcome: ExpectedOutcome | None = None,
 ) -> EntrypointOutput:
     """
     config must be json serializable
@@ -210,6 +221,7 @@ def discover(
         return _run_command(
             source,
             ["discover", "--config", config_file, "--debug"],
+            expecting_exception=expecting_exception,  # Deprecated, but still supported.
             expected_outcome=expected_outcome,
         )
 
@@ -219,8 +231,9 @@ def read(
     config: Mapping[str, Any],
     catalog: ConfiguredAirbyteCatalog,
     state: Optional[List[AirbyteStateMessage]] = None,
+    expecting_exception: bool | None = None,  # Deprecated, use `expected_outcome` instead.
     *,
-    expected_outcome: ExpectedOutcome = ExpectedOutcome.EXPECT_SUCCESS,
+    expected_outcome: ExpectedOutcome | None = None,
 ) -> EntrypointOutput:
     """
     config and state must be json serializable
@@ -253,7 +266,12 @@ def read(
                 ]
             )
 
-        return _run_command(source, args, expected_outcome=expected_outcome)
+        return _run_command(
+            source,
+            args,
+            expecting_exception=expecting_exception,  # Deprecated, but still supported.
+            expected_outcome=expected_outcome,
+        )
 
 
 def make_file(

airbyte_cdk/test/utils/reading.py

@@ -20,16 +20,17 @@ def read_records(
     stream_name: str,
     sync_mode: SyncMode,
     state: Optional[List[AirbyteStateMessage]] = None,
-    *,
     expecting_exception: bool | None = None,  # Deprecated, use expected_outcome instead.
+    *,
     expected_outcome: ExpectedOutcome | None = None,
 ) -> EntrypointOutput:
     """Read records from a stream."""
-    if expecting_exception is not None and expected_outcome is not None:
-        raise ValueError("Cannot set both expecting_exception and expected_outcome.")
-
-    if expected_outcome is None:
-        expected_outcome = ExpectedOutcome.from_expecting_exception_bool(expecting_exception)
-
     _catalog = catalog(stream_name, sync_mode)
-    return read(source, config, _catalog, state, expected_outcome=expected_outcome)
+    return read(
+        source,
+        config,
+        _catalog,
+        state,
+        expecting_exception=expecting_exception,  # Deprecated, for backward compatibility.
+        expected_outcome=expected_outcome,
+    )