feat(api): OCR réel — POST /ocr/jobs + GET /ocr/jobs/:id (tesseract syscall, jobs asynchrones)
- ocr/tesseract.go : Engine → Tesseract subprocess (OCR_LANG fra+eng) ; PDF → calque texte via ledongthuc/pdf (go.mod : nouveau dep) - repository/ocr_jobs.go : queued→processing→done/failed, scoping device, text/error NULLIFés - service/ocr.go : Create valide le fichier (GetFile), queue + goroutine de traitement ; physique résolu par glob UPLOAD_DIR/<device>/<id>.* ; fail propre (fichier illisible, erreur moteur) - handlers/ocr.go : réels (validate fileId, NOT_FOUND si job d'un autre device), fin 501 OCR - tests end-to-end : cycle queued→done (stub moteur), NOT_FOUND fichier inconnu, scoping device - smoke réel : PNG 'VAULTDROP' → job done text='VAULTDROP' (tesseract installé) - docs/AGENTS : §5 + état des routes (tout V1 réel)
This commit is contained in:
@@ -0,0 +1,143 @@
|
||||
package handlers_test
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"net/http"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
|
||||
"github.com/vaultdrop/backend/dbtest"
|
||||
"github.com/vaultdrop/backend/handlers"
|
||||
"github.com/vaultdrop/backend/pkg/auth"
|
||||
"github.com/vaultdrop/backend/repository"
|
||||
"github.com/vaultdrop/backend/service"
|
||||
)
|
||||
|
||||
type stubEngine struct {
|
||||
text string
|
||||
err error
|
||||
}
|
||||
|
||||
func (s stubEngine) ExtractText(_ context.Context, _ string, _ string) (string, error) {
|
||||
if s.err != nil {
|
||||
return "", s.err
|
||||
}
|
||||
return s.text, nil
|
||||
}
|
||||
|
||||
func setupOcr(t *testing.T) (*gin.Engine, string) {
|
||||
t.Helper()
|
||||
conn := dbtest.OpenTestDatabase(t, handlersTestURL)
|
||||
repo := repository.NewRepository(conn)
|
||||
uploadDir := t.TempDir()
|
||||
store := service.NewResources(repo, uploadDir, 100*1024)
|
||||
|
||||
manager, _ := auth.NewManager("test-secret")
|
||||
handlers.Auth = manager
|
||||
handlers.Store = store
|
||||
handlers.Ocr = service.NewOcr(repo, uploadDir, "fra+eng", stubEngine{text: "HELLO OCR"})
|
||||
|
||||
gin.SetMode(gin.TestMode)
|
||||
r := gin.New()
|
||||
handlers.RegisterRoutes(r)
|
||||
return r, uploadDir
|
||||
}
|
||||
|
||||
type ocrJobDTO struct {
|
||||
ID string `json:"id"`
|
||||
Status string `json:"status"`
|
||||
Text string `json:"text"`
|
||||
Error string `json:"error"`
|
||||
}
|
||||
|
||||
func waitTerminal(t *testing.T, r *gin.Engine, token, jobID string) ocrJobDTO {
|
||||
t.Helper()
|
||||
deadline := time.Now().Add(3 * time.Second)
|
||||
for time.Now().Before(deadline) {
|
||||
rec, _ := doRequest(t, r, http.MethodGet, "/api/v1/ocr/jobs/"+jobID, token, nil, "")
|
||||
env := expectOK(t, rec, "ocr-get")
|
||||
var job ocrJobDTO
|
||||
if err := json.Unmarshal(env.Data, &job); err != nil {
|
||||
t.Fatalf("ocr-get: unmarshal: %v", err)
|
||||
}
|
||||
if job.Status == "done" || job.Status == "failed" {
|
||||
return job
|
||||
}
|
||||
time.Sleep(50 * time.Millisecond)
|
||||
}
|
||||
t.Fatal("job OCR jamais terminal")
|
||||
return ocrJobDTO{}
|
||||
}
|
||||
|
||||
func TestOcrJobsLifecycle(t *testing.T) {
|
||||
r, uploadDir := setupOcr(t)
|
||||
device := repository.NewID()
|
||||
token := registerDevice(t, r, device)
|
||||
|
||||
// Fichier + fichier physique (simule UPLOAD_DIR/<device>/<id>.txt)
|
||||
fileID := repository.NewID()
|
||||
if err := os.MkdirAll(filepath.Join(uploadDir, device), 0o755); err != nil {
|
||||
t.Fatalf("mkdir: %v", err)
|
||||
}
|
||||
if err := os.WriteFile(filepath.Join(uploadDir, device, fileID+".txt"), []byte("ignored by stub"), 0o644); err != nil {
|
||||
t.Fatalf("write: %v", err)
|
||||
}
|
||||
repo := handlers.Store.Repository
|
||||
if err := repo.Resources.InsertFile(device, fileID, "scan.png", "", 128, nil, nil); err != nil {
|
||||
t.Fatalf("insert: %v", err)
|
||||
}
|
||||
|
||||
// Création du job
|
||||
body, _ := json.Marshal(map[string]string{"fileId": fileID})
|
||||
rec, _ := doRequest(t, r, http.MethodPost, "/api/v1/ocr/jobs", token, body, "application/json")
|
||||
env := expectOK(t, rec, "ocr-create")
|
||||
var created ocrJobDTO
|
||||
if err := json.Unmarshal(env.Data, &created); err != nil {
|
||||
t.Fatalf("ocr-create: unmarshal: %v", err)
|
||||
}
|
||||
if created.Status != "queued" || created.ID == "" {
|
||||
t.Errorf("job attendu queued: %+v", created)
|
||||
}
|
||||
|
||||
// Poll jusqu'au terminal
|
||||
job := waitTerminal(t, r, token, created.ID)
|
||||
if job.Status != "done" || job.Text != "HELLO OCR" {
|
||||
t.Errorf("job terminal: %+v", job)
|
||||
}
|
||||
|
||||
// Fichier inconnu → NOT_FOUND
|
||||
rec, _ = doRequest(t, r, http.MethodPost, "/api/v1/ocr/jobs", token, bodyFor(repository.NewID()), "application/json")
|
||||
expectError(t, rec, http.StatusNotFound, "NOT_FOUND", "ocr-missing-file")
|
||||
}
|
||||
|
||||
func TestOcrJobsScopedByDevice(t *testing.T) {
|
||||
r, _ := setupOcr(t)
|
||||
deviceA := repository.NewID()
|
||||
deviceB := repository.NewID()
|
||||
tokenA := registerDevice(t, r, deviceA)
|
||||
tokenB := registerDevice(t, r, deviceB)
|
||||
|
||||
fileID := repository.NewID()
|
||||
if err := handlers.Store.Repository.Resources.InsertFile(deviceA, fileID, "scan.png", "", 128, nil, nil); err != nil {
|
||||
t.Fatalf("insert: %v", err)
|
||||
}
|
||||
body, _ := json.Marshal(map[string]string{"fileId": fileID})
|
||||
rec, _ := doRequest(t, r, http.MethodPost, "/api/v1/ocr/jobs", tokenA, body, "application/json")
|
||||
env := expectOK(t, rec, "ocr-create")
|
||||
var created ocrJobDTO
|
||||
_ = json.Unmarshal(env.Data, &created)
|
||||
|
||||
// Un autre device ne voit pas le job
|
||||
rec, _ = doRequest(t, r, http.MethodGet, "/api/v1/ocr/jobs/"+created.ID, tokenB, nil, "")
|
||||
expectError(t, rec, http.StatusNotFound, "NOT_FOUND", "ocr-other-device")
|
||||
}
|
||||
|
||||
func bodyFor(id string) []byte {
|
||||
b, _ := json.Marshal(map[string]string{"fileId": id})
|
||||
return b
|
||||
}
|
||||
Reference in New Issue
Block a user