Skip to content

Commit e764c9d

Browse files
PrinsINTPrinsINT
committed
Reactive documents useAxios
1 parent 900403d commit e764c9d

108 files changed

Lines changed: 1217 additions & 1291 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎client/auto-imports.d.ts‎

Lines changed: 226 additions & 0 deletions
Large diffs are not rendered by default.

‎client/biome.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
"formatter": {
2626
"semicolons": "asNeeded",
2727
"arrowParentheses": "asNeeded",
28-
"bracketSameLine": true
28+
"bracketSameLine": true,
29+
"trailingCommas": "none"
2930
}
3031
}
3132
}

‎client/package-lock.json‎

Lines changed: 33 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎client/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
},
1111
"dependencies": {
1212
"@primeuix/themes": "^1.1.1",
13+
"@vueuse/core": "^13.3.0",
1314
"@vueuse/router": "^13.3.0",
1415
"axios": "^1.9.0",
1516
"content-disposition": "^0.5.4",

‎client/src/App.vue‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</template>
1010
</GTabs>
1111

12-
<GModal :show="errors.errors.length > 0" title="Ocharme!" @hide="errors.reset">
12+
<GModal v-if="errors.errors.length > 0" title="Ocharme!" @hide="errors.reset">
1313
<p>
1414
Please try again or contact
1515
<MailAddress /> for support.
@@ -22,11 +22,8 @@
2222
import stores from "@/stores"
2323
2424
const errors = stores.useErrors()
25-
const userStore = stores.useUser()
26-
27-
onMounted(() => {
28-
userStore.fetchUser()
29-
})
25+
// Load user globally to confirm connection
26+
stores.useUser()
3027
</script>
3128

3229
<style lang="scss">

‎client/src/api/corpora.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ import axios, { type AxiosResponse } from "axios"
66
import type {
77
CorpusMetadata,
88
MutableCorpusMetadata,
9-
UUID,
9+
UUID
1010
} from "@/types/corpora"
1111

1212
type CorporaResponse = AxiosResponse<CorpusMetadata[]>
1313
type CorpusResponse = AxiosResponse<CorpusMetadata>
1414

15-
const corporaPath = "/corpora"
15+
export const corporaPath = "/corpora"
1616
const corpusPath = (uuid: UUID): string => `${corporaPath}/${uuid}`
1717

1818
/**
@@ -36,7 +36,7 @@ export function getCorpus(uuid: UUID): Promise<CorpusResponse> {
3636
* @param corpus Metadata of new corpus.
3737
*/
3838
export function postCorpus(
39-
corpus: MutableCorpusMetadata,
39+
corpus: MutableCorpusMetadata
4040
): Promise<AxiosResponse<UUID>> {
4141
return axios.post(corporaPath, corpus)
4242
}
@@ -56,7 +56,7 @@ export function deleteCorpus(uuid: UUID): Promise<AxiosResponse> {
5656
*/
5757
export function patchCorpus(
5858
uuid: UUID,
59-
metadata: MutableCorpusMetadata,
59+
metadata: MutableCorpusMetadata
6060
): Promise<AxiosResponse> {
6161
return axios.patch(corpusPath(uuid), metadata)
6262
}

‎client/src/api/documents.ts‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@ import type { DocumentMetadata } from "@/types/documents"
1010

1111
type DocumentsResponse = AxiosResponse<DocumentMetadata[]>
1212

13-
const documentsPath = (corpus: UUID): string => `/corpora/${corpus}/documents`
13+
export const documentsPath = (corpus: UUID): string =>
14+
`/corpora/${corpus}/documents`
1415
const documentPath = (corpus: UUID, document: string): string =>
1516
`${documentsPath(corpus)}/${document}`
1617
const rawDocumentPath = (corpus: UUID, document: string): string =>
17-
`${documentPath(corpus, document)}/raw`
18+
`${documentPath(corpus, document)}/download`
1819

1920
/**
2021
* Fetch all documents for a corpus.
@@ -33,7 +34,7 @@ export function getDocuments(corpus: UUID): Promise<DocumentsResponse> {
3334
export function postDocument(
3435
corpus: UUID,
3536
document: FormData,
36-
contentType?: Record<string, string>,
37+
contentType?: Record<string, string>
3738
): Promise<AxiosResponse> {
3839
return axios.post(documentsPath(corpus), document, { headers: contentType })
3940
}
@@ -45,7 +46,7 @@ export function postDocument(
4546
*/
4647
export function deleteDocument(
4748
corpus: UUID,
48-
document: string,
49+
document: string
4950
): Promise<AxiosResponse> {
5051
return axios.delete(documentPath(corpus, document))
5152
}
@@ -57,7 +58,7 @@ export function deleteDocument(
5758
*/
5859
export function getRawDocument(
5960
corpus: UUID,
60-
document: string,
61+
document: string
6162
): Promise<BlobResponse> {
6263
return getBlob(rawDocumentPath(corpus, document))
6364
}

‎client/src/api/evaluation.ts‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ import type {
99
ConfusionWrapper,
1010
DistributionWrapper,
1111
Metrics,
12-
TermComparison,
12+
TermComparison
1313
} from "@/types/evaluation"
1414
import type {
1515
DocumentEntities,
1616
JobEntities,
17-
JobsEntities,
17+
JobsEntities
1818
} from "@/types/evaluation/entities"
1919

2020
type ConfusionResponse = AxiosResponse<ConfusionWrapper>
@@ -41,12 +41,12 @@ const downloadPath = (corpus: UUID, hypothesis: string): string =>
4141
const documentLayerComparisonPath = (
4242
corpus: UUID,
4343
job: string,
44-
document: string,
44+
document: string
4545
): string => `/corpora/${corpus}/jobs/${job}/documents/${document}/evaluation`
4646
const documentEntitiesPath = (
4747
corpus: UUID,
4848
job: string,
49-
document: string,
49+
document: string
5050
): string => `/corpora/${corpus}/jobs/${job}/documents/${document}/entities`
5151
const jobEntitiesPath = (corpus: UUID, job: string): string =>
5252
`${evaluationPath(corpus, job)}/entities`
@@ -59,7 +59,7 @@ const jobsEntitiesPath = (corpus: UUID): string =>
5959
*/
6060
export function getDistribution(
6161
corpus: UUID,
62-
hypothesis: string,
62+
hypothesis: string
6363
): Promise<DistributionResponse> {
6464
return axios.get(distributionPath(corpus, hypothesis))
6565
}
@@ -73,10 +73,10 @@ export function getDistribution(
7373
export function getConfusion(
7474
corpus: UUID,
7575
hypothesis: string,
76-
reference: string,
76+
reference: string
7777
): Promise<ConfusionResponse> {
7878
return axios.get(confusionPath(corpus, hypothesis), {
79-
params: { reference },
79+
params: { reference }
8080
})
8181
}
8282

@@ -89,7 +89,7 @@ export function getConfusion(
8989
export function getMetrics(
9090
corpus: UUID,
9191
hypothesis: string,
92-
reference: string,
92+
reference: string
9393
): Promise<MetricsResponse> {
9494
return axios.get(metricsPath(corpus, hypothesis), { params: { reference } })
9595
}
@@ -103,10 +103,10 @@ export function getMetrics(
103103
export function getDownloadEvaluation(
104104
corpus: UUID,
105105
hypothesis: string,
106-
reference: string,
106+
reference: string
107107
): Promise<BlobResponse> {
108108
return getBlob(downloadPath(corpus, hypothesis), {
109-
params: { reference },
109+
params: { reference }
110110
})
111111
}
112112

@@ -124,10 +124,10 @@ export function getConfusionSamples(
124124
reference: string,
125125
hypoFilter: string,
126126
refFilter: string,
127-
annotationType: string,
127+
annotationType: string
128128
): Promise<BlobResponse> {
129129
return getBlob(confusionSamplesPath(corpus, hypothesis), {
130-
params: { reference, hypoFilter, refFilter, annotationType },
130+
params: { reference, hypoFilter, refFilter, annotationType }
131131
})
132132
}
133133

@@ -146,12 +146,12 @@ export function getMetricsSamples(
146146
reference: string,
147147
setting: string,
148148
classType: string,
149-
group?: string,
149+
group?: string
150150
): Promise<BlobResponse> {
151151
const params: Record<string, string> = {
152152
reference,
153153
metricsType: setting,
154-
class: classType,
154+
class: classType
155155
}
156156
if (group) {
157157
params.group = group
@@ -171,24 +171,24 @@ export function getDocumentLayerComparison(
171171
corpus: UUID,
172172
job: string,
173173
document: string,
174-
reference: string,
174+
reference: string
175175
): Promise<AxiosResponse<TermComparison[]>> {
176176
return axios.get(documentLayerComparisonPath(corpus, job, document), {
177-
params: { reference },
177+
params: { reference }
178178
})
179179
}
180180

181181
export function getDocumentEntities(
182182
corpus: UUID,
183183
job: string,
184-
document: string,
184+
document: string
185185
): Promise<DocumentEntitiesResponse> {
186186
return axios.get(documentEntitiesPath(corpus, job, document))
187187
}
188188

189189
export function getJobEntities(
190190
corpus: UUID,
191-
job: string,
191+
job: string
192192
): Promise<JobEntitiesResponse> {
193193
return axios.get(jobEntitiesPath(corpus, job))
194194
}

‎client/src/api/export.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ const convertCorpusPath = (
1111
corpus: UUID,
1212
job: string,
1313
format: Format,
14-
posHeadOnly: boolean,
14+
posHeadOnly: boolean
1515
): string =>
1616
`/corpora/${corpus}/jobs/${job}/export/convert?format=${format}&posHeadOnly=${posHeadOnly}`
1717
const mergeCorpusPath = (
1818
corpus: UUID,
1919
job: string,
2020
format: Format,
21-
posHeadOnly: boolean,
21+
posHeadOnly: boolean
2222
): string =>
2323
`/corpora/${corpus}/jobs/${job}/export/merge?format=${format}&posHeadOnly=${posHeadOnly}`
2424

@@ -33,7 +33,7 @@ export function convertCorpus(
3333
corpus: UUID,
3434
job: string,
3535
format: Format,
36-
posHeadOnly: boolean,
36+
posHeadOnly: boolean
3737
): Promise<BlobResponse> {
3838
return getBlob(convertCorpusPath(corpus, job, format, posHeadOnly))
3939
}
@@ -49,7 +49,7 @@ export function mergeCorpus(
4949
corpus: UUID,
5050
job: string,
5151
format: Format,
52-
posHeadOnly: boolean,
52+
posHeadOnly: boolean
5353
): Promise<BlobResponse> {
5454
return getBlob(mergeCorpusPath(corpus, job, format, posHeadOnly))
5555
}

‎client/src/api/jobs.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ export function postJob(corpus: UUID, job: string): Promise<ProgressResponse> {
5353
export function cancelOrDeleteJob(
5454
corpus: UUID,
5555
job: string,
56-
hard: boolean,
56+
hard: boolean
5757
): Promise<ProgressResponse> {
5858
return axios.delete(jobPath(corpus, job), { params: { hard: hard } })
5959
}
@@ -63,7 +63,7 @@ export function cancelOrDeleteJob(
6363
*/
6464
export function getJobIsBusy(
6565
corpus: UUID,
66-
job: string,
66+
job: string
6767
): Promise<AxiosResponse<boolean>> {
6868
return axios.get(jobIsBusyPath(corpus, job))
6969
}
@@ -73,7 +73,7 @@ export function getJobIsBusy(
7373
*/
7474
export function getJobProgress(
7575
corpus: UUID,
76-
job: string,
76+
job: string
7777
): Promise<ProgressResponse> {
7878
return axios.get(jobProgressPath(corpus, job))
7979
}

0 commit comments

Comments
 (0)
⚡