Adding dataset

.claude/settings.local.json

@@ -11,7 +11,9 @@
       "Bash(DATABASE_URL=\"sqlite+aiosqlite:////tmp/claude-1000/-home-iroddis-dev-armament-fitguide/41e5e14d-88fe-45e7-ba3a-be5a2cbde2cd/scratchpad/mig_test.db\" uv run alembic upgrade head)",
       "Bash(sqlite3 /tmp/claude-1000/-home-iroddis-dev-armament-fitguide/41e5e14d-88fe-45e7-ba3a-be5a2cbde2cd/scratchpad/mig_test.db '.schema users')",
       "Bash(docker build *)",
-      "Bash(git status *)"
+      "Bash(git status *)",
+      "Bash(git -C /home/iroddis/dev/armament/fitguide status --short)",
+      "Bash(git -C /home/iroddis/dev/armament/fitguide log --oneline -10)"
     ]
   }
 }

app/crud/augmented_part.py

@@ -31,6 +31,16 @@ async def list_all(
     return list(result.scalars().all())
 
 
+async def get_many(db: AsyncSession, ids: list[int]) -> list[AugmentedPart]:
+    """Fetch augmented parts by id in one query (selectin relationships loaded)."""
+    if not ids:
+        return []
+    result = await db.execute(
+        select(AugmentedPart).where(AugmentedPart.id.in_(ids))
+    )
+    return list(result.scalars().all())
+
+
 async def list_filtered(
     db: AsyncSession,
     description: str = "",

app/crud/fit.py

@@ -52,6 +52,29 @@ async def list_for_part(db: AsyncSession, augmented_part_id: int) -> list[Fit]:
     return list(result.scalars().all())
 
 
+async def list_for_parts(
+    db: AsyncSession,
+    part_ids: list[int],
+    exclude_label: FitLabel | None = None,
+) -> list[Fit]:
+    """All fits touching any of the given augmented parts, in one query.
+
+    Pass ``exclude_label`` to drop, e.g., confirmed non-fits (``FitLabel.NONE``).
+    """
+    if not part_ids:
+        return []
+    q = select(Fit).where(
+        or_(
+            Fit.augmented_part_a_id.in_(part_ids),
+            Fit.augmented_part_b_id.in_(part_ids),
+        )
+    )
+    if exclude_label is not None:
+        q = q.where(Fit.label != exclude_label)
+    result = await db.execute(q.order_by(Fit.id))
+    return list(result.scalars().all())
+
+
 async def list_all(
     db: AsyncSession,
     skip: int = 0,

app/crud/scope_info.py

@@ -17,6 +17,20 @@ async def get_by_augmented_part(
     return result.scalar_one_or_none()
 
 
+async def list_by_augmented_parts(
+    db: AsyncSession, augmented_part_ids: list[int]
+) -> list[ScopeInfo]:
+    """ScopeInfo rows for the given augmented parts, fetched in one query."""
+    if not augmented_part_ids:
+        return []
+    result = await db.execute(
+        select(ScopeInfo).where(
+            ScopeInfo.augmented_part_id.in_(augmented_part_ids)
+        )
+    )
+    return list(result.scalars().all())
+
+
 async def create(
     db: AsyncSession,
     *,

app/main.py

@@ -12,6 +12,7 @@ from app.core.database import init_db
 from app.deps import NotAuthenticated
 from app.web.admin import router as admin_router
 from app.web.pages import router as pages_router
+from app.web.scopes import router as scopes_router
 
 STATIC_DIR = Path(__file__).resolve().parent / "static"
 
@@ -39,6 +40,7 @@ def create_app() -> FastAPI:
 
     app.include_router(api_router, prefix="/api")
     app.include_router(pages_router)
+    app.include_router(scopes_router)
     app.include_router(admin_router)
 
     @app.exception_handler(NotAuthenticated)

app/services/scope_guide.py

@@ -0,0 +1,137 @@
+"""Assemble the scope-centric fit guide.
+
+Builds the data for the top-level ``/scopes`` page: one row per augmented part
+of part type "Scope", one column per non-Scope part type, where each cell lists
+the parts of that type that fit the row's scope.
+"""
+
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.crud import augmented_part as augmented_part_crud
+from app.crud import fit as fit_crud
+from app.crud import part_type as part_type_crud
+from app.crud import scope_info as scope_info_crud
+from app.models.fit import FitLabel
+
+SCOPE_TYPE_NAME = "Scope"
+
+# "exact" outranks "possible" when the same part fits a scope via several fits.
+_LABEL_RANK = {FitLabel.EXACT.value: 2, FitLabel.POSSIBLE.value: 1}
+
+
+async def build(
+    db: AsyncSession,
+    *,
+    description: str = "",
+    manufacturer_id: int | None = None,
+    scope_model_id: int | None = None,
+    sub_part_type_id: int | None = None,
+    fits_part_type_id: int | None = None,
+) -> dict:
+    """Return the context for ``scopes.html``.
+
+    The scope rows are narrowed by the scope-attribute filters (``description``
+    matches the scope's description; the ``*_id`` filters match exactly).
+    ``fits_part_type_id`` keeps only scopes that have at least one (non-``none``)
+    fit for that part type.
+
+    Shape::
+
+        {
+            "column_types": [PartType, ...],   # non-Scope, ordered by name
+            "rows": [
+                {
+                    "scope": AugmentedPart,
+                    "info": ScopeInfo | None,
+                    "cells": {part_type_id: [{"part": AugmentedPart, "label": str}]},
+                },
+                ...,
+            ],
+        }
+    """
+    part_types = await part_type_crud.list_all(db, limit=1000)
+    scope_type = next(
+        (pt for pt in part_types if pt.name == SCOPE_TYPE_NAME), None
+    )
+    column_types = [
+        pt for pt in part_types if scope_type is None or pt.id != scope_type.id
+    ]
+
+    if scope_type is None:
+        return {"column_types": column_types, "rows": []}
+
+    scopes = await augmented_part_crud.list_filtered(
+        db,
+        description=description,
+        manufacturer_id=manufacturer_id,
+        scope_model_id=scope_model_id,
+        sub_part_type_id=sub_part_type_id,
+        part_type_id=scope_type.id,
+        limit=1000,
+    )
+    scope_ids = {s.id for s in scopes}
+    if not scope_ids:
+        return {"column_types": column_types, "rows": []}
+
+    fits = await fit_crud.list_for_parts(
+        db, list(scope_ids), exclude_label=FitLabel.NONE
+    )
+
+    # Resolve the "other" (non-scope) part on each fit in a single batched query.
+    other_ids: set[int] = set()
+    for fit in fits:
+        scope_id, other_id = _scope_and_other(fit, scope_ids)
+        if scope_id is not None and other_id not in scope_ids:
+            other_ids.add(other_id)
+    other_parts = {
+        p.id: p for p in await augmented_part_crud.get_many(db, list(other_ids))
+    }
+
+    infos = {
+        info.augmented_part_id: info
+        for info in await scope_info_crud.list_by_augmented_parts(db, list(scope_ids))
+    }
+
+    # cell_map[scope_id][type_id][other_part_id] -> {"part", "label"}, dedup'd so a
+    # part appears once per cell, keeping its strongest fit label.
+    cell_map: dict[int, dict[int, dict[int, dict]]] = {
+        sid: {} for sid in scope_ids
+    }
+    for fit in fits:
+        scope_id, other_id = _scope_and_other(fit, scope_ids)
+        if scope_id is None:
+            continue
+        other = other_parts.get(other_id)
+        if other is None or other.part_type_id == scope_type.id:
+            continue  # scope-to-scope fits have no column
+        by_type = cell_map[scope_id].setdefault(other.part_type_id, {})
+        existing = by_type.get(other.id)
+        label = fit.label.value
+        if existing is None or _LABEL_RANK[label] > _LABEL_RANK[existing["label"]]:
+            by_type[other.id] = {"part": other, "label": label}
+
+    rows = []
+    for scope in scopes:
+        cells = {
+            type_id: sorted(
+                entries.values(), key=lambda e: e["part"].description.lower()
+            )
+            for type_id, entries in cell_map[scope.id].items()
+        }
+        if fits_part_type_id is not None and fits_part_type_id not in cells:
+            continue  # scope has no fit for the required accessory type
+        rows.append(
+            {"scope": scope, "info": infos.get(scope.id), "cells": cells}
+        )
+
+    return {"column_types": column_types, "rows": rows}
+
+
+def _scope_and_other(fit, scope_ids: set[int]) -> tuple[int | None, int]:
+    """Return (scope_part_id, other_part_id) for a fit, or (None, _) if neither
+    side is a scope. When both sides are scopes, side A is treated as the scope."""
+    if fit.augmented_part_a_id in scope_ids:
+        return fit.augmented_part_a_id, fit.augmented_part_b_id
+    if fit.augmented_part_b_id in scope_ids:
+        return fit.augmented_part_b_id, fit.augmented_part_a_id
+    return None, fit.augmented_part_b_id

app/static/css/style.css

@@ -493,6 +493,16 @@ textarea:focus {
 
 .fit-notes { margin-top: 0.4rem; padding-left: 0.25rem; }
 
+/* Scope guide: stacked matching-part entries within a fit column cell. */
+.fit-cell-item {
+  display: flex;
+  align-items: center;
+  gap: 0.4rem;
+  font-size: 0.85rem;
+  white-space: nowrap;
+}
+.fit-cell-item + .fit-cell-item { margin-top: 0.3rem; }
+
 .fit-note { font-size: 0.85rem; margin-bottom: 0.3rem; }
 .fit-note-meta { color: var(--muted); font-size: 0.75rem; }
 .fit-note-body { margin: 0.1rem 0 0; }

app/templates/_nav.html

@@ -5,6 +5,7 @@
 {% set can_labels = su or "attachment_point_names:read" in p or "manufacturers:read" in p or "part_colours:read" in p or "part_types:read" in p or "scope_models:read" in p or "sub_part_types:read" in p %}
 {% set can_database = su or "imported_parts:read" in p or "augmented_parts:read" in p or "attachment_points:read" in p %}
 {% set can_parts = can_connections or can_labels or can_database %}
+{% set can_scopes = su or ("augmented_parts:read" in p and "fits:read" in p) %}
 
 {# ── SVG icon sprite ───────────────────────────────────────────────────────── #}
 <svg xmlns="http://www.w3.org/2000/svg" style="display:none">
@@ -127,6 +128,10 @@
   <nav>
     <a href="/">{{ icon("home") }} Dashboard</a>
 
+    {% if can_scopes %}
+    <a href="/scopes">{{ icon("crosshair") }} Scopes</a>
+    {% endif %}
+
     {% if can_admin %}
     <div class="nav-group">
       <span class="nav-label">{{ icon("shield") }} Admin ▾</span>

app/templates/_scopes_table_card.html

@@ -0,0 +1,71 @@
+{%- macro mag(v) -%}{{ v | int if v == v | int else v | round(1) }}{%- endmacro -%}
+{%- macro magnification(info) -%}
+  {%- if info and info.magnification_min is not none and info.magnification_max is not none -%}
+    {{ mag(info.magnification_min) }}–{{ mag(info.magnification_max) }}×
+  {%- elif info and info.magnification_min is not none -%}
+    {{ mag(info.magnification_min) }}×
+  {%- elif info and info.magnification_max is not none -%}
+    {{ mag(info.magnification_max) }}×
+  {%- else -%}
+    <span class="muted">—</span>
+  {%- endif -%}
+{%- endmacro -%}
+<div id="scopes-table-card" class="card" style="overflow-x:auto">
+  <table class="table">
+    <thead>
+      <tr>
+        <th>Scope</th>
+        <th>Manufacturer</th>
+        <th>Model</th>
+        <th>Type</th>
+        <th>Magnification</th>
+        <th>Objective thread</th>
+        {% for ct in column_types %}
+          <th>{{ ct.name }}</th>
+        {% endfor %}
+      </tr>
+    </thead>
+    <tbody>
+      {% for row in rows %}
+        {% set scope = row.scope %}
+        {% set info = row.info %}
+        <tr>
+          <td>
+            <strong><a href="/admin/augmented-parts/{{ scope.id }}">{{ scope.description }}</a></strong>
+            {% if scope.sku %}<br><span class="muted">{{ scope.sku }}</span>{% endif %}
+          </td>
+          <td>{{ scope.manufacturer.name if scope.manufacturer else "—" }}</td>
+          <td>{{ scope.scope_model.name if scope.scope_model else "—" }}</td>
+          <td>{{ scope.sub_part_type.name if scope.sub_part_type else "—" }}</td>
+          <td>{{ magnification(info) }}</td>
+          <td>
+            {% if info and info.objective_thread_pitch %}
+              {{ info.objective_thread_pitch }}
+            {% else %}<span class="muted">—</span>{% endif %}
+          </td>
+          {% for ct in column_types %}
+            {% set entries = row.cells.get(ct.id) %}
+            <td>
+              {% if entries %}
+                {% for e in entries %}
+                  <div class="fit-cell-item">
+                    <span class="fit-badge fit-badge-{{ e.label }}">{{ e.label | capitalize }}</span>
+                    <a href="/admin/augmented-parts/{{ e.part.id }}">{{ e.part.description | truncate(48) }}</a>
+                  </div>
+                {% endfor %}
+              {% else %}
+                <span class="muted">—</span>
+              {% endif %}
+            </td>
+          {% endfor %}
+        </tr>
+      {% else %}
+        <tr>
+          <td colspan="{{ 6 + column_types | length }}" class="muted">
+            No scopes match your search.
+          </td>
+        </tr>
+      {% endfor %}
+    </tbody>
+  </table>
+</div>

app/templates/admin/_augmented_part_fit_row.html

@@ -19,6 +19,7 @@
     <span class="fit-item-arrow">↔</span>
     <span class="fit-item-side">{{ other_part.description if other_part else "Unknown part" }} — <strong>{{ other_ap.attachment_point_name.name }}</strong> ({{ conn_desc(other_ap) }})</span>
   </div>
+  {% if can_write %}
   <div class="row-actions">
     {% if fit.label.value != "exact" %}
       <button class="btn btn-ghost"
@@ -44,6 +45,7 @@
             hx-swap="outerHTML"
             hx-confirm="Delete this fit?">Delete</button>
   </div>
+  {% endif %}
 
   <div class="fit-notes">
     {% for note in fit.notes %}
@@ -52,11 +54,13 @@
         <p class="fit-note-body">{{ note.body }}</p>
       </div>
     {% endfor %}
+    {% if can_write %}
     <form hx-post="/admin/augmented-parts/{{ augmented_part_id }}/fits/{{ fit.id }}/notes"
           hx-target="#fit-{{ fit.id }}" hx-swap="outerHTML"
           class="inline-edit fit-note-form">
       <input type="text" name="body" placeholder="Add a note…" required>
       <button type="submit" class="btn btn-ghost">Add note</button>
     </form>
+    {% endif %}
   </div>
 </div>

app/templates/admin/_augmented_part_fits.html

@@ -12,6 +12,7 @@
     <p class="muted" style="font-size:0.85rem;margin:0 0 0.5rem">No fits recorded yet.</p>
   {% endfor %}
 
+  {% if can_write %}
   <div class="row-actions" style="margin:0.5rem 0">
     <form hx-post="/admin/augmented-parts/{{ augmented_part_id }}/fits/recompute"
           hx-target="#ap-{{ augmented_part_id }}-fits" hx-swap="outerHTML">
@@ -46,4 +47,5 @@
     <div id="ap-{{ augmented_part_id }}-fit-other-points"></div>
     <button type="submit" class="btn btn-primary">Add fit</button>
   </form>
+  {% endif %}
 </div>

app/templates/admin/_augmented_part_row.html

@@ -1,7 +1,7 @@
 <tr id="augmented-part-{{ ap.id }}">
   <td>{{ ap.id }}</td>
   <td>{{ ap.sku or '—' }}</td>
-  <td>{{ ap.description | truncate(60) }}</td>
+  <td><a href="/admin/augmented-parts/{{ ap.id }}">{{ ap.description | truncate(60) }}</a></td>
   <td>{{ ap.colour.name }}</td>
   <td>{{ ap.manufacturer.name }}</td>
   <td>{{ ap.scope_model.name if ap.scope_model else '—' }}</td>

app/templates/admin/augmented_part_detail.html

@@ -0,0 +1,85 @@
+{% extends "base.html" %}
+{% block title %}{{ ap.description | truncate(40) }} · {{ app_name }}{% endblock %}
+{% block body %}
+{% include "_nav.html" %}
+
+{%- macro conn_desc(point) -%}
+  {%- if point.iso_thread -%}
+    ISO M{{ point.iso_thread.diameter_mm }}×{{ point.iso_thread.pitch_mm }}
+  {%- elif point.unc_thread -%}
+    UNC {{ point.unc_thread.diameter_fraction }}-{{ point.unc_thread.tpi }} {{ point.unc_thread.series.value }}
+  {%- elif point.clamp_connection -%}
+    Clamp {{ point.clamp_connection.min_mm if point.clamp_connection.min_mm is not none else point.clamp_connection.min_in }}–{{ point.clamp_connection.max_mm if point.clamp_connection.max_mm is not none else point.clamp_connection.max_in }}
+  {%- elif point.static_connection -%}
+    Static {{ point.static_connection.od_mm }} mm OD
+  {%- else -%}
+    —
+  {%- endif -%}
+{%- endmacro -%}
+
+<main class="container">
+  <p><a href="/admin/augmented-parts" class="btn btn-ghost">← Augmented Parts</a></p>
+
+  <h1>{{ ap.description }}</h1>
+  <p class="muted">
+    <span class="tag">{{ ap.part_type.name }}</span>
+    {% if ap.sub_part_type %}<span class="tag">{{ ap.sub_part_type.name }}</span>{% endif %}
+    {% if ap.sku %}· SKU {{ ap.sku }}{% endif %}
+  </p>
+
+  <div class="grid">
+    <div class="card">
+      <h2>Details</h2>
+      <dl class="kv">
+        <dt>SKU</dt><dd>{{ ap.sku or "—" }}</dd>
+        <dt>Description</dt><dd>{{ ap.description }}</dd>
+        <dt>Colour</dt><dd>{{ ap.colour.name if ap.colour else "—" }}</dd>
+        <dt>Manufacturer</dt><dd>{{ ap.manufacturer.name if ap.manufacturer else "—" }}</dd>
+        <dt>Type</dt><dd>{{ ap.part_type.name }}</dd>
+        <dt>Sub type</dt><dd>{{ ap.sub_part_type.name if ap.sub_part_type else "—" }}</dd>
+        <dt>Scope model</dt>
+        <dd>
+          {% if ap.scope_model %}
+            {{ ap.scope_model.name }}
+            {% if ap.scope_model.url %} · <a href="{{ ap.scope_model.url }}" target="_blank" rel="noopener">link</a>{% endif %}
+          {% else %}—{% endif %}
+        </dd>
+      </dl>
+    </div>
+
+    {% if scope_info %}
+    <div class="card">
+      <h2>Scope information</h2>
+      <dl class="kv">
+        <dt>Magnification</dt>
+        <dd>
+          {% if scope_info.magnification_min is not none or scope_info.magnification_max is not none %}
+            {{ scope_info.magnification_min if scope_info.magnification_min is not none else "?" }}–{{ scope_info.magnification_max if scope_info.magnification_max is not none else "?" }}×
+          {% else %}—{% endif %}
+        </dd>
+        <dt>Model suffix</dt><dd>{{ scope_info.model_suffix or "—" }}</dd>
+        <dt>Objective thread</dt><dd>{{ scope_info.objective_thread_pitch or "—" }}</dd>
+      </dl>
+    </div>
+    {% endif %}
+
+    <div class="card">
+      <h2>Attachment points</h2>
+      {% for point in attachment_points %}
+        <div class="ap-item">
+          <span class="ap-item-name">{{ point.attachment_point_name.name }}</span>
+          <code class="ap-item-conn">{{ conn_desc(point) }}</code>
+        </div>
+      {% else %}
+        <p class="muted">No attachment points recorded.</p>
+      {% endfor %}
+    </div>
+  </div>
+
+  {% if can_read_fits %}
+  <div class="card">
+    {% include "admin/_augmented_part_fits.html" %}
+  </div>
+  {% endif %}
+</main>
+{% endblock %}

app/templates/scopes.html

@@ -0,0 +1,49 @@
+{% extends "base.html" %}
+{% block title %}Scopes · {{ app_name }}{% endblock %}
+{% block body %}
+{% include "_nav.html" %}
+<main class="container">
+  <h1>Scopes</h1>
+  <p class="muted">
+    Every scope on record, with the accessories that fit it. Each part-type
+    column lists matching parts; <span class="fit-badge fit-badge-exact">Exact</span>
+    is a confirmed fit, <span class="fit-badge fit-badge-possible">Possible</span> a candidate.
+  </p>
+
+  <div class="filter-bar">
+    <form hx-get="/scopes/filter"
+          hx-target="#scopes-table-card"
+          hx-trigger="input delay:300ms, change"
+          hx-swap="outerHTML">
+      <input type="text" name="description" placeholder="Search scopes…"
+             value="{{ filters.description or '' }}">
+      <select name="manufacturer_id">
+        <option value="">All manufacturers</option>
+        {% for m in manufacturers %}
+          <option value="{{ m.id }}" {{ "selected" if filters.manufacturer_id and filters.manufacturer_id|int == m.id }}>{{ m.name }}</option>
+        {% endfor %}
+      </select>
+      <select name="scope_model_id">
+        <option value="">All models</option>
+        {% for sm in scope_models %}
+          <option value="{{ sm.id }}" {{ "selected" if filters.scope_model_id and filters.scope_model_id|int == sm.id }}>{{ sm.name }}</option>
+        {% endfor %}
+      </select>
+      <select name="sub_part_type_id">
+        <option value="">All types</option>
+        {% for spt in sub_part_types %}
+          <option value="{{ spt.id }}" {{ "selected" if filters.sub_part_type_id and filters.sub_part_type_id|int == spt.id }}>{{ spt.name }}</option>
+        {% endfor %}
+      </select>
+      <select name="fits_part_type_id">
+        <option value="">Fits any accessory</option>
+        {% for ct in column_types %}
+          <option value="{{ ct.id }}" {{ "selected" if filters.fits_part_type_id and filters.fits_part_type_id|int == ct.id }}>Fits {{ ct.name }}</option>
+        {% endfor %}
+      </select>
+    </form>
+  </div>
+
+  {% include "_scopes_table_card.html" %}
+</main>
+{% endblock %}

app/web/admin.py

@@ -26,6 +26,7 @@ from app.crud import manufacturer as manufacturer_crud
 from app.crud import part_colour as part_colour_crud
 from app.crud import part_type as part_type_crud
 from app.crud import role as role_crud
+from app.crud import scope_info as scope_info_crud
 from app.crud import scope_model as scope_model_crud
 from app.crud import attachment_point as attachment_point_crud
 from app.crud import attachment_point_name as apn_crud
@@ -1780,6 +1781,37 @@ async def filter_skipped_parts(
     )
 
 
+@router.get("/augmented-parts/{augmented_part_id}", response_class=HTMLResponse)
+async def augmented_part_detail(
+    request: Request,
+    augmented_part_id: int,
+    db: AsyncSession = Depends(get_db),
+    user: User = Depends(web_require("augmented_parts:read")),
+):
+    ap = await augmented_part_crud.get(db, augmented_part_id)
+    if ap is None:
+        raise HTTPException(status_code=404, detail="Augmented part not found")
+    can_read_fits = user.is_superuser or "fits:read" in user.permissions
+    ctx = {
+        "user": user,
+        "ap": ap,
+        "scope_info": await scope_info_crud.get_by_augmented_part(
+            db, augmented_part_id
+        ),
+        "attachment_points": await attachment_point_crud.list_for_augmented_part(
+            db, augmented_part_id
+        ),
+        "can_read_fits": can_read_fits,
+    }
+    if can_read_fits:
+        ctx.update(
+            await _augmented_part_fits_ctx(
+                db, augmented_part_id, can_write=_can_write_fits(user)
+            )
+        )
+    return templates.TemplateResponse(request, "admin/augmented_part_detail.html", ctx)
+
+
 @router.get("/augmented-parts/{augmented_part_id}/edit", response_class=HTMLResponse)
 async def edit_augmented_part_row(
     request: Request,
@@ -2102,10 +2134,15 @@ async def _fit_view(db: AsyncSession, fit, part_id: int) -> dict:
     }
 
 
+def _can_write_fits(user: User) -> bool:
+    return user.is_superuser or "fits:write" in user.permissions
+
+
 async def _augmented_part_fits_ctx(
     db: AsyncSession,
     augmented_part_id: int,
     *,
+    can_write: bool = True,
     message: str | None = None,
     error: str | None = None,
 ) -> dict:
@@ -2122,6 +2159,7 @@ async def _augmented_part_fits_ctx(
             db, augmented_part_id
         ),
         "other_parts": other_parts,
+        "can_write": can_write,
         "message": message,
         "error": error,
     }
@@ -2132,9 +2170,11 @@ async def augmented_part_fits(
     request: Request,
     augmented_part_id: int,
     db: AsyncSession = Depends(get_db),
-    _: User = Depends(web_require("fits:read")),
+    user: User = Depends(web_require("fits:read")),
 ):
-    ctx = await _augmented_part_fits_ctx(db, augmented_part_id)
+    ctx = await _augmented_part_fits_ctx(
+        db, augmented_part_id, can_write=_can_write_fits(user)
+    )
     return templates.TemplateResponse(request, "admin/_augmented_part_fits.html", ctx)
 
 
@@ -2162,6 +2202,7 @@ async def recompute_augmented_part_fits(
     ctx = await _augmented_part_fits_ctx(
         db,
         augmented_part_id,
+        can_write=_can_write_fits(actor),
         message=f"{result.created} created, {result.removed} removed.",
     )
     return templates.TemplateResponse(request, "admin/_augmented_part_fits.html", ctx)
@@ -2223,7 +2264,9 @@ async def create_augmented_part_fit(
                     "Fit", fit.id, f"attachment points {ap_a.id}↔{ap_b.id}"
                 ),
             )
-    ctx = await _augmented_part_fits_ctx(db, augmented_part_id, error=error)
+    ctx = await _augmented_part_fits_ctx(
+        db, augmented_part_id, can_write=_can_write_fits(actor), error=error
+    )
     return templates.TemplateResponse(request, "admin/_augmented_part_fits.html", ctx)
 
 
@@ -2255,7 +2298,11 @@ async def update_augmented_part_fit_label(
     return templates.TemplateResponse(
         request,
         "admin/_augmented_part_fit_row.html",
-        {"augmented_part_id": augmented_part_id, **view},
+        {
+            "augmented_part_id": augmented_part_id,
+            "can_write": _can_write_fits(actor),
+            **view,
+        },
     )
 
 
@@ -2281,7 +2328,11 @@ async def create_augmented_part_fit_note(
     return templates.TemplateResponse(
         request,
         "admin/_augmented_part_fit_row.html",
-        {"augmented_part_id": augmented_part_id, **view},
+        {
+            "augmented_part_id": augmented_part_id,
+            "can_write": _can_write_fits(actor),
+            **view,
+        },
     )
 
 
@@ -2309,7 +2360,9 @@ async def delete_augmented_part_fit(
             resource_id=fit_id,
             description=audit_crud.describe_delete("Fit", fit_id, label),
         )
-    ctx = await _augmented_part_fits_ctx(db, augmented_part_id)
+    ctx = await _augmented_part_fits_ctx(
+        db, augmented_part_id, can_write=_can_write_fits(actor)
+    )
     return templates.TemplateResponse(request, "admin/_augmented_part_fits.html", ctx)
 
 

app/web/scopes.py

@@ -0,0 +1,103 @@
+"""Top-level, read-only scope fit guide at ``/scopes``.
+
+The site's primary view: a table of scopes with their specs, plus one column per
+non-Scope part type listing the accessories that fit each scope. Supports HTMX
+search/filter over scope attributes and required accessory fits.
+"""
+
+from fastapi import APIRouter, Depends, Request
+from fastapi.responses import HTMLResponse
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.core.database import get_db
+from app.crud import manufacturer as manufacturer_crud
+from app.crud import part_type as part_type_crud
+from app.crud import scope_model as scope_model_crud
+from app.crud import sub_part_type as sub_part_type_crud
+from app.models.user import User
+from app.services import scope_guide as scope_guide_service
+from app.web.admin import web_require
+from app.web.templates import templates
+
+router = APIRouter(include_in_schema=False)
+
+
+def _to_int(value: str) -> int | None:
+    return int(value) if value.strip() else None
+
+
+async def _build(db: AsyncSession, filters: dict) -> dict:
+    """Run the guide query for the given raw (string) filter values."""
+    return await scope_guide_service.build(
+        db,
+        description=filters["description"],
+        manufacturer_id=_to_int(filters["manufacturer_id"]),
+        scope_model_id=_to_int(filters["scope_model_id"]),
+        sub_part_type_id=_to_int(filters["sub_part_type_id"]),
+        fits_part_type_id=_to_int(filters["fits_part_type_id"]),
+    )
+
+
+async def _filter_options(db: AsyncSession) -> dict:
+    """Dropdown option lists for the filter bar."""
+    scope_type = await part_type_crud.get_by_name(
+        db, scope_guide_service.SCOPE_TYPE_NAME
+    )
+    sub_part_types = [
+        spt
+        for spt in await sub_part_type_crud.list_all(db, limit=1000)
+        if scope_type is not None and spt.part_type_id == scope_type.id
+    ]
+    return {
+        "manufacturers": await manufacturer_crud.list_all(db, limit=1000),
+        "scope_models": await scope_model_crud.list_all(db, limit=1000),
+        "sub_part_types": sub_part_types,
+    }
+
+
+@router.get("/scopes", response_class=HTMLResponse)
+async def scopes_page(
+    request: Request,
+    description: str = "",
+    manufacturer_id: str = "",
+    scope_model_id: str = "",
+    sub_part_type_id: str = "",
+    fits_part_type_id: str = "",
+    db: AsyncSession = Depends(get_db),
+    user: User = Depends(web_require("augmented_parts:read", "fits:read")),
+):
+    filters = {
+        "description": description,
+        "manufacturer_id": manufacturer_id,
+        "scope_model_id": scope_model_id,
+        "sub_part_type_id": sub_part_type_id,
+        "fits_part_type_id": fits_part_type_id,
+    }
+    guide = await _build(db, filters)
+    return templates.TemplateResponse(
+        request,
+        "scopes.html",
+        {"user": user, "filters": filters, **guide, **(await _filter_options(db))},
+    )
+
+
+@router.get("/scopes/filter", response_class=HTMLResponse)
+async def scopes_filter(
+    request: Request,
+    description: str = "",
+    manufacturer_id: str = "",
+    scope_model_id: str = "",
+    sub_part_type_id: str = "",
+    fits_part_type_id: str = "",
+    db: AsyncSession = Depends(get_db),
+    _: User = Depends(web_require("augmented_parts:read", "fits:read")),
+):
+    filters = {
+        "description": description,
+        "manufacturer_id": manufacturer_id,
+        "scope_model_id": scope_model_id,
+        "sub_part_type_id": sub_part_type_id,
+        "fits_part_type_id": fits_part_type_id,
+    }
+    guide = await _build(db, filters)
+    return templates.TemplateResponse(request, "_scopes_table_card.html", guide)

tests/test_augmented_part_detail.py

@@ -0,0 +1,152 @@
+import pytest
+
+from app.crud import role as role_crud
+from app.models.attachment_point import AttachmentPoint
+from app.models.attachment_point_name import AttachmentPointName
+from app.models.augmented_part import AugmentedPart
+from app.models.fit import Fit, FitLabel
+from app.models.part_type import PartType
+from app.models.scope_info import ScopeInfo
+
+
+async def _seed_part_with_fit(db):
+    apn = AttachmentPointName(name="Objective")
+    scope_t = PartType(name="Scope")
+    cover_t = PartType(name="Flip Cover")
+    db.add_all([apn, scope_t, cover_t])
+    await db.flush()
+
+    scope = AugmentedPart(
+        description="Alpha 3-18x50",
+        sku="ALP-318",
+        colour_id=1,
+        manufacturer_id=1,
+        part_type_id=scope_t.id,
+    )
+    cover = AugmentedPart(
+        description="Flip cover 50mm",
+        colour_id=1,
+        manufacturer_id=1,
+        part_type_id=cover_t.id,
+    )
+    db.add_all([scope, cover])
+    await db.flush()
+
+    db.add(
+        ScopeInfo(
+            augmented_part_id=scope.id,
+            magnification_min=3,
+            magnification_max=18,
+            objective_thread_pitch="M52x0.75",
+        )
+    )
+    ap_s = AttachmentPoint(
+        augmented_part_id=scope.id, attachment_point_name_id=apn.id
+    )
+    ap_c = AttachmentPoint(
+        augmented_part_id=cover.id, attachment_point_name_id=apn.id
+    )
+    db.add_all([ap_s, ap_c])
+    await db.flush()
+
+    db.add(
+        Fit(
+            attachment_point_a_id=ap_s.id,
+            attachment_point_b_id=ap_c.id,
+            augmented_part_a_id=scope.id,
+            augmented_part_b_id=cover.id,
+            label=FitLabel.POSSIBLE,
+        )
+    )
+    await db.commit()
+    return {"scope_id": scope.id, "cover_id": cover.id}
+
+
+async def _web_login(client, email, password="secret123"):
+    resp = await client.post("/login", data={"email": email, "password": password})
+    assert resp.status_code == 303
+
+
+@pytest.mark.asyncio
+async def test_detail_shows_attributes_and_fits_readonly(
+    client, seeded, make_user, db_sessionmaker
+):
+    async with db_sessionmaker() as db:
+        ids = await _seed_part_with_fit(db)
+    # The default "user" role has augmented_parts:read + fits:read, NOT fits:write.
+    await make_user("reader@example.com", role_ids=[seeded["roles"]["user"].id])
+    await _web_login(client, "reader@example.com")
+
+    resp = await client.get(f"/admin/augmented-parts/{ids['scope_id']}")
+    assert resp.status_code == 200
+    body = resp.text
+    # Attributes
+    assert "Alpha 3-18x50" in body
+    assert "ALP-318" in body
+    assert "M52x0.75" in body  # scope info
+    assert "Objective" in body  # attachment point
+    # Fits are shown (the other part in the fit)
+    assert "Flip cover 50mm" in body
+    # ...but write controls are hidden for a read-only user
+    assert "Add fit" not in body
+    assert "Mark Exact" not in body
+    assert "Recompute possible fits" not in body
+
+
+@pytest.mark.asyncio
+async def test_detail_write_controls_for_fit_editor(
+    client, seeded, make_user, db_sessionmaker
+):
+    async with db_sessionmaker() as db:
+        ids = await _seed_part_with_fit(db)
+        perms = seeded["perms"]
+        editor = await role_crud.create(
+            db,
+            name="fit-editor",
+            permission_ids=[
+                perms["augmented_parts:read"].id,
+                perms["fits:read"].id,
+                perms["fits:write"].id,
+            ],
+        )
+        editor_id = editor.id
+    await make_user("editor@example.com", role_ids=[editor_id])
+    await _web_login(client, "editor@example.com")
+
+    resp = await client.get(f"/admin/augmented-parts/{ids['scope_id']}")
+    assert resp.status_code == 200
+    body = resp.text
+    assert "Add fit" in body
+    assert "Mark Exact" in body
+    assert "Recompute possible fits" in body
+
+
+@pytest.mark.asyncio
+async def test_detail_404_for_missing_part(client, seeded, make_user):
+    await make_user("reader2@example.com", role_ids=[seeded["roles"]["user"].id])
+    await _web_login(client, "reader2@example.com")
+    resp = await client.get("/admin/augmented-parts/99999")
+    assert resp.status_code == 404
+
+
+@pytest.mark.asyncio
+async def test_detail_requires_read_permission(client, seeded, make_user, db_sessionmaker):
+    async with db_sessionmaker() as db:
+        ids = await _seed_part_with_fit(db)
+    await make_user("plain@example.com")  # no roles, not superuser
+    await _web_login(client, "plain@example.com")
+    resp = await client.get(f"/admin/augmented-parts/{ids['scope_id']}")
+    assert resp.status_code == 403
+
+
+@pytest.mark.asyncio
+async def test_augmented_parts_list_links_to_detail(
+    client, seeded, make_user, db_sessionmaker
+):
+    async with db_sessionmaker() as db:
+        ids = await _seed_part_with_fit(db)
+    await make_user("reader3@example.com", role_ids=[seeded["roles"]["user"].id])
+    await _web_login(client, "reader3@example.com")
+    resp = await client.get("/admin/augmented-parts")
+    assert resp.status_code == 200
+    assert f'href="/admin/augmented-parts/{ids["scope_id"]}"' in resp.text

tests/test_scope_guide.py

@@ -0,0 +1,241 @@
+import pytest
+
+from app.models.augmented_part import AugmentedPart
+from app.models.fit import Fit, FitLabel
+from app.models.part_type import PartType
+from app.models.scope_info import ScopeInfo
+from app.models.sub_part_type import SubPartType
+from app.services import scope_guide
+
+
+async def _seed_guide_data(db):
+    scope_t = PartType(name="Scope")
+    cover_t = PartType(name="Flip Cover")
+    ard_t = PartType(name="ARD")
+    db.add_all([scope_t, cover_t, ard_t])
+    await db.flush()
+
+    rifle = SubPartType(name="Riflescope", part_type_id=scope_t.id)
+    reddot = SubPartType(name="Red Dot", part_type_id=scope_t.id)
+    db.add_all([rifle, reddot])
+    await db.flush()
+
+    def part(desc, type_id, manufacturer_id=1, sub_part_type_id=None):
+        p = AugmentedPart(
+            description=desc,
+            colour_id=1,
+            manufacturer_id=manufacturer_id,
+            part_type_id=type_id,
+            sub_part_type_id=sub_part_type_id,
+        )
+        db.add(p)
+        return p
+
+    s1 = part("Alpha 3-18x50", scope_t.id, manufacturer_id=10, sub_part_type_id=rifle.id)
+    s2 = part("Zeta 1-6x24", scope_t.id, manufacturer_id=20, sub_part_type_id=reddot.id)
+    fc1 = part("Flip cover 50mm", cover_t.id)
+    a1 = part("ARD 50mm", ard_t.id)
+    a2 = part("ARD 56mm", ard_t.id)
+    await db.flush()
+
+    db.add(
+        ScopeInfo(
+            augmented_part_id=s1.id,
+            magnification_min=3,
+            magnification_max=18,
+            objective_thread_pitch="M52x0.75",
+        )
+    )
+
+    def fit(ap_a, ap_b, a, b, label):
+        db.add(
+            Fit(
+                attachment_point_a_id=ap_a,
+                attachment_point_b_id=ap_b,
+                augmented_part_a_id=a.id,
+                augmented_part_b_id=b.id,
+                label=label,
+            )
+        )
+
+    # S1 fits FC1 (exact) via two attachment points -> should dedup to one exact.
+    fit(1, 2, s1, fc1, FitLabel.POSSIBLE)
+    fit(3, 4, s1, fc1, FitLabel.EXACT)
+    # S1 fits A1 (possible); an explicit NONE to A2 must be excluded.
+    fit(5, 6, s1, a1, FitLabel.POSSIBLE)
+    fit(7, 8, s1, a2, FitLabel.NONE)
+    # S2 fits FC1 (possible); order reversed to exercise the b-side branch.
+    fit(9, 10, fc1, s2, FitLabel.POSSIBLE)
+    await db.commit()
+
+    return {
+        "scope": scope_t,
+        "cover": cover_t,
+        "ard": ard_t,
+        "s1": s1,
+        "s2": s2,
+        "rifle": rifle,
+        "reddot": reddot,
+    }
+
+
+@pytest.mark.asyncio
+async def test_build_columns_exclude_scope_type(db_sessionmaker):
+    async with db_sessionmaker() as db:
+        await _seed_guide_data(db)
+        guide = await scope_guide.build(db)
+
+    names = [ct.name for ct in guide["column_types"]]
+    assert names == ["ARD", "Flip Cover"]  # sorted, Scope excluded
+
+
+@pytest.mark.asyncio
+async def test_build_rows_group_fits_by_type_and_dedup(db_sessionmaker):
+    async with db_sessionmaker() as db:
+        ids = await _seed_guide_data(db)
+        guide = await scope_guide.build(db)
+
+    cover_id, ard_id = ids["cover"].id, ids["ard"].id
+    rows = {r["scope"].description: r for r in guide["rows"]}
+    assert list(rows) == ["Alpha 3-18x50", "Zeta 1-6x24"]  # ordered by description
+
+    s1 = rows["Alpha 3-18x50"]
+    # Two fits to the same cover collapse to one entry, keeping the exact label.
+    cover_cell = s1["cells"][cover_id]
+    assert [(e["part"].description, e["label"]) for e in cover_cell] == [
+        ("Flip cover 50mm", "exact")
+    ]
+    # Possible ARD present; the NONE-labelled ARD is excluded entirely.
+    ard_cell = s1["cells"][ard_id]
+    assert [(e["part"].description, e["label"]) for e in ard_cell] == [
+        ("ARD 50mm", "possible")
+    ]
+    assert s1["info"] is not None
+    assert s1["info"].magnification_max == 18
+
+    s2 = rows["Zeta 1-6x24"]
+    assert [e["part"].description for e in s2["cells"][cover_id]] == ["Flip cover 50mm"]
+    assert ard_id not in s2["cells"]  # no ARD fits for S2
+    assert s2["info"] is None
+
+
+@pytest.mark.asyncio
+async def test_build_no_scope_type_returns_empty_rows(db_sessionmaker):
+    async with db_sessionmaker() as db:
+        db.add(PartType(name="Flip Cover"))
+        await db.commit()
+        guide = await scope_guide.build(db)
+    assert guide["rows"] == []
+    assert [ct.name for ct in guide["column_types"]] == ["Flip Cover"]
+
+
+def _descriptions(guide):
+    return [r["scope"].description for r in guide["rows"]]
+
+
+@pytest.mark.asyncio
+async def test_build_filters_by_description(db_sessionmaker):
+    async with db_sessionmaker() as db:
+        await _seed_guide_data(db)
+        guide = await scope_guide.build(db, description="alpha")
+    assert _descriptions(guide) == ["Alpha 3-18x50"]
+
+
+@pytest.mark.asyncio
+async def test_build_filters_by_manufacturer(db_sessionmaker):
+    async with db_sessionmaker() as db:
+        await _seed_guide_data(db)
+        guide = await scope_guide.build(db, manufacturer_id=20)
+    assert _descriptions(guide) == ["Zeta 1-6x24"]
+
+
+@pytest.mark.asyncio
+async def test_build_filters_by_sub_part_type(db_sessionmaker):
+    async with db_sessionmaker() as db:
+        ids = await _seed_guide_data(db)
+        guide = await scope_guide.build(db, sub_part_type_id=ids["rifle"].id)
+    assert _descriptions(guide) == ["Alpha 3-18x50"]
+
+
+@pytest.mark.asyncio
+async def test_build_filters_by_required_fit_type(db_sessionmaker):
+    async with db_sessionmaker() as db:
+        ids = await _seed_guide_data(db)
+        # Only Alpha has an ARD fit; both scopes fit a flip cover.
+        ard_only = await scope_guide.build(db, fits_part_type_id=ids["ard"].id)
+        cover = await scope_guide.build(db, fits_part_type_id=ids["cover"].id)
+    assert _descriptions(ard_only) == ["Alpha 3-18x50"]
+    assert _descriptions(cover) == ["Alpha 3-18x50", "Zeta 1-6x24"]
+
+
+async def _web_login(client, email, password="secret123"):
+    resp = await client.post(
+        "/login", data={"email": email, "password": password}
+    )
+    assert resp.status_code == 303
+
+
+@pytest.mark.asyncio
+async def test_scopes_page_renders_for_reader(client, seeded, make_user):
+    await make_user("reader@example.com", role_ids=[seeded["roles"]["user"].id])
+    await _web_login(client, "reader@example.com")
+    resp = await client.get("/scopes")
+    assert resp.status_code == 200
+    assert "Scopes" in resp.text
+
+
+@pytest.mark.asyncio
+async def test_scopes_page_renders_rows_and_fits(
+    client, seeded, make_user, db_sessionmaker
+):
+    async with db_sessionmaker() as db:
+        await _seed_guide_data(db)
+    await make_user("reader2@example.com", role_ids=[seeded["roles"]["user"].id])
+    await _web_login(client, "reader2@example.com")
+    resp = await client.get("/scopes")
+    assert resp.status_code == 200
+    body = resp.text
+    assert "Alpha 3-18x50" in body  # scope row
+    assert "Flip cover 50mm" in body  # a matching part in a fit column
+    assert "fit-badge-exact" in body  # the exact fit badge
+    assert "M52x0.75" in body  # scope info: objective thread
+    assert "3–18×" in body  # magnification range, integral values un-padded
+
+
+@pytest.mark.asyncio
+async def test_scopes_filter_endpoint_narrows_rows(
+    client, seeded, make_user, db_sessionmaker
+):
+    async with db_sessionmaker() as db:
+        await _seed_guide_data(db)
+    await make_user("reader3@example.com", role_ids=[seeded["roles"]["user"].id])
+    await _web_login(client, "reader3@example.com")
+    resp = await client.get("/scopes/filter", params={"description": "Alpha"})
+    assert resp.status_code == 200
+    assert "Alpha 3-18x50" in resp.text
+    assert "Zeta 1-6x24" not in resp.text
+
+
+@pytest.mark.asyncio
+async def test_scopes_filter_endpoint_forbidden_without_permission(
+    client, seeded, make_user
+):
+    await make_user("plain2@example.com")  # no roles, not a superuser
+    await _web_login(client, "plain2@example.com")
+    resp = await client.get("/scopes/filter")
+    assert resp.status_code == 403
+
+
+@pytest.mark.asyncio
+async def test_scopes_page_forbidden_without_permission(client, seeded, make_user):
+    await make_user("plain@example.com")  # no roles, not a superuser
+    await _web_login(client, "plain@example.com")
+    resp = await client.get("/scopes")
+    assert resp.status_code == 403
+
+
+@pytest.mark.asyncio
+async def test_scopes_page_redirects_when_anonymous(client):
+    resp = await client.get("/scopes")
+    assert resp.status_code == 302
+    assert resp.headers["location"] == "/login"