LiuZichen commited on
Commit
c944b54
·
verified ·
1 Parent(s): 537f21e

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +41 -41
app.py CHANGED
@@ -28,13 +28,13 @@ import gc
28
  snapshot_download(repo_id="LiuZichen/MagicQuill-models", repo_type="model", local_dir="models")
29
  # HF_TOKEN = os.environ.get("HF_TOKEN")
30
  # The client has been made public. Welcome to duplicate our repo.
31
- _HELPER_SPACE = "LiuZichen/MagicQuillHelper"
32
- _client = None
33
- def client():
34
- global _client
35
- if _client is None:
36
- _client = Client(_HELPER_SPACE)
37
- return _client
38
  scribbleColorEditModel = ScribbleColorEditModel()
39
 
40
  def tensor_to_numpy(tensor):
@@ -108,49 +108,49 @@ def prepare_images_and_masks(total_mask, original_image, add_color_image, add_ed
108
  return add_color_image_tensor, original_image_tensor, total_mask, add_edge_mask, remove_edge_mask
109
 
110
  def guess_prompt_handler(original_image, add_color_image, add_edge_image):
111
- original_image_tensor = load_and_preprocess_image(original_image)
112
 
113
- if add_color_image:
114
- add_color_image_tensor = load_and_preprocess_image(add_color_image)
115
- else:
116
- add_color_image_tensor = original_image_tensor
117
 
118
- width, height = original_image_tensor.shape[1], original_image_tensor.shape[2]
119
- add_edge_mask = create_alpha_mask(add_edge_image) if add_edge_image else torch.zeros((1, height, width), dtype=torch.float32, device="cpu")
120
 
121
- original_image_numpy = tensor_to_numpy(original_image_tensor.squeeze(0))
122
- add_color_image_numpy = tensor_to_numpy(add_color_image_tensor.squeeze(0))
123
- add_edge_mask_numpy = tensor_to_numpy(add_edge_mask.squeeze(0).unsqueeze(-1))
124
- original_image_numpy = cv2.cvtColor(original_image_numpy, cv2.COLOR_RGB2BGR)
125
- add_color_image_numpy = cv2.cvtColor(add_color_image_numpy, cv2.COLOR_RGB2BGR)
126
 
127
- original_image_file = tempfile.NamedTemporaryFile(delete=False, suffix=".png", mode='w+b')
128
- add_color_image_file = tempfile.NamedTemporaryFile(delete=False, suffix=".png", mode='w+b')
129
- add_edge_mask_file = tempfile.NamedTemporaryFile(delete=False, suffix=".png", mode='w+b')
130
 
131
- cv2.imwrite(original_image_file.name, original_image_numpy)
132
- cv2.imwrite(add_color_image_file.name, add_color_image_numpy)
133
- cv2.imwrite(add_edge_mask_file.name, add_edge_mask_numpy)
134
 
135
- original_image_file.close()
136
- add_color_image_file.close()
137
- add_edge_mask_file.close()
138
 
139
- res = client().predict(
140
- handle_file(original_image_file.name),
141
- handle_file(add_color_image_file.name),
142
- handle_file(add_edge_mask_file.name),
143
- api_name="/guess_prompt"
144
- )
145
 
146
- if original_image_file and os.path.exists(original_image_file.name):
147
- os.remove(original_image_file.name)
148
- if add_color_image_file and os.path.exists(add_color_image_file.name):
149
- os.remove(add_color_image_file.name)
150
- if add_edge_mask_file and os.path.exists(add_edge_mask_file.name):
151
- os.remove(add_edge_mask_file.name)
152
 
153
- return res
154
 
155
  def generate(ckpt_name, total_mask, original_image, add_color_image, add_edge_image, remove_edge_image, positive_prompt, negative_prompt, grow_size, stroke_as_edge, fine_edge, edge_strength, color_strength, inpaint_strength, seed, steps, cfg, sampler_name, scheduler):
156
  add_color_image, original_image, total_mask, add_edge_mask, remove_edge_mask = prepare_images_and_masks(total_mask, original_image, add_color_image, add_edge_image, remove_edge_image)
 
28
  snapshot_download(repo_id="LiuZichen/MagicQuill-models", repo_type="model", local_dir="models")
29
  # HF_TOKEN = os.environ.get("HF_TOKEN")
30
  # The client has been made public. Welcome to duplicate our repo.
31
+ # _HELPER_SPACE = "LiuZichen/MagicQuillHelper"
32
+ # _client = None
33
+ # def client():
34
+ # global _client
35
+ # if _client is None:
36
+ # _client = Client(_HELPER_SPACE)
37
+ # return _client
38
  scribbleColorEditModel = ScribbleColorEditModel()
39
 
40
  def tensor_to_numpy(tensor):
 
108
  return add_color_image_tensor, original_image_tensor, total_mask, add_edge_mask, remove_edge_mask
109
 
110
  def guess_prompt_handler(original_image, add_color_image, add_edge_image):
111
+ # original_image_tensor = load_and_preprocess_image(original_image)
112
 
113
+ # if add_color_image:
114
+ # add_color_image_tensor = load_and_preprocess_image(add_color_image)
115
+ # else:
116
+ # add_color_image_tensor = original_image_tensor
117
 
118
+ # width, height = original_image_tensor.shape[1], original_image_tensor.shape[2]
119
+ # add_edge_mask = create_alpha_mask(add_edge_image) if add_edge_image else torch.zeros((1, height, width), dtype=torch.float32, device="cpu")
120
 
121
+ # original_image_numpy = tensor_to_numpy(original_image_tensor.squeeze(0))
122
+ # add_color_image_numpy = tensor_to_numpy(add_color_image_tensor.squeeze(0))
123
+ # add_edge_mask_numpy = tensor_to_numpy(add_edge_mask.squeeze(0).unsqueeze(-1))
124
+ # original_image_numpy = cv2.cvtColor(original_image_numpy, cv2.COLOR_RGB2BGR)
125
+ # add_color_image_numpy = cv2.cvtColor(add_color_image_numpy, cv2.COLOR_RGB2BGR)
126
 
127
+ # original_image_file = tempfile.NamedTemporaryFile(delete=False, suffix=".png", mode='w+b')
128
+ # add_color_image_file = tempfile.NamedTemporaryFile(delete=False, suffix=".png", mode='w+b')
129
+ # add_edge_mask_file = tempfile.NamedTemporaryFile(delete=False, suffix=".png", mode='w+b')
130
 
131
+ # cv2.imwrite(original_image_file.name, original_image_numpy)
132
+ # cv2.imwrite(add_color_image_file.name, add_color_image_numpy)
133
+ # cv2.imwrite(add_edge_mask_file.name, add_edge_mask_numpy)
134
 
135
+ # original_image_file.close()
136
+ # add_color_image_file.close()
137
+ # add_edge_mask_file.close()
138
 
139
+ # res = client().predict(
140
+ # handle_file(original_image_file.name),
141
+ # handle_file(add_color_image_file.name),
142
+ # handle_file(add_edge_mask_file.name),
143
+ # api_name="/guess_prompt"
144
+ # )
145
 
146
+ # if original_image_file and os.path.exists(original_image_file.name):
147
+ # os.remove(original_image_file.name)
148
+ # if add_color_image_file and os.path.exists(add_color_image_file.name):
149
+ # os.remove(add_color_image_file.name)
150
+ # if add_edge_mask_file and os.path.exists(add_edge_mask_file.name):
151
+ # os.remove(add_edge_mask_file.name)
152
 
153
+ return ""
154
 
155
  def generate(ckpt_name, total_mask, original_image, add_color_image, add_edge_image, remove_edge_image, positive_prompt, negative_prompt, grow_size, stroke_as_edge, fine_edge, edge_strength, color_strength, inpaint_strength, seed, steps, cfg, sampler_name, scheduler):
156
  add_color_image, original_image, total_mask, add_edge_mask, remove_edge_mask = prepare_images_and_masks(total_mask, original_image, add_color_image, add_edge_image, remove_edge_image)