Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
115 commits
Select commit Hold shift + click to select a range
d58014e
containerization structure
chreman Mar 3, 2020
d6e3b7a
move
chreman Mar 3, 2020
cf91061
move
chreman Mar 3, 2020
bc959d2
basic container build
chreman Mar 3, 2020
c092a48
wip
chreman Mar 3, 2020
03d9416
wip
chreman Mar 4, 2020
5a276df
wip
chreman Mar 4, 2020
6dcf286
wip
chreman Mar 4, 2020
f6e47cb
api test works
chreman Mar 4, 2020
f626c79
backend wip
chreman Mar 4, 2020
f6861fd
package structure
chreman Mar 4, 2020
33110be
entry wip
chreman Mar 4, 2020
74550c4
triple minimal example
chreman Mar 7, 2020
df150af
mappings endpoint
chreman Mar 8, 2020
1a223f4
wip
chreman Mar 9, 2020
6980ecb
swagger+restx added
chreman Mar 9, 2020
9deae73
swagger+restx added
chreman Mar 9, 2020
269182e
data cleaning
chreman Mar 9, 2020
6640852
activate backend container
chreman Mar 10, 2020
aefb142
subprocess works
chreman Mar 10, 2020
cef5880
backend tweaks
chreman Mar 11, 2020
77c946b
update gitignore
chreman Mar 11, 2020
045522b
external logging
chreman Mar 11, 2020
a9f5cda
close loop
chreman Mar 11, 2020
994d307
maybe a break condition would be nice
chreman Mar 11, 2020
d9c1bc9
data cleaning
chreman Mar 11, 2020
fa53377
the bugfixing commences
chreman Mar 11, 2020
66da929
testing
chreman Mar 12, 2020
551d0d3
Merge remote-tracking branch 'upstream/containerization' into contain…
chreman Mar 12, 2020
0ee7e8a
data cleaning
chreman Mar 12, 2020
4ed2785
wip
chreman Mar 15, 2020
dcb8fb1
remove blueprints; simplify structure; new content type
chreman Mar 17, 2020
b6dbbad
wip
chreman Mar 17, 2020
985a4f8
mv config
chreman Mar 20, 2020
2a28d86
get raw csv
chreman Mar 20, 2020
8247584
example configs added
chreman Mar 20, 2020
4c65bb9
proxy fix
chreman Mar 20, 2020
ffaa432
redis conf
chreman Mar 20, 2020
1eceb4d
revert proxy fix
chreman Mar 20, 2020
738fd56
fix redis volume
chreman Mar 20, 2020
bcd7364
deployment issues
chreman Mar 20, 2020
0e505bf
fix proxy and flask-restx hotfix version
chreman Mar 21, 2020
814e1aa
doesnt belong here
chreman Mar 21, 2020
b949a39
monkeypatching 2nd attempt
chreman Mar 21, 2020
0a0dac8
behind proxy patches
chreman Mar 22, 2020
a1efe6c
deployment
chreman Mar 22, 2020
97a63a9
attempt with flasgger
chreman Mar 23, 2020
0d357b4
secure redis
chreman Mar 23, 2020
5889a4b
update proxy readme
chreman Mar 23, 2020
26e0362
new parameter: limit
chreman Mar 23, 2020
7057838
swagger
chreman Mar 23, 2020
759c77a
swagger
chreman Mar 23, 2020
c27b227
new parameter: limit
chreman Mar 24, 2020
cbc148d
correct scope
chreman Mar 24, 2020
dac792c
tests & gitignore update
chreman Mar 24, 2020
df5fff6
wip
chreman Mar 25, 2020
1427e3c
Merge remote-tracking branch 'upstream/master' into containerization
chreman Mar 25, 2020
cb8459f
first set of tests; first improvement of query parsing
chreman Mar 26, 2020
f430183
Merge remote-tracking branch 'upstream/containerization' into contain…
chreman Mar 27, 2020
94af5fc
first backend tests; fix backend redis scope
chreman Mar 27, 2020
539fd1b
collab map WIP
chreman Mar 28, 2020
7dcb1aa
more WIP
chreman Mar 28, 2020
ff34c67
more WIP
chreman Mar 28, 2020
c9abcc9
finished for first sprint
chreman Mar 28, 2020
b745e57
basic query
chreman Mar 29, 2020
017e15a
Merge branch 'containerization' into cv19-backend
chreman Mar 29, 2020
e4261a6
add logging and debug mode
chreman Mar 30, 2020
668d6d6
more logging
chreman Mar 30, 2020
1eefd63
deployment polishing
chreman Mar 31, 2020
d012577
Merge remote-tracking branch 'upstream/master' into containerization
chreman Apr 1, 2020
9fbfac8
update windows docs
chreman Apr 1, 2020
c9f0b42
README and naming convention
chreman Apr 2, 2020
c94e1e3
clean up
chreman Apr 2, 2020
7561268
formatting
chreman Apr 2, 2020
3f204b7
formatting
chreman Apr 2, 2020
48156be
formatting
chreman Apr 2, 2020
cf3991b
Update README.md
chreman Apr 2, 2020
00ae545
Update README.md
chreman Apr 2, 2020
717c7a0
Merge remote-tracking branch 'upstream/containerization' into contain…
chreman Apr 2, 2020
d43866c
windows networking
chreman Apr 2, 2020
6375ca5
Update README.md
chreman Apr 2, 2020
cc6a004
Update README.md
chreman Apr 2, 2020
3b1484c
Update README.md
chreman Apr 2, 2020
0a0f858
Update README.md
chreman Apr 2, 2020
9e93351
merge containerization
chreman Apr 6, 2020
88c0153
update searches
chreman Apr 6, 2020
12b6f47
Merge branch 'containerization' into cv19-backend
chreman Apr 6, 2020
b25d9b4
update searches
chreman Apr 6, 2020
f215cbd
Merge branch 'containerization' into cv19-backend
chreman Apr 6, 2020
0a94e9b
logging
chreman Apr 6, 2020
c2a656b
Merge remote-tracking branch 'upstream/master' into cv19-backend
chreman Apr 6, 2020
2c4367e
now works up to map data generation
chreman Apr 6, 2020
7f4a83f
Merge remote-tracking branch 'upstream/master' into cv19-backend
chreman Apr 6, 2020
e55b723
wip
chreman Apr 6, 2020
4d67311
fix serialization
chreman Apr 6, 2020
8a6186c
Merge branch 'containerization' into cv19-backend
chreman Apr 6, 2020
e2f4ca9
good wip
chreman Apr 6, 2020
6b93055
fix serialization
chreman Apr 6, 2020
15996b6
wip
chreman Apr 6, 2020
8209be5
no persisting if error
chreman Apr 6, 2020
d91b57c
fix search
chreman Apr 6, 2020
8cc6095
cleanup
chreman Apr 6, 2020
bfeab86
fix serialization
chreman Apr 6, 2020
c76c1a4
fix serialization
chreman Apr 6, 2020
a82e0ab
more serialization fixing
chreman Apr 6, 2020
e0e7871
Merge remote-tracking branch 'upstream/cv19-backend' into cv19-backend
chreman Apr 6, 2020
c72fe98
result fields update
chreman Apr 7, 2020
19435db
Merge remote-tracking branch 'upstream/containerization' into contain…
chreman Apr 7, 2020
bb1d3eb
first attempt at integration
chreman Apr 7, 2020
45e0360
Merge remote-tracking branch 'upstream/master' into cv19-backend
chreman Apr 7, 2020
b1a3caa
more integration wip
chreman Apr 7, 2020
2e2f236
Merge branch 'containerization' into cv19-backend
chreman Apr 8, 2020
f1fbfd4
cleanup
chreman Apr 8, 2020
668d63b
cleanup
chreman Apr 8, 2020
6589f63
harmonise headstart paths in triple example
chreman Apr 9, 2020
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
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,9 @@ vis/stylesheets/*.css
dist/
.idea/
config.js
*__pycache__*
.pytest_cache
.cache
.Rhistory
.ipynb_checkpoints
.Rprofile
54 changes: 54 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
version: '3.7'

services:

api:
build:
context: server
dockerfile: services.docker
restart: always
ports:
- '5001:5001'
depends_on:
- redis
network_mode: "host"

redis:
image: 'redis:4.0-alpine'
restart: always
command: ["redis-server", "/etc/redis/redis.conf", "--appendonly", "yes"]
volumes:
- 'redis:/var/lib/redis/data'
- ./server/workers/redis.conf:/etc/redis/redis.conf
restart: always
ports:
- '6379:6379'
network_mode: "host"

search_triple:
build:
context: server
dockerfile: search_triple.docker
env_file:
- server/workers/triple/triple.env
restart: always
network_mode: "host"

dataprocessing:
build:
context: server
dockerfile: dataprocessing.docker
env_file:
- server/workers/dataprocessing/dataprocessing.env
restart: always
network_mode: "host"
volumes:
- type: bind
source: /var/opt/renv
target: /root/.local/share/renv
- type: bind
source: /var/log/headstart
target: /var/log/headstart

volumes:
redis:
42 changes: 42 additions & 0 deletions docker-compose_win.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
version: '3.7'

services:

api:
build:
context: server
dockerfile: services.docker
restart: always
ports:
- '127.0.0.1:5001:5001'
depends_on:
- redis

redis:
image: 'redis:4.0-alpine'
restart: always
command: ["redis-server", "/etc/redis/redis.conf", "--appendonly", "yes"]
volumes:
- ./server/workers/redis.conf:/etc/redis/redis.conf
restart: always
ports:
- '127.0.0.1:6379:6379'

search_triple:
build:
context: server
dockerfile: search_triple.docker
env_file:
- server/workers/triple/triple.env
restart: always

dataprocessing:
build:
context: server
dockerfile: dataprocessing.docker
env_file:
- server/workers/dataprocessing/dataprocessing.env
restart: always

volumes:
redis:
Empty file added examples/triple/README.md
Empty file.
1 change: 1 addition & 0 deletions examples/triple/data-config_server.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
data_config.server_url = window.location.href.replace(/[^/]*$/, '') + "../../server/";
32 changes: 32 additions & 0 deletions examples/triple/data-config_triple.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
var data_config = {
tag: "visualization",
mode: "search_repos",

service: "triple",

title: "",
base_unit: "citations",
use_area_uri: true,
show_multiples: false,
show_dropdown: false,
preview_type: "pdf",
sort_options: ["relevance", "title", "authors", "year"],
is_force_areas: true,
language: "eng_pubmed",
area_force_alpha: 0.015,
show_list: true,
content_based: true,
url_prefix: "",

show_context: true,
create_title_from_context: true,
context_most_relevant_tooltip: true,

doi_outlink: true,
filter_menu_dropdown: true,
sort_menu_dropdown: true,
filter_options: ["all", "open_access"],

embed_modal: true,
share_modal: false,
};
28 changes: 28 additions & 0 deletions examples/triple/headstart.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>

<body style="margin:0px; padding:0px">

<div id="visualization"></div>
<script type="text/javascript" src="data-config_<?php echo $_GET['service'] ?>.js"></script>
<script type="text/javascript" src="data-config_server.js"></script>
<script type="text/javascript" src="search_options.js"></script>
<script>
data_config.title = '<?php echo 'Overview of <span id="search-term-unique">' . $_GET['query'] . '</span>'; ?>';
data_config.files = [{
title: <?php echo json_encode($_GET['query']) ?>,
file: <?php echo json_encode($_GET['file']) ?>
}];
data_config.options = options_<?php echo $_GET['service'] ?>.dropdowns;
</script>
<script type="text/javascript" src="../../dist/headstart.js"></script>
<link type="text/css" rel="stylesheet" href="../../dist/headstart.css"></link>
<script type="text/javascript">
headstart.start();
</script>
<div style="margin-top:20px">Built with <a href="http://github.com/OpenKnowledgeMaps/Headstart" target="_blank">Headstart</a> and <a href="http://github.com/ropensci/rplos" target="_blank">rplos</a>. All content retrieved from <a href="https://www.gotriple.eu/" target="_blank ">TRIPLE</a>.
</div>
</body>
</html>
127 changes: 127 additions & 0 deletions examples/triple/options.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
* {
box-sizing: content-box;
}

.divity {
display: inline-block;
}

.frontend-hidden {
display: none;
}

.visible {
display: block;
}

label {
display: inline;
font-weight: normal;
}

#filter-container {
margin-top: 15px;
}

#filter-btn {
margin-bottom: 23px;
margin-right: 20px;
margin-top: 5px;
}

#filters {
margin-bottom: 10px;
}

#stats {
margin-bottom: 30px;
margin-top: 30px;
}

.dropdown {
padding: 5px;
}

.frontend-btn {
-webkit-border-radius: 5;
-moz-border-radius: 5;
border-radius: 5px;
color: #636363;
font-size: 12px;
background: #ffffff;
padding: 8px 10px 8px 10px;
text-decoration: none;
border: solid #636363 1px;
}

.frontend-btn:hover {
background: #f5f2f5;
/*background-image: -webkit-linear-gradient(top, #f5f2f5, #c9c9c9);
background-image: -moz-linear-gradient(top, #f5f2f5, #c9c9c9);
background-image: -ms-linear-gradient(top, #f5f2f5, #c9c9c9);
background-image: -o-linear-gradient(top, #f5f2f5, #c9c9c9);
background-image: linear-gradient(to bottom, #f5f2f5, #c9c9c9);*/
text-decoration: none;
}

.div {
display: block;
}

.hidden {
display: none;
}

.visible {
display: block;
}

#input-container {
margin-bottom: 30px;
}

.submit-btn {
padding: 3px 12px;
}

.caret {
border-left: 1px solid #AAA;
border-radius: 0px 4px 4px 0px;
background: #CCC linear-gradient(to top, #CCC 0%, #EEE 60%) repeat scroll 0% 0%;
}

.multiselect {
background-color: #fff;
/*background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #eee), color-stop(0.5, #fff));
background-image: -webkit-linear-gradient(center bottom, #eee 0%, #fff 50%);
background-image: -moz-linear-gradient(center bottom, #eee 0%, #fff 50%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr = '#ffffff', endColorstr = '#eeeeee', GradientType = 0);
background-image: linear-gradient(to top, #eee 0%, #fff 50%);*/

height: 18px
}

.btn-group {
margin-right: 30px;
}

.submit-btn {
display: inline-block;
padding-top: 10px;
margin-left: 20px;
}

#download {
margin-top: 510px;
margin-left: 30px;
}

.input_items {
display: inline-block;
vertical-align: middle;
}

.btn {
margin-left: 10px;
width: 100px;
}
Loading