Merge branch 'openfoodfacts:develop' into feat/facet-container

ShreyaSomvanshi · web-flow · commit 1017208d75f2 · 2026-02-17T14:30:13.000+05:30
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -15,15 +15,15 @@ images:
 OCR:
 - changed-files:
   - any-glob-to-any-file: 'tests/​test_ocr.py'
-  
+
 tests:
 - changed-files:
   - any-glob-to-any-file: 'tests/test_utils.py'
-  - any-glob-to-any-file: 'tests/​test_api.py'
-  - any-glob-to-any-file: 'tests/​test_ocr.py'
-  - any-glob-to-any-file: 'tests/​test_redis.py'
-  - any-glob-to-any-file: 'tests/​test_images.py'
-  - any-glob-to-any-file: 'tests/​test_api_config.py'
+  - any-glob-to-any-file: 'tests/test_api.py'
+  - any-glob-to-any-file: 'tests/test_ocr.py'
+  - any-glob-to-any-file: 'tests/test_redis.py'
+  - any-glob-to-any-file: 'tests/test_images.py'
+  - any-glob-to-any-file: 'tests/test_api_config.py'
 
 utils:
 - changed-files:
@@ -32,7 +32,7 @@ utils:
 
 dependencies:
 - changed-files:
-  - any-glob-to-any-file: 'poetry.lock'
+  - any-glob-to-any-file: 'uv.lock'
 
 documentation:
 - changed-files:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,7 +5,7 @@ on:
     paths:
       - "openfoodfacts/**"
       - "pyproject.toml"
-      - "poetry.lock"
+      - "uv.lock"
       - "tests/**"
 
 jobs:
@@ -19,27 +19,24 @@ jobs:
     - uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
-    - name: Install Poetry
-      uses: snok/install-poetry@v1.4
+    - name: Install uv
+      uses: astral-sh/setup-uv@v7
       with:
-        virtualenvs-create: true
-        virtualenvs-in-project: true
+        version: "0.10.2"
     - name: Load cached venv
-      id: cached-poetry-dependencies
+      id: cached-uv-dependencies
       uses: actions/cache@v4
       with:
         path: .venv
-        key: venv-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('**/poetry.lock') }}
+        key: venv-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('**/uv.lock') }}
     - name: Install dependencies
-      run: poetry install --with=dev --all-extras
-      if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
+      run: uv sync --all-extras
+      if: steps.cached-uv-dependencies.outputs.cache-hit != 'true'
 
     - name: Launch quality checks
       run: |
-        poetry run flake8 .
-        poetry run black --check .
-        poetry run mypy .
-        poetry run isort --check .
+        uv run ruff check .
+        uv run mypy .
     - name: Test with pytest
       run: |
-        poetry run pytest tests
+        uv run pytest tests
diff --git a/.github/workflows/github-projects.yml b/.github/workflows/github-projects.yml
@@ -95,3 +95,9 @@ jobs:
           github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
           labeled: 🚦 Nutri-Score
           label-operator: OR   
+      - uses: actions/add-to-project@main
+        with:
+          project-url: https://github.com/orgs/openfoodfacts/projects/5 # Add issue to the Folksonomy Engine project
+          github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
+          labeled: Folksonomy Engine
+          label-operator: OR   
diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml
@@ -14,10 +14,11 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: 3.11
-      - uses: abatilo/actions-poetry@v4.0.0
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
         with:
-          poetry-version: 2.3.2
-      - name: Run poetry build
-        run:  poetry build
-      - name: Run poetry publish
-        run: POETRY_PYPI_TOKEN_PYPI=${{ secrets.PYPI_TOKEN }} poetry publish
+          version: "0.10.2"
+      - name: Run uv build
+        run:  uv build
+      - name: Run uv publish
+        run: UV_PUBLISH_TOKEN=${{ secrets.PYPI_TOKEN }} uv publish
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,7 +1,16 @@
 # SPDX-FileCopyrightText: 2020 Free Software Foundation Europe e.V.
 # SPDX-License-Identifier: CC0-1.0
 repos:
-  - repo: https://github.com/fsfe/reuse-tool
-    rev: v5.0.2
-    hooks:
-      - id: reuse-lint-file
+- repo: https://github.com/fsfe/reuse-tool
+  rev: v6.2.0
+  hooks:
+  - id: reuse-lint-file
+
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  # Ruff version.
+  rev: v0.15.0
+  hooks:
+  # Run the linter.
+  - id: ruff-check
+  # Run the formatter.
+  - id: ruff-format
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-    ".": "3.4.2"
+    ".": "3.4.3"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## [3.4.3](https://github.com/openfoodfacts/openfoodfacts-python/compare/v3.4.2...v3.4.3) (2026-02-13)
+
+
+### Technical
+
+* **deps-dev:** bump cryptography from 43.0.3 to 46.0.5 ([#424](https://github.com/openfoodfacts/openfoodfacts-python/issues/424)) ([c5b4349](https://github.com/openfoodfacts/openfoodfacts-python/commit/c5b43496fea0dec61b499ca1bcd04203527a3238))
+* **deps:** bump protobuf from 5.29.5 to 5.29.6 ([#419](https://github.com/openfoodfacts/openfoodfacts-python/issues/419)) ([4e0c58a](https://github.com/openfoodfacts/openfoodfacts-python/commit/4e0c58a7ad9b97e1ee035df308e7c23cbc6af588))
+* **deps:** upgrade dependencies ([#426](https://github.com/openfoodfacts/openfoodfacts-python/issues/426)) ([93be8e5](https://github.com/openfoodfacts/openfoodfacts-python/commit/93be8e587d7c1bdecea9cc84d8f6e278c475d5c3))
+* improve tooling ([#430](https://github.com/openfoodfacts/openfoodfacts-python/issues/430)) ([c18d93f](https://github.com/openfoodfacts/openfoodfacts-python/commit/c18d93f72a62ecb6367e262d4e99d305ea4016ce))
+* move NutritionV3 from robotoff to SDK ([#433](https://github.com/openfoodfacts/openfoodfacts-python/issues/433)) ([0b2bc01](https://github.com/openfoodfacts/openfoodfacts-python/commit/0b2bc01ff4e04bdf29fc22d8aa3b6bdcde0aae5e))
+* remove reference to last release sha ([bef76a3](https://github.com/openfoodfacts/openfoodfacts-python/commit/bef76a3a9b113533f92f683ec10a660f20aa185e))
+* replace black/isort/flake8 by ruff ([#429](https://github.com/openfoodfacts/openfoodfacts-python/issues/429)) ([3d3c20c](https://github.com/openfoodfacts/openfoodfacts-python/commit/3d3c20c43176cfda3ddff5fdefd0f6d0702da326))
+* switch from poetry to uv ([#431](https://github.com/openfoodfacts/openfoodfacts-python/issues/431)) ([dcbd4fc](https://github.com/openfoodfacts/openfoodfacts-python/commit/dcbd4fc1491632460e406ebcc8a4067cfb689575))
+
 ## [3.4.2](https://github.com/openfoodfacts/openfoodfacts-python/compare/v3.4.1...v3.4.2) (2026-02-10)
 
 
diff --git a/README.md b/README.md
@@ -111,6 +111,8 @@ Contributors:
 - [Benoît Prieur](https://github.com/benprieur)
 - [Aadarsh A](https://github.com/aadarsh-ram)
 
+We use uv as a dependency manager and ruff as a linter/formatter.
+
 ## Copyright and License
 
     Copyright 2016-2024 Open Food Facts
diff --git a/openfoodfacts/__init__.py b/openfoodfacts/__init__.py
@@ -30,4 +30,4 @@
     "normalize_barcode",
 ]
 
-__version__ = "3.4.2"
+__version__ = "3.4.3"
diff --git a/openfoodfacts/api.py b/openfoodfacts/api.py
@@ -397,7 +397,8 @@ def parse_ingredients(
 
         if not api_version.startswith("v3"):
             logger.warning(
-                "ingredient parsing is only available in v3 of the API (here: %s), using v3",
+                "ingredient parsing is only available in v3 of the API (here: %s), "
+                "using v3",
                 self.api_config.version,
             )
             api_version = "v3"
@@ -431,11 +432,12 @@ def parse_ingredients(
         ) as e:
             raise RuntimeError(
                 f"Unable to parse ingredients: error during HTTP request: {e}"
-            )
+            ) from e
 
         if not r.ok:
             raise RuntimeError(
-                f"Unable to parse ingredients (non-200 status code): {r.status_code}, {r.text}"
+                "Unable to parse ingredients (non-200 status code): "
+                f"{r.status_code}, {r.text}"
             )
 
         response_data = r.json()
@@ -486,8 +488,9 @@ def upload_image(
         api_version = self.api_config.version
         if not self.api_config.version.startswith("v3"):
             warnings.warn(
-                "image upload is only available in v3 of the API (here: %s), forcing use of v3"
-                % self.api_config.version,
+                "image upload is only available in v3 of the API (here: %s), "
+                "forcing use of v3" % self.api_config.version,
+                stacklevel=2,
             )
             api_version = "v3"
 
@@ -534,7 +537,8 @@ def upload_image(
                         )
                     if not isinstance(value, dict):
                         raise ValueError(
-                            f"selected[{key}][{lang_code}] must be a dict, got {type(value)}"
+                            f"selected[{key}][{lang_code}] must be a dict, got "
+                            f"{type(value)}"
                         )
 
         # copy the config but force v3 of the API
@@ -665,11 +669,12 @@ def parse_ingredients(text: str, lang: str, api_config: APIConfig) -> list[JSONT
     ) as e:
         raise RuntimeError(
             f"Unable to parse ingredients: error during HTTP request: {e}"
-        )
+        ) from e
 
     if not r.ok:
         raise RuntimeError(
-            f"Unable to parse ingredients (non-200 status code): {r.status_code}, {r.text}"
+            "Unable to parse ingredients (non-200 status code): "
+            f"{r.status_code}, {r.text}"
         )
 
     response_data = r.json()
diff --git a/openfoodfacts/images.py b/openfoodfacts/images.py
@@ -216,7 +216,9 @@ def download_image(
     :return: the downloaded image, or an `ImageDownloadItem` object if
         `return_struct` is True.
 
-    >>> download_image("https://images.openfoodfacts.org/images/products/324/227/210/2359/4.jpg")  # noqa
+    >>> download_image(
+      "https://images.openfoodfacts.org/images/products/324/227/210/2359/4.jpg"
+    )
     <PIL.JpegImagePlugin.JpegImageFile image mode=RGB size=1244x1500>
 
     >>> download_image(("3242272102359", "4"))
diff --git a/openfoodfacts/ml/image_classification.py b/openfoodfacts/ml/image_classification.py
@@ -157,7 +157,8 @@ def postprocess(
 
         if len(response.raw_output_contents) != 1:
             raise Exception(
-                f"expected 1 raw output content, got {len(response.raw_output_contents)}"
+                "expected 1 raw output content, got "
+                f"{len(response.raw_output_contents)}"
             )
 
         output_index = {output.name: i for i, output in enumerate(response.outputs)}
diff --git a/openfoodfacts/ml/object_detection.py b/openfoodfacts/ml/object_detection.py
@@ -140,7 +140,10 @@ def to_list(self) -> list[JSONType]:
         """Convert the detection results to a JSON serializable format."""
         results = []
         for bounding_box, score, label in zip(
-            self.detection_boxes, self.detection_scores, self.detection_classes
+            self.detection_boxes,
+            self.detection_scores,
+            self.detection_classes,
+            strict=True,
         ):
             label_int = int(label)
             label_str = self.label_names[label_int]
@@ -329,7 +332,8 @@ def postprocess(
 
         if len(response.raw_output_contents) != 1:
             raise ValueError(
-                f"expected 1 raw output content, got {len(response.raw_output_contents)}"
+                "expected 1 raw output content, got "
+                f"{len(response.raw_output_contents)}"
             )
 
         if nms_threshold is None:
diff --git a/openfoodfacts/ml/triton.py b/openfoodfacts/ml/triton.py
@@ -72,7 +72,7 @@ def serialize_byte_tensor(input_tensor):
             # don't convert it to str as Python will encode the
             # bytes which may distort the meaning
             if input_tensor.dtype == np.object_:
-                if type(obj.item()) == bytes:
+                if type(obj.item()) is bytes:
                     s = obj.item()
                 else:
                     s = str(obj.item()).encode("utf-8")
diff --git a/openfoodfacts/ml/utils.py b/openfoodfacts/ml/utils.py
@@ -13,7 +13,7 @@ def convert_image_to_array(image: Image.Image) -> np.ndarray:
     if image.mode != "RGB":
         image = image.convert("RGB")
 
-    (im_width, im_height) = image.size
+    im_width, im_height = image.size
 
     return np.array(image.getdata(), dtype=np.uint8).reshape((im_height, im_width, 3))
 
diff --git a/openfoodfacts/types.py b/openfoodfacts/types.py
@@ -1,7 +1,7 @@
 import enum
-from typing import Any, Dict, Optional, Union
+from typing import Any, Dict, Literal, Optional, Union
 
-from pydantic import BaseModel, model_validator
+from pydantic import BaseModel, Field, model_validator
 
 #: A precise expectation of what mappings looks like in json.
 #: (dict where keys are always of type `str`).
@@ -913,3 +913,97 @@ class TaxonomyType(str, enum.Enum):
     origin = "origin"
     language = "language"
     other_nutritional_substance = "other_nutritional_substance"
+
+
+class NutritionV3NutrientAggregated(BaseModel):
+    value: float
+    unit: str = Field(description="Normalized unit", examples=["g", "kJ", "kcal", "%"])
+    modifier: str | None = None
+    source: str = Field(examples=["packaging", "manufacturer", "estimate", "usda"])
+    source_per: Literal["serving", "100g", "100ml"]
+    source_index: int
+
+
+class NutritionV3NutrientInput(BaseModel):
+    unit: str
+    value: float | None = None
+    value_computed: float | None = None
+    value_string: str | None = None
+    modifier: str | None = None
+
+
+class NutritionV3AggregatedSet(BaseModel):
+    preparation: Literal["as_sold", "prepared"]
+    per: Literal["100g", "100ml"]
+    nutrients: dict[str, NutritionV3NutrientAggregated] = Field(default_factory=dict)
+
+
+class NutritionV3InputSet(BaseModel):
+    preparation: Literal["as_sold", "prepared"]
+    per: Literal["serving", "100g", "100ml"]
+    per_quantity: int
+    per_unit: Literal["g", "ml"]
+    source: str = Field(
+        examples=["packaging", "manufacturer", "database-usda", "estimate"]
+    )
+    source_description: str | None = None
+    last_updated_t: int | None = Field(
+        None, description="timestamp of the last update of the input set"
+    )
+    nutrients: dict[str, NutritionV3NutrientInput] = Field(
+        default_factory=dict, description="Mapping from nutrient name to its value"
+    )
+    unspecified_nutrients: list[str] = Field(
+        default_factory=list,
+        description="List of unspecified nutrients (ex: not provided on the packaging)",
+    )
+
+
+class NutritionV3(BaseModel):
+    """New `nutrition` field of products, which come with schema_version 1003."""
+
+    aggregated_set: NutritionV3AggregatedSet | None = None
+    input_sets: list[NutritionV3InputSet] = Field(default_factory=list)
+
+    def filter_input_sets(
+        self,
+        per: str | None = None,
+        preparation: str | None = None,
+        per_quantity: int | None = None,
+        per_unit: str | None = None,
+        source: str | None = None,
+    ) -> list["NutritionV3InputSet"]:
+        results = self.input_sets
+        if per is not None:
+            results = [s for s in results if s.per == per]
+        if preparation is not None:
+            results = [s for s in results if s.preparation == preparation]
+        if per_quantity is not None:
+            results = [s for s in results if s.per_quantity == per_quantity]
+        if per_unit is not None:
+            results = [s for s in results if s.per_unit == per_unit]
+        if source is not None:
+            results = [s for s in results if s.source == source]
+        return results
+
+    def get_input_nutrient(
+        self,
+        nutrient: str,
+        per: str | None = None,
+        preparation: str | None = None,
+        per_quantity: int | None = None,
+        per_unit: str | None = None,
+        source: str | None = None,
+    ) -> NutritionV3NutrientInput | None:
+        filtered_sets = self.filter_input_sets(
+            per=per,
+            preparation=preparation,
+            per_quantity=per_quantity,
+            per_unit=per_unit,
+            source=source,
+        )
+        if not filtered_sets:
+            return None
+
+        input_set = filtered_sets[0]
+        return input_set.nutrients.get(nutrient)
diff --git a/openfoodfacts/utils/__init__.py b/openfoodfacts/utils/__init__.py
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
diff --git a/release-please-config.json b/release-please-config.json
diff --git a/tests/unit/test_api.py b/tests/unit/test_api.py
diff --git a/tests/unit/test_ocr.py b/tests/unit/test_ocr.py
diff --git a/tests/unit/test_types.py b/tests/unit/test_types.py
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- ".": "3.4.2"`
	`2`	`+ ".": "3.4.3"`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,4 +30,4 @@`
`30`	`30`	`"normalize_barcode",`
`31`	`31`	`]`
`32`	`32`
`33`		`-__version__ = "3.4.2"`
	`33`	`+__version__ = "3.4.3"`