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.

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

Documentation etc. for release 2.2.0 #409

Merged
merged 5 commits into from
May 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
37 changes: 37 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,43 @@ docker compose run --rm -it pgbackups /backup.sh

(or `docker-compose` if your version of Docker does not support compose v2).

## [2.2.0] 2024-05-08

### Changed
- **Breaking change**: When exporting annotations as JSON, the "features" that the annotator entered are no longer nested under `label` ([#347](https://github.com/GateNLP/gate-teamware/issues/347)). Where previously the export would have been
```json
{
"features": {
"label": {
"field1": "value1"
}
}
}
```

it is now
```json
{
"features": {
"field1": "value1"
}
}
```
- Include details of failed annotations in export formats ([#399](https://github.com/GateNLP/gate-teamware/pull/399))
- When exporting annotation data from projects (both via the web UI and using the command line tool),
each document includes details of which users _rejected_, _timed out_ or _aborted_ annotation of
that document, as well as the annotation data from the users who completed the document successfully.
This can be useful for the project manager to identify documents that are particularly difficult
to annotate, perhaps suggesting that the annotation guidelines need to be extended or clarified.

### Fixed
- Upgraded a number of third-party dependencies to close various vulnerabilities ([#397](https://github.com/GateNLP/gate-teamware/pull/397))
- Fixed several issues relating to the export of annotated data ([#377](https://github.com/GateNLP/gate-teamware/pull/377))
- "Anonymous" export was not properly anonymous ([#345](https://github.com/GateNLP/gate-teamware/issues/345))
- Teamware now does a better job of preserving the GATE BDOC JSON structure when exporting documents that were originally uploaded in that format ([#346](https://github.com/GateNLP/gate-teamware/issues/346), [#348](https://github.com/GateNLP/gate-teamware/issues/348))
- Added an explicit setting for "no email security", as an alternative to the implicit setting when the relevant environment variable is omitted. This is because the implicit setting was lost on upgrades, whereas an explicit "none" will be preserved ([#402](https://github.com/GateNLP/gate-teamware/pull/402))


## [2.1.1] 2023-10-02

### Added
Expand Down
26 changes: 14 additions & 12 deletions CITATION.cff
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
abstract: A web application for collaborative document annotation. GATE teamware provides
a flexible web app platform for managing classification of documents by human annotators.
authors:
authors:
- affiliation: The University of Sheffield
email: [email protected]
family-names: Karmakharm
Expand Down Expand Up @@ -33,13 +33,7 @@ keywords:
- document annotation
license: AGPL-3.0
message: If you use this software, please cite it using the metadata from this file.
repository-code: https://github.com/GateNLP/gate-teamware
title: GATE Teamware
type: software
url: https://gatenlp.github.io/gate-teamware/
version: 2.1.1
preferred-citation:
type: conference-paper
authors:
- affiliation: The University of Sheffield
email: [email protected]
Expand All @@ -66,14 +60,22 @@ preferred-citation:
family-names: Bontcheva
given-names: Kalina
orcid: https://orcid.org/0000-0001-6152-9600
collection-title: 'Proceedings of the 17th Conference of the European Chapter of
the Association for Computational Linguistics: System Demonstrations'
doi: 10.18653/v1/2023.eacl-demo.17
title: "GATE Teamware 2: An open-source tool for collaborative document classification annotation"
collection-title: "Proceedings of the 17th Conference of the European Chapter of the Association for Computational Linguistics: System Demonstrations"
end: 151
location:
name: Dubrovnik, Croatia
year: 2023
month: 5
start: 145
end: 151
publisher:
name: Association for Computational Linguistics
start: 145
title: 'GATE Teamware 2: An open-source tool for collaborative document classification
annotation'
type: conference-paper
year: 2023
repository-code: https://github.com/GateNLP/gate-teamware
title: GATE Teamware
type: software
url: https://gatenlp.github.io/gate-teamware/
version: 2.2.0
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.1
2.2.0
8 changes: 8 additions & 0 deletions docs/docs/.vuepress/versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@
"text": "2.1.0",
"value": "/gate-teamware/2.1.0/"
},
{
"text": "2.1.1",
"value": "/gate-teamware/2.1.1/"
},
{
"text": "2.2.0",
"value": "/gate-teamware/2.2.0/"
},
{
"text": "development",
"value": "/gate-teamware/development/"
Expand Down
6 changes: 5 additions & 1 deletion docs/docs/developerguide/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,13 @@ to the list of environment variables:
```bash
DJANGO_EMAIL_BACKEND='django.core.mail.backends.smtp.EmailBackend'
DJANGO_EMAIL_HOST='myserver.com'
DJANGO_EMAIL_PORT=22
DJANGO_EMAIL_PORT=25
DJANGO_EMAIL_HOST_USER='username'
DJANGO_EMAIL_HOST_PASSWORD='password'
DJANGO_EMAIL_SECURITY=tls
# tls = STARTTLS, typically on port 25 or 587
# ssl = TLS-on-connect, typically on port 465
# none (or omitted) = no encryption
```

#### E-mail using Google API
Expand Down
2 changes: 1 addition & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gate-teamware-docs",
"version": "2.1.1",
"version": "2.2.0",
"description": "Documentation for GATE Teamware.",
"main": "index.js",
"scripts": {
Expand Down
8 changes: 8 additions & 0 deletions docs/versioned/0.3.0/.vuepress/versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@
"text": "2.1.0",
"value": "/gate-teamware/2.1.0/"
},
{
"text": "2.1.1",
"value": "/gate-teamware/2.1.1/"
},
{
"text": "2.2.0",
"value": "/gate-teamware/2.2.0/"
},
{
"text": "development",
"value": "/gate-teamware/development/"
Expand Down
8 changes: 8 additions & 0 deletions docs/versioned/0.4.0/.vuepress/versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@
"text": "2.1.0",
"value": "/gate-teamware/2.1.0/"
},
{
"text": "2.1.1",
"value": "/gate-teamware/2.1.1/"
},
{
"text": "2.2.0",
"value": "/gate-teamware/2.2.0/"
},
{
"text": "development",
"value": "/gate-teamware/development/"
Expand Down
8 changes: 8 additions & 0 deletions docs/versioned/2.0.0/.vuepress/versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@
"text": "2.1.0",
"value": "/gate-teamware/2.1.0/"
},
{
"text": "2.1.1",
"value": "/gate-teamware/2.1.1/"
},
{
"text": "2.2.0",
"value": "/gate-teamware/2.2.0/"
},
{
"text": "development",
"value": "/gate-teamware/development/"
Expand Down
8 changes: 8 additions & 0 deletions docs/versioned/2.1.0/.vuepress/versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@
"text": "2.1.0",
"value": "/gate-teamware/2.1.0/"
},
{
"text": "2.1.1",
"value": "/gate-teamware/2.1.1/"
},
{
"text": "2.2.0",
"value": "/gate-teamware/2.2.0/"
},
{
"text": "development",
"value": "/gate-teamware/development/"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
<template>
<div>
<b-tabs>
<b-tab title="Code">

<slot></slot>

</b-tab>
<b-tab title="Preview">
<p v-if="documents.length > 1">Document {{documentIndex + 1}} of {{documents.length}}</p>
<b-card class="mb-2 mt-2">
<AnnotationRenderer ref="annotationRenderer"
:config="config"
:document="currentDocument" :allow_document_reject="true"
v-model="annotationOutput"
:doc_preannotation_field="preAnnotation"
@submit="nextDocument()"
@reject="nextDocument()"
></AnnotationRenderer>
</b-card>
<b-card class="mb-2 mt-2">
<p><strong>Annotation output:</strong></p>
{{annotationOutput}}
</b-card>
</b-tab>

</b-tabs>
</div>

</template>

<script>
import AnnotationRenderer from '@/components/AnnotationRenderer';

export default {
name: "AnnotationRendererPreview",
components: {
AnnotationRenderer
},
data(){
return {
annotationOutput: {},
documentIndex: 0
}

},
computed: {
documents() {
if(Array.isArray(this.document)) {
return this.document
} else {
return [this.document]
}
},
currentDocument() {
return this.documents[this.documentIndex]
}
},
props: {
preAnnotation: {
default(){
return ""
}
},
document: {
default(){
return {text: "Sometext with <strong>html</strong>"}
}
},
config: {
default() {
return [
{
"name": "htmldisplay",
"type": "html",
"text": "{{{text}}}"
},
{
"name": "sentiment",
"type": "radio",
"title": "Sentiment",
"description": "Please select a sentiment of the text above.",
"options": {
"negative": "Negative",
"neutral": "Neutral",
"positive": "Positive"

}
}
]
}
},
},
methods: {
nextDocument() {
this.documentIndex = (this.documentIndex + 1) % this.documents.length;
this.$refs.annotationRenderer.clearForm()
}
}
}
</script>

<style>
legend {
font-weight: bold;
}
</style>
21 changes: 21 additions & 0 deletions docs/versioned/2.1.1/.vuepress/components/DisplayVersion.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<template>
<span>{{version_name}}</span>
</template>

<script>
import versionData from "../versions.json"
export default {
name: "DisplayVersion",
computed: {
version_name(){
return versionData.current
}
}


}
</script>

<style scoped>

</style>
42 changes: 42 additions & 0 deletions docs/versioned/2.1.1/.vuepress/config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
const versionData = require("./versions.json")
const path = require("path");
module.exports = context => ({
title: 'GATE Teamware Documentation',
description: 'Documentation for GATE Teamware',
base: versionData.base,
themeConfig: {
nav: [
{text: 'Home', link: '/'},
{text: 'Annotators', link: '/annotatorguide/'},
{text: 'Managers & Admins', link: '/manageradminguide/'},
{text: 'Developer', link: '/developerguide/'}
],
sidebar: {
'/manageradminguide/': [
"",
"project_management",
"project_config",
"documents_annotations_management",
"annotators_management"
],
'/developerguide/': [
'',
'frontend',
'testing',
'releases',
'documentation',
"api_docs",

],
},
},
configureWebpack: {
resolve: {
alias: {
'@': path.resolve(__dirname, versionData.frontendSource)
}
}
},


})
17 changes: 17 additions & 0 deletions docs/versioned/2.1.1/.vuepress/enhanceApp.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import Vue from 'vue'
import {BootstrapVue, BootstrapVueIcons, IconsPlugin} from 'bootstrap-vue'

import 'bootstrap/dist/css/bootstrap.css'
import 'bootstrap-vue/dist/bootstrap-vue.css'

Vue.use(BootstrapVue)
Vue.use(BootstrapVueIcons)

export default ({
Vue, // the version of Vue being used in the VuePress app
options, // the options for the root Vue instance
router, // the router instance for the app
siteData // site metadata
}) => {

}
Loading
Loading