Commit Graph

Select branches

Hide Pull Requests

main

Mono Color

• cef248be66 Delete docker-compose.yml main markoferme 2023-01-12 15:01:45 +01:00
• ab7c465e87 Merge remote-tracking branch 'clarin/main' marko.ferme 2023-01-12 15:01:13 +01:00
• 7452988275 umaknil model marko.ferme 2023-01-12 14:38:35 +01:00
• 7998a767c5 dev docker-compose marko.ferme 2023-01-12 14:32:25 +01:00
• 53b7011d3a Merge remote-tracking branch 'clarin/main' marko.ferme 2023-01-12 14:32:04 +01:00
• b30fc724a0 Delete docker-compose.yml markoferme 2023-01-12 14:29:41 +01:00
• 05286e520f Delete docker-compose.yml markoferme 2023-01-12 14:29:41 +01:00
• 7c42cc3702 Added prod file for clarin and removed dev docker-compose marko.ferme 2023-01-12 14:28:00 +01:00
• 62a6539fa4 db fix marko.ferme 2023-01-12 14:24:29 +01:00
• 49d345bd7d typo marko.ferme 2023-01-10 19:45:19 +01:00
• 4ac5b337c6 swager update marko.ferme 2023-01-10 18:43:15 +01:00
• dc92c93786 Še en mini fix za boljšo čitljivost marko.ferme 2023-01-10 12:31:19 +01:00
• a2a8fd25a3 Merge remote-tracking branch 'origin/main' Last fixes marko.ferme 2023-01-10 12:13:00 +01:00
• 3315442b21 Bug fix marko.ferme 2023-01-10 12:05:39 +01:00
• f2bdf3d9f6 Merge remote-tracking branch 'origin/main' marko.ferme 2023-01-10 12:00:54 +01:00
• 8a42e55c88 add models marko.ferme 2023-01-10 11:22:16 +01:00
• 69a92a3420 Working fix pre merge marko.ferme 2023-01-10 11:20:14 +01:00
• 90adc995b1 Additioanl fixes regarding error catching and reporting at ATEapi related jobs Kikimanox 2022-12-23 18:10:00 +01:00
• 44d4e58ec3 increased recursion limit at conllu utils since it made some files not go trough Kikimanox 2022-12-23 17:56:55 +01:00
• ae9dd4c1c3 job creation no longer checks for already existing/same jobs Kikimanox 2022-12-22 18:31:55 +01:00
• 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) Kikimanox 2022-12-22 18:31:15 +01:00
• 27fb70987c Console error logging at unexpected errors Kikimanox 2022-12-22 11:45:04 +01:00
• 1cd7663d49 Main brez modelov Marko Ferme 2022-12-07 06:22:36 +01:00
• 120c85a2a1 Slight readme update Kikimanox 2022-12-06 21:57:22 +01:00
• d3cedd47b5 'Priority que' logic implementation Kikimanox 2022-12-06 21:53:19 +01:00
• 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 Kikimanox 2022-11-29 17:14:40 +01:00
• 3c2577a5d6 Workaround for enabling ATEapi to work on the server, it doesn't without this Kikimanox 2022-11-21 12:02:58 +01:00
• e82f5eafa6 Quick update related to job_output formatting Kikimanox 2022-11-21 11:42:06 +01:00
• dd79c42c59 ATE api update 3 Kikimanox 2022-11-11 15:45:22 +01:00
• e9345ee887 ATE api update 2 Kikimanox 2022-11-11 15:45:00 +01:00
• 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 Kikimanox 2022-11-03 15:58:11 +01:00
• fe6120fb18 Return 200 should be done without Response fix Kikimanox 2022-10-24 18:54:39 +02:00
• e95d534e78 Added deleting finished/not started jobs. Modified code to work with new ATEapi docker Kikimanox 2022-10-24 16:54:58 +02:00
• 5947cc1b00 Updated ate-api Kikimanox 2022-10-24 16:32:14 +02:00
• 21fa8542c9 Added async version of izlusciPoIskanju Kikimanox 2022-10-19 11:24:59 +02:00
• 7682cd0e0a popravljen json, swagger, oss_controller, da se ujema z novo strukturo zahtev Kikimanox 2022-10-19 10:39:30 +02:00
• 94b04a2922 oblika fix Marko Ferme 2022-10-19 10:12:15 +02:00
• 107e5fd4d3 Dodani popravki za iskanje kandidatov in števila besedil. Dodana logika za klicanje ocrja. Popravljen bug za timeout v ateapi-ju. Popravljen swager. Marko Ferme 2022-10-19 04:07:15 +02:00
• d44a268b24 Merge remote-tracking branch 'origin/main' Marko Ferme 2022-10-19 00:06:38 +02:00
• aefb4800c8 db connection and oss file count Marko Ferme 2022-10-19 00:01:34 +02:00
• 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) Kikimanox 2022-10-18 22:48:51 +02:00
• 8ffa85cd76 mariadb update Marko Ferme 2022-10-18 19:58:04 +02:00
• 82718d71bb lets not use localhost on the server Kikimanox 2022-10-18 19:25:05 +02:00
• f89b84dd31 extract method (async) Kikimanox 2022-10-18 19:24:38 +02:00
• 673a83691b Improved extract method to work properly (sync) Kikimanox 2022-10-18 19:08:41 +02:00
• b483e1643f Update gitignore and added todo to README.md Kikimanox 2022-10-18 16:38:58 +02:00
• abf79be4c8 tika update Marko Ferme 2022-10-18 12:26:16 +02:00
• 5833dfafc8 Preperation for merging multiple conllus, also added ATE files Kikimanox 2022-10-18 10:07:01 +02:00
• be84cdae1b No need for two datetime imports, whoops Kikimanox 2022-09-20 00:05:02 +02:00
• ac35026577 Typo Kikimanox 2022-09-19 23:50:57 +02:00
• 916b2bef2a implemented the rest of the async functions and changed the way multithreading works Kikimanox 2022-09-19 17:11:59 +02:00
• 9e82f3b93a updated endpoint definitions/names and reformatted some files and code Kikimanox 2022-09-14 16:40:29 +02:00
• 0b90b6555b forgot to remove temp wrong name Kikimanox 2022-09-01 18:33:46 +02:00
• 729dfb14cf Added two more async endpoints (temporary implementation) Kikimanox 2022-09-01 18:30:58 +02:00
• fcf192b00b Made text extraction methods more generic for re-use in other modules/files (should probably move these into some utils file) Kikimanox 2022-09-01 18:26:03 +02:00
• 0da8332426 Rename: oznaciBesedilo -> oznaciBesediloAsync Kikimanox 2022-09-01 17:34:16 +02:00
• 93aba45e6a Dodane backup metode, ce bi slucajno padla tika. Kikimanox 2022-09-01 17:33:55 +02:00
• 511118f4d7 no need for uncommented maria db if this wont be ran otuside of the docker Kikimanox 2022-08-31 18:37:23 +02:00
• 63099da8c9 reverting most useless attempts at trying to make this work Kikimanox 2022-08-31 18:34:51 +02:00
• 8bd8567b98 running out of ideas what to do Kikimanox 2022-08-31 18:30:49 +02:00
• 621b047ebb forgot to remove dot Kikimanox 2022-08-31 18:14:31 +02:00
• 3e450b9d41 forgot to remove dot Kikimanox 2022-08-31 18:00:53 +02:00
• c4558242e1 time to try running it without docker instead Kikimanox 2022-08-31 18:00:44 +02:00
• 3415d790d6 . Kikimanox 2022-08-31 17:52:43 +02:00
• ffbb292289 reverted all workarounds that didn't work Kikimanox 2022-08-31 17:44:03 +02:00
• 7d4aceb457 reverted attempted workarounds back to initial state Kikimanox 2022-08-31 17:39:46 +02:00
• 08711f38f9 maybe this? Kikimanox 2022-08-31 17:33:09 +02:00
• cf8e217c82 Will this workaround maybe work on the server? Kikimanox 2022-08-31 17:27:19 +02:00
• bb4adeee2e testing Kikimanox 2022-08-31 16:39:15 +02:00
• 55ea46397f maybe this will work, because it works locally... Kikimanox 2022-08-31 16:33:40 +02:00
• 80a9b9638b seems like "http://tika:9999/tika" endpoint doesn't want to work, lets see if "http://localhost:9999/tika" works..? Kikimanox 2022-08-31 16:24:51 +02:00
• 0561fd03af changed the way tika runs in docker-compose.yml, port 9998 already taken on the server currently Kikimanox 2022-08-31 16:20:04 +02:00
• a8319072f8 Trying to figure out how to run this without messing up Ivan's Tika instance Kikimanox 2022-08-31 15:52:54 +02:00
• 8b974c7b55 back to 9998 Kikimanox 2022-08-31 15:45:22 +02:00
• f28fa109fa forgot to remove dot Kikimanox 2022-08-31 15:42:27 +02:00
• 500e5aa2a5 Different tika port since 9998 is already in use Kikimanox 2022-08-31 15:42:19 +02:00
• f16c78bbdc Dodana endpointa za sync pridobivanje connlu-jev, ali preprosto file -> text, ali file -> ocr -> text. Kikimanox 2022-08-31 15:37:04 +02:00
• c30b014a68 Dodana tika & format (v swagger definiciji se ni nic novega v tem commitu) Kikimanox 2022-08-31 14:49:47 +02:00
• 5a87193490 Hitri popravki in navodila Marko Ferme 2022-08-31 06:52:47 +02:00
• fedb72f1d7 does this path change work? Kikimanox 2022-08-29 23:43:37 +02:00
• dfe2f08b84 debug Kikimanox 2022-08-29 23:36:07 +02:00
• 5bdba94035 limit ngrams to 200 because this temporary implementation is kind of slow Kikimanox 2022-08-29 23:35:22 +02:00
• 246c60de02 attachment_filename -> download_name Kikimanox 2022-08-29 23:31:59 +02:00
• 77c5473142 fix dateutil ver Kikimanox 2022-08-29 23:19:20 +02:00
• c8586513a9 Added new logic (temporary logic for getting files by search) and converting from files to txt Kikimanox 2022-08-29 22:53:49 +02:00
• dd42b56c28 PYTHONUNBUFFERED=1 helped, but the main problem was not being able to connect to mariadb... Kikimanox 2022-08-29 16:42:27 +02:00
• 1f2c9161fb will this workaround work....? Kikimanox 2022-08-29 16:36:07 +02:00
• 7360c41099 will this workaround work...? Kikimanox 2022-08-29 16:29:20 +02:00
• ba944cfac0 debug info Kikimanox 2022-08-29 16:20:25 +02:00
• 44222fea39 typo Kikimanox 2022-08-29 15:32:39 +02:00
• 796fca551a more server specific paths Kikimanox 2022-08-29 15:26:12 +02:00
• 15fc2e0f62 fixed docker specific paths so that everything works... Kikimanox 2022-08-29 15:20:21 +02:00
• 748db5ad0f nl Kikimanox 2022-08-29 14:26:02 +02:00
• 4be3ace842 tmp debug info Kikimanox 2022-08-29 14:02:59 +02:00
• 7cd4004ba9 Added .env logic (finally) Kikimanox 2022-08-29 13:01:02 +02:00
• 023d448a28 path typo Kikimanox 2022-08-29 12:50:45 +02:00
• 3e38875485 dockerfile, req update Kikimanox 2022-08-29 12:45:08 +02:00
• 64e10542f2 update requirements.txt Kikimanox 2022-08-29 12:28:41 +02:00
• a821551e30 Forgot to obfuscate db info... Na sreco je to interni git 😅😓 ... Naredi ze .env, da ne bos rabil pri vsakem commitu te datoteke spreminjat te vrednosti.. Kristjan Žagar 2022-08-12 11:48:28 +02:00
• ac682a6973 path change* Kristjan Žagar 2022-08-12 11:41:54 +02:00