RedHotTensors commited on
Commit
ae08ba5
·
1 Parent(s): af52477

Larger images!

Browse files
Files changed (1) hide show
  1. app.py +14 -7
app.py CHANGED
@@ -280,20 +280,20 @@ def _normalize_rating_pref(pref: str | None) -> str:
280
  return pref if pref in ("safe", "all") else "safe"
281
 
282
 
283
- def _initial_load(state: dict, pref: str | None, submit_key: str | None):
284
  rating_pref = _normalize_rating_pref(pref)
285
  submit_key = _normalize_submit_key(submit_key)
286
- return rating_pref, submit_key, *new_round(DEFAULT_DATASET, rating_pref, state)
287
-
288
 
289
  def _on_rating_change(rating_pref: str, state: dict):
290
  rating_pref = _normalize_rating_pref(rating_pref)
291
  return *new_round(DEFAULT_DATASET, rating_pref, state), rating_pref
292
 
 
 
293
 
294
  def _normalize_submit_key(submit_key: str | None) -> str:
295
- return submit_key or ""
296
-
297
 
298
  def _filtered_explorer_df(rating_pref: str) -> pd.DataFrame:
299
  return _filtered_explorer_df_by_classifier(rating_pref, ALLOWED_CLASSIFIER_FILTERS[0])
@@ -601,7 +601,6 @@ with gr.Blocks(
601
  }
602
  .rating-image-frame {
603
  width: 100%;
604
- height: 720px;
605
  border: 1px solid #e6e6e6;
606
  border-radius: 8px;
607
  background: #333;
@@ -667,12 +666,14 @@ with gr.Blocks(
667
  padding: 0 !important;
668
  }
669
  """,
 
670
  ) as demo:
671
  state = gr.State({})
672
  rating_pref_store = gr.BrowserState(default_value="safe", storage_key="rating_pref")
673
  submit_key_store = gr.BrowserState(default_value="", storage_key="submit_key")
674
  results_sort_store = gr.BrowserState(default_value="Default", storage_key="results_sort_mode")
675
  results_classifier_store = gr.BrowserState(default_value=ALLOWED_CLASSIFIER_FILTERS[0], storage_key="results_classifier")
 
676
 
677
  with gr.Tabs():
678
  with gr.Tab("Image Quality Rater"):
@@ -692,6 +693,10 @@ with gr.Blocks(
692
  btn_b = gr.Button("➡️ Prefer B", variant="primary", elem_id="btn-vote-b")
693
 
694
  with gr.Accordion("Settings", open=False):
 
 
 
 
695
  rating_dd = gr.Dropdown(
696
  choices=["safe", "all"],
697
  value="safe",
@@ -708,6 +713,7 @@ with gr.Blocks(
708
  pair_details = gr.HTML(html_template="Dataset: <a href='https://huggingface.co/datasets/taigasan/e6-visual-ratings' target='_blank' rel='noopener noreferrer'>taigasan/e6-visual-ratings</a> ${value}")
709
  submit_status = gr.HTML(html_template="<span class='submit-status-msg'>${value}</span>")
710
  gr.HTML("<span class='subtle-note'>Keyboard Shortcuts: ⬅️ Vote A, ⬆️ Same Quality, ➡️ Vote B, ⬇️ or Ctrl+Z Undo</span>")
 
711
 
712
  (
713
  results_summary_md,
@@ -746,7 +752,8 @@ with gr.Blocks(
746
  results_sort_dd.change(fn=_load_results, inputs=[rating_pref_store, results_sort_dd, results_classifier_store], outputs=results_outputs, queue=False, show_progress="hidden")
747
  results_classifier_dd.change(fn=_normalize_classifier_filter, inputs=[results_classifier_dd], outputs=[results_classifier_store], queue=False, show_progress="hidden")
748
  results_classifier_dd.change(fn=_load_results, inputs=[rating_pref_store, results_sort_store, results_classifier_dd], outputs=results_outputs, queue=False, show_progress="hidden")
749
- demo.load(fn=_initial_load, inputs=[state, rating_pref_store, submit_key_store], outputs=[rating_dd, submit_key_tb, *outputs], queue=False, show_progress="hidden")
 
750
  demo.load(fn=_load_results, inputs=[rating_pref_store, results_sort_store, results_classifier_store], outputs=results_outputs, queue=False, show_progress="hidden")
751
  demo.load(fn=_normalize_sort_mode, inputs=[results_sort_store], outputs=[results_sort_dd], queue=False, show_progress="hidden")
752
  demo.load(fn=_normalize_classifier_filter, inputs=[results_classifier_store], outputs=[results_classifier_dd], queue=False, show_progress="hidden")
 
280
  return pref if pref in ("safe", "all") else "safe"
281
 
282
 
283
+ def _initial_load(state: dict, pref: str | None, submit_key: str | None, image_height: str):
284
  rating_pref = _normalize_rating_pref(pref)
285
  submit_key = _normalize_submit_key(submit_key)
286
+ return rating_pref, submit_key, image_height, image_height, *new_round(DEFAULT_DATASET, rating_pref, state)
 
287
 
288
  def _on_rating_change(rating_pref: str, state: dict):
289
  rating_pref = _normalize_rating_pref(rating_pref)
290
  return *new_round(DEFAULT_DATASET, rating_pref, state), rating_pref
291
 
292
+ def _on_image_height_change(image_height: str) -> tuple[str, str]:
293
+ return image_height, image_height
294
 
295
  def _normalize_submit_key(submit_key: str | None) -> str:
296
+ return (submit_key or "").strip()
 
297
 
298
  def _filtered_explorer_df(rating_pref: str) -> pd.DataFrame:
299
  return _filtered_explorer_df_by_classifier(rating_pref, ALLOWED_CLASSIFIER_FILTERS[0])
 
601
  }
602
  .rating-image-frame {
603
  width: 100%;
 
604
  border: 1px solid #e6e6e6;
605
  border-radius: 8px;
606
  background: #333;
 
666
  padding: 0 !important;
667
  }
668
  """,
669
+ fill_width=True,
670
  ) as demo:
671
  state = gr.State({})
672
  rating_pref_store = gr.BrowserState(default_value="safe", storage_key="rating_pref")
673
  submit_key_store = gr.BrowserState(default_value="", storage_key="submit_key")
674
  results_sort_store = gr.BrowserState(default_value="Default", storage_key="results_sort_mode")
675
  results_classifier_store = gr.BrowserState(default_value=ALLOWED_CLASSIFIER_FILTERS[0], storage_key="results_classifier")
676
+ image_height_store = gr.BrowserState(default_value=768, storage_key="image_height")
677
 
678
  with gr.Tabs():
679
  with gr.Tab("Image Quality Rater"):
 
693
  btn_b = gr.Button("➡️ Prefer B", variant="primary", elem_id="btn-vote-b")
694
 
695
  with gr.Accordion("Settings", open=False):
696
+ image_height_slider = gr.Slider(
697
+ minimum=512, maximum=2048, step=16, precision=0,
698
+ label="Image Size",
699
+ )
700
  rating_dd = gr.Dropdown(
701
  choices=["safe", "all"],
702
  value="safe",
 
713
  pair_details = gr.HTML(html_template="Dataset: <a href='https://huggingface.co/datasets/taigasan/e6-visual-ratings' target='_blank' rel='noopener noreferrer'>taigasan/e6-visual-ratings</a> ${value}")
714
  submit_status = gr.HTML(html_template="<span class='submit-status-msg'>${value}</span>")
715
  gr.HTML("<span class='subtle-note'>Keyboard Shortcuts: ⬅️ Vote A, ⬆️ Same Quality, ➡️ Vote B, ⬇️ or Ctrl+Z Undo</span>")
716
+ image_height = gr.HTML(html_template="<style>.rating-image-frame { height:${value}px; }</style>", apply_default_css=False)
717
 
718
  (
719
  results_summary_md,
 
752
  results_sort_dd.change(fn=_load_results, inputs=[rating_pref_store, results_sort_dd, results_classifier_store], outputs=results_outputs, queue=False, show_progress="hidden")
753
  results_classifier_dd.change(fn=_normalize_classifier_filter, inputs=[results_classifier_dd], outputs=[results_classifier_store], queue=False, show_progress="hidden")
754
  results_classifier_dd.change(fn=_load_results, inputs=[rating_pref_store, results_sort_store, results_classifier_dd], outputs=results_outputs, queue=False, show_progress="hidden")
755
+ image_height_slider.change(fn=_on_image_height_change, inputs=[image_height_slider], outputs=[image_height_store, image_height], queue=False, show_progress="hidden")
756
+ demo.load(fn=_initial_load, inputs=[state, rating_pref_store, submit_key_store, image_height_store], outputs=[rating_dd, submit_key_tb, image_height_slider, image_height, *outputs], queue=False, show_progress="hidden")
757
  demo.load(fn=_load_results, inputs=[rating_pref_store, results_sort_store, results_classifier_store], outputs=results_outputs, queue=False, show_progress="hidden")
758
  demo.load(fn=_normalize_sort_mode, inputs=[results_sort_store], outputs=[results_sort_dd], queue=False, show_progress="hidden")
759
  demo.load(fn=_normalize_classifier_filter, inputs=[results_classifier_store], outputs=[results_classifier_dd], queue=False, show_progress="hidden")