merge-duplicates slice and did a first polish

2026-04-25 23:50:58 +02:00
parent 1d6d103bc2
commit 19d34efa37
6 changed files with 788 additions and 1 deletions
--- a/src/repo_registry/web_ui/views.py
+++ b/src/repo_registry/web_ui/views.py
@@ -124,7 +124,10 @@ def page(title: str, body: str) -> HTMLResponse:
          <body>
            <header>
              <a href="/ui"><strong>Repository Ability Registry</strong></a>
-              <a href="/docs">API Docs</a>
+              <nav class="actions">
+                <a href="/ui/search">Search</a>
+                <a href="/docs">API Docs</a>
+              </nav>
            </header>
            <main>{body}</main>
          </body>
@@ -170,6 +173,49 @@ def repository_index(service: RegistryService = Depends(get_service)) -> HTMLRes
    return page("Repositories", body)


+@router.get("/ui/search")
+def search_page(
+    q: str = "",
+    service: RegistryService = Depends(get_service),
+) -> HTMLResponse:
+    results = service.search(q) if q.strip() else []
+    rows = "\n".join(
+        f"""
+        <tr>
+          <td><a href="/ui/repos/{result.repository_id}">{escape(result.repository_name)}</a></td>
+          <td><span class="pill">{escape(result.match_type)}</span></td>
+          <td>{escape(result.match_name)}</td>
+          <td>{result.confidence:.2f}</td>
+        </tr>
+        """
+        for result in results
+    )
+    empty = (
+        '<tr><td colspan="4" class="muted">No matches.</td></tr>'
+        if q.strip()
+        else '<tr><td colspan="4" class="muted">Enter a need, capability, or repository name.</td></tr>'
+    )
+    body = f"""
+    <div class="actions">
+      <h1 style="margin-right:auto">Search</h1>
+      <a class="button secondary" href="/ui">Repositories</a>
+    </div>
+    <section class="panel">
+      <form class="actions" method="get" action="/ui/search">
+        <input name="q" value="{escape(q)}" placeholder="Search approved registry entries">
+        <button type="submit">Search</button>
+      </form>
+    </section>
+    <section class="panel" style="margin-top:18px">
+      <table>
+        <thead><tr><th>Repository</th><th>Match</th><th>Name</th><th>Confidence</th></tr></thead>
+        <tbody>{rows or empty}</tbody>
+      </table>
+    </section>
+    """
+    return page("Search", body)
+
+
@router.post("/ui/repos")
 def create_repository_from_form(
    url: str = Form(...),
@@ -524,6 +570,102 @@ def relink_candidate_evidence_from_form(
    )


+@router.post(
+    "/ui/repos/{repository_id}/analysis-runs/{analysis_run_id}"
+    "/candidate-abilities/{source_ability_id}/merge"
+)
+def merge_candidate_ability_from_form(
+    repository_id: int,
+    analysis_run_id: int,
+    source_ability_id: int,
+    target_ability_id: int = Form(...),
+    service: RegistryService = Depends(get_service),
+) -> RedirectResponse:
+    service.merge_candidate_ability(
+        repository_id,
+        analysis_run_id,
+        source_ability_id,
+        target_ability_id=target_ability_id,
+        notes="Merged from web UI",
+    )
+    return RedirectResponse(
+        f"/ui/repos/{repository_id}/analysis-runs/{analysis_run_id}",
+        status_code=303,
+    )
+
+
+@router.post(
+    "/ui/repos/{repository_id}/analysis-runs/{analysis_run_id}"
+    "/candidate-capabilities/{source_capability_id}/merge"
+)
+def merge_candidate_capability_from_form(
+    repository_id: int,
+    analysis_run_id: int,
+    source_capability_id: int,
+    target_capability_id: int = Form(...),
+    service: RegistryService = Depends(get_service),
+) -> RedirectResponse:
+    service.merge_candidate_capability(
+        repository_id,
+        analysis_run_id,
+        source_capability_id,
+        target_capability_id=target_capability_id,
+        notes="Merged from web UI",
+    )
+    return RedirectResponse(
+        f"/ui/repos/{repository_id}/analysis-runs/{analysis_run_id}",
+        status_code=303,
+    )
+
+
+@router.post(
+    "/ui/repos/{repository_id}/analysis-runs/{analysis_run_id}"
+    "/candidate-features/{source_feature_id}/merge"
+)
+def merge_candidate_feature_from_form(
+    repository_id: int,
+    analysis_run_id: int,
+    source_feature_id: int,
+    target_feature_id: int = Form(...),
+    service: RegistryService = Depends(get_service),
+) -> RedirectResponse:
+    service.merge_candidate_feature(
+        repository_id,
+        analysis_run_id,
+        source_feature_id,
+        target_feature_id=target_feature_id,
+        notes="Merged from web UI",
+    )
+    return RedirectResponse(
+        f"/ui/repos/{repository_id}/analysis-runs/{analysis_run_id}",
+        status_code=303,
+    )
+
+
+@router.post(
+    "/ui/repos/{repository_id}/analysis-runs/{analysis_run_id}"
+    "/candidate-evidence/{source_evidence_id}/merge"
+)
+def merge_candidate_evidence_from_form(
+    repository_id: int,
+    analysis_run_id: int,
+    source_evidence_id: int,
+    target_evidence_id: int = Form(...),
+    service: RegistryService = Depends(get_service),
+) -> RedirectResponse:
+    service.merge_candidate_evidence(
+        repository_id,
+        analysis_run_id,
+        source_evidence_id,
+        target_evidence_id=target_evidence_id,
+        notes="Merged from web UI",
+    )
+    return RedirectResponse(
+        f"/ui/repos/{repository_id}/analysis-runs/{analysis_run_id}",
+        status_code=303,
+    )
+
+
 def render_candidate_graph(graph: dict, repository_id: int, analysis_run_id: int) -> str:
    abilities = graph.get("abilities", [])
    if not abilities:
@@ -538,11 +680,13 @@ def render_candidate_graph(graph: dict, repository_id: int, analysis_run_id: int
            f"""
            <li>
              <strong>{escape(ability['name'])}</strong>
+              <span class="pill">ID {ability['id']}</span>
              <span class="pill">{escape(ability['status'])}</span>
              <span class="pill">{ability['confidence']:.2f}</span>
              {render_candidate_ability_actions(ability, repository_id, analysis_run_id)}
              <p class="muted">{escape(ability['description'])}</p>
              {render_candidate_edit_form('candidate-abilities', ability, repository_id, analysis_run_id)}
+              {render_candidate_merge_form('candidate-abilities', ability, repository_id, analysis_run_id, 'target_ability_id', 'Merge into ability ID')}
              {render_sources(ability['source_refs'])}
              <ul>{capabilities}</ul>
            </li>
@@ -608,12 +752,14 @@ def render_candidate_capability(
    return f"""
    <li>
      <strong>{escape(capability['name'])}</strong>
+      <span class="pill">ID {capability['id']}</span>
      <span class="pill">{escape(capability['status'])}</span>
      <span class="pill">{capability['confidence']:.2f}</span>
      {render_candidate_reject_form('candidate-capabilities', capability, repository_id, analysis_run_id)}
      <p class="muted">{escape(capability['description'])}</p>
      {render_candidate_edit_form('candidate-capabilities', capability, repository_id, analysis_run_id)}
      {render_candidate_relink_form('candidate-capabilities', capability, repository_id, analysis_run_id, 'target_ability_id', 'Target ability ID')}
+      {render_candidate_merge_form('candidate-capabilities', capability, repository_id, analysis_run_id, 'target_capability_id', 'Merge into capability ID')}
      {render_sources(capability['source_refs'])}
      <h3>Features</h3>
      <ul>{features or '<li class="muted">No feature candidates.</li>'}</ul>
@@ -631,11 +777,13 @@ def render_candidate_feature(
    return f"""
    <li>
      {escape(feature["name"])}
+      <span class="pill">ID {feature["id"]}</span>
      <span class="pill">{escape(feature["status"])}</span>
      <span class="pill">{escape(feature["type"])}</span>
      <span class="source">{escape(feature["location"])}</span>
      {render_candidate_reject_form('candidate-features', feature, repository_id, analysis_run_id)}
      {render_candidate_relink_form('candidate-features', feature, repository_id, analysis_run_id, 'target_capability_id', 'Target capability ID')}
+      {render_candidate_merge_form('candidate-features', feature, repository_id, analysis_run_id, 'target_feature_id', 'Merge into feature ID')}
    </li>
    """

@@ -648,11 +796,13 @@ def render_candidate_evidence(
    return f"""
    <li>
      {escape(evidence["type"])}
+      <span class="pill">ID {evidence["id"]}</span>
      <span class="pill">{escape(evidence["status"])}</span>
      <span class="pill">{escape(evidence["strength"])}</span>
      <span class="source">{escape(evidence["reference"])}</span>
      {render_candidate_reject_form('candidate-evidence', evidence, repository_id, analysis_run_id)}
      {render_candidate_relink_form('candidate-evidence', evidence, repository_id, analysis_run_id, 'target_capability_id', 'Target capability ID')}
+      {render_candidate_merge_form('candidate-evidence', evidence, repository_id, analysis_run_id, 'target_evidence_id', 'Merge into evidence ID')}
    </li>
    """

@@ -698,6 +848,28 @@ def render_candidate_relink_form(
    """


+def render_candidate_merge_form(
+    collection: str,
+    candidate: dict,
+    repository_id: int,
+    analysis_run_id: int,
+    field_name: str,
+    label: str,
+) -> str:
+    if candidate["status"] != "candidate":
+        return ""
+    action = (
+        f"/ui/repos/{repository_id}/analysis-runs/{analysis_run_id}"
+        f"/{collection}/{candidate['id']}/merge"
+    )
+    return f"""
+    <form style="display:inline-grid; grid-template-columns: 140px auto; gap: 6px; align-items: end;" method="post" action="{action}">
+      <label>{label}<input name="{field_name}" type="number" min="1" required></label>
+      <button class="secondary" type="submit">Merge</button>
+    </form>
+    """
+
+
 def render_ability_map(ability_map: dict) -> str:
    abilities = ability_map.get("abilities", [])
    if not abilities: