Added correction of white balance (#11)

* Added correction of white balance

* Added fixture for test

* fabric

* fix linters, update code

feat: new v3 api

* Restyle Added correction of white balance (#13)

* Restyled by autopep8

* Restyled by isort

* Restyled by reorder-python-imports

* Restyled by yapf

Co-authored-by: Restyled.io <[email protected]>

* fix ci/cd python version

* fix ci/cd python version

* fix imports

* Restyle Added correction of white balance (#14)

* Restyled by autopep8

* Restyled by black

* Restyled by isort

* Restyled by reorder-python-imports

* Restyled by yapf

Co-authored-by: Restyled.io <[email protected]>

* fix ci/cd

* Restyle Added correction of white balance (#15)

* Restyled by yapf

* Restyled by black

* Restyled by isort

Co-authored-by: Restyled.io <[email protected]>

* verbose pytest

* pytest all close

* pytest all close

* pytest all close

Co-authored-by: ilyakochankov <[email protected]>
Co-authored-by: restyled-io[bot] <32688539+restyled-io[bot]@users.noreply.github.com>
Co-authored-by: Restyled.io <[email protected]>

Author: 4 people

.github/workflows/bandit.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Set up Python 3.9
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: 3.9.8
 
       - name: Install bandit
         run: |

.github/workflows/black.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Set up Python 3.9
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: 3.9.8
       #----------------------------------------------
       #  -----  install & configure poetry  -----
       #----------------------------------------------
@@ -40,6 +40,6 @@ jobs:
       - name: Analysing the vendor service code with black
         run: |
           source .venv/bin/activate
-          black .
+          black --check .
           deactivate
           exit ${exit_code}

.github/workflows/codecov.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Set up Python 3.9
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: 3.9.8
       #----------------------------------------------
       #  -----  install & configure poetry  -----
       #----------------------------------------------

.github/workflows/flake8.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Set up Python 3.9
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: 3.9.8
       #----------------------------------------------
       #  -----  install & configure poetry  -----
       #----------------------------------------------

.github/workflows/isort.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Set up Python 3.9
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: 3.9.8
       #----------------------------------------------
       #  -----  install & configure poetry  -----
       #----------------------------------------------
@@ -40,6 +40,6 @@ jobs:
       - name: Analysing the vendor service code with isort
         run: |
           source .venv/bin/activate
-          isort .
+          isort --check .
           deactivate
           exit ${exit_code}

.github/workflows/pylint.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Set up Python 3.9
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: 3.9.8
       #----------------------------------------------
       #  -----  install & configure poetry  -----
       #----------------------------------------------

.github/workflows/pytest.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Set up Python 3.9
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: 3.9.8
       #----------------------------------------------
       #  -----  install & configure poetry  -----
       #----------------------------------------------
@@ -41,5 +41,5 @@ jobs:
       - name: Run tests
         run: |
           source .venv/bin/activate
-          pytest
+          pytest -v
           deactivate

.restyled.yaml

@@ -0,0 +1,19 @@
+enabled: true
+pull_requests: true
+statuses:
+  differences: true     # Red when style differences are found
+  no_differences: true  # Green when no differences are found
+  error: true
+restylers_version: stable
+restylers:
+  - "*"
+  - autopep8:
+      enabled: false
+  - black:
+      arguments:
+        - "--config"
+        - "pyproject.toml"
+  - isort:
+      arguments:
+        - "--sp"
+        - "."

api/v3/cv/__init__.py

@@ -0,0 +1,5 @@
+from flask import Blueprint
+
+bp = Blueprint("cv_v3", __name__, url_prefix="/api/cv/v3")  # type: Blueprint
+
+from api.v3.cv.tonal import *

api/v3/cv/tonal.py

@@ -0,0 +1,69 @@
+import http
+from typing import Optional
+
+import numpy as np
+from cv2 import cv2
+from flask_apispec import doc, marshal_with, use_kwargs
+from marshmallow import fields, validate
+from werkzeug.datastructures import FileStorage
+
+from api.v3.cv import bp
+from schemas.color_schema import ColorSchema
+from schemas.error_schema import ErrorSchema
+from schemas.input_image_schema import InputImageSchema
+from services.cv_tone_processor import CVToneProcessor
+from services.face_extractor import face_extractor_fabric
+from services.tone_extractor import tone_extractor_fabric
+from services.white_balance import white_balance_fabric
+
+
+@bp.route("/skin_tone", methods=["POST"])
+@doc(
+    description="Search face on the photo and determine its skin color",
+    tags=["tonal"],
+    consumes=["multipart/form-data"],
+)
+@use_kwargs(InputImageSchema, location="files")
+@use_kwargs(
+    {
+        "wb": fields.String(
+            default=None, validate=validate.OneOf(white_balance_fabric.keys())
+        )
+    },
+    location="query",
+)
+@use_kwargs(
+    {
+        "face_ext": fields.String(
+            default="mediapipe", validate=validate.OneOf(face_extractor_fabric.keys())
+        )
+    },
+    location="query",
+)
+@use_kwargs(
+    {
+        "tone_ext": fields.String(
+            default="kmean", validate=validate.OneOf(tone_extractor_fabric.keys())
+        )
+    },
+    location="query",
+)
+@marshal_with(schema=ColorSchema, code=200, description="Return color in hex code")
+@marshal_with(schema=ErrorSchema, code=422, description="Problem with image file")
+@marshal_with(schema=ErrorSchema, code=400, description="No face on the image")
+def skin_tone_v3(
+    image: FileStorage,
+    face_ext: str = "mediapipe",
+    tone_ext: str = "kmean",
+    wb: Optional[str] = None,
+):
+    np_img = np.fromstring(image.read(), np.uint8)
+    image = cv2.imdecode(np_img, cv2.IMREAD_COLOR)
+    color = CVToneProcessor.build_tone_process(image, face_ext, tone_ext, wb)
+
+    if not color:
+        error = {"files": {"image": ["No face on the image"]}}
+        return ErrorSchema().dump({"error": error}), http.HTTPStatus.BAD_REQUEST
+
+    response = dict(color=color)
+    return ColorSchema().dump(response)

core/settings.py

@@ -3,7 +3,7 @@
 from environs import Env
 
 env = Env()
-env.read_env('.env')
+env.read_env(".env")
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent

main.py

@@ -12,6 +12,8 @@
 from api.v1.cv.tonal import opencv_skin_tone_v1
 from api.v2.cv import bp as cv_bp_v2
 from api.v2.cv.tonal import mediapipe_skin_tone_v2, opencv_skin_tone_v2
+from api.v3.cv import bp as cv_bp_v3
+from api.v3.cv.tonal import skin_tone_v3
 from core import settings
 from core.loger import LOGGING
 from core.settings import CV_ALLOWED_HOSTS, DEBUG
@@ -71,9 +73,11 @@ def health_check():
 
 app.register_blueprint(cv_bp_v1)
 app.register_blueprint(cv_bp_v2)
+app.register_blueprint(cv_bp_v3)
 docs.register(opencv_skin_tone_v1, blueprint=cv_bp_v1.name)
 docs.register(opencv_skin_tone_v2, blueprint=cv_bp_v2.name)
 docs.register(mediapipe_skin_tone_v2, blueprint=cv_bp_v2.name)
+docs.register(skin_tone_v3, blueprint=cv_bp_v3.name)
 docs.register(health_check)
 
 

poetry.lock

@@ -20,7 +20,7 @@ mediapipe = "^0.8.8"
 six = "^1.16.0"
 Flask-Cors = "^3.0.10"
 typing-extensions = "^3.10.0"
-opencv-python-headless = "^4.5.4"
+opencv-contrib-python-headless = "^4.5.4"
 
 [tool.poetry.dev-dependencies]
 pylint = "2.9.3"
@@ -59,7 +59,8 @@ disable = [
     "no-name-in-module",
     "c-extension-no-member",
     "duplicate-code",
-    "inconsistent-return-statements"
+    "inconsistent-return-statements",
+    "import-error"
 ]
 
 [tool.isort]
@@ -70,7 +71,7 @@ ignore = ["E203", "W503"]
 max-line-length = 120
 format = "html"
 htmldir = "flake-report"
-exclude = [".venv", "api/v1/cv/__init__.py", "api/v2/cv/__init__.py"]
+exclude = [".venv", "api/v1/cv/__init__.py", "api/v2/cv/__init__.py", "api/v3/cv/__init__.py"]
 
 [tool.pytest.ini_options]
 minversion = "6.0"

pyproject.toml

@@ -2,6 +2,10 @@
 from typing import Any
 
 
+class CellError(Exception):
+    ...
+
+
 class Cell(ABC):
     @abstractmethod
     def set_next(self, next_cell: "Cell") -> "Cell":
@@ -27,4 +31,7 @@ def __call__(self, context: Any):
 
 class CellFromFabric(AbstractCell):
     def __init__(self, fabric: dict, item_name: str):
-        self._item = fabric[item_name]
+        try:
+            self._item = fabric[item_name]
+        except KeyError as e:
+            raise CellError(str(e)) from KeyError

services/chain/cell.py

@@ -7,6 +7,7 @@
 from services.cv_context import CVContext
 from services.face_extractor import FaceExtractorCell
 from services.tone_extractor import ToneExtractorCell
+from services.white_balance import WhiteBalanceCell
 
 
 class CVToneProcessor:
@@ -33,3 +34,21 @@ def mediapipe_tone_process(image: np.ndarray) -> Optional[str]:
         )
         context: CVContext = chain.process(CVContext(image))
         return context.tone_hex
+
+    @staticmethod
+    def build_tone_process(
+        image: np.ndarray, face_ext: str, tone_ext: str, wb: Optional[str] = None
+    ):
+        cells = []
+        if wb:
+            cells.append(WhiteBalanceCell(white_balance=wb))
+        cells.extend(
+            [
+                FaceExtractorCell(face_extractor=face_ext),
+                ToneExtractorCell(tone_extractor=tone_ext),
+                R2HConverterCell(),
+            ]
+        )
+        chain = Chain(cells=cells)
+        context: CVContext = chain.process(CVContext(image))
+        return context.tone_hex