BLACK

pyinfra/flask.py

@@ -50,11 +50,15 @@ def set_up_probing_webserver():
         try:
             resp = requests.get(f"{CONFIG.rabbitmq.callback.analysis_endpoint}/prometheus")
             resp.raise_for_status()
-            return resp.text
+        except ConnectionError:
-        except Exception as err:
+            return ""
-            if not informed_about_missing_prometheus_endpoint:
+        except requests.exceptions.HTTPError as err:
-                logger.warning(f"Got no metrics from analysis prometheus endpoint: {err}")
+            if resp.status_code == 404:
-                informed_about_missing_prometheus_endpoint = True
+                if not informed_about_missing_prometheus_endpoint:
-            return resp
+                    logger.warning(f"Got no metrics from analysis prometheus endpoint: {err}")
+                    informed_about_missing_prometheus_endpoint = True
+            else:
+                raise err
+        return resp.text
 
     return app

scripts/mock_client.py

@@ -48,7 +48,8 @@ def build_message_bodies(analyse_container_type):
             message_dict.update({"targetFileExtension": "ORIGIN.pdf.gz", "responseFileExtension": "IMAGE_INFO.json.gz"})
         if analyse_container_type == "ner":
             message_dict.update(
-                {"targetFileExtension": "TEXT.json.gz", "responseFileExtension": "NER_ENTITIES.json.gz"})
+                {"targetFileExtension": "TEXT.json.gz", "responseFileExtension": "NER_ENTITIES.json.gz"}
+            )
         return message_dict
 
     storage = get_s3_storage()

src/serve.py

@@ -31,6 +31,8 @@ def make_callback(analysis_endpoint):
         operations = message.get("operations", ["/"])
         results = map(perform_operation, operations)
         result = dict(zip(operations, results))
+        if list(result.keys()) == ["/"]:
+            result = list(result.values())[0]
         return result
 
     return callback