Compare commits

...

3 commits

Author SHA1 Message Date
7ede416a3b Drop host port publish for postgres (5433 taken by bilhej-postgres-prod on host)
All checks were successful
CI / api-tests (push) Successful in 34s
CI / package-tests (push) Successful in 26s
CI / web-tests (push) Successful in 23s
2026-07-31 10:15:18 +00:00
20e14800ed Add production compose + bilhej-style CI/deploy workflows (host docker deployment)
Some checks failed
CI / api-tests (push) Failing after 51s
CI / package-tests (push) Successful in 27s
CI / web-tests (push) Successful in 24s
2026-07-31 10:02:01 +00:00
hermes
0741a8b717 Vision-verified UI fixes: flat company/title joins on kanban+detail, keyword coverage ratio object rendering, change log action/detail fields, Swedish diacritics in demo seed and UI labels (Skåne, Malmö, Göteborg, Ängelholm, Fråga, Arbetsförmedlingen)
Some checks failed
CI / api-tests (push) Failing after 34s
CI / package-tests (push) Failing after 31s
CI / web-tests (push) Failing after 34s
🤖 Generated with Hermes Agent
2026-07-30 22:05:19 +00:00
16 changed files with 294 additions and 67 deletions

View file

@ -1,6 +1,7 @@
# ---- Database ----
# Used by apps/api to connect to the postgres service defined in docker-compose.yml.
DATABASE_URL=postgresql://jobhunt:***@localhost:5433/jobhunt
# Postgres is not published to the host; all services run inside the compose network.
DATABASE_URL=postgresql://jobhunt:***@postgres:5432/jobhunt
# ---- LLM Gateway ----
# Primary provider (default: GLM-5.2 via ollama-cloud).

View file

@ -11,7 +11,12 @@ jobs:
api-tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Checkout repository
run: |
git init
git remote add origin https://x-access-token:${FORGEJO_TOKEN}@srvr.nu/git/hermes/jobhunt-platform.git
git fetch --depth 1 origin ${GITHUB_SHA}
git checkout FETCH_HEAD
- name: Set up Docker
run: |
docker --version
@ -24,7 +29,12 @@ jobs:
package-tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Checkout repository
run: |
git init
git remote add origin https://x-access-token:${FORGEJO_TOKEN}@srvr.nu/git/hermes/jobhunt-platform.git
git fetch --depth 1 origin ${GITHUB_SHA}
git checkout FETCH_HEAD
- name: Set up Python
uses: actions/setup-python@v5
with:
@ -53,17 +63,27 @@ jobs:
. .venv/bin/activate
uv pip install -e ".[dev]"
pytest -q
- name: Run matching tests
run: |
cd packages/matching
uv venv
. .venv/bin/activate
uv pip install -e ".[dev]"
pytest -q
web-tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Checkout repository
run: |
git init
git remote add origin https://x-access-token:${FORGEJO_TOKEN}@srvr.nu/git/hermes/jobhunt-platform.git
git fetch --depth 1 origin ${GITHUB_SHA}
git checkout FETCH_HEAD
- name: Set up Node
uses: actions/setup-node@v4
with:
node-version: "22"
cache: npm
cache-dependency-path: apps/web/package-lock.json
- name: Install dependencies
run: |
cd apps/web

View file

@ -0,0 +1,145 @@
name: Deploy to Production
on:
workflow_dispatch:
inputs:
version:
description: 'Leave as "auto" to bump from latest git tag, or enter a specific version (e.g. v0.1.2)'
required: false
default: 'auto'
type: string
jobs:
deploy:
name: Build and deploy
runs-on: ubuntu-latest
steps:
- name: Checkout repository
run: |
git init
git remote add origin https://x-access-token:${FORGEJO_TOKEN}@srvr.nu/git/hermes/jobhunt-platform.git
git fetch --depth 1 origin ${GITHUB_SHA}
git checkout FETCH_HEAD
- name: Resolve version
run: |
INPUT_VERSION="${{ github.event.inputs.version }}"
if [ -z "$INPUT_VERSION" ] || [ "$INPUT_VERSION" = "auto" ]; then
git fetch --tags origin
LATEST=$(git tag --list 'v*' --sort=-v:refname | head -1)
if [ -z "$LATEST" ]; then LATEST="v0.0.0"; fi
BASE="${LATEST#v}"
MAJOR=$(echo "$BASE" | cut -d. -f1)
MINOR=$(echo "$BASE" | cut -d. -f2)
PATCH=$(echo "$BASE" | cut -d. -f3)
PATCH=$(( ${PATCH:-0} + 1 ))
VERSION="v${MAJOR:-0}.${MINOR:-0}.${PATCH}"
echo "Latest tag: $LATEST → auto-bumped to $VERSION"
else
VERSION="$INPUT_VERSION"
echo "Using manual version: $VERSION"
fi
if ! echo "$VERSION" | grep -qE '^v[0-9]+\.[0-9]+\.[0-9]+$'; then
echo "ERROR: resolved version '$VERSION' is not valid semver (expected vX.Y.Z)"
exit 1
fi
echo "VERSION=$VERSION" >> "$GITHUB_ENV"
- name: Tag version
run: |
git tag -d ${{ env.VERSION }} 2>/dev/null || true
git push origin --delete ${{ env.VERSION }} 2>/dev/null || true
git tag ${{ env.VERSION }}
git push origin ${{ env.VERSION }}
- name: Write production .env
env:
LLM_PRIMARY_KEY: ${{ secrets.LLM_PRIMARY_KEY }}
run: |
{
printf 'DATABASE_URL=%s\n' 'postgresql://jobhunt:jobhunt@postgres:5432/jobhunt'
printf 'LLM_PRIMARY_BASE_URL=%s\n' 'https://ollama.com/v1'
printf 'LLM_PRIMARY_KEY=%s\n' "$LLM_PRIMARY_KEY"
printf 'LLM_PRIMARY_MODEL=%s\n' 'glm-5.2'
printf 'LLM_CHEAP_MODEL=%s\n' 'glm-5.2'
printf 'LLM_STRONG_MODEL=%s\n' 'glm-5.2'
printf 'VITE_API_BASE=%s\n' '/api'
} > .env
- name: Build and start production stack
run: |
docker compose -p jobhunt -f docker-compose.prod.yml down
docker compose -p jobhunt -f docker-compose.prod.yml up --build -d
- name: Health checks with rollback
run: |
echo "Waiting for services to start..."
sleep 15
API_OK=false
for i in 1 2 3 4 5 6 7 8 9 10; do
if docker run --rm --network jobhunt_default curlimages/curl:8.5.0 \
-sf http://jobhunt-api:8000/api/health > /dev/null; then
echo "API is healthy"
API_OK=true
break
fi
echo "API check attempt $i failed, retrying in 5s..."
sleep 5
done
WEB_OK=false
for i in 1 2 3 4 5; do
if docker run --rm --network jobhunt_default curlimages/curl:8.5.0 \
-sf http://jobhunt-web/ > /dev/null; then
echo "Frontend is serving"
WEB_OK=true
break
fi
echo "Frontend check attempt $i failed, retrying in 5s..."
sleep 5
done
if [ "$API_OK" != "true" ] || [ "$WEB_OK" != "true" ]; then
echo ""
echo "═══════════════════════════════════════════════════"
echo " HEALTH CHECK FAILED — DIAGNOSTICS"
echo "═══════════════════════════════════════════════════"
echo ""
docker compose -p jobhunt -f docker-compose.prod.yml ps
echo ""
echo "--- API logs ---"
docker logs jobhunt-api 2>&1 | tail -80 || true
echo ""
echo "--- Postgres logs ---"
docker logs jobhunt-postgres 2>&1 | tail -30 || true
echo ""
echo "═══════════════════════════════════════════════════"
echo " ROLLING BACK DEPLOYMENT"
echo "═══════════════════════════════════════════════════"
echo ""
docker compose -p jobhunt -f docker-compose.prod.yml down
echo ""
echo "Rolled back. Containers stopped. DB volume preserved."
echo "Read API logs above to find the root cause before redeploying."
exit 1
fi
- name: Seed demo data (idempotent)
run: |
docker run --rm --network jobhunt_default curlimages/curl:8.5.0 \
-sf -X POST http://jobhunt-api:8000/api/concierge/seed-demo || \
echo "WARN: demo seed failed (non-fatal)"
- name: Print deploy status
run: |
echo ""
echo "═══════════════════════════════════════════════════"
echo " Deployed ${{ env.VERSION }} to production"
echo "═══════════════════════════════════════════════════"
echo ""
docker compose -p jobhunt -f docker-compose.prod.yml ps
echo ""
echo "Web UI: http://tocke:8085"
echo "API: http://tocke:8000/api/health"
echo ""

View file

@ -175,10 +175,10 @@ def _mock_cv_tailor(prompt: str) -> dict[str, Any]:
change_log = []
for b in bullets[:2]:
tailored.append(f"{b} (tailored for this posting)")
change_log.append({"action": "rephrased", "detail": f"Emphasized relevance of: {b[:60]}..."})
change_log.append({"action": "rephrased", "detail": f"Emphasized relevance of {b[:60]}"})
for b in bullets[2:]:
tailored.append(b)
change_log.append({"action": "kept", "detail": f"Retained as-is: {b[:60]}..."})
change_log.append({"action": "kept", "detail": f"Retained as-is {b[:60]}"})
return {
"tailored_cv": {"summary": bullets[0][:160], "bullets": tailored},
"change_log": change_log,

View file

@ -1151,9 +1151,9 @@ def seed_demo() -> Any:
profile = repo_profile.update_profile({
"full_name": "Demo Demosson",
"email": "demo@example.com",
"location": "Malmo",
"location": "Malmö",
"headline": "Software Developer",
"summary": "Experienced developer looking for opportunities in Skane.",
"summary": "Experienced developer looking for opportunities in Skåne.",
"languages": [{"code": "sv", "level": "native"}, {"code": "en", "level": "fluent"}],
})
if profile is None:
@ -1161,7 +1161,7 @@ def seed_demo() -> Any:
# Create demo CV sections
demo_sections = [
{"kind": "experience", "title": "Backend Developer", "org": "TechSkane AB", "bullets": ["Built REST APIs", "Improved performance by 30%"], "tags": ["python", "fastapi"]},
{"kind": "experience", "title": "Backend Developer", "org": "TechSkåne AB", "bullets": ["Built REST APIs", "Improved performance by 30%"], "tags": ["python", "fastapi"]},
{"kind": "experience", "title": "Junior Developer", "org": "Lund Software", "bullets": ["Maintained web apps"], "tags": ["javascript"]},
{"kind": "education", "title": "MSc Computer Science", "org": "Lunds Universitet", "bullets": ["Distributed systems specialization"], "tags": ["algorithms"]},
{"kind": "skills", "title": "Technical Skills", "bullets": ["Python", "PostgreSQL", "Docker", "FastAPI"], "tags": ["python", "docker"]},
@ -1176,12 +1176,12 @@ def seed_demo() -> Any:
# -- Create 6 standalone demo postings with varied states --
demo_postings = [
{"company": "Skane Tech AB", "title": "Senior Python Developer", "location": "Malmo", "url": "https://example.com/af/1", "state": "scored", "score": 85},
{"company": "Skåne Tech AB", "title": "Senior Python Developer", "location": "Malmö", "url": "https://example.com/af/1", "state": "scored", "score": 85},
{"company": "Lund Systems", "title": "Fullstack Engineer", "location": "Lund", "url": "https://example.com/af/2", "state": "discovered", "score": None},
{"company": "Copenhagen Digital", "title": "Backend Developer", "location": "Copenhagen", "url": "https://example.com/af/3", "state": "approved", "score": 70},
{"company": "Helsingborg IT", "title": "DevOps Engineer", "location": "Helsingborg", "url": "https://example.com/af/4", "state": "sent", "score": 65},
{"company": "Malmo Startup", "title": "Software Engineer", "location": "Malmo", "url": "https://example.com/af/5", "state": "rejected", "score": 30},
{"company": "Angelholm Tech", "title": "Data Engineer", "location": "Angelholm", "url": "https://example.com/af/6", "state": "discovered", "score": None},
{"company": "Malmö Startup", "title": "Software Engineer", "location": "Malmö", "url": "https://example.com/af/5", "state": "rejected", "score": 30},
{"company": "Ängelholm Tech", "title": "Data Engineer", "location": "Ängelholm", "url": "https://example.com/af/6", "state": "discovered", "score": None},
]
for dp in demo_postings:
@ -1258,7 +1258,7 @@ def seed_demo() -> Any:
url=f"https://example.com/af/deadline/{j+1}",
company=f"Deadline Corp {j+1}",
title=f"Urgent Developer Role {j+1}",
location="Goteborg",
location="Göteborg",
description="Urgent hire for a developer with deadline approaching.",
raw={},
)
@ -1290,7 +1290,7 @@ def seed_demo() -> Any:
url="https://example.com/af/interview/1",
company="Festina Digital AB",
title="Full Stack Developer",
location="Malmo",
location="Malmö",
description="Full stack developer with React, Python, and cloud experience.",
raw={},
)
@ -1398,8 +1398,8 @@ def seed_demo() -> Any:
create_email_suggestion(
application_id=interviewing_app_id,
mailbox_from="hr@festina-demo.se",
subject="Fraga om din erfarenhet",
snippet="Vi har nagra fragor om din bakgrund inom Python...",
subject="Fråga om din erfarenhet",
snippet="Vi har några frågor om din bakgrund inom Python...",
classification="question",
state_proposal=None,
received_at=datetime.now(timezone.utc) - timedelta(hours=1),

View file

@ -66,8 +66,10 @@ export interface Application {
notes: string
state_changed_at: string
created_at: string
// joined posting info (from GET /applications)
posting?: JobPosting
// joined posting info (flat fields from GET /applications)
company?: string | null
title?: string | null
location?: string | null
}
export type ArtifactKind = 'cv' | 'cover_letter' | 'email' | 'other'
@ -262,14 +264,21 @@ export interface Cluster {
postings: ClusterPosting[]
}
export interface TailorKeywordCoverage {
ratio: number
matched: string[]
missing: string[]
}
export interface TailorChangeLogEntry {
section: string
change: string
bullet_id: string
action?: string
section?: string
detail?: string
change?: string
}
export interface TailorCvResponse {
artifact_id: string
change_log: TailorChangeLogEntry[]
keyword_coverage: number
keyword_coverage: TailorKeywordCoverage
}

View file

@ -34,11 +34,9 @@ function makeApp(): Application {
notes: '',
state_changed_at: '2026-01-01T00:00:00Z',
created_at: '2026-01-01T00:00:00Z',
posting: {
id: 'j-1', source: 'manual_url', external_id: null, url: 'http://x',
company: 'Acme', title: 'Engineer', location: 'Remote', description: '',
raw: {}, fetched_at: '2026-01-01T00:00:00Z'
}
company: 'Acme',
title: 'Engineer',
location: 'Remote'
}
}
@ -60,10 +58,10 @@ function makeTailorResult(): TailorCvResponse {
return {
artifact_id: 'art-tailor-1',
change_log: [
{ section: 'experience', change: 'Reordered to highlight Python backend work', bullet_id: 'b-1' },
{ section: 'skills', change: 'Moved Docker and Kubernetes higher', bullet_id: 'b-5' }
{ action: 'experience', detail: 'Reordered to highlight Python backend work' },
{ action: 'skills', detail: 'Moved Docker and Kubernetes higher' }
],
keyword_coverage: 0.75
keyword_coverage: { ratio: 0.75, matched: ['python', 'docker'], missing: ['kubernetes'] }
}
}

View file

@ -34,11 +34,9 @@ function makeApp(): Application {
notes: '',
state_changed_at: '2026-01-01T00:00:00Z',
created_at: '2026-01-01T00:00:00Z',
posting: {
id: 'j-1', source: 'manual_url', external_id: null, url: 'http://x',
company: 'Acme', title: 'Engineer', location: 'Remote', description: '',
raw: {}, fetched_at: '2026-01-01T00:00:00Z'
}
company: 'Acme',
title: 'Engineer',
location: 'Remote'
}
}

View file

@ -52,17 +52,22 @@ const severityClass: Record<string, string> = {
low: 'bg-blue-50 border-blue-200'
}
const coverageRatio = computed(() => {
if (!tailorResult.value) return 0
const kc = tailorResult.value.keyword_coverage
return typeof kc === 'object' && kc !== null ? (kc.ratio ?? 0) : Number(kc) || 0
})
const coverageColor = computed(() => {
if (!tailorResult.value) return 'bg-gray-300'
const c = tailorResult.value.keyword_coverage
const c = coverageRatio.value
if (c >= 0.7) return 'bg-green-500'
if (c >= 0.4) return 'bg-yellow-500'
return 'bg-red-500'
})
const coveragePercent = computed(() => {
if (!tailorResult.value) return 0
return Math.round(tailorResult.value.keyword_coverage * 100)
return Math.round(coverageRatio.value * 100)
})
const downloadUrl = computed(() => {
@ -140,7 +145,7 @@ async function sendOutbox() {
if (!approval.value || !canSend.value) return
sending.value = true
try {
await api.outboxSend(approval.value.id, { to: application.value?.posting?.company ?? '' })
await api.outboxSend(approval.value.id, { to: application.value?.company ?? '' })
toast.push('Sent successfully', 'success')
} catch (err) {
let msg = 'Send failed'
@ -195,8 +200,8 @@ onMounted(loadData)
<template v-if="!loading && application">
<!-- Posting info -->
<section class="bg-white rounded-lg border border-gray-200 p-4">
<div class="font-semibold text-lg">{{ application.posting?.company ?? 'Unknown' }}</div>
<div class="text-gray-600">{{ application.posting?.title ?? 'No title' }}</div>
<div class="font-semibold text-lg">{{ application.company ?? 'Unknown' }}</div>
<div class="text-gray-600">{{ application.title ?? 'No title' }}</div>
<div class="text-sm text-gray-500 mt-1">
State: <span class="capitalize font-medium">{{ application.state }}</span>
<span v-if="application.score != null" class="ml-3">Score: {{ application.score }}</span>
@ -245,8 +250,8 @@ onMounted(loadData)
:key="i"
class="border-b border-gray-100 py-1"
>
<span class="font-medium text-gray-700">{{ entry.section }}:</span>
<span class="text-gray-600 ml-1">{{ entry.change }}</span>
<span class="font-medium text-gray-700">{{ entry.action || entry.section || 'change' }}:</span>
<span class="text-gray-600 ml-1">{{ entry.detail || entry.change }}</span>
</li>
</ul>
</div>

View file

@ -30,11 +30,9 @@ function makeApp(id: string, state: string, company: string): Application {
notes: '',
state_changed_at: '2026-01-01T00:00:00Z',
created_at: '2026-01-01T00:00:00Z',
posting: {
id: 'j-' + id, source: 'manual_url', external_id: null, url: 'http://x',
company, title: 'Engineer', location: 'Remote', description: '',
raw: {}, fetched_at: '2026-01-01T00:00:00Z'
}
company,
title: 'Engineer',
location: 'Remote'
}
}

View file

@ -31,11 +31,9 @@ function fixture(): Application[] {
notes: '',
state_changed_at: '2026-01-01T00:00:00Z',
created_at: '2026-01-01T00:00:00Z',
posting: {
id: 'j-1', source: 'manual_url', external_id: null, url: 'http://x',
company: 'Acme', title: 'Engineer', location: 'Remote', description: '',
raw: {}, fetched_at: '2026-01-01T00:00:00Z'
}
company: 'Acme',
title: 'Engineer',
location: 'Remote'
},
{
id: 'app-2',
@ -46,11 +44,9 @@ function fixture(): Application[] {
notes: '',
state_changed_at: '2026-01-01T00:00:00Z',
created_at: '2026-01-01T00:00:00Z',
posting: {
id: 'j-2', source: 'linkedin', external_id: null, url: 'http://y',
company: 'Globex', title: 'Manager', location: 'Malmo', description: '',
raw: {}, fetched_at: '2026-01-01T00:00:00Z'
}
company: 'Globex',
title: 'Manager',
location: 'Malmo'
}
]
}

View file

@ -171,9 +171,9 @@ onMounted(loadApplications)
class="inline-block w-2 h-2 rounded-full bg-orange-500 flex-shrink-0"
title="Follow-up nudge pending"
></span>
<div class="font-medium text-sm truncate">{{ app.posting?.company ?? 'Unknown' }}</div>
<div class="font-medium text-sm truncate">{{ app.company ?? 'Unknown' }}</div>
</div>
<div class="text-xs text-gray-500 truncate">{{ app.posting?.title ?? 'No title' }}</div>
<div class="text-xs text-gray-500 truncate">{{ app.title ?? 'No title' }}</div>
<div v-if="app.score != null" class="text-xs text-green-700 mt-1">
Score: {{ app.score }}
</div>

View file

@ -153,7 +153,7 @@ onMounted(loadPostings)
<!-- Fetch form (Arbetsformedlingen connector) -->
<section class="bg-white rounded-lg border border-gray-200 p-4 space-y-3">
<h2 class="font-semibold">Fetch from Arbetsformedlingen</h2>
<h2 class="font-semibold">Fetch from Arbetsförmedlingen</h2>
<div class="flex gap-2">
<input
v-model="fetchQuery"

View file

@ -223,7 +223,7 @@ function prev() {
<div v-if="step === 2" class="bg-white rounded-lg border border-gray-200 p-6 space-y-4">
<h2 class="font-semibold text-lg">Fetch Job Postings</h2>
<p class="text-sm text-gray-600">
Search for job postings from the Arbetsformedlingen connector. New postings will be added to your applications.
Search for job postings from the Arbetsförmedlingen connector. New postings will be added to your applications.
</p>
<div class="space-y-2">
<label class="block">

57
docker-compose.prod.yml Normal file
View file

@ -0,0 +1,57 @@
# Production stack for jobhunt-platform.
# Built and started by .forgejo/workflows/deploy.yml on the host docker daemon.
# Web UI is published on http://<host>:8085, API on :8000. Postgres is internal only.
services:
postgres:
image: postgres:16
container_name: jobhunt-postgres
environment:
POSTGRES_USER: jobhunt
POSTGRES_PASSWORD: jobhunt
POSTGRES_DB: jobhunt
volumes:
- jobhunt_pgdata:/var/lib/postgresql/data
healthcheck:
test: ["CMD-SHELL", "pg_isready -U jobhunt -d jobhunt"]
interval: 5s
timeout: 3s
retries: 10
restart: unless-stopped
api:
build:
context: .
dockerfile: apps/api/Dockerfile.test
image: jobhunt-api
container_name: jobhunt-api
entrypoint: uvicorn app.main:app --host 0.0.0.0 --port 8000
env_file: .env
environment:
DATABASE_URL: postgresql://jobhunt:jobhunt@postgres:5432/jobhunt
working_dir: /app/apps/api
ports:
- "8000:8000"
depends_on:
postgres:
condition: service_healthy
restart: unless-stopped
web:
build:
context: .
dockerfile: apps/web/Dockerfile
args:
# Baked into the SPA at build time. Relative /api goes through the
# nginx proxy in apps/web/nginx.conf -> http://api:8000/api/
VITE_API_BASE: /api
image: jobhunt-web
container_name: jobhunt-web
ports:
- "8085:80"
depends_on:
- api
restart: unless-stopped
volumes:
jobhunt_pgdata:
name: jobhunt_pgdata

View file

@ -8,8 +8,8 @@ services:
POSTGRES_USER: jobhunt
POSTGRES_PASSWORD: jobhunt
POSTGRES_DB: jobhunt
ports:
- "5433:5432"
# No host port publishing: CI/tests run inside the compose network, and on
# this host 5433 is already taken by bilhej-postgres-prod.
volumes:
- jobhunt_pgdata:/var/lib/postgresql/data
healthcheck: