Aaltronav/dougal-software
1
0
Fork 0
mirror of https://gitlab.com/wgp/dougal/software.git synced 2025-12-06 13:27:08 +00:00
Code Issues Packages Projects Releases Activity

Merge branch '184-refactor-qcs' into devel

Browse Source
This commit is contained in:
D. Berge
2022-03-17 20:12:15 +01:00
parent 1fd265cc74 913606e7f1
commit 634a7be3f1
2 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/www/server/lib/qc/index.js
View File

@@ -10,6 +10,34 @@ const { projectHash, sequenceHash } = require('./last-modified');
const { runShotsQC, saveShotsQC } = require('./shots');
const { runSequenceQCs, saveSequenceQCs } = require('./sequences');
/** Return true if the user has requested force running
* a QC that would normally not be scheduled to be run.
*
* This is done via the DOUGAL_FORCE_QC environment
* variable. The format is as follows:
*
* DOUGAL_FORCE_QC="project-id [sequence1 sequence2 … sequenceN]"
*
* A value of "project-id" re-runs QCs for all sequences of that
* project, whereas specifying sequences to be run affects only
* those sequences.
*/
function forceQC (projectId, sequenceNumber) {
if (process.env.DOUGAL_FORCE_QC) {
const [force_projectID, ...force_sequences ] = process.env.DOUGAL_FORCE_QC.split(/\s+/);
if (projectId == force_projectID) {
if (!sequenceNumber) {
return true;
} else if (!force_sequences.length) {
return true;
} else {
return force_sequences.map(i => Number(i)).some(i => i == sequenceNumber);
}
}
}
return false;
}
async function getProjectQCConfig (projectId) {
console.log("getProjectQCConfig");
const qcConfig = await configuration.get(projectId, "qc");
@@ -41,7 +69,7 @@ async function main () {
console.log("projectHash", projectHash);
console.log("lastQCHash", lastQCHash);
if (currentQCHash != lastQCHash) {
if (currentQCHash != lastQCHash || forceQC(projectId)) {
console.log("currentQCHash != lastQCHash", projectId, currentQCHash, lastQCHash);
// Fetch definitions and parameters
@@ -64,7 +92,7 @@ async function main () {
console.log("sequenceCurrentHash", sequenceCurrentHash);
console.log("sequenceLastQCHash", sequenceLastQCHash);
if (sequenceCurrentHash != sequenceLastQCHash) {
if (sequenceCurrentHash != sequenceLastQCHash || forceQC(projectId, sequenceNumber)) {
const results = await runShotsQC(projectId, sequenceNumber, shotQCs, parameters);

18
lib/www/server/lib/qc/shots/save-qc.js
View File

@@ -5,20 +5,16 @@ async function saveShotsQC (projectId, results) {
const client = await setSurvey(projectId);
await transaction.begin(client);
async function deleteQCEvent (sequence, shot, qc_id) {
// NOTE that we delete from event_log_full
// because the event is readonly and we can't otherwise
// modify it via event_log (though it'd be nice to)
async function deleteQCEvents (sequence) {
const text = `
DELETE
FROM event_log_full
WHERE
sequence = $1 AND point = $2
AND meta->>'qc_id' = $3;
WHERE sequence = $1 AND meta ? 'qc_id';
`;
// console.log("DELETE QUERY", projectId, sequence, shot, qc_id);
return await client.query(text, [ sequence, shot, qc_id ]);
const values = [ sequence ];
return await client.query(text, values);
}
async function updateQCEvent (sequence, shot, qc_id, result) {
@@ -37,11 +33,11 @@ async function saveShotsQC (projectId, results) {
};
for (const sequence in results) {
// Remove *all* QC events for this sequence
await deleteQCEvents(sequence);
for (const shot in results[sequence]) {
for (const qc_id in results[sequence][shot]) {
const result = results[sequence][shot][qc_id];
// Remove any existing event for this QC
await deleteQCEvent(sequence, shot, qc_id);
if (result !== true) { // `true` means QC passed. Otherwise expect string or array.
// Add or replace an existing event for this QC
await updateQCEvent(sequence, shot, qc_id, result);