wangchunlin
/
cvat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert `api.ts`, `api-implementation.ts` and `frames.ts` to ES6 modules (#5283)

Browse Source 
This fixes ESLint errors in these files.

Set the `resolveJsonModule` setting, so that TypeScript can recognize the
`package.json` import.
main
Roman Donchenko 3 years ago committed by GitHub
parent 5dd7eff97a
commit c86746c785
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 1067 additions and 1085 deletions
Show Stats Download Patch File Download Diff File

600
cvat-core/src/api-implementation.ts
Unescape Escape View File

@ -3,329 +3,325 @@
//
// SPDX-License-Identifier: MIT
const config = require('./config').default;
(() => {
const PluginRegistry = require('./plugins').default;
const serverProxy = require('./server-proxy').default;
const lambdaManager = require('./lambda-manager').default;
const {
isBoolean,
isInteger,
isString,
checkFilter,
checkExclusiveFields,
checkObjectType,
} = require('./common');
const User = require('./user').default;
const { AnnotationFormats } = require('./annotation-formats');
const { ArgumentError } = require('./exceptions');
const { Task, Job } = require('./session');
const Project = require('./project').default;
const CloudStorage = require('./cloud-storage').default;
const Organization = require('./organization').default;
const Webhook = require('./webhook').default;
function implementAPI(cvat) {
cvat.plugins.list.implementation = PluginRegistry.list;
cvat.plugins.register.implementation = PluginRegistry.register.bind(cvat);
cvat.lambda.list.implementation = lambdaManager.list.bind(lambdaManager);
cvat.lambda.run.implementation = lambdaManager.run.bind(lambdaManager);
cvat.lambda.call.implementation = lambdaManager.call.bind(lambdaManager);
cvat.lambda.cancel.implementation = lambdaManager.cancel.bind(lambdaManager);
cvat.lambda.listen.implementation = lambdaManager.listen.bind(lambdaManager);
cvat.lambda.requests.implementation = lambdaManager.requests.bind(lambdaManager);
cvat.server.about.implementation = async () => {
const result = await serverProxy.server.about();
return result;
};
cvat.server.share.implementation = async (directory) => {
const result = await serverProxy.server.share(directory);
return result;
};
cvat.server.formats.implementation = async () => {
const result = await serverProxy.server.formats();
return new AnnotationFormats(result);
};
cvat.server.userAgreements.implementation = async () => {
const result = await serverProxy.server.userAgreements();
return result;
};
cvat.server.register.implementation = async (
import config from './config';
import PluginRegistry from './plugins';
import serverProxy from './server-proxy';
import lambdaManager from './lambda-manager';
import {
isBoolean,
isInteger,
isString,
checkFilter,
checkExclusiveFields,
checkObjectType,
} from './common';
import User from './user';
import { AnnotationFormats } from './annotation-formats';
import { ArgumentError } from './exceptions';
import { Task, Job } from './session';
import Project from './project';
import CloudStorage from './cloud-storage';
import Organization from './organization';
import Webhook from './webhook';
export default function implementAPI(cvat) {
cvat.plugins.list.implementation = PluginRegistry.list;
cvat.plugins.register.implementation = PluginRegistry.register.bind(cvat);
cvat.lambda.list.implementation = lambdaManager.list.bind(lambdaManager);
cvat.lambda.run.implementation = lambdaManager.run.bind(lambdaManager);
cvat.lambda.call.implementation = lambdaManager.call.bind(lambdaManager);
cvat.lambda.cancel.implementation = lambdaManager.cancel.bind(lambdaManager);
cvat.lambda.listen.implementation = lambdaManager.listen.bind(lambdaManager);
cvat.lambda.requests.implementation = lambdaManager.requests.bind(lambdaManager);
cvat.server.about.implementation = async () => {
const result = await serverProxy.server.about();
return result;
};
cvat.server.share.implementation = async (directory) => {
const result = await serverProxy.server.share(directory);
return result;
};
cvat.server.formats.implementation = async () => {
const result = await serverProxy.server.formats();
return new AnnotationFormats(result);
};
cvat.server.userAgreements.implementation = async () => {
const result = await serverProxy.server.userAgreements();
return result;
};
cvat.server.register.implementation = async (
username,
firstName,
lastName,
email,
password,
userConfirmations,
) => {
const user = await serverProxy.server.register(
username,
firstName,
lastName,
email,
password,
userConfirmations,
) => {
const user = await serverProxy.server.register(
username,
firstName,
lastName,
email,
password,
userConfirmations,
);
return new User(user);
};
cvat.server.login.implementation = async (username, password) => {
await serverProxy.server.login(username, password);
};
cvat.server.logout.implementation = async () => {
await serverProxy.server.logout();
};
cvat.server.advancedAuthentication.implementation = async () => {
const result = await serverProxy.server.advancedAuthentication();
return result;
};
cvat.server.changePassword.implementation = async (oldPassword, newPassword1, newPassword2) => {
await serverProxy.server.changePassword(oldPassword, newPassword1, newPassword2);
};
cvat.server.requestPasswordReset.implementation = async (email) => {
await serverProxy.server.requestPasswordReset(email);
};
cvat.server.resetPassword.implementation = async (newPassword1, newPassword2, uid, token) => {
await serverProxy.server.resetPassword(newPassword1, newPassword2, uid, token);
};
cvat.server.authorized.implementation = async () => {
const result = await serverProxy.server.authorized();
return result;
};
cvat.server.request.implementation = async (url, data) => {
const result = await serverProxy.server.request(url, data);
return result;
};
cvat.server.installedApps.implementation = async () => {
const result = await serverProxy.server.installedApps();
return result;
};
cvat.users.get.implementation = async (filter) => {
checkFilter(filter, {
id: isInteger,
is_active: isBoolean,
self: isBoolean,
search: isString,
limit: isInteger,
});
let users = null;
if ('self' in filter && filter.self) {
users = await serverProxy.users.self();
users = [users];
} else {
const searchParams = {};
for (const key in filter) {
if (filter[key] && key !== 'self') {
searchParams[key] = filter[key];
}
);
return new User(user);
};
cvat.server.login.implementation = async (username, password) => {
await serverProxy.server.login(username, password);
};
cvat.server.logout.implementation = async () => {
await serverProxy.server.logout();
};
cvat.server.advancedAuthentication.implementation = async () => {
const result = await serverProxy.server.advancedAuthentication();
return result;
};
cvat.server.changePassword.implementation = async (oldPassword, newPassword1, newPassword2) => {
await serverProxy.server.changePassword(oldPassword, newPassword1, newPassword2);
};
cvat.server.requestPasswordReset.implementation = async (email) => {
await serverProxy.server.requestPasswordReset(email);
};
cvat.server.resetPassword.implementation = async (newPassword1, newPassword2, uid, token) => {
await serverProxy.server.resetPassword(newPassword1, newPassword2, uid, token);
};
cvat.server.authorized.implementation = async () => {
const result = await serverProxy.server.authorized();
return result;
};
cvat.server.request.implementation = async (url, data) => {
const result = await serverProxy.server.request(url, data);
return result;
};
cvat.server.installedApps.implementation = async () => {
const result = await serverProxy.server.installedApps();
return result;
};
cvat.users.get.implementation = async (filter) => {
checkFilter(filter, {
id: isInteger,
is_active: isBoolean,
self: isBoolean,
search: isString,
limit: isInteger,
});
let users = null;
if ('self' in filter && filter.self) {
users = await serverProxy.users.self();
users = [users];
} else {
const searchParams = {};
for (const key in filter) {
if (filter[key] && key !== 'self') {
searchParams[key] = filter[key];
}
users = await serverProxy.users.get(searchParams);
}
users = users.map((user) => new User(user));
return users;
};
cvat.jobs.get.implementation = async (filter) => {
checkFilter(filter, {
page: isInteger,
filter: isString,
sort: isString,
search: isString,
taskID: isInteger,
jobID: isInteger,
});
if ('taskID' in filter && 'jobID' in filter) {
throw new ArgumentError('Filter fields "taskID" and "jobID" are not permitted to be used at the same time');
users = await serverProxy.users.get(searchParams);
}
users = users.map((user) => new User(user));
return users;
};
cvat.jobs.get.implementation = async (filter) => {
checkFilter(filter, {
page: isInteger,
filter: isString,
sort: isString,
search: isString,
taskID: isInteger,
jobID: isInteger,
});
if ('taskID' in filter && 'jobID' in filter) {
throw new ArgumentError('Filter fields "taskID" and "jobID" are not permitted to be used at the same time');
}
if ('taskID' in filter) {
const [task] = await serverProxy.tasks.get({ id: filter.taskID });
if (task) {
return new Task(task).jobs;
}
if ('taskID' in filter) {
const [task] = await serverProxy.tasks.get({ id: filter.taskID });
if (task) {
return new Task(task).jobs;
}
return [];
}
return [];
if ('jobID' in filter) {
const job = await serverProxy.jobs.get({ id: filter.jobID });
if (job) {
return [new Job(job)];
}
}
if ('jobID' in filter) {
const job = await serverProxy.jobs.get({ id: filter.jobID });
if (job) {
return [new Job(job)];
}
}
const searchParams = {};
for (const key of Object.keys(filter)) {
if (['page', 'sort', 'search', 'filter'].includes(key)) {
searchParams[key] = filter[key];
}
const searchParams = {};
for (const key of Object.keys(filter)) {
if (['page', 'sort', 'search', 'filter'].includes(key)) {
searchParams[key] = filter[key];
}
const jobsData = await serverProxy.jobs.get(searchParams);
const jobs = jobsData.results.map((jobData) => new Job(jobData));
jobs.count = jobsData.count;
return jobs;
};
cvat.tasks.get.implementation = async (filter) => {
checkFilter(filter, {
page: isInteger,
projectId: isInteger,
id: isInteger,
sort: isString,
search: isString,
filter: isString,
ordering: isString,
});
checkExclusiveFields(filter, ['id', 'projectId'], ['page']);
const searchParams = {};
for (const key of Object.keys(filter)) {
if (['page', 'id', 'sort', 'search', 'filter', 'ordering'].includes(key)) {
searchParams[key] = filter[key];
}
}
const jobsData = await serverProxy.jobs.get(searchParams);
const jobs = jobsData.results.map((jobData) => new Job(jobData));
jobs.count = jobsData.count;
return jobs;
};
cvat.tasks.get.implementation = async (filter) => {
checkFilter(filter, {
page: isInteger,
projectId: isInteger,
id: isInteger,
sort: isString,
search: isString,
filter: isString,
ordering: isString,
});
checkExclusiveFields(filter, ['id', 'projectId'], ['page']);
const searchParams = {};
for (const key of Object.keys(filter)) {
if (['page', 'id', 'sort', 'search', 'filter', 'ordering'].includes(key)) {
searchParams[key] = filter[key];
}
}
let tasksData = null;
if (filter.projectId) {
if (searchParams.filter) {
const parsed = JSON.parse(searchParams.filter);
searchParams.filter = JSON.stringify({ and: [parsed, { '==': [{ var: 'project_id' }, filter.projectId] }] });
} else {
searchParams.filter = JSON.stringify({ and: [{ '==': [{ var: 'project_id' }, filter.projectId] }] });
}
let tasksData = null;
if (filter.projectId) {
if (searchParams.filter) {
const parsed = JSON.parse(searchParams.filter);
searchParams.filter = JSON.stringify({ and: [parsed, { '==': [{ var: 'project_id' }, filter.projectId] }] });
} else {
searchParams.filter = JSON.stringify({ and: [{ '==': [{ var: 'project_id' }, filter.projectId] }] });
}
tasksData = await serverProxy.tasks.get(searchParams);
const tasks = tasksData.map((task) => new Task(task));
tasks.count = tasksData.count;
return tasks;
};
cvat.projects.get.implementation = async (filter) => {
checkFilter(filter, {
id: isInteger,
page: isInteger,
search: isString,
sort: isString,
filter: isString,
});
checkExclusiveFields(filter, ['id'], ['page']);
const searchParams = {};
for (const key of Object.keys(filter)) {
if (['id', 'page', 'search', 'sort', 'page', 'filter'].includes(key)) {
searchParams[key] = filter[key];
}
}
tasksData = await serverProxy.tasks.get(searchParams);
const tasks = tasksData.map((task) => new Task(task));
tasks.count = tasksData.count;
return tasks;
};
cvat.projects.get.implementation = async (filter) => {
checkFilter(filter, {
id: isInteger,
page: isInteger,
search: isString,
sort: isString,
filter: isString,
});
checkExclusiveFields(filter, ['id'], ['page']);
const searchParams = {};
for (const key of Object.keys(filter)) {
if (['id', 'page', 'search', 'sort', 'page', 'filter'].includes(key)) {
searchParams[key] = filter[key];
}
const projectsData = await serverProxy.projects.get(searchParams);
const projects = projectsData.map((project) => {
project.task_ids = project.tasks;
return project;
}).map((project) => new Project(project));
projects.count = projectsData.count;
return projects;
};
cvat.projects.searchNames
.implementation = async (search, limit) => serverProxy.projects.searchNames(search, limit);
cvat.cloudStorages.get.implementation = async (filter) => {
checkFilter(filter, {
page: isInteger,
filter: isString,
sort: isString,
id: isInteger,
search: isString,
});
checkExclusiveFields(filter, ['id', 'search'], ['page']);
const searchParams = {};
for (const key of Object.keys(filter)) {
if (['page', 'filter', 'sort', 'id', 'search'].includes(key)) {
searchParams[key] = filter[key];
}
}
const projectsData = await serverProxy.projects.get(searchParams);
const projects = projectsData.map((project) => {
project.task_ids = project.tasks;
return project;
}).map((project) => new Project(project));
projects.count = projectsData.count;
return projects;
};
cvat.projects.searchNames
.implementation = async (search, limit) => serverProxy.projects.searchNames(search, limit);
cvat.cloudStorages.get.implementation = async (filter) => {
checkFilter(filter, {
page: isInteger,
filter: isString,
sort: isString,
id: isInteger,
search: isString,
});
checkExclusiveFields(filter, ['id', 'search'], ['page']);
const searchParams = {};
for (const key of Object.keys(filter)) {
if (['page', 'filter', 'sort', 'id', 'search'].includes(key)) {
searchParams[key] = filter[key];
}
const cloudStoragesData = await serverProxy.cloudStorages.get(searchParams);
const cloudStorages = cloudStoragesData.map((cloudStorage) => new CloudStorage(cloudStorage));
cloudStorages.count = cloudStoragesData.count;
return cloudStorages;
};
cvat.organizations.get.implementation = async () => {
const organizationsData = await serverProxy.organizations.get();
const organizations = organizationsData.map((organizationData) => new Organization(organizationData));
return organizations;
};
cvat.organizations.activate.implementation = (organization) => {
checkObjectType('organization', organization, null, Organization);
config.organizationID = organization.slug;
};
cvat.organizations.deactivate.implementation = async () => {
config.organizationID = null;
};
cvat.webhooks.get.implementation = async (filter) => {
checkFilter(filter, {
page: isInteger,
id: isInteger,
projectId: isInteger,
filter: isString,
search: isString,
sort: isString,
});
checkExclusiveFields(filter, ['id', 'projectId'], ['page']);
const searchParams = {};
for (const key of Object.keys(filter)) {
if (['page', 'id', 'filter', 'search', 'sort'].includes(key)) {
searchParams[key] = filter[key];
}
}
const cloudStoragesData = await serverProxy.cloudStorages.get(searchParams);
const cloudStorages = cloudStoragesData.map((cloudStorage) => new CloudStorage(cloudStorage));
cloudStorages.count = cloudStoragesData.count;
return cloudStorages;
};
cvat.organizations.get.implementation = async () => {
const organizationsData = await serverProxy.organizations.get();
const organizations = organizationsData.map((organizationData) => new Organization(organizationData));
return organizations;
};
cvat.organizations.activate.implementation = (organization) => {
checkObjectType('organization', organization, null, Organization);
config.organizationID = organization.slug;
};
cvat.organizations.deactivate.implementation = async () => {
config.organizationID = null;
};
cvat.webhooks.get.implementation = async (filter) => {
checkFilter(filter, {
page: isInteger,
id: isInteger,
projectId: isInteger,
filter: isString,
search: isString,
sort: isString,
});
checkExclusiveFields(filter, ['id', 'projectId'], ['page']);
const searchParams = {};
for (const key of Object.keys(filter)) {
if (['page', 'id', 'filter', 'search', 'sort'].includes(key)) {
searchParams[key] = filter[key];
}
}
if (filter.projectId) {
if (searchParams.filter) {
const parsed = JSON.parse(searchParams.filter);
searchParams.filter = JSON.stringify({ and: [parsed, { '==': [{ var: 'project_id' }, filter.projectId] }] });
} else {
searchParams.filter = JSON.stringify({ and: [{ '==': [{ var: 'project_id' }, filter.projectId] }] });
}
if (filter.projectId) {
if (searchParams.filter) {
const parsed = JSON.parse(searchParams.filter);
searchParams.filter = JSON.stringify({ and: [parsed, { '==': [{ var: 'project_id' }, filter.projectId] }] });
} else {
searchParams.filter = JSON.stringify({ and: [{ '==': [{ var: 'project_id' }, filter.projectId] }] });
}
}
const webhooksData = await serverProxy.webhooks.get(searchParams);
const webhooks = webhooksData.map((webhookData) => new Webhook(webhookData));
webhooks.count = webhooksData.count;
return webhooks;
};
return cvat;
}
const webhooksData = await serverProxy.webhooks.get(searchParams);
const webhooks = webhooksData.map((webhookData) => new Webhook(webhookData));
webhooks.count = webhooksData.count;
return webhooks;
};
module.exports = implementAPI;
})();
return cvat;
}

53
cvat-core/src/api.ts
Unescape Escape View File

@ -8,34 +8,36 @@
* @module API
*/
function build() {
const PluginRegistry = require('./plugins').default;
const loggerStorage = require('./logger-storage').default;
const { Log } = require('./log');
const ObjectState = require('./object-state').default;
const Statistics = require('./statistics').default;
const Comment = require('./comment').default;
const Issue = require('./issue').default;
const { Job, Task } = require('./session');
const Project = require('./project').default;
const implementProject = require('./project-implementation').default;
const { Attribute, Label } = require('./labels');
const MLModel = require('./ml-model').default;
const { FrameData } = require('./frames');
const CloudStorage = require('./cloud-storage').default;
const Organization = require('./organization').default;
const Webhook = require('./webhook').default;
import PluginRegistry from './plugins';
import loggerStorage from './logger-storage';
import { Log } from './log';
import ObjectState from './object-state';
import Statistics from './statistics';
import Comment from './comment';
import Issue from './issue';
import { Job, Task } from './session';
import Project from './project';
import implementProject from './project-implementation';
import { Attribute, Label } from './labels';
import MLModel from './ml-model';
import { FrameData } from './frames';
import CloudStorage from './cloud-storage';
import Organization from './organization';
import Webhook from './webhook';
import * as enums from './enums';
const enums = require('./enums');
import {
Exception, ArgumentError, DataError, ScriptingError, PluginError, ServerError,
} from './exceptions';
const {
Exception, ArgumentError, DataError, ScriptingError, PluginError, ServerError,
} = require('./exceptions');
import User from './user';
import pjson from '../package.json';
import config from './config';
const User = require('./user').default;
const pjson = require('../package.json');
const config = require('./config').default;
import implementAPI from './api-implementation';
function build() {
/**
* API entrypoint
* @namespace cvat
@ -925,9 +927,8 @@ function build() {
cvat.cloudStorages = Object.freeze(cvat.cloudStorages);
cvat.organizations = Object.freeze(cvat.organizations);
const implementAPI = require('./api-implementation');
const implemented = Object.freeze(implementAPI(cvat));
return implemented;
}
module.exports = build();
export default build();

1476
cvat-core/src/frames.ts
View File

File diff suppressed because it is too large Load Diff

2
cvat-core/tests/api/annotations.js
Unescape Escape View File

@ -13,7 +13,7 @@ jest.mock('../../src/server-proxy', () => {
});
// Initialize api
window.cvat = require('../../src/api');
window.cvat = require('../../src/api').default;
const serverProxy = require('../../src/server-proxy').default;
// Test cases

2
cvat-core/tests/api/cloud-storages.js
Unescape Escape View File

@ -12,7 +12,7 @@ jest.mock('../../src/server-proxy', () => {
});
// Initialize api
window.cvat = require('../../src/api');
window.cvat = require('../../src/api').default;
const CloudStorage= require('../../src/cloud-storage').default;
const { cloudStoragesDummyData } = require('../mocks/dummy-data.mock');

2
cvat-core/tests/api/frames.js
Unescape Escape View File

@ -12,7 +12,7 @@ jest.mock('../../src/server-proxy', () => {
});
// Initialize api
window.cvat = require('../../src/api');
window.cvat = require('../../src/api').default;
const { FrameData } = require('../../src/frames');

2
cvat-core/tests/api/jobs.js
Unescape Escape View File

@ -12,7 +12,7 @@ jest.mock('../../src/server-proxy', () => {
});
// Initialize api
window.cvat = require('../../src/api');
window.cvat = require('../../src/api').default;
const { Job } = require('../../src/session');

2
cvat-core/tests/api/object-state.js
Unescape Escape View File

@ -12,7 +12,7 @@ jest.mock('../../src/server-proxy', () => {
});
// Initialize api
window.cvat = require('../../src/api');
window.cvat = require('../../src/api').default;
describe('Feature: set attributes for an object state', () => {
test('set a valid value', () => {

2
cvat-core/tests/api/plugins.js
Unescape Escape View File

@ -12,7 +12,7 @@ jest.mock('../../src/server-proxy', () => {
});
// Initialize api
window.cvat = require('../../src/api');
window.cvat = require('../../src/api').default;
describe('Feature: dummy feature', () => {
test('dummy test', async () => {

2
cvat-core/tests/api/projects.js
Unescape Escape View File

@ -12,7 +12,7 @@ jest.mock('../../src/server-proxy', () => {
});
// Initialize api
window.cvat = require('../../src/api');
window.cvat = require('../../src/api').default;
const Project = require('../../src/project').default;

2
cvat-core/tests/api/server.js
Unescape Escape View File

@ -12,7 +12,7 @@ jest.mock('../../src/server-proxy', () => {
});
// Initialize api
window.cvat = require('../../src/api');
window.cvat = require('../../src/api').default;
const { AnnotationFormats, Loader, Dumper } = require('../../src/annotation-formats');
// Test cases

2
cvat-core/tests/api/tasks.js
Unescape Escape View File

@ -12,7 +12,7 @@ jest.mock('../../src/server-proxy', () => {
});
// Initialize api
window.cvat = require('../../src/api');
window.cvat = require('../../src/api').default;
const { Task } = require('../../src/session');

2
cvat-core/tests/api/user.js
Unescape Escape View File

@ -12,7 +12,7 @@ jest.mock('../../src/server-proxy', () => {
});
// Initialize api
window.cvat = require('../../src/api');
window.cvat = require('../../src/api').default;
const User = require('../../src/user').default;

2
cvat-core/tests/api/webhooks.js
Unescape Escape View File

@ -11,7 +11,7 @@ jest.mock('../../src/server-proxy', () => {
});
// Initialize api
window.cvat = require('../../src/api');
window.cvat = require('../../src/api').default;
const Webhook = require('../../src/webhook').default;
const { webhooksDummyData, webhooksEventsDummyData } = require('../mocks/dummy-data.mock');

1
cvat-core/tsconfig.json
Unescape Escape View File

@ -8,6 +8,7 @@
"isolatedModules": true,
"noEmit": true,
"baseUrl": "src",
"resolveJsonModule": true,
},
"include": ["src/*.ts"]
}

Write Preview
Loading…
Cancel
Save