Feature/frontend integration

.devcontainer/Dockerfile

@@ -88,7 +88,11 @@ RUN apt update && apt install -y \
     && rm -rf /tmp/* /var/tmp/* \
     && rm -rf /var/lib/apt/lists/*
 
-
+# Node.js & npm for frontend build
+RUN apt-get update && \
+    apt-get install -y curl && \
+    curl -fsSL https://deb.nodesource.com/setup_24.x | bash - && \
+    apt-get install -y nodejs
 
 WORKDIR /tmp
 

.dockerignore

@@ -2,7 +2,10 @@ resources/
 !resources/api
 !resources/pipelines
 !resources/cache/aymurai
-!resources/cache/tfhub_modules
 notebooks/
 
-*.egg-info/
+*.egg-info/
+
+frontend/node_modules/
+frontend/out/
+frontend-dist/

.github/workflows/pytest.yml

@@ -69,6 +69,7 @@ jobs:
       - name: Run api tests
         env:
           DISKCACHE_ROOT: /tmp
+          SQLALCHEMY_DATABASE_URI: sqlite:////tmp/aymurai-test.db
         run: uv run --no-sync pytest -q --tb=short --disable-warnings --color=yes --maxfail=5 tests/api
 
       - name: Download pipelines data

.gitignore

@@ -135,3 +135,9 @@ aymurai/version.py
 notebooks/**
 !notebooks/**/
 !notebooks/**/*.ipynb
+
+# Frontend build output
+frontend-dist/
+
+# pnpm local package store
+.pnpm-store/

Makefile

@@ -44,3 +44,19 @@ alembic-regenerate:
 	cd aymurai && \
 	uv run alembic revision --autogenerate -m "Create database" && \
 	uv run alembic upgrade head
+
+# --- Frontend build ---
+FRONTEND_DIR=frontend
+FRONTEND_DIST_DIR=frontend-dist
+
+frontend-install:
+	cd $(FRONTEND_DIR) && pnpm install
+
+frontend-build: frontend-install
+	cd $(FRONTEND_DIR) && pnpm run build:web
+	# Copy build output to frontend-dist
+	rm -rf $(FRONTEND_DIST_DIR)
+	cp -r $(FRONTEND_DIR)/out/renderer $(FRONTEND_DIST_DIR)
+
+frontend-clean:
+	rm -rf $(FRONTEND_DIST_DIR)

README.md

@@ -50,7 +50,13 @@ docker run -d --name aymurai-backend-gpu --gpus all \
 Open Swagger UI:
 
 ```text
-http://localhost:8899/docs
+http://localhost:8899/api/docs
+```
+
+Open the bundled frontend:
+
+```text
+http://localhost:8899/
 ```
 
 ## Quick Start (Docker Compose)
@@ -80,23 +86,24 @@ make api-logs
 ## Runtime Overview
 - Framework: `FastAPI`
 - Default API port: `8899`
+- Bundled frontend path: `GET /`
 - DB engine: `SQLModel` + Alembic migrations on startup
 - Default DB URI: `sqlite:////resources/cache/sqlite/database.db`
 - Production pipeline configs:
   - `resources/pipelines/production/flair-anonymizer/pipeline.json`
   - `resources/pipelines/production/datapublic/pipeline.json`
 
 ## Main Public Endpoints
-- `GET /server/healthcheck`
-- `GET /server/stats/summary`
-- `POST /misc/document-extract` (and deprecated alias `POST /document-extract`)
-- `POST /anonymizer/predict`
-- `POST /anonymizer/disambiguate`
-- `POST /anonymizer/validation`
-- `POST /anonymizer/anonymize-document`
-- `POST /datapublic/predict/{document_id}`
-- `GET /datapublic/validation/document/{document_id}`
-- `POST /datapublic/validation/document/{document_id}`
+- `GET /api/server/healthcheck`
+- `GET /api/server/stats/summary`
+- `POST /api/misc/document-extract` (and deprecated alias `POST /api/document-extract`)
+- `POST /api/anonymizer/predict`
+- `POST /api/anonymizer/disambiguate`
+- `POST /api/anonymizer/validation`
+- `POST /api/anonymizer/anonymize-document`
+- `POST /api/datapublic/predict/{document_id}`
+- `GET /api/datapublic/validation/document/{document_id}`
+- `POST /api/datapublic/validation/document/{document_id}`
 
 For full request/response contracts and examples, see [docs/api/README.md](docs/api/README.md).
 

aymurai/api/core.py

@@ -1,9 +1,7 @@
 from fastapi.routing import APIRouter
 
 from .endpoints.routers.anonymizer import anonymizer
-from .endpoints.routers.anonymizer import database as anonymizer_database
 from .endpoints.routers.datapublic import datapublic
-
 from .endpoints.routers.misc import convert, document_extract
 from .endpoints.routers.server import stats
 
@@ -23,11 +21,6 @@
     prefix="/anonymizer",
     tags=["anonymization/model"],
 )
-# router.include_router(
-#     anonymizer_database.router,
-#     prefix="/anonymizer/database",
-#     tags=["anonymization/database"],
-# )
 
 # Datapublic
 router.include_router(

aymurai/api/endpoints/routers/anonymizer/anonymizer.py

@@ -5,7 +5,6 @@
 from collections.abc import Iterable
 from threading import Lock
 
-import torch
 from fastapi import Body, Depends, Form, HTTPException, Query, UploadFile
 from fastapi.responses import FileResponse
 from fastapi.routing import APIRouter
@@ -31,7 +30,7 @@
     RenderPolicy,
     TextRequest,
 )
-from aymurai.settings import settings
+from aymurai.settings import DEFAULT_RENDER_POLICY, settings
 from aymurai.text.anonymization import (
     InvalidDocumentAnonymizer,
     get_anonymizer,
@@ -48,7 +47,6 @@
 
 
 RESOURCES_BASEPATH = settings.RESOURCES_BASEPATH
-torch.set_num_threads = 100  # FIXME: polemic ?
 pipeline_lock = Lock()
 
 
@@ -198,10 +196,7 @@ def _merge_render_policy(
     Returns:
         RenderPolicy: Effective render policy.
     """
-    policy = RenderPolicy(
-        suffix_mode="auto",
-        suffix_threshold=1,
-    )
+    policy = RenderPolicy.model_validate(DEFAULT_RENDER_POLICY)
 
     def apply(incoming: RenderPolicy) -> None:
         nonlocal policy

aymurai/api/endpoints/routers/datapublic/datapublic.py

@@ -1,7 +1,6 @@
 import os
 from threading import Lock
 
-import torch
 from fastapi import Body, Depends, HTTPException, Query
 from fastapi.routing import APIRouter
 from pydantic import UUID5
@@ -28,7 +27,6 @@
 
 
 RESOURCES_BASEPATH = settings.RESOURCES_BASEPATH
-torch.set_num_threads = 100  # FIXME: polemic ?
 pipeline_lock = Lock()
 
 

aymurai/api/endpoints/routers/frontend/__init__.py

@@ -0,0 +1 @@
+

aymurai/api/endpoints/routers/frontend/frontend.py

@@ -0,0 +1,114 @@
+from pathlib import Path
+
+from fastapi import APIRouter, HTTPException
+from fastapi.responses import FileResponse, RedirectResponse, Response
+
+from aymurai.settings import settings
+
+router = APIRouter(include_in_schema=False)
+
+LEGACY_API_ROUTE_PREFIXES = (
+    "anonymizer",
+    "api",
+    "convert",
+    "datapublic",
+    "database",
+    "document-extract",
+    "docs",
+    "misc",
+    "openapi.json",
+    "redoc",
+    "server",
+)
+FEATURE_ROUTE_SLUGS = ("anonymizer", "data_set")
+FEATURE_ROUTE_STEPS = ("", "finish", "onboarding", "preview", "process", "validation")
+LEGACY_FEATURE_ROUTE_SLUGS = {
+    "ANONYMIZER": "anonymizer",
+    "DATA_SET": "data_set",
+}
+
+
+def _frontend_dist_dir() -> Path:
+    return Path(settings.FRONTEND_DIST_DIR).expanduser()
+
+
+def _split_asset_path(asset_path: str) -> list[str]:
+    return [segment for segment in asset_path.lstrip("/").split("/") if segment]
+
+
+def _is_frontend_feature_route(asset_path: str) -> bool:
+    segments = _split_asset_path(asset_path)
+    if not segments or segments[0] not in FEATURE_ROUTE_SLUGS:
+        return False
+
+    return len(segments) == 1 or segments[1] in FEATURE_ROUTE_STEPS
+
+
+def _is_legacy_api_route(asset_path: str) -> bool:
+    first_segment = asset_path.lstrip("/").split("/", maxsplit=1)[0]
+    if _is_frontend_feature_route(asset_path):
+        return False
+    return first_segment in LEGACY_API_ROUTE_PREFIXES
+
+
+def _canonical_frontend_path(asset_path: str) -> str | None:
+    segments = _split_asset_path(asset_path)
+    if not segments:
+        return None
+
+    if segments[0] == "app":
+        canonical_segments = segments[1:]
+        if canonical_segments:
+            canonical_feature = LEGACY_FEATURE_ROUTE_SLUGS.get(canonical_segments[0])
+            if canonical_feature:
+                canonical_segments = [canonical_feature, *canonical_segments[1:]]
+        return "/" + "/".join(canonical_segments)
+
+    canonical_feature = LEGACY_FEATURE_ROUTE_SLUGS.get(segments[0])
+    if canonical_feature:
+        return "/" + "/".join([canonical_feature, *segments[1:]])
+
+    return None
+
+
+def _resolve_frontend_path(asset_path: str) -> Path:
+    dist_dir = _frontend_dist_dir().resolve()
+    requested_path = (dist_dir / asset_path.lstrip("/")).resolve()
+    requested_path.relative_to(dist_dir)
+    return requested_path
+
+
+def _serve_frontend(asset_path: str = "") -> Response:
+    canonical_path = _canonical_frontend_path(asset_path)
+    if canonical_path is not None:
+        return RedirectResponse(canonical_path or "/")
+
+    if asset_path and _is_legacy_api_route(asset_path):
+        raise HTTPException(status_code=404, detail="API route not found.")
+
+    dist_dir = _frontend_dist_dir()
+    index_file = dist_dir / "index.html"
+    if not dist_dir.is_dir() or not index_file.is_file():
+        raise HTTPException(status_code=404, detail="Frontend build not found.")
+
+    if asset_path:
+        try:
+            requested_path = _resolve_frontend_path(asset_path)
+        except ValueError as error:
+            raise HTTPException(
+                status_code=404, detail="Frontend asset not found."
+            ) from error
+
+        if requested_path.is_file():
+            return FileResponse(requested_path)
+
+        if Path(asset_path).suffix:
+            raise HTTPException(status_code=404, detail="Frontend asset not found.")
+
+    return FileResponse(index_file)
+
+
+@router.get("/")
+@router.get("/{asset_path:path}")
+async def frontend_app(asset_path: str = "") -> Response:
+    return _serve_frontend(asset_path)

aymurai/api/main.py

@@ -2,19 +2,19 @@
 import time
 from contextlib import asynccontextmanager
 
-import torch
 from alembic import command
 from alembic.config import Config
 from fastapi import FastAPI, Request
-from fastapi.responses import RedirectResponse
 from fastapi.middleware.cors import CORSMiddleware
 from starlette.formparsers import MultiPartParser
 
 from aymurai.api import core
+from aymurai.api.endpoints.routers.frontend import frontend
+from aymurai.api.startup.database import check_db_connection
+from aymurai.api.utils import configure_torch_threads
 from aymurai.logger import get_logger
-from aymurai.settings import settings
 from aymurai.pipeline import AymurAIPipeline
-from aymurai.api.startup.database import check_db_connection
+from aymurai.settings import settings
 
 try:
     from aymurai.version import __version__
@@ -24,7 +24,7 @@
 logger = get_logger(__name__)
 
 
-torch.set_num_threads = 100  # FIXME: polemic ?
+configure_torch_threads()
 
 RESOURCES_BASEPATH = settings.RESOURCES_BASEPATH
 
@@ -54,8 +54,9 @@ async def lifespan(app: FastAPI):
         logger.info(">> Running Alembic migrations")
         alembic_cfg = Config(str(settings.ALEMBIC_INI_PATH))
         command.upgrade(alembic_cfg, "head")
-    except Exception as error:
-        logger.error("Error while starting up:", error)
+    except Exception:
+        logger.exception("Error while starting up")
+        raise
 
     yield
 
@@ -64,6 +65,9 @@ async def lifespan(app: FastAPI):
     title="AymurAI API",
     version=__version__,
     lifespan=lifespan,
+    docs_url="/api/docs",
+    redoc_url="/api/redoc",
+    openapi_url="/api/openapi.json",
 )
 
 
@@ -90,33 +94,20 @@ async def add_process_time_header(request: Request, call_next):
     return response
 
 
-@api.get("/", response_class=RedirectResponse, include_in_schema=False)
-async def index():
-    return "/docs"
-
-
-# @api.get("/docs", include_in_schema=False)
-# async def custom_swagger_ui_html():
-#     return get_swagger_ui_html(
-#         openapi_url=api.openapi_url,
-#         title=f"{api.title} - Swagger UI",
-#         swagger_css_url="https://cdn.jsdelivr.net/gh/danielperezrubio/swagger-dark-theme@main/assets/swagger-ui.min.css",
-#     )
-
-
 ################################################################################
 # MARK: API ENDPOINTS
 ################################################################################
 
 
 # Healthcheck
-@api.get("/server/healthcheck", status_code=200, tags=["server"])
+@api.get("/api/server/healthcheck", status_code=200, tags=["server"])
 def healthcheck():
     return {"status": "ok"}
 
 
 # Api endpoints
-api.include_router(core.router)
+api.include_router(core.router, prefix="/api")
+api.include_router(frontend.router)
 
 
 if __name__ == "__main__":