jykoh commited on
Commit
20a5db2
β€’
1 Parent(s): 8d32b88

Turn off debug mode.

Browse files
Files changed (3) hide show
  1. app.py +7 -8
  2. gill/models.py +1 -1
  3. share_btn.py +4 -4
app.py CHANGED
@@ -53,7 +53,7 @@ def upload_image(state, image_input):
53
  input_image = Image.open(image_input.name).resize(
54
  (224, 224)).convert('RGB')
55
  input_image.save(image_input.name) # Overwrite with smaller image.
56
- conversation += [(f'<img src="https://huggingface.co/spaces/jykoh/gill/file={image_input.name}" style="display: inline-block;">', "")]
57
  return [conversation, chat_history + [input_image, ""]], conversation
58
 
59
 
@@ -92,8 +92,7 @@ def generate_for_prompt(input_text, state, ret_scale_factor, num_words, temperat
92
  if temperature != 0.0:
93
  top_p = 0.95
94
 
95
- print('Running model.generate_for_images_and_texts with',
96
- model_inputs, flush=True)
97
  model_outputs = model.generate_for_images_and_texts(model_inputs,
98
  num_words=max(num_words, 1), ret_scale_factor=ret_scale_factor, top_p=top_p,
99
  temperature=temperature, max_num_rets=1,
@@ -115,13 +114,13 @@ def generate_for_prompt(input_text, state, ret_scale_factor, num_words, temperat
115
  elif type(p) == dict:
116
  # Decide whether to generate or retrieve.
117
  if p['decision'] is not None and p['decision'][0] == 'gen':
118
- image = p['gen'][0][0].resize((512, 512))
119
  filename = save_image_to_local(image)
120
- response += f'<img src="https://huggingface.co/spaces/jykoh/gill/file={filename}" style="display: inline-block;"><p style="font-size: 12px; color: #555;">(Generated)</p>'
121
  else:
122
- image = p['ret'][0][0].resize((512, 512))
123
  filename = save_image_to_local(image)
124
- response += f'<img src="https://huggingface.co/spaces/jykoh/gill/file={filename}" style="display: inline-block;"><p style="font-size: 12px; color: #555;">(Retrieved)</p>'
125
 
126
 
127
  chat_history = model_inputs + \
@@ -162,7 +161,7 @@ with gr.Blocks(css=css) as demo:
162
  with gr.Row():
163
  with gr.Column(scale=0.7, min_width=500):
164
  with gr.Row():
165
- chatbot = gr.Chatbot(elem_id="chatbot", label="πŸ§€ FROMAGe Chatbot")
166
  with gr.Row():
167
  image_btn = gr.UploadButton("πŸ–ΌοΈ Upload Image", file_types=["image"])
168
 
 
53
  input_image = Image.open(image_input.name).resize(
54
  (224, 224)).convert('RGB')
55
  input_image.save(image_input.name) # Overwrite with smaller image.
56
+ conversation += [(f'<img src="/file={image_input.name}" style="display: inline-block;">', "")]
57
  return [conversation, chat_history + [input_image, ""]], conversation
58
 
59
 
 
92
  if temperature != 0.0:
93
  top_p = 0.95
94
 
95
+ print('Running model.generate_for_images_and_texts with', model_inputs, flush=True)
 
96
  model_outputs = model.generate_for_images_and_texts(model_inputs,
97
  num_words=max(num_words, 1), ret_scale_factor=ret_scale_factor, top_p=top_p,
98
  temperature=temperature, max_num_rets=1,
 
114
  elif type(p) == dict:
115
  # Decide whether to generate or retrieve.
116
  if p['decision'] is not None and p['decision'][0] == 'gen':
117
+ image = p['gen'][0][0].resize((224, 224))
118
  filename = save_image_to_local(image)
119
+ response += f'<img src="/file={filename}" style="display: inline-block;"><p style="font-size: 12px; color: #555;">(Generated)</p>'
120
  else:
121
+ image = p['ret'][0][0].resize((224, 224))
122
  filename = save_image_to_local(image)
123
+ response += f'<img src="/file={filename}" style="display: inline-block;"><p style="font-size: 12px; color: #555;">(Retrieved)</p>'
124
 
125
 
126
  chat_history = model_inputs + \
 
161
  with gr.Row():
162
  with gr.Column(scale=0.7, min_width=500):
163
  with gr.Row():
164
+ chatbot = gr.Chatbot(elem_id="chatbot", label="🐟 GILL Chatbot")
165
  with gr.Row():
166
  image_btn = gr.UploadButton("πŸ–ΌοΈ Upload Image", file_types=["image"])
167
 
gill/models.py CHANGED
@@ -866,7 +866,7 @@ def load_gill(embeddings_dir: str, model_args_path: str, model_ckpt_path: str, d
866
  # Use the same RET tokens for generation.
867
  model_kwargs['gen_token_idx'] = model_kwargs['retrieval_token_idx']
868
 
869
- debug = True
870
  if debug:
871
  model_kwargs['opt_version'] = 'facebook/opt-125m'
872
  model_kwargs['visual_encoder'] = 'openai/clip-vit-base-patch32'
 
866
  # Use the same RET tokens for generation.
867
  model_kwargs['gen_token_idx'] = model_kwargs['retrieval_token_idx']
868
 
869
+ debug = False
870
  if debug:
871
  model_kwargs['opt_version'] = 'facebook/opt-125m'
872
  model_kwargs['visual_encoder'] = 'openai/clip-vit-base-patch32'
share_btn.py CHANGED
@@ -33,7 +33,7 @@ async () => {
33
  .then((canvas) => {
34
  const imageBlob = canvas.toBlob((blob) => {
35
  const imageId = Date.now();
36
- const fileName = "FROMAGe-" + imageId + ".jpg";
37
  resolve(new File([blob], fileName, { type: 'image/jpeg' }));
38
  }, 'image/jpeg', 0.95);
39
  })
@@ -47,7 +47,7 @@ async () => {
47
  console.log(imageFile);
48
  const urlChatbotImage = await uploadFile(imageFile);
49
  console.log(urlChatbotImage);
50
- let titleTxt = `FROMAGe Example`;
51
 
52
  //const shareBtnEl = gradioEl.querySelector('#share-btn');
53
  //shareBtnEl.style.pointerEvents = 'none';
@@ -60,7 +60,7 @@ async () => {
60
  description: descriptionMd,
61
  });
62
  const paramsStr = params.toString();
63
- window.open(`https://huggingface.co/spaces/jykoh/fromage/discussions/new?${paramsStr}`, '_blank');
64
  //shareBtnEl.style.removeProperty('pointer-events');
65
  }
66
  """
@@ -93,7 +93,7 @@ async () => {
93
  html2canvas(div)
94
  .then((canvas) => {
95
  const imageId = Date.now();
96
- const fileName = "FROMAGe-" + imageId + ".png";
97
  saveAs(canvas.toDataURL(), fileName);
98
  })
99
 
 
33
  .then((canvas) => {
34
  const imageBlob = canvas.toBlob((blob) => {
35
  const imageId = Date.now();
36
+ const fileName = "GILL-" + imageId + ".jpg";
37
  resolve(new File([blob], fileName, { type: 'image/jpeg' }));
38
  }, 'image/jpeg', 0.95);
39
  })
 
47
  console.log(imageFile);
48
  const urlChatbotImage = await uploadFile(imageFile);
49
  console.log(urlChatbotImage);
50
+ let titleTxt = `GILL Example`;
51
 
52
  //const shareBtnEl = gradioEl.querySelector('#share-btn');
53
  //shareBtnEl.style.pointerEvents = 'none';
 
60
  description: descriptionMd,
61
  });
62
  const paramsStr = params.toString();
63
+ window.open(`https://huggingface.co/spaces/jykoh/gill/discussions/new?${paramsStr}`, '_blank');
64
  //shareBtnEl.style.removeProperty('pointer-events');
65
  }
66
  """
 
93
  html2canvas(div)
94
  .then((canvas) => {
95
  const imageId = Date.now();
96
+ const fileName = "GILL-" + imageId + ".png";
97
  saveAs(canvas.toDataURL(), fileName);
98
  })
99