introduce two level bug expiration

Author: TheJJ

startriage/cli.py

@@ -119,7 +119,7 @@ def _build_parser() -> argparse.ArgumentParser:
   +  last activity NOT from the team (reply pending)
   U  updated recently (within --flag-recent days)
   O  old / dormant (beyond --flag-old days)
-  X  expiring (not seen in today's window, --expire-tagged/--expire days)
+  X  expiring (not seen in today's window, --expire-level1/2 days)
   N  new bug since last --compare file
   v  verification-needed-* tag set
   V  verification-done-* tag set
@@ -142,16 +142,16 @@ def _build_parser() -> argparse.ArgumentParser:
     )
     triage_p.add_argument("--no-expiration", action="store_true", help="Skip expiring bugs subsection")
     triage_p.add_argument(
-        "--expire-tagged",
+        "--expire-level1",
         type=int,
         metavar="DAYS",
-        help="Days to consider todo-tagged bugs expired if no update happened",
+        help="Days to re-display old expiring bugs (level 1)",
     )
     triage_p.add_argument(
-        "--expire",
+        "--expire-level2",
         type=int,
         metavar="DAYS",
-        help="Days to consider subscribed bugs expired if no update happened",
+        help="Days to re-display ay old expiring bugs (level 2)",
     )
     triage_p.add_argument(
         "--extended",
@@ -192,7 +192,7 @@ def _build_parser() -> argparse.ArgumentParser:
 
     config_setdefaults_p = config_sp.add_parser("set", help="Persist settings to config file")
     config_setdefaults_p.add_argument("--discourse-site", help="Discourse website base URL")
-    config_setdefaults_p.add_argument("--discourse-category", help="Discourse category")
+    config_setdefaults_p.add_argument("--discourse-categories", help="Discourse category (comma separated)")
     config_setdefaults_p.add_argument("--default-team", help="Set general.default_team in config")
     config_setdefaults_p.add_argument(
         "--save-bugs-dir", metavar="PATH", help="Directory to track previous bugs in"
@@ -277,10 +277,10 @@ async def _run_triage(args: argparse.Namespace, config: StarTriageConfig) -> Non
         team = team.model_copy(update={"lp_ignore_packages": []})
 
     general = config.general
-    if args.expire_tagged is not None:
-        general = general.model_copy(update={"lp_expire_tagged": args.expire_tagged})
-    if args.expire is not None:
-        general = general.model_copy(update={"lp_expire": args.expire})
+    if args.expire_level1 is not None:
+        general = general.model_copy(update={"lp_expire_level1_days": args.expire_level1})
+    if args.expire_level2 is not None:
+        general = general.model_copy(update={"lp_expire_level2_days": args.expire_level2})
     if args.extended is not None:
         general = general.model_copy(update={"lp_extended": args.extended})
     if args.proposed_min_age is not None:
@@ -340,11 +340,11 @@ async def _set_config_settings(args: argparse.Namespace, _config: StarTriageConf
         data.setdefault("general", {})["default_team"] = args.default_team
     if args.discourse_site:
         data.setdefault("general", {})["discourse_site"] = args.discourse_site
-    if args.discourse_category:
+    if args.discourse_categories:
         if not args.team:
-            raise ValueError("error: --discourse-category requires -t/--team")
+            raise ValueError("error: --discourse-categories requires -t/--team")
         team_section = data.setdefault("team", {}).setdefault(args.team, {})
-        team_section["discourse_categories"] = args.discourse_category
+        team_section["discourse_categories"] = args.discourse_categories.split(",")
     if args.save_bugs_dir:
         if not Path(args.save_bugs_dir).is_dir():
             raise ValueError(f"error: --save-bugs-dir {args.save_bugs_dir!r} is not a directory")

startriage/config.py

@@ -18,8 +18,8 @@
 class GeneralConfig(BaseModel):
     model_config = ConfigDict(extra="forbid")
 
-    lp_expire_tagged: int = 60
-    lp_expire: int = 180
+    lp_expire_level1_days: int = 60
+    lp_expire_level2_days: int = 180
     lp_extended: bool | None = None
     lp_triage_updates: UpdateFilter = UpdateFilter.theirs
     savebugs_dir: Path | None = None

startriage/data/defaults.toml

@@ -1,6 +1,6 @@
 [general]
-lp_expire_tagged = 60
-lp_expire = 180
+lp_expire_level1_days = 60
+lp_expire_level2_days = 180
 lp_triage_updates = "theirs"
 #savebugs_dir = ~/src/ubuntu/mnt/savebugs/
 #default_team = automatic if 1 defined

startriage/output.py

@@ -46,8 +46,11 @@ async def record(self, persistor: BugPersistor) -> None:
 
 
 @lru_cache(maxsize=256)
-def hyperlink(url: str, text: str, fmt: OutputFormat = OutputFormat.TERMINAL) -> str:
+def hyperlink(
+    url: str, text: str, fmt: OutputFormat = OutputFormat.TERMINAL, pad_right: int | None = None
+) -> str:
     """Format text as a hyperlink for the given output format.
+    pad_right: pad the resulting string, but the clickable surface remains just text.
 
     Terminal: ANSI OSC8 escape sequence (only when stdout is a TTY).
     Markdown: [text](url)
@@ -59,7 +62,11 @@ def hyperlink(url: str, text: str, fmt: OutputFormat = OutputFormat.TERMINAL) ->
             if os.isatty(sys.stdout.fileno()):
                 osc8 = "\x1b]8"
                 st = "\x1b\\"
-                return f"{osc8};;{url}{st}{text}{osc8};;{st}"
+                padding = ""
+                if pad_right is not None:
+                    padding_len = max(0, pad_right - len(text))
+                    padding = " " * padding_len
+                return f"{osc8};;{url}{st}{text}{osc8};;{st}{padding}"
             return text
         case _:
             raise NotImplementedError

startriage/sources/launchpad/finder.py

@@ -136,8 +136,8 @@ def fetch_bugs(
     filter: TaskFilterOptions,
     mode: FetchMode,
     update_filter: str | None,
-    expire_tagged_days: int = 60,
-    expire_days: int = 180,
+    expire_level1_days: int = 60,
+    expire_level2_days: int = 180,
 ) -> LaunchpadTasks:
     """Synchronous LP fetch - run inside asyncio.to_thread().
 
@@ -241,7 +241,7 @@ def fetch_bugs(
     expiring_subscribed: list[Task] = []
     if mode == FetchMode.triage and filter.show_expiration and filter.start and filter.end:
 
-        def _expiring_window(days: int, tags: list[str], statuses: list[str]) -> list[Task]:
+        def _expiring_window(days: int) -> list[Task]:
             shift = timedelta(days=days)
             w_start = filter.start - shift
             w_end = filter.end - shift
@@ -251,21 +251,17 @@ def _expiring_window(days: int, tags: list[str], statuses: list[str]) -> list[Ta
                 for t in _search_tasks_all_series(
                     ubuntu,
                     modified_since=w_start,
-                    bug_subscriber=team,
-                    tags=tags,
-                    tags_combinator="All",
-                    status=statuses,
+                    structural_subscriber=team,
+                    status=OPEN_BUG_STATUSES,
                 )
             }
             since_end = {
                 (t.bug_link, _fast_target_name(t)): t
                 for t in _search_tasks_all_series(
                     ubuntu,
                     modified_since=w_end,
-                    bug_subscriber=team,
-                    tags=tags,
-                    tags_combinator="All",
-                    status=statuses,
+                    structural_subscriber=team,
+                    status=OPEN_BUG_STATUSES,
                 )
             }
             result = []
@@ -279,21 +275,13 @@ def _expiring_window(days: int, tags: list[str], statuses: list[str]) -> list[Ta
                 result.append(Task(lp_task, subscribed=True, last_activity_ours=is_ours, expiring=True))
             return result
 
-        logging.info("Fetching expiring tagged bugs (~%d days ago)\u2026", expire_tagged_days)
-        expiring_tagged = _expiring_window(
-            expire_tagged_days,
-            [team_config.lp_todo_tag, "-bot-stop-nagging"],
-            OPEN_BUG_STATUSES,
-        )
-        logging.info("Launchpad: %d expiring tagged bugs.", len({t.number for t in expiring_tagged}))
+        logging.info("Fetching expiring bugs level 1 (~%d days ago)\u2026", expire_level1_days)
+        expiring_tagged = _expiring_window(expire_level1_days)
+        logging.info("Launchpad: %d expiring level-1 bugs.", len({t.number for t in expiring_tagged}))
 
-        logging.info("Fetching expiring subscribed bugs (~%d days ago)\u2026", expire_days)
-        expiring_subscribed = _expiring_window(
-            expire_days,
-            ["-bot-stop-nagging", f"-{team_config.lp_todo_tag}"],
-            OPEN_BUG_STATUSES,
-        )
-        logging.info("Launchpad: %d expiring subscribed bugs.", len({t.number for t in expiring_subscribed}))
+        logging.info("Fetching expiring bugs level 2 (~%d days ago)\u2026", expire_level2_days)
+        expiring_subscribed = _expiring_window(expire_level2_days)
+        logging.info("Launchpad: %d expiring level-2 bugs.", len({t.number for t in expiring_subscribed}))
 
     active_series = [s.name for s in ubuntu.series_collection if s.active]
 

startriage/sources/launchpad/models.py

@@ -23,7 +23,8 @@
 COLOR_STATUS_OPEN = "\033[0;31m"  # red
 COLOR_RESET = "\033[0m"
 
-LONG_URL_ROOT = "https://bugs.launchpad.net/ubuntu/+bug/"
+_LP_BUG_URL_ROOT = "https://bugs.launchpad.net/ubuntu/+bug/"
+_LP_SOURCE_URL = "https://launchpad.net/ubuntu/+source/{pkg}"
 LPBUGREF = "LP: #"
 
 # Visual width of the Release column in the triage table.
@@ -121,7 +122,7 @@ def short_title(self) -> str:
 
     @property
     def url(self) -> str:
-        return LONG_URL_ROOT + self.number
+        return _LP_BUG_URL_ROOT + self.number
 
     @property
     def bug_reference(self) -> str:
@@ -220,7 +221,7 @@ def get_table_row(
         newbug: bool = False,
     ) -> str:
         bug_ref = self.bug_reference if shortlinks else self.url
-        fmt_len = bugid_len + len(LPBUGREF if shortlinks else LONG_URL_ROOT)
+        fmt_len = bugid_len + len(LPBUGREF if shortlinks else _LP_BUG_URL_ROOT)
         bug_str = hyperlink(self.url, f"%-{fmt_len}s" % bug_ref)
 
         # split up distro tasks to multiple lines if necessary.
@@ -233,12 +234,12 @@ def get_table_row(
         def _release_col(chunk: list[str]) -> str:
             return "".join(chunk) + " " * (_RELEASE_COL_WIDTH - len(chunk))
 
-        text = "%-12s | %6s | %s | %-13s | %-19s |" % (
+        text = "%-12s | %6s | %s | %-13s | %s |" % (
             bug_str,
             self.get_flags(ctx, newbug),
             _release_col(chunks[0]),
             self.status,
-            truncate_string(self.src, 19),
+            hyperlink(_LP_SOURCE_URL.format(pkg=self.src), truncate_string(self.src, 19), pad=19),
         )
         if extended:
             text += " %8s | %-10s | %-13s |" % (

startriage/sources/launchpad/triage.py

@@ -238,15 +238,15 @@ async def _print_old_bugs(
         case OutputFormat.TERMINAL:
             for label, exp_tasks, days, order_by_date in [
                 (
-                    "Expiring tagged",
+                    "Expiring level 1",
                     expiring_tagged,
-                    config.lp_expire_tagged,
+                    config.lp_expire_level1_days,
                     False,
                 ),
                 (
-                    "Expiring subscribed",
+                    "Expiring level 2",
                     expiring_subscribed,
-                    config.lp_expire,
+                    config.lp_expire_level2_days,
                     True,
                 ),
             ]:
@@ -289,8 +289,8 @@ async def find(
         filter,
         mode,
         effective_update_filter,
-        config.general.lp_expire_tagged,
-        config.general.lp_expire,
+        config.general.lp_expire_level1_days,
+        config.general.lp_expire_level2_days,
     )
     logging.info("Launchpad: %d bugs fetched. Checking unapproved queue…", len(lp_tasks.tasks))