Marmelator/pyinfra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 36 Wiki Activity

Pull request #16: refactor save response as file

Browse Source 
Merge in RR/pyinfra from response to master

Squashed commit of the following:

commit a3056c0df73091ee766491331f07e3a0377e7887
Author: cdietrich <clarissa.dietrich@iqser.com>
Date:   Thu Mar 3 10:24:54 2022 +0100

    refactor save response as file
This commit is contained in:
Clarissa Dietrich 2022-03-03 10:27:05 +01:00 committed by Julius Unverfehrt
parent 2a1d6c4973
commit cc0c1bb999
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -6,3 +6,4 @@ reports
pyinfra.egg-info pyinfra.egg-info
bamboo-specs/target bamboo-specs/target
.pytest_cache .pytest_cache
/.coverage

5
config.yaml
View File

@ -1,8 +1,9 @@
service: service:
logging_level: $LOGGING_LEVEL_ROOT|DEBUG # Logging level for service logger logging_level: $LOGGING_LEVEL_ROOT|DEBUG # Logging level for service logger
response: response:
type: $RESPONSE_TYPE|"stream" # Whether the analysis response is stored as file on storage or sent as stream type: $RESPONSE_TYPE|"file" # Whether the analysis response is stored as file on storage or sent as stream
extension: $RESPONSE_FILE_EXTENSION|".NER_ENTITIES.json.gz" # {.IMAGE_INFO.json.gz | .NER_ENTITIES.json.gz} extension: $RESPONSE_FILE_EXTENSION|".IMAGE_INFO.json.gz" # {.IMAGE_INFO.json.gz | .NER_ENTITIES.json.gz}
key: $RESPONSE_KEY|"imageMetadata" # the key of the result {result, imageMetadata}
probing_webserver: probing_webserver:
host: $PROBING_WEBSERVER_HOST|"0.0.0.0" # Probe webserver address host: $PROBING_WEBSERVER_HOST|"0.0.0.0" # Probe webserver address

25
pyinfra/callback.py
View File

@ -59,21 +59,30 @@ def make_callback_for_output_queue(json_wrapped_body_processor, output_queue_nam
declare_queue(channel, output_queue_name) declare_queue(channel, output_queue_name)
def callback(channel, method, _, body): def callback(channel, method, _, body):
"""
response is dossier_id, file_id and analysis result, if CONFIG.service.response.type == "file" the response only
contains file_id and dossier_id and the analysis result will be written in a json file
Args:
channel:
method:
_:
body:
Returns:
"""
dossier_id, file_id, result = json_wrapped_body_processor(body) dossier_id, file_id, result = json_wrapped_body_processor(body)
# TODO Unify analysis Repsonse for image-prediction and ner-prediction result_key = CONFIG.service.response.key if CONFIG.service.response.key else "result"
if CONFIG.service.response.type == "stream": result = json.dumps({"dossierId": dossier_id, "fileId": file_id, result_key: result})
result = {"dossierId": dossier_id, "fileId": file_id, "imageMetadata": result}
result = json.dumps(result) if CONFIG.service.response.type == "file":
elif CONFIG.service.response.type == "file":
result = json.dumps(result)
upload_compressed_response( upload_compressed_response(
get_storage(CONFIG.storage.backend), CONFIG.storage.bucket, dossier_id, file_id, result get_storage(CONFIG.storage.backend), CONFIG.storage.bucket, dossier_id, file_id, result
) )
result = json.dumps({"dossierId": dossier_id, "fileId": file_id}) result = json.dumps({"dossierId": dossier_id, "fileId": file_id})
else:
result = "WRONG WRONG WORNG DONG"
channel.basic_publish(exchange="", routing_key=output_queue_name, body=result) channel.basic_publish(exchange="", routing_key=output_queue_name, body=result)
channel.basic_ack(delivery_tag=method.delivery_tag) channel.basic_ack(delivery_tag=method.delivery_tag)