Skip to content

Commit

Permalink
new method replaces insertRecord
Browse files Browse the repository at this point in the history 
fixed undelete
  • Loading branch information
@Mattk70
Mattk70 committed Jan 20, 2024
1 parent 17146d1 commit 9eab487
Show file tree
Hide file tree
Showing 3 changed files with 110 additions and 66 deletions.
4 changes: 3 additions & 1 deletion js/state.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,10 @@ export class State {
this.update({ filesToAnalyse: files });
}

// Used to decrease calls to get summary when prepping a dataset
// because it's an expensive op when the memory db is v. large
increment() {
if (++this.predictionCount === 20) {
if (++this.predictionCount === 2000) {
this.predictionCount = 0
}
return this.predictionCount;
Expand Down
15 changes: 9 additions & 6 deletions js/ui.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2632,16 +2632,19 @@ function onProgress(args) {
progressDiv.classList.add('d-none');
}
} else {
progressDiv.classList.remove('d-none');
const count = fileList.indexOf(args.file) + 1;
fileNumber.textContent = `File ${count} of ${fileList.length}`;
}
if (args.progress) {
let progress = Math.round(args.progress * 1000) / 10;
updateProgress(progress);
if (progress === 100) {
progressDiv.classList.add('d-none');
//progressDiv.classList.add('d-none');
}
} else {}
} else {
progressDiv.classList.remove('d-none');
}
}

function updatePagination(total, offset) {
Expand Down Expand Up @@ -3012,16 +3015,16 @@ const deleteRecord = (target) => {
const [file, start, end,] = unpackNameAttr(target);
const setting = target.closest('table');
const row = target.closest('tr');
let cname = target.querySelector('.cname').textContent;
let cname = target.querySelector('.cname').innerText;
let [species, confidence] = cname.split('\n');
// confirmed records don't have a confidence bar
if (!confidence) {
species = species.slice(0, -9); // remove ' verified'
confidence = 2000;
} else { confidence = parseInt(confidence.replace('%', '')) * 10 }
const comment = target.querySelector('.comment').textContent;
const label = target.querySelector('.label').textContent;
let callCount = target.querySelector('.call-count').textContent;
const comment = target.querySelector('.comment').innerText;
const label = target.querySelector('.label').innerText;
let callCount = target.querySelector('.call-count').innerText;
callCount = callCount.replace('Present', '');
DELETE_HISTORY.push([species, start, end, comment, callCount, label, undefined, undefined, undefined, confidence])

Expand Down
157 changes: 98 additions & 59 deletions js/worker.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ let SEEN_LIST_UPDATE = false // Prevents list updates from every worker on ever
const DEBUG = false;

const DATASET = true;
const adding_chirpity_additions = false;
const adding_chirpity_additions = true;
const dataset_database = DATASET;
const DATASET_SAVE_LOCATION = '/media/matt/36A5CC3B5FA24585/DATASETS/BEST_MODEL_pngs/';
const DATASET_SAVE_LOCATION = "E:/DATASETS/BEST_MODEL_pngs";


if (DEBUG) console.log(staticFfmpeg.path);
Expand Down Expand Up @@ -490,7 +490,9 @@ const getTotal = async ({species = undefined, offset = 0}) => {
const range = STATE.mode === 'explore' ? STATE.explore.range : undefined;
const useRange = range?.start;
let SQL = ` WITH MaxConfidencePerDateTime AS (
SELECT confidence FROM records `;
SELECT confidence,
RANK() OVER (PARTITION BY records.dateTime ORDER BY records.confidence DESC) AS rank
FROM records `;
// if (['analyse', 'archive'].includes(STATE.mode)) {
// SQL += ' JOIN files on files.id = records.fileid ';
// }
Expand All @@ -508,7 +510,7 @@ const getTotal = async ({species = undefined, offset = 0}) => {
// params.push(...STATE.filesToAnalyse)
// }
SQL += ' ) '
SQL += `SELECT COUNT(confidence) AS total FROM MaxConfidencePerDateTime`;
SQL += `SELECT COUNT(confidence) AS total FROM MaxConfidencePerDateTime WHERE rank <= ${STATE.topRankin}`;

const {total} = await STATE.db.getAsync(SQL, ...params)
UI.postMessage({event: 'total-records', total: total, offset: offset, species: species})
Expand Down Expand Up @@ -1223,7 +1225,7 @@ const fetchAudioBuffer = async ({
file = '', start = 0, end = metadata[file].duration
}) => {
if (end - start < 0.1) return // prevents dataset creation barfing with v. short buffers
const proxy = metadata[file].proxy;
const proxy = metadata[file]?.proxy || await getWorkingFile(file);
if (!proxy) return false
return new Promise(resolve => {
const byteStart = convertTimeToBytes(start, metadata[file]);
Expand All @@ -1242,15 +1244,19 @@ const fetchAudioBuffer = async ({
// Ensure data is processed in order
readStream.pause();
const offlineCtx = await setupCtx(chunk, metadata[file].header);
offlineCtx?.startRendering().then(resampled => {
// `resampled` contains an AudioBuffer resampled at 24000Hz.
// use resampled.getChannelData(x) to get an Float32Array for channel x.
readStream.resume();
resolve(resampled);
}).catch((error) => {
console.error(`FetchAudio rendering failed: ${error}`);
// Note: The promise should reject when startRendering is called a second time on an OfflineAudioContext
});
if (offlineCtx){
offlineCtx.startRendering().then(resampled => {
// `resampled` contains an AudioBuffer resampled at 24000Hz.
// use resampled.getChannelData(x) to get an Float32Array for channel x.
readStream.resume();
resolve(resampled);
}).catch((error) => {
console.error(`FetchAudio rendering failed: ${error}`);
// Note: The promise should reject when startRendering is called a second time on an OfflineAudioContext
});
}
// if the was a problem setting up the context remove the file from the files list
offlineCtx || updateFilesBeingProcessed(file)
})

readStream.on('end', function () {
Expand Down Expand Up @@ -1361,7 +1367,7 @@ const saveResults2DataSet = ({species}) => {
let promise = Promise.resolve();
let promises = [];
let count = 0;
let db2ResultSQL = `SELECT DISTINCT dateTime AS timestamp,
let db2ResultSQL = `SELECT dateTime AS timestamp,
files.duration,
files.filestart,
files.name AS file,
Expand All @@ -1382,7 +1388,7 @@ const saveResults2DataSet = ({species}) => {
db2ResultSQL += ` AND species.cname = ?`;
params.push(species)
}
diskDB.each(db2ResultSQL, ...params, async (err, result) => {
STATE.db.each(db2ResultSQL, ...params, async (err, result) => {
// Check for level of ambient noise activation
let ambient, threshold, value = STATE.detect.confidence;
// adding_chirpity_additions is a flag for curated files, if true we assume every detection is correct
Expand All @@ -1394,19 +1400,19 @@ const saveResults2DataSet = ({species}) => {
// value = 0.7
// }
// Check whether top predicted species matches folder (i.e. the searched for species)
// species not matching the top prediction sets threshold to 2, effectively doing nothing with results
// that don't match the searched for species
// species not matching the top prediction sets threshold to 2000, effectively limiting treatment to manual records
threshold = speciesMatch(result.file, result.sname) ? value : 2000;
} else {
threshold = 0;
threshold = result.sname === "Ambient_Noise" ? 0 : 2000;
}
promise = promise.then(async function () {
let score = result.score;
if (score >= threshold) {
const folders = p.dirname(result.file).split(p.sep); //.match(/^.*\/(.*)$/)
species = result.cname.replaceAll(' ', '_');
const sname = result.sname.replaceAll(' ', '_');
const folder = adding_chirpity_additions ? 'No_call' : `${sname}~${species}`;
// score 2000 when manual id. if manual ID when doing additions put it in the species folder
const folder = adding_chirpity_additions && score !== 2000 ? 'No_call' : `${sname}~${species}`;
// get start and end from timestamp
const start = result.position;
let end = start + 3;
Expand Down Expand Up @@ -1653,31 +1659,31 @@ const terminateWorkers = () => {
predictWorkers = [];
}

const insertRecord = async (timestamp, key, speciesID, confidence, file) => {
const isDaylight = isDuringDaylight(timestamp, STATE.lat, STATE.lon);
const offset = key * 1000;
let changes, fileID;
confidence = Math.round(confidence);
const db = memoryDB; //STATE.db;
let res = await db.getAsync('SELECT id FROM files WHERE name = ?', file);
if (!res) {
res = await db.runAsync('INSERT OR IGNORE INTO files VALUES ( ?,?,?,?,? )',
undefined, file, metadata[file].duration, metadata[file].fileStart, undefined);
fileID = res.lastID;
changes = 1;
} else {
fileID = res.id;
}
if (changes) {
const durationSQL = Object.entries(metadata[file].dateDuration)
.map(entry => `(${entry.toString()},${fileID})`).join(',');
// No "OR IGNORE" in this statement because it should only run when the file is new
await db.runAsync(`INSERT OR IGNORE INTO duration VALUES ${durationSQL}`);
}
await db.runAsync('INSERT OR REPLACE INTO records VALUES (?,?,?,?,?,?,?,?,?,?)',
metadata[file].fileStart + offset, key, fileID, speciesID, confidence,
undefined, undefined, key + 3, undefined, isDaylight);
}
// const insertRecord = async (timestamp, key, speciesID, confidence, file) => {
// const isDaylight = isDuringDaylight(timestamp, STATE.lat, STATE.lon);
// const offset = key * 1000;
// let changes, fileID;
// confidence = Math.round(confidence);
// const db = STATE.db;
// let res = await db.getAsync('SELECT id FROM files WHERE name = ?', file);
// if (!res) {
// res = await db.runAsync('INSERT OR IGNORE INTO files VALUES ( ?,?,?,?,? )',
// undefined, file, metadata[file].duration, metadata[file].fileStart, undefined);
// fileID = res.lastID;
// changes = 1;
// } else {
// fileID = res.id;
// }
// if (changes) {
// const durationSQL = Object.entries(metadata[file].dateDuration)
// .map(entry => `(${entry.toString()},${fileID})`).join(',');
// // No "OR IGNORE" in this statement because it should only run when the file is new
// await db.runAsync(`INSERT OR IGNORE INTO duration VALUES ${durationSQL}`);
// }
// await db.runAsync('INSERT OR REPLACE INTO records VALUES (?,?,?,?,?,?,?,?,?,?)',
// metadata[file].fileStart + offset, key, fileID, speciesID, confidence,
// undefined, undefined, key + 3, undefined, isDaylight);
// }

async function batchInsertRecords(cname, label, files, originalCname) {
const db = STATE.db;
Expand Down Expand Up @@ -1772,12 +1778,51 @@ const onInsertManualRecord = async ({ cname, start, end, comment, count, file, l
})
}

const generateInsertQuery = async (latestResult, file) => {
const db = STATE.db;
let insertQuery = 'INSERT INTO records VALUES ';
let fileID, changes;
let res = await db.getAsync('SELECT id FROM files WHERE name = ?', file);
if (!res) {
res = await db.runAsync('INSERT OR IGNORE INTO files VALUES ( ?,?,?,?,? )',
undefined, file, metadata[file].duration, metadata[file].fileStart, undefined);
fileID = res.lastID;
changes = 1;
} else {
fileID = res.id;
}
if (changes) {
const durationSQL = Object.entries(metadata[file].dateDuration)
.map(entry => `(${entry.toString()},${fileID})`).join(',');
// No "OR IGNORE" in this statement because it should only run when the file is new
await db.runAsync(`INSERT OR IGNORE INTO duration VALUES ${durationSQL}`);
}
let [keysArray, speciesIDBatch, confidenceBatch] = latestResult;
for (let i = 0; i < keysArray.length; i++) {
const key = parseFloat(keysArray[i]);
const timestamp = metadata[file].fileStart + key * 1000;
const isDaylight = isDuringDaylight(timestamp, STATE.lat, STATE.lon);
const confidenceArray = confidenceBatch[i];
const speciesIDArray = speciesIDBatch[i];
for (let j = 0; j < confidenceArray.length; j++) {
const confidence = Math.round(confidenceArray[j] *= 1000);
if (confidence < 50) break;
const speciesID = speciesIDArray[j];
insertQuery += `(${timestamp}, ${key}, ${fileID}, ${speciesID}, ${confidence}, null, null, ${key + 3}, null, ${isDaylight}), `;
}
}
// Remove the trailing comma and space
insertQuery = insertQuery.slice(0, -2);
DEBUG && console.log(insertQuery);
await db.runAsync(insertQuery);
return fileID
}

const parsePredictions = async (response) => {
let file = response.file;
const latestResult = response.result, db = STATE.db;
DEBUG && console.log('worker being used:', response.worker);


await generateInsertQuery(latestResult, file);
let [keysArray, speciesIDBatch, confidenceBatch] = latestResult;
for (let i = 0; i < keysArray.length; i++) {
let updateUI = false;
Expand All @@ -1787,12 +1832,9 @@ const parsePredictions = async (response) => {
const speciesIDArray = speciesIDBatch[i];
for (let j = 0; j < confidenceArray.length; j++) {
let confidence = confidenceArray[j];
if (confidence < 0.05) break;
if (confidence < 50) break;
let speciesID = speciesIDArray[j];
confidence *= 1000;
updateUI = (confidence > STATE.detect.confidence && ! STATE.blocked.includes(speciesID));
//save all results to db, regardless of confidence
STATE.selection || await insertRecord(timestamp, key, speciesID, confidence, file);
if (STATE.selection || updateUI) {
let end, confidenceRequired;
if (STATE.selection) {
Expand All @@ -1804,7 +1846,6 @@ const parsePredictions = async (response) => {
end = key + 3;
confidenceRequired = STATE.detect.confidence;
}

if (confidence >= confidenceRequired) {
const { cname } = await memoryDB.getAsync(`SELECT cname FROM species WHERE id = ${speciesID}`);
const result = {
Expand All @@ -1815,13 +1856,14 @@ const parsePredictions = async (response) => {
cname: cname,
score: confidence
}
sendResult(++index, result, false)
sendResult(++index, result, false);
// Only show the highest confidence detection
if (! STATE.selection) break;
};
}
}
}

//STATE.userSettingsInSelection = false;
predictionsReceived[file]++;
const received = sumObjectValues(predictionsReceived);
const total = sumObjectValues(batchChunksToSend);
Expand Down Expand Up @@ -1883,7 +1925,7 @@ break;
predictWorkers[response.worker].isAvailable = true;
let worker = await parsePredictions(response);
if (predictionsReceived[response.file] === predictionsRequested[response.file]) {
const limit = 10;
const limit = 100;
clearCache(CACHE_LOCATION, limit);
if (filesBeingProcessed.length) {
processNextFile({
Expand Down Expand Up @@ -1989,10 +2031,7 @@ async function processNextFile({
}

function sumObjectValues(obj) {
return Object.values(obj).reduce((acc, value) => {
acc += value;
return acc;
}, 0);
return Object.values(obj).reduce((total, value) => total + value, 0);
}

function onSameDay(timestamp1, timestamp2) {
Expand Down

0 comments on commit 9eab487

Please sign in to comment.