31 Commits

Author SHA1 Message Date
Julius Unverfehrt
75af55dbda chore(project structure): use src/ structure 2024-02-09 09:47:42 +01:00
francisco.schulz
88fbe077e6 fix: poetry install --without=dev 2023-12-11 10:40:06 +01:00
francisco.schulz
b60f4d0383 use python 3.10 2023-11-28 15:57:53 +01:00
francisco.schulz
f73264874e copy scripts 2023-06-21 15:42:14 +02:00
francisco.schulz
8b9771373b copy image_prediction folder, not just files 2023-06-19 11:26:15 +02:00
francisco.schulz
7b37f3c913 update Dockerfiles 2023-06-07 17:41:54 +02:00
Julius Unverfehrt
81520b1a53 Pull request #46: RED-6205 add prometheus monitoring
Merge in RR/image-prediction from RED-6205-add-prometheus-monitoring to master

Squashed commit of the following:

commit 6932b5ee579a31d0317dc3f76acb8dd2845fdb4b
Author: Julius Unverfehrt <julius.unverfehrt@iqser.com>
Date:   Thu Mar 16 17:30:57 2023 +0100

    update pyinfra

commit d6e55534623eae2edcddaa6dd333f93171d421dc
Author: Julius Unverfehrt <julius.unverfehrt@iqser.com>
Date:   Thu Mar 16 16:30:14 2023 +0100

    set pyinfra subproject to current master commit

commit 030dc660e6060ae326c32fba8c2944a10866fbb6
Author: Julius Unverfehrt <julius.unverfehrt@iqser.com>
Date:   Thu Mar 16 16:25:19 2023 +0100

    adapt serve script to advanced pyinfra API including monitoring of the processing time of images.

commit 0fa0c44c376c52653e517d257a35793797f7be31
Author: Julius Unverfehrt <julius.unverfehrt@iqser.com>
Date:   Thu Mar 16 15:19:57 2023 +0100

    Update dockerfile to work with new pyinfra package setup utilizing pyproject.toml instad of setup.py and requirments.txt

commit aad53c4d313f908de93a13e69e2cb150db3be6cb
Author: Julius Unverfehrt <julius.unverfehrt@iqser.com>
Date:   Thu Mar 16 14:16:04 2023 +0100

    remove no longer needed dependencies
2023-03-17 16:12:59 +01:00
shamel-hussain
1967945ff7 RED-5718: Revert user changes to allow using a random id 2023-02-28 12:08:32 +01:00
shamel-hussain
7c7b038491 RED-5718: Add a specific user to the image-prediction service 2023-02-27 09:19:37 +01:00
Julius Unverfehrt
d13b8436e2 Pull request #23: add pdf2image & pyinfra installation
Merge in RR/image-prediction from update-build-scripts to master

Squashed commit of the following:

commit 4a5b21d6e6e0d76091443ba3faaad15953855bad
Author: Julius Unverfehrt <julius.unverfehrt@iqser.com>
Date:   Thu Aug 18 15:08:13 2022 +0200

    add pdf2image & pyinfra installation
2022-08-18 15:09:51 +02:00
Matthias Bisping
ddd8d4685e Pull request #9: Tdd refactoring
Merge in RR/image-prediction from tdd_refactoring to master

Squashed commit of the following:

commit f6c64430007590f5d2b234a7f784e26025d06484
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Mon Apr 25 12:18:47 2022 +0200

    renaming

commit 8f40b51282191edf3e2a5edcd6d6acb388ada453
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Mon Apr 25 12:07:18 2022 +0200

    adjusted expetced output for alpha channel in response

commit 7e666302d5eadb1e84b70cae27e8ec6108d7a135
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Mon Apr 25 11:52:51 2022 +0200

    added alpha channel check result to response

commit a6b9f64b51cd888fc0c427a38bd43ae2ae2cb051
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Mon Apr 25 11:27:57 2022 +0200

    readme updated

commit 0d06ad657e3c21dcef361c53df37b05aba64528b
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Mon Apr 25 11:19:35 2022 +0200

    readme updated and config

commit 75748a1d82f0ebdf3ad7d348c6d820c8858aa3cb
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Mon Apr 25 11:19:26 2022 +0200

    refactoring

commit 60101337828d11f5ee5fed0d8c4ec80cde536d8a
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Mon Apr 25 11:18:23 2022 +0200

    multiple reoutes for prediction

commit c8476cb5f55e470b831ae4557a031a2c1294eb86
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Mon Apr 25 11:17:49 2022 +0200

    add banner.txt to container

commit 26ef5fce8a9bc015f1c35f32d40e8bea50a96454
Author: Matthias Bisping <Matthias.Bisping@iqser.com>
Date:   Mon Apr 25 10:08:49 2022 +0200

    Pull request #8: Pipeline refactoring

    Merge in RR/image-prediction from pipeline_refactoring to tdd_refactoring

    Squashed commit of the following:

    commit 6989fcb3313007b7eecf4bba39077fcde6924a9a
    Author: Matthias Bisping <matthias.bisping@iqser.com>
    Date:   Mon Apr 25 09:49:49 2022 +0200

        removed obsolete module

    commit 7428aeee37b11c31cffa597c85b018ba71e79a1d
    Author: Matthias Bisping <matthias.bisping@iqser.com>
    Date:   Mon Apr 25 09:45:45 2022 +0200

        refactoring

    commit 0dcd3894154fdf34bd3ba4ef816362434474f472
    Author: Matthias Bisping <matthias.bisping@iqser.com>
    Date:   Mon Apr 25 08:57:21 2022 +0200

        refactoring; removed obsolete extractor-classifier

    commit 1078aa81144f4219149b3fcacdae8b09c4b905c0
    Author: Matthias Bisping <matthias.bisping@iqser.com>
    Date:   Fri Apr 22 17:18:10 2022 +0200

        removed obsolete imports

    commit 71f61fc5fc915da3941cf5ed5d9cc90fccc49031
    Author: Matthias Bisping <matthias.bisping@iqser.com>
    Date:   Fri Apr 22 17:16:25 2022 +0200

        comment changed

    commit b582726cd1de233edb55c5a76c91e99f9dd3bd13
    Author: Matthias Bisping <matthias.bisping@iqser.com>
    Date:   Fri Apr 22 17:12:11 2022 +0200

        refactoring

    commit 8abc9010048078868b235d6793ac6c8b20abb985
    Author: Matthias Bisping <matthias.bisping@iqser.com>
    Date:   Thu Apr 21 21:25:47 2022 +0200

        formatting

    commit 2c87c419fe3185a25c27139e7fcf79f60971ad24
    Author: Matthias Bisping <matthias.bisping@iqser.com>
    Date:   Thu Apr 21 21:24:05 2022 +0200

        formatting

    commit 50b161192db43a84464125c6d79650225e1010d6
    Author: Matthias Bisping <matthias.bisping@iqser.com>
    Date:   Thu Apr 21 21:20:18 2022 +0200

        refactoring

    commit 9a1446cccfa070852a5d9c0bdbc36037b82541fc
    Author: Matthias Bisping <matthias.bisping@iqser.com>
    Date:   Thu Apr 21 21:04:57 2022 +0200

        refactoring

    commit 6c10b55ff8e61412cb2fe5a5625e660ecaf1d7d1
    Author: Matthias Bisping <matthias.bisping@iqser.com>
    Date:   Thu Apr 21 19:48:05 2022 +0200

        refactoring

    commit 72e785e3e31c132ab352119e9921725f91fac9e2
    Author: Matthias Bisping <matthias.bisping@iqser.com>
    Date:   Thu Apr 21 19:43:39 2022 +0200

        refactoring

    commit f036ee55e6747daf31e3929bdc2d93dc5f2a56ca
    Author: Matthias Bisping <matthias.bisping@iqser.com>
    Date:   Wed Apr 20 18:30:41 2022 +0200

        refactoring pipeline WIP

commit 120721f5f1a7e910c0c2ebc79dc87c2908794c80
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Wed Apr 20 15:39:58 2022 +0200

    rm debug ls

commit 81226d4f8599af0db0e9718fbb1789cfad91a855
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Wed Apr 20 15:28:27 2022 +0200

    no compose down

commit 943f7799d49b6a6b0fed985a76ed4fe725dfaeef
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Wed Apr 20 15:22:17 2022 +0200

    coverage combine

commit d4cd96607157ea414db417cfd7133f56cb56afe1
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Wed Apr 20 14:43:09 2022 +0200

    model builder path in mlruns adjusted

commit 5b90bb47c3421feb6123c179eb68d1125d58ff1e
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Wed Apr 20 10:56:58 2022 +0200

    dvc pull in test running script

commit a935cacf2305a4a78a15ff571f368962f4538369
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Wed Apr 20 10:50:36 2022 +0200

    no clean working dir

commit ba09df7884485b8ab8efbf42a8058de9af60c75c
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Wed Apr 20 10:43:22 2022 +0200

    debug ls

commit 71263a9983dbfe2060ef5b74de7cc2cbbad43416
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Wed Apr 20 09:11:03 2022 +0200

    debug ls

commit 41fbadc331e65e4ffe6d053e2d925e5e0543d8b7
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Tue Apr 19 20:08:08 2022 +0200

    debug echo

commit bb19698d640b3a99ea404e5b4b06d719a9bfe9e9
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Tue Apr 19 20:01:59 2022 +0200

    skip server predict test

commit 5094015a87fc0976c9d3ff5d1f4c6fdbd96b7eae
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date:   Tue Apr 19 19:05:50 2022 +0200

    sonar stage after build stage

... and 253 more commits
2022-04-25 12:25:41 +02:00
Julius Unverfehrt
2117e2a294 Quickfix Dockerfile 2022-03-02 11:44:18 +01:00
Julius Unverfehrt
ca365c66f8 Quickfix Dockerfile 2022-03-02 11:37:39 +01:00
Julius Unverfehrt
06ade2ce71 Quickfix Dockerfile 2022-03-02 11:29:56 +01:00
Julius Unverfehrt
8943e34078 Quickfix Dockerfile 2022-03-02 11:26:22 +01:00
Julius Unverfehrt
3a21f94f19 Quickfix Dockerfile 2022-03-02 11:15:06 +01:00
Julius Unverfehrt
d306b8946d Quickfix Dockerfile 2022-03-02 11:10:54 +01:00
Julius Unverfehrt
e2fc1257f1 Quickfix Dockerfile 2022-03-02 11:04:44 +01:00
cdietrich
42ae5793e0 RED-3501: adapt service-container to image-service-v2 2022-03-01 16:48:03 +01:00
cdietrich
684aca364f adapt service-container to image-service-v2 2022-03-01 14:17:37 +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
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
cdietrich
b7ca7cb447 change dockerfile 2022-02-18 09:56:47 +01:00
cdietrich
03274d4372 change dockerfile 2022-02-18 09:47:15 +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
bf710dec7a fix bug 2022-02-17 16:41:18 +01:00
cdietrich
63fbeba1a5 change service name to repo name 2022-02-17 16:25:40 +01:00
Matthias Bisping
2910ea7e63 split dockerfile 2022-02-09 12:24:13 +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