wuzengcheng commited on
Commit
4b4753d
·
1 Parent(s): 6fb92ab

[feat] 上传图片区域也改为gallery

Browse files
Files changed (2) hide show
  1. algorithm.py +4 -4
  2. app.py +3 -3
algorithm.py CHANGED
@@ -91,17 +91,17 @@ class ImageSearch():
91
 
92
  return zip(product_cropped_images, product_names)
93
 
94
- def upload_wait2search_image(self, image_files):
95
 
96
  wait2search_image_list = []
97
  wait2search_image_hashes = []
98
  wait2search_image_names = []
99
 
100
- for image_file in image_files:
101
-
102
  wait2search_image = Image.open(image_file)
103
 
104
- wait2search_image_names.append(image_file.name.split('/')[-1])
105
  wait2search_image_list.append(wait2search_image)
106
  wait2search_image_hashes.append(hashlib.md5(wait2search_image.tobytes()).hexdigest())
107
 
 
91
 
92
  return zip(product_cropped_images, product_names)
93
 
94
+ def upload_wait2search_image(self, image_infos):
95
 
96
  wait2search_image_list = []
97
  wait2search_image_hashes = []
98
  wait2search_image_names = []
99
 
100
+ for image_info in image_infos:
101
+ image_file, image_label = image_info
102
  wait2search_image = Image.open(image_file)
103
 
104
+ wait2search_image_names.append(image_file.split('/')[-1])
105
  wait2search_image_list.append(wait2search_image)
106
  wait2search_image_hashes.append(hashlib.md5(wait2search_image.tobytes()).hexdigest())
107
 
app.py CHANGED
@@ -31,14 +31,14 @@ with gr.Blocks() as demo:
31
  upload_pdf_btn.click(SearchImageTask.upload_products_pdf_file, input_pdf, gallery_pdf)
32
  with gr.Row():
33
  with gr.Column(scale=1):
34
- input_img = gr.Files(label="Upload Image", height=300)
35
  with gr.Column(scale=1):
36
- gallery_image = gr.Gallery(label="Matched Images", elem_id="gallery", height=300)
37
 
38
  with gr.Row():
39
  upload_img_btn = gr.Button("上传测试图片,匹配作品登记证书")
40
 
41
- upload_img_btn.click(SearchImageTask.upload_wait2search_image, input_img, gallery_image)
42
 
43
 
44
  if __name__ == "__main__":
 
31
  upload_pdf_btn.click(SearchImageTask.upload_products_pdf_file, input_pdf, gallery_pdf)
32
  with gr.Row():
33
  with gr.Column(scale=1):
34
+ gallery_input_image = gr.Gallery(label="Upload Images", elem_id="gallery", height=400)
35
  with gr.Column(scale=1):
36
+ gallery_output_image = gr.Gallery(label="Matched Images", elem_id="gallery", height=400)
37
 
38
  with gr.Row():
39
  upload_img_btn = gr.Button("上传测试图片,匹配作品登记证书")
40
 
41
+ upload_img_btn.click(SearchImageTask.upload_wait2search_image, gallery_input_image, gallery_output_image)
42
 
43
 
44
  if __name__ == "__main__":