Merge branch 'main' into category-tag-lang-prefix

open_prices/api/proofs/views.py

@@ -1,6 +1,4 @@
-from django.conf import settings
 from django_filters.rest_framework import DjangoFilterBackend
-from django_q.tasks import async_task
 from drf_spectacular.utils import extend_schema
 from rest_framework import filters, mixins, status, viewsets
 from rest_framework.decorators import action
@@ -77,10 +75,6 @@ def upload(self, request: Request) -> Response:
                 status=status.HTTP_400_BAD_REQUEST,
             )
         file_path, mimetype, image_thumb_path = store_file(request.data.get("file"))
-        async_task(
-            "open_prices.proofs.utils.run_ocr_task",
-            f"{settings.IMAGES_DIR}/{file_path}",
-        )
         proof_create_data = {
             "file_path": file_path,
             "mimetype": mimetype,

open_prices/proofs/models.py

@@ -6,6 +6,7 @@
 from django.db.models import Count, signals
 from django.dispatch import receiver
 from django.utils import timezone
+from django_q.tasks import async_task
 
 from open_prices.common import constants, utils
 from open_prices.locations import constants as location_constants
@@ -299,6 +300,16 @@ def set_missing_fields_from_prices(self):
             self.save()
 
 
+@receiver(signals.post_save, sender=Proof)
+def proof_post_save_run_ocr(sender, instance, created, **kwargs):
+    if not settings.TESTING:
+        if created:
+            async_task(
+                "open_prices.proofs.utils.fetch_and_save_ocr_data",
+                f"{settings.IMAGES_DIR}/{instance.file_path}",
+            )
+
+
 @receiver(signals.post_save, sender=Proof)
 def proof_post_save_update_prices(sender, instance, created, **kwargs):
     if not created:

open_prices/proofs/tests.py

@@ -14,7 +14,7 @@
 from open_prices.proofs import constants as proof_constants
 from open_prices.proofs.factories import ProofFactory
 from open_prices.proofs.models import Proof
-from open_prices.proofs.utils import run_ocr_task
+from open_prices.proofs.utils import fetch_and_save_ocr_data
 
 LOCATION_OSM_NODE_652825274 = {
     "type": location_constants.TYPE_OSM,
@@ -311,7 +311,7 @@ def test_proof_update(self):
 
 
 class RunOCRTaskTest(TestCase):
-    def test_run_ocr_task_success(self):
+    def test_fetch_and_save_ocr_data_success(self):
         response_data = {"responses": [{"textAnnotations": [{"description": "test"}]}]}
         with self.settings(GOOGLE_CLOUD_VISION_API_KEY="test_api_key"):
             # mock call to run_ocr_on_image
@@ -323,7 +323,7 @@ def test_run_ocr_task_success(self):
                     image_path = Path(f"{tmpdirname}/test.jpg")
                     with image_path.open("w") as f:
                         f.write("test")
-                    run_ocr_task(image_path)
+                    fetch_and_save_ocr_data(image_path)
                     mock_run_ocr_on_image.assert_called_once_with(
                         image_path, "test_api_key"
                     )

open_prices/proofs/utils.py

@@ -169,7 +169,7 @@ def run_ocr_on_image(image_path: Path | str, api_key: str) -> dict[str, Any] | N
     return r.json()
 
 
-def run_ocr_task(image_path: Path | str, override: bool = False) -> None:
+def fetch_and_save_ocr_data(image_path: Path | str, override: bool = False) -> None:
     """Run OCR on the image stored at the given path and save the result to a
     JSON file.
 

pyproject.toml

@@ -43,7 +43,7 @@ readme = "README.md"
 [tool.poetry.dependencies]
 python = "~3.11"
 Babel = "~2.13.1"
-openfoodfacts = "2.2.0"
+openfoodfacts = "^2.2.0"
 psycopg2-binary = "~2.9.9"
 python-multipart = "~0.0.7"
 requests = "~2.31.0"