feat: full customizability — dynamic columns, sort, email templates

- Dynamic table columns from digest.columns config (BUNDLE/VERSION added)
- sort_by honored within tier groups
- Email body/celebration HTML templates configurable
- Celebration max links + more template configurable
- Empty-result template configurable
- SMTP auth (username/password) + use_tls default true
- Network timeouts configurable per integration
- Week boundary configurable (sunday/monday)
- Slack API base URL configurable
- Email href scheme validation (http/https only)
- Deploy templates use REPLACE placeholders (no org-specific values)

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: rnetser

config/config.example.toml

@@ -5,24 +5,23 @@
 [schedule]
 # Keep deploy/cronjob.yaml spec.schedule in sync with this value.
 # Note: schedule.cron is a sync marker for deploy/cronjob.yaml; timezone is unused.
-# Week window is always the last complete Sun–Sat in UTC.
+# week_start: sunday → last complete Sun–Sat; monday → last complete Mon–Sun.
 cron = "0 10 * * 0"
 timezone = "Asia/Jerusalem"
+week_start = "sunday"
 
 [digest]
 # 0 = no limit (show all jobs). Positive N truncates the Slack message.
 max_rows = 0
 # sort_by applies within each tier group. Rows are first grouped by tier
 # (order from `tiers`), then sorted by version descending, bundle descending,
-# and finally by this field.
+# and finally by this field (job_name sorts ascending and does not reverse).
 sort_by = "not_reviewed" # not_reviewed | failures | job_name
 # API labels to include. "other" is a display catch-all (not sent to API).
 tiers = ["gating", "release-checklist", "other"]
-# Column order controls the Slack table (API fields only).
-# Note: columns apply to plain/mrkdwn format only. Blocks format uses a fixed
-# table layout (Job, Bundle, Reviewed, rootcoz).
-columns = ["job_name", "tier", "failures", "reviewed", "jenkins", "rootcoz"]
-# Optional columns: team, not_reviewed, build
+# Column order controls Slack tables (blocks + plain). Default blocks layout:
+columns = ["job_name", "bundle", "reviewed", "rootcoz"]
+# Optional columns: tier, team, failures, not_reviewed, build, jenkins, version
 # Passed as API ``exclude_label`` query params (metadata labels).
 # Example: exclude_labels = ["s390x"]
 exclude_labels = []
@@ -52,14 +51,19 @@ table_code_fence = true
 # {week_label}, {excluded_versions}, {mention_suffix}, {mention}, {team}, {total_jobs}, {lanes}
 # celebration_reviewed_template = "🎉 *rootcoz {lanes} weekly digest* — {week_label}{excluded_versions}{mention_suffix}\n\n✅ All *{total_jobs}* {lanes} failures for *{team}* have been reviewed! 👏"
 # celebration_no_failures_template = "🎉 *rootcoz {lanes} weekly digest* — {week_label}{excluded_versions}{mention_suffix}\n\n✅ Zero {lanes} failures for *{team}* this week! 🚀"
+# celebration_max_links = 20
+# celebration_more_template = "_+{remaining} more reviewed jobs_"
+# empty_template / empty_template_plain for zero-row digests
 # Email subject. Placeholders: {lanes}, {week_label}, {team}
 # email_subject_template = "rootcoz {lanes} weekly digest — {week_label} — {team}"
+# email_body_title / email_celebration_*_template for HTML email bodies
 
 [rootcoz]
 # Prefer env: ROOTCOZ_URL, ROOTCOZ_API_KEY, ROOTCOZ_VERIFY_SSL
 url = ""
 api_key = ""
 verify_ssl = true
+timeout = 60
 # API endpoint and default query params
 endpoint = "/api/dashboard/filtered"
 
@@ -103,11 +107,16 @@ release-checklist = "release-checklist"
 mode = "bot"
 bot_token = ""
 webhook_url = ""
+api_base_url = "https://slack.com/api"
+timeout = 30
 
 [email]
-# SMTP relay (no auth). Enable to deliver digests via TARGETS[].email.
+# SMTP relay. Optional smtp_username/smtp_password for authenticated relays.
 enabled = false
 smtp_host = "smtp.example.com"
 smtp_port = 25
 from_address = "digest@example.com"
-use_tls = false
+use_tls = true
+# smtp_username = ""
+# smtp_password = ""
+timeout = 30

deploy/configmap.yaml

@@ -10,19 +10,20 @@ data:
     [schedule]
     # Week window is always the last complete Sun–Sat in UTC.
     cron = "0 10 * * 0"
-    timezone = "Asia/Jerusalem"
+    timezone = "UTC"
+    week_start = "sunday"
 
     [digest]
     # 0 = no limit. exclude_labels are API query params; exclude_job_patterns is client-side name filter.
     max_rows = 0
     sort_by = "not_reviewed"
     # API labels to include. "other" is a display catch-all (not sent to API).
     tiers = ["gating", "release-checklist", "other"]
-    columns = ["job_name", "tier", "failures", "reviewed", "jenkins", "rootcoz"]
-    exclude_labels = ["s390x"]
-    exclude_job_patterns = ["s390x"]
-    exclude_versions = ["4.99", "5.99", "5.0", "4.23"]
-    include_tags = ["rootcoz-jenkins-bot"]
+    columns = ["job_name", "bundle", "reviewed", "rootcoz"]
+    exclude_labels = ["REPLACE"]
+    exclude_job_patterns = ["REPLACE"]
+    exclude_versions = ["REPLACE"]
+    include_tags = ["REPLACE"]
 
     [message]
     format = "blocks"
@@ -68,19 +69,19 @@ data:
     smtp_host = "smtp.example.com"
     smtp_port = 25
     from_address = "digest@example.com"
-    use_tls = false
+    use_tls = true
   ROOTCOZ_URL: "REPLACE"
   ROOTCOZ_VERIFY_SSL: "true"
   TARGETS: |
     [
       {
-        "team": "virt-node",
-        "slack": {"channel": "REPLACE", "usergroup": "virt-node-qe"},
+        "team": "REPLACE_TEAM",
+        "slack": {"channel": "REPLACE", "usergroup": "REPLACE"},
         "email": {"recipients": ["REPLACE@example.com"]}
       },
       {
-        "team": "network",
-        "slack": {"channel": "REPLACE", "usergroup": "network-qe"},
+        "team": "REPLACE_TEAM_2",
+        "slack": {"channel": "REPLACE", "usergroup": "REPLACE"},
         "email": {"recipients": ["REPLACE@example.com"]}
       }
     ]

deploy/staging/configmap.yaml

@@ -68,17 +68,17 @@ data:
     smtp_host = "smtp.example.com"
     smtp_port = 25
     from_address = "digest@example.com"
-    use_tls = false
+    use_tls = true
   ROOTCOZ_URL: "REPLACE"
   ROOTCOZ_VERIFY_SSL: "true"
   TARGETS: |
     [
       {
         "team": "virt-node",
-        "slack": {"channel": "C0AFWM3NFC5", "usergroup": ""}
+        "slack": {"channel": "REPLACE_CHANNEL", "usergroup": ""}
       },
       {
         "team": "network",
-        "slack": {"channel": "C0AFWM3NFC5", "usergroup": ""}
+        "slack": {"channel": "REPLACE_CHANNEL", "usergroup": ""}
       }
     ]

src/rootcoz_slack_digest/email_client.py

@@ -40,9 +40,15 @@ def send(
         msg.attach(MIMEText(html_body, "html"))
 
         all_recipients = list(recipients) + (cc or [])
-        with smtplib.SMTP(self._config.smtp_host, self._config.smtp_port, timeout=30) as server:
+        with smtplib.SMTP(
+            self._config.smtp_host,
+            self._config.smtp_port,
+            timeout=self._config.timeout,
+        ) as server:
             if self._config.use_tls:
                 server.starttls()
+            if self._config.smtp_username:
+                server.login(self._config.smtp_username, self._config.smtp_password)
             server.sendmail(self._config.from_address, all_recipients, msg.as_string())
 
         logger.info("Sent digest email to %s", ", ".join(recipients))

src/rootcoz_slack_digest/email_format.py

@@ -4,18 +4,27 @@
 
 import html
 
-from rootcoz_slack_digest.models import JobRow, WeekWindow
+from rootcoz_slack_digest.models import JobRow, MessageConfig, WeekWindow
 from rootcoz_slack_digest.utils import version_sort_key
 
 
+def _safe_href(url: str) -> str:
+    """Only allow http/https URLs in href attributes."""
+    if url and url.startswith(("http://", "https://")):
+        return html.escape(url, quote=True)
+    return ""
+
+
 def format_digest_html(
     *,
     window: WeekWindow,
     rows: list[JobRow],
     team: str,
     tiers: list[str] | None = None,
+    message: MessageConfig | None = None,
 ) -> str:
     """Render digest rows as styled HTML email body."""
+    msg = message or MessageConfig()
     total_failures = sum(r.failure_count for r in rows)
     total_reviewed = sum(r.reviewed_count for r in rows)
     tier_display = ", ".join(html.escape(t) for t in tiers) if tiers else "all"
@@ -29,7 +38,7 @@ def format_digest_html(
 
     html_parts = [
         "<html><body style='font-family: Arial, sans-serif; font-size: 14px;'>",
-        f"<h2>rootcoz weekly digest — {html.escape(window.label)}</h2>",
+        f"<h2>{html.escape(msg.email_body_title)} — {html.escape(window.label)}</h2>",
         f"<p><strong>Team:</strong> {team_html} · "
         f"<strong>Tiers:</strong> {tier_display} · "
         f"<strong>Jobs:</strong> {len(rows)} · "
@@ -53,15 +62,13 @@ def format_digest_html(
         html_parts.append("<ul>")
         for row in tier_rows:
             job_name = html.escape(row.job_name)
-            if row.jenkins_url:
-                name_html = f'<a href="{html.escape(row.jenkins_url, quote=True)}">{job_name}</a>'
+            href = _safe_href(row.jenkins_url)
+            if href:
+                name_html = f'<a href="{href}">{job_name}</a>'
             else:
                 name_html = f"<strong>{job_name}</strong>"
-            rootcoz_html = (
-                f' · <a href="{html.escape(row.rootcoz_url, quote=True)}">rootcoz</a>'
-                if row.rootcoz_url
-                else ""
-            )
+            rootcoz_href = _safe_href(row.rootcoz_url)
+            rootcoz_html = f' · <a href="{rootcoz_href}">rootcoz</a>' if rootcoz_href else ""
             bundle_html = f" [{html.escape(row.bundle)}]" if row.bundle else ""
             html_parts.append(
                 f"<li>{name_html}{bundle_html} "
@@ -81,36 +88,44 @@ def format_celebration_html(
     total_jobs: int,
     tiers: list[str] | None = None,
     jobs: list[JobRow] | None = None,
+    message: MessageConfig | None = None,
 ) -> str:
     """Render celebration message as HTML."""
+    msg = message or MessageConfig()
     tier_display = ", ".join(html.escape(t) for t in tiers) if tiers else "all"
     team_html = html.escape(team)
     if total_jobs > 0:
-        body = (
-            f"All <strong>{total_jobs}</strong> {tier_display} failures "
-            f"for <strong>{team_html}</strong> have been reviewed! 👏"
+        body = msg.email_celebration_reviewed_template.format(
+            total_jobs=total_jobs,
+            lanes=tier_display,
+            team=team_html,
         )
     else:
-        body = f"Zero {tier_display} failures for <strong>{team_html}</strong> this week! 🚀"
+        body = msg.email_celebration_no_failures_template.format(
+            lanes=tier_display,
+            team=team_html,
+        )
 
     parts = [
         "<html><body style='font-family: Arial, sans-serif;'>",
-        f"<h2>🎉 rootcoz weekly digest — {html.escape(window.label)}</h2>",
+        f"<h2>🎉 {html.escape(msg.email_body_title)} — {html.escape(window.label)}</h2>",
         f"<p>✅ {body}</p>",
     ]
+    max_links = msg.celebration_max_links
     if total_jobs > 0 and jobs:
         items: list[str] = []
-        for job in jobs[:20]:
+        for job in jobs[:max_links]:
             bundle_html = f" [{html.escape(job.bundle)}]" if job.bundle else ""
-            if job.rootcoz_url:
+            href = _safe_href(job.rootcoz_url)
+            if href:
                 items.append(
-                    f'<li><a href="{html.escape(job.rootcoz_url, quote=True)}">'
-                    f"{html.escape(job.job_name)}</a>{bundle_html}</li>"
+                    f'<li><a href="{href}">{html.escape(job.job_name)}</a>{bundle_html}</li>'
                 )
             else:
                 items.append(f"<li>{html.escape(job.job_name)}{bundle_html}</li>")
         parts.append("<ul>" + "".join(items) + "</ul>")
-        if len(jobs) > 20:
-            parts.append(f"<p><em>+{len(jobs) - 20} more reviewed jobs</em></p>")
+        if len(jobs) > max_links:
+            remaining = len(jobs) - max_links
+            parts.append(f"<p><em>+{remaining} more reviewed jobs</em></p>")
     parts.append("</body></html>")
     return "\n".join(parts)

src/rootcoz_slack_digest/mentions.py

@@ -44,8 +44,17 @@ def mention_for_handle(resolver: UsergroupResolver, handle: str | None) -> str:
 class SlackUsergroupResolver:
     """Resolve handles via ``usergroups.list`` (cached for one run)."""
 
-    def __init__(self, token: str, *, client: httpx.Client | None = None) -> None:
+    def __init__(
+        self,
+        token: str,
+        *,
+        api_base_url: str = "https://slack.com/api",
+        timeout: int = 30,
+        client: httpx.Client | None = None,
+    ) -> None:
         self._token = token
+        self._api_base_url = api_base_url.rstrip("/")
+        self._timeout = timeout
         self._client = client
         self._owns_client = client is None
         self._cache: dict[str, str] | None = None
@@ -65,9 +74,9 @@ def __exit__(self, *args: object) -> None:
     def _http(self) -> httpx.Client:
         if self._client is None:
             self._client = httpx.Client(
-                base_url="https://slack.com/api",
+                base_url=self._api_base_url,
                 headers={"Authorization": f"Bearer {self._token}"},
-                timeout=30.0,
+                timeout=float(self._timeout),
             )
         return self._client
 

src/rootcoz_slack_digest/models.py

@@ -31,6 +31,8 @@ class DigestColumn(StrEnum):
     JENKINS = "jenkins"
     ROOTCOZ = "rootcoz"
     BUILD = "build"
+    BUNDLE = "bundle"
+    VERSION = "version"
 
 
 class MessageFormat(StrEnum):
@@ -50,6 +52,14 @@ class MessageFormat(StrEnum):
     DigestColumn.ROOTCOZ,
 ]
 
+# Default Block Kit table layout (Job / Bundle / Reviewed / rootcoz).
+DEFAULT_BLOCK_COLUMNS: list[DigestColumn] = [
+    DigestColumn.JOB_NAME,
+    DigestColumn.BUNDLE,
+    DigestColumn.REVIEWED,
+    DigestColumn.ROOTCOZ,
+]
+
 
 class WeekWindow(BaseModel):
     """Inclusive Sun–Sat UTC week window."""
@@ -96,6 +106,8 @@ class ScheduleConfig(BaseModel):
 
     cron: str = "0 7 * * 0"
     timezone: str = "UTC"
+    # sunday → last complete Sun–Sat; monday → last complete Mon–Sun.
+    week_start: str = "sunday"
 
 
 class DigestConfig(BaseModel):
@@ -150,7 +162,19 @@ class MessageConfig(BaseModel):
         "🎉 *rootcoz {lanes} weekly digest* — {week_label}{excluded_versions}{mention_suffix}\n\n"
         "✅ Zero {lanes} failures for *{team}* this week! 🚀"
     )
+    celebration_max_links: int = 20
+    celebration_more_template: str = "_+{remaining} more reviewed jobs_"
+    empty_template: str = "_No completed jobs with failures in this window._"
+    empty_template_plain: str = "No completed jobs with failures in this window."
     email_subject_template: str = "rootcoz {lanes} weekly digest — {week_label} — {team}"
+    email_body_title: str = "rootcoz weekly digest"
+    email_celebration_reviewed_template: str = (
+        "All <strong>{total_jobs}</strong> {lanes} failures for "
+        "<strong>{team}</strong> have been reviewed! 👏"
+    )
+    email_celebration_no_failures_template: str = (
+        "Zero {lanes} failures for <strong>{team}</strong> this week! 🚀"
+    )
 
 
 class FieldMapConfig(BaseModel):
@@ -215,6 +239,7 @@ class RootcozConfig(BaseModel):
     url: str = ""
     api_key: str = ""
     verify_ssl: bool = True
+    timeout: int = 60
     endpoint: str = "/api/dashboard/filtered"
     params: dict[str, str] = Field(
         default_factory=lambda: {
@@ -234,6 +259,8 @@ class SlackConfig(BaseModel):
     mode: Literal["webhook", "bot"] = "bot"
     webhook_url: str = ""
     bot_token: str = ""
+    api_base_url: str = "https://slack.com/api"
+    timeout: int = 30
 
 
 class SlackTargetConfig(BaseModel):
@@ -280,7 +307,10 @@ class EmailConfig(BaseModel):
     smtp_host: str = "smtp.example.com"
     smtp_port: int = 25
     from_address: str = "digest@example.com"
-    use_tls: bool = False
+    use_tls: bool = True
+    smtp_username: str = ""
+    smtp_password: str = ""
+    timeout: int = 30
 
 
 class AppConfig(BaseModel):

src/rootcoz_slack_digest/rootcoz_client.py

@@ -42,7 +42,7 @@ def __init__(
             base_url=config.url.rstrip("/"),
             headers={"Authorization": f"Bearer {config.api_key}"},
             verify=config.verify_ssl,
-            timeout=60.0,
+            timeout=float(config.timeout),
         )
 
     def close(self) -> None: