branch_worker: minor typecheck fixes

Internal Meta typechecker reported a couple of issues in recent PR
comments forwardning feature [1].

Fix them with additional checks and local variables.

[1] #25

Signed-off-by: Ihor Solodrai <[email protected]>

Author: theihor

kernel_patches_daemon/branch_worker.py

@@ -37,7 +37,11 @@
 from github.Repository import Repository
 from github.WorkflowJob import WorkflowJob
 
-from kernel_patches_daemon.config import EmailConfig, SERIES_TARGET_SEPARATOR
+from kernel_patches_daemon.config import (
+    EmailConfig,
+    PRCommentsForwardingConfig,
+    SERIES_TARGET_SEPARATOR,
+)
 from kernel_patches_daemon.github_connector import GithubConnector
 from kernel_patches_daemon.github_logs import GithubLogExtractor
 from kernel_patches_daemon.patchwork import Patchwork, Series, Subject
@@ -405,25 +409,27 @@ def reply_email_recipients(
 
 
 async def send_pr_comment_email(
-    config: EmailConfig, msg: EmailMessage, body: str
+    email_config: EmailConfig, msg: EmailMessage, body: str
 ) -> Optional[str]:
     """
     This function forwards a pull request comment (`body`) as an email reply to the original
     patch email message `msg`. It extracts recipients from the `msg`, applies allowlist, denylist,
     and always_cc as configured, and sets Subject and In-Reply-To based on the `msg`
 
     Args:
-        config: EmailConfig with PRCommentsForwardingConfig
+        email_config: EmailConfig with PRCommentsForwardingConfig
         msg: the original EmailMessage we are replying to (the patch submission)
         body: the content of the reply we are sending
 
     Returns:
         Message-Id of the sent email, or None if it wasn't sent
     """
-    if config is None or not config.is_pr_comment_forwarding_enabled():
+    if email_config.pr_comments_forwarding is None:
+        return
+    cfg: PRCommentsForwardingConfig = email_config.pr_comments_forwarding
+    if not cfg.enabled:
         return
 
-    cfg = config.pr_comments_forwarding
     (to_list, cc_list) = reply_email_recipients(
         msg, allowlist=cfg.recipient_allowlist, denylist=cfg.recipient_denylist
     )
@@ -435,7 +441,7 @@ async def send_pr_comment_email(
     subject = "Re: " + msg.get("Subject")
     in_reply_to = msg.get("Message-Id")
 
-    return await send_email(config, to_list, cc_list, subject, body, in_reply_to)
+    return await send_email(email_config, to_list, cc_list, subject, body, in_reply_to)
 
 
 def pr_has_label(pr: PullRequest, label: str) -> bool:
@@ -1293,6 +1299,8 @@ async def evaluate_ci_result(
             logger.info("No email configuration present; skipping sending...")
             return
 
+        email_cfg: EmailConfig = self.email_config
+
         if status in (Status.PENDING, Status.SKIPPED):
             return
 
@@ -1329,7 +1337,7 @@ async def evaluate_ci_result(
             subject = await get_ci_email_subject(series)
             ctx = build_email_body_context(self.repo, pr, status, series, inline_logs)
             body = furnish_ci_email_body(ctx)
-            await send_ci_results_email(self.email_config, series, subject, body)
+            await send_ci_results_email(email_cfg, series, subject, body)
             bump_email_status_counters(status)
 
     def expire_branches(self) -> None:
@@ -1379,12 +1387,15 @@ async def submit_pr_summary(
         pr_summary_report.add(1)
 
     async def forward_pr_comments(self, pr: PullRequest, series: Series):
-        if (
-            self.email_config is None
-            or not self.email_config.is_pr_comment_forwarding_enabled()
-        ):
+        # The checks and local variables are needed to make type checker happy
+        if self.email_config is None:
+            return
+        email_cfg: EmailConfig = self.email_config
+        if email_cfg.pr_comments_forwarding is None:
+            return
+        cfg: PRCommentsForwardingConfig = email_cfg.pr_comments_forwarding
+        if not cfg.enabled:
             return
-        cfg = self.email_config.pr_comments_forwarding
 
         comments = pr.get_issue_comments()
 
@@ -1441,7 +1452,7 @@ async def forward_pr_comments(self, pr: PullRequest, series: Series):
 
             # and forward the target comment via email
             sent_msg_id = await send_pr_comment_email(
-                self.email_config, patch_msg, comment.body
+                email_cfg, patch_msg, comment.body
             )
             if sent_msg_id is not None:
                 logger.info(

kernel_patches_daemon/config.py

@@ -168,12 +168,6 @@ def from_json(cls, json: Dict) -> "EmailConfig":
             ),
         )
 
-    def is_pr_comment_forwarding_enabled(self) -> bool:
-        if self.pr_comments_forwarding is not None:
-            return self.pr_comments_forwarding.enabled
-        else:
-            return False
-
 
 @dataclass
 class PatchworksConfig: