mypy fixes

Author: aaronsteers

airbyte/_connector_base.py

@@ -399,7 +399,6 @@ def _execute(
         stdin: IO[str] | AirbyteMessageIterator | None = None,
         *,
         progress_tracker: ProgressTracker | None = None,
-        env: dict[str, str] | None = None,
     ) -> Generator[AirbyteMessage, None, None]:
         """Execute the connector with the given arguments.
 

airbyte/_executors/base.py

@@ -225,7 +225,7 @@ def env_vars(self) -> dict[str, str]:
         By default, this is an empty dict. Subclasses may override this method
         to provide custom environment variables.
         """
-        result = cast(dict[str,str], os.environ.copy())
+        result = os.environ.copy()
         if self.http_cache:
             result.update(self.http_cache.get_env_vars())
 

airbyte/_executors/declarative.py

@@ -106,7 +106,7 @@ def execute(
         stdin: IO[str] | AirbyteMessageIterator | None = None,
     ) -> Iterator[str]:
         """Execute the declarative source."""
-        _ = stdin, env  # Not used
+        _ = stdin  # Not used
         source_entrypoint = AirbyteEntrypoint(self.declarative_source)
 
         mapped_args: list[str] = self.map_cli_args(args)

airbyte/_executors/docker.py

@@ -1,17 +1,19 @@
 # Copyright (c) 2023 Airbyte, Inc., all rights reserved.
 from __future__ import annotations
 
-import http
 import logging
 import shutil
 import tempfile
 from pathlib import Path
-from typing import NoReturn
+from typing import TYPE_CHECKING, NoReturn
 
 from airbyte import exceptions as exc
 from airbyte._executors.base import Executor
 from airbyte.constants import TEMP_DIR_OVERRIDE
-from airbyte.http_caching.cache import AirbyteConnectorCache
+
+
+if TYPE_CHECKING:
+    from airbyte.http_caching.cache import AirbyteConnectorCache
 
 
 logger = logging.getLogger("airbyte")

airbyte/_executors/python.py

@@ -20,6 +20,7 @@
 
 
 if TYPE_CHECKING:
+    from airbyte.http_caching.cache import AirbyteConnectorCache
     from airbyte.sources.registry import ConnectorMetadata
 
 
@@ -32,6 +33,7 @@ def __init__(
         target_version: str | None = None,
         pip_url: str | None = None,
         install_root: Path | None = None,
+        http_cache: AirbyteConnectorCache | None = None,
     ) -> None:
         """Initialize a connector executor that runs a connector in a virtual environment.
 
@@ -42,8 +44,14 @@ def __init__(
             pip_url: (Optional.) The pip URL of the connector to install.
             install_root: (Optional.) The root directory where the virtual environment will be
                 created. If not provided, the current working directory will be used.
+            http_cache: (Optional.) The HTTP cache to use for downloading the connector.
         """
-        super().__init__(name=name, metadata=metadata, target_version=target_version)
+        super().__init__(
+            name=name,
+            metadata=metadata,
+            target_version=target_version,
+            http_cache=http_cache,
+        )
 
         if not pip_url and metadata and not metadata.pypi_package_name:
             raise exc.AirbyteConnectorNotPyPiPublishedError(