lint fixes

Author: aaronsteers

airbyte_cdk/test/declarative/models/scenario.py

@@ -10,7 +10,7 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import Literal
+from typing import Any, Literal, cast
 
 import yaml
 from pydantic import BaseModel
@@ -33,7 +33,7 @@ class AcceptanceTestFileTypes(BaseModel):
         bypass_reason: str
 
     config_path: Path | None = None
-    config_dict: dict | None = None
+    config_dict: dict[str, Any] | None = None
 
     id: str | None = None
 
@@ -43,27 +43,27 @@ class AcceptanceTestFileTypes(BaseModel):
     file_types: AcceptanceTestFileTypes | None = None
     status: Literal["succeed", "failed"] | None = None
 
-    def get_config_dict(self) -> dict:
+    def get_config_dict(self) -> dict[str, Any]:
         """Return the config dictionary.
 
         If a config dictionary has already been loaded, return it. Otherwise, load
-        Otherwise, load the config file and return the dictionary.
+        the config file and return the dictionary.
         """
         if self.config_dict:
             return self.config_dict
 
         if self.config_path:
-            return yaml.safe_load(self.config_path.read_text())
+            return cast(dict[str, Any], yaml.safe_load(self.config_path.read_text()))
 
         raise ValueError("No config dictionary or path provided.")
 
     @property
     def expect_exception(self) -> bool:
-        return self.status and self.status == "failed"
+        return self.status and self.status == "failed" or False
 
     @property
     def instance_name(self) -> str:
-        return self.config_path.stem
+        return self.config_path.stem if self.config_path else "Unnamed Scenario"
 
     def __str__(self) -> str:
         if self.id:

airbyte_cdk/test/declarative/test_suites/connector_base.py

@@ -20,6 +20,11 @@
     AirbyteMessage,
     Type,
 )
+from airbyte_cdk.sources.declarative.declarative_source import (
+    AbstractSource,
+    ConcurrentDeclarativeSource,
+    Source,
+)
 from airbyte_cdk.test import entrypoint_wrapper
 from airbyte_cdk.test.declarative.models import (
     ConnectorTestScenario,
@@ -41,10 +46,10 @@ class RunnableConnector(abc.ABC):
     """A connector that can be run in a test scenario."""
 
     @abc.abstractmethod
-    def launch(cls, args: list[str] | None): ...
+    def launch(cls, args: list[str] | None) -> None: ...
 
 
-def generate_tests(metafunc):
+def generate_tests(metafunc) -> None:
     """
     A helper for pytest_generate_tests hook.
 

airbyte_cdk/test/declarative/test_suites/declarative_sources.py

@@ -26,6 +26,7 @@ class DeclarativeSourceTestSuite(SourceTestSuiteBase):
     def create_connector(
         self, connector_test: ConnectorTestScenario
     ) -> ConcurrentDeclarativeSource:
+        """Create a connector instance for the test suite."""
         config = connector_test.get_config_dict()
         # catalog = connector_test.get_catalog()
         # state = connector_test.get_state()

airbyte_cdk/test/declarative/utils/job_runner.py

@@ -1,7 +1,7 @@
 import tempfile
 import uuid
 from pathlib import Path
-from typing import Callable, Literal
+from typing import Any, Callable, Literal
 
 import orjson
 
@@ -22,7 +22,7 @@ def run_test_job(
     verb: Literal["read", "check", "discover"],
     test_instance: ConnectorTestScenario,
     *,
-    catalog: dict | None = None,
+    catalog: dict[str, Any] | None = None,
 ) -> entrypoint_wrapper.EntrypointOutput:
     """Run a test job from provided CLI args and return the result."""
     if not connector:
@@ -49,7 +49,7 @@ def run_test_job(
     else:
         raise ValueError(f"Invalid source type: {type(connector)}")
 
-    args = [verb]
+    args: list[str] = [verb]
     if test_instance.config_path:
         args += ["--config", str(test_instance.config_path)]
     elif test_instance.config_dict:
@@ -103,12 +103,12 @@ def run_test_job(
         assert len(result.connection_status_messages) == 1, (
             "Expected exactly one CONNECTION_STATUS message. Got "
             f"{len(result.connection_status_messages)}:\n"
-            + "\n".join(result.connection_status_messages)
+            + "\n".join([str(msg) for msg in result.connection_status_messages])
         )
         if test_instance.expect_exception:
             assert result.connection_status_messages[0].connectionStatus.status == Status.FAILED, (
                 "Expected CONNECTION_STATUS message to be FAILED. Got: \n"
-                + "\n".join([str(result.connection_status_messages)])
+                + "\n".join([str(msg) for msg in result.connection_status_messages])
             )
         return result
 

airbyte_cdk/test/fixtures/general.py

@@ -1,18 +1,24 @@
+"""Global pytest configuration for the Airbyte CDK tests."""
+
 from pathlib import Path
+from typing import Optional
 
 import pytest
 
 
-def pytest_collect_file(parent, path):
-    if path.basename == "test_connector.py":
-        return pytest.Module.from_parent(parent, path=path)
+def pytest_collect_file(parent: Optional[pytest.Module], path: Path) -> pytest.Module | None:
+    """Collect test files based on their names."""
+    if path.name == "test_connector.py":
+        return cast(pytest.Module, pytest.Module.from_parent(parent, path=path))
+
+    return None
 
 
-def pytest_configure(config):
+def pytest_configure(config: pytest.Config) -> None:
     config.addinivalue_line("markers", "connector: mark test as a connector test")
 
 
-def pytest_addoption(parser):
+def pytest_addoption(parser: pytest.Parser) -> None:
     parser.addoption(
         "--run-connector",
         action="store_true",
@@ -21,7 +27,7 @@ def pytest_addoption(parser):
     )
 
 
-def pytest_collection_modifyitems(config, items):
+def pytest_collection_modifyitems(config: pytest.Config, items: list[pytest.Item]) -> None:
     if config.getoption("--run-connector"):
         return
     skip_connector = pytest.mark.skip(reason="need --run-connector option to run")
@@ -30,11 +36,11 @@ def pytest_collection_modifyitems(config, items):
             item.add_marker(skip_connector)
 
 
-def pytest_runtest_setup(item):
+def pytest_runtest_setup(item: pytest.Item) -> None:
     # This hook is called before each test function is executed
     print(f"Setting up test: {item.name}")
 
 
-def pytest_runtest_teardown(item, nextitem):
+def pytest_runtest_teardown(item: pytest.Item, nextitem: Optional[pytest.Item]) -> None:
     # This hook is called after each test function is executed
     print(f"Tearing down test: {item.name}")

airbyte_cdk/test/pytest_config/plugin.py

@@ -88,7 +88,7 @@ whenever = "^0.6.16"
 freezegun = "*"
 mypy = "*"
 asyncio = "3.4.3"
-ruff = "^0.7.2"
+ruff = "^0.11.4"
 pdoc = "^15.0.0"
 poethepoet = "^0.24.2"
 pyproject-flake8 = "^6.1.0"