fix: use image.openfoodfacts.* as default server for serving images

openfoodfacts · Jan 10, 2023 · 70aceee · 70aceee
1 parent 5178bac
commit 70aceee
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/robotoff/off.py b/robotoff/off.py
@@ -178,7 +178,10 @@ def generate_json_path(barcode: str, image_id: str) -> str:
 
 
 def generate_json_ocr_url(barcode: str, image_id: str) -> str:
-    return settings.BaseURLProvider.image_url(generate_json_path(barcode, image_id))
+    return (
+        settings.BaseURLProvider.static()
+        + f"/images/products{generate_json_path(barcode, image_id)}"
+    )
 
 
 def generate_image_url(barcode: str, image_id: str) -> str:

diff --git a/robotoff/settings.py b/robotoff/settings.py
@@ -93,7 +93,15 @@ def static() -> str:
 
     @staticmethod
     def image_url(image_path: str) -> str:
-        return BaseURLProvider.static() + f"/images/products{image_path}"
+        # If STATIC_OFF_DOMAIN is defined, used the custom static domain
+        # configured
+        # Otherwise use images.openfoodfacts.{net,org} as proxy server
+        prefix = (
+            BaseURLProvider.static()
+            if os.environ.get("STATIC_OFF_DOMAIN")
+            else BaseURLProvider._get_url(prefix="images")
+        )
+        return prefix + f"/images/products{image_path}"
 
     @staticmethod
     def country(country_code: str) -> str: