Commit Graph
106 Commits
Author SHA1 Message Date
marko.ferme 7998a767c5 dev docker-compose 2023-01-12 14:32:25 +01:00
marko.ferme 53b7011d3a Merge remote-tracking branch 'clarin/main' 2023-01-12 14:32:04 +01:00
markoferme 05286e520f Delete docker-compose.yml 2023-01-12 14:29:41 +01:00
marko.ferme 7c42cc3702 Added prod file for clarin and removed dev docker-compose 2023-01-12 14:28:00 +01:00
marko.ferme 62a6539fa4 db fix 2023-01-12 14:24:29 +01:00
marko.ferme 49d345bd7d typo 2023-01-10 19:45:19 +01:00
marko.ferme 4ac5b337c6 swager update 2023-01-10 18:43:15 +01:00
marko.ferme dc92c93786 Še en mini fix za boljšo čitljivost 2023-01-10 12:31:19 +01:00
marko.ferme a2a8fd25a3 Merge remote-tracking branch 'origin/main'
Last fixes
2023-01-10 12:13:00 +01:00
marko.ferme 3315442b21 Bug fix 2023-01-10 12:05:39 +01:00
marko.ferme f2bdf3d9f6 Merge remote-tracking branch 'origin/main'
Merge popravkov vrste in celega brancha z definicijami, kanonizirano obliko ter kodo ijs-ja
2023-01-10 12:00:54 +01:00
marko.ferme 8a42e55c88 add models 2023-01-10 11:22:16 +01:00
marko.ferme 69a92a3420 Working fix pre merge 2023-01-10 11:20:14 +01:00
Kikimanox 90adc995b1 Additioanl fixes regarding error catching and reporting at ATEapi related jobs 2022-12-23 18:10:00 +01:00
Kikimanox 44d4e58ec3 increased recursion limit at conllu utils since it made some files not go trough 2022-12-23 17:56:55 +01:00
Kikimanox ae9dd4c1c3 job creation no longer checks for already existing/same jobs 2022-12-22 18:31:55 +01:00
Kikimanox 3f4a298fd1 Changed the way jobs are handled, so they can be cancelled mid-operation now (doesn't work on izlusciPoIskanju currently though so cancelling that returns a different message/denial) 2022-12-22 18:31:15 +01:00
Kikimanox 27fb70987c Console error logging at unexpected errors 2022-12-22 11:45:04 +01:00
Marko Ferme 1cd7663d49 Main brez modelov 2022-12-07 06:22:36 +01:00
Kikimanox 120c85a2a1 Slight readme update 2022-12-06 21:57:22 +01:00
Kikimanox d3cedd47b5 'Priority que' logic implementation 2022-12-06 21:53:19 +01:00
Kikimanox 911bc8f0c9 Added mentioned post requests, made it so that the response body is a clear json (as requested) in case the response is a json, fixed decimal bug, updated swagger templates and json 2022-11-29 17:14:40 +01:00
Kikimanox 3c2577a5d6 Workaround for enabling ATEapi to work on the server, it doesn't without this 2022-11-21 12:02:58 +01:00
Kikimanox e82f5eafa6 Quick update related to job_output formatting 2022-11-21 11:42:06 +01:00
Kikimanox dd79c42c59 ATE api update 3 2022-11-11 15:45:22 +01:00
Kikimanox e9345ee887 ATE api update 2 2022-11-11 15:45:00 +01:00
Kikimanox 7b7214905a Updated so json doesn't get sorted anymore, bugfixes, added new parameter to two endpoints, docker-compose jobs saving location update, json & swagger update 2022-11-03 15:58:11 +01:00
Kikimanox fe6120fb18 Return 200 should be done without Response fix 2022-10-24 18:54:39 +02:00
Kikimanox e95d534e78 Added deleting finished/not started jobs. Modified code to work with new ATEapi docker 2022-10-24 16:54:58 +02:00
Kikimanox 5947cc1b00 Updated ate-api 2022-10-24 16:32:14 +02:00
Kikimanox 21fa8542c9 Added async version of izlusciPoIskanju 2022-10-19 11:24:59 +02:00
Kikimanox 7682cd0e0a popravljen json, swagger, oss_controller, da se ujema z novo strukturo zahtev 2022-10-19 10:39:30 +02:00
Marko Ferme 94b04a2922 oblika fix 2022-10-19 10:12:15 +02:00
Marko Ferme 107e5fd4d3 Dodani popravki za iskanje kandidatov in števila besedil. Dodana logika za klicanje ocrja. Popravljen bug za timeout v ateapi-ju. Popravljen swager. 2022-10-19 04:07:15 +02:00
Marko Ferme d44a268b24 Merge remote-tracking branch 'origin/main' 2022-10-19 00:06:38 +02:00
Marko Ferme aefb4800c8 db connection and oss file count 2022-10-19 00:01:34 +02:00
Kikimanox acb028073a Added additional error handling to job related functionalities. (Formatted file in db_utils, which might cause a merge conflict, just override my file later) 2022-10-18 22:48:51 +02:00
Marko Ferme 8ffa85cd76 mariadb update 2022-10-18 19:58:04 +02:00
Kikimanox 82718d71bb lets not use localhost on the server 2022-10-18 19:25:05 +02:00
Kikimanox f89b84dd31 extract method (async) 2022-10-18 19:24:38 +02:00
Kikimanox 673a83691b Improved extract method to work properly (sync) 2022-10-18 19:08:41 +02:00
Kikimanox b483e1643f Update gitignore and added todo to README.md 2022-10-18 16:38:58 +02:00
Marko Ferme abf79be4c8 tika update 2022-10-18 12:26:16 +02:00
Kikimanox 5833dfafc8 Preperation for merging multiple conllus, also added ATE files 2022-10-18 10:07:01 +02:00
Kikimanox be84cdae1b No need for two datetime imports, whoops 2022-09-20 00:05:02 +02:00
Kikimanox ac35026577 Typo 2022-09-19 23:50:57 +02:00
Kikimanox 916b2bef2a implemented the rest of the async functions and changed the way multithreading works 2022-09-19 17:11:59 +02:00
Kikimanox 9e82f3b93a updated endpoint definitions/names and reformatted some files and code 2022-09-14 16:40:29 +02:00
Kikimanox 0b90b6555b forgot to remove temp wrong name 2022-09-01 18:33:46 +02:00
Kikimanox 729dfb14cf Added two more async endpoints (temporary implementation) 2022-09-01 18:30:58 +02:00