Catherine ZHOU commited on
Commit
7db0ed5
·
1 Parent(s): 2f404b6

update changes

Browse files
Files changed (2) hide show
  1. app.py +13 -14
  2. flagged/log.csv +2 -0
app.py CHANGED
@@ -48,15 +48,13 @@ def search_text(query, top_k=1):
48
  hits = util.semantic_search(query_emb, img_emb, top_k=top_k)[0]
49
 
50
  image = []
51
- image_emb = []
52
  for hit in hits:
53
  #print(img_names[hit['corpus_id']])
54
  object = Image.open(os.path.join(
55
  "photos/", img_names[hit['corpus_id']]))
56
  image.append(object)
57
- image_emb.append([img_emb[hit['corpus_id']]])
58
  #print(f'array length is: {len(image)}')
59
- return image, image_emb
60
 
61
  def select_image(evt: gr.SelectData):
62
  """ Returns the index of the selected image
@@ -69,18 +67,19 @@ def select_image(evt: gr.SelectData):
69
  """
70
  return evt.index
71
 
72
- def select_image_relevance(evt: gr.SelectData, selected_embs, image_relevance_state):
73
  """ Returns the relevance of the selected image
74
 
75
  Args:
76
  evt (SelectData): the event we are listening to
77
- selected_embs (int): the index of the selected image
 
78
  image_relevance_state (State): the current state of the image relevance
79
 
80
  Returns:
81
  state: the new state of the image relevance
82
  """
83
- image_relevance_state[selected_embs] = evt.value
84
  return image_relevance_state
85
 
86
 
@@ -120,19 +119,19 @@ with gr.Blocks() as demo:
120
  gr.Examples(examples, [query, top_k])
121
 
122
  # when user input query and top_k
123
- gallery_embs = [[] for _ in range(top_k.value)]
124
- submit_btn.click(search_text, [query, top_k], [gallery, gallery_embs])
125
- image_relevance = {embs: 0 for embs in gallery_embs}
126
- image_relevance_state = gr.State(image_relevance, label="image_relevance_state")
127
- selected_index = 0
128
- callback.setup([image_relevance_state])
129
 
130
  # when user select an image in the gallery
131
  gallery.select(select_image, None, selected_index)
132
  # when user select the relevance of the image
133
  relevance.select(fn=select_image_relevance,
134
- input=[gallery_embs[selected_index], image_relevance_state],
135
- output=image_relevance_state)
136
 
137
  # when user click save button
138
  # we will flag the current image_relevance_state
 
48
  hits = util.semantic_search(query_emb, img_emb, top_k=top_k)[0]
49
 
50
  image = []
 
51
  for hit in hits:
52
  #print(img_names[hit['corpus_id']])
53
  object = Image.open(os.path.join(
54
  "photos/", img_names[hit['corpus_id']]))
55
  image.append(object)
 
56
  #print(f'array length is: {len(image)}')
57
+ return image
58
 
59
  def select_image(evt: gr.SelectData):
60
  """ Returns the index of the selected image
 
67
  """
68
  return evt.index
69
 
70
+ def select_image_relevance(evt: gr.SelectData, gallery, selected_index, image_relevance_state):
71
  """ Returns the relevance of the selected image
72
 
73
  Args:
74
  evt (SelectData): the event we are listening to
75
+ gallery (Gallery): the gallery of images
76
+ selected_index (Number): the index of the selected image
77
  image_relevance_state (State): the current state of the image relevance
78
 
79
  Returns:
80
  state: the new state of the image relevance
81
  """
82
+ image_relevance_state[gallery.value[selected_index.value]] = evt.value
83
  return image_relevance_state
84
 
85
 
 
119
  gr.Examples(examples, [query, top_k])
120
 
121
  # when user input query and top_k
122
+ submit_btn.click(search_text, [query, top_k], [gallery])
123
+
124
+ image_relevance_state = gr.State({}, label="image_relevance_state")
125
+ selected_index = gr.Number(value=0, visible=False)
126
+
127
+ callback.setup([image_relevance_state], "flagged")
128
 
129
  # when user select an image in the gallery
130
  gallery.select(select_image, None, selected_index)
131
  # when user select the relevance of the image
132
  relevance.select(fn=select_image_relevance,
133
+ inputs=[gallery, selected_index, image_relevance_state],
134
+ outputs=image_relevance_state)
135
 
136
  # when user click save button
137
  # we will flag the current image_relevance_state
flagged/log.csv CHANGED
@@ -1,2 +1,4 @@
1
  Write what you are looking for in an image...,top_k,Relevance Image Label,Generated images,flag,username,timestamp
2
  cat,3,2,/Users/zhilinzhou/Local-documents/Workspace/CLIP-image-search/flagged/Generated images/tmphv4zf24i.png,,,2023-04-03 20:56:01.812245
 
 
 
1
  Write what you are looking for in an image...,top_k,Relevance Image Label,Generated images,flag,username,timestamp
2
  cat,3,2,/Users/zhilinzhou/Local-documents/Workspace/CLIP-image-search/flagged/Generated images/tmphv4zf24i.png,,,2023-04-03 20:56:01.812245
3
+ ,,,2023-04-05 00:12:20.300102
4
+ ,,,2023-04-05 00:12:26.702897