@tricoteuses/senat 2.9.1 → 2.9.6

package/lib/scripts/retrieve_comptes_rendus.js

@@ -2,11 +2,11 @@ import assert from "assert";
 import commandLineArgs from "command-line-args";
 import fs from "fs-extra";
 import path from "path";
-import { COMPTES_RENDUS_FOLDER, DATA_ORIGINAL_FOLDER, DATA_TRANSFORMED_FOLDER, iterLoadSenatDebats } from "../loaders";
-import { parseCompteRenduFromFile } from "../model/compte_rendu";
+import { COMPTES_RENDUS_FOLDER, DATA_ORIGINAL_FOLDER, DATA_TRANSFORMED_FOLDER, iterLoadSenatDebats, } from "../loaders";
 import { getSessionsFromStart } from "../types/sessions";
 import { commonOptions } from "./shared/cli_helpers";
 import { ensureAndClearDir } from "./shared/util";
+import { parseCompteRenduFromFile } from "../model/compte_rendu";
 const optionsDefinitions = [
     ...commonOptions,
     {
@@ -22,6 +22,22 @@ class CompteRenduError extends Error {
         super(`An error occurred while retrieving Compte-Rendu ${compteRenduUrl}: ${message}`);
     }
 }
+async function fetchWithRetry(url, retries = 5, backoffMs = 1000) {
+    for (let attempt = 0; attempt < retries; attempt++) {
+        try {
+            return await fetch(url);
+        }
+        catch (e) {
+            if (attempt === retries)
+                break;
+            console.warn(`Fetch attempt ${attempt + 1} for ${url} failed. Retrying in ${backoffMs}ms...`);
+            await new Promise((resolve) => setTimeout(resolve, backoffMs));
+            backoffMs *= 2;
+        }
+    }
+    console.log(`Failed to fetch ${url} after ${retries} attempts.`);
+    return null;
+}
 async function retrieveComptesRendus(dataDir, sessions) {
     const comptesRendusRootDir = path.join(dataDir, COMPTES_RENDUS_FOLDER);
     ensureAndClearDir(comptesRendusRootDir);
@@ -38,16 +54,15 @@ async function retrieveComptesRendus(dataDir, sessions) {
         if (options["parseDebats"]) {
             fs.ensureDirSync(transformedComptesRendusSessionDir);
         }
-        for (const { item: debat, } of iterLoadSenatDebats(dataDir, session)) {
-            if (!debat.url) {
+        for (const { item: debat } of iterLoadSenatDebats(dataDir, session)) {
+            if (!debat.url)
                 continue;
-            }
             try {
                 const debatMonoUrl = `${path.parse(debat.url).dir}/s${debat.id}_mono.html`;
                 const compteRenduPath = path.join(originalComptesRendusSessionDir, `${debat.id}.html`);
                 await downloadCompteRendu(debatMonoUrl, compteRenduPath);
                 if (options["parseDebats"]) {
-                    await parseCompteRendu(transformedComptesRendusSessionDir, compteRenduPath, debat);
+                    await parseAndWriteJSON(transformedComptesRendusSessionDir, compteRenduPath, debat);
                 }
             }
             catch (error) {
@@ -61,7 +76,7 @@ async function downloadCompteRendu(debatUrl, compteRenduPath) {
     if (!options["silent"]) {
         console.log(`Downloading Compte-Rendu ${compteRenduUrl}…`);
     }
-    const response = await fetch(compteRenduUrl);
+    const response = await fetchWithRetry(compteRenduUrl);
     if (!response.ok) {
         if (response.status === 404) {
             console.warn(`Compte-Rendu ${compteRenduUrl} not found`);
@@ -72,21 +87,19 @@ async function downloadCompteRendu(debatUrl, compteRenduPath) {
         return;
     }
     const compteRenduContent = await response.arrayBuffer();
-    if (!compteRenduContent) {
+    if (!compteRenduContent)
         return;
-    }
     fs.writeFileSync(compteRenduPath, Buffer.from(compteRenduContent));
 }
-async function parseCompteRendu(transformedComptesRendusSessionDir, compteRenduPath, debat) {
+async function parseAndWriteJSON(transformedComptesRendusSessionDir, compteRenduPath, debat) {
     if (!options["silent"]) {
         console.log(`Parsing compte-rendu ${compteRenduPath}…`);
     }
-    const parsedCompteRendu = await parseCompteRenduFromFile(compteRenduPath, debat);
-    if (!parsedCompteRendu) {
+    const parsed = await parseCompteRenduFromFile(compteRenduPath);
+    if (!parsed)
         return;
-    }
     const parsedFilePath = path.parse(compteRenduPath);
-    fs.writeJSONSync(path.join(transformedComptesRendusSessionDir, `${parsedFilePath.name}.json`), parsedCompteRendu, { spaces: 2 });
+    fs.writeJSONSync(path.join(transformedComptesRendusSessionDir, `${parsedFilePath.name}.json`), parsed, { spaces: 2 });
 }
 async function main() {
     const dataDir = options["dataDir"];

package/lib/scripts/retrieve_videos.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/scripts/retrieve_videos.js

@@ -0,0 +1,420 @@
+// scripts/retrieve_senat_videos_from_agendas.ts
+import assert from "assert";
+import commandLineArgs from "command-line-args";
+import fs from "fs-extra";
+import fsp from "fs/promises";
+import path from "path";
+import { AGENDA_FOLDER, DATA_TRANSFORMED_FOLDER, iterLoadSenatAgendas, } from "../loaders";
+import { getSessionsFromStart } from "../types/sessions";
+import { commonOptions } from "./shared/cli_helpers";
+// ===================== Constants =====================
+const MATCH_THRESHOLD = 0.60;
+const MAX_CANDIDATES = 15;
+const MAX_PAGES = 3;
+const STATS = { total: 0, accepted: 0 };
+const VIDEOS_ROOT_FOLDER = "videos";
+const SENAT_VIDEOS_SEARCH_AJAX = "https://videos.senat.fr/senat_videos_search.php";
+const SENAT_DATAS_ROOT = "https://videos.senat.fr/Datas/senat";
+const SENAT_VOD_HOST = "https://vodsenat.akamaized.net";
+// ===================== CLI =====================
+const optionsDefinitions = [
+    ...commonOptions,
+];
+const options = commandLineArgs(optionsDefinitions);
+// ===================== Utils =====================
+function normalize(s) {
+    return (s ?? "")
+        .toLowerCase()
+        .normalize("NFD")
+        .replace(/[\u0300-\u036f]/g, "")
+        .replace(/[^\p{L}\p{N}\s-]/gu, " ")
+        .replace(/\s+/g, " ")
+        .trim();
+}
+function tokens(s) { return normalize(s).split(" ").filter(Boolean); }
+function dice(a, b) {
+    const A = new Set(tokens(a)), B = new Set(tokens(b));
+    if (!A.size || !B.size)
+        return 0;
+    let inter = 0;
+    for (const t of A)
+        if (B.has(t))
+            inter++;
+    return (2 * inter) / (A.size + B.size);
+}
+// Heuristic for Europe/Paris DST: +02:00 ≈ April→October, +01:00 otherwise.
+function parisOffsetForDate(dateYYYYMMDD) {
+    const m = Number(dateYYYYMMDD.split("-")[1] || "1");
+    return (m >= 4 && m <= 10) ? "+02:00" : "+01:00";
+}
+function epochToParisDateTime(epochSec) {
+    if (!Number.isFinite(epochSec))
+        return null;
+    const dUtc = new Date(epochSec * 1000);
+    // Offset heuristic (same logique que parisOffsetForDate)
+    const m = dUtc.getUTCMonth() + 1; // 1..12
+    const offsetHours = (m >= 4 && m <= 10) ? 2 : 1;
+    const offsetStr = offsetHours === 2 ? "+02:00" : "+01:00";
+    // Applique l'offset pour obtenir la date/heure locales Paris
+    const localMs = dUtc.getTime() + offsetHours * 3600 * 1000;
+    const dl = new Date(localMs);
+    const yyyy = String(dl.getUTCFullYear());
+    const mm = String(dl.getUTCMonth() + 1).padStart(2, "0");
+    const dd = String(dl.getUTCDate()).padStart(2, "0");
+    const hh = String(dl.getUTCHours()).padStart(2, "0");
+    const mi = String(dl.getUTCMinutes()).padStart(2, "0");
+    const ss = String(dl.getUTCSeconds()).padStart(2, "0");
+    const ms = String(dl.getUTCMilliseconds()).padStart(3, "0");
+    return {
+        date: `${yyyy}-${mm}-${dd}`,
+        startTime: `${hh}:${mi}:${ss}.${ms}${offsetStr}`,
+    };
+}
+function toTargetEpoch(date, time) {
+    if (!date)
+        return null;
+    let t = (time ?? "00:00").trim();
+    // Si l'heure contient déjà un fuseau (Z ou ±HH:MM), on la fait simplement précéder de la date.
+    const hasTz = /(?:Z|[+-]\d{2}:\d{2})$/i.test(t);
+    let iso;
+    if (hasTz) {
+        // Exemple: 2022-10-04T18:00:00.000+02:00
+        iso = `${date}T${t}`;
+    }
+    else {
+        // Normalise pour avoir au moins HH:mm:ss
+        if (/^\d{1,2}$/.test(t)) {
+            t = `${t.padStart(2, "0")}:00:00`;
+        }
+        else if (/^\d{1,2}:\d{2}$/.test(t)) {
+            t = `${t}:00`;
+        } // sinon, on garde tel quel (gère HH:mm:ss et HH:mm:ss.SSS)
+        // Ajoute l’offset Paris (heuristique saisonnière)
+        iso = `${date}T${t}${parisOffsetForDate(date)}`;
+    }
+    const ms = Date.parse(iso);
+    return Number.isNaN(ms) ? null : Math.floor(ms / 1000);
+}
+async function fetchText(url) {
+    const res = await fetch(url);
+    if (!res.ok)
+        return null;
+    return await res.text();
+}
+async function fetchBuffer(url) {
+    const res = await fetch(url);
+    if (!res.ok)
+        return null;
+    const ab = await res.arrayBuffer();
+    return Buffer.from(ab);
+}
+async function writeIfChanged(p, content) {
+    const exists = await fs.pathExists(p);
+    if (exists) {
+        const old = await fsp.readFile(p, "utf-8");
+        if (old === content)
+            return;
+    }
+    await fsp.writeFile(p, content, "utf-8");
+}
+function queryString(obj) {
+    return Object.entries(obj)
+        .map(([k, v]) => `${encodeURIComponent(k)}=${encodeURIComponent(v)}`)
+        .join("&");
+}
+function simplifyTitleForKeywords(input) {
+    return (input || "")
+        .replace(/\baudition\s+de\b/gi, " ")
+        .replace(/\breunion\b/gi, " ")
+        .replace(/\bsur\b/gi, " ")
+        .replace(/\b(la|le|les|des|de|du|d’|d')\b/gi, " ")
+        .replace(/[–—-]/g, " ")
+        .replace(/\s+/g, " ")
+        .trim();
+}
+function toFRDate(dateYYYYMMDD) {
+    const [y, m, d] = dateYYYYMMDD.split("-");
+    return `${d}/${m}/${y}`; // DD/MM/YYYY
+}
+function formatYYYYMMDD(dateYYYYMMDD) {
+    const [y, m, d] = dateYYYYMMDD.split("-");
+    return `${y}${m}${d}`;
+}
+function makeReunionUid(agenda) {
+    // agenda.date is expected as "YYYY-MM-DD"
+    const ymd = agenda.date ? formatYYYYMMDD(agenda.date) : "00000000";
+    return `${ymd}-${agenda.id}`;
+}
+function extractCandidatesFromSearchHtml(html) {
+    const out = [];
+    const re = /href="\/?video\.(\d+)_([a-z0-9]+)\.[^"]+"/gi;
+    let m;
+    while ((m = re.exec(html))) {
+        const id = m[1], hash = m[2];
+        const pageUrl = `https://videos.senat.fr/video.${id}_${hash}.html`;
+        const ctx = html.slice(Math.max(0, m.index - 240), Math.min(html.length, m.index + 240));
+        const t = ctx.match(/title="([^"]+)"/i) || ctx.match(/>([^<]{10,200})</);
+        out.push({ id, hash, pageUrl, title: t?.[1] });
+    }
+    const seen = new Set();
+    return out.filter(c => {
+        const k = `${c.id}_${c.hash}`;
+        if (seen.has(k))
+            return false;
+        seen.add(k);
+        return true;
+    });
+}
+function parseDataNvs(nvs) {
+    const epoch = nvs.match(/<metadata\s+name="date"\s+value="(\d+)"/i)?.[1];
+    const title = nvs.match(/<metadata\s+name="title"\s+value="([^"]+)"/i)?.[1];
+    return { epoch: epoch ? Number(epoch) : undefined, title };
+}
+function buildSenatVodMasterM3u8FromNvs(xml, host = SENAT_VOD_HOST) {
+    if (!xml)
+        return null;
+    // (a) Déjà un lien VOD complet en .smil/playlist.m3u8
+    const mVod = xml.match(/https?:\/\/[^"'<>]*vodsenat[^"'<>]*\.smil\/(?:playlist|master)\.m3u8/i);
+    if (mVod)
+        return mVod[0];
+    // (b) Chemin senat/YYYY/MM/<basename>.smil  -> normalise en playlist.m3u8
+    const mSmilPath = xml.match(/senat\/(\d{4})\/(\d{2})\/([^"'<>\/]+?)\.smil/i);
+    if (mSmilPath) {
+        const [, y, m, base] = mSmilPath;
+        return `${host}/senat/${y}/${m}/${base}.smil/playlist.m3u8`;
+    }
+    // (c) Chemin senat/YYYY/MM/<basename>.mp4  -> transforme en .smil/playlist.m3u8
+    const mMp4Path = xml.match(/senat\/(\d{4})\/(\d{2})\/([^"'<>\/]+?)\.mp4/i);
+    if (mMp4Path) {
+        const [, y, m, base] = mMp4Path;
+        return `${host}/senat/${y}/${m}/${base}.smil/playlist.m3u8`;
+    }
+    // (d) À défaut, n’importe quel .m3u8 présent (faible priorité — peut être du live)
+    const mAny = xml.match(/https?:\/\/[^"'<>]+\.m3u8/i);
+    return mAny ? mAny[0] : null;
+}
+function score(agenda, agendaTs, videoTitle, videoEpoch) {
+    const titleScore = dice(agenda.titre || "", videoTitle || "");
+    let timeScore = 0;
+    if (agendaTs && videoEpoch) {
+        const deltaMin = Math.abs(videoEpoch - agendaTs) / 60;
+        timeScore = Math.max(0, 1 - (deltaMin / 180));
+    }
+    let orgBonus = 0;
+    if (agenda.organe && videoTitle) {
+        const o = normalize(agenda.organe);
+        const t = normalize(videoTitle);
+        if (o && t.includes(o.split(" ")[0]))
+            orgBonus = 0.15;
+    }
+    return 0.3 * titleScore + 0.7 * timeScore + orgBonus;
+}
+function buildSearchStrategies(agenda) {
+    const fr = agenda.date ? toFRDate(agenda.date) : undefined;
+    const kw = simplifyTitleForKeywords(agenda.titre || "");
+    const commission = agenda.organe || undefined;
+    // common base
+    const base = { search: "true", videotype: "Commission" };
+    if (fr)
+        Object.assign(base, { period: "custom", begin: fr, end: fr });
+    const strategies = [];
+    // 1) keywords + commission
+    if (kw && commission)
+        strategies.push({ ...base, motscles: kw, commission });
+    // 2) keywords without commission
+    if (kw)
+        strategies.push({ ...base, motscles: kw });
+    // 3) full-text (AND) + commission
+    if (kw && commission)
+        strategies.push({ ...base, text: `AND${kw}`, commission });
+    // 4) full-text (AND) without commission
+    if (kw)
+        strategies.push({ ...base, text: `AND${kw}` });
+    // 5) no keywords (just type + period)
+    strategies.push({ ...base });
+    return strategies;
+}
+async function fetchAllSearchPages(args, baseDir, strategyIndex, maxPages = MAX_PAGES) {
+    const pages = [];
+    for (let p = 1; p <= maxPages; p++) {
+        const url = `${SENAT_VIDEOS_SEARCH_AJAX}?${queryString({ ...args, page: String(p) })}`;
+        const html = await fetchText(url);
+        if (!html)
+            break;
+        pages.push(html);
+        if (!/href="\/?video\.\d+_[a-z0-9]+\./i.test(html))
+            break;
+    }
+    return pages;
+}
+async function processAgenda(agenda, session, dataDir) {
+    if (!agenda)
+        return;
+    if (!agenda.captationVideo) {
+        if (!options["silent"])
+            console.log(`[skip] ${agenda.id} captationVideo=false`);
+        return;
+    }
+    if (!agenda.date || !agenda.startTime) {
+        if (!options["silent"])
+            console.log(`[skip] ${agenda.id} date/hour missing`);
+        return;
+    }
+    STATS.total++;
+    const reunionUid = makeReunionUid(agenda);
+    const baseDir = path.join(dataDir, VIDEOS_ROOT_FOLDER, String(session), reunionUid);
+    await fs.ensureDir(baseDir);
+    const agendaTs = toTargetEpoch(agenda.date, agenda.startTime);
+    // ==== 1) Multi-strategy searches ====
+    const strategies = buildSearchStrategies(agenda);
+    let combinedHtml = "";
+    let usedStrategy = -1;
+    let candidates = [];
+    for (let i = 0; i < strategies.length; i++) {
+        const pages = await fetchAllSearchPages(strategies[i], baseDir, i + 1, MAX_PAGES);
+        if (pages.length === 0)
+            continue;
+        const combined = pages.join("\n<!-- PAGE SPLIT -->\n");
+        const cs = extractCandidatesFromSearchHtml(combined);
+        if (cs.length) {
+            combinedHtml = combined;
+            candidates = cs.slice(0, MAX_CANDIDATES);
+            usedStrategy = i + 1;
+            break;
+        }
+    }
+    if (usedStrategy === -1 || !candidates.length) {
+        if (!options["silent"])
+            console.log(`[miss] ${agenda.id} no candidates (triedStrategies=${strategies.length})`);
+        return;
+    }
+    // ==== 2) Enrich via data.nvs + scoring; pick best ====
+    let best = null;
+    for (const c of candidates) {
+        const dataUrl = `${SENAT_DATAS_ROOT}/${c.id}_${c.hash}/content/data.nvs`;
+        const buf = await fetchBuffer(dataUrl);
+        if (!buf)
+            continue;
+        const meta = parseDataNvs(buf.toString("utf-8"));
+        const s = score(agenda, agendaTs, c.title ?? meta.title, meta.epoch);
+        if (!best || s > best.score) {
+            best = { id: c.id, hash: c.hash, pageUrl: c.pageUrl, epoch: meta.epoch, vtitle: c.title ?? meta.title, score: s };
+        }
+    }
+    if (!best) {
+        if (!options["silent"])
+            console.log(`[miss] ${agenda.id} candidats without data.nvs`);
+        return;
+    }
+    const accepted = best.score >= MATCH_THRESHOLD;
+    if (accepted)
+        STATS.accepted++;
+    if (!options["silent"]) {
+        console.log(`[pick] ${agenda.id} best id=${best.id} hash=${best.hash} score=${best.score.toFixed(2)} accepted=${accepted} (strategy=${usedStrategy})`);
+    }
+    // ==== 3) Write metadata + NVS of the best candidate (always) ====
+    const bestDt = best?.epoch ? epochToParisDateTime(best.epoch) : null;
+    const metadata = {
+        reunionUid,
+        session,
+        accepted,
+        threshold: MATCH_THRESHOLD,
+        strategy: usedStrategy,
+        agenda: {
+            date: agenda.date,
+            startTime: agenda.startTime,
+            titre: agenda.titre,
+            organe: agenda.organe ?? undefined,
+            id: agenda.id,
+        },
+        best: {
+            id: best.id,
+            hash: best.hash,
+            pageUrl: best.pageUrl,
+            epoch: best.epoch ?? null,
+            date: bestDt?.date ?? null,
+            startTime: bestDt?.startTime ?? null,
+            title: best.vtitle ?? null,
+            score: best.score,
+        },
+    };
+    await writeIfChanged(path.join(baseDir, "metadata.json"), JSON.stringify(metadata, null, 2));
+    const dataUrl = `${SENAT_DATAS_ROOT}/${best.id}_${best.hash}/content/data.nvs`;
+    const finalUrl = `${SENAT_DATAS_ROOT}/${best.id}_${best.hash}/content/finalplayer.nvs`;
+    const dataTxt = await fetchText(dataUrl);
+    const finalTxt = await fetchText(finalUrl);
+    if (dataTxt)
+        await fsp.writeFile(path.join(baseDir, "data.nvs"), dataTxt, "utf-8");
+    if (finalTxt)
+        await fsp.writeFile(path.join(baseDir, "finalplayer.nvs"), finalTxt, "utf-8");
+    let master = null;
+    if (dataTxt)
+        master = buildSenatVodMasterM3u8FromNvs(dataTxt);
+    // ==== 4) Update agenda file (only if accepted + m3u8) ====
+    if (accepted && master) {
+        const agendaJsonPath = path.join(dataDir, AGENDA_FOLDER, DATA_TRANSFORMED_FOLDER, String(session), `${formatYYYYMMDD(agenda.date)}.json`);
+        if (await fs.pathExists(agendaJsonPath)) {
+            const raw = await fsp.readFile(agendaJsonPath, "utf-8");
+            let items;
+            try {
+                items = JSON.parse(raw);
+            }
+            catch (e) {
+                console.warn(`[warn] invalid JSON in ${agendaJsonPath}:`, e?.message);
+                items = null;
+            }
+            if (Array.isArray(items)) {
+                const idx = items.findIndex((e) => String(e?.id) === String(agenda.id));
+                if (idx === -1) {
+                    console.warn(`[warn] agenda id ${agenda.id} not found in ${agendaJsonPath}`);
+                }
+                else {
+                    // add/update urlVideo on the matching item
+                    items[idx] = { ...items[idx], urlVideo: master };
+                    await writeIfChanged(agendaJsonPath, JSON.stringify(items, null, 2));
+                    if (!options["silent"]) {
+                        console.log(`[write] ${agenda.id} urlVideo ← ${master}`);
+                    }
+                }
+            }
+            else {
+                console.warn(`[warn] expected an array in ${agendaJsonPath}, got ${typeof items}`);
+            }
+        }
+        else {
+            console.warn(`[warn] agenda file not found for update: ${agendaJsonPath}`);
+        }
+    }
+}
+async function processAll(dataDir, sessions) {
+    for (const session of sessions) {
+        for (const { item: agendas } of iterLoadSenatAgendas(dataDir, session, {})) {
+            for (const agenda of agendas) {
+                try {
+                    await processAgenda(agenda, session, dataDir);
+                }
+                catch (e) {
+                    console.error(`[error] ${agenda.id}:`, e?.message || e);
+                }
+            }
+        }
+    }
+}
+async function main() {
+    const dataDir = options["dataDir"];
+    assert(dataDir, "Missing argument: data directory");
+    const sessions = getSessionsFromStart(options["fromSession"]);
+    if (!options["silent"])
+        console.time("senat-agendas→videos start processing time");
+    await processAll(dataDir, sessions);
+    if (!options["silent"])
+        console.timeEnd("senat-agendas→videos processing time");
+    if (!options["silent"]) {
+        const { total, accepted } = STATS;
+        const ratio = total ? (accepted / total * 100).toFixed(1) : "0.0";
+        console.log(`[summary] accepted=${accepted} / total=${total} (${ratio}%)`);
+    }
+}
+main()
+    .then(() => process.exit(0))
+    .catch((err) => { console.error(err); process.exit(1); });

package/lib/types/agenda.d.ts

@@ -12,4 +12,6 @@ export interface AgendaEvent {
     captationVideo: boolean;
     urlDossierSenat: string | null;
     quantieme: string | null;
+    urlVideo: string | null;
+    timecodeDebutVideo: number | null;
 }

package/lib/types/compte_rendu.d.ts

@@ -1,11 +1,76 @@
 export interface CompteRendu {
-    sections: Section[];
+    uid?: string;
+    seanceRef?: string;
+    sessionRef?: string;
+    metadonnees?: Metadonnees;
+    contenu?: Contenu;
 }
-export interface Section {
-    id: string | null;
-    interventions: Intervention[];
+export interface Metadonnees {
+    dateSeance: string;
+    dateSeanceJour: string;
+    numSeanceJour: string;
+    numSeance: string;
+    typeAssemblee: "AN" | "SN";
+    legislature: string;
+    session: string;
+    nomFichierJo: string;
+    validite: string;
+    etat: string;
+    diffusion: string;
+    version: string;
+    environnement: string;
+    heureGeneration: Date;
+    sommaire: Sommaire;
 }
-export interface Intervention {
-    id: string | null;
-    texteHtml: string | null;
+export interface Contenu {
+    quantiemes: {
+        journee: string;
+        session: string;
+    };
+    point: Point[];
+}
+export interface Point {
+    ordre_absolu_seance: string;
+    code_grammaire: string;
+    roledebat?: string;
+    orateurs?: {
+        orateur: {
+            nom: string;
+            id: string;
+            qualite: string;
+        };
+    };
+    texte: {
+        _: string;
+    };
+    code_style?: string;
+}
+export interface Texte {
+    _?: string;
+    id_syceron?: string;
+    stime?: string;
+    sup?: string;
+    lienAdt?: Texte[] | Texte;
+}
+export interface Sommaire {
+    presidentSeance: Texte;
+    sommaire1: SommaireElement[] | SommaireElement;
+    sommaire3?: SommaireElement[] | SommaireElement;
+    sommaire2?: SommaireElement[] | SommaireElement;
+    para?: Texte[] | Texte;
+}
+export interface SommaireElement {
+    valeur_pts_odj: string | undefined;
+    titreStruct: TitreStruct;
+    para?: Array<Texte | string> | Texte;
+    sommaire2?: SommaireElement[] | SommaireElement;
+    sommaire3?: SommaireElement[] | SommaireElement;
+    presidentSeance?: Texte[] | Texte;
+    type_debat?: string;
+}
+export interface TitreStruct {
+    id_syceron: string;
+    intitule?: string;
+    sousIntitule?: string;
+    type_debat?: string;
 }

package/lib/validators/senat.js

@@ -0,0 +1,24 @@
+"use strict";
+// import { validateNonEmptyTrimmedString } from "@biryani/core"
+// const acteurUidRegExp = /^PA\d+$/
+// const organeUidRegExp = /^PO\d+$/
+// export function validateSenateurUid(input: any): [any, any] {
+//   const [value, error] = validateNonEmptyTrimmedString(input)
+//   if (error !== null) {
+//     return [value, error]
+//   }
+//   if (!acteurUidRegExp.test(value)) {
+//     return [value, 'Invalid "acteur" unique ID']
+//   }
+//   return [value, null]
+// }
+// export function validateOrganeUid(input: any): [any, any] {
+//   const [value, error] = validateNonEmptyTrimmedString(input)
+//   if (error !== null) {
+//     return [value, error]
+//   }
+//   if (!organeUidRegExp.test(value)) {
+//     return [value, 'Invalid "organe" unique ID']
+//   }
+//   return [value, null]
+// }