merge: reconcile perf/wave1-perf with main (Wave 0 features)
Resolve conflicts from main's Wave 0 (PR #1) landing after this branch was cut: - useViewResource.ts: main'se352aaealready fixes the render loop the same way (load in a ref, dropped from deps) — took main's canonical version. My independent fix is superseded (my branch predatede352aae, which is why the loop reproduced live). - JobApplicationsController.cs: keep BOTH main's IJobCvMatchService and my AnalyticsService (ctor gets both optional params). GetAnalyticsOverview stays delegated to AnalyticsService. - Fold main's H3 additions into the extracted AnalyticsService: pipeline-driven funnel (JobPipeline.Normalize/Stages) + time-in-stage (StageAnalytics) and add StageDurationDto + TimeInStage to Models/AnalyticsDtos.cs, preserving the API contract the frontend expects. Build clean; backend suite 135/135 green.
This commit is contained in:
+11
-2
@@ -54,6 +54,9 @@ services:
|
||||
frontend:
|
||||
build:
|
||||
context: ./job-tracker-ui
|
||||
# fork-ts-checker (CRA's build type-checker) needs more than Docker's default
|
||||
# 64MB /dev/shm; too little causes a SIGSEGV during `npm run build`.
|
||||
shm_size: '1gb'
|
||||
args:
|
||||
- REACT_APP_GOOGLE_CLIENT_ID=${AUTH_GOOGLE_CLIENT_ID}
|
||||
# Optional override; default in production is `/api`
|
||||
@@ -72,6 +75,10 @@ services:
|
||||
context: ./tools/summarizer
|
||||
dockerfile: Dockerfile
|
||||
environment:
|
||||
# Point at an existing/shared Ollama by setting OLLAMA_BASE_URL in .env
|
||||
# (e.g. http://<host-ip>:11435). The in-compose ollama service below is
|
||||
# opt-in via the "bundled-ollama" profile, so it is NOT started by default
|
||||
# and no duplicate Ollama container is created.
|
||||
- OLLAMA_BASE_URL=${OLLAMA_BASE_URL:-http://ollama:11434}
|
||||
- OLLAMA_MODEL=${OLLAMA_MODEL:-qwen2.5:7b}
|
||||
# AI provider for heavy /cv/* calls: ollama (default) | gemini | groq.
|
||||
@@ -83,8 +90,6 @@ services:
|
||||
- GROQ_MODEL=${GROQ_MODEL:-llama-3.3-70b-versatile}
|
||||
ports:
|
||||
- "8001:8001"
|
||||
depends_on:
|
||||
- ollama
|
||||
networks:
|
||||
- default
|
||||
- shared_services
|
||||
@@ -95,7 +100,11 @@ services:
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
|
||||
# Opt-in only: start with `docker compose --profile bundled-ollama up`.
|
||||
# Left out of the default set so deploys reuse an existing/shared Ollama
|
||||
# (configured via OLLAMA_BASE_URL) instead of spinning up a duplicate.
|
||||
ollama:
|
||||
profiles: ["bundled-ollama"]
|
||||
image: ollama/ollama:latest
|
||||
ports:
|
||||
- "11434:11434"
|
||||
|
||||
Reference in New Issue
Block a user