Merge pull request 'v0.3.0: OCR via camera, FAB UX, side drawer' (#4) from feature/ocr-camera into main

The h1 + tagline at the top of the main view were just taking
vertical space. Strip them. The "Finrod" wordmark now lives only
inside the side drawer, set in Cinzel (classical-inscription
serif, loaded from Google Fonts) alongside the Star of Fëanor
mark — matches the favicon and the loremaster vibe.

Body padding-top adjusted to 3.5 rem so the controls clear the
fixed hamburger button at the top-left.

CHANGELOG.md

@@ -0,0 +1,75 @@
+# Changelog
+
+All notable changes to finrod are documented here.
+
+Format: [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
+Versioning: [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [0.3.0] - 2026-06-09
+
+### Added
+- "Scan image" button next to the input pane: opens the phone's rear camera (or a file picker on desktop), runs OCR locally in the browser via Tesseract.js (loaded from esm.sh on first use), and replaces the editor contents with the recognised text. Language follows the "From" dropdown via an ISO 639-2 mapping; "Auto-detect" loads a common European set (`eng+por+deu+nld`). Progress status shows beneath the input ("Loading OCR engine…" → "OCR 40%" → "OCR done in 3.2s"). Zero image-size cost — same CDN pattern as CodeMirror.
+- Images are downscaled to 1600 px on the long edge before OCR. A 12 MP phone photo (~4000 px) drops to ~1.3 MP, making Tesseract 4-8× faster with no real accuracy loss for printed text. Smaller-than-1600 px inputs are passed through unchanged.
+- Adaptive thresholding (Bradley's method with integral images) binarises the downscaled image before OCR — drops hallucinated text from shadows, gradients, and surface texture on phone photos. Output is pure black-on-white, much closer to the scanned-page input Tesseract was trained on.
+- Per-word confidence filter (≥ 60) drops the low-confidence noise Tesseract still emits. Re-assembles lines from kept words; status line reports how many words were dropped.
+- Crop & rotate modal between image pick and OCR. After choosing an image, a modal pops up with cropperjs's drag-handle crop UI and Rotate left / Rotate right / Reset buttons. EXIF orientation is honoured automatically. Cancel / `Esc` / clicking the backdrop aborts; `Enter` accepts. Library lazy-loaded from esm.sh (no bundling).
+
+### Changed
+- "Scan image" button replaced with a floating action button at the bottom-right of the viewport, using a Material Symbols Outlined camera glyph (`photo_camera`) for consistent rendering across platforms (was a small text button in the input pane header).
+- "Translate" inline button replaced with a primary FAB using the `translate` Material Symbols icon, stacked directly under the camera FAB at the bottom-right corner (closest to the thumb on phones). The camera FAB is now the *secondary* in the stack, just above. Both 56 × 56 px, same accent fill. The translate FAB gains a pulsing-ring `busy` animation during a running translation; `goBtn.textContent` swap is gone (was meaningless for an icon-only button). `body` got `~9 rem` of bottom padding so content scrolls clear of the stack.
+- FAB stack rides above the on-screen keyboard on mobile via `interactive-widget=resizes-content` in the viewport meta tag (handled by Chrome on Android).
+- Layout: From / To dropdowns now occupy 2 columns at the top (was 3 columns including Model).
+- Model selector moved into a slide-out side drawer (hamburger menu in the top-left). Drawer opens from the left with a backdrop, closes via the X button, backdrop click, or `Esc`. Honours Android safe-area insets.
+- Page header (`h1 finrod` + tagline) removed from the main view to recover vertical space. The "Finrod" wordmark now lives only inside the side drawer, set in Cinzel (classical-inscription serif, loaded from Google Fonts) alongside the Star of Fëanor mark.
+- Default source language is now Dutch (was Auto-detect). Target stays English.
+- Crop modal:
+  - No default crop box. User drags on the image to draw the region; falls back to full image if they confirm without drawing.
+  - Buttons are now Material Symbols icons: `rotate_left`, `rotate_right`, `invert_colors` (new — see below), `check`. Cancel kept as text. The `check` (Use this) button is larger and more prominent. The Reset button was removed (rarely useful with no default box).
+  - Inner padding bumped to 2 rem so cropperjs's corner handles never sit on the right/bottom edges where Android's edge-swipe back gesture fires. iOS safe-area insets honoured on the backdrop and FAB.
+  - Header text is now a hint ("Drag on the image to select the text region") instead of a title.
+
+### Added
+- Camera viewfinder modal on mobile (via `navigator.mediaDevices.getUserMedia` with `facingMode: environment`) — replaces the `<input type=file capture>` flow. Tapping the shutter goes directly to the crop modal, skipping the OS-level "retake / use" confirm step. Falls back to the file picker if camera access is denied or unavailable; a "Pick from file" icon (`photo_library`) inside the camera modal also routes to the picker on demand.
+- Invert-colours toggle (`invert_colors`) in the crop modal. Tap to flip light-on-dark text into the dark-on-light polarity Tesseract expects. The grayscale buffer is inverted before adaptive thresholding so the binarised output is correct.
+- Mobile-first modal layout (≤ 640 px): the crop and camera modals now fill the viewport (no backdrop padding, no border-radius), buttons hug the screen edges in the footer, and the camera video occupies the entire body. Body still has ~20 px horizontal padding so cropper's corner handles stay outside Android's edge-swipe back-gesture zone. iOS notch / home-bar insets honoured.
+
+### Fixed
+- "Hot: …" status no longer claims "unloads in X" when the server's `keep_alive` is `-1` (Ollama returns an absurd year-4001 `expires_at`). Threshold: any expiry >7 days drops the suffix and just shows the model name.
+
+## [0.2.0] - 2026-06-09
+
+### Added
+- Vim bindings in the input via CodeMirror 6 + `@replit/codemirror-vim` (loaded from esm.sh, no build step). Supports `i`/`Esc`, `hjkl`, word/line motions, `dd`/`yy`/`p` (vim's internal register), undo/redo, `/` search, `:` command line. Auto-disabled on touch devices (detected via `(pointer: coarse)`) where modal editing fights the virtual keyboard.
+- `Shift-H` / `Shift-L` cycle focus across the page controls (source → target → model → editor → button) like `Shift-Tab` / `Tab`. Also overridden in vim normal mode (replacing vim's viewport-top/bottom default) so the same shortcut works to leave the editor.
+- On page load, the model dropdown defaults to whichever model Ollama already has hot — skips the 5-15 s disk-reload pain on the first translation. After load it follows the user's manual selection.
+
+### Changed
+- Editor font-size pinned to `1rem` to match the output pane (CodeMirror 6 ships smaller by default).
+
+## [0.1.0] - 2026-06-09
+
+First release. Stateless translator UI that proxies streaming requests to
+Ollama on radagast.
+
+### Added
+- FastAPI backend with three endpoints:
+  - `GET /api/models` — filtered (`gemma,aya` by default) list from Ollama's `/api/tags`
+  - `POST /api/translate` — streams Ollama's NDJSON `/api/generate` response back to the browser
+  - `GET /api/loaded` — proxies Ollama's `/api/ps` for the currently-loaded model
+  - `GET /healthz` — for Kubernetes probes
+- Single-page UI:
+  - Source / target / model dropdowns (30+ languages, "Auto-detect" source)
+  - Token-by-token streaming into the output pane with a blinking caret
+  - Live status line: spinner while waiting for first token, pulsing dot during streaming, elapsed time and token count
+  - Glowing border on the output pane during streaming
+  - Loaded-model indicator (`● ` prefix in dropdown, "Hot: … — unloads in Xm" status line); refreshes on page load, on translation completion, and 500 ms after typing pauses
+  - ⌘/Ctrl-Enter to translate from the input
+  - Dark mode, inline SVG favicon (Star of Fëanor)
+- Dockerfile: two-stage `uv` build, slim Python 3.13 runtime
+- `build.sh`: multi-arch (amd64 + arm64) manual push to Scaleway, tags `:latest`, `:<git-short-sha>`, and `:<pyproject-version>`
+- Cluster deploy via the `valinor` repo at `apps/finrod/` (bjw-s app-template, internal-only ingress at `finrod.jpnadas.xyz`)
+
+### Fixed
+- Lock against public PyPI explicitly — the workstation's global `uv` config had pointed `uv.lock` sources at the dexterenergy private artifact registry, which 401'd inside Docker

README.md

@@ -47,14 +47,29 @@ Then on every change:
 ./build.sh
 ```
 
-That builds `linux/amd64,linux/arm64` and pushes `rg.nl-ams.scw.cloud/valinor/finrod:{latest, <git-short-sha>}`. Take note of the short SHA it prints — that's what you pin in valinor.
+That builds `linux/amd64,linux/arm64` and pushes three tags:
+- `:latest` — moving pointer
+- `:<git-short-sha>` — immutable, traceable
+- `:<pyproject-version>` (e.g. `:0.1.0`) — semver
 
 ## Deploy
 
-Cluster manifests live in `valinor/apps/finrod/` (bjw-s app-template, internal-only ingress at `finrod.jpnadas.xyz`). To roll out a new build:
+Cluster manifests live in `valinor/apps/finrod/` (bjw-s app-template, internal-only ingress at `finrod.jpnadas.xyz`). To roll out a new build, bump `tag:` in `valinor/apps/finrod/values.yaml` to the new semver on a branch → PR → merge → ArgoCD syncs.
 
-1. `./build.sh` here — get the SHA
+## Release workflow
-2. Bump `tag:` in `valinor/apps/finrod/values.yaml` to that SHA on a branch
-3. Merge → ArgoCD syncs the new image
 
-Using `:latest` works for the first deploy (the pull policy is `Always`) but pinning to a SHA on each rollout gives you trivial rollback via git revert.
+This project uses [Semantic Versioning](https://semver.org/) and keeps a human-edited [CHANGELOG.md](./CHANGELOG.md).
+
+To cut a release:
+
+1. On a branch, edit `CHANGELOG.md`: move accumulated `[Unreleased]` notes into a new `## [X.Y.Z] - YYYY-MM-DD` section.
+2. Bump `version` in `pyproject.toml` to `X.Y.Z`.
+3. PR → merge to `main`.
+4. Tag the merge commit:
+   ```sh
+   git checkout main && git pull
+   git tag -a vX.Y.Z -m "vX.Y.Z"
+   git push origin vX.Y.Z
+   ```
+5. `./build.sh` — the image now also gets `:X.Y.Z` (read from `pyproject.toml`).
+6. In `valinor`, bump `apps/finrod/values.yaml` `tag:` from the previous version to `X.Y.Z` on a branch → PR → ArgoCD picks it up.

app.py

@@ -49,6 +49,23 @@ async def list_models() -> list[str]:
     return sorted(names)
 
 
+@app.get("/api/loaded")
+async def loaded_models() -> dict[str, list[dict[str, str | None]]]:
+    """Models currently resident in Ollama's memory (from /api/ps)."""
+    async with httpx.AsyncClient(timeout=5) as client:
+        try:
+            r = await client.get(f"{OLLAMA_URL}/api/ps")
+            r.raise_for_status()
+        except httpx.HTTPError as e:
+            raise HTTPException(502, f"Ollama unreachable: {e}") from e
+    return {
+        "models": [
+            {"name": m["name"], "expires_at": m.get("expires_at")}
+            for m in r.json().get("models", [])
+        ]
+    }
+
+
 @app.post("/api/translate")
 async def translate(req: TranslateRequest) -> StreamingResponse:
     text = req.text.strip()

build.sh

@@ -9,20 +9,24 @@
 #   docker login rg.nl-ams.scw.cloud -u nologin -p <SCW_SECRET_KEY>
 #
 # Usage:
-#   ./build.sh                 # tags :latest and :<short-sha>
+#   ./build.sh
-#   TAG=v0.2.0 ./build.sh      # additional explicit tag
+#
+# Always tags:
+#   :latest                — moving pointer
+#   :<git-short-sha>       — immutable, traceable to a commit
+#   :<pyproject-version>   — semver from pyproject.toml (e.g. :0.1.0)
 
 set -euo pipefail
 
+cd "$(dirname "$0")"
+
 REGISTRY="${REGISTRY:-rg.nl-ams.scw.cloud/valinor}"
 IMAGE="${REGISTRY}/finrod"
 SHA="$(git rev-parse --short HEAD)"
-TAGS=(-t "${IMAGE}:latest" -t "${IMAGE}:${SHA}")
+VERSION="$(awk -F\" '/^version =/ {print $2; exit}' pyproject.toml)"
-if [[ -n "${TAG:-}" ]]; then
+: "${VERSION:?Could not read version from pyproject.toml}"
-    TAGS+=(-t "${IMAGE}:${TAG}")
-fi
 
-cd "$(dirname "$0")"
+TAGS=(-t "${IMAGE}:latest" -t "${IMAGE}:${SHA}" -t "${IMAGE}:${VERSION}")
 
 docker buildx build \
     --platform linux/amd64,linux/arm64 \
@@ -31,4 +35,7 @@ docker buildx build \
     .
 
 echo
-echo "Pushed: ${IMAGE}:{latest,${SHA}${TAG:+,${TAG}}}"
+echo "Pushed:"
+echo "  ${IMAGE}:latest"
+echo "  ${IMAGE}:${SHA}"
+echo "  ${IMAGE}:${VERSION}"

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "finrod"
-version = "0.1.0"
+version = "0.3.0"
 description = "Translator UI backed by Ollama"
 requires-python = ">=3.11"
 dependencies = [