Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Az/upload anno for task #393

Merged
merged 2 commits into from
Apr 12, 2019
Merged

Az/upload anno for task #393

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e31299
improved uploading annotation for task
Apr 11, 2019
ec3c2c3
Merge branch 'nm/rest_api' into az/upload_anno_for_task
Apr 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 71 additions & 27 deletions cvat/apps/dashboard/static/dashboard/js/dashboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,44 +82,88 @@ class TaskView {
}

_upload() {
async function saveChunk(parsed, start, version) {
const CHUNK_SIZE = 100000;
let end = start + CHUNK_SIZE;
let next = false;

let chunk = {
shapes: [],
tracks: [],
tags: [],
version,
}

for (let prop in parsed) {
if (parsed.hasOwnProperty(prop)) {
chunk[prop] = parsed[prop].slice(start, end);
next |= chunk[prop].length > 0;
async function saveChunk(parsed) {
const CHUNK_SIZE = 30000;

class Chunk {
constructor() {
this.shapes = [];
this.tracks = [];
this.tags = [];
this.capasity = CHUNK_SIZE;
this.version = 0;
}
}

if (next) {
const response = await $.ajax({
url: `/api/v1/tasks/${this._id}/annotations?action=create`,
type: 'PATCH',
data: JSON.stringify(chunk),
contentType: 'application/json',
});
length() {
return this.tags.length +
this.shapes.length +
this.tracks.reduce((sum, track) => sum + track.shapes.length, 0);
}

isFull() {
return this.length() >= this.capasity;
}

isEmpty() {
return this.length() === 0;
}

saveChunk.call(this, parsed, end, response.version);
clear() {
this.shapes = [];
this.tracks = [];
this.tags = [];
}
export() {
return {
shapes: this.shapes,
tracks: this.tracks,
tags: this.tags,
version: this.version,
};
}
async save(taskID) {
try {
const response = await $.ajax({
url: `/api/v1/tasks/${taskID}/annotations?action=create`,
type: 'PATCH',
data: JSON.stringify(chunk.export()),
contentType: 'application/json',
});
this.version = response.version;
this.clear();
} catch (error) {
throw error;
}
}
}

const splitAndSave = async (chunk, prop, splitStep) => {
for(let start = 0; start < parsed[prop].length; start += splitStep) {
Array.prototype.push.apply(chunk[prop], parsed[prop].slice(start, start + splitStep));
if (chunk.isFull()) {
await chunk.save(this._id);
}
}
// save tail
if (!chunk.isEmpty()) {
await chunk.save(this._id);
}
};

let chunk = new Chunk();
// FIXME tags aren't supported by parser
// await split(chunk, "tags", CHUNK_SIZE);
await splitAndSave(chunk, "shapes", CHUNK_SIZE);
await splitAndSave(chunk, "tracks", 1);
}

async function save(parsed) {3
async function save(parsed) {
await $.ajax({
url: `/api/v1/tasks/${this._id}/annotations`,
type: 'DELETE',
});

await saveChunk.call(this, parsed, 0, 0);
await saveChunk.call(this, parsed);
}

async function onload(overlay, text) {
Expand Down