d6de45d783
Merge in RR/pyinfra from RED-6205-monitoring to master
Squashed commit of the following:
commit 529cedfd7c065a3f7364e4596b923f25f0af76b5
Author: Matthias Bisping <matthias.bisping@axbit.com>
Date: Thu Mar 16 14:57:26 2023 +0100
Remove unnecessary default argument to dict.get
commit b718531f568e89df77cc05039e5e7afe7111b9a4
Author: Julius Unverfehrt <julius.unverfehrt@iqser.com>
Date: Thu Mar 16 14:56:50 2023 +0100
refactor
commit c039b0c25a6cd2ad2a72d237d0930c484c8e427c
Author: Julius Unverfehrt <julius.unverfehrt@iqser.com>
Date: Thu Mar 16 13:22:17 2023 +0100
increase package version to reflect the recent changes
commit 0a983a4113f25cd692b68869e1f33ffbf7efc6f0
Author: Julius Unverfehrt <julius.unverfehrt@iqser.com>
Date: Thu Mar 16 13:16:39 2023 +0100
remove processing result conversion to a list, since ner-predicion service actually returns a dictionary. It is now expected that the result is sized to perform the monitoring and json dumpable to upload it.
commit 541bf321410471dc09a354669b2778402286c09f
Author: Julius Unverfehrt <julius.unverfehrt@iqser.com>
Date: Thu Mar 16 12:48:07 2023 +0100
remove no longer needed requirements
commit cfa182985d989a5b92a9a069a603daee72f37d49
Author: Julius Unverfehrt <julius.unverfehrt@iqser.com>
Date: Thu Mar 16 11:14:58 2023 +0100
refactor payload formatting
- introduce PayloadFormatter class for better typehinting and bundling
of functionality
- parametrize payload formatting so the PayloadProcesser can adapt
better to differnt services/products
- move file extension parsing to its own module
commit f57663b86954b7164eeb6db013d862af88ec4584
Author: Julius Unverfehrt <julius.unverfehrt@iqser.com>
Date: Wed Mar 15 12:22:08 2023 +0100
refactor payload parsing
- introduce QueueMessagePayloadParser for generality
and typehinting
- refactor file extension parsing algorithm
commit 713fb4a0dddecf5442ceda3988444d9887869dcf
Author: Julius Unverfehrt <julius.unverfehrt@iqser.com>
Date: Tue Mar 14 17:07:02 2023 +0100
fix tests
commit a22ecf7ae93bc0bec235fba3fd9cbf6c1778aa13
Author: Julius Unverfehrt <julius.unverfehrt@iqser.com>
Date: Tue Mar 14 16:31:26 2023 +0100
refactor payload parsing
- parameterize file and compression types allowed for files to download
and upload via config
- make a real value bag out of QueueMessagePayload and do the parsing
beforehand
- refector file extension parser to be more robust
commit 50b578d054ca47a94c907f5f8b585eca7ed626ac
Author: Julius Unverfehrt <julius.unverfehrt@iqser.com>
Date: Tue Mar 14 13:21:32 2023 +0100
add monitoring
- add an optional prometheus monitor to monitor the average processing
time of a service per relevent paramater that is at this point defined
via the number of resulting elements.
commit de525e7fa2f846f7fde5b9a4b466039238da10cd
Author: Julius Unverfehrt <julius.unverfehrt@iqser.com>
Date: Tue Mar 14 12:57:24 2023 +0100
fix bug in file extension parser not working if the file endings have prefixes
42 lines
1.3 KiB
Python
42 lines
1.3 KiB
Python
from collections import defaultdict
|
|
from typing import Callable
|
|
|
|
from funcy import merge
|
|
|
|
|
|
def make_file_extension_parser(file_types, compression_types):
|
|
ext2_type2ext = make_ext2_type2ext(file_types, compression_types)
|
|
ext_to_type2ext = make_ext_to_type2ext(ext2_type2ext)
|
|
|
|
def inner(path):
|
|
file_extensions = parse_file_extensions(path, ext_to_type2ext)
|
|
return file_extensions.get("file_type"), file_extensions.get("compression_type")
|
|
|
|
return inner
|
|
|
|
|
|
def make_ext2_type2ext(file_type_extensions, compression_type_extensions):
|
|
def make_ext_to_ext2type(ext_type):
|
|
return lambda ext: {ext_type: ext}
|
|
|
|
ext_to_file_type_mapper = make_ext_to_ext2type("file_type")
|
|
ext_to_compression_type_mapper = make_ext_to_ext2type("compression_type")
|
|
return defaultdict(
|
|
lambda: lambda _: {},
|
|
{
|
|
**{e: ext_to_file_type_mapper for e in file_type_extensions},
|
|
**{e: ext_to_compression_type_mapper for e in compression_type_extensions},
|
|
},
|
|
)
|
|
|
|
|
|
def make_ext_to_type2ext(ext2_type2ext):
|
|
def ext_to_type2ext(ext):
|
|
return ext2_type2ext[ext](ext)
|
|
|
|
return ext_to_type2ext
|
|
|
|
|
|
def parse_file_extensions(path, ext_to_type2ext: Callable):
|
|
return merge(*map(ext_to_type2ext, path.split(".")))
|