@tricoteuses/senat 3.1.21 → 3.1.23

package/lib/src/rich_types/dosleg.js

@@ -39,13 +39,6 @@ function getDateSortValue(value) {
 function compareByDate(left, right) {
     return getDateSortValue(left.date) - getDateSortValue(right.date);
 }
-function getCommissionCodeActe(phasePrefix, rapportType) {
-    const normalizedType = (rapportType || "").toLowerCase();
-    if (normalizedType.includes("avis") || normalizedType.includes("information")) {
-        return `${phasePrefix}-COM-AVIS`;
-    }
-    return `${phasePrefix}-COM-FOND`;
-}
 function getPhasePrefix(lecture, assemblee, codeNatureDossier) {
     if (assemblee !== "Sénat")
         return null;

package/lib/src/scripts/convert_data.js

@@ -154,12 +154,11 @@ async function convertDatasetDosLeg(dataDir, options) {
         if (options["verbose"]) {
             console.log(`Converting ${dossier["signet"]} file…`);
         }
-        let dossierReorganizedDir = path.join(dossiersReorganizedDir, String(UNDEFINED_SESSION));
         const session = getSessionFromSignet(dossier["signet"]) || UNDEFINED_SESSION;
         if (options["fromSession"] && session < options["fromSession"]) {
             continue;
         }
-        dossierReorganizedDir = path.join(dossiersReorganizedDir, String(session));
+        const dossierReorganizedDir = path.join(dossiersReorganizedDir, String(session));
         const actesBrutsNormalises = buildActesLegislatifs(dossier);
         const dossierWithActes = {
             ...dossier,
@@ -184,9 +183,8 @@ async function convertDatasetScrutins(dataDir, options) {
         if (options["verbose"]) {
             console.log(`Converting ${scrutin["numero"]} file…`);
         }
-        let scrutinReorganizedDir = path.join(scrutinsReorganizedDir, String(UNDEFINED_SESSION));
         const session = scrutin["session"] || UNDEFINED_SESSION;
-        scrutinReorganizedDir = path.join(scrutinsReorganizedDir, String(session));
+        const scrutinReorganizedDir = path.join(scrutinsReorganizedDir, String(session));
         const scrutinFileName = `${scrutin["numero"]}.json`;
         await fs.outputJSON(path.join(scrutinReorganizedDir, scrutinFileName), scrutin, {
             spaces: 2,
@@ -339,7 +337,8 @@ async function convertDatasetSens(dataDir, options) {
     for await (const organisme of findAllOrganismes()) {
         const sanitizedCode = organisme.code.trim().replace(/\s+/g, "-");
         if (sanitizedCode !== organisme.code) {
-            console.warn(`Warning: code "${organisme.code}" contains leading/trailing or multiple consecutive whitespace characters. It has been sanitized to "${sanitizedCode}". Please check the original code for potential issues.`);
+            console.warn(`Warning: code "${organisme.code}" contains leading/trailing or multiple consecutive whitespace characters. ` +
+                `It has been sanitized to "${sanitizedCode}". Please check the original code for potential issues.`);
         }
         if (options["verbose"]) {
             console.log(`Converting ${sanitizedCode} file…`);

package/lib/src/scripts/retrieve_cr_commission.js

@@ -263,7 +263,7 @@ async function retrieveCommissionCRs(options = {}) {
             for (const f of htmlFiles) {
                 const htmlPath = path.join(commissionDir, f);
                 let meta;
-                let raw = "";
+                let raw;
                 try {
                     raw = await fs.readFile(htmlPath, "utf8");
                     meta = parseCommissionMetadataFromHtml(raw, f);

package/lib/src/scripts/retrieve_cr_seance.js

@@ -28,18 +28,25 @@ const optionsDefinitions = [
 const options = commandLineArgs(optionsDefinitions);
 const CRI_ZIP_URL = "https://data.senat.fr/data/debats/cri.zip";
 let exitCode = 10; // 0: some data changed, 10: no modification
+function log(options, ...args) {
+    if (!options["silent"])
+        console.log(...args);
+}
+function warn(options, ...args) {
+    if (!options["silent"])
+        console.warn(...args);
+}
 class CompteRenduError extends Error {
     constructor(message, url) {
         super(`An error occurred while retrieving ${url}: ${message}`);
     }
 }
-async function downloadCriZip(zipPath) {
-    if (!options["silent"])
-        console.log(`Downloading CRI zip ${CRI_ZIP_URL}…`);
+async function downloadCriZip(zipPath, options) {
+    log(options, `Downloading CRI zip ${CRI_ZIP_URL}…`);
     const response = await fetchWithRetry(CRI_ZIP_URL);
     if (!response.ok) {
         if (response.status === 404) {
-            console.warn(`CRI zip ${CRI_ZIP_URL} not found`);
+            warn(options, `CRI zip ${CRI_ZIP_URL} not found`);
             return;
         }
         throw new CompteRenduError(String(response.status), CRI_ZIP_URL);
@@ -48,7 +55,7 @@ async function downloadCriZip(zipPath) {
     await fs.writeFile(zipPath, buf);
     if (!options["silent"]) {
         const mb = (buf.length / (1024 * 1024)).toFixed(1);
-        console.log(`[CRI] Downloaded ${mb} MB → ${zipPath}`);
+        log(options, `[CRI] Downloaded ${mb} MB → ${zipPath}`);
     }
 }
 async function extractAndDistributeXmlBySession(zipPath, originalRoot) {
@@ -97,9 +104,9 @@ export async function retrieveCriXmlDump(dataDir, options = {}) {
     const sessions = getSessionsFromStart((options["fromSession"] ?? UNDEFINED_SESSION));
     // 1) Download ZIP global + distribut by session
     const zipPath = path.join(dataDir, "cri.zip");
-    console.log("[CRI] Downloading global CRI zip…");
-    await downloadCriZip(zipPath);
-    console.log("[CRI] Extracting + distributing XMLs by session…");
+    log(options, "[CRI] Downloading global CRI zip…");
+    await downloadCriZip(zipPath, options);
+    log(options, "[CRI] Extracting + distributing XMLs by session…");
     for (const session of sessions) {
         const dir = path.join(originalRoot, String(session));
         if (await fs.pathExists(dir)) {
@@ -110,13 +117,13 @@ export async function retrieveCriXmlDump(dataDir, options = {}) {
     }
     const n = await extractAndDistributeXmlBySession(zipPath, originalRoot);
     if (n === 0) {
-        console.warn("[CRI] No XML extracted. Archive empty or layout changed?");
+        warn(options, "[CRI] No XML extracted. Archive empty or layout changed?");
     }
     else {
-        console.log(`[CRI] Distributed ${n} XML file(s) into session folders.`);
+        log(options, `[CRI] Distributed ${n} XML file(s) into session folders.`);
     }
     if (!options["parseDebats"]) {
-        console.log("[CRI] parseDebats not requested → done.");
+        log(options, "[CRI] parseDebats not requested → done.");
         return;
     }
     for (const session of sessions) {
@@ -147,10 +154,10 @@ export async function retrieveCriXmlDump(dataDir, options = {}) {
                             const crPath = path.join(transformedSessionDir, fn);
                             try {
                                 const cr = await fs.readJSON(crPath);
-                                await linkCriEventIntoAgenda(dataDir, yyyymmdd, eventId, cr.uid, cr, session);
+                                await linkCriEventIntoAgenda(dataDir, yyyymmdd, eventId, cr.uid, cr, session, options);
                             }
                             catch (e) {
-                                console.warn(`[CR] [${session}] Could not relink existing CR into a reunion for ${yyyymmdd} event=${eventId}:`, e);
+                                warn(options, `[CR] [${session}] Could not relink existing CR into a reunion for ${yyyymmdd} event=${eventId}:`, e);
                             }
                         }
                         continue;
@@ -160,7 +167,7 @@ export async function retrieveCriXmlDump(dataDir, options = {}) {
             // === Charger les events SP du jour depuis les agendas groupés ===
             const dayEvents = await loadAgendaSpEventsForDate(dataDir, yyyymmdd, session);
             if (dayEvents.length === 0) {
-                console.warn(`[CRI] [${session}] No agenda SP events found for ${yyyymmdd} → skip split/link`);
+                warn(options, `[CRI] [${session}] No agenda SP events found for ${yyyymmdd} → skip split/link`);
                 continue;
             }
             // === Lire XML + construire index DOM ===
@@ -175,14 +182,14 @@ export async function retrieveCriXmlDump(dataDir, options = {}) {
                 idx = new Map(order.map((el, i) => [el, i]));
             }
             catch (e) {
-                console.warn(`[CRI] [${session}] Cannot read/parse ${f}:`, e);
+                warn(options, `[CRI] [${session}] Cannot read/parse ${f}:`, e);
                 continue;
             }
             // === Extraire sommaire + matcher vers events agenda ===
             const blocks = extractSommaireBlocks($, idx);
             const intervals = buildIntervalsByAgendaEvents($, idx, order, blocks, dayEvents);
             if (!intervals.length) {
-                console.warn(`[CRI] [${session}] No confident split intervals for ${yyyymmdd} → skip`);
+                warn(options, `[CRI] [${session}] No confident split intervals for ${yyyymmdd} → skip`);
                 continue;
             }
             // === Parser / écrire / linker chaque segment par event ===
@@ -191,16 +198,16 @@ export async function retrieveCriXmlDump(dataDir, options = {}) {
                 const outPath = path.join(transformedSessionDir, outName);
                 const cr = await parseCompteRenduIntervalFromFile(xmlPath, iv.startIndex, iv.endIndex, iv.agendaEventId);
                 if (!cr) {
-                    console.warn(`[CRI] [${session}] Empty or no points for ${yyyymmdd} event=${iv.agendaEventId} → skip`);
+                    warn(options, `[CRI] [${session}] Empty or no points for ${yyyymmdd} event=${iv.agendaEventId} → skip`);
                     continue;
                 }
                 await fs.ensureDir(transformedSessionDir);
                 await fs.writeJSON(outPath, cr, { spaces: 2 });
                 try {
-                    await linkCriEventIntoAgenda(dataDir, yyyymmdd, iv.agendaEventId, cr.uid, cr, session);
+                    await linkCriEventIntoAgenda(dataDir, yyyymmdd, iv.agendaEventId, cr.uid, cr, session, options);
                 }
                 catch (e) {
-                    console.warn(`[CR] [${session}] Could not link CR into agenda for ${yyyymmdd} event=${iv.agendaEventId}:`, e);
+                    warn(options, `[CR] [${session}] Could not link CR into agenda for ${yyyymmdd} event=${iv.agendaEventId}:`, e);
                 }
             }
         }
@@ -218,7 +225,7 @@ function commitAndPushGit(datasetDir, options) {
         }
     }
 }
-async function linkCriEventIntoAgenda(dataDir, yyyymmdd, agendaEventId, crUid, cr, session) {
+async function linkCriEventIntoAgenda(dataDir, yyyymmdd, agendaEventId, crUid, cr, session, options) {
     const agendadDir = path.join(dataDir, AGENDA_FOLDER, DATA_TRANSFORMED_FOLDER, session.toString());
     fs.ensureDirSync(agendadDir);
     const dateISO = `${yyyymmdd.slice(0, 4)}-${yyyymmdd.slice(4, 6)}-${yyyymmdd.slice(6, 8)}`;
@@ -230,17 +237,17 @@ async function linkCriEventIntoAgenda(dataDir, yyyymmdd, agendaEventId, crUid, c
             agenda = await fs.readJSON(agendaPath);
         }
         catch (e) {
-            console.warn(`[CR] unreadable reunion JSON → ${agendaPath} (${e})`);
+            warn(options, `[CR] unreadable reunion JSON → ${agendaPath} (${e})`);
             agenda = null;
         }
     }
     if (!agenda) {
-        console.warn(`[CR] Missing reunion file for SP event=${agendaEventId}: ${agendaPath}`);
+        warn(options, `[CR] Missing reunion file for SP event=${agendaEventId}: ${agendaPath}`);
         return;
     }
     agenda.compteRenduRefUid = crUid;
     await fs.writeJSON(agendaPath, agenda, { spaces: 2 });
-    console.log(`[CR] Linked CR ${crUid} → ${path.basename(agendaPath)} (event=${agendaEventId})`);
+    log(options, `[CR] Linked CR ${crUid} → ${path.basename(agendaPath)} (event=${agendaEventId})`);
 }
 function buildIntervalsByAgendaEvents($, idx, order, blocks, dayEvents) {
     const MIN_SCORE = 0.65;
@@ -348,9 +355,11 @@ function resolveTargetIndex($, idx, targetId) {
 }
 async function main() {
     const dataDir = assertExistingDirectory(options["dataDir"], "data directory");
-    console.time("CRI processing time");
+    if (!options["silent"])
+        console.time("CRI processing time");
     await retrieveCriXmlDump(dataDir, options);
-    console.timeEnd("CRI processing time");
+    if (!options["silent"])
+        console.timeEnd("CRI processing time");
 }
 main()
     .then(() => process.exit(exitCode))

package/lib/src/scripts/retrieve_open_data.js

@@ -185,10 +185,49 @@ function runPsqlQuery(command, dataDir, options, connection, stopOnError = true)
         stdio: ["ignore", "pipe", "pipe"],
     });
 }
+function sourceSchemaNames(dataset) {
+    if (dataset.database === "sens") {
+        return ["sens", "senat"];
+    }
+    return [dataset.database];
+}
+function inspectSourceDump(dataset, dataDir) {
+    const sqlFilePath = path.join(dataDir, `${dataset.database}.sql`);
+    if (!fs.existsSync(sqlFilePath)) {
+        return {
+            copyStatements: 0,
+            createTableStatements: 0,
+            fileSizeBytes: null,
+            schemaQualifiedTableStatements: 0,
+            sqlFilePath,
+        };
+    }
+    const sqlContent = fs.readFileSync(sqlFilePath, { encoding: "utf8" });
+    const schemaPattern = sourceSchemaNames(dataset)
+        .map((schemaName) => schemaName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"))
+        .join("|");
+    return {
+        copyStatements: (sqlContent.match(/^COPY\s+/gim) ?? []).length,
+        createTableStatements: (sqlContent.match(/^CREATE\s+TABLE\s+/gim) ?? []).length,
+        fileSizeBytes: fs.statSync(sqlFilePath).size,
+        schemaQualifiedTableStatements: (sqlContent.match(new RegExp(`\\b(?:${schemaPattern})\\.`, "g")) ?? []).length,
+        sqlFilePath,
+    };
+}
 function ensureStagingSchemaHasTables(dataset, dataDir, options, connection) {
     const stagingSchema = stagingSchemaName(dataset.database);
     const tableCount = Number.parseInt(runPsqlQuery(`SELECT count(*) FROM pg_tables WHERE schemaname = '${escapeSqlLiteral(stagingSchema)}'`, dataDir, options, connection).trim(), 10);
+    if (tableCount === 0) {
+        const dumpInspection = inspectSourceDump(dataset, dataDir);
+        const fileSizeLabel = dumpInspection.fileSizeBytes === null ? "missing" : `${dumpInspection.fileSizeBytes} bytes`;
+        console.error(`Source dump diagnostics for ${dataset.database}: file=${dumpInspection.sqlFilePath}, ` +
+            `size=${fileSizeLabel}, create_table=${dumpInspection.createTableStatements}, ` +
+            `copy=${dumpInspection.copyStatements}, ` +
+            `schema_refs=${dumpInspection.schemaQualifiedTableStatements}`);
+    }
     assert(tableCount > 0, `Staging schema ${stagingSchema} is empty after importing ${dataset.database}. ` +
+        "Source dump may be empty or malformed. " +
+        `Check /home/gitlab-runner/senat-data/${dataset.database}.sql and the upstream archive before retrying. ` +
         `Aborting incremental merge to protect ${senatSchemaName}.`);
 }
 function ensureStagingDatabase(dataDir, options, runtime) {

package/lib/src/scripts/retrieve_videos.js

@@ -17,6 +17,10 @@ import { processBisIfNeeded, processOneReunionMatch, writeIfChanged } from "../v
 const optionsDefinitions = [...commonOptions];
 const options = commandLineArgs(optionsDefinitions);
 let exitCode = 10; // 0: some data changed, 10: no modification
+function log(...args) {
+    if (!options["silent"])
+        console.log(...args);
+}
 function shouldSkipAgenda(agenda) {
     if (!agenda.date || !agenda.startTime)
         return true;
@@ -106,7 +110,6 @@ async function processGroupedReunion(agenda, session, dataDir, lastByVideo) {
         return;
     const ctx = await computeContext(agenda, session, dataDir);
     const skipDownload = shouldSkipDownload(agenda, ctx.baseDir);
-    let match = null;
     let best = null;
     let secondBest = null;
     // 2) Match + download artifacts (only if not skipped)
@@ -114,12 +117,12 @@ async function processGroupedReunion(agenda, session, dataDir, lastByVideo) {
         STATS.total++;
         const candidates = await fetchCandidatesForAgenda(agenda, options);
         if (!candidates) {
-            console.log(`[warn] ${agenda.uid} No candidate found for this reunion. Probably VOD not published yet.`);
+            log(`[warn] ${agenda.uid} No candidate found for this reunion. Probably VOD not published yet.`);
             return;
         }
-        match = await matchAgendaToVideo({ agenda, agendaTs: ctx.agendaTs, candidates, options });
+        const match = await matchAgendaToVideo({ agenda, agendaTs: ctx.agendaTs, candidates, options });
         if (!match) {
-            console.log(`[miss] ${agenda.uid} No match found for this reunion`);
+            log(`[miss] ${agenda.uid} No match found for this reunion`);
             return;
         }
         ;
@@ -128,8 +131,7 @@ async function processGroupedReunion(agenda, session, dataDir, lastByVideo) {
         await writeMatchArtifacts({ agenda, ctx, best, secondBest });
     }
     if (best && isAmbiguousTimeOriginal(agenda.events[0].timeOriginal)) {
-        if (!options["silent"])
-            console.log("If the time is ambiguous, update agenda startTime from matched video");
+        log("If the time is ambiguous, update agenda startTime from matched video");
         agenda = { ...agenda, startTime: epochToParisDateTime(best.epoch)?.startTime ?? agenda.startTime };
     }
     // 3) Always update BEST agenda JSON from local NVS
@@ -159,7 +161,7 @@ async function processGroupedReunion(agenda, session, dataDir, lastByVideo) {
     });
 }
 async function processAll(dataDir, sessions) {
-    console.log("Process all Agendas and fetch video's url");
+    log("Process all Agendas and fetch video's url");
     for (const session of sessions) {
         const lastByVideo = new Map();
         for (const { item: agenda } of iterLoadSenatAgendas(dataDir, session)) {
@@ -187,12 +189,14 @@ async function main() {
     const dataDir = assertExistingDirectory(options["dataDir"], "data directory");
     const sessions = getSessionsFromStart((options["fromSession"] ?? UNDEFINED_SESSION));
     const TIMER = "senat-agendas→videos processing time";
-    console.time(TIMER);
+    if (!options["silent"])
+        console.time(TIMER);
     await processAll(dataDir, sessions);
-    console.timeEnd(TIMER);
+    if (!options["silent"])
+        console.timeEnd(TIMER);
     const { total, accepted } = STATS;
     const ratio = total ? ((accepted / total) * 100).toFixed(1) : "0.0";
-    console.log(`[summary] accepted=${accepted} / total=${total} (${ratio}%)`);
+    log(`[summary] accepted=${accepted} / total=${total} (${ratio}%)`);
 }
 if (import.meta.url === pathToFileURL(process.argv[1]).href) {
     main()

package/lib/src/scripts/shared/incremental_import_sql.js

@@ -283,6 +283,13 @@ BEGIN
     )
     INTO use_row_multiset_merge;
 
+    -- The synchronization below temporarily drops primary/unique constraints before
+    -- issuing DELETE/UPDATE statements. On tables that belong to a publication with
+    -- deletes/updates enabled, PostgreSQL then refuses those statements unless the
+    -- table has an explicit replica identity. FULL keeps logical replication valid
+    -- while the constraints are being rebuilt.
+    EXECUTE format('ALTER TABLE ${senatSchemaName}.%I REPLICA IDENTITY FULL', table_row.tablename);
+
     FOR constraint_row IN
       SELECT con.conname
       FROM pg_constraint con

package/lib/src/server/ameli.js

@@ -16,6 +16,7 @@ export async function* findAllAmendements(fromSession) {
         .leftJoin("ameli_lec_ameli as lec_ameli", "lec_ameli.id", "txt_ameli.lecid")
         .leftJoin("dosleg_texte as texte", (join) => join.onRef("ses.ann", "=", "texte.sesann").onRef("txt_ameli.numabs", "=", "texte.texnum"))
         .leftJoin("dosleg_lecass as lecass", "lecass.lecassidt", "texte.lecassidt")
+        .leftJoin("dosleg_org as org_lecass", "org_lecass.orgcod", "lecass.orgcod")
         .leftJoin("ameli_mot as mot", "mot.id", "amd.motid")
         .leftJoin("ameli_avicom as avicom", "avicom.id", "amd.avcid")
         .leftJoin("ameli_avigvt as avigvt", "avigvt.id", "amd.avgid")
@@ -107,12 +108,11 @@ export async function* findAllAmendements(fromSession) {
         )
       `.as("url"),
         "grppol_ameli.lilcou as au_nom_de_groupe_politique",
-        sql `rtrim(${eb.ref("com_ameli.lil")})`.as("au_nom_de_commission"),
-        sql `rtrim(${eb.ref("com_ameli.cod")})`.as("code_commission"),
+        sql `coalesce(rtrim(${eb.ref("com_ameli.lil")}), ${eb.ref("org_lecass.orgnom")})`.as("au_nom_de_commission"),
+        sql `coalesce(rtrim(${eb.ref("com_ameli.cod")}), ${eb.ref("org_lecass.senorgcod")})`.as("code_commission"),
         sql `(${eb.ref("cab.entid")} is not null)`.as("auteur_est_gouvernement"),
         // Sous-requête scalaire: numéro de scrutin
         eb
-            .withSchema("senat")
             .selectFrom("dosleg_amescr as amescr")
             .leftJoin("dosleg_scr as scr", (join) => join.onRef("amescr.scrnum", "=", "scr.scrnum").onRef("amescr.sesann", "=", "scr.sesann"))
             .leftJoin("dosleg_date_seance as date_seance", "date_seance.code", "scr.code")
@@ -124,7 +124,6 @@ export async function* findAllAmendements(fromSession) {
             .as("scrutin_num"),
         // Sous-requête pour les auteurs
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("ameli_amdsen as amdsen")
             .leftJoin("ameli_sen_ameli as sen_ameli", "sen_ameli.entid", "amdsen.senid")
             .leftJoin("ameli_grppol_ameli as grppol_ameli2", "grppol_ameli2.entid", "amdsen.grpid")

package/lib/src/server/conversion_textes.js

@@ -218,7 +218,7 @@ p.has-alinea {
                 else if (child.nodeType === 1) {
                     const element = child;
                     const tagName = element.tagName.toLowerCase();
-                    let htmlElement = null;
+                    let htmlElement;
                     switch (tagName) {
                         case "article": {
                             htmlElement = htmlDoc.createElement("div");

package/lib/src/server/debats.js

@@ -13,7 +13,6 @@ export async function* findAll() {
         "debats.debsyn as etat_synchronisation",
         // Sections principales (PJL)
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("debats_secdis as secdis")
             .leftJoin("debats_typsec as typsec", "typsec.typseccod", "secdis.typseccod")
             .select((eb2) => [
@@ -26,7 +25,6 @@ export async function* findAll() {
             "secdis.lecassidt as lecture_id",
             // Interventions de la section
             jsonArrayFrom(eb2
-                .withSchema("senat")
                 .selectFrom("debats_intpjl as intpjl")
                 .leftJoin("dosleg_auteur as auteur", "auteur.autcod", "intpjl.autcod")
                 .select([
@@ -49,7 +47,6 @@ export async function* findAll() {
             .orderBy("secdis.secdisordid", "asc")).as("sections"),
         // Sections diverses
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("debats_secdivers as secdivers")
             .leftJoin("debats_typsec as typsec", "typsec.typseccod", "secdivers.typseccod")
             .select((eb2) => [
@@ -59,7 +56,6 @@ export async function* findAll() {
             "typsec.typseccat as categorie",
             // Interventions diverses
             jsonArrayFrom(eb2
-                .withSchema("senat")
                 .selectFrom("debats_intdivers as intdivers")
                 .leftJoin("dosleg_auteur as auteur", "auteur.autcod", "intdivers.autcod")
                 .select([
@@ -81,7 +77,6 @@ export async function* findAll() {
             .whereRef("secdivers.datsea", "=", "debats.datsea")).as("sections_divers"),
         // Lectures
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("debats_lecassdeb as lecassdeb")
             .select(["lecassdeb.lecassidt as id"])
             .whereRef("lecassdeb.datsea", "=", "debats.datsea")).as("lectures"),

package/lib/src/server/documents.js

@@ -36,7 +36,6 @@ export async function* findAllTextes() {
         sql `${eb.ref("texte.sesann")}::int`.as("session"),
         // Auteurs
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("dosleg_auteur as auteur")
             .leftJoin("dosleg_ecr as ecr", "ecr.autcod", "auteur.autcod")
             .leftJoin("dosleg_rolsig as rolsig", "rolsig.signataire", "ecr.signataire")
@@ -95,7 +94,6 @@ export async function* findAllRapports() {
         sql `${eb.ref("rap.sesann")}::int`.as("session"),
         // Auteurs
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("dosleg_auteur as auteur")
             .leftJoin("dosleg_ecr as ecr", "ecr.autcod", "auteur.autcod")
             .leftJoin("dosleg_rolsig as rolsig", "rolsig.signataire", "ecr.signataire")
@@ -111,7 +109,6 @@ export async function* findAllRapports() {
             .whereRef("ecr.rapcod", "=", "rap.rapcod")).as("auteurs"),
         // Documents annexes
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("dosleg_docatt as docatt")
             .leftJoin("dosleg_typatt as typatt", "typatt.typattcod", "docatt.typattcod")
             .select(["docatt.docatturl as url", "typatt.typattlib as type_document"])

package/lib/src/server/dosleg.js

@@ -58,7 +58,6 @@ export async function* findAllDossiers() {
         "loi.url_jo3 as url_JO_correctif_2",
         // Lectures
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("dosleg_lecture as lecture")
             .leftJoin("dosleg_typlec as typlec", "typlec.typleccod", "lecture.typleccod")
             .select((eb2) => [
@@ -68,7 +67,6 @@ export async function* findAllDossiers() {
             "typlec.typlecord as ordre_lecture_num",
             // Lectures par assemblée
             jsonArrayFrom(eb2
-                .withSchema("senat")
                 .selectFrom("dosleg_lecass as lecass")
                 .leftJoin("dosleg_ass as ass", "ass.codass", "lecass.codass")
                 .leftJoin("dosleg_org as org", "org.orgcod", "lecass.orgcod")
@@ -114,7 +112,6 @@ export async function* findAllDossiers() {
                 sql `lecass.lecassamecomadoses::int`.as("session_liasse_amendements_adoptes_commission"),
                 // Textes
                 jsonArrayFrom(eb3
-                    .withSchema("senat")
                     .selectFrom("dosleg_texte as texte")
                     .leftJoin("dosleg_oritxt as oritxt", "oritxt.oritxtcod", "texte.oritxtcod")
                     .leftJoin("dosleg_typtxt as typtxt", "typtxt.typtxtcod", "texte.typtxtcod")
@@ -158,7 +155,6 @@ export async function* findAllDossiers() {
                     "texte.prix as prix",
                     // Auteurs du texte
                     jsonArrayFrom(eb4
-                        .withSchema("senat")
                         .selectFrom("dosleg_auteur as auteur")
                         .leftJoin("dosleg_ecr as ecr", "ecr.autcod", "auteur.autcod")
                         .leftJoin("dosleg_rolsig as rolsig", "rolsig.signataire", "ecr.signataire")
@@ -178,7 +174,6 @@ export async function* findAllDossiers() {
                     .orderBy(sql `array_position(array['0','2','1'], oritxt.oriordre)`)).as("textes"),
                 // Rapports
                 jsonArrayFrom(eb3
-                    .withSchema("senat")
                     .selectFrom("dosleg_rap as rap")
                     .leftJoin("dosleg_raporg as raporg", "raporg.rapcod", "rap.rapcod")
                     .leftJoin("dosleg_denrap as denrap", "denrap.coddenrap", "rap.coddenrap")
@@ -228,7 +223,6 @@ export async function* findAllDossiers() {
                     "lecassrap.lecassrapord as ordre_rapport",
                     // Auteurs du rapport
                     jsonArrayFrom(eb4
-                        .withSchema("senat")
                         .selectFrom("dosleg_auteur as auteur")
                         .leftJoin("dosleg_ecr as ecr", "ecr.autcod", "auteur.autcod")
                         .leftJoin("dosleg_rolsig as rolsig", "rolsig.signataire", "ecr.signataire")
@@ -244,7 +238,6 @@ export async function* findAllDossiers() {
                         .whereRef("ecr.rapcod", "=", "rap.rapcod")).as("auteurs"),
                     // Documents annexes
                     jsonArrayFrom(eb4
-                        .withSchema("senat")
                         .selectFrom("dosleg_docatt as docatt")
                         .leftJoin("dosleg_typatt as typatt", "typatt.typattcod", "docatt.typattcod")
                         .select(["docatt.docatturl as url", "typatt.typattlib as type_document"])
@@ -253,7 +246,6 @@ export async function* findAllDossiers() {
                     .whereRef("lecassrap.lecassidt", "=", "lecass.lecassidt")).as("rapports"),
                 // Dates de séances
                 jsonArrayFrom(eb3
-                    .withSchema("senat")
                     .selectFrom("dosleg_date_seance as date_seance")
                     .select([
                     "date_seance.code as code",
@@ -264,7 +256,6 @@ export async function* findAllDossiers() {
                 // Commissions saisies (source : ameli.sai)
                 // Fusionnées avec la commission au fond (lecass.orgcod) en post-traitement
                 jsonArrayFrom(eb3
-                    .withSchema("senat")
                     .selectFrom("ameli_sai as sai")
                     .innerJoin("ameli_txt_ameli as txt_a", "txt_a.id", "sai.txtid")
                     .innerJoin("ameli_com_ameli as com_a", "com_a.entid", "sai.comid")
@@ -285,7 +276,6 @@ export async function* findAllDossiers() {
                     .groupBy(["com_a.lib", "com_a.lil", "sai.saityp", "sai.isdelegfond"])).as("commissions_saisies_ameli"),
                 // Réunions de commission (source : dosleg_aud)
                 jsonArrayFrom(eb3
-                    .withSchema("senat")
                     .selectFrom("dosleg_aud as aud")
                     .innerJoin("dosleg_org as org_a", "org_a.orgcod", "aud.orgcod")
                     .select([
@@ -305,7 +295,6 @@ export async function* findAllDossiers() {
             .orderBy(sql `COALESCE(typlec.typlecord::int, 9999)`, "asc")).as("lectures"),
         // Thèmes
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("dosleg_the as the")
             .leftJoin("dosleg_loithe as loithe", "loithe.thecle", "the.thecle")
             .select(["the.thelib as libelle"])

package/lib/src/server/questions.js

@@ -63,7 +63,6 @@ export async function* findAll() {
       )`.as("themes"),
         // Réponses
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("questions_tam_reponses as tam_reponses")
             .select([
             sql `to_char(tam_reponses.datejorep, 'YYYY-MM-DD')`.as("date_reponse_JO"),

package/lib/src/server/scrutins.js

@@ -33,7 +33,6 @@ export async function* findAllScrutins(fromSession) {
         sql `${eb.ref("scr.scrpousea")}::text`.as("nombre_pour_seance"),
         // Votes individuels
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("dosleg_votsen as votsen")
             .leftJoin("dosleg_titsen as titsen", "titsen.titsencod", "votsen.titsencod")
             .leftJoin("dosleg_stavot as stavot", "stavot.stavotidt", "votsen.stavotidt")
@@ -57,9 +56,7 @@ export async function* findAllScrutins(fromSession) {
             .orderBy("memgrppol.memgrppoldatdeb", (ob) => ob.desc().nullsLast())).as("votes"),
         // Groupes votants (avec déduplication via window function)
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom(eb
-            .withSchema("senat")
             .selectFrom("dosleg_votsen as votsen")
             .leftJoin("dosleg_posvot as posvot", "posvot.posvotcod", "votsen.posvotcod")
             .leftJoin("dosleg_stavot as stavot", "stavot.stavotidt", "votsen.stavotidt")
@@ -93,7 +90,6 @@ export async function* findAllScrutins(fromSession) {
             .groupBy("unique_votes.grppolcod")).as("groupes_votants"),
         // Mises au point (corrections)
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("dosleg_corscr as corscr")
             .select([
             "corscr.corscrtxt as texte",

package/lib/src/server/sens.js

@@ -37,14 +37,12 @@ export async function* findAll() {
         "sen.sendaiurl as url_hatvp",
         // URLs
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("sens_senurl as senurl")
             .select(["senurl.typurlcod as code_url", "senurl.senurlurl as url", "senurl.senurlnumtri as order_num"])
             .whereRef("senurl.senmat", "=", "sen.senmat")
             .orderBy("senurl.senurlnumtri", "asc")).as("urls"),
         // Mandats sénatoriaux
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("sens_elusen as elusen")
             .leftJoin("sens_etadebman as etadebman", "etadebman.etadebmancod", "elusen.etadebmancod")
             .leftJoin("sens_etafinman as etafinman", "etafinman.etafinmancod", "elusen.etafinmancod")
@@ -61,7 +59,6 @@ export async function* findAll() {
             .orderBy("elusen.eludatdeb", (ob) => ob.desc().nullsLast())).as("mandats_senateur"),
         // Commissions
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("sens_memcom as memcom")
             .leftJoin("sens_com as com2", "com2.orgcod", "memcom.orgcod")
             .leftJoin("sens_typorg as typorg", "typorg.typorgcod", "com2.typorgcod")
@@ -76,7 +73,6 @@ export async function* findAll() {
             "memcom.memcomdatdeb as order_date",
             // Fonctions dans la commission
             jsonArrayFrom(eb2
-                .withSchema("senat")
                 .selectFrom("sens_fonmemcom as fonmemcom")
                 .leftJoin("sens_foncom as foncom", "foncom.foncomcod", "fonmemcom.foncomcod")
                 .select([
@@ -95,7 +91,6 @@ export async function* findAll() {
             .orderBy("memcom.memcomdatdeb", (ob) => ob.desc().nullsLast())).as("commissions"),
         // Délégations
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("sens_memdelega as memdelega")
             .leftJoin("sens_delega as delega", "delega.orgcod", "memdelega.orgcod")
             .leftJoin("sens_designorg as designorg", "designorg.designcod", "memdelega.designcod")
@@ -111,7 +106,6 @@ export async function* findAll() {
             "memdelega.memdelegadatdeb as order_date",
             // Fonctions dans la délégation
             jsonArrayFrom(eb2
-                .withSchema("senat")
                 .selectFrom("sens_fonmemdelega as fonmemdelega")
                 .leftJoin("sens_fondelega as fondelega", "fondelega.fondelcod", "fonmemdelega.fondelcod")
                 .select([
@@ -130,7 +124,6 @@ export async function* findAll() {
             .orderBy("memdelega.memdelegadatdeb", (ob) => ob.desc().nullsLast())).as("delegations"),
         // Groupes politiques
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("sens_memgrppol as memgrppol")
             .leftJoin("sens_grppol as grppol2", "grppol2.grppolcod", "memgrppol.grppolcod")
             .leftJoin("sens_typapppol as typapppol", "typapppol.typapppolcod", "memgrppol.typapppolcod")
@@ -146,7 +139,6 @@ export async function* findAll() {
             "memgrppol.memgrppoldatdeb as order_date",
             // Fonctions dans le groupe politique
             jsonArrayFrom(eb2
-                .withSchema("senat")
                 .selectFrom("sens_fonmemgrppol as fonmemgrppol")
                 .leftJoin("sens_fongrppol as fongrppol", "fongrppol.fongrppolcod", "fonmemgrppol.fongrppolcod")
                 .select([
@@ -165,7 +157,6 @@ export async function* findAll() {
             .orderBy("memgrppol.memgrppoldatdeb", (ob) => ob.desc().nullsLast())).as("groupes"),
         // Organismes divers (groupes d'études, missions, etc.)
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("sens_memorg as memorg")
             .leftJoin("sens_org as org", "org.orgcod", "memorg.orgcod")
             .leftJoin("sens_typorg as typorg4", "typorg4.typorgcod", "org.typorgcod")
@@ -180,7 +171,6 @@ export async function* findAll() {
             "memorg.memorgdatdeb as order_date",
             // Fonctions dans l'organisme
             jsonArrayFrom(eb2
-                .withSchema("senat")
                 .selectFrom("sens_fonmemorg as fonmemorg")
                 .leftJoin("sens_fonorg as fonorg", "fonorg.fonorgcod", "fonmemorg.fonorgcod")
                 .select([
@@ -199,9 +189,7 @@ export async function* findAll() {
             .orderBy("memorg.memorgdatdeb", (ob) => ob.desc().nullsLast())).as("organismes"),
         // Groupes sénatoriaux (groupes d'amitié)
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom(eb
-            .withSchema("senat")
             .selectFrom("sens_memgrpsen as memgrpsen_raw")
             .select([
             "memgrpsen_raw.orgcod as orgcod",
@@ -231,7 +219,6 @@ export async function* findAll() {
             "memgrpsen.memgrpsendatent as order_date",
             // Fonctions dans le groupe sénatorial
             jsonArrayFrom(eb2
-                .withSchema("senat")
                 .selectFrom("sens_fonmemgrpsen as fonmemgrpsen")
                 .leftJoin("sens_fongrpsen as fongrpsen", "fongrpsen.fongrpsencod", "fonmemgrpsen.fongrpsencod")
                 .select([
@@ -249,7 +236,6 @@ export async function* findAll() {
             .orderBy("memgrpsen.memgrpsendatent", (ob) => ob.desc().nullsLast())).as("groupes_senatoriaux"),
         // Fonctions au bureau du Sénat
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("sens_senbur as senbur")
             .leftJoin("sens_bur as bur", "bur.burcod", "senbur.burcod")
             .select([
@@ -266,7 +252,6 @@ export async function* findAll() {
             .orderBy("senbur.senburdatdeb", (ob) => ob.desc().nullsLast())).as("fonctions_bureau"),
         // Points de contact
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("sens_poicon as poicon")
             .select((eb2) => [
             sql `poicon.poiconid::text`.as("id"),
@@ -275,7 +260,6 @@ export async function* findAll() {
             "poicon.poiconnumtri as order_num",
             // Adresses
             jsonArrayFrom(eb2
-                .withSchema("senat")
                 .selectFrom("sens_adresse as adresse")
                 .select([
                 "adresse.adrnumvoi as numero_voie",
@@ -293,7 +277,6 @@ export async function* findAll() {
                 .orderBy("adresse.adrnumtri", "asc")).as("adresses"),
             // Téléphones
             jsonArrayFrom(eb2
-                .withSchema("senat")
                 .selectFrom("sens_telephone as telephone")
                 .select([
                 "telephone.typtelcod as type",

package/lib/src/utils/reunion_odj_building.js

@@ -265,10 +265,6 @@ function computeCodeEtape(ev, dossier, flatActes) {
             return cleanCode(genericActe.codeActe);
         }
     }
-    console.log(`✖ No stage code found for ev=${ev.id} (Date: ${evDate}, Nature: ${nature}, Lecture: ${lecture})`, {
-        totalActsInDossier: dossier["actes_legislatifs"]?.length || 0,
-        firstActDate: flat[0]?.date,
-    });
     return null;
 }
 function buildFlatActes(dossier) {

package/lib/src/videos/match.js

@@ -114,7 +114,9 @@ export async function matchOneReunion(args) {
         if (isSP && timeAmbigious) {
             // Optional safety: second must also be "acceptable"
             if (second.score >= minAccept) {
-                console.log(" - special case: séance publique + time ambigious => accepting best + secondBest (bis)");
+                if (!options["silent"]) {
+                    console.log(" - special case: séance publique + time ambigious => accepting best + secondBest (bis)");
+                }
                 return { best, secondBest: second, reason: "margin_ambiguous_time_sp" };
             }
         }

package/lib/src/videos/pipeline.js

@@ -5,6 +5,14 @@ import { fetchText } from "./search.js";
 import fs from "fs-extra";
 import fsp from "fs/promises";
 import path from "path";
+function log(options, ...args) {
+    if (!options["silent"])
+        console.log(...args);
+}
+function warn(options, ...args) {
+    if (!options["silent"])
+        console.warn(...args);
+}
 function isReunion(value) {
     return typeof value === "object" && value !== null && "uid" in value;
 }
@@ -18,18 +26,18 @@ export async function processOneReunionMatch(args) {
         finalTxt = await fsp.readFile(path.join(baseDir, "finalplayer.nvs"), "utf-8");
     }
     catch {
-        console.warn(`[skip] Missing NVS files for reunion ${reunionUid}`);
+        warn(options, `[skip] Missing NVS files for reunion ${reunionUid}`);
         return;
     }
     const master = buildSenatVodMasterM3u8FromNvs(dataTxt);
     if (!master) {
-        console.warn(`[warn] Cannot build m3u8 for reunion ${reunionUid}`);
+        warn(options, `[warn] Cannot build m3u8 for reunion ${reunionUid}`);
         return;
     }
     const agendaJsonPath = path.join(dataDir, AGENDA_FOLDER, DATA_TRANSFORMED_FOLDER, String(session), `${agenda.uid}.json`);
     // Ensure it exists first.
     if (!(await fs.pathExists(agendaJsonPath))) {
-        console.warn(`[warn] agenda file not found: ${agendaJsonPath}`);
+        warn(options, `[warn] agenda file not found: ${agendaJsonPath}`);
         return;
     }
     let timecodeDebutVideo = null;
@@ -46,7 +54,7 @@ export async function processOneReunionMatch(args) {
         if (prev && prev.agendaJsonPath !== agendaJsonPath) {
             // micro-safety: do not close with an earlier timecode
             if (timecodeDebutVideo <= prev.start) {
-                console.warn("[warn] timecode order inversion on same video: " +
+                warn(options, "[warn] timecode order inversion on same video: " +
                     `prev=${prev.agendaUid}(${prev.start}s) -> ` +
                     `cur=${agenda.uid}(${timecodeDebutVideo}s). ` +
                     "Skip closing prev to avoid negative segment.");
@@ -55,6 +63,7 @@ export async function processOneReunionMatch(args) {
                 await patchAgendaTimecodeFin({
                     agendaJsonPath: prev.agendaJsonPath,
                     timecodeFinVideo: timecodeDebutVideo,
+                    options,
                     writeIfChanged,
                 });
             }
@@ -68,11 +77,11 @@ export async function processOneReunionMatch(args) {
         obj = JSON.parse(raw);
     }
     catch {
-        console.warn(`[warn] invalid JSON in ${agendaJsonPath}`);
+        warn(options, `[warn] invalid JSON in ${agendaJsonPath}`);
         return;
     }
     if (!isReunion(obj)) {
-        console.warn(`[warn] invalid reunion payload in ${agendaJsonPath}`);
+        warn(options, `[warn] invalid reunion payload in ${agendaJsonPath}`);
         return;
     }
     const next = { ...obj, urlVideo: master, startTime: agenda.startTime, urlPageVideo: best?.pageUrl };
@@ -84,10 +93,8 @@ export async function processOneReunionMatch(args) {
             delete next.timecodeFinVideo;
     }
     await writeIfChanged(agendaJsonPath, JSON.stringify(next, null, 2));
-    if (!options["silent"]) {
-        console.log(`[write] ${agenda.uid} urlVideo ← ${master}` +
-            (timecodeDebutVideo != null ? ` (timecodeDebutVideo ← ${timecodeDebutVideo}s)` : ""));
-    }
+    log(options, `[write] ${agenda.uid} urlVideo ← ${master}` +
+        (timecodeDebutVideo != null ? ` (timecodeDebutVideo ← ${timecodeDebutVideo}s)` : ""));
 }
 export async function processBisIfNeeded(args) {
     const { agenda, secondBest, ctx, skipDownload, options, lastByVideo, writeIfChanged, processOneReunionMatch, getAgendaSegmentTimecodes, buildSenatVodMasterM3u8FromNvs, } = args;
@@ -106,7 +113,7 @@ export async function processBisIfNeeded(args) {
     };
     const baseDirBis = path.join(path.dirname(ctx.baseDir), bisUid);
     await fs.ensureDir(baseDirBis);
-    await ensureBisAgendaJson({ agenda, agendaBis, dataDir: ctx.dataDir, session: ctx.session });
+    await ensureBisAgendaJson({ agenda, agendaBis, dataDir: ctx.dataDir, session: ctx.session, options });
     await downloadNvsForMatch(secondBest, baseDirBis);
     await processOneReunionMatch({
         agenda: agendaBis,
@@ -122,26 +129,26 @@ export async function processBisIfNeeded(args) {
     });
 }
 async function ensureBisAgendaJson(args) {
-    const { agenda, agendaBis, dataDir, session } = args;
+    const { agenda, agendaBis, dataDir, session, options } = args;
     const agendaJsonPath = path.join(dataDir, AGENDA_FOLDER, DATA_TRANSFORMED_FOLDER, String(session), `${agenda.uid}.json`);
     const agendaBisJsonPath = path.join(dataDir, AGENDA_FOLDER, DATA_TRANSFORMED_FOLDER, String(session), `${agendaBis.uid}.json`);
     if (!(await fs.pathExists(agendaJsonPath))) {
-        console.warn(`[bis] original agenda json not found to clone: ${agendaJsonPath}`);
+        warn(options, `[bis] original agenda json not found to clone: ${agendaJsonPath}`);
         return;
     }
     try {
         const raw = await fsp.readFile(agendaJsonPath, "utf-8");
         const obj = JSON.parse(raw);
         if (!obj || typeof obj !== "object" || Array.isArray(obj)) {
-            console.warn(`[bis] cannot clone agenda json: expected object in ${agendaJsonPath}, ` +
+            warn(options, `[bis] cannot clone agenda json: expected object in ${agendaJsonPath}, ` +
                 `got ${Array.isArray(obj) ? "array" : typeof obj}`);
             return;
         }
         await writeIfChanged(agendaBisJsonPath, JSON.stringify(agendaBis, null, 2));
-        console.log(`[bis] created agenda json ${agendaBis.uid}.json from ${agenda.uid}.json`);
+        log(options, `[bis] created agenda json ${agendaBis.uid}.json from ${agenda.uid}.json`);
     }
     catch (e) {
-        console.warn(`[bis] cannot clone agenda json ${agenda.uid}.json -> ${agendaBis.uid}.json:`, e?.message);
+        warn(options, `[bis] cannot clone agenda json ${agenda.uid}.json -> ${agendaBis.uid}.json:`, e?.message);
     }
 }
 async function downloadNvsForMatch(best, baseDir) {
@@ -164,7 +171,7 @@ export async function writeIfChanged(p, content) {
     await fsp.writeFile(p, content, "utf-8");
 }
 async function patchAgendaTimecodeFin(args) {
-    const { agendaJsonPath, timecodeFinVideo, writeIfChanged } = args;
+    const { agendaJsonPath, timecodeFinVideo, options, writeIfChanged } = args;
     if (!(await fs.pathExists(agendaJsonPath)))
         return;
     const raw = await fsp.readFile(agendaJsonPath, "utf-8");
@@ -173,11 +180,11 @@ async function patchAgendaTimecodeFin(args) {
         obj = JSON.parse(raw);
     }
     catch {
-        console.warn(`[warn] invalid JSON in ${agendaJsonPath}`);
+        warn(options, `[warn] invalid JSON in ${agendaJsonPath}`);
         return;
     }
     if (typeof obj !== "object" || obj === null || Array.isArray(obj)) {
-        console.warn(`[warn] invalid reunion payload in ${agendaJsonPath}`);
+        warn(options, `[warn] invalid reunion payload in ${agendaJsonPath}`);
         return;
     }
     const next = { ...obj, timecodeFinVideo };

package/lib/tests/incrementalImportSql.test.js

@@ -33,6 +33,7 @@ describe("incremental import SQL", () => {
         expect(sql).toContain("t.%1$I IS NOT DISTINCT FROM s.%1$I");
         expect(sql).toContain("jsonb_build_array(");
         expect(sql).toContain("Sync strategy for %.%: %");
+        expect(sql).toContain("ALTER TABLE senat.%I REPLICA IDENTITY FULL");
         expect(sql).toContain("Rejected sync key for %.% from % because only %/% columns are present in both staging and target: %");
         expect(sql).toContain("WHERE table_namespace.nspname IN ('dosleg_staging', 'senat')");
         expect(sql).toContain("CASE WHEN table_namespace.nspname = 'dosleg_staging' THEN 0 ELSE 1 END AS schema_priority");
@@ -42,7 +43,9 @@ describe("incremental import SQL", () => {
         expect(sql).toContain("LEFT JOIN target_counts reference_row USING (row_signature)");
         expect(sql).toContain("DELETE FROM senat.%1$I t WHERE NOT EXISTS (SELECT 1 FROM %2$I.%1$I s WHERE %3$s)");
         expect(sql).toContain("UPDATE senat.%1$I t SET %2$s FROM %3$I.%1$I s WHERE %4$s AND (%5$s)");
-        expect(sql).toContain("INSERT INTO senat.%1$I (%2$s) SELECT %3$s FROM %4$I.%1$I s WHERE NOT EXISTS (SELECT 1 FROM senat.%1$I t WHERE %5$s)");
+        expect(sql).toContain("INSERT INTO senat.%1$I (%2$s) '");
+        expect(sql).toContain("SELECT %3$s FROM %4$I.%1$I s '");
+        expect(sql).toContain("(SELECT 1 FROM senat.%1$I t WHERE %5$s)");
         expect(sql).toContain("ALTER TABLE senat.%I ADD CONSTRAINT %I %s");
         expect(sql).toContain("DROP SEQUENCE IF EXISTS senat.%I CASCADE");
         expect(sql).not.toContain("DROP SCHEMA IF EXISTS dosleg_staging CASCADE;");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tricoteuses/senat",
-  "version": "3.1.21",
+  "version": "3.1.23",
   "description": "Handle French Sénat's open data",
   "keywords": [
     "France",
@@ -75,43 +75,45 @@
     "test:prefixed-tables": "vitest tests/prefixedTables.test.ts tests/validatePrefixedTables.test.ts"
   },
   "dependencies": {
-    "cheerio": "^1.1.2",
-    "command-line-args": "^6.0.1",
-    "dotenv": "^17.3.1",
-    "fast-xml-parser": "^5.3.3",
-    "fs-extra": "^11.3.3",
-    "jsdom": "^27.2.0",
+    "cheerio": "^1.2.0",
+    "command-line-args": "^6.0.2",
+    "domhandler": "^6.0.1",
+    "dotenv": "^17.4.2",
+    "fast-xml-parser": "^5.9.3",
+    "fs-extra": "^11.3.6",
+    "jsdom": "^29.1.1",
     "luxon": "^3.7.2",
-    "node-stream-zip": "^1.8.2",
-    "p-limit": "^7.2.0",
-    "pg-cursor": "^2.19.0",
-    "postgres": "^3.4.8",
-    "slug": "^11.0.0",
+    "node-stream-zip": "^1.15.0",
+    "p-limit": "^7.3.0",
+    "pg": "^8.22.0",
+    "pg-cursor": "^2.21.0",
+    "slug": "^11.0.1",
     "windows-1252": "^3.0.4",
-    "zod": "^4.3.5"
+    "zod": "^4.4.3"
   },
   "devDependencies": {
-    "@types/cheerio": "^1.0.0",
-    "@types/command-line-args": "^5.0.0",
+    "@eslint/js": "^10.0.1",
+    "@types/command-line-args": "^5.2.3",
     "@types/fs-extra": "^11.0.4",
-    "@types/jsdom": "^27.0.0",
-    "@types/luxon": "^3.7.1",
-    "@types/node": "^24.10.1",
+    "@types/jsdom": "^28.0.3",
+    "@types/luxon": "^3.7.2",
+    "@types/node": "^26.1.1",
     "@types/pg": "^8.20.0",
     "@types/pg-cursor": "^2.7.2",
     "@types/slug": "^5.0.9",
-    "@typescript-eslint/eslint-plugin": "^8.52.0",
-    "@typescript-eslint/parser": "^8.52.0",
+    "@typescript-eslint/eslint-plugin": "^8.63.0",
+    "@typescript-eslint/parser": "^8.63.0",
     "cross-env": "^10.1.0",
-    "eslint": "^9.39.2",
-    "globals": "^17.0.0",
-    "kanel": "^4.0.1",
+    "eslint": "^10.6.0",
+    "extract-pg-schema": "^5.8.2",
+    "globals": "^17.7.0",
+    "kanel": "^4.0.2",
     "kanel-kysely": "^4.0.0",
     "kanel-zod": "^4.0.0",
-    "kysely": "^0.28.16",
-    "prettier": "^3.5.3",
-    "tsx": "^4.21.0",
-    "typescript": "^5.9.3",
-    "vitest": "^4.0.18"
+    "kysely": "^0.29.3",
+    "prettier": "^3.9.4",
+    "tsx": "^4.23.0",
+    "typescript": "^6.0.3",
+    "vitest": "^4.1.10"
   }
 }