update

demo/locales.py

@@ -182,22 +182,22 @@ LOCALES = {
     "bg_color": {
         "en": {
             "label": "Background color",
-            "choices": list(color_list_dict_EN.keys()) + ["Custom"],
+            "choices": list(color_list_dict_EN.keys()) + ["Custom(RGB)", "Custom(HEX)"],
             "develop": color_list_dict_EN,
         },
         "zh": {
             "label": "背景颜色",
-            "choices": list(color_list_dict_CN.keys()) + ["自定义底色"],
+            "choices": list(color_list_dict_CN.keys()) + ["自定义(RGB)", "自定义(HEX)"],
             "develop": color_list_dict_CN,
         },
         "ja": {
             "label": "背景色",
-            "choices": list(color_list_dict_EN.keys()) + ["カスタム"],
+            "choices": list(color_list_dict_EN.keys()) + ["カスタム(RGB)", "カスタム(HEX)"],
             "develop": color_list_dict_EN,
         },
         "ko": {
             "label": "배경색",
-            "choices": list(color_list_dict_EN.keys()) + ["사용자 지정"],
+            "choices": list(color_list_dict_EN.keys()) + ["사용자 지정(RGB)", "사용자 지정(HEX)"],
             "develop": color_list_dict_EN,
         },
     },

demo/processor.py

@@ -31,6 +31,7 @@ class IDPhotoProcessor:
         custom_color_R,
         custom_color_G,
         custom_color_B,
+        custom_color_hex_value,
         custom_size_height,
         custom_size_width,
         custom_size_height_mm,
@@ -88,6 +89,7 @@ class IDPhotoProcessor:
             custom_color_R,
             custom_color_G,
             custom_color_B,
+            custom_color_hex_value,
         )
 
         # 如果设置了自定义KB大小
@@ -208,12 +210,28 @@ class IDPhotoProcessor:
         custom_color_R,
         custom_color_G,
         custom_color_B,
+        custom_color_hex_value,
     ):
         """处理颜色模式"""
-        if idphoto_json["color_mode"] == LOCALES["bg_color"][language]["choices"][-1]:
+        # 如果选择了自定义颜色
+        if idphoto_json["color_mode"] == LOCALES["bg_color"][language]["choices"][-2]:
             idphoto_json["color_bgr"] = tuple(
                 map(range_check, [custom_color_R, custom_color_G, custom_color_B])
             )
+        elif idphoto_json["color_mode"] == LOCALES["bg_color"][language]["choices"][-1]:
+            hex_color = custom_color_hex_value
+            # 将十六进制颜色转换为RGB颜色，如果长度为6，则直接转换，如果长度为7，则去掉#号再转换
+            if len(hex_color) == 6:
+                idphoto_json["color_bgr"] = tuple(
+                    int(hex_color[i : i + 2], 16) for i in (0, 2, 4)
+                )
+            elif len(hex_color) == 7:
+                hex_color = hex_color[1:]
+                idphoto_json["color_bgr"] = tuple(
+                    int(hex_color[i : i + 2], 16) for i in (0, 2, 4)
+                )
+            else:
+                raise ValueError("Invalid hex color. You can only use 6 or 7 characters. For example: #FFFFFF or FFFFFF")
         else:
             hex_color = LOCALES["bg_color"][language]["develop"][color_option]
             idphoto_json["color_bgr"] = tuple(
@@ -288,7 +306,7 @@ class IDPhotoProcessor:
         )
 
         # 生成排版照片
-        result_image_layout, result_image_layout_gr = self._generate_image_layout(
+        result_image_layout, result_image_layout_visible = self._generate_image_layout(
             idphoto_json,
             result_image_standard,
             language,
@@ -315,21 +333,41 @@ class IDPhotoProcessor:
             )
 
         # 调整图片大小
-        output_image_path = self._resize_image_if_needed(
+        output_image_path_dict = self._resize_image_if_needed(
             result_image_standard,
             result_image_hd,
             result_image_layout,
             idphoto_json,
         )
 
-        return self._create_response(
-            result_image_standard,
-            result_image_hd,
-            result_image_standard_png,
-            result_image_hd_png,
-            result_image_layout_gr,
-            output_image_path,
-        )
+        # 如果output_image_path_dict为None，
+        if output_image_path_dict is None:
+            return self._create_response(
+                result_image_standard,
+                result_image_hd,
+                result_image_standard_png,
+                result_image_hd_png,
+                gr.update(value=result_image_layout, visible=result_image_layout_visible),
+            )
+        else:
+            # 如果output_image_path_dict不为None，
+            if output_image_path_dict["layout"]["processed"]:
+                result_image_layout = output_image_path_dict["layout"]["path"]
+            return self._create_response(
+                (
+                    output_image_path_dict["standard"]["path"]
+                    if output_image_path_dict["standard"]["processed"]
+                    else result_image_standard
+                ),
+                (
+                    output_image_path_dict["hd"]["path"]
+                    if output_image_path_dict["hd"]["processed"]
+                    else result_image_hd
+                ),
+                result_image_standard_png,
+                result_image_hd_png,
+                gr.update(value=result_image_layout, visible=result_image_layout_visible),
+            )
 
     def _render_background(self, result_image_standard, result_image_hd, idphoto_json):
         """渲染背景"""
@@ -363,8 +401,9 @@ class IDPhotoProcessor:
         watermark_text_color,
     ):
         """生成排版照片"""
+        # 如果选择了自定义尺寸，则不生成排版照片
         if idphoto_json["size_mode"] in LOCALES["size_mode"][language]["choices"][1]:
-            return None, gr.update(visible=False)
+            return None, False
 
         typography_arr, typography_rotate = generate_layout_photo(
             input_height=idphoto_json["size"][0],
@@ -391,10 +430,7 @@ class IDPhotoProcessor:
             width=idphoto_json["size"][1],
         )
 
-        return result_image_layout, gr.update(
-            value=result_image_layout,
-            visible=True,
-        )
+        return result_image_layout, True
 
     def _add_watermark(
         self,
@@ -436,9 +472,9 @@ class IDPhotoProcessor:
         )
         timestamp = int(time.time())
         output_paths = {
-            "standard": f"{base_path}/{timestamp}_standard",
-            "hd": f"{base_path}/{timestamp}_hd",
-            "layout": f"{base_path}/{timestamp}_layout",
+            "standard": {"path": f"{base_path}/{timestamp}_standard", "processed": False},
+            "hd": {"path": f"{base_path}/{timestamp}_hd", "processed": False},
+            "layout": {"path": f"{base_path}/{timestamp}_layout", "processed": False},
         }
 
         # 获取自定义的KB和DPI值
@@ -449,50 +485,59 @@ class IDPhotoProcessor:
         if custom_kb and custom_dpi:
             # 为所有输出路径添加DPI信息
             for key in output_paths:
-                output_paths[key] += f"_{custom_dpi}dpi.jpg"
+                output_paths[key]["path"] += f"_{custom_dpi}dpi.jpg"
             # 为标准图像添加KB信息
-            output_paths["standard"] = output_paths["standard"].replace(
+            output_paths["standard"]["path"] = output_paths["standard"]["path"].replace(
                 ".jpg", f"_{custom_kb}kb.jpg"
             )
 
             # 调整标准图像大小并保存
             resize_image_to_kb(
                 result_image_standard,
-                output_paths["standard"],
+                output_paths["standard"]["path"],
                 custom_kb,
                 dpi=custom_dpi,
             )
+            output_paths["standard"]["processed"] = True
             # 保存高清图像和排版图像
-            save_image_dpi_to_bytes(result_image_hd, output_paths["hd"], dpi=custom_dpi)
-            save_image_dpi_to_bytes(
-                result_image_layout, output_paths["layout"], dpi=custom_dpi
-            )
+            save_image_dpi_to_bytes(result_image_hd, output_paths["hd"]["path"], dpi=custom_dpi)
+            output_paths["hd"]["processed"] = True
+            if result_image_layout:
+                save_image_dpi_to_bytes(
+                    result_image_layout, output_paths["layout"]["path"], dpi=custom_dpi
+                )
+                output_paths["layout"]["processed"] = True
 
-            return list(output_paths.values())
+            return output_paths
 
         # 只有自定义DPI的情况
         elif custom_dpi:
             for key in output_paths:
-                output_paths[key] += f"_{custom_dpi}dpi.jpg"
+                output_paths[key]["path"] += f"_{custom_dpi}dpi.jpg"
                 # 保存所有图像，使用自定义DPI
-                save_image_dpi_to_bytes(
-                    locals()[f"result_image_{key}"], output_paths[key], dpi=custom_dpi
-                )
+                if key == "layout" and result_image_layout is None:
+                    pass
+                else:
+                    save_image_dpi_to_bytes(
+                        locals()[f"result_image_{key}"], output_paths[key]["path"], dpi=custom_dpi
+                    )
+                    output_paths[key]["processed"] = True
 
-            return list(output_paths.values())
+            return output_paths
 
         # 只有自定义KB的情况
         elif custom_kb:
-            output_paths["standard"] += f"_{custom_kb}kb.jpg"
+            output_paths["standard"]["path"] += f"_{custom_kb}kb.jpg"
             # 只调整标准图像大小并保存
             resize_image_to_kb(
                 result_image_standard,
-                output_paths["standard"],
+                output_paths["standard"]["path"],
                 custom_kb,
                 dpi=300,
             )
+            output_paths["standard"]["processed"] = True
 
-            return [output_paths["standard"]]
+            return output_paths
 
         # 如果没有自定义设置，返回None
         return None
@@ -504,7 +549,6 @@ class IDPhotoProcessor:
         result_image_standard_png,
         result_image_hd_png,
         result_layout_image,
-        output_image_path,
     ):
         """创建响应"""
         response = [
@@ -515,10 +559,7 @@ class IDPhotoProcessor:
             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):

demo/ui.py

@@ -120,11 +120,16 @@ def create_ui(
                         label=LOCALES["bg_color"][DEFAULT_LANG]["label"],
                         value=LOCALES["bg_color"][DEFAULT_LANG]["choices"][0],
                     )
-
-                    with gr.Row(visible=False) as custom_color:
-                        custom_color_R = gr.Number(value=0, label="R", interactive=True)
-                        custom_color_G = gr.Number(value=0, label="G", interactive=True)
-                        custom_color_B = gr.Number(value=0, label="B", interactive=True)
+                    
+                    # 自定义颜色RGB
+                    with gr.Row(visible=False) as custom_color_rgb:
+                        custom_color_R = gr.Number(value=0, label="R", minimum=0, maximum=255, interactive=True)
+                        custom_color_G = gr.Number(value=0, label="G", minimum=0, maximum=255, interactive=True)
+                        custom_color_B = gr.Number(value=0, label="B", minimum=0, maximum=255, interactive=True)
+                    
+                    # 自定义颜色HEX
+                    with gr.Row(visible=False) as custom_color_hex:
+                        custom_color_hex_value = gr.Text(value="000000", label="Hex", interactive=True)
 
                     render_options = gr.Radio(
                         choices=LOCALES["render_mode"][DEFAULT_LANG]["choices"],
@@ -535,7 +540,11 @@ def create_ui(
                 }
 
             def change_color(colors, lang):
-                return change_visibility(colors, lang, "bg_color", custom_color)
+                return {
+                    custom_color_rgb: gr.update(visible = colors == LOCALES["bg_color"][lang]["choices"][-2]),
+                    custom_color_hex: gr.update(visible = colors == LOCALES["bg_color"][lang]["choices"][-1]),
+                }
+                
 
             def change_size_mode(size_option_item, lang):
                 choices = LOCALES["size_mode"][lang]["choices"]
@@ -650,7 +659,7 @@ def create_ui(
             color_options.input(
                 change_color,
                 inputs=[color_options, language_options],
-                outputs=[custom_color],
+                outputs=[custom_color_rgb, custom_color_hex],
             )
 
             # 图片kb
@@ -679,6 +688,7 @@ def create_ui(
                     custom_color_R,
                     custom_color_G,
                     custom_color_B,
+                    custom_color_hex_value,
                     custom_size_height_px,
                     custom_size_width_px,
                     custom_size_height_mm,
@@ -712,7 +722,6 @@ def create_ui(
                     img_output_standard_hd_png,
                     img_output_layout,
                     notification,
-                    file_download,
                 ],
             )