update

assets/title.md

@@ -1,11 +1,11 @@
-<div style="display: flex; justify-content: center; align-items: center; text-align: center; font-size: 40px;">
-  <div>
+<div style="display: flex; flex-direction: column; justify-content: center; align-items: center; text-align: center; font-size: 40px;">
+  <div style="display: flex; align-items: center;">
     <b>HivisionIDPhotos</b>
-    <br>
-    <div style="display: flex; justify-content: center; align-items: center; text-align: center;">
-        <a href="https://github.com/xiaolin199912/HivisionIDPhotos"><img alt="Github" src="https://img.shields.io/static/v1?label=GitHub&message=GitHub&color=black"></a> &ensp;
-        <a href="https://docs.qq.com/doc/DUkpBdk90eWZFS2JW" target="_blank"><img alt="Static Badge" src="https://img.shields.io/badge/WeChat-微信-4cb55e"></a> &ensp;
-        <a href="https://github.com/Zeyi-Lin/HivisionIDPhotos/blob/master/docs/api_EN.md" target="_blank"><img alt="Static Badge" src="https://img.shields.io/badge/API_Docs-API文档-315bce"></a>
-    </div>
   </div>
-</div>
+  <div style="display: flex; justify-content: center; align-items: center; text-align: center;">
+      <a href="https://github.com/xiaolin199912/HivisionIDPhotos"><img alt="Github" src="https://img.shields.io/static/v1?label=GitHub&message=GitHub&color=black"></a> &ensp;
+      <a href="https://docs.qq.com/doc/DUkpBdk90eWZFS2JW" target="_blank"><img alt="Static Badge" src="https://img.shields.io/badge/WeChat-微信-4cb55e"></a> &ensp;
+      <a href="https://github.com/xiaolin199912/HivisionIDPhotos/stargazers"><img alt="GitHub stars" src="https://img.shields.io/github/stars/zeyi-lin/hivisionidphotos?color=ffcb47&labelColor=black&style=flat-square"></a> &ensp;
+      <a href="https://github.com/Zeyi-Lin/HivisionIDPhotos/blob/master/docs/api_EN.md" target="_blank"><img alt="Static Badge" src="https://img.shields.io/badge/API_Docs-API文档-315bce"></a>
+  </div>
+</div>

demo/locals.py

@@ -35,6 +35,12 @@ LOCALES = {
         "zh": {
             "label": "人脸检测模型",
         },
+        "ja": {
+            "label": "顔検出モデル",
+        },
+        "ko": {
+            "label": "얼굴 감지 모델",
+        },
     },
     "matting_model": {
         "en": {
@@ -43,6 +49,12 @@ LOCALES = {
         "zh": {
             "label": "抠图模型",
         },
+        "ja": {
+            "label": "マッティングモデル",
+        },
+        "ko": {
+            "label": "매팅 모델",
+        },
     },
     "key_param": {
         "en": {
@@ -51,6 +63,12 @@ LOCALES = {
         "zh": {
             "label": "核心参数",
         },
+        "ja": {
+            "label": "主要パラメータ",
+        },
+        "ko": {
+            "label": "주요 매개변수",
+        },
     },
     "advance_param": {
         "en": {
@@ -59,6 +77,12 @@ LOCALES = {
         "zh": {
             "label": "高级参数",
         },
+        "ja": {
+            "label": "詳細パラメータ",
+        },
+        "ko": {
+            "label": "고급 매개변수",
+        },
     },
     "size_mode": {
         "en": {
@@ -71,6 +95,20 @@ LOCALES = {
             "choices": ["尺寸列表", "只换底", "自定义尺寸"],
             "custom_size_eror": "宽度不应大于长度；长度和宽度不应小于100，不大于1800。",
         },
+        "ja": {
+            "label": "証明写真サイズオプション",
+            "choices": [
+                "サイズリスト",
+                "背景のみ変更",
+                "カスタムサイズ",
+            ],
+            "custom_size_eror": "幅は長さより大きくしないでください。長さと幅は100以上1800以下にしてください。",
+        },
+        "ko": {
+            "label": "증명사진 크기 옵션",
+            "choices": ["크기 목록", "배경만 변경", "사용자 지정 크기"],
+            "custom_size_eror": "너비는 길이보다 크지 않아야 합니다; 길이와 너비는 100 이상 1800 이하여야 합니다.",
+        },
     },
     "size_list": {
         "en": {
@@ -83,6 +121,16 @@ LOCALES = {
             "choices": list(size_list_dict_CN.keys()),
             "develop": size_list_config_CN,
         },
+        "ja": {
+            "label": "サイズリスト",
+            "choices": list(size_list_dict_EN.keys()),
+            "develop": size_list_config_EN,
+        },
+        "ko": {
+            "label": "크기 목록",
+            "choices": list(size_list_dict_EN.keys()),
+            "develop": size_list_config_EN,
+        },
     },
     "bg_color": {
         "en": {
@@ -95,6 +143,16 @@ LOCALES = {
             "choices": list(color_list_dict_CN.keys()) + ["自定义底色"],
             "develop": color_list_dict_CN,
         },
+        "ja": {
+            "label": "背景色",
+            "choices": list(color_list_dict_EN.keys()) + ["カスタム"],
+            "develop": color_list_dict_EN,
+        },
+        "ko": {
+            "label": "배경색",
+            "choices": list(color_list_dict_EN.keys()) + ["사용자 지정"],
+            "develop": color_list_dict_EN,
+        },
     },
     "button": {
         "en": {
@@ -103,6 +161,12 @@ LOCALES = {
         "zh": {
             "label": "开始制作",
         },
+        "ja": {
+            "label": "開始",
+        },
+        "ko": {
+            "label": "시작",
+        },
     },
     "head_measure_ratio": {
         "en": {
@@ -111,6 +175,12 @@ LOCALES = {
         "zh": {
             "label": "面部比例",
         },
+        "ja": {
+            "label": "頭部比率",
+        },
+        "ko": {
+            "label": "머리 비율",
+        },
     },
     "top_distance": {
         "en": {
@@ -119,6 +189,12 @@ LOCALES = {
         "zh": {
             "label": "头距顶距离",
         },
+        "ja": {
+            "label": "上部からの距離",
+        },
+        "ko": {
+            "label": "상단 거리",
+        },
     },
     "image_kb": {
         "en": {
@@ -129,6 +205,14 @@ LOCALES = {
             "label": "设置 KB 大小",
             "choices": ["不设置", "自定义"],
         },
+        "ja": {
+            "label": "KBサイズを設定",
+            "choices": ["設定なし", "カスタム"],
+        },
+        "ko": {
+            "label": "KB 크기 설정",
+            "choices": ["설정 안 함", "사용자 지정"],
+        },
     },
     "image_kb_size": {
         "en": {
@@ -137,6 +221,44 @@ LOCALES = {
         "zh": {
             "label": "KB 大小",
         },
+        "ja": {
+            "label": "KBサイズ",
+        },
+        "ko": {
+            "label": "KB 크기",
+        },
+    },
+    "image_dpi": {
+        "en": {
+            "label": "Set DPI",
+            "choices": ["Not Set", "Custom"],
+        },
+        "zh": {
+            "label": "设置 DPI 大小",
+            "choices": ["不设置", "自定义"],
+        },
+        "ja": {
+            "label": "DPIを設定",
+            "choices": ["設定なし", "カスタム"],
+        },
+        "ko": {
+            "label": "DPI 설정",
+            "choices": ["설정 안 함", "사용자 지정"],
+        },
+    },
+    "image_dpi_size": {
+        "en": {
+            "label": "DPI size",
+        },
+        "zh": {
+            "label": "DPI 大小",
+        },
+        "ja": {
+            "label": "DPIサイズ",
+        },
+        "ko": {
+            "label": "DPI 크기",
+        },
     },
     "render_mode": {
         "en": {
@@ -151,6 +273,22 @@ LOCALES = {
             "label": "渲染方式",
             "choices": ["纯色", "上下渐变（白色）", "中心渐变（白色）"],
         },
+        "ja": {
+            "label": "レンダリングモード",
+            "choices": [
+                "単色",
+                "上下グラデーション（白）",
+                "中心グラデーション（白）",
+            ],
+        },
+        "ko": {
+            "label": "렌더링 모드",
+            "choices": [
+                "단색",
+                "위-아래 그라데이션 (흰색)",
+                "중앙 그라데이션 (흰색)",
+            ],
+        },
     },
     # Tab3 - 水印工作台
     "watermark_tab": {
@@ -160,6 +298,12 @@ LOCALES = {
         "zh": {
             "label": "水印",
         },
+        "ja": {
+            "label": "ウォーターマーク",
+        },
+        "ko": {
+            "label": "워터마크",
+        },
     },
     "watermark_text": {
         "en": {
@@ -172,6 +316,16 @@ LOCALES = {
             "value": "Hello",
             "placeholder": "最多20个字符",
         },
+        "ja": {
+            "label": "テキスト",
+            "value": "Hello",
+            "placeholder": "最大20文字",
+        },
+        "ko": {
+            "label": "텍스트",
+            "value": "Hello",
+            "placeholder": "최대 20자",
+        },
     },
     "watermark_color": {
         "en": {
@@ -180,6 +334,12 @@ LOCALES = {
         "zh": {
             "label": "水印颜色",
         },
+        "ja": {
+            "label": "色",
+        },
+        "ko": {
+            "label": "색상",
+        },
     },
     "watermark_size": {
         "en": {
@@ -188,6 +348,12 @@ LOCALES = {
         "zh": {
             "label": "文字大小",
         },
+        "ja": {
+            "label": "サイズ",
+        },
+        "ko": {
+            "label": "크기",
+        },
     },
     "watermark_opacity": {
         "en": {
@@ -196,6 +362,12 @@ LOCALES = {
         "zh": {
             "label": "水印透明度",
         },
+        "ja": {
+            "label": "不透明度",
+        },
+        "ko": {
+            "label": "불투명도",
+        },
     },
     "watermark_angle": {
         "en": {
@@ -204,6 +376,12 @@ LOCALES = {
         "zh": {
             "label": "水印角度",
         },
+        "ja": {
+            "label": "角度",
+        },
+        "ko": {
+            "label": "각도",
+        },
     },
     "watermark_space": {
         "en": {
@@ -212,6 +390,12 @@ LOCALES = {
         "zh": {
             "label": "水印间距",
         },
+        "ja": {
+            "label": "間隔",
+        },
+        "ko": {
+            "label": "간격",
+        },
     },
     "watermark_switch": {
         "en": {
@@ -224,6 +408,16 @@ LOCALES = {
             "value": "不添加",
             "choices": ["不添加", "添加"],
         },
+        "ja": {
+            "label": "ウォーターマーク",
+            "value": "追加しない",
+            "choices": ["追加しない", "追加"],
+        },
+        "ko": {
+            "label": "워터마크",
+            "value": "추가하지 않음",
+            "choices": ["추가하지 않음", "추가"],
+        },
     },
     # 输出结果
     "notification": {
@@ -235,6 +429,14 @@ LOCALES = {
             "label": "通知",
             "face_error": "人脸数不等于1，请上传单人照片。如果实际人脸数为1，可能是检测模型的准确度问题，请切换左侧不同的人脸检测模型或提出Github Issue通知作者。",
         },
+        "ja": {
+            "label": "通知",
+            "face_error": "顔の数が1ではありません。1つの顔を含む画像をアップロードしてください。実際の顔の数が1の場合、検出モデルの精度の問題かもしれません。左側で別の顔検出モデルに切り替えるか、Githubの問題を作成して作者に通知してください。",
+        },
+        "ko": {
+            "label": "알림",
+            "face_error": "얼굴 수가 1이 아닙니다. 단일 얼굴이 있는 이미지를 업로드해 주세요. 실제 얼굴 수가 1인 경우 감지 모델의 정확도 문제일 수 있습니다. 왼쪽에서 다른 얼굴 감지 모델로 전환하거나 Github Issue를 제기하여 작성자에게 알려주세요.",
+        },
     },
     "standard_photo": {
         "en": {
@@ -243,6 +445,12 @@ LOCALES = {
         "zh": {
             "label": "标准照",
         },
+        "ja": {
+            "label": "標準写真",
+        },
+        "ko": {
+            "label": "표준 사진",
+        },
     },
     "hd_photo": {
         "en": {
@@ -251,6 +459,12 @@ LOCALES = {
         "zh": {
             "label": "高清照",
         },
+        "ja": {
+            "label": "HD写真",
+        },
+        "ko": {
+            "label": "HD 사진",
+        },
     },
     "standard_photo_png": {
         "en": {
@@ -259,6 +473,12 @@ LOCALES = {
         "zh": {
             "label": "透明标准照",
         },
+        "ja": {
+            "label": "マッティング標準写真",
+        },
+        "ko": {
+            "label": "매팅 표준 사진",
+        },
     },
     "hd_photo_png": {
         "en": {
@@ -267,6 +487,12 @@ LOCALES = {
         "zh": {
             "label": "透明高清照",
         },
+        "ja": {
+            "label": "マッティングHD写真",
+        },
+        "ko": {
+            "label": "매팅 HD 사진",
+        },
     },
     "layout_photo": {
         "en": {
@@ -275,13 +501,25 @@ LOCALES = {
         "zh": {
             "label": "六寸排版照",
         },
+        "ja": {
+            "label": "レイアウト写真",
+        },
+        "ko": {
+            "label": "레이아웃 사진",
+        },
     },
     "download": {
         "en": {
-            "label": "Download the photo after adjusting the KB size",
+            "label": "Download the photo after adjusting the DPI or KB size",
         },
         "zh": {
-            "label": "下载调整 KB 大小后的照片",
+            "label": "下载调整 DPI 或 KB 大小后的照片",
+        },
+        "ja": {
+            "label": "DPIまたはKBサイズ調整後の写真をダウンロード",
+        },
+        "ko": {
+            "label": "DPI 또는 KB 크기 조정 후 사진 다운로드",
         },
     },
     "matting_image": {
@@ -291,6 +529,12 @@ LOCALES = {
         "zh": {
             "label": "抠图图像",
         },
+        "ja": {
+            "label": "マット画像",
+        },
+        "ko": {
+            "label": "매팅 이미지",
+        },
     },
     "beauty_tab": {
         "en": {
@@ -299,6 +543,12 @@ LOCALES = {
         "zh": {
             "label": "美颜",
         },
+        "ja": {
+            "label": "美顔",
+        },
+        "ko": {
+            "label": "뷰티",
+        },
     },
     "whitening_strength": {
         "en": {
@@ -307,5 +557,67 @@ LOCALES = {
         "zh": {
             "label": "美白强度",
         },
+        "ja": {
+            "label": "美白強度",
+        },
+        "ko": {
+            "label": "미백 강도",
+        },
+    },
+    "brightness_strength": {
+        "en": {
+            "label": "brightness strength",
+        },
+        "zh": {
+            "label": "亮度强度",
+        },
+        "ja": {
+            "label": "明るさの強さ",
+        },
+        "ko": {
+            "label": "밝기 강도",
+        },
+    },
+    "contrast_strength": {
+        "en": {
+            "label": "contrast strength",
+        },
+        "zh": {
+            "label": "对比度强度",
+        },
+        "ja": {
+            "label": "コントラスト強度",
+        },
+        "ko": {
+            "label": "대비 강도",
+        },
+    },
+    "sharpen_strength": {
+        "en": {
+            "label": "sharpen strength",
+        },
+        "zh": {
+            "label": "锐化强度",
+        },
+        "ja": {
+            "label": "シャープ化強度",
+        },
+        "ko": {
+            "label": "샤ープ 강도",
+        },
+    },
+    "saturation_strength": {
+        "en": {
+            "label": "saturation strength",
+        },
+        "zh": {
+            "label": "饱和度强度",
+        },
+        "ja": {
+            "label": "飽和度強度",
+        },
+        "ko": {
+            "label": "포화도 강도",
+        },
     },
 }

demo/processor.py

@@ -1,7 +1,12 @@
 import numpy as np
 from hivision import IDCreator
 from hivision.error import FaceError, APIError
-from hivision.utils import add_background, resize_image_to_kb, add_watermark
+from hivision.utils import (
+    add_background,
+    resize_image_to_kb,
+    add_watermark,
+    save_image_dpi_to_bytes,
+)
 from hivision.creator.layout_calculator import (
     generate_layout_photo,
     generate_layout_image,
@@ -42,265 +47,406 @@ class IDPhotoProcessor:
         head_measure_ratio=0.2,
         top_distance_max=0.12,
         whitening_strength=0,
+        image_dpi_option=False,
+        custom_image_dpi=None,
+        brightness_strength=0,
+        contrast_strength=0,
+        sharpen_strength=0,
+        saturation_strength=0,
     ):
+        # 初始化参数
         top_distance_min = top_distance_max - 0.02
+        # 得到render_option在LOCALES["render_mode"][language]["choices"]中的索引
+        render_option_index = LOCALES["render_mode"][language]["choices"].index(
+            render_option
+        )
+        idphoto_json = self._initialize_idphoto_json(
+            mode_option, color_option, render_option_index, image_kb_options
+        )
+
+        # 处理尺寸模式
+        size_result = self._process_size_mode(
+            idphoto_json,
+            language,
+            size_list_option,
+            custom_size_height,
+            custom_size_width,
+        )
+        if isinstance(size_result, list):
+            return size_result  # 返回错误信息
+
+        # 处理颜色模式
+        self._process_color_mode(
+            idphoto_json,
+            language,
+            color_option,
+            custom_color_R,
+            custom_color_G,
+            custom_color_B,
+        )
+
+        # 如果设置了自定义KB大小
+        if (
+            idphoto_json["image_kb_mode"]
+            == LOCALES["image_kb"][language]["choices"][-1]
+        ):
+            idphoto_json["custom_image_kb"] = custom_image_kb
+
+        # 如果设置了自定义DPI大小
+        if image_dpi_option == LOCALES["image_dpi"][language]["choices"][-1]:
+            idphoto_json["custom_image_dpi"] = custom_image_dpi
+
+        # 创建IDCreator实例并设置处理器
+        creator = IDCreator()
+        choose_handler(creator, matting_model_option, face_detect_option)
 
-        idphoto_json = {
+        # 生成证件照
+        try:
+            result = self._generate_id_photo(
+                creator,
+                input_image,
+                idphoto_json,
+                language,
+                head_measure_ratio,
+                top_distance_max,
+                top_distance_min,
+                whitening_strength,
+                brightness_strength,
+                contrast_strength,
+                sharpen_strength,
+                saturation_strength,
+            )
+        except (FaceError, APIError):
+            return self._handle_photo_generation_error(language)
+
+        # 后处理生成的照片
+        return self._process_generated_photo(
+            result,
+            idphoto_json,
+            language,
+            watermark_option,
+            watermark_text,
+            watermark_text_size,
+            watermark_text_opacity,
+            watermark_text_angle,
+            watermark_text_space,
+            watermark_text_color,
+        )
+
+    def _initialize_idphoto_json(
+        self,
+        mode_option,
+        color_option,
+        render_option,
+        image_kb_options,
+    ):
+        """初始化idphoto_json字典"""
+        return {
             "size_mode": mode_option,
             "color_mode": color_option,
             "render_mode": render_option,
             "image_kb_mode": image_kb_options,
             "custom_image_kb": None,
+            "custom_image_dpi": None,
         }
 
-        # 如果尺寸模式选择的是尺寸列表
+    def _process_size_mode(
+        self,
+        idphoto_json,
+        language,
+        size_list_option,
+        custom_size_height,
+        custom_size_width,
+    ):
+        """处理尺寸模式"""
         if idphoto_json["size_mode"] == LOCALES["size_mode"][language]["choices"][0]:
             idphoto_json["size"] = LOCALES["size_list"][language]["develop"][
                 size_list_option
             ]
-        # 如果尺寸模式选择的是自定义尺寸
         elif idphoto_json["size_mode"] == LOCALES["size_mode"][language]["choices"][2]:
-            id_height = int(custom_size_height)
-            id_width = int(custom_size_width)
+            id_height, id_width = int(custom_size_height), int(custom_size_width)
             if (
                 id_height < id_width
                 or min(id_height, id_width) < 100
                 or max(id_height, id_width) > 1800
             ):
-                return [
-                    gr.update(value=None),  # img_output_standard
-                    gr.update(value=None),  # img_output_standard_hd
-                    gr.update(value=None),  # img_output_standard_png
-                    gr.update(value=None),  # img_output_standard_hd_png
-                    None,  # img_output_layout (assuming it should be None or not updated)
-                    gr.update(  # notification
-                        value=LOCALES["size_mode"][language]["custom_size_eror"],
-                        visible=True,
-                    ),
-                    None,  # file_download (assuming it should be None or not updated)
-                ]
-
+                return self._create_error_response(language)
             idphoto_json["size"] = (id_height, id_width)
         else:
             idphoto_json["size"] = (None, None)
 
-        # 如果颜色模式选择的是自定义底色
+    def _process_color_mode(
+        self,
+        idphoto_json,
+        language,
+        color_option,
+        custom_color_R,
+        custom_color_G,
+        custom_color_B,
+    ):
+        """处理颜色模式"""
         if idphoto_json["color_mode"] == LOCALES["bg_color"][language]["choices"][-1]:
-            idphoto_json["color_bgr"] = (
-                range_check(custom_color_R),
-                range_check(custom_color_G),
-                range_check(custom_color_B),
+            idphoto_json["color_bgr"] = tuple(
+                map(range_check, [custom_color_R, custom_color_G, custom_color_B])
             )
         else:
-            hex_color = idphoto_json["color_bgr"] = LOCALES["bg_color"][language][
-                "develop"
-            ][color_option]
-            # 转为 RGB
+            hex_color = LOCALES["bg_color"][language]["develop"][color_option]
             idphoto_json["color_bgr"] = tuple(
                 int(hex_color[i : i + 2], 16) for i in (0, 2, 4)
             )
 
-        # 如果输出 KB 大小选择的是自定义
-        if (
-            idphoto_json["image_kb_mode"]
-            == LOCALES["image_kb"][language]["choices"][-1]
-        ):
-            idphoto_json["custom_image_kb"] = custom_image_kb
-
-        creator = IDCreator()
-        choose_handler(creator, matting_model_option, face_detect_option)
-
-        # 是否只换底
+    def _generate_id_photo(
+        self,
+        creator: IDCreator,
+        input_image,
+        idphoto_json,
+        language,
+        head_measure_ratio,
+        top_distance_max,
+        top_distance_min,
+        whitening_strength,
+        brightness_strength,
+        contrast_strength,
+        sharpen_strength,
+        saturation_strength,
+    ):
+        """生成证件照"""
         change_bg_only = (
             idphoto_json["size_mode"] in LOCALES["size_mode"][language]["choices"][1]
         )
+        return creator(
+            input_image,
+            change_bg_only=change_bg_only,
+            size=idphoto_json["size"],
+            head_measure_ratio=head_measure_ratio,
+            head_top_range=(top_distance_max, top_distance_min),
+            whitening_strength=whitening_strength,
+            brightness_strength=brightness_strength,
+            contrast_strength=contrast_strength,
+            sharpen_strength=sharpen_strength,
+            saturation_strength=saturation_strength,
+        )
 
-        # 生成证件照
-        try:
-            result = creator(
-                input_image,
-                change_bg_only=change_bg_only,
-                size=idphoto_json["size"],
-                head_measure_ratio=head_measure_ratio,
-                head_top_range=(top_distance_max, top_distance_min),
-                whitening_strength=whitening_strength,
+    def _handle_photo_generation_error(self, language):
+        """处理照片生成错误"""
+        return [gr.update(value=None) for _ in range(4)] + [
+            gr.update(visible=False),
+            gr.update(
+                value=LOCALES["notification"][language]["face_error"], visible=True
+            ),
+            None,
+        ]
+
+    def _process_generated_photo(
+        self,
+        result,
+        idphoto_json,
+        language,
+        watermark_option,
+        watermark_text,
+        watermark_text_size,
+        watermark_text_opacity,
+        watermark_text_angle,
+        watermark_text_space,
+        watermark_text_color,
+    ):
+        """处理生成的照片"""
+        result_image_standard, result_image_hd, _, _, _, _ = result
+        result_image_standard_png = np.uint8(result_image_standard)
+        result_image_hd_png = np.uint8(result_image_hd)
+
+        # 渲染背景
+        result_image_standard, result_image_hd = self._render_background(
+            result_image_standard, result_image_hd, idphoto_json
+        )
+
+        # 生成排版照片
+        result_layout_image = self._generate_layout_image(
+            idphoto_json,
+            result_image_standard,
+            language,
+            watermark_option,
+            watermark_text,
+            watermark_text_size,
+            watermark_text_opacity,
+            watermark_text_angle,
+            watermark_text_space,
+            watermark_text_color,
+        )
+
+        # 添加水印
+        if watermark_option == LOCALES["watermark_switch"][language]["choices"][1]:
+            result_image_standard, result_image_hd = self._add_watermark(
+                result_image_standard,
+                result_image_hd,
+                watermark_text,
+                watermark_text_size,
+                watermark_text_opacity,
+                watermark_text_angle,
+                watermark_text_space,
+                watermark_text_color,
             )
-        # 如果检测到人脸数量不等于1
-        except FaceError:
-            return [
-                gr.update(value=None),  # img_output_standard
-                gr.update(value=None),  # img_output_standard_hd
-                gr.update(value=None),  # img_output_standard_png
-                gr.update(value=None),  # img_output_standard_hd_png
-                gr.update(visible=False),  # img_output_layout
-                gr.update(  # notification
-                    value=LOCALES["notification"][language]["face_error"],
-                    visible=True,
-                ),
-                None,  # file_download (assuming it should be None or have no update)
-            ]
-        # 如果 API 错误
-        except APIError as e:
-            return [
-                gr.update(value=None),  # img_output_standard
-                gr.update(value=None),  # img_output_standard_hd
-                gr.update(value=None),  # img_output_standard_png
-                gr.update(value=None),  # img_output_standard_hd_png
-                gr.update(visible=False),  # img_output_layout
-                gr.update(  # notification
-                    value=LOCALES["notification"][language]["face_error"],
-                    visible=True,
+
+        # 调整图片大小
+        output_image_path = self._resize_image_if_needed(
+            result_image_standard, idphoto_json
+        )
+
+        return self._create_response(
+            result_image_standard,
+            result_image_hd,
+            result_image_standard_png,
+            result_image_hd_png,
+            result_layout_image,
+            output_image_path,
+        )
+
+    def _render_background(self, result_image_standard, result_image_hd, idphoto_json):
+        """渲染背景"""
+        render_modes = {0: "pure_color", 1: "updown_gradient", 2: "center_gradient"}
+        render_mode = render_modes[idphoto_json["render_mode"]]
+
+        result_image_standard = np.uint8(
+            add_background(
+                result_image_standard, bgr=idphoto_json["color_bgr"], mode=render_mode
+            )
+        )
+        result_image_hd = np.uint8(
+            add_background(
+                result_image_hd, bgr=idphoto_json["color_bgr"], mode=render_mode
+            )
+        )
+
+        return result_image_standard, result_image_hd
+
+    def _generate_layout_image(
+        self,
+        idphoto_json,
+        result_image_standard,
+        language,
+        watermark_option,
+        watermark_text,
+        watermark_text_size,
+        watermark_text_opacity,
+        watermark_text_angle,
+        watermark_text_space,
+        watermark_text_color,
+    ):
+        """生成排版照片"""
+        if idphoto_json["size_mode"] in LOCALES["size_mode"][language]["choices"][1]:
+            return gr.update(visible=False)
+
+        typography_arr, typography_rotate = generate_layout_photo(
+            input_height=idphoto_json["size"][0],
+            input_width=idphoto_json["size"][1],
+        )
+
+        image = result_image_standard
+        if watermark_option == LOCALES["watermark_switch"][language]["choices"][1]:
+            image = add_watermark(
+                image=image,
+                text=watermark_text,
+                size=watermark_text_size,
+                opacity=watermark_text_opacity,
+                angle=watermark_text_angle,
+                space=watermark_text_space,
+                color=watermark_text_color,
+            )
+
+        return gr.update(
+            value=generate_layout_image(
+                image,
+                typography_arr,
+                typography_rotate,
+                height=idphoto_json["size"][0],
+                width=idphoto_json["size"][1],
+            ),
+            visible=True,
+        )
+
+    def _add_watermark(
+        self,
+        result_image_standard,
+        result_image_hd,
+        watermark_text,
+        watermark_text_size,
+        watermark_text_opacity,
+        watermark_text_angle,
+        watermark_text_space,
+        watermark_text_color,
+    ):
+        """添加水印"""
+        watermark_params = {
+            "text": watermark_text,
+            "size": watermark_text_size,
+            "opacity": watermark_text_opacity,
+            "angle": watermark_text_angle,
+            "space": watermark_text_space,
+            "color": watermark_text_color,
+        }
+        result_image_standard = add_watermark(
+            image=result_image_standard, **watermark_params
+        )
+        result_image_hd = add_watermark(image=result_image_hd, **watermark_params)
+        return result_image_standard, result_image_hd
+
+    def _resize_image_if_needed(self, result_image_standard, idphoto_json):
+        """如果需要，调整图片大小"""
+        output_image_path = f"{os.path.join(os.path.dirname(os.path.dirname(__file__)), 'demo/kb_output')}/{int(time.time())}.jpg"
+        # 如果设置了自定义KB大小
+        if idphoto_json["custom_image_kb"]:
+            resize_image_to_kb(
+                result_image_standard,
+                output_image_path,
+                idphoto_json["custom_image_kb"],
+                dpi=(
+                    idphoto_json["custom_image_dpi"]
+                    if idphoto_json["custom_image_dpi"]
+                    else 300
                 ),
-                None,  # file_download (assuming it should be None or have no update)
-            ]
-        # 证件照生成正常
-        else:
-            (result_image_standard, result_image_hd, _, _, _, _) = result
+            )
+            return output_image_path
+        # 如果只设置了dpi
+        elif idphoto_json["custom_image_dpi"]:
+            save_image_dpi_to_bytes(
+                result_image_standard,
+                output_image_path,
+                dpi=idphoto_json["custom_image_dpi"],
+            )
+            return output_image_path
 
-            result_image_standard_png = np.uint8(result_image_standard)
-            result_image_hd_png = np.uint8(result_image_hd)
+        return None
 
-            # 纯色渲染
-            if (
-                idphoto_json["render_mode"]
-                == LOCALES["render_mode"][language]["choices"][0]
-            ):
-                result_image_standard = np.uint8(
-                    add_background(result_image_standard, bgr=idphoto_json["color_bgr"])
-                )
-                result_image_hd = np.uint8(
-                    add_background(result_image_hd, bgr=idphoto_json["color_bgr"])
-                )
-            # 上下渐变渲染
-            elif (
-                idphoto_json["render_mode"]
-                == LOCALES["render_mode"][language]["choices"][1]
-            ):
-                result_image_standard = np.uint8(
-                    add_background(
-                        result_image_standard,
-                        bgr=idphoto_json["color_bgr"],
-                        mode="updown_gradient",
-                    )
-                )
-                result_image_hd = np.uint8(
-                    add_background(
-                        result_image_hd,
-                        bgr=idphoto_json["color_bgr"],
-                        mode="updown_gradient",
-                    )
-                )
-            # 中心渐变渲染
-            else:
-                result_image_standard = np.uint8(
-                    add_background(
-                        result_image_standard,
-                        bgr=idphoto_json["color_bgr"],
-                        mode="center_gradient",
-                    )
-                )
-                result_image_hd = np.uint8(
-                    add_background(
-                        result_image_hd,
-                        bgr=idphoto_json["color_bgr"],
-                        mode="center_gradient",
-                    )
-                )
-
-            # 如果只换底，就不生成排版照
-            if change_bg_only:
-                result_layout_image = gr.update(visible=False)
-            else:
-                typography_arr, typography_rotate = generate_layout_photo(
-                    input_height=idphoto_json["size"][0],
-                    input_width=idphoto_json["size"][1],
-                )
-
-                if (
-                    watermark_option
-                    == LOCALES["watermark_switch"][language]["choices"][1]
-                ):
-                    result_layout_image = gr.update(
-                        value=generate_layout_image(
-                            add_watermark(
-                                image=result_image_standard,
-                                text=watermark_text,
-                                size=watermark_text_size,
-                                opacity=watermark_text_opacity,
-                                angle=watermark_text_angle,
-                                space=watermark_text_space,
-                                color=watermark_text_color,
-                            ),
-                            typography_arr,
-                            typography_rotate,
-                            height=idphoto_json["size"][0],
-                            width=idphoto_json["size"][1],
-                        ),
-                        visible=True,
-                    )
-                else:
-                    result_layout_image = gr.update(
-                        value=generate_layout_image(
-                            result_image_standard,
-                            typography_arr,
-                            typography_rotate,
-                            height=idphoto_json["size"][0],
-                            width=idphoto_json["size"][1],
-                        ),
-                        visible=True,
-                    )
-
-            # 如果添加水印
-            if watermark_option == LOCALES["watermark_switch"][language]["choices"][1]:
-                result_image_standard = add_watermark(
-                    image=result_image_standard,
-                    text=watermark_text,
-                    size=watermark_text_size,
-                    opacity=watermark_text_opacity,
-                    angle=watermark_text_angle,
-                    space=watermark_text_space,
-                    color=watermark_text_color,
-                )
-                result_image_hd = add_watermark(
-                    image=result_image_hd,
-                    text=watermark_text,
-                    size=watermark_text_size,
-                    opacity=watermark_text_opacity,
-                    angle=watermark_text_angle,
-                    space=watermark_text_space,
-                    color=watermark_text_color,
-                )
-
-            # 如果输出 KB 大小选择的是自定义
-            if idphoto_json["custom_image_kb"]:
-                print("调整 kb 大小到", idphoto_json["custom_image_kb"], "kb")
-                output_image_path = f"{os.path.join(os.path.dirname(os.path.dirname(__file__)), 'demo/kb_output')}/{int(time.time())}.jpg"
-                resize_image_to_kb(
-                    result_image_standard,
-                    output_image_path,
-                    idphoto_json["custom_image_kb"],
-                )
-            else:
-                output_image_path = None
-
-            # 返回结果
-            if output_image_path:
-                return [
-                    result_image_standard,  # img_output_standard
-                    result_image_hd,  # img_output_standard_hd
-                    result_image_standard_png,  # img_output_standard_png
-                    result_image_hd_png,  # img_output_standard_hd_png
-                    result_layout_image,  # img_output_layout
-                    gr.update(visible=False),  # notification
-                    gr.update(visible=True, value=output_image_path),  # file_download
-                ]
-            else:
-                return [
-                    result_image_standard,  # img_output_standard
-                    result_image_hd,  # img_output_standard_hd
-                    result_image_standard_png,  # img_output_standard_png
-                    result_image_hd_png,  # img_output_standard_hd_png
-                    result_layout_image,  # img_output_layout
-                    gr.update(visible=False),  # notification
-                    gr.update(visible=False),  # file_download
-                ]
+    def _create_response(
+        self,
+        result_image_standard,
+        result_image_hd,
+        result_image_standard_png,
+        result_image_hd_png,
+        result_layout_image,
+        output_image_path,
+    ):
+        """创建响应"""
+        response = [
+            result_image_standard,
+            result_image_hd,
+            result_image_standard_png,
+            result_image_hd_png,
+            result_layout_image,
+            gr.update(visible=False),
+        ]
+        if output_image_path:
+            response.append(gr.update(visible=True, value=output_image_path))
+        else:
+            response.append(gr.update(visible=False))
+        return response
+
+    def _create_error_response(self, language):
+        """创建错误响应"""
+        return [gr.update(value=None) for _ in range(4)] + [
+            None,
+            gr.update(
+                value=LOCALES["size_mode"][language]["custom_size_eror"], visible=True
+            ),
+            None,
+        ]

demo/ui.py

@@ -21,8 +21,9 @@ def create_ui(
     root_dir: str,
     human_matting_models: list,
     face_detect_models: list,
+    language: list,
 ):
-    DEFAULT_LANG = "zh"
+    DEFAULT_LANG = language[0]
     DEFAULT_HUMAN_MATTING_MODEL = "modnet_photographic_portrait_matting"
     DEFAULT_FACE_DETECT_MODEL = "retinaface-resnet50"
 
@@ -38,13 +39,12 @@ def create_ui(
     with demo:
         gr.HTML(load_description(os.path.join(root_dir, "assets/title.md")))
         with gr.Row():
-            # ------------ 左半边 UI ----------------
+            # ------------------------ 左半边 UI ------------------------
             with gr.Column():
                 img_input = gr.Image(height=400)
 
                 with gr.Row():
                     # 语言选择器
-                    language = ["zh", "en"]
                     language_options = gr.Dropdown(
                         choices=language,
                         label="Language",
@@ -63,7 +63,7 @@ def create_ui(
                         value=human_matting_models[0],
                     )
 
-                # TAB1 - 关键参数
+                # TAB1 - 关键参数 ------------------------------------------------
                 with gr.Tab(
                     LOCALES["key_param"][DEFAULT_LANG]["label"]
                 ) as key_parameter_tab:
@@ -106,7 +106,7 @@ def create_ui(
                         value=LOCALES["render_mode"][DEFAULT_LANG]["choices"][0],
                     )
 
-                # TAB2 - 高级参数
+                # TAB2 - 高级参数 ------------------------------------------------
                 with gr.Tab(
                     LOCALES["advance_param"][DEFAULT_LANG]["label"]
                 ) as advance_parameter_tab:
@@ -133,19 +133,34 @@ def create_ui(
                         value=LOCALES["image_kb"][DEFAULT_LANG]["choices"][0],
                     )
 
-                    with gr.Row(visible=False) as custom_image_kb:
-                        custom_image_kb_size = gr.Slider(
-                            minimum=10,
-                            maximum=1000,
-                            value=50,
-                            label=LOCALES["image_kb_size"][DEFAULT_LANG]["label"],
-                            interactive=True,
-                        )
+                    custom_image_kb_size = gr.Slider(
+                        minimum=10,
+                        maximum=1000,
+                        value=50,
+                        label=LOCALES["image_kb_size"][DEFAULT_LANG]["label"],
+                        interactive=True,
+                        visible=False,
+                    )
 
-                # TAB3 - 美颜
+                    image_dpi_options = gr.Radio(
+                        choices=LOCALES["image_dpi"][DEFAULT_LANG]["choices"],
+                        label=LOCALES["image_dpi"][DEFAULT_LANG]["label"],
+                        value=LOCALES["image_dpi"][DEFAULT_LANG]["choices"][0],
+                    )
+                    custom_image_dpi_size = gr.Slider(
+                        minimum=72,
+                        maximum=600,
+                        value=300,
+                        label=LOCALES["image_dpi_size"][DEFAULT_LANG]["label"],
+                        interactive=True,
+                        visible=False,
+                    )
+
+                # TAB3 - 美颜 ------------------------------------------------
                 with gr.Tab(
                     LOCALES["beauty_tab"][DEFAULT_LANG]["label"]
                 ) as beauty_parameter_tab:
+                    # 美白组件
                     whitening_option = gr.Slider(
                         label=LOCALES["whitening_strength"][DEFAULT_LANG]["label"],
                         minimum=0,
@@ -155,7 +170,46 @@ def create_ui(
                         interactive=True,
                     )
 
-                # TAB4 - 水印
+                    with gr.Row():
+                        # 亮度组件
+                        brightness_option = gr.Slider(
+                            label=LOCALES["brightness_strength"][DEFAULT_LANG]["label"],
+                            minimum=-5,
+                            maximum=25,
+                            value=0,
+                            step=1,
+                            interactive=True,
+                        )
+                        # 对比度组件
+                        contrast_option = gr.Slider(
+                            label=LOCALES["contrast_strength"][DEFAULT_LANG]["label"],
+                            minimum=-10,
+                            maximum=50,
+                            value=0,
+                            step=1,
+                            interactive=True,
+                        )
+                        # 饱和度组件
+                        saturation_option = gr.Slider(
+                            label=LOCALES["saturation_strength"][DEFAULT_LANG]["label"],
+                            minimum=-10,
+                            maximum=50,
+                            value=0,
+                            step=1,
+                            interactive=True,
+                        )
+
+                    # 锐化组件
+                    sharpen_option = gr.Slider(
+                        label=LOCALES["sharpen_strength"][DEFAULT_LANG]["label"],
+                        minimum=0,
+                        maximum=5,
+                        value=0,
+                        step=1,
+                        interactive=True,
+                    )
+
+                # TAB4 - 水印 ------------------------------------------------
                 with gr.Tab(
                     LOCALES["watermark_tab"][DEFAULT_LANG]["label"]
                 ) as watermark_parameter_tab:
@@ -409,27 +463,46 @@ def create_ui(
                     whitening_option: gr.update(
                         label=LOCALES["whitening_strength"][language]["label"]
                     ),
+                    image_dpi_options: gr.update(
+                        label=LOCALES["image_dpi"][language]["label"],
+                        choices=LOCALES["image_dpi"][language]["choices"],
+                        value=LOCALES["image_dpi"][language]["choices"][0],
+                    ),
+                    custom_image_dpi_size: gr.update(
+                        label=LOCALES["image_dpi"][language]["label"]
+                    ),
+                    brightness_option: gr.update(
+                        label=LOCALES["brightness_strength"][language]["label"]
+                    ),
+                    contrast_option: gr.update(
+                        label=LOCALES["contrast_strength"][language]["label"]
+                    ),
+                    sharpen_option: gr.update(
+                        label=LOCALES["sharpen_strength"][language]["label"]
+                    ),
+                    saturation_option: gr.update(
+                        label=LOCALES["saturation_strength"][language]["label"]
+                    ),
                 }
 
-            def change_color(colors):
-                if colors == "自定义底色" or colors == "Custom Color":
-                    return {custom_color: gr.update(visible=True)}
-                else:
-                    return {custom_color: gr.update(visible=False)}
+            def change_visibility(option, lang, locales_key, custom_component):
+                return {
+                    custom_component: gr.update(
+                        visible=option == LOCALES[locales_key][lang]["choices"][-1]
+                    )
+                }
+
+            def change_color(colors, lang):
+                return change_visibility(colors, lang, "bg_color", custom_color)
 
-            def change_size_mode(size_option_item):
-                if (
-                    size_option_item == "自定义尺寸"
-                    or size_option_item == "Custom Size"
-                ):
+            def change_size_mode(size_option_item, lang):
+                choices = LOCALES["size_mode"][lang]["choices"]
+                if size_option_item == choices[2]:
                     return {
                         custom_size: gr.update(visible=True),
                         size_list_row: gr.update(visible=False),
                     }
-                elif (
-                    size_option_item == "只换底"
-                    or size_option_item == "Only Change Background"
-                ):
+                elif size_option_item == choices[1]:
                     return {
                         custom_size: gr.update(visible=False),
                         size_list_row: gr.update(visible=False),
@@ -440,11 +513,15 @@ def create_ui(
                         size_list_row: gr.update(visible=True),
                     }
 
-            def change_image_kb(image_kb_option):
-                if image_kb_option == "自定义" or image_kb_option == "Custom":
-                    return {custom_image_kb: gr.update(visible=True)}
-                else:
-                    return {custom_image_kb: gr.update(visible=False)}
+            def change_image_kb(image_kb_option, lang):
+                return change_visibility(
+                    image_kb_option, lang, "image_kb", custom_image_kb_size
+                )
+
+            def change_image_dpi(image_dpi_option, lang):
+                return change_visibility(
+                    image_dpi_option, lang, "image_dpi", custom_image_dpi_size
+                )
 
             # ---------------- 绑定事件 ----------------
             # 语言切换
@@ -483,21 +560,37 @@ def create_ui(
                     matting_image_accordion,
                     beauty_parameter_tab,
                     whitening_option,
+                    image_dpi_options,
+                    custom_image_dpi_size,
+                    brightness_option,
+                    contrast_option,
+                    sharpen_option,
+                    saturation_option,
                 ],
             )
 
             color_options.input(
-                change_color, inputs=[color_options], outputs=[custom_color]
+                change_color,
+                inputs=[color_options, language_options],
+                outputs=[custom_color],
             )
 
             mode_options.input(
                 change_size_mode,
-                inputs=[mode_options],
+                inputs=[mode_options, language_options],
                 outputs=[custom_size, size_list_row],
             )
 
             image_kb_options.input(
-                change_image_kb, inputs=[image_kb_options], outputs=[custom_image_kb]
+                change_image_kb,
+                inputs=[image_kb_options, language_options],
+                outputs=[custom_image_kb_size],
+            )
+
+            image_dpi_options.input(
+                change_image_dpi,
+                inputs=[image_dpi_options, language_options],
+                outputs=[custom_image_dpi_size],
             )
 
             img_but.click(
@@ -528,6 +621,12 @@ def create_ui(
                     head_measure_ratio_option,
                     top_distance_option,
                     whitening_option,
+                    image_dpi_options,
+                    custom_image_dpi_size,
+                    brightness_option,
+                    contrast_option,
+                    sharpen_option,
+                    saturation_option,
                 ],
                 outputs=[
                     img_output_standard,

hivision/creator/__init__.py

@@ -13,8 +13,9 @@ import hivision.creator.utils as U
 from .context import Context, ContextHandler, Params, Result
 from .human_matting import extract_human
 from .face_detector import detect_face_mtcnn
-from hivision.plugin.beauty.whitening import make_whitening
+from hivision.plugin.beauty.handler import beauty_face
 from .photo_adjuster import adjust_photo
+import cv2
 
 
 class IDCreator:
@@ -43,7 +44,7 @@ class IDCreator:
         # 处理者
         self.matting_handler: ContextHandler = extract_human
         self.detection_handler: ContextHandler = detect_face_mtcnn
-
+        self.beauty_handler: ContextHandler = beauty_face
         # 上下文
         self.ctx = None
 
@@ -58,6 +59,10 @@ class IDCreator:
         head_top_range: float = (0.12, 0.1),
         face: Tuple[int, int, int, int] = None,
         whitening_strength: int = 0,
+        brightness_strength: int = 0,
+        contrast_strength: int = 0,
+        sharpen_strength: int = 0,
+        saturation_strength: int = 0,
     ) -> Result:
         """
         证件照处理函数
@@ -70,7 +75,9 @@ class IDCreator:
         :param head_top_range: 头距离顶部的比例（max,min)
         :param face: 人脸坐标
         :param whitening_strength: 美白强度
-
+        :param brightness_strength: 亮度强度
+        :param contrast_strength: 对比度强度
+        :param sharpen_strength: 锐化强度
         :return: 返回处理后的证件照和一系列参数
         """
         # 0.初始化上下文
@@ -83,7 +90,12 @@ class IDCreator:
             crop_only=crop_only,
             face=face,
             whitening_strength=whitening_strength,
+            brightness_strength=brightness_strength,
+            contrast_strength=contrast_strength,
+            sharpen_strength=sharpen_strength,
+            saturation_strength=saturation_strength,
         )
+
         self.ctx = Context(params)
         ctx = self.ctx
         ctx.processing_image = image
@@ -93,12 +105,6 @@ class IDCreator:
         ctx.origin_image = ctx.processing_image.copy()
         self.before_all and self.before_all(ctx)
 
-        # 美白
-        if ctx.params.whitening_strength > 0:
-            ctx.processing_image = make_whitening(
-                ctx.processing_image, ctx.params.whitening_strength
-            )
-
         # 1. 人像抠图
         if not ctx.params.crop_only:
             # 调用抠图工作流
@@ -107,6 +113,9 @@ class IDCreator:
         else:
             ctx.matting_image = ctx.processing_image
 
+        # 2. 美颜
+        self.beauty_handler(ctx)
+
         # 如果仅换底，则直接返回抠图结果
         if ctx.params.change_bg_only:
             ctx.result = Result(

hivision/creator/context.py

@@ -22,6 +22,10 @@ class Params:
         head_top_range: float = (0.12, 0.1),
         face: Tuple[int, int, int, int] = None,
         whitening_strength: int = 0,
+        brightness_strength: int = 0,
+        contrast_strength: int = 0,
+        sharpen_strength: int = 0,
+        saturation_strength: int = 0,
     ):
         self.__size = size
         self.__change_bg_only = change_bg_only
@@ -31,6 +35,10 @@ class Params:
         self.__head_top_range = head_top_range
         self.__face = face
         self.__whitening_strength = whitening_strength
+        self.__brightness_strength = brightness_strength
+        self.__contrast_strength = contrast_strength
+        self.__sharpen_strength = sharpen_strength
+        self.__saturation_strength = saturation_strength
 
     @property
     def size(self):
@@ -64,6 +72,22 @@ class Params:
     def whitening_strength(self):
         return self.__whitening_strength
 
+    @property
+    def brightness_strength(self):
+        return self.__brightness_strength
+
+    @property
+    def contrast_strength(self):
+        return self.__contrast_strength
+
+    @property
+    def sharpen_strength(self):
+        return self.__sharpen_strength
+
+    @property
+    def saturation_strength(self):
+        return self.__saturation_strength
+
 
 class Result:
     def __init__(

hivision/creator/photo_adjuster.py

@@ -22,7 +22,7 @@ def adjust_photo(ctx: Context):
     params = ctx.params
     x, y = face_rect[0], face_rect[1]
     w, h = face_rect[2], face_rect[3]
-    height, width = ctx.processing_image.shape[:2]
+    height, width = ctx.matting_image.shape[:2]
     width_height_ratio = standard_size[0] / standard_size[1]
     # Step2. 计算高级参数
     face_center = (x + w / 2, y + h / 2)  # 面部中心坐标
@@ -46,7 +46,7 @@ def adjust_photo(ctx: Context):
     x2 = x1 + crop_size[1]
 
     # Step3, 裁剪框的调整
-    cut_image = IDphotos_cut(x1, y1, x2, y2, ctx.processing_image)
+    cut_image = IDphotos_cut(x1, y1, x2, y2, ctx.matting_image)
     cut_image = cv2.resize(cut_image, (crop_size[1], crop_size[0]))
     y_top, y_bottom, x_left, x_right = U.get_box(
         cut_image.astype(np.uint8), model=2, correction_factor=0
@@ -85,7 +85,7 @@ def adjust_photo(ctx: Context):
             y1 + cut_value_top + status_top * move_value,
             x2 - x_right,
             y2 - cut_value_top + status_top * move_value,
-            ctx.processing_image,
+            ctx.matting_image,
         )
 
     # 换装参数准备

hivision/plugin/beauty/base_adjust.py

@@ -0,0 +1,154 @@
+"""
+亮度、对比度、锐化、饱和度调整模块
+"""
+
+import cv2
+import numpy as np
+
+
+def adjust_brightness_contrast_sharpen_saturation(
+    image,
+    brightness_factor=0,
+    contrast_factor=0,
+    sharpen_strength=0,
+    saturation_factor=0,
+):
+    """
+    调整图像的亮度、对比度、锐度和饱和度。
+
+    参数:
+    image (numpy.ndarray): 输入的图像数组。
+    brightness_factor (float): 亮度调整因子。大于0增加亮度，小于0降低亮度。
+    contrast_factor (float): 对比度调整因子。大于0增加对比度，小于0降低对比度。
+    sharpen_strength (float): 锐化强度。
+    saturation_factor (float): 饱和度调整因子。大于0增加饱和度，小于0降低饱和度。
+
+    返回:
+    numpy.ndarray: 调整后的图像。
+    """
+    if (
+        brightness_factor == 0
+        and contrast_factor == 0
+        and sharpen_strength == 0
+        and saturation_factor == 0
+    ):
+        return image.copy()
+
+    adjusted_image = image.copy()
+
+    # 调整饱和度
+    if saturation_factor != 0:
+        adjusted_image = adjust_saturation(adjusted_image, saturation_factor)
+
+    # 调整亮度和对比度
+    alpha = 1.0 + (contrast_factor / 100.0)
+    beta = brightness_factor
+    adjusted_image = cv2.convertScaleAbs(adjusted_image, alpha=alpha, beta=beta)
+
+    # 增强锐化
+    adjusted_image = sharpen_image(adjusted_image, sharpen_strength)
+
+    return adjusted_image
+
+
+def adjust_saturation(image, saturation_factor):
+    """
+    调整图像的饱和度。
+
+    参数:
+    image (numpy.ndarray): 输入的图像数组。
+    saturation_factor (float): 饱和度调整因子。大于0增加饱和度，小于0降低饱和度。
+
+    返回:
+    numpy.ndarray: 调整后的图像。
+    """
+    hsv = cv2.cvtColor(image, cv2.COLOR_BGR2HSV)
+    h, s, v = cv2.split(hsv)
+    s = s.astype(np.float32)
+    s = s + s * (saturation_factor / 100.0)
+    s = np.clip(s, 0, 255).astype(np.uint8)
+    hsv = cv2.merge([h, s, v])
+    return cv2.cvtColor(hsv, cv2.COLOR_HSV2BGR)
+
+
+def sharpen_image(image, strength=0):
+    """
+    对图像进行锐化处理。
+
+    参数:
+    image (numpy.ndarray): 输入的图像数组。
+    strength (float): 锐化强度，范围建议为0-5。0表示不进行锐化。
+
+    返回:
+    numpy.ndarray: 锐化后的图像。
+    """
+    print(f"Sharpen strength: {strength}")
+    if strength == 0:
+        return image.copy()
+
+    strength = strength * 20
+    kernel_strength = 1 + (strength / 500)
+
+    kernel = (
+        np.array([[-0.5, -0.5, -0.5], [-0.5, 5, -0.5], [-0.5, -0.5, -0.5]])
+        * kernel_strength
+    )
+
+    sharpened = cv2.filter2D(image, -1, kernel)
+    sharpened = np.clip(sharpened, 0, 255).astype(np.uint8)
+
+    alpha = strength / 200
+    blended = cv2.addWeighted(image, 1 - alpha, sharpened, alpha, 0)
+
+    return blended
+
+
+# Gradio接口
+def base_adjustment(image, brightness, contrast, sharpen, saturation):
+    adjusted = adjust_brightness_contrast_sharpen_saturation(
+        image, brightness, contrast, sharpen, saturation
+    )
+    return adjusted
+
+
+if __name__ == "__main__":
+    import gradio as gr
+
+    iface = gr.Interface(
+        fn=base_adjustment,
+        inputs=[
+            gr.Image(label="Input Image", height=400),
+            gr.Slider(
+                minimum=-20,
+                maximum=20,
+                value=0,
+                step=1,
+                label="Brightness",
+            ),
+            gr.Slider(
+                minimum=-100,
+                maximum=100,
+                value=0,
+                step=1,
+                label="Contrast",
+            ),
+            gr.Slider(
+                minimum=0,
+                maximum=5,
+                value=0,
+                step=1,
+                label="Sharpen",
+            ),
+            gr.Slider(
+                minimum=-100,
+                maximum=100,
+                value=0,
+                step=1,
+                label="Saturation",
+            ),
+        ],
+        outputs=gr.Image(label="Adjusted Image"),
+        title="Image Adjustment",
+        description="Adjust the brightness, contrast, sharpness, and saturation of an image using sliders.",
+    )
+    iface.launch()

hivision/plugin/beauty/grind_skin.py

@@ -1,20 +1,50 @@
-"""
-@author: cuny
-@file: GrindSkin.py
-@time: 2022/7/2 14:44
-@description: 
-磨皮算法
-"""
-
+# Required Libraries
 import cv2
 import numpy as np
+import gradio as gr
+
+
+def annotate_image(image, grind_degree, detail_degree, strength):
+    """Annotates the image with parameters in the lower-left corner."""
+    font = cv2.FONT_HERSHEY_SIMPLEX
+    font_scale = 0.5
+    color = (0, 0, 255)
+    thickness = 1
+    line_type = cv2.LINE_AA
+
+    # Text positions
+    y_offset = 20
+    x_offset = 10
+    y_base = image.shape[0] - 10
+
+    # Define each line of the annotation
+    lines = [
+        f"Grind Degree: {grind_degree}",
+        f"Detail Degree: {detail_degree}",
+        f"Strength: {strength}",
+    ]
+
+    # Draw the text lines on the image
+    for i, line in enumerate(lines):
+        y_position = y_base - (i * y_offset)
+        cv2.putText(
+            image,
+            line,
+            (x_offset, y_position),
+            font,
+            font_scale,
+            color,
+            thickness,
+            line_type,
+        )
+
+    return image
 
 
 def grindSkin(src, grindDegree: int = 3, detailDegree: int = 1, strength: int = 9):
     """
-    Dest =(Src * (100 - Opacity) + (Src + 2 * GaussBlur(EPFFilter(Src) - Src)) * Opacity) /100
-    人像磨皮方案，后续会考虑使用一些皮肤区域检测算法来实现仅皮肤区域磨皮，增加算法的精细程度——或者使用人脸关键点
-    https://www.cnblogs.com/Imageshop/p/4709710.html
+    Dest =(Src * (100 - Opacity) + (Src + 2 * GaussBlur(EPFFilter(Src) - Src)) * Opacity) / 100
+    人像磨皮方案
     Args:
         src: 原图
         grindDegree: 磨皮程度调节参数
@@ -28,8 +58,8 @@ def grindSkin(src, grindDegree: int = 3, detailDegree: int = 1, strength: int =
         return src
     dst = src.copy()
     opacity = min(10.0, strength) / 10.0
-    dx = grindDegree * 5  # 双边滤波参数之一
-    fc = grindDegree * 12.5  # 双边滤波参数之一
+    dx = grindDegree * 5
+    fc = grindDegree * 12.5
     temp1 = cv2.bilateralFilter(src[:, :, :3], dx, fc, fc)
     temp2 = cv2.subtract(temp1, src[:, :, :3])
     temp3 = cv2.GaussianBlur(temp2, (2 * detailDegree - 1, 2 * detailDegree - 1), 0)
@@ -38,7 +68,49 @@ def grindSkin(src, grindDegree: int = 3, detailDegree: int = 1, strength: int =
     return dst
 
 
+def process_image(input_img, grind_degree, detail_degree, strength):
+    # Reading the image using OpenCV
+    img = cv2.cvtColor(input_img, cv2.COLOR_RGB2BGR)
+    # Processing the image
+    output_img = grindSkin(img, grind_degree, detail_degree, strength)
+    # Annotating the processed image with parameters
+    output_img_annotated = annotate_image(
+        output_img.copy(), grind_degree, detail_degree, strength
+    )
+    # Horizontal stacking of input and processed images
+    combined_img = cv2.hconcat([img, output_img_annotated])
+    # Convert the combined image back to RGB for display
+    combined_img_rgb = cv2.cvtColor(combined_img, cv2.COLOR_BGR2RGB)
+    return combined_img_rgb
+
+
+with gr.Blocks(title="Skin Grinding") as iface:
+    gr.Markdown("## Skin Grinding Application")
+
+    with gr.Row():
+        image_input = gr.Image(type="numpy", label="Input Image")
+        image_output = gr.Image(label="Output Image")
+
+    grind_degree_slider = gr.Slider(
+        minimum=1, maximum=10, value=3, step=1, label="Grind Degree"
+    )
+    detail_degree_slider = gr.Slider(
+        minimum=1, maximum=10, value=1, step=1, label="Detail Degree"
+    )
+    strength_slider = gr.Slider(
+        minimum=0, maximum=10, value=9, step=1, label="Strength"
+    )
+
+    gr.Button("Process Image").click(
+        fn=process_image,
+        inputs=[
+            image_input,
+            grind_degree_slider,
+            detail_degree_slider,
+            strength_slider,
+        ],
+        outputs=image_output,
+    )
+
 if __name__ == "__main__":
-    input_image = cv2.imread("test_image/7.jpg")
-    output_image = grindSkin(src=input_image)
-    cv2.imwrite("grindSkinCompare.png", np.hstack((input_image, output_image)))
+    iface.launch()

hivision/plugin/beauty/handler.py

@@ -0,0 +1,48 @@
+import cv2
+from hivision.creator.context import Context
+from hivision.plugin.beauty.whitening import make_whitening
+from hivision.plugin.beauty.base_adjust import (
+    adjust_brightness_contrast_sharpen_saturation,
+)
+
+
+def beauty_face(ctx: Context):
+    """
+    对人脸进行美颜处理
+    1. 美白
+    2. 亮度
+
+    :param ctx: Context对象，包含处理参数和图像
+    """
+    middle_image = ctx.origin_image.copy()
+    processed = False
+
+    # 如果美白强度大于0，进行美白处理
+    if ctx.params.whitening_strength > 0:
+        middle_image = make_whitening(middle_image, ctx.params.whitening_strength)
+        processed = True
+
+    # 如果亮度、对比度、锐化强度不为0，进行亮度、对比度、锐化处理
+    if (
+        ctx.params.brightness_strength != 0
+        or ctx.params.contrast_strength != 0
+        or ctx.params.sharpen_strength != 0
+        or ctx.params.saturation_strength != 0
+    ):
+        middle_image = adjust_brightness_contrast_sharpen_saturation(
+            middle_image,
+            ctx.params.brightness_strength,
+            ctx.params.contrast_strength,
+            ctx.params.sharpen_strength,
+            ctx.params.saturation_strength,
+        )
+        processed = True
+
+    # 如果进行了美颜处理，更新matting_image
+    if processed:
+        # 分离中间图像的BGR通道
+        b, g, r = cv2.split(middle_image)
+        # 从原始matting_image中获取alpha通道
+        _, _, _, alpha = cv2.split(ctx.matting_image)
+        # 合并处理后的BGR通道和原始alpha通道
+        ctx.matting_image = cv2.merge((b, g, r, alpha))

hivision/plugin/beauty/whitening.py

@@ -52,8 +52,16 @@ make_whiter = MakeWhiter(default_lut)
 
 def make_whitening(image, strength):
     image = cv2.cvtColor(np.array(image), cv2.COLOR_RGB2BGR)
-    output_image = make_whiter.run(image, strength)
-    return cv2.cvtColor(output_image, cv2.COLOR_BGR2RGB)
+
+    iteration = strength // 10
+    bias = strength % 10
+
+    for i in range(iteration):
+        image = make_whiter.run(image, 10)
+
+    image = make_whiter.run(image, bias)
+
+    return cv2.cvtColor(image, cv2.COLOR_BGR2RGB)
 
 
 def make_whitening_png(image, strength):
@@ -71,10 +79,10 @@ def make_whitening_png(image, strength):
 # 启动Gradio应用
 if __name__ == "__main__":
     demo = gr.Interface(
-        fn=make_whitening_png,
+        fn=make_whitening,
         inputs=[
             gr.Image(type="pil", image_mode="RGBA", label="Input Image"),
-            gr.Slider(0, 10, step=1, label="Whitening Strength"),
+            gr.Slider(0, 30, step=1, label="Whitening Strength"),
         ],
         outputs=gr.Image(type="pil"),
         title="Image Whitening Demo",

hivision/utils.py

@@ -1,12 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-r"""
-@DATE: 2024/9/5 21:52
-@File: utils.py
-@IDE: pycharm
-@Description:
-    hivision提供的工具函数
-"""
 from PIL import Image
 import io
 import numpy as np
@@ -15,7 +8,30 @@ import base64
 from hivision.plugin.watermark import Watermarker, WatermarkerStyles
 
 
-def resize_image_to_kb(input_image, output_image_path, target_size_kb):
+def save_image_dpi_to_bytes(image, output_image_path, dpi=300):
+    """
+    设置图像的DPI（每英寸点数）并返回字节流
+
+    :param image: numpy.ndarray, 输入的图像数组
+    :param output_image_path: Path to save the resized image. 保存调整大小后的图像的路径。
+    :param dpi: int, 要设置的DPI值，默认为300
+    """
+    image = Image.fromarray(image)
+    # 创建一个字节流对象
+    byte_stream = io.BytesIO()
+    # 将图像保存到字节流
+    image.save(byte_stream, format="PNG", dpi=(dpi, dpi))
+    # 获取字节流的内容
+    image_bytes = byte_stream.getvalue()
+
+    # Save the image to the output path
+    with open(output_image_path, "wb") as f:
+        f.write(image_bytes)
+
+    return image_bytes
+
+
+def resize_image_to_kb(input_image, output_image_path, target_size_kb, dpi=300):
     """
     Resize an image to a target size in KB.
     将图像调整大小至目标文件大小（KB）。
@@ -47,7 +63,7 @@ def resize_image_to_kb(input_image, output_image_path, target_size_kb):
         img_byte_arr = io.BytesIO()
 
         # Save the image to the BytesIO object with the current quality
-        img.save(img_byte_arr, format="JPEG", quality=quality)
+        img.save(img_byte_arr, format="JPEG", quality=quality, dpi=(dpi, dpi))
 
         # Get the size of the image in KB
         img_size_kb = len(img_byte_arr.getvalue()) / 1024
@@ -145,14 +161,14 @@ def resize_image_to_kb_base64(input_image, target_size_kb, mode="exact"):
 
     # Encode the image data to base64
     img_base64 = base64.b64encode(img_byte_arr.getvalue()).decode("utf-8")
-    return img_base64
+    return "data:image/png;base64," + img_base64
 
 
 def numpy_2_base64(img: np.ndarray) -> str:
     _, buffer = cv2.imencode(".png", img)
     base64_image = base64.b64encode(buffer).decode("utf-8")
 
-    return base64_image
+    return "data:image/png;base64," + base64_image
 
 
 def base64_2_numpy(base64_image: str) -> np.ndarray:
@@ -258,7 +274,13 @@ def add_background(input_image, bgr=(0, 0, 0), mode="pure_color"):
     :return: output: 合成好的输出图像
     """
     height, width = input_image.shape[0], input_image.shape[1]
-    b, g, r, a = cv2.split(input_image)
+    try:
+        b, g, r, a = cv2.split(input_image)
+    except ValueError:
+        raise ValueError(
+            "The input image must have 4 channels. 输入图像必须有4个通道，即透明图像。"
+        )
+
     a_cal = a / 255
     if mode == "pure_color":
         # 纯色填充