Skip to content

Commit

Permalink
Merge branch 'master' into minimize-dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@heinpa
heinpa committed Oct 17, 2023
2 parents bb5342a + 3fcc01e commit d348c7d
Show file tree
Hide file tree
Showing 17 changed files with 939 additions and 721 deletions.
810 changes: 443 additions & 367 deletions qanary-configuration-frontend/package-lock.json
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions qanary-configuration-frontend/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"version": "1.0.3",
"private": true,
"dependencies": {
"@babel/core": "7.20.12",
"@testing-library/jest-dom": "^5.16.5",
"@babel/core": "7.22.20",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^12.1.2",
"@testing-library/user-event": "^7.2.1",
"react": "^16.13.1",
Expand Down Expand Up @@ -34,7 +34,7 @@
]
},
"devDependencies": {
"@babel/core": "7.20.12",
"@babel/core": "7.22.20",
"axios": "^0.21.2"
}
}
10 changes: 5 additions & 5 deletions qanary_commons/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>eu.wdaqua.qanary</groupId>
<artifactId>qa.commons</artifactId>
<version>3.8.5</version>
<version>3.8.7</version>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
Expand All @@ -12,7 +12,7 @@

<properties>
<java.version>11</java.version>
<spring-boot-admin.version>2.7.10</spring-boot-admin.version>
<spring-boot-admin.version>2.7.11</spring-boot-admin.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<jena.version>4.9.0</jena.version>
Expand Down Expand Up @@ -227,7 +227,7 @@
<dependency>
<groupId>com.openlinksw</groupId>
<artifactId>virtjdbc4_3</artifactId>
<version>3.122</version>
<version>3.123</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
<dependency>
Expand All @@ -250,12 +250,12 @@
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>4.0.2</version>
<version>4.0.3</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>4.0.0</version>
<version>4.0.1</version>
</dependency>
<!-- https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api -->
<dependency>
Expand Down
28 changes: 14 additions & 14 deletions qanary_commons/src/main/resources/queries/select_all_AnnotationOfAnswerJson.rq
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>

SELECT * WHERE {
GRAPH ?graph {
?annotationAnswer
a qa:AnnotationOfAnswerJson ;
oa:hasTarget ?question ;
oa:hasBody ?answer ;
oa:annotatedBy ?service ;
oa:annotatedAt ?time ;
qa:score ?score .
?answer
a qa:AnswerJson ;
rdf:value ?answerJson .
}
}
SELECT *
FROM ?graphURI
WHERE {
?annotationAnswer
a qa:AnnotationOfAnswerJson ;
oa:hasTarget ?hasTarget ;
oa:hasBody ?hasBody ;
oa:annotatedBy ?annotatedBy ;
oa:annotatedAt ?annotatedAt ;
qa:score ?score .
?hasBody
a qa:AnswerJson ;
rdf:value ?value .
}
19 changes: 10 additions & 9 deletions qanary_commons/src/main/resources/queries/select_all_AnnotationOfAnswerSPARQL.rq
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@ PREFIX qa: <http://www.wdaqua.eu/qa#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>

SELECT *
SELECT *
FROM ?graph
WHERE {
GRAPH ?graph {
?newAnnotation rdf:type qa:AnnotationOfAnswerSPARQL .
?newAnnotation oa:hasTarget ?targetQuestion .
?newAnnotation oa:hasBody ?selectQueryThatShouldComputeTheAnswer .
?newAnnotation qa:score ?confidence .
?newAnnotation oa:annotatedAt ?time .
?newAnnotation oa:annotatedBy ?application .
}
?annotationId rdf:type qa:AnnotationOfAnswerSPARQL .
?annotationId oa:hasTarget ?hasTarget ;
oa:hasBody ?hasBody .
OPTIONAL {
?annotationnId qa:score ?score ;
}
?annotationId oa:annotatedAt ?annotatedAt ;
oa:annotatedBy ?annotatedBy .
}
16 changes: 16 additions & 0 deletions qanary_commons/src/main/resources/queries/select_all_AnnotationOfClass.rq
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
PREFIX qa: <http://www.wdaqua.eu/qa#>
PREFIX oa: <http://www.w3.org/ns/openannotation/core/>
PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>

SELECT *
FROM ?graph
WHERE {
?annotationId a qa:AnnotationOfClass .
?annotationId oa:hasTarget [
a oa:SpecificClass ;
oa:hasSource ?hasSource ;
] .
?annotationId oa:hasBody ?hasBody ;
oa:annotatedBy ?annotatedBy ;
oa:annotatedAt ?annotatedAt .
}
24 changes: 24 additions & 0 deletions qanary_commons/src/main/resources/queries/select_all_AnnotationOfInstance.rq
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX oa: <http://www.w3.org/ns/openannotation/core/>
PREFIX qa: <http://www.wdaqua.eu/qa#>

SELECT *
FROM ?graph
WHERE {
?annotationId rdf:type qa:AnnotationOfInstance .
?annotationId oa:hasTarget [
a oa:SpecificResource;
oa:hasSource ?hasSource;
oa:hasSelector [
a oa:TextPositionSelector;
oa:start ?start;
oa:end ?end
]
].
?annotationId oa:hasBody ?hasBody ;
oa:annotatedBy ?annotatedBy ;
oa:annotatedAt ?annotatedAt .
OPTIONAL {
?annotationId qa:score ?score .
}
}
13 changes: 13 additions & 0 deletions qanary_commons/src/main/resources/queries/select_all_AnnotationOfQuestionLanguage.rq
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
PREFIX qa: <http://www.wdaqua.eu/qa#>
PREFIX oa: <http://www.w3.org/ns/openannotation/core/>
PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>

SELECT *
FROM ?graph
WHERE {
?annotationId a qa:AnnotationOfQuestionLanguage .
?annotationId oa:hasTarget ?hasTarget ;
oa:hasBody ?hasBody ;
oa:annotatedBy ?annotatedBy ;
oa:annotatedAt ?annotatedAt .
}
13 changes: 8 additions & 5 deletions qanary_commons/src/main/resources/queries/select_all_AnnotationOfQuestionTranslation.rq
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
PREFIX qa: <http://www.wdaqua.eu/qa#>
PREFIX oa: <http://www.w3.org/ns/openannotation/core/>

SELECT ?a ?translation ?time
SELECT *
FROM ?graph
WHERE {
?a a qa:AnnotationOfQuestionTranslation .
?a oa:hasTarget ?targetQuestion .
?a oa:hasBody ?translation .
FILTER (lang(?translation) = ?language).
?annotationId a qa:AnnotationOfQuestionTranslation .
?annotationId oa:hasTarget ?hasTarget ;
oa:hasBody ?hasBody ;
oa:annotatedBy ?annotatedBy ;
oa:annotatedAt ?annotatedAt .
FILTER (lang(?hasBody) = ?language).
}

29 changes: 29 additions & 0 deletions qanary_commons/src/main/resources/queries/select_all_AnnotationOfRelation.rq
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@


PREFIX qa: <http://www.wdaqua.eu/qa#>
PREFIX oa: <http://www.w3.org/ns/openannotation/core/>

SELECT *
FROM ?graph
WHERE {
?annotationId a qa:AnnotationOfRelation .
?annotationId oa:hasTarget [
a oa:SpecificResource;
oa:hasSource ?hasSource
] .
OPTIONAL {
?annotationId oa:hasTarget [
oa:hasSelector [
a oa:TextPositionSelector ;
oa:start ?start ;
oa:end ?end
]
] .
}
OPTIONAL {
?annotationId qa:score ?score .
}
?annotationId oa:hasBody ?hasBody ;
oa:annotatedBy ?annotatedBy ;
oa:annotatedAt ?annotatedAt .
}
20 changes: 20 additions & 0 deletions qanary_commons/src/main/resources/queries/select_all_AnnotationOfSpotInstance.rq
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX oa: <http://www.w3.org/ns/openannotation/core/>
PREFIX qa: <http://www.wdaqua.eu/qa#>

SELECT *
FROM ?graph
WHERE {
?annotationId rdf:type qa:AnnotationOfSpotInstance.
?annotationId oa:hasTarget [
a oa:SpecificResource;
oa:hasSource ?hasSource;
oa:hasSelector [
a oa:TextPositionSelector;
oa:start ?start;
oa:end ?end
]
].
?annotationId oa:annotatedAt ?annotatedAt ;
oa:annotatedBy ?annotatedBy .
}
19 changes: 19 additions & 0 deletions qanary_commons/src/main/resources/queries/select_all_AnnotationOfTextAnswerJson.rq
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
PREFIX qa: <http://www.wdaqua.eu/qa#>
PREFIX oa: <http://www.w3.org/ns/openannotation/core/>
PREFIX dbr: <http://dbpedia.org/resource/>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>

SELECT *
FROM ?graph
WHERE {
?annotationId rdf:type qa:AnnotationOfTextAnswerJson .
?annotationId oa:hasTarget ?hasTarget
?annotationId oa:hasBody ?hasBody .
?annotationId oa:annotatedAt ?annotatedAt .
?annotationId oa:annotatedBy ?annotatedBy .
?hasBody rdf:type qa:AnswerJson .
?hasBody rdf:value ?value .
qa:AnswerJson rdfs:subClassOf qa:Answer .
}
3 changes: 1 addition & 2 deletions qanary_commons/src/main/resources/queries/select_highestScore_AnnotationOfAnswerSPARQL.rq
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>

SELECT *
FROM ?graph
WHERE {
GRAPH ?graph {
?newAnnotation rdf:type qa:AnnotationOfAnswerSPARQL .
?newAnnotation oa:hasTarget ?targetQuestion .
?newAnnotation oa:hasBody ?selectQueryThatShouldComputeTheAnswer .
Expand All @@ -25,6 +25,5 @@ WHERE {

?newAnnotation oa:annotatedBy ?application .
}
}
ORDER BY DESC(?confidence)
LIMIT 1
6 changes: 3 additions & 3 deletions qanary_component-parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-parent -->
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.7</version>
<version>2.7.11</version>
<relativePath/>
</parent>
<properties>
<java.version>17</java.version>
<qanary.version>[3.7.0,4.0.0)</qanary.version>
<spring-boot-admin.version>2.6.7</spring-boot-admin.version>
<qanary.version>[3.7.1,4.0.0)</qanary.version>
<spring-boot-admin.version>2.7.11</spring-boot-admin.version>
<junit-jupiter.version>5.8.2</junit-jupiter.version>
<json-path.version>2.4.0</json-path.version>
</properties>
Expand Down
4 changes: 2 additions & 2 deletions qanary_component-template/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>eu.wdaqua.qanary</groupId>
<artifactId>qa.component</artifactId>
<version>3.7.1</version>
<version>3.7.2</version>

<parent>
<groupId>org.springframework.boot</groupId>
Expand All @@ -14,7 +14,7 @@
</parent>
<properties>
<java.version>11</java.version>
<spring-boot-admin.version>2.7.10</spring-boot-admin.version>
<spring-boot-admin.version>2.7.11</spring-boot-admin.version>
</properties>

<dependencies>
Expand Down
Loading

0 comments on commit d348c7d

Please sign in to comment.