fix all types broken by 4.3

Author: Mic92

buildbot_nix/buildbot_nix/__init__.py

@@ -142,6 +142,8 @@ def __init__(
         self.show_trace = show_trace
 
     async def produce_event(self, event: str, result: None | int) -> None:
+        if not self.build:
+            return
         build: dict[str, Any] = await self.master.data.get(
             ("builds", str(self.build.buildid))
         )
@@ -191,9 +193,10 @@ async def run(self) -> int:
 
         # if the command passes extract the list of stages
         result = cmd.results()
-        await CombinedBuildEvent.produce_event_for_build(
-            self.master, CombinedBuildEvent.FINISHED_NIX_EVAL, self.build, result
-        )
+        if self.build:
+            await CombinedBuildEvent.produce_event_for_build(
+                self.master, CombinedBuildEvent.FINISHED_NIX_EVAL, self.build, result
+            )
         if result == util.SUCCESS:
             # create a ShellCommand for each stage and add them to the build
             jobs: list[NixEvalJob] = []
@@ -221,26 +224,27 @@ async def run(self) -> int:
 
             self.number_of_jobs = len(successful_jobs)
 
-            self.build.addStepsAfterCurrentStep(
-                [
-                    BuildTrigger(
-                        project=self.project,
-                        builds_scheduler=f"{self.project.project_id}-nix-build",
-                        skipped_builds_scheduler=f"{self.project.project_id}-nix-skipped-build",
-                        failed_eval_scheduler=f"{self.project.project_id}-nix-failed-eval",
-                        dependency_failed_scheduler=f"{self.project.project_id}-nix-dependency-failed",
-                        cached_failure_scheduler=f"{self.project.project_id}-nix-cached-failure",
-                        name="build flake",
-                        successful_jobs=successful_jobs,
-                        failed_jobs=failed_jobs,
-                        combine_builds=(
-                            self.job_report_limit is not None
-                            and self.number_of_jobs > self.job_report_limit
+            if self.build:
+                self.build.addStepsAfterCurrentStep(
+                    [
+                        BuildTrigger(
+                            project=self.project,
+                            builds_scheduler=f"{self.project.project_id}-nix-build",
+                            skipped_builds_scheduler=f"{self.project.project_id}-nix-skipped-build",
+                            failed_eval_scheduler=f"{self.project.project_id}-nix-failed-eval",
+                            dependency_failed_scheduler=f"{self.project.project_id}-nix-dependency-failed",
+                            cached_failure_scheduler=f"{self.project.project_id}-nix-cached-failure",
+                            name="build flake",
+                            successful_jobs=successful_jobs,
+                            failed_jobs=failed_jobs,
+                            combine_builds=(
+                                self.job_report_limit is not None
+                                and self.number_of_jobs > self.job_report_limit
+                            ),
+                            failed_builds_db=self.failed_builds_db,
                         ),
-                        failed_builds_db=self.failed_builds_db,
-                    ),
-                ]
-            )
+                    ]
+                )
 
         return result
 
@@ -266,16 +270,17 @@ async def run(self) -> int:
             # create a ShellCommand for each stage and add them to the build
             effects = json.loads(self.observer.getStdout())
 
-            self.build.addStepsAfterCurrentStep(
-                [
-                    BuildbotEffectsTrigger(
-                        project=self.project,
-                        effects_scheduler=f"{self.project.project_id}-run-effect",
-                        name="Buildbot effect",
-                        effects=effects,
-                    ),
-                ],
-            )
+            if self.build:
+                self.build.addStepsAfterCurrentStep(
+                    [
+                        BuildbotEffectsTrigger(
+                            project=self.project,
+                            effects_scheduler=f"{self.project.project_id}-run-effect",
+                            name="Buildbot effect",
+                            effects=effects,
+                        ),
+                    ],
+                )
 
         return result
 
@@ -336,7 +341,7 @@ def __init__(
         super().__init__(**kwargs)
 
     async def run(self) -> int:
-        if self.build.reason != "rebuild":
+        if self.build and self.build.reason != "rebuild":
             attr = self.getProperty("attr")
             # show eval error
             error_log: StreamLog = await self.addLog("nix_error")
@@ -369,7 +374,11 @@ def __init__(self, **kwargs: Any) -> None:
         super().__init__(**kwargs)
 
     async def run(self) -> int:
-        if self.build.reason == "rebuild" and not self.getProperty("combine_builds"):
+        if (
+            self.build
+            and self.build.reason == "rebuild"
+            and not self.getProperty("combine_builds")
+        ):
             await CombinedBuildEvent.produce_event_for_build(
                 self.master, CombinedBuildEvent.STARTED_NIX_BUILD, self.build, None
             )
@@ -380,7 +389,11 @@ async def run(self) -> int:
 
         res = cmd.results()
 
-        if self.build.reason == "rebuild" and not self.getProperty("combine_builds"):
+        if (
+            self.build
+            and self.build.reason == "rebuild"
+            and not self.getProperty("combine_builds")
+        ):
             await CombinedBuildEvent.produce_event_for_build(
                 self.master, CombinedBuildEvent.FINISHED_NIX_BUILD, self.build, res
             )

buildbot_nix/buildbot_nix/build_trigger.py

@@ -125,7 +125,11 @@ def interrupt(self, reason: str | Failure) -> None:
         if self.running and not self.ended:
             self.ended = True
             # if we are interrupted because of a connection lost, we interrupt synchronously
-            if self.build.conn is None and self.wait_for_finish_deferred is not None:
+            if (
+                self.build
+                and self.build.conn is None
+                and self.wait_for_finish_deferred is not None
+            ):
                 self.wait_for_finish_deferred.cancel()
 
     def get_scheduler_by_name(self, name: str) -> Triggerable:
@@ -232,7 +236,7 @@ async def schedule(
             waited_for=True,
             sourcestamps=ss_for_trigger,
             set_props=props,
-            parent_buildid=self.build.buildid,
+            parent_buildid=self.build.buildid if self.build else None,
             parent_relationship="Triggered from",
         )
 
@@ -278,7 +282,7 @@ def prepare_sourcestamp_list_for_trigger(
         dict[str, Any]
     ]:  # TODO: ISourceStamp? its defined but never used anywhere an doesn't include `asDict` method
         ss_for_trigger = {}
-        objs_from_build = self.build.getAllSourceStamps()
+        objs_from_build = self.build.getAllSourceStamps() if self.build else []
         for ss in objs_from_build:
             ss_for_trigger[ss.codebase] = ss.asDict()
 
@@ -340,15 +344,16 @@ async def run(self) -> int:
         reports. The reporting is based on custom events and logic, see `BuildNixEvalStatusGenerator` for
         the receiving side.
         """
-        await CombinedBuildEvent.produce_event_for_build(
-            self.master, CombinedBuildEvent.STARTED_NIX_BUILD, self.build, None
-        )
+        if self.build:
+            await CombinedBuildEvent.produce_event_for_build(
+                self.master, CombinedBuildEvent.STARTED_NIX_BUILD, self.build, None
+            )
 
         done: list[BuildTrigger.DoneJob] = []
         scheduled: list[BuildTrigger.ScheduledJob] = []
 
         self.running = True
-        build_props = self.build.getProperties()
+        build_props = self.build.getProperties() if self.build else Properties()
         ss_for_trigger = self.prepare_sourcestamp_list_for_trigger()
         scheduler_log: StreamLog = await self.addLog("scheduler")
 
@@ -394,7 +399,11 @@ async def run(self) -> int:
                 failed_build = self.failed_builds_db.check_build(build.drvPath)
                 if job_closures.get(build.drvPath):
                     pass
-                elif failed_build is not None and self.build.reason != "rebuild":
+                elif (
+                    failed_build is not None
+                    and self.build
+                    and self.build.reason != "rebuild"
+                ):
                     scheduler_log.addStdout(
                         f"\t- skipping {build.attr} due to cached failure, first failed at {failed_build.time}\n"
                         f"\t  see build at {failed_build.url}\n"
@@ -409,7 +418,11 @@ async def run(self) -> int:
                         BuildTrigger.ScheduledJob(build, brids, results_deferred)
                     )
                     self.brids.extend(brids.values())
-                elif failed_build is not None and self.build.reason == "rebuild":
+                elif (
+                    failed_build is not None
+                    and self.build
+                    and self.build.reason == "rebuild"
+                ):
                     self.failed_builds_db.remove_build(build.drvPath)
                     scheduler_log.addStdout(
                         f"\t- not skipping {build.attr} with cached failure due to rebuild, first failed at {failed_build.time}\n"
@@ -470,10 +483,10 @@ async def run(self) -> int:
             if isinstance(job, NixEvalJobSuccess):
                 if result != SUCCESS:
                     if (
-                        self.build.reason == "rebuild"
+                        (self.build and self.build.reason == "rebuild")
                         or not self.failed_builds_db.check_build(job.drvPath)
                     ) and result == util.FAILURE:
-                        url = await self.build.getUrl()
+                        url = await self.build.getUrl() if self.build else ""
                         self.failed_builds_db.add_build(
                             job.drvPath, datetime.now(tz=UTC), url
                         )
@@ -513,12 +526,13 @@ async def run(self) -> int:
         while self.update_result_futures:
             await self.update_result_futures.pop()
 
-        await CombinedBuildEvent.produce_event_for_build(
-            self.master,
-            CombinedBuildEvent.FINISHED_NIX_BUILD,
-            self.build,
-            overall_result,
-        )
+        if self.build:
+            await CombinedBuildEvent.produce_event_for_build(
+                self.master,
+                CombinedBuildEvent.FINISHED_NIX_BUILD,
+                self.build,
+                overall_result,
+            )
         scheduler_log.addStdout("Done!\n")
         return overall_result
 

buildbot_nix/buildbot_nix/common.py

@@ -9,12 +9,12 @@
 from typing import TYPE_CHECKING, Any, TypeVar
 
 if TYPE_CHECKING:
-    from buildbot.process.log import StreamLog
     from pydantic import BaseModel
 
 
 from buildbot.plugins import util
 from buildbot.process.buildstep import BuildStep
+from buildbot.util.twisted import async_to_deferred
 from twisted.internet import threads
 from twisted.python.failure import Failure
 
@@ -156,6 +156,7 @@ def run_deferred(self) -> None:
     def run_post(self) -> Any:
         pass
 
+    @async_to_deferred
     async def run(self) -> int:
         d = threads.deferToThread(self.run_deferred)  # type: ignore[no-untyped-call]
 
@@ -169,8 +170,8 @@ def error_cb(failure: Failure) -> int:
         res = await d
         if res == util.SUCCESS:
             return self.run_post()
-        log: StreamLog = await self.addLog("log")
-        log.addStderr(f"Failed to reload project list: {self.error_msg}")
+        log = await self.addLog("log")
+        log.addStderr(f"Failed to reload project list: {self.error_msg}")  # type: ignore[attr-defined]
         return util.FAILURE
 
 

buildbot_nix/buildbot_nix/oauth2_proxy_auth.py

@@ -3,6 +3,7 @@
 from typing import Any, ClassVar
 
 from buildbot.util import bytes2unicode, unicode2bytes
+from buildbot.util.twisted import async_to_deferred
 from buildbot.www.auth import AuthBase, UserInfoProviderBase
 from twisted.logger import Logger
 from twisted.web.error import Error
@@ -31,6 +32,7 @@ def getLoginResource(self) -> IResource:  # noqa: N802
     def getLogoutResource(self) -> IResource:  # noqa: N802
         return typing.cast("IResource", Redirect(b"/oauth2/sign_out"))
 
+    @async_to_deferred
     async def maybeAutoLogin(  # noqa: N802
         self, request: Request
     ) -> None:

buildbot_nix/buildbot_nix/repo_config/__init__.py

@@ -1,18 +1,15 @@
 import tomllib
 from pathlib import Path
 from tomllib import TOMLDecodeError
-from typing import TYPE_CHECKING, Self
+from typing import Self
 
 from buildbot.process.buildstep import BuildStep, ShellMixin
 from pydantic import BaseModel, ValidationError
 
 from buildbot_nix.errors import BuildbotNixError
 
-if TYPE_CHECKING:
-    from buildbot.process.log import StreamLog
 
-
-class BuildStepShellMixin(BuildStep, ShellMixin):
+class BuildStepShellMixin(BuildStep, ShellMixin):  # type: ignore[misc]
     pass
 
 
@@ -27,11 +24,11 @@ class BranchConfig(BaseModel):
 
     @classmethod
     async def extract_during_step(cls, buildstep: BuildStepShellMixin) -> Self:
-        stdio: StreamLog = await buildstep.addLog("stdio")
+        stdio = await buildstep.addLog("stdio")
         cmd = await buildstep.makeRemoteShellCommand(
             collectStdout=True,
             collectStderr=True,
-            stdioLogName=None,
+            stdioLogName="stdio",
             # TODO: replace this with something like buildbot.steps.transfer.StringUpload
             # in the future... this one doesn't not exist yet.
             command=[
@@ -42,7 +39,7 @@ async def extract_during_step(cls, buildstep: BuildStepShellMixin) -> Self:
         )
         await buildstep.runCommand(cmd)
         if cmd.didFail():
-            stdio.addStderr(
+            stdio.addStderr(  # type: ignore[attr-defined]
                 f"Failed to read repository local configuration, {cmd.stderr}.\n"
             )
             return cls()
@@ -54,9 +51,13 @@ async def extract_during_step(cls, buildstep: BuildStepShellMixin) -> Self:
                 msg = f"Invalid flake_dir {config.flake_dir}"
                 raise BuildbotNixError(msg)
         except ValidationError as e:
-            stdio.addStderr(f"Failed to read repository local configuration, {e}.\n")
+            stdio.addStderr(  # type: ignore[attr-defined]
+                f"Failed to read repository local configuration, {e}.\n"
+            )
             return cls()
         except TOMLDecodeError as e:
-            stdio.addStderr(f"Failed to read repository local configuration, {e}.\n")
+            stdio.addStderr(  # type: ignore[attr-defined]
+                f"Failed to read repository local configuration, {e}.\n"
+            )
             return cls()
         return config