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

Dbpedia spotlight annotation #337

Open
wants to merge 139 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
139 commits
Select commit Hold shift + click to select a range
8635503
feat(search history): implementation of DBpedia Spotlight
Apr 21, 2022
0a8cac2
fix(search history): fix DBpedia Spotlight code for lint
Apr 25, 2022
17bee07
fix(search history): fix DBpedia Spotlight code for lint
Apr 27, 2022
9e76d47
fix(search history): fix DBpedia Spotlight code for lint
Apr 28, 2022
e412f5f
fix(search history): additional small fix of DBpedia Spotlight code f…
Apr 28, 2022
47de2b6
fix(search history): remove lombok annotations from DBpedia Spotlight…
Apr 28, 2022
26fa3c5
fix(search history): spotbugs errors fix of DBpedia Spotlight code
Apr 29, 2022
5365525
fix(dbpedia spotlight): add number of occurrences per URI
May 18, 2022
4a99e8c
fix(dbpedia spotlight): clean code
May 19, 2022
c9d5481
Merge branch 'master' of https://git.l3s.uni-hannover.de/Learnweb/Lea…
trungtran9 Jul 20, 2022
709d6b4
feat: merge dbpedia-spotlight, add annotation graph
trungtran9 Aug 8, 2022
bad60fc
feat: add annotation database exporter
trungtran9 Aug 31, 2022
b16a81f
chore: reimplement the CollabGraph
trungtran9 Sep 25, 2022
d133521
chore: fix CollabGraph, implement RdfGraph
trungtran9 Nov 7, 2022
a955d03
feat: fix dbpedia-spotlight recognization function
trungtran9 Nov 17, 2022
a5bf85c
chore: fix dbpedia-spotlight runtime
trungtran9 Dec 1, 2022
42daaaf
chore: update pom.xml
trungtran9 Dec 1, 2022
e8fbf44
Merge branch 'master' of https://git.l3s.uni-hannover.de/Learnweb/Lea…
trungtran9 Dec 1, 2022
405db0d
chore: migration
trungtran9 Dec 2, 2022
ee1875e
chore: fix JsonQuery code redundancy, fix dbpedia-spotlight recognition
trungtran9 Dec 8, 2022
0cbe20d
chore: fix JsonQuery code redundancy, fix dbpedia-spotlight recognition
trungtran9 Dec 9, 2022
c4bf5f9
chore: fix code convention, add documentation, refactoring
trungtran9 Dec 22, 2022
0f95d76
chore: fix documentation, bugs on DB Annotation
trungtran9 Dec 23, 2022
9b8ac81
chore: refactoring code, fix code workflow
trungtran9 Jan 4, 2023
d6692aa
chore: fix calculateWeight wrong day formula
trungtran9 Jan 13, 2023
0a65b24
chore: add function documentation, add migration
trungtran9 Jan 16, 2023
dba5aab
chore: add singleGraph, documentation
trungtran9 Jan 16, 2023
f06f12f
chore: fix group recognization input, add singleGraph ratio
trungtran9 Jan 16, 2023
08bcd7d
fix build test pipeline
trungtran9 Jan 17, 2023
233bebe
feat: fix build test, add NER in GroupsBean
trungtran9 Jan 17, 2023
afc621f
fix migration syntax
trungtran9 Jan 17, 2023
16a6eaf
fix lint syntax
trungtran9 Jan 17, 2023
2c7112d
fix lint syntax
trungtran9 Jan 17, 2023
093df24
feat: change singleGraph ratio size with quartiles
trungtran9 Jan 17, 2023
06395bf
fix quartile bug for collabGraph
trungtran9 Jan 19, 2023
53214ac
chore: remove local export file
trungtran9 Jan 22, 2023
bcb6445
feat(search history): implementation of DBpedia Spotlight
Apr 21, 2022
0a01554
fix(search history): fix DBpedia Spotlight code for lint
Apr 25, 2022
0a2c897
fix(search history): fix DBpedia Spotlight code for lint
Apr 27, 2022
34f6bb2
fix(search history): fix DBpedia Spotlight code for lint
Apr 28, 2022
d663967
fix(search history): additional small fix of DBpedia Spotlight code f…
Apr 28, 2022
af7042f
fix(search history): remove lombok annotations from DBpedia Spotlight…
Apr 28, 2022
5a74bd0
fix(search history): spotbugs errors fix of DBpedia Spotlight code
Apr 29, 2022
58332f7
fix(dbpedia spotlight): add number of occurrences per URI
May 18, 2022
cd12806
fix(dbpedia spotlight): clean code
May 19, 2022
f1ce945
feat: merge dbpedia-spotlight, add annotation graph
trungtran9 Aug 8, 2022
2179106
feat: add annotation database exporter
trungtran9 Aug 31, 2022
df4a990
chore: reimplement the CollabGraph
trungtran9 Sep 25, 2022
72a5acf
chore: fix CollabGraph, implement RdfGraph
trungtran9 Nov 7, 2022
69a80df
feat: fix dbpedia-spotlight recognization function
trungtran9 Nov 17, 2022
f65cd60
chore: fix dbpedia-spotlight runtime
trungtran9 Dec 1, 2022
ea70a78
chore: update pom.xml
trungtran9 Dec 1, 2022
57f7477
chore: migration
trungtran9 Dec 2, 2022
9c6bf71
chore: fix JsonQuery code redundancy, fix dbpedia-spotlight recognition
trungtran9 Dec 8, 2022
3e7d59f
chore: fix JsonQuery code redundancy, fix dbpedia-spotlight recognition
trungtran9 Dec 9, 2022
fe3b3b2
chore: fix code convention, add documentation, refactoring
trungtran9 Dec 22, 2022
bfcbcd0
chore: fix documentation, bugs on DB Annotation
trungtran9 Dec 23, 2022
e48a37e
chore: refactoring code, fix code workflow
trungtran9 Jan 4, 2023
bd46a2d
chore: fix calculateWeight wrong day formula
trungtran9 Jan 13, 2023
940e202
chore: add function documentation, add migration
trungtran9 Jan 16, 2023
42a6d3f
chore: add singleGraph, documentation
trungtran9 Jan 16, 2023
0a6e9da
chore: fix group recognization input, add singleGraph ratio
trungtran9 Jan 16, 2023
eb69ff5
fix build test pipeline
trungtran9 Jan 17, 2023
676f1f6
feat: fix build test, add NER in GroupsBean
trungtran9 Jan 17, 2023
7a7f90b
fix migration syntax
trungtran9 Jan 17, 2023
8a822d4
fix lint syntax
trungtran9 Jan 17, 2023
2d76ff8
fix lint syntax
trungtran9 Jan 17, 2023
5bcc788
feat: change singleGraph ratio size with quartiles
trungtran9 Jan 17, 2023
67e7f74
fix quartile bug for collabGraph
trungtran9 Jan 19, 2023
ab6d75d
chore: remove local export file
trungtran9 Jan 22, 2023
4f723f7
chore: modify features
trungtran9 Feb 1, 2023
69cfe41
Merge remote-tracking branch 'origin/dbpedia-spotlight-annotation' in…
trungtran9 Feb 1, 2023
84a9c82
chore: fix Pkg performance
trungtran9 Feb 5, 2023
2b6525c
chore: fix Pkg performance
trungtran9 Feb 5, 2023
124e83a
chore: fix Pkg performance
trungtran9 Feb 6, 2023
ec53a21
chore: reupload dbpediaspotlight
trungtran9 Feb 6, 2023
025a871
chore: reupload dbpediaspotlight
trungtran9 Feb 6, 2023
c05009b
Update AnnotationBean package
Feb 7, 2023
783ef71
chore: update Pkg performance
trungtran9 Feb 7, 2023
33ecf18
small changes for test pipeline
trungtran9 Feb 8, 2023
77a8786
optimize Pkg performance on creation
trungtran9 Feb 8, 2023
f044f69
Merge branch 'master' of https://git.l3s.uni-hannover.de/Learnweb/Lea…
trungtran9 Feb 8, 2023
f4f19f7
move migration into main
trungtran9 Feb 8, 2023
22bd509
update migration
trungtran9 Feb 8, 2023
3f74b81
change DB input for annotation
trungtran9 Feb 8, 2023
b0c423b
fix pipeline
trungtran9 Feb 15, 2023
ca8ddb6
Merge branch 'master' into dbpedia-spotlight-annotation
astappiev Feb 22, 2023
c7a7389
fix: migration
astappiev Feb 22, 2023
fe402de
fix: test failed
astappiev Feb 22, 2023
ff41b8d
chore: change ports
astappiev Feb 22, 2023
c4711c5
chore: add verbosity
astappiev Feb 22, 2023
00b5a96
chore: try fixe solr
astappiev Feb 22, 2023
02b052b
chore: fix annotationCount database representation
trungtran9 Feb 22, 2023
38a8419
Merge remote-tracking branch 'origin/dbpedia-spotlight-annotation' in…
trungtran9 Feb 22, 2023
6f687da
chore: fix collabGraph links trimming
trungtran9 Mar 4, 2023
5961f73
chore: fix linter
astappiev Mar 6, 2023
80f8d6b
Merge remote-tracking branch 'origin/master' into dbpedia-spotlight-a…
trungtran9 Mar 25, 2023
d56b9a7
chore: cleanup old logs
astappiev Mar 28, 2023
0519890
chore: fix SharedObject
trungtran9 Mar 28, 2023
03e13a2
Merge remote-tracking branch 'origin/dbpedia-spotlight-annotation' in…
trungtran9 Mar 28, 2023
32ffb6e
chore: add d3
trungtran9 Mar 28, 2023
01dd5b1
chore: fix CollabGraph sizing
trungtran9 Mar 29, 2023
197f216
chore: disable tutorial
trungtran9 Apr 4, 2023
20cc407
chore: modify graph svg
trungtran9 Apr 4, 2023
679817f
feat: change search autocomplete to prompt via modal
astappiev Apr 13, 2023
1772b4d
feat: add edurec suggestions
astappiev Apr 14, 2023
33622d3
Merge branch 'promt-interface' into dbpedia-spotlight-annotation
astappiev Apr 14, 2023
733a3e7
feat: add todos and update Suggested Searches
astappiev Apr 14, 2023
dcfdd11
chore: modify database + migration
trungtran9 Apr 20, 2023
38c6a42
chore: fix migration
trungtran9 Apr 21, 2023
b33a920
chore: fix migration
trungtran9 Apr 21, 2023
248fa8f
Merge branch 'master' into dbpedia-spotlight-annotation
astappiev Apr 25, 2023
f8ec80e
Merge remote-tracking branch 'origin/dbpedia-spotlight-annotation' in…
astappiev Apr 25, 2023
298e406
feat: improve request to edurec
astappiev Apr 25, 2023
46e20d8
feat: log search results
astappiev Apr 25, 2023
ae261fc
chore: fix rdf model
trungtran9 May 11, 2023
02a5bc7
Merge branch 'master' into dbpedia-spotlight-annotation
astappiev May 26, 2023
c1127cf
chore: npm lock
astappiev May 26, 2023
592f40a
chore: fix rdf model
trungtran9 May 26, 2023
0de6d2a
Merge branch 'dbpedia-spotlight-annotation' of https://git.l3s.uni-ha…
trungtran9 May 26, 2023
67bc634
feat: weight distribution
astappiev May 26, 2023
cad296e
chore: fix rdf model
trungtran9 May 26, 2023
b1f2d1c
Merge remote-tracking branch 'origin/dbpedia-spotlight-annotation' in…
trungtran9 May 26, 2023
fb86a25
chore: commit for presentation demo
trungtran9 Jun 20, 2023
25cad16
Merge branch 'master' into dbpedia-spotlight-annotation
astappiev Jul 21, 2023
a5c38f4
fix: migration conflicts
astappiev Jul 21, 2023
3059c96
fix: some graph issues resolved
astappiev Jul 21, 2023
bb6ee2b
Merge branch 'master' into dbpedia-spotlight-annotation
astappiev Jul 26, 2023
20c89f7
feat: refactor collab graph
astappiev Aug 2, 2023
97d17f8
chore: rename classes
astappiev Aug 2, 2023
0d7d8f5
chore: change edurec to collabred endpoint
astappiev Aug 2, 2023
fc553d6
Merge branch 'master' into dbpedia-spotlight-annotation
astappiev Sep 21, 2023
a9551fc
Merge branch 'master' into dbpedia-spotlight-annotation
astappiev Oct 2, 2023
44597fb
feat: add export of RDF model for single user
astappiev Oct 2, 2023
db8e5f9
fix: center model on screen
astappiev Oct 2, 2023
8963aa8
Merge branch 'main' into dbpedia-spotlight-annotation
astappiev Mar 6, 2024
efd13b2
feat: add fuseki docker
astappiev Mar 7, 2024
7a0167b
refactor: packages move
astappiev Mar 28, 2024
c7c378d
feat: add fuseki docker container
astappiev Mar 28, 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
1 change: 1 addition & 0 deletions .idea/dictionaries/astappiev.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 29 additions & 9 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,37 +6,57 @@ services:
- "./target/Learnweb.war:/usr/local/tomcat/webapps/ROOT.war"
- "./data/files:/mnt/files"
ports:
- "8080:8080"
- "7010:8080"
depends_on:
- mariadb
- solr
- fuseki
environment:
TZ: "Europe/Berlin"
LEARNWEB_FILE_MANAGER_FOLDER: "/mnt/files"
LEARNWEB_DATASOURCE_URL: "jdbc:mariadb://mariadb:3306/${DATASOURCE_DATABASE}"
LEARNWEB_DATASOURCE_USERNAME: ${DATASOURCE_USERNAME}
LEARNWEB_DATASOURCE_PASSWORD: ${DATASOURCE_PASSWORD}
LEARNWEB_SOLR_SERVER_URL: "http://solr:8983/solr/learnweb"
LEARNWEB_DATASOURCE_URL: "jdbc:mariadb://mariadb:3306/learnweb"
LEARNWEB_DATASOURCE_USERNAME: "learnweb"
LEARNWEB_DATASOURCE_PASSWORD: "cm&dY@FSM7sCtSxZ"
env_file:
- .env.override
mariadb:
image: mariadb:10.11
restart: always
ports:
- "3306:3306"
- "7006:3306"
volumes:
- "./data/mariadb:/var/lib/mysql"
environment:
TZ: "Europe/Berlin"
MARIADB_AUTO_UPGRADE: "yes"
MARIADB_RANDOM_ROOT_PASSWORD: "yes"
MARIADB_DATABASE: "learnweb"
MARIADB_USER: "learnweb"
MARIADB_PASSWORD: "cm&dY@FSM7sCtSxZ"
MARIADB_DATABASE: ${DATASOURCE_DATABASE}
MARIADB_USER: ${DATASOURCE_USERNAME}
MARIADB_PASSWORD: ${DATASOURCE_PASSWORD}
env_file:
- .env.override
solr:
image: solr:9
restart: always
ports:
- "8983:8983"
- "7003:8983"
volumes:
- "./src/main/conf/solr-setup.sh:/solr-setup.sh:ro"
- "./data/solr:/var/solr"
command: bash -e -c "precreate-core learnweb && source /solr-setup.sh && solr-foreground"
fuseki:
image: secoresearch/fuseki:latest
restart: always
ports:
- "7005:3030"
volumes:
- "./data/fuseki/db:/fuseki-base/databases"
- "./data/fuseki/conf:/fuseki-base/configuration"
environment:
ADMIN_PASSWORD: ${FUSEKI_PASSWORD}
ENABLE_DATA_WRITE: "true"
ENABLE_UPDATE: "true"
ENABLE_SHACL: "true"
env_file:
- .env.override
Loading
Loading