Skip to content

batches author lookups in imports #3126

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

Draft
gabestein wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

batches author lookups in imports #3126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ff2e3c
batches author lookups in imports
gabestein Jul 11, 2024
80face9
batch at 2 and up queue time to 5 mins
gabestein Jul 12, 2024
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
2 changes: 1 addition & 1 deletion workers/queue.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { WorkerTask } from 'server/models';
import { expect } from 'utils/assert';
import { createCachePurgeDebouncer } from 'utils/caching/createCachePurgeDebouncer';

const maxWorkerTimeSeconds = 120;
const maxWorkerTimeSeconds = 300;
const maxWorkerThreads = 5;
let currentWorkerThreads = 0;

Expand Down
22 changes: 14 additions & 8 deletions workers/tasks/import/metadata.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { metaValueToString, metaValueToJsonSerializable } from '@pubpub/prosemir

import { getSearchUsers } from 'server/search/queries';
import { isValidDate } from 'utils/dates';
import { asyncMap } from 'utils/async';
import { Falsy } from 'types';

const getAuthorsArray = (author) => {
Expand All @@ -23,18 +24,23 @@ const getDateStringFromMetaValue = (metaDateString) => {
return null;
};

const getAuthorEntries = async (authorEntry) => {
if (typeof authorEntry === 'string') {
const users = await getSearchUsers(authorEntry);
return { name: authorEntry, users: users.map((user) => user.toJSON()) };
}
return authorEntry;
};
const getAttributions = async (author) => {
if (author) {
const authorsArray = getAuthorsArray(author);
const authorEntries = authorsArray.map(metaValueToJsonSerializable) as any[];
const attributions = await Promise.all(
authorEntries.map(async (authorEntry: string) => {
if (typeof authorEntry === 'string') {
const users = await getSearchUsers(authorEntry);
return { name: authorEntry, users: users.map((user) => user.toJSON()) };
}
return authorEntry;
}),
const attributions = await asyncMap(
authorEntries,
(authorEntry) => getAuthorEntries(authorEntry),
{
concurrency: 2,
},
);
return attributions;
}
Expand Down