Marmelator/image-classification-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 29 Wiki Activity
201 Commits 4 Branches 400 Tags
Commit Graph

201 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cdietrich
684aca364f adapt service-container to image-service-v2 2022-03-01 14:17:37 +01:00
Julius Unverfehrt
a4fa73deaa Pull request #14: optional debug progress bar added 
Merge in RR/fb-detr from add-debug-progress-bar to master

Squashed commit of the following:

commit 3449be1b46f73a5e9ae3719ed2821a1b7faca9e4
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Wed Feb 23 10:26:47 2022 +0100

    refactoring; added VERBOSE flag to config

commit e50234e205dfd7a40aaf7981da85e28048d9efba
Merge: 89703ca f6c51be
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Wed Feb 23 09:45:33 2022 +0100

    Merge branch 'config_changes' into add-debug-progress-bar

commit f6c51beeaa952c18c80b7af6b7a46b9de8f521c3
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Wed Feb 23 09:44:00 2022 +0100

    added env var

commit 89703caa776f0fad55757ab22568e45949b2b310
Author: Julius Unverfehrt <Julius.Unverfehrt@iqser.com>
Date:   Wed Feb 23 08:28:52 2022 +0100

    optional debug progress bar added
 2022-02-23 10:51:24 +01:00
Julius Unverfehrt
1a06214267 quickfix far to eager logging calculation 2022-02-22 08:39:24 +01:00
Julius Unverfehrt
05a28e4658 Pull request #13: Sonar scan 💖 
Merge in RR/fb-detr from sonar-scan to master

Squashed commit of the following:

commit b5ea19f16e198071db9bc6b4864d8b7789884a25
Author: Julius Unverfehrt <Julius.Unverfehrt@iqser.com>
Date:   Mon Feb 21 17:36:02 2022 +0100

    💖

commit e1554c1f874a7af0ae3e6f480ca1db05e62a3a0b
Author: Julius Unverfehrt <Julius.Unverfehrt@iqser.com>
Date:   Mon Feb 21 16:54:56 2022 +0100

    sonarscan WIP
 2022-02-21 17:38:13 +01:00
Matthias Bisping
662d7e95f4 added gitignore 2022-02-21 16:38:24 +01:00
Julius Unverfehrt
0f4acddd02 Pull request #10: adjusted build scripts for repo rename 
Merge in RR/fb-detr from refactor-build to master

Squashed commit of the following:

commit 96d272ecfaf94b88ade5dd64fce662832ec44684
Author: Julius Unverfehrt <Julius.Unverfehrt@iqser.com>
Date:   Mon Feb 21 16:31:31 2022 +0100

    adjusted build scripts for repo rename
 2022-02-21 16:32:38 +01:00
Matthias Bisping
3e2cb94060 Pull request #9: Docker image tuning, batching of pdf pages and misc other 
Merge in RR/fb_detr_prediction_container from docker-image-tuning to master

Squashed commit of the following:

commit 9b30e6317aaf892fcb6f87275d03e2efb76954bf
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Mon Feb 21 15:17:01 2022 +0100

    applied black

commit 84a57ac29723910dbc2c4d8ccce58c9d3131a305
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Mon Feb 21 15:15:15 2022 +0100

    refactorig of tqdm

commit b26c52765c58125826099072d510a39baabce73e
Author: Julius Unverfehrt <Julius.Unverfehrt@iqser.com>
Date:   Mon Feb 21 14:52:11 2022 +0100

    correcting versioning of docker-compose

commit 23752eec0d95cc543f15a86c78bd8531ebfdde7d
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Mon Feb 21 14:49:26 2022 +0100

    put tqdm progress in different place

commit e2e109ea7125c90f5b15ec374f3cbfef41e2ee9e
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Mon Feb 21 11:51:09 2022 +0100

    fixed batching index bug

commit 6ca508ac55dd02ded356617653f580099e1cf186
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Mon Feb 21 11:37:34 2022 +0100

    batching WIP

commit 0ceb7c1415b10230397f4860ac4e314d44bfbfd1
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Fri Feb 18 19:21:02 2022 +0100

    debug mode for webserver renamed

commit 617f07a0296ad3efc85b6ee52d1641cdfa22d3d3
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Fri Feb 18 18:25:39 2022 +0100

    refactoring, better logging, added compose file for local testing

commit a24f799614e22481dd20b578c354e33474bec5c0
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Fri Feb 18 17:31:14 2022 +0100

    updated submodule

commit 67b64606e081373e5c30ccf5bfafcb91dcc9a74e
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Fri Feb 18 17:29:20 2022 +0100

    cleanup: better config; refactoring; renaming

commit c3a1ab560879d6a1e6ce003c74a07d62175316f7
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Fri Feb 18 15:55:35 2022 +0100

    tweaked dockerfiles

commit 43f7a32265243bc0f110bd307325b5404e8726a8
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Fri Feb 18 15:02:49 2022 +0100

    added dockerignore
 2022-02-21 15:36:38 +01:00
Matthias Bisping
9554c1d82a Merge branch 'master' of ssh://git.iqser.com:2222/rr/fb_detr_prediction_container 2022-02-18 12:36:13 +01:00
Matthias Bisping
6a06f8f7df Pull request #8: Exception handling 
Merge in RR/fb_detr_prediction_container from exception_handling to master

Squashed commit of the following:

commit 591339edfc9fd9c1dfb26119b5b35336fde696f1
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Fri Feb 18 11:49:10 2022 +0100

    removed debug prints

commit bbbf50c3ba1a3b3f0e0a91fbc64b38a5f3a8d8eb
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Fri Feb 18 11:48:18 2022 +0100

    fixed docker.sh base-dockerfile name

commit 82b0453dcfd7f099336185bcb059d49c37336d28
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Fri Feb 18 11:00:56 2022 +0100

    dinge

commit bd8778256624b11cab4ed083d41e254120fdc158
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Fri Feb 18 10:58:48 2022 +0100

    fixed docker.shs

commit 42cb54fb150d506243bde1b654cc3f7b90ae2069
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Fri Feb 18 10:56:11 2022 +0100

    fixed (?) path to submodule in planspec script

commit 981304483870ccce0868a59514234cec8c6b5234
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Fri Feb 18 10:53:38 2022 +0100

    added submodule init call to docker-build.sh

commit 6a1745a4d3857f49c460ac1a2479d44e79adf695
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Fri Feb 18 10:27:30 2022 +0100

    debug echos

commit 659828d3a9220d4f009f53d7bae0dc44786e831e
Merge: 91af62c 91ee3b7
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Fri Feb 18 10:09:33 2022 +0100

    Merge branch 'master' into exception_handling

commit 91ee3b778201b095d279f8e1f9ec6bef7f863edb
Merge: 08b2583 b7ca7cb
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Fri Feb 18 10:09:09 2022 +0100

    Merge branch 'master' of ssh://git.iqser.com:2222/rr/fb_detr_prediction_container

commit 91af62c09e852f7393aac8172634c06d2b7f7e75
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Fri Feb 18 09:53:17 2022 +0100

    renaming

commit 0e5f861b79f747a4e338c0d9b083d2e4a35d9893
Merge: 08b2583 03274d4
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Fri Feb 18 09:52:10 2022 +0100

    Merge branch 'master' of ssh://git.iqser.com:2222/rr/fb_detr_prediction_container into exception_handling

commit 08b2583b0db78cf6c87a2c68f372a91800abde7b
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Fri Feb 18 09:49:49 2022 +0100

    renaming

commit e5053345669eb1336d3327ece5c5514c694e1801
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Fri Feb 18 09:49:31 2022 +0100

    applied black

commit e051ef6cc4aa95ed9ec8b83c96a1a087edb652b6
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Fri Feb 18 09:48:33 2022 +0100

    exception handling
 2022-02-18 12:35:59 +01:00
Matthias Bisping
91ee3b7782 Merge branch 'master' of ssh://git.iqser.com:2222/rr/fb_detr_prediction_container 2022-02-18 10:09:09 +01:00
cdietrich
b7ca7cb447 change dockerfile 2022-02-18 09:56:47 +01:00
Matthias Bisping
08b2583b0d renaming 2022-02-18 09:49:49 +01:00
Matthias Bisping
e505334566 applied black 2022-02-18 09:49:31 +01:00
Matthias Bisping
e051ef6cc4 exception handling 2022-02-18 09:48:33 +01:00
cdietrich
03274d4372 change dockerfile 2022-02-18 09:47:15 +01:00
cdietrich
e9b3959785 adjusted subdir 2022-02-18 09:19:31 +01:00
Clarissa Dietrich
8dae939a34 Pull request #7: change dockerfile 
Merge in RR/fb_detr_prediction_container from k8s-service to master

* commit 'e86385f796ec75054b2c6bf4e18dc43a804cdd55':
  change dockerfile
 2022-02-18 09:13:57 +01:00
cdietrich
e86385f796 change dockerfile 2022-02-18 08:58:54 +01:00
Clarissa Dietrich
471d6f21dd Pull request #6: rename docker file base 
Merge in RR/fb_detr_prediction_container from k8s-service to master

* commit '199e98b786a9bbd7c24b9b368775d4e112a31f9a':
  change dockerfile
  change dockerfile
  change dockerfile
  adapt sonar settings
  adapt sonar settings
  fix bug
  fix bug
  rename docker file base
 2022-02-18 08:55:12 +01:00
cdietrich
199e98b786 change dockerfile 2022-02-18 08:46:08 +01:00
cdietrich
6a9c996820 change dockerfile 2022-02-18 08:37:00 +01:00
cdietrich
eff1fe4294 change dockerfile 2022-02-18 08:30:28 +01:00
cdietrich
b26bf8f250 adapt sonar settings 2022-02-18 08:13:15 +01:00
cdietrich
ac9c48fc32 adapt sonar settings 2022-02-18 08:10:38 +01:00
cdietrich
0acccb7c27 fix bug 2022-02-18 08:07:52 +01:00
cdietrich
bf710dec7a fix bug 2022-02-17 16:41:18 +01:00
cdietrich
02893cc91b rename docker file base 2022-02-17 16:38:14 +01:00
Christoph  Schabert
24c5ca051a PlanSpec.java edited online with Bitbucket 2022-02-17 16:33:36 +01:00
Christoph  Schabert
0aacca0982 PlanSpec.java edited online with Bitbucket 2022-02-17 16:31:58 +01:00
Clarissa Dietrich
1319dc83af Pull request #5: K8s service 
Merge in RR/fb_detr_prediction_container from k8s-service to master

* commit '63fbeba1a54b62bcab913161a2c4e104dce95cbc':
  change service name to repo name
  add live and ready probes
  add bamboo-specs
 2022-02-17 16:30:53 +01:00
cdietrich
63fbeba1a5 change service name to repo name 2022-02-17 16:25:40 +01:00
cdietrich
07cb72a572 add live and ready probes 2022-02-17 16:16:43 +01:00
cdietrich
d36245e1a0 add bamboo-specs 2022-02-17 16:07:21 +01:00
Matthias Bisping
709fa77b57 readme updated 2022-02-16 14:24:53 +01:00
Julius Unverfehrt
b00ff021f8 Pull request #4: waitress as webserver 
Merge in RR/fb_detr_prediction_container from suppress_userwarnings to master

Squashed commit of the following:

commit ecdacd449b466b206434fd8d6729e55f91f7c171
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Wed Feb 9 14:58:00 2022 +0100

    updated submodule

commit 114c0b963de024cfef30a3f7ac084751611c4ea0
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Wed Feb 9 14:47:00 2022 +0100

    fixed docker build invocation

commit daa01cda5328d0e25694f89e83a1aa9e21d4bfcb
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Wed Feb 9 14:45:40 2022 +0100

    refactoring; added waitress wrapper

commit d9828dfcc86cdd021f4fc37078f133d8c1fe4924
Merge: 32ffd0e 9a2a5b2
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Wed Feb 9 13:22:26 2022 +0100

    Merge branch 'master' of ssh://git.iqser.com:2222/rr/fb_detr_prediction_container into suppress_userwarnings

commit 32ffd0ea97ee39af7526966efc8ec46b7553b415
Author: Julius Unverfehrt <Julius.Unverfehrt@iqser.com>
Date:   Wed Feb 9 13:09:31 2022 +0100

    typo fixed

commit 6d03a590434c70feb4836a0e024b24e92ed98f73
Author: Julius Unverfehrt <Julius.Unverfehrt@iqser.com>
Date:   Wed Feb 9 13:06:58 2022 +0100

    added suppress function to suppress pytorch-futre warnings cluttering the service logs
 2022-02-09 15:10:02 +01:00
Matthias Bisping
9a2a5b2362 Pull request #3: split dockerfile 
Merge in RR/fb_detr_prediction_container from docker-splitting to master

* commit '177de04459c0c5e89749d1a67271d96ce97d57ec':
  removed dockerfile arg from bash scrip
  split dockerfile
 2022-02-09 13:21:46 +01:00
Matthias Bisping
177de04459 removed dockerfile arg from bash scrip 2022-02-09 13:20:29 +01:00
Matthias Bisping
2910ea7e63 split dockerfile 2022-02-09 12:24:13 +01:00
Matthias Bisping
c8e14ab2b5 Merge 2022-02-04 17:47:23 +01:00
Matthias Bisping
8b308a0906 removed outdated comment 2022-02-04 17:46:17 +01:00
Matthias Bisping
8ebbe0e6a7 Pull request #2: Non max supprs 
Merge in RR/fb_detr_prediction_container from non_max_supprs to master

Squashed commit of the following:

commit 9cc31b70e39412b3613a117228554608d947dbb5
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Fri Feb 4 17:41:00 2022 +0100

    refactoring, renaming

commit ebc37299df598b71f7569d8e8473bdb66bbbbd1a
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Fri Feb 4 17:34:26 2022 +0100

    renaming

commit d694866e1e98e6129f37eaf4c1950b962fed437f
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Fri Feb 4 17:33:07 2022 +0100

    applied black

commit 381fe2dbf5d88f008d87bd807b84174376c5bcfe
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Fri Feb 4 17:32:22 2022 +0100

    duplicate detection removal completed

commit ef2bab300322da3b12326d470f1c41263779e4a0
Author: Julius Unverfehrt <Julius.Unverfehrt@iqser.com>
Date:   Fri Feb 4 09:58:49 2022 +0100

    box merging algo  WIP

commit d770e56a7f31a28dea635816cae3b7b75fed0e24
Author: Julius Unverfehrt <Julius.Unverfehrt@iqser.com>
Date:   Fri Feb 4 09:37:17 2022 +0100

    refactor & box dropping working but algo is faulty & drops too much WIP

commit 289848871caadb4438f889b8a030f30cfb64201a
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Thu Feb 3 23:56:04 2022 +0100

    non max supprs WIP

commit 2f1ec100b2d33409e9178af8d53218b57d9bb0e2
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Thu Feb 3 13:32:22 2022 +0100

    changed Flask to not listen on public IP
 2022-02-04 17:45:55 +01:00
Matthias Bisping
9cc31b70e3 refactoring, renaming 2022-02-04 17:41:00 +01:00
Matthias Bisping
ebc37299df renaming 2022-02-04 17:34:26 +01:00
Matthias Bisping
d694866e1e applied black 2022-02-04 17:33:07 +01:00
Matthias Bisping
381fe2dbf5 duplicate detection removal completed 2022-02-04 17:32:22 +01:00
Julius Unverfehrt
ef2bab3003 box merging algo WIP 2022-02-04 09:58:49 +01:00
Julius Unverfehrt
d770e56a7f refactor & box dropping working but algo is faulty & drops too much WIP 2022-02-04 09:37:17 +01:00
Matthias Bisping
289848871c non max supprs WIP 2022-02-03 23:56:04 +01:00
Matthias Bisping
2f1ec100b2 changed Flask to not listen on public IP 2022-02-03 13:32:22 +01:00
Matthias Bisping
e4dc6631b5 Pull request #1: Setup 
Merge in RR/fb_detr_prediction_container from setup to master

Squashed commit of the following:

commit 7fae4878d4250676367b7201fa163a4b67f79f84
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Thu Feb 3 11:22:12 2022 +0100

    readded annotation to client

commit ff788030f6b3b342919a7fd31dfa66940033d7e1
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Thu Feb 3 11:15:16 2022 +0100

    applied black

commit 3521444f678950a2772b725c6964751e0e655736
Merge: 4080aff 51d6597
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Thu Feb 3 10:39:11 2022 +0100

    Merge branch 'setup' of ssh://git.iqser.com:2222/rr/fb_detr_prediction_container into setup

commit 4080affd21a02ad32c61fbd2027511f51a202d63
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Thu Feb 3 10:39:02 2022 +0100

    added poppler-utils download to Dockerfile, since pdf2image only is a wrapper for it

commit 51d6597b056ae9ac693280f65a3f37d46b1276cf
Author: Julius Unverfehrt <Julius.Unverfehrt@iqser.com>
Date:   Thu Feb 3 09:43:35 2022 +0100

    Structure change for local backbone lookup (working now)

commit ac314d5148d6e026c67f00df45a8bbc70c15b52d
Author: Julius Unverfehrt <Julius.Unverfehrt@iqser.com>
Date:   Thu Feb 3 09:35:41 2022 +0100

    env bug fixed

commit 1c3221fe4956911b29fd8fede8d07dcdefad06d8
Author: Julius Unverfehrt <Julius.Unverfehrt@iqser.com>
Date:   Thu Feb 3 09:23:55 2022 +0100

    ENV correctly set now

commit 58069440583f1f78cfb2fb796fa4dc4a63e2916a
Author: Julius Unverfehrt <Julius.Unverfehrt@iqser.com>
Date:   Thu Feb 3 08:41:29 2022 +0100

    ENV for local torch model lookup set

commit f0501cf0bf904793e8e04afbd3d80ee84af9d981
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Wed Feb 2 18:28:44 2022 +0100

    changed host and port for flask

commit 986fda22f6656b10930628d0d284995b33ea2df5
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Wed Feb 2 17:33:07 2022 +0100

    added debug webserver method

commit 64b857ce53757ec2b7e7c327962fa65b551603a0
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Wed Feb 2 16:59:11 2022 +0100

    moved utils into module; fixed open-cv (maybe)

commit c62ada183135e12b41a29c6822472e33698f947f
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Wed Feb 2 15:55:10 2022 +0100

    made bash scripts executable

commit 982bdd7503c14fcf1776ae10c38589475199545e
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Wed Feb 2 15:35:16 2022 +0100

    service building logic added (WIP)

commit 46e5e3b8e67e54ecedaeee4765a3437f08fa4b17
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Wed Feb 2 14:37:28 2022 +0100

    applied black

commit ad93130e66d2e87bc86b2bf1de6234f3c037df48
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Wed Feb 2 14:36:09 2022 +0100

    fixed formatting (w, h -> x2, y2); added drawing logic to caller mock

commit df76f033599e66aaa52143f5e2b156530f643df9
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Wed Feb 2 13:54:34 2022 +0100

    page indices in predictions

commit 5e87c57dff752419486d1a44de9a734e3f840816
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Wed Feb 2 13:17:34 2022 +0100

    service main loop WIP (working in basic version)

commit ba5ec3d57621d090201413309126955940602be9
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Wed Feb 2 13:03:52 2022 +0100

    service main loop WIP

commit 77266f6982ec826eadcdd8a18c5ccf0fc380611b
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Wed Feb 2 11:24:27 2022 +0100

    fixed bug for self.classes == None

commit 858ef7589d6914ad503660a3ddc5e75bf72a6bb7
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Wed Feb 2 11:09:11 2022 +0100

    removed 'postprocessors' argument and attribute

... and 32 more commits
 2022-02-03 11:44:11 +01:00