Fix typing issues

data_safe_haven/external/api/azure_cli.py

@@ -22,15 +22,16 @@ class AzureCliAccount:
 class AzureCli:
     """Interface to the Azure CLI"""
 
-    def __init__(self):
+    def __init__(self) -> None:
         self.logger = LoggingSingleton()
 
-        self.path = which("az")
-        if self.path is None:
+        path = which("az")
+        if path is None:
             msg = "Unable to find Azure CLI executable in your path.\nPlease ensure that Azure CLI is installed"
             raise DataSafeHavenAzureError(msg)
+        self.path = path
 
-        self._account = None
+        self._account: AzureCliAccount | None = None
 
     @property
     def account(self) -> AzureCliAccount:

data_safe_haven/infrastructure/stack_manager.py

@@ -27,10 +27,11 @@ def __init__(self, config: Config):
         self.cfg = config
         self.env_: dict[str, Any] | None = None
         self.logger = LoggingSingleton()
-        self.path = which("pulumi")
-        if self.path is None:
+        path = which("pulumi")
+        if path is None:
             msg = "Unable to find Pulumi CLI executable in your path.\nPlease ensure that Pulumi is installed"
             raise DataSafeHavenPulumiError(msg)
+        self.path = path
 
         # Ensure Azure CLI account is correct
         # This will be needed to populate env

typings/typer/__init__.pyi

@@ -1,4 +1,5 @@
 from click.exceptions import BadParameter, Exit
+from click.termui import confirm
 
 from .main import Typer
 from .params import Argument
@@ -10,4 +11,5 @@ __all__ = [
     "Exit",
     "Option",
     "Typer",
+    "confirm",
 ]