finish refactor to using pydantic models

Author: dbgold17

airbyte_cdk/test/models/scenario.py

@@ -44,7 +44,7 @@ class AcceptanceTestFileTypes(BaseModel):
         skip_test: bool
         bypass_reason: str
 
-    class AcceptanceTestEmptyStreams(BaseModel):
+    class AcceptanceTestEmptyStream(BaseModel):
         name: str
         bypass_reason: str | None = None
 
@@ -54,7 +54,7 @@ class AcceptanceTestEmptyStreams(BaseModel):
     _id: str | None = None  # Used to override the default ID generation
 
     configured_catalog_path: Path | None = None
-    empty_streams: list[AcceptanceTestEmptyStreams] | list[str] | None = None
+    empty_streams: list[AcceptanceTestEmptyStream] | None = None
     timeout_seconds: int | None = None
     expect_records: AcceptanceTestExpectRecords | None = None
     file_types: AcceptanceTestFileTypes | None = None

airbyte_cdk/test/standard_tests/docker_base.py

@@ -346,7 +346,7 @@ def test_docker_image_build_and_read(
 
             if scenario.empty_streams:
                 # If there are empty streams, we remove them from the list of streams to read.
-                streams_list = list(set(streams_list) - set(scenario.empty_streams))
+                streams_list = list(set(streams_list) - set(stream.name for stream in scenario.empty_streams))
 
             configured_catalog: ConfiguredAirbyteCatalog = ConfiguredAirbyteCatalog(
                 streams=[

airbyte_cdk/test/standard_tests/source_base.py

@@ -121,9 +121,11 @@ def test_basic_read(
             # Failed as expected; we're done.
             return
         streams = discover_result.catalog.catalog.streams  # type: ignore [reportOptionalMemberAccess, union-attr]
-        if scenario.empty_streams is not None:
-            # If the scenario has an "empty_streams" key, filter out those streams.
-            streams = [stream for stream in streams if stream.name not in scenario.empty_streams]
+
+        if scenario.empty_streams:
+            # Don't read from any streams marked as empty in the scenario.
+            streams = list(set(streams) - set(stream.name for stream in scenario.empty_streams))
+
         configured_catalog = ConfiguredAirbyteCatalog(
             streams=[
                 ConfiguredAirbyteStream(