Commit Graph

364 Commits

Author SHA1 Message Date
Patrick Jentsch
82745629bc Bug fixes 2021-12-01 16:03:55 +01:00
Patrick Jentsch
72ba61f369 Only reveal hashids to the ui 2021-11-30 16:22:16 +01:00
Patrick Jentsch
904747ec66 Add dependencies and missing exception handling 2021-11-18 08:39:56 +01:00
Patrick Jentsch
f6c2292e03 Big Corpus analysis update 2021-11-16 15:23:57 +01:00
Patrick Jentsch
5469bd0ec1 Don't use module level logger functions 2021-09-16 11:15:31 +02:00
Patrick Jentsch
1b342d5159 Use gunicorn as the default webserver 2021-09-15 14:15:23 +02:00
Patrick Jentsch
def01d474e Add UTC flag to date strings 2021-09-14 12:51:49 +02:00
Patrick Jentsch
4950a407af rename blueprint variables (blueprint_name -> bp) and view files (views.py -> routes.py) 2021-09-13 11:45:43 +02:00
Patrick Jentsch
9d59aa3409 Move event handlers to a dedicated event directory 2021-09-07 13:50:23 +02:00
Patrick Jentsch
0861d931ce Add an abort criterion when exporting query results 2021-08-24 09:50:32 +02:00
Patrick Jentsch
a5782f932c Do not manually emit corpus changes via socket. 2021-08-23 12:29:31 +02:00
Patrick Jentsch
c7b2c413d3 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development 2021-08-23 11:04:10 +02:00
Patrick Jentsch
fd5fcf9821 Change exception handling in corpus analysis 2021-08-23 11:04:09 +02:00
Patrick Jentsch
1a59b19124 Handle all ressource events with unified sqlalchemy event handlers. 2021-08-20 14:41:40 +02:00
Patrick Jentsch
98a43ec86f Use sqlalchemy events to emit jsonpatches to the client. 2021-08-18 15:11:11 +02:00
Patrick Jentsch
d6ab379418 Change directory structure (move ./nopaque/* to ./) 2021-07-20 15:07:42 +02:00
Patrick Jentsch
cb2b64fa9d integrate nopaque repo 2020-06-05 14:42:04 +02:00
Stephan Porada
cb8f3faae0 Add curren ttoken and max token nr 2020-05-04 12:08:43 +02:00
Stephan Porada
1350e6ddd6 Add metadata object on analysis 2020-04-30 14:45:54 +02:00
Stephan Porada
d54a3d3f33 First metadata addition 2020-04-29 16:15:11 +02:00
Stephan Porada
eb5e5c3253 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-04-27 16:16:59 +02:00
Stephan Porada
deda16f0f5 Add meta data recv after corpus analysis init 2020-04-27 16:16:57 +02:00
Patrick Jentsch
c67c033aec Rework notification system 2020-04-27 15:22:20 +02:00
Patrick Jentsch
98fecacb11 use cqi from pypi 2020-04-24 15:44:40 +02:00
Patrick Jentsch
7fc1084749 Add notifications on status changes of jobs and corpora 2020-04-24 15:22:04 +02:00
Patrick Jentsch
3a989534cf Make the app arg in @background functions a bit less magical 2020-04-23 08:35:18 +02:00
Patrick Jentsch
edc0b34032 Process corpus files in task, not in database model 2020-04-23 07:56:23 +02:00
Patrick Jentsch
bb8a542eed Small fixes 2020-04-22 09:29:45 +02:00
Patrick Jentsch
60cc93a806 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-04-21 18:34:27 +02:00
Patrick Jentsch
bc27744946 Create and use a decorator for background functions 2020-04-21 18:34:21 +02:00
Stephan Porada
c7f7036306 Visual fix 2020-04-21 10:41:08 +02:00
Patrick Jentsch
29f1be5c80 Delete functions should not throw an error, if the ressource does not exists. -> Consider it as deleted if does not exist 2020-04-21 10:27:42 +02:00
Stephan Porada
78f93a884b Move down from 100 to 50 words lr context 2020-04-20 15:09:08 +02:00
Stephan Porada
6126477825 Finalize inspect view display options 2020-04-20 13:48:40 +02:00
Stephan Porada
2eb3d2f03e Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-04-20 09:59:34 +02:00
Patrick Jentsch
5fa1ba385b Update 2020-04-17 16:00:40 +02:00
Patrick Jentsch
3aafe664a3 Add macros and use them 2020-04-17 11:04:09 +02:00
Stephan Porada
9145265e4b Add expert mode and higlight sentences switch to inspect. WIP 2020-04-16 15:06:03 +02:00
Patrick Jentsch
fede774196 Change nopaque upload forms. Add corpus file form has an upload progress bar now. 2020-04-16 09:40:38 +02:00
Patrick Jentsch
20d4d1c0b3 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-04-15 14:57:19 +02:00
Patrick Jentsch
f264b27ae5 Change validation process (currently broken) 2020-04-15 14:57:17 +02:00
Stephan Porada
68eb1d1972 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-04-15 14:55:36 +02:00
Stephan Porada
9031ca5845 New context options 2020-04-15 14:55:29 +02:00
Patrick Jentsch
b1d819444e corpus page: Only show compile buttons if corpus is unprepared AND has files. 2020-04-15 14:30:41 +02:00
Patrick Jentsch
bbccbcfcd2 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-04-15 10:32:27 +02:00
Patrick Jentsch
338e760bfb Hide analyze button if corpus is not ready for this 2020-04-15 10:32:21 +02:00
Stephan Porada
34e8d952b6 Add match context display options 2020-04-14 15:51:26 +02:00
Patrick Jentsch
7c8ae161a9 Fix context size and codestyle 2020-04-14 09:51:33 +02:00
Patrick Jentsch
9a1efbe5f3 corpus logic 2020-04-09 15:14:39 +02:00
Stephan Porada
ca333e29ee Some fixes and clean up 2020-04-09 10:17:04 +02:00
Patrick Jentsch
ca833c966a fixes and doc 2020-04-07 16:36:27 +02:00
Patrick Jentsch
08dba25de3 fix 2020-04-07 16:30:27 +02:00
Patrick Jentsch
a1cdfd498a Remove wrapper 2020-04-07 16:27:28 +02:00
Patrick Jentsch
83a607728d cqi package update and changes to match the new functions 2020-04-07 16:25:44 +02:00
Stephan Porada
49dc7c4cdb Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-04-06 15:29:04 +02:00
Stephan Porada
69b17f350e Remove all pjs! 2020-04-06 15:28:58 +02:00
Patrick Jentsch
606c4dee85 CQi updates 2020-04-06 14:53:50 +02:00
Stephan Porada
9ec1b596f8 Remove pj_ 2020-04-06 14:27:14 +02:00
Stephan Porada
19aee30b1b remove wrong inits 2020-04-06 14:18:48 +02:00
Stephan Porada
a6bcfe51b1 Rename pj_views|events|forms to views, events, forms 2020-04-06 14:16:59 +02:00
Stephan Porada
85abf7748d Delete old events 2020-04-06 14:13:45 +02:00
Stephan Porada
a6855797d5 Update new view 2020-04-06 14:12:22 +02:00
Stephan Porada
e0df6a9eca Delete old views 2020-04-06 14:12:15 +02:00
Stephan Porada
66a2fcdb34 update new forms 2020-04-06 14:09:41 +02:00
Stephan Porada
e6efb042c3 Delete old form 2020-04-06 14:09:33 +02:00
Stephan Porada
12586bb13d First feature complete rebuilt of analysis interface 2020-04-06 12:32:29 +02:00
Patrick Jentsch
38e1408e01 quick fix 2020-04-06 12:01:36 +02:00
Patrick Jentsch
498defa386 Fix 2020-04-02 14:45:02 +02:00
Stephan Porada
2c93f02c11 Update 2020-04-02 14:22:03 +02:00
Stephan Porada
bface71503 use ranges 2020-04-02 11:38:27 +02:00
Patrick Jentsch
848bc90b0c Bugfix 2020-04-02 10:43:01 +02:00
Patrick Jentsch
b8a086f389 Set list/range flag in events.py instead of the export function 2020-04-02 10:36:59 +02:00
Patrick Jentsch
6a5621b753 Add Flag to indicate if cpos lists are saved as ranges or lists. 2020-04-02 10:14:43 +02:00
Patrick Jentsch
37526a6b43 Use expanded List 2020-04-01 14:25:49 +02:00
Stephan Porada
46b82f5737 Corpus analysis version 3.0 lul 2020-04-01 13:44:06 +02:00
Patrick Jentsch
4556a52ffc Abort transmission after disconnect 2020-03-30 09:01:40 +02:00
Patrick Jentsch
0be0e12aee add simple status check 2020-03-30 08:36:55 +02:00
Patrick Jentsch
6e3579b33f Update 2020-03-29 20:54:51 +02:00
Patrick Jentsch
4ff372de77 small updates 2020-03-29 20:33:00 +02:00
Patrick Jentsch
d07b73781f Update 2020-03-29 19:40:29 +02:00
Patrick Jentsch
f7692102a5 Update 2020-03-29 12:38:24 +02:00
Patrick Jentsch
2db9677659 Make it work again 2020-03-28 20:45:33 +01:00
Patrick Jentsch
e3fde2d5c9 compatibility fixes and add reimplementations 2020-03-28 19:29:19 +01:00
Patrick Jentsch
a51394dddd Update cqi package 2020-03-28 11:56:01 +01:00
Patrick Jentsch
4294c2854b Make inner package imports relative 2020-03-27 12:06:11 +01:00
Patrick Jentsch
eba6af3b1e Replace the default function decorators with new socketio specific ones 2020-03-26 16:14:09 +01:00
Stephan Porada
257600a2a8 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-03-26 15:28:36 +01:00
Stephan Porada
08e7df4ad3 Add function to resend queries during running query 2020-03-26 15:28:11 +01:00
Patrick Jentsch
0db99e33fe Update cqi package 2020-03-25 15:39:32 +01:00
Stephan Porada
6b24184206 remove logger warnings 2020-03-23 13:03:40 +01:00
Stephan Porada
ac14bedc62 Add neww result recieving 2020-03-23 12:14:32 +01:00
Patrick Jentsch
94e71b41df fix empty matches error 2020-03-23 11:24:39 +01:00
Patrick Jentsch
e99053e3cf rename 2020-03-23 11:18:27 +01:00
Patrick Jentsch
303ea166d2 fix num matches 2020-03-23 11:17:37 +01:00
Patrick Jentsch
e13ed86d29 new style 2020-03-23 10:28:07 +01:00
Patrick Jentsch
acfcc0321b Add package implementation of cqi 2020-03-23 09:10:35 +01:00
Patrick Jentsch
7752e7fb57 Add changes from cqiclient repository 2020-03-20 15:12:19 +01:00
Stephan Porada
3111cc5175 Clean up corpus analysis and add new features 2020-03-18 15:52:53 +01:00
Patrick Jentsch
b8437735b4 Defensive programming inc 2020-03-16 13:15:13 +01:00
stephan
6bdc0b354b Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-03-12 14:49:03 +01:00
stephan
5c134dd8c5 Add interaactive context change 2020-03-12 14:48:58 +01:00
Patrick Jentsch
b6ffad1ae4 use variable instead of magic number 2020-03-12 14:18:38 +01:00
Patrick Jentsch
f4ac584668 Update 2020-03-12 14:18:07 +01:00
Patrick Jentsch
bcbb67b707 Remove debug log 2020-03-12 14:16:47 +01:00
Patrick Jentsch
416c724f70 Simplify 2020-03-12 14:13:07 +01:00
Patrick Jentsch
fa7d2da973 Update 2020-03-11 14:48:48 +01:00
Patrick Jentsch
cedc1f11e3 Update 2020-03-11 13:34:09 +01:00
Patrick Jentsch
e881401a10 Update CQi stuff 2020-03-10 16:06:47 +01:00
stephan
4a8696cf16 Fix typo 2020-03-02 11:18:34 +01:00
stephan
41b171e460 Fix typo 2020-02-27 10:25:33 +01:00
stephan
c7155badf2 fix typo 2020-02-20 10:59:54 +01:00
stephan
a1405150bb Change tilte 2020-02-20 10:58:46 +01:00
stephan
928ab9512b Add automatic query display option changes 2020-02-19 15:40:54 +01:00
stephan
416cc145cf Fix unclickable input fields 2020-02-17 10:45:45 +01:00
Patrick Jentsch
545c3ae2ec update 2020-02-14 15:23:02 +01:00
Stephan Porada
21371efde6 Continue new list building for results 2020-02-03 12:58:40 +01:00
Stephan Porada
da4cc75943 Work on new list bilding 2020-01-29 16:12:57 +01:00
Stephan Porada
4b0e9392a7 NEw analysis stuff 2020-01-27 16:11:34 +01:00
Stephan Porada
b4427cd3ec Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-01-27 13:19:34 +01:00
Stephan Porada
2b1e8f34de Rename some stuff 2020-01-27 13:19:33 +01:00
Patrick Jentsch
2c0f009e7c Change corpus analysis init behavior 2020-01-27 13:18:54 +01:00
Stephan Porada
87d6380e22 Rework corpus analysis list building part 1 2020-01-23 16:00:48 +01:00
Stephan Porada
2142fb14af Add second iteration of json download 2020-01-21 14:50:27 +01:00
Stephan Porada
74e5c47e3b Enhance analysis UI add first iteration of results download 2020-01-20 15:53:53 +01:00
Stephan Porada
5c5f7012eb Remove redundant info 2020-01-20 15:53:06 +01:00
Stephan Porada
e4b794d37c Add tmp List.js implemetation 2020-01-17 14:31:14 +01:00
Stephan Porada
e04b31d282 Add error handling of invalid CQP queries 2020-01-16 11:56:16 +01:00
Patrick Jentsch
9353a3d5db Change corpus analyse ui 2020-01-15 15:52:42 +01:00
Stephan Porada
446eca2d22 Add function to edit new metadata fields 2020-01-10 12:13:42 +01:00
Stephan Porada
cee89dd712 continue additional metadata 2020-01-10 11:29:26 +01:00
Stephan Porada
e1a8fbc531 Add options to add more detailed metadate to corpus file 2020-01-09 16:04:52 +01:00
Stephan Porada
8e02c2fd14 Add more metadate to corpus files 2020-01-08 16:02:42 +01:00
Stephan Porada
31ac9ddcf3 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-12-03 15:11:40 +01:00
Stephan Porada
7ec41a03be Add Inspect view 2019-12-03 15:11:31 +01:00
Patrick Jentsch
ccfd449260 Rename analysis container 2019-12-03 11:46:56 +01:00
Stephan Porada
94e8d0895c Add first things to get more context for one match. 2019-12-02 16:13:53 +01:00
Stephan Porada
d2334e6a1e Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-12-02 14:19:51 +01:00
Stephan Porada
3af400a732 Add get_sentences to wrapper 2019-12-02 14:19:40 +01:00
Patrick Jentsch
f63a850175 Renaming: opaque->nopaque 2019-12-02 11:34:28 +01:00
Stephan Porada
1c9e715980 Fixe some things for query results 2019-11-28 15:19:52 +01:00
Stephan Porada
dbd580b3c0 Get results with wrapper 3.0 2019-11-28 14:14:56 +01:00
Patrick Jentsch
9b71fb0cc9 Add tooltips to query ui 2019-11-28 12:09:25 +01:00
Patrick Jentsch
49311f58f0 Add basic style for expert view 2019-11-27 15:56:39 +01:00
Patrick Jentsch
54f3036d89 push 2019-11-27 13:29:43 +01:00
Patrick Jentsch
5411bd91bd Fix imports and hardcoded values 2019-11-27 10:18:15 +01:00
Stephan Porada
b3d5c15df3 CQiWrapper new data structure 2019-11-27 09:41:21 +01:00
Stephan Porada
00d61a7bf5 Add sentences to results 2019-11-26 11:48:54 +01:00
Stephan Porada
52b7202017 Fix CQiClient 2019-11-26 11:48:42 +01:00
Stephan Porada
d23656ae80 Some fixes 2019-11-25 11:51:56 +01:00
Patrick Jentsch
eeed9268bb Remove gzip compression 2019-11-25 10:29:05 +01:00
Patrick Jentsch
3d8d2b3e48 Codestyle update 2019-11-25 10:12:39 +01:00
Patrick Jentsch
dd469386e1 change socket logic 2019-11-22 14:13:14 +01:00
Stephan Porada
fd2547de0c Add compression of result dictionary and size infos for other compression or no compression methods 2019-11-21 16:05:00 +01:00
Stephan Porada
e6b27b0970 Add first setup for compression 2019-11-19 15:21:42 +01:00
Stephan Porada
1f74ad8a8e Add Wrapper Version 2.0 2019-11-19 11:48:00 +01:00
Patrick Jentsch
e3db29e476 Change container name for analysis 2019-11-19 11:42:23 +01:00
Stephan Porada
0ca4bf6030 Add first query result function 2019-11-18 16:07:07 +01:00
Stephan Porada
5c8ca4e22d Fix imports 2019-11-18 14:29:16 +01:00
Stephan Porada
14e869b2dd Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-11-18 14:26:39 +01:00
Stephan Porada
ae6e252830 Temp event query handling 2019-11-18 14:24:31 +01:00
Stephan Porada
5fdd67ebf2 Add new CQiWrapper 2019-11-18 14:24:13 +01:00
Patrick Jentsch
0cd4be055e Change corpus analysis socket behavior 2019-11-18 11:08:33 +01:00
Patrick Jentsch
5fd9711da9 Simplify db lookup for queries by id 2019-11-15 13:09:12 +01:00
Patrick Jentsch
aacfe40bd6 Code enhancement 2019-11-15 12:51:53 +01:00
Patrick Jentsch
f22bff4ed0 Updated URL Logic for admin package 2019-11-15 11:45:04 +01:00
Patrick Jentsch
3fb5802682 Cleanup corpus analysis code 2019-11-14 15:53:43 +01:00
Patrick Jentsch
df98f3a900 Change HTML for corpus analysis 2019-11-14 15:34:07 +01:00
Patrick Jentsch
7dd55c47a0 Code update to new request system 2019-11-14 13:19:05 +01:00
Patrick Jentsch
bab479db20 Change delete execution 2019-11-14 09:48:30 +01:00
Patrick Jentsch
1152417419 First output of query results 2019-11-12 16:45:54 +01:00
Stephan Porada
5660318450 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-11-12 14:02:20 +01:00
Stephan Porada
dfd9d09f3f Clean up 2019-11-12 14:02:01 +01:00
Patrick Jentsch
4f53122515 Use CQiClient for testing purpose. 2019-11-12 14:00:03 +01:00
Patrick Jentsch
0d441a9364 Change import logic. 2019-11-12 13:36:22 +01:00
Patrick Jentsch
2bebd0256c Implement logger in another way. 2019-11-12 13:23:54 +01:00
Stephan Porada
6459c9f064 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-11-12 12:08:11 +01:00
Stephan Porada
55cacf53fc Add JSON handling with emit and on 2019-11-12 12:08:09 +01:00
Patrick Jentsch
b0c6bb9c05 Add checks if the user is allowed to start an analysis. 2019-11-12 12:04:07 +01:00
Patrick Jentsch
5602ba950f Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-11-11 15:58:00 +01:00
Patrick Jentsch
388e7eaa60 Add first implementation of loading modal 2019-11-11 15:57:55 +01:00
Stephan Porada
ffed8592c8 Add new CQiWrapper 2019-11-11 15:35:37 +01:00
Patrick Jentsch
0392d25464 Hups 2019-11-11 14:20:44 +01:00
Patrick Jentsch
8a607b6dc0 Multiple analyses sessions perfectly implemented. 2019-11-11 11:51:18 +01:00
Patrick Jentsch
87b7f07d26 Fix event loop 2019-11-11 09:41:34 +01:00
Stephan Porada
e0a1514084 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-11-07 15:58:24 +01:00
Stephan Porada
9be33ffc5a Add first tr to implement VQiWrapper 2019-11-07 15:51:01 +01:00
Stephan Porada
8e5e8408bd Add CQiWrapper 2019-11-07 15:48:47 +01:00
Patrick Jentsch
03b956c457 Remove workaround to wait for container 2019-11-07 15:28:07 +01:00
Stephan Porada
13421a9e7f Remove 2019-11-07 14:37:37 +01:00
Patrick Jentsch
ebf2f00e0d Add example for client management 2019-11-07 14:33:58 +01:00
Stephan Porada
7233c74dca Add some fixes 2019-11-07 13:56:21 +01:00
Stephan Porada
54c0d0f27d Fix app context 2019-11-07 10:55:23 +01:00
Stephan Porada
19f470ca18 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-11-07 10:48:10 +01:00
Stephan Porada
47440880d5 Set up all things for first query 2019-11-07 10:45:12 +01:00
Patrick Jentsch
1b3d40eed3 Cleanup eventcode 2019-11-07 10:44:02 +01:00
Patrick Jentsch
414ebc73ff Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-11-06 15:44:10 +01:00
Patrick Jentsch
82ce08b938 Add CQiClient 2019-11-06 15:44:06 +01:00
Stephan Porada
0af783a5a6 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-11-06 15:40:47 +01:00
Stephan Porada
08aafb8f99 Add corpus analysis stuff 2019-11-06 15:40:43 +01:00
Patrick Jentsch
5aa777bc11 Set corpus analysis connection stop signal 2019-11-06 14:45:08 +01:00