-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Make one check-status call for all corpora
- Loading branch information
Showing
6 changed files
with
129 additions
and
90 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,101 +1,48 @@ | ||
| import { useRouter } from "vue-router"; | ||
| import { useAuth } from "@/auth/auth.composable"; | ||
| import { emptyConfig } from "@/api/corpusConfig"; | ||
| import useConfig from "@/corpus/config/config.composable"; | ||
| import useSources from "@/corpus/sources/sources.composable"; | ||
| import useMessenger from "@/message/messenger.composable"; | ||
| import useMinkBackend from "@/api/backend.composable"; | ||
| import useCorpus from "@/corpus/corpus.composable"; | ||
| import { useCorpusStore } from "@/store/corpus.store"; | ||
| import useMessenger from "@/message/messenger.composable"; | ||
|
|
||
| /** Let corpus list be refreshed initially, but skip subsequent load calls. */ | ||
| let isCorporaFresh = false; | ||
|
|
||
| /** Use this module-scope variable for the request, so that simultaneous calls don't procude multiple requests. */ | ||
| let loadPromise = null; | ||
|
|
||
| export default function useCorpora() { | ||
| const corpusStore = useCorpusStore(); | ||
| const router = useRouter(); | ||
| const { refreshJwt } = useAuth(); | ||
| const { deleteCorpus } = useCorpus(); | ||
| const { uploadConfig } = useConfig(); | ||
| const { uploadSources } = useSources(); | ||
| const { alert, alertError } = useMessenger(); | ||
| const { alertError } = useMessenger(); | ||
| const mink = useMinkBackend(); | ||
|
|
||
| async function loadCorpora(force = false) { | ||
| if (isCorporaFresh && !force) return; | ||
| const corpora = await mink.loadCorpora().catch(alertError); | ||
| corpusStore.setCorpusIds(corpora); | ||
| isCorporaFresh = true; | ||
| } | ||
|
|
||
| async function createCorpus() { | ||
| const corpusId = await mink.createCorpus().catch(alertError); | ||
| // Have the new corpus included in further API calls. | ||
| await refreshJwt(); | ||
| // Adding the new id to store may trigger API calls, so do it after updating the JWT. | ||
| corpusStore.corpora[corpusId] = corpusStore.corpora[corpusId] || {}; | ||
| return corpusId; | ||
| } | ||
|
|
||
| async function createFromUpload(files) { | ||
| const corpusId = await createCorpus().catch(alertError); | ||
| if (!corpusId) return; | ||
|
|
||
| const results = await Promise.allSettled([ | ||
| uploadSources(files, corpusId), | ||
| uploadConfig(emptyConfig(), corpusId), | ||
| ]); | ||
|
|
||
| const rejectedResults = results.filter( | ||
| (result) => result.status != "fulfilled" | ||
| ); | ||
| if (rejectedResults.length) { | ||
| // Display error message(s). | ||
| rejectedResults.forEach((result) => alertError(result.reason)); | ||
| // Discard the empty corpus. | ||
| await deleteCorpus(corpusId).catch(alertError); | ||
| return; | ||
| // Store the pending request in module scope, so simultaneous calls will await the same promise. | ||
| if (!loadPromise) { | ||
| const loadCorporaPromise = mink | ||
| .loadCorpora() | ||
| .catch(alertError) | ||
| .then((corpora) => corpusStore.setCorpusIds(corpora)); | ||
|
|
||
| const loadJobsPromise = mink | ||
| .loadJobs() | ||
| .catch(alertError) | ||
| .then((jobs) => | ||
| jobs.forEach((job) => { | ||
| corpusStore.corpora[job.corpus_id].status = job; | ||
| corpusStore.corpora[job.corpus_id].sources = job.available_files; | ||
| }) | ||
| ); | ||
|
|
||
| loadPromise = Promise.all([loadCorporaPromise, loadJobsPromise]); | ||
| } | ||
|
|
||
| router.push(`/corpus/${corpusId}`); | ||
| } | ||
|
|
||
| async function createFromConfig(name, description, format, textAnnotation) { | ||
| const config = { | ||
| name: { swe: name, eng: name }, | ||
| description: { swe: description, eng: description }, | ||
| format, | ||
| textAnnotation, | ||
| }; | ||
| await loadPromise; | ||
|
|
||
| // Create an empty corpus. If it fails, abort. | ||
| let corpusId; | ||
| try { | ||
| corpusId = await createCorpus().catch(alertError); | ||
| } catch (e) { | ||
| alertError(e); | ||
| return; | ||
| } | ||
|
|
||
| // Upload the basic config. | ||
| try { | ||
| await uploadConfig(config, corpusId); | ||
| // Show the created corpus. | ||
| router.push(`/corpus/${corpusId}`); | ||
| return corpusId; | ||
| } catch (e) { | ||
| // If creating the config fails, there's a TypeError. | ||
| if (e.name == "TypeError") alert(e.message, "error"); | ||
| // Otherwise it's probably a backend error when saving. | ||
| else alertError(e); | ||
| // Discard the empty corpus. | ||
| await deleteCorpus(corpusId).catch(alertError); | ||
| } | ||
| loadPromise = null; | ||
| isCorporaFresh = true; | ||
| } | ||
|
|
||
| return { | ||
| loadCorpora, | ||
| createFromUpload, | ||
| createFromConfig, | ||
| }; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| import { useRouter } from "vue-router"; | ||
| import { useAuth } from "@/auth/auth.composable"; | ||
| import useMinkBackend from "@/api/backend.composable"; | ||
| import { emptyConfig } from "@/api/corpusConfig"; | ||
| import { useCorpusStore } from "@/store/corpus.store"; | ||
| import useMessenger from "@/message/messenger.composable"; | ||
| import useConfig from "./config/config.composable"; | ||
| import useSources from "./sources/sources.composable"; | ||
| import useCorpus from "./corpus.composable"; | ||
|
|
||
| export default function useCorpora() { | ||
| const corpusStore = useCorpusStore(); | ||
| const router = useRouter(); | ||
| const { refreshJwt } = useAuth(); | ||
| const { deleteCorpus } = useCorpus(); | ||
| const { uploadConfig } = useConfig(); | ||
| const { uploadSources } = useSources(); | ||
| const { alert, alertError } = useMessenger(); | ||
| const mink = useMinkBackend(); | ||
|
|
||
| async function createCorpus() { | ||
| const corpusId = await mink.createCorpus().catch(alertError); | ||
| // Have the new corpus included in further API calls. | ||
| await refreshJwt(); | ||
| // Adding the new id to store may trigger API calls, so do it after updating the JWT. | ||
| corpusStore.corpora[corpusId] = corpusStore.corpora[corpusId] || {}; | ||
| return corpusId; | ||
| } | ||
|
|
||
| async function createFromUpload(files) { | ||
| const corpusId = await createCorpus().catch(alertError); | ||
| if (!corpusId) return; | ||
|
|
||
| const results = await Promise.allSettled([ | ||
| uploadSources(files, corpusId), | ||
| uploadConfig(emptyConfig(), corpusId), | ||
| ]); | ||
|
|
||
| const rejectedResults = results.filter( | ||
| (result) => result.status != "fulfilled" | ||
| ); | ||
| if (rejectedResults.length) { | ||
| // Display error message(s). | ||
| rejectedResults.forEach((result) => alertError(result.reason)); | ||
| // Discard the empty corpus. | ||
| await deleteCorpus(corpusId).catch(alertError); | ||
| return; | ||
| } | ||
|
|
||
| router.push(`/corpus/${corpusId}`); | ||
| } | ||
|
|
||
| async function createFromConfig(name, description, format, textAnnotation) { | ||
| const config = { | ||
| name: { swe: name, eng: name }, | ||
| description: { swe: description, eng: description }, | ||
| format, | ||
| textAnnotation, | ||
| }; | ||
|
|
||
| // Create an empty corpus. If it fails, abort. | ||
| let corpusId; | ||
| try { | ||
| corpusId = await createCorpus().catch(alertError); | ||
| } catch (e) { | ||
| alertError(e); | ||
| return; | ||
| } | ||
|
|
||
| // Upload the basic config. | ||
| try { | ||
| await uploadConfig(config, corpusId); | ||
| // Show the created corpus. | ||
| router.push(`/corpus/${corpusId}`); | ||
| return corpusId; | ||
| } catch (e) { | ||
| // If creating the config fails, there's a TypeError. | ||
| if (e.name == "TypeError") alert(e.message, "error"); | ||
| // Otherwise it's probably a backend error when saving. | ||
| else alertError(e); | ||
| // Discard the empty corpus. | ||
| await deleteCorpus(corpusId).catch(alertError); | ||
| } | ||
| } | ||
|
|
||
| return { | ||
| createFromUpload, | ||
| createFromConfig, | ||
| }; | ||
| } |