Bump openfoodfacts version

Closes #1450
Closes #1434

requirements.txt

@@ -27,7 +27,7 @@ easy-thumbnails==2.8.5
 fontawesomefree~=6.4.2
 icalendar==5.0.10
 invoke==2.2.0
-openfoodfacts==0.1.3
+openfoodfacts==0.1.10
 pillow==10.0.1
 reportlab==4.0.5
 requests==2.31.0

wger/nutrition/models/ingredient.py

@@ -41,7 +41,7 @@
 from django.utils.translation import gettext_lazy as _
 
 # Third Party
-import openfoodfacts
+from openfoodfacts import API
 
 # wger
 from wger.core.models import Language
@@ -464,9 +464,10 @@ def fetch_ingredient_from_off(cls, code: str):
 
         logger.info(f'Searching for ingredient {code} in OFF')
         try:
-            result = openfoodfacts.products.get_product(code)
-        except JSONDecodeError:
-            logger.info('Got JSONDecodeError from OFF')
+            api = API()
+            result = api.product.get(code)
+        except JSONDecodeError as e:
+            logger.info(f'Got JSONDecodeError from OFF: {e}')
             return None
         if result['status'] != OFF_SEARCH_PRODUCT_FOUND:
             return None

wger/nutrition/tests/test_ingredient.py

@@ -493,12 +493,12 @@ def setUp(self):
             'status_verbose': 'product not found'
         }
 
-    @patch('openfoodfacts.products.get_product')
-    def test_fetch_from_off_success(self, mock_get_product):
+    @patch('openfoodfacts.api.ProductResource.get')
+    def test_fetch_from_off_success(self, mock_api):
         """
         Tests creating an ingredient from OFF
         """
-        mock_get_product.return_value = self.off_response
+        mock_api.return_value = self.off_response
 
         ingredient = Ingredient.fetch_ingredient_from_off('1234')
 
@@ -514,8 +514,8 @@ def test_fetch_from_off_success(self, mock_get_product):
         self.assertEqual(ingredient.brand, 'The bar company')
         self.assertEqual(ingredient.license_author, 'open food facts, MrX')
 
-    @patch('openfoodfacts.products.get_product')
-    def test_fetch_from_off_success_long_name(self, mock_get_product):
+    @patch('openfoodfacts.api.ProductResource.get')
+    def test_fetch_from_off_success_long_name(self, mock_api):
         """
         Tests creating an ingredient from OFF - name gets truncated
         """
@@ -524,39 +524,39 @@ def test_fetch_from_off_success_long_name(self, mock_get_product):
         small-to-medium breed, it is the smallest of the six original and distinct spitz
         breeds of dog native to Japan.[1] Its name literally translates to "brushwood dog",
         as it is used to flush game."""
-        mock_get_product.return_value = self.off_response
+        mock_api.return_value = self.off_response
 
         ingredient = Ingredient.fetch_ingredient_from_off('1234')
         self.assertEqual(len(ingredient.name), 200)
 
-    @patch('openfoodfacts.products.get_product')
-    def test_fetch_from_off_key_missing_1(self, mock_get_product):
+    @patch('openfoodfacts.api.ProductResource.get')
+    def test_fetch_from_off_key_missing_1(self, mock_api):
         """
         Tests creating an ingredient from OFF - missing key in nutriments
         """
         del self.off_response['product']['nutriments']['energy-kcal_100g']
-        mock_get_product.return_value = self.off_response
+        mock_api.return_value = self.off_response
 
         ingredient = Ingredient.fetch_ingredient_from_off('1234')
         self.assertIsNone(ingredient)
 
-    @patch('openfoodfacts.products.get_product')
-    def test_fetch_from_off_key_missing_2(self, mock_get_product):
+    @patch('openfoodfacts.api.ProductResource.get')
+    def test_fetch_from_off_key_missing_2(self, mock_api):
         """
         Tests creating an ingredient from OFF - missing name
         """
         del self.off_response['product']['product_name']
-        mock_get_product.return_value = self.off_response
+        mock_api.return_value = self.off_response
 
         ingredient = Ingredient.fetch_ingredient_from_off('1234')
         self.assertIsNone(ingredient)
 
-    @patch('openfoodfacts.products.get_product')
-    def test_fetch_from_off_no_results(self, mock_get_product):
+    @patch('openfoodfacts.api.ProductResource.get')
+    def test_fetch_from_off_no_results(self, mock_api):
         """
         Tests creating an ingredient from OFF
         """
-        mock_get_product.return_value = self.off_response_no_results
+        mock_api.return_value = self.off_response_no_results
 
         ingredient = Ingredient.fetch_ingredient_from_off('1234')
         self.assertIsNone(ingredient)