Spaces:
Build error
Build error
File size: 21,188 Bytes
ed52286 d03b796 ed52286 d03b796 ed52286 fc1a5f0 ed52286 d03b796 ed62931 d03b796 ed62931 d03b796 ed52286 d03b796 ed52286 8feb390 ed52286 8feb390 ed52286 8feb390 ed52286 f338ad4 8feb390 ed52286 8feb390 ed52286 f338ad4 ed52286 1b0c69c e0fd571 1b0c69c d03b796 b986b08 d03b796 b986b08 d03b796 ed52286 d03b796 ed52286 1b0c69c ed52286 d03b796 ed52286 f338ad4 ed52286 8feb390 d03b796 8feb390 ed52286 c0b5d70 8feb390 ed52286 d03b796 8feb390 ed52286 d03b796 ed52286 c0b5d70 ed52286 8feb390 ed52286 8feb390 ed52286 c0b5d70 ed52286 8feb390 ed52286 8feb390 ed52286 d03b796 ed52286 8feb390 d03b796 8feb390 ed52286 8feb390 ed52286 8feb390 ed52286 f338ad4 ed52286 8feb390 ed52286 f338ad4 ed52286 8feb390 ed52286 fc1a5f0 ed52286 f338ad4 ed52286 8feb390 ed52286 d03b796 8feb390 ed52286 8feb390 d03b796 8feb390 f338ad4 ed52286 8feb390 ed52286 f338ad4 ed52286 8feb390 ed52286 fc1a5f0 ed52286 8feb390 ed52286 8feb390 ed52286 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 | """
Endpoints d'ingestion de corpus (R10 — préfixe /api/v1/).
POST /api/v1/corpora/{id}/ingest/files
POST /api/v1/corpora/{id}/ingest/iiif-manifest
POST /api/v1/corpora/{id}/ingest/iiif-images
Règle (R01) : aucune logique spécifique à un corpus particulier.
Règle : ingestion = création des PageModel en BDD uniquement.
L'analyse IA est déclenchée séparément via /run.
"""
# 1. stdlib
import logging
import re
import uuid
from pathlib import Path
# 2. third-party
import httpx
from fastapi import APIRouter, Depends, File, HTTPException, UploadFile
from pydantic import BaseModel, Field
from sqlalchemy import func, select
from sqlalchemy.exc import IntegrityError
from sqlalchemy.ext.asyncio import AsyncSession
# 3. local
from app import config as _config_module
from app.models.corpus import CorpusModel, ManuscriptModel, PageModel
from app.models.database import get_db
logger = logging.getLogger(__name__)
router = APIRouter(tags=["ingestion"])
# ── Constantes de sécurité ────────────────────────────────────────────────────
_SAFE_LABEL_RE = re.compile(r"^[\w\-\.]+$")
_MAX_UPLOAD_BYTES = 100 * 1024 * 1024 # 100 Mo par fichier
_ALLOWED_MIME_PREFIXES = ("image/",)
def _sanitize_label(label: str) -> str:
"""Nettoie un folio_label : garde uniquement alphanum, -, _, .
Les points en début/fin sont supprimés pour éviter des IDs de page
se terminant par un point (problèmes de routing et de chemins fichier).
"""
clean = Path(label).name # retire tout chemin
clean = clean.strip(".") # supprimer les points en début/fin
if not _SAFE_LABEL_RE.match(clean) or not clean:
clean = re.sub(r"[^\w\-\.]", "_", clean) or "page"
return clean
def _sanitize_filename(name: str) -> str:
"""Nettoie un nom de fichier uploadé : garde uniquement le basename sûr."""
clean = Path(name).name
if not _SAFE_LABEL_RE.match(clean) or not clean:
clean = f"{uuid.uuid4().hex[:12]}.bin"
return clean
# ── Schémas ───────────────────────────────────────────────────────────────────
class IIIFManifestRequest(BaseModel):
manifest_url: str
class IIIFImagesRequest(BaseModel):
urls: list[str] = Field(..., max_length=5000)
folio_labels: list[str] = Field(..., max_length=5000)
class IngestResponse(BaseModel):
corpus_id: str
manuscript_id: str
pages_created: int
pages_skipped: int = 0
page_ids: list[str]
# ── Helpers ───────────────────────────────────────────────────────────────────
async def _get_corpus_or_404(corpus_id: str, db: AsyncSession) -> CorpusModel:
corpus = await db.get(CorpusModel, corpus_id)
if corpus is None:
raise HTTPException(status_code=404, detail="Corpus introuvable")
return corpus
async def _get_or_create_manuscript(
db: AsyncSession, corpus_id: str, title: str | None = None
) -> ManuscriptModel:
"""Retourne le premier manuscrit du corpus, ou en crée un par défaut."""
result = await db.execute(
select(ManuscriptModel).where(ManuscriptModel.corpus_id == corpus_id).limit(1)
)
ms = result.scalar_one_or_none()
if ms is not None:
return ms
corpus = await db.get(CorpusModel, corpus_id)
ms = ManuscriptModel(
id=str(uuid.uuid4()),
corpus_id=corpus_id,
title=title or (corpus.title if corpus else corpus_id),
total_pages=0,
)
db.add(ms)
await db.flush()
return ms
async def _next_sequence(db: AsyncSession, manuscript_id: str) -> int:
"""Retourne le prochain numéro de séquence disponible (max + 1, ou 1)."""
result = await db.execute(
select(func.max(PageModel.sequence)).where(
PageModel.manuscript_id == manuscript_id
)
)
max_seq = result.scalar_one_or_none()
return (max_seq or 0) + 1
def _find_duplicate_labels(labels: list[str]) -> set[str]:
"""Retourne les folio_labels qui apparaissent plus d'une fois."""
seen: dict[str, int] = {}
for label in labels:
seen[label] = seen.get(label, 0) + 1
return {label for label, count in seen.items() if count > 1}
def _make_page_id(corpus_slug: str, folio_label: str, batch_index: int, duplicate_labels: set[str]) -> str:
"""Génère un ID de page. Ajoute le batch_index si le label n'est pas unique."""
if folio_label in duplicate_labels:
return f"{corpus_slug}-{batch_index:04d}-{folio_label}"
return f"{corpus_slug}-{folio_label}"
async def _create_page(
db: AsyncSession,
manuscript_id: str,
page_id: str,
folio_label: str,
sequence: int,
image_master_path: str | None = None,
iiif_service_url: str | None = None,
canvas_width: int | None = None,
canvas_height: int | None = None,
manifest_url: str | None = None,
) -> PageModel | None:
"""Crée une page si elle n'existe pas déjà. Retourne None si l'ID est déjà pris."""
existing = await db.get(PageModel, page_id)
if existing is not None:
logger.info("Page déjà existante, ignorée", extra={"page_id": page_id})
return None
page = PageModel(
id=page_id,
manuscript_id=manuscript_id,
folio_label=folio_label,
sequence=sequence,
image_master_path=image_master_path,
iiif_service_url=iiif_service_url,
canvas_width=canvas_width,
canvas_height=canvas_height,
manifest_url=manifest_url,
processing_status="INGESTED",
)
db.add(page)
return page
_MANIFEST_HEADERS = {
"User-Agent": (
"Mozilla/5.0 (compatible; IIIFStudio/1.0; "
"+https://huggingface.co/spaces/Ma-Ri-Ba-Ku/iiif-studio)"
),
"Accept": "application/ld+json,application/json,*/*",
"Referer": "https://gallica.bnf.fr/",
}
_MAX_MANIFEST_BYTES = 10 * 1024 * 1024 # 10 Mo max pour un manifest JSON
def _validate_url(url: str) -> None:
"""Rejette les URLs non-HTTP et les cibles réseau privé (SSRF)."""
import socket
from ipaddress import ip_address
from urllib.parse import urlparse
parsed = urlparse(url)
if parsed.scheme not in ("http", "https"):
raise ValueError(f"Schéma non autorisé : {parsed.scheme!r}")
hostname = parsed.hostname or ""
if not hostname:
raise ValueError("URL sans hostname")
# Résolution DNS pour détecter les rebinding attacks
try:
resolved = socket.getaddrinfo(hostname, None, socket.AF_UNSPEC, socket.SOCK_STREAM)
except socket.gaierror:
raise ValueError(f"Résolution DNS impossible : {hostname!r}")
for family, _, _, _, sockaddr in resolved:
ip_str = sockaddr[0]
try:
addr = ip_address(ip_str)
except ValueError:
continue
if addr.is_private or addr.is_loopback or addr.is_reserved or addr.is_link_local:
raise ValueError(
f"Hôte interdit — {hostname!r} résout vers une adresse privée/réservée : {ip_str}"
)
async def _fetch_json_manifest(url: str) -> dict:
"""Télécharge un manifest IIIF avec protections SSRF + taille max."""
_validate_url(url)
async with httpx.AsyncClient() as client:
resp = await client.get(url, headers=_MANIFEST_HEADERS, follow_redirects=True, timeout=30.0)
resp.raise_for_status()
if len(resp.content) > _MAX_MANIFEST_BYTES:
raise ValueError(f"Manifest trop volumineux ({len(resp.content)} octets)")
return resp.json()
def _extract_canvas_label(canvas: dict, index: int) -> str:
"""Extrait le folio_label d'un canvas IIIF (3.0 ou 2.x)."""
label = canvas.get("label")
if isinstance(label, dict):
for lang in ("none", "en", "fr", "la"):
values = label.get(lang)
if values:
return (values[0] if isinstance(values, list) else str(values)).strip()
elif isinstance(label, str) and label.strip():
return label.strip()
return f"f{index + 1:03d}r"
# Pattern IIIF Image API : {service}/full/{size}/{rotation}/{quality}.{format}
_IIIF_IMAGE_API_RE = re.compile(
r"^(https?://.+)/full/[^/]+/\d+/default\.\w+$"
)
def _extract_iiif_service(canvas: dict) -> tuple[str | None, int | None, int | None]:
"""Détecte le IIIF Image Service d'un canvas et ses dimensions.
Retourne (service_url, canvas_width, canvas_height).
service_url est None si aucun service IIIF trouvé (image statique).
"""
canvas_w = canvas.get("width")
canvas_h = canvas.get("height")
# ── IIIF 3.0 : body → service[] ─────────────────────────────────────
items = canvas.get("items") or []
if items:
ann_items = (items[0].get("items") or []) if items else []
if ann_items:
body = ann_items[0].get("body") or {}
if isinstance(body, dict):
# Chercher un service IIIF sur le body
services = body.get("service") or []
if isinstance(services, dict):
services = [services]
for svc in services:
svc_type = svc.get("type") or svc.get("@type") or ""
if "ImageService" in svc_type:
svc_url = (svc.get("id") or svc.get("@id") or "").rstrip("/")
if svc_url:
return svc_url, canvas_w, canvas_h
# Fallback : détecter le pattern Image API dans body.id
body_id = body.get("id") or body.get("@id") or ""
m = _IIIF_IMAGE_API_RE.match(body_id)
if m:
return m.group(1), canvas_w, canvas_h
# ── IIIF 2.x : resource → service ───────────────────────────────────
images = canvas.get("images") or []
if images:
resource = images[0].get("resource") or {}
services = resource.get("service") or []
if isinstance(services, dict):
services = [services]
for svc in services:
svc_type = svc.get("@type") or svc.get("type") or ""
if "ImageService" in svc_type:
svc_url = (svc.get("@id") or svc.get("id") or "").rstrip("/")
if svc_url:
return svc_url, canvas_w, canvas_h
# Fallback : pattern Image API dans resource @id
res_id = resource.get("@id") or resource.get("id") or ""
m = _IIIF_IMAGE_API_RE.match(res_id)
if m:
return m.group(1), canvas_w, canvas_h
return None, canvas_w, canvas_h
def _detect_iiif_service_from_url(url: str) -> str | None:
"""Tente de détecter une URL de service IIIF à partir d'une URL d'image directe.
Si l'URL suit le pattern IIIF Image API ({base}/full/{size}/{rot}/{qual}.{fmt}),
retourne la base. Sinon retourne None.
"""
m = _IIIF_IMAGE_API_RE.match(url)
return m.group(1) if m else None
def _extract_canvas_image_url(canvas: dict) -> str | None:
"""Extrait l'URL de l'image principale d'un canvas IIIF (3.0 ou 2.x)."""
# IIIF 3.0
items = canvas.get("items") or []
if items:
ann_items = (items[0].get("items") or []) if items else []
if ann_items:
body = ann_items[0].get("body") or {}
if isinstance(body, dict):
return body.get("id") or body.get("@id")
# IIIF 2.x
images = canvas.get("images") or []
if images:
resource = images[0].get("resource") or {}
return resource.get("@id")
# Fallback : ID du canvas
return canvas.get("id") or canvas.get("@id")
# ── Endpoints ─────────────────────────────────────────────────────────────────
@router.post("/corpora/{corpus_id}/ingest/files", response_model=IngestResponse, status_code=201)
async def ingest_files(
corpus_id: str,
files: list[UploadFile] = File(...),
db: AsyncSession = Depends(get_db),
) -> IngestResponse:
"""Ingère une liste de fichiers images (multipart/form-data).
Chaque fichier crée un PageModel. Le fichier est copié dans
data/corpora/{slug}/masters/{folio_label}/{filename}.
"""
corpus = await _get_corpus_or_404(corpus_id, db)
ms = await _get_or_create_manuscript(db, corpus_id)
seq = await _next_sequence(db, ms.id)
# Collect labels and detect duplicates
labels = [_sanitize_label(Path(f.filename or f"file_{i}").stem) for i, f in enumerate(files)]
dupes = _find_duplicate_labels(labels)
created: list[PageModel] = []
written_files: list[Path] = []
skipped = 0
for i, upload in enumerate(files):
# Validation MIME type
ctype = upload.content_type or ""
if not any(ctype.startswith(p) for p in _ALLOWED_MIME_PREFIXES):
raise HTTPException(
status_code=422,
detail=f"Type MIME non autorisé : {ctype!r}. Seules les images sont acceptées.",
)
filename = _sanitize_filename(upload.filename or f"file_{i}.bin")
folio_label = labels[i]
page_id = _make_page_id(corpus.slug, folio_label, seq + i, dupes)
content = await upload.read()
# Validation taille
if len(content) > _MAX_UPLOAD_BYTES:
raise HTTPException(
status_code=413,
detail=f"Fichier trop volumineux ({len(content)} octets). Maximum : {_MAX_UPLOAD_BYTES}.",
)
master_dir = (
_config_module.settings.data_dir
/ "corpora"
/ corpus.slug
/ "masters"
/ folio_label
)
master_dir.mkdir(parents=True, exist_ok=True)
master_path = master_dir / filename
master_path.write_bytes(content)
written_files.append(master_path)
page = await _create_page(
db, ms.id, page_id, folio_label, seq + i,
image_master_path=str(master_path),
)
if page is None:
skipped += 1
else:
created.append(page)
ms.total_pages = (ms.total_pages or 0) + len(created)
try:
await db.commit()
except Exception:
# Nettoyage des fichiers orphelins si le commit BDD échoue
for f in written_files:
f.unlink(missing_ok=True)
raise
logger.info(
"Fichiers ingérés",
extra={"corpus_id": corpus_id, "created": len(created), "skipped": skipped},
)
return IngestResponse(
corpus_id=corpus_id,
manuscript_id=ms.id,
pages_created=len(created),
pages_skipped=skipped,
page_ids=[p.id for p in created],
)
@router.post("/corpora/{corpus_id}/ingest/iiif-manifest", response_model=IngestResponse, status_code=201)
async def ingest_iiif_manifest(
corpus_id: str,
body: IIIFManifestRequest,
db: AsyncSession = Depends(get_db),
) -> IngestResponse:
"""Télécharge un manifest IIIF, extrait les canvases et crée les PageModel."""
corpus = await _get_corpus_or_404(corpus_id, db)
try:
manifest = await _fetch_json_manifest(body.manifest_url)
except ValueError as exc:
raise HTTPException(status_code=400, detail=str(exc))
except httpx.HTTPStatusError as exc:
raise HTTPException(
status_code=502,
detail=f"Erreur HTTP lors du téléchargement du manifest : {exc.response.status_code}",
)
except (httpx.RequestError, httpx.TimeoutException) as exc:
raise HTTPException(
status_code=502,
detail=f"Erreur réseau lors du téléchargement du manifest : {exc}",
)
# Détecte le format IIIF (3.0 vs 2.x)
canvases: list[dict] = manifest.get("items") or []
if not canvases:
sequences = manifest.get("sequences") or []
canvases = sequences[0].get("canvases", []) if sequences else []
if not canvases:
raise HTTPException(
status_code=422,
detail="Le manifest IIIF ne contient aucun canvas (items vide)",
)
# Titre du manuscrit depuis le manifest
ms_title_raw = manifest.get("label") or {}
if isinstance(ms_title_raw, dict):
for lang in ("none", "fr", "en"):
v = ms_title_raw.get(lang)
if v:
ms_title = v[0] if isinstance(v, list) else str(v)
break
else:
ms_title = corpus.title
elif isinstance(ms_title_raw, str):
ms_title = ms_title_raw
else:
ms_title = corpus.title
ms = await _get_or_create_manuscript(db, corpus_id, title=ms_title)
seq = await _next_sequence(db, ms.id)
# Collect labels and detect duplicates
labels = [_sanitize_label(_extract_canvas_label(canvas, i)) for i, canvas in enumerate(canvases)]
dupes = _find_duplicate_labels(labels)
created: list[PageModel] = []
skipped = 0
for i, canvas in enumerate(canvases):
folio_label = labels[i]
page_id = _make_page_id(corpus.slug, folio_label, seq + i, dupes)
image_url = _extract_canvas_image_url(canvas)
service_url, c_width, c_height = _extract_iiif_service(canvas)
page = await _create_page(
db, ms.id, page_id, folio_label, seq + i,
image_master_path=image_url,
iiif_service_url=service_url,
canvas_width=c_width,
canvas_height=c_height,
manifest_url=body.manifest_url,
)
if page is None:
skipped += 1
else:
created.append(page)
ms.total_pages = (ms.total_pages or 0) + len(created)
try:
await db.commit()
except IntegrityError:
await db.rollback()
raise HTTPException(
status_code=409,
detail="Conflit : certaines pages existent déjà (ingestion concurrente probable)",
)
logger.info(
"Manifest IIIF ingéré",
extra={
"corpus_id": corpus_id,
"url": body.manifest_url,
"created": len(created),
"skipped": skipped,
"iiif_service_detected": sum(1 for p in created if p.iiif_service_url),
},
)
return IngestResponse(
corpus_id=corpus_id,
manuscript_id=ms.id,
pages_created=len(created),
pages_skipped=skipped,
page_ids=[p.id for p in created],
)
@router.post("/corpora/{corpus_id}/ingest/iiif-images", response_model=IngestResponse, status_code=201)
async def ingest_iiif_images(
corpus_id: str,
body: IIIFImagesRequest,
db: AsyncSession = Depends(get_db),
) -> IngestResponse:
"""Ingère une liste d'URLs d'images IIIF directes.
urls et folio_labels doivent avoir la même longueur.
"""
if len(body.urls) != len(body.folio_labels):
raise HTTPException(
status_code=422,
detail=f"urls ({len(body.urls)}) et folio_labels ({len(body.folio_labels)}) doivent avoir la même longueur",
)
if not body.urls:
raise HTTPException(status_code=422, detail="La liste d'URLs est vide")
corpus = await _get_corpus_or_404(corpus_id, db)
ms = await _get_or_create_manuscript(db, corpus_id)
seq = await _next_sequence(db, ms.id)
sanitized_labels = [_sanitize_label(lbl) for lbl in body.folio_labels]
dupes = _find_duplicate_labels(sanitized_labels)
created: list[PageModel] = []
skipped = 0
for i, (url, folio_label) in enumerate(zip(body.urls, sanitized_labels)):
page_id = _make_page_id(corpus.slug, folio_label, seq + i, dupes)
# Tenter de détecter un service IIIF à partir du pattern URL
service_url = _detect_iiif_service_from_url(url)
page = await _create_page(
db, ms.id, page_id, folio_label, seq + i,
image_master_path=url,
iiif_service_url=service_url,
)
if page is None:
skipped += 1
else:
created.append(page)
ms.total_pages = (ms.total_pages or 0) + len(created)
try:
await db.commit()
except IntegrityError:
await db.rollback()
raise HTTPException(
status_code=409,
detail="Conflit : certaines pages existent déjà (ingestion concurrente probable)",
)
logger.info(
"Images IIIF ingérées",
extra={"corpus_id": corpus_id, "created": len(created), "skipped": skipped},
)
return IngestResponse(
corpus_id=corpus_id,
manuscript_id=ms.id,
pages_created=len(created),
pages_skipped=skipped,
page_ids=[p.id for p in created],
)
|