Update supported objects

app.py

@@ -19,6 +19,61 @@ from PIL import Image
 from diffusers import StableDiffusionInpaintPipeline
 from accelerate.utils import set_seed
 
+clevr_all_objects = [
+    'blue metal cube',
+    'blue metal cylinder',
+    'blue metal sphere',
+    'blue rubber cube',
+    'blue rubber cylinder',
+    'blue rubber sphere',
+    'brown metal cube',
+    'brown metal cylinder',
+    'brown metal sphere',
+    'brown rubber cube',
+    'brown rubber cylinder',
+    'brown rubber sphere',
+    'cyan metal cube',
+    'cyan metal cylinder',
+    'cyan metal sphere',
+    'cyan rubber cube',
+    'cyan rubber cylinder',
+    'cyan rubber sphere',
+    'gray metal cube',
+    'gray metal cylinder',
+    'gray metal sphere',
+    'gray rubber cube',
+    'gray rubber cylinder',
+    'gray rubber sphere',
+    'green metal cube',
+    'green metal cylinder',
+    'green metal sphere',
+    'green rubber cube',
+    'green rubber cylinder',
+    'green rubber sphere',
+    'purple metal cube',
+    'purple metal cylinder',
+    'purple metal sphere',
+    'purple rubber cube',
+    'purple rubber cylinder',
+    'purple rubber sphere',
+    'red metal cube',
+    'red metal cylinder',
+    'red metal sphere',
+    'red rubber cube',
+    'red rubber cylinder',
+    'red rubber sphere',
+    'yellow metal cube',
+    'yellow metal cylinder',
+    'yellow metal sphere',
+    'yellow rubber cube',
+    'yellow rubber cylinder',
+    'yellow rubber sphere'
+]
+
+all_clevr_colors = ['blue', 'brown', 'cyan', 'gray', 'green', 'purple', 'red', 'yellow']
+all_clevr_materials = ['metal', 'rubber']
+all_clevr_shapes = ['cube', 'cylinder', 'sphere']
+
 class Instance:
     def __init__(self, capacity = 2):
         self.model_type = 'base'
@@ -247,6 +302,14 @@ def generate(task, language_instruction, grounding_texts, sketch_pad,
     boxes = state['boxes']
     grounding_texts = [x.strip() for x in grounding_texts.split(';')]
     # assert len(boxes) == len(grounding_texts)
+
+
+    # check if object query is within clevr_all_objects
+    for grounding_text in grounding_texts:
+        if grounding_text not in clevr_all_objects:
+            raise ValueError("""The grounding object {} is not in the CLEVR dataset.""".format(grounding_text))
+
+
     if len(boxes) != len(grounding_texts):
         if len(boxes) < len(grounding_texts):
             raise ValueError("""The number of boxes should be equal to the number of grounding objects.
@@ -489,6 +552,13 @@ with Blocks(
     <p>
         (1) &#9000;&#65039; Enter the object names in <em> Region Captions</em>
         <br>
+        Since the model is trained on <a href="https://cs.stanford.edu/people/jcjohns/clevr/" target="_blank">CLEVR</a> dataset, you can use the object names in the form of <b>"[color] [material] [shape]"</b> (e.g., <em>blue metal sphere</em>):
+        <br>
+        <ul>
+            <li>color: <em><color style="color: red">red</color>, <color style="color: cyan">cyan</color>, <color style="color: green">green</color>, <color style="color: blue">blue</color>, <color style="color: yellow">yellow</color>, <color style="color: purple">purple</color>, <color style="color: brown">brown</color>, <color style="color: gray">gray</color></em></li>
+            <li>material: <em>metal, rubber</em></li>
+            <li>shape: <em>cylinder, cube, sphere</em></li>
+        </ul>
         (2) &#128433;&#65039; Draw their corresponding bounding boxes one by one using <em> Sketch Pad</em> -- the parsed boxes will be displayed automatically.
         <br>
         For faster inference without waiting in queue, you may duplicate the space and upgrade to GPU in settings. <a href="https://huggingface.co/spaces/j-min/iterinpaint-CLEVR?duplicate=true"><img style="display: inline; margin-top: 0em; margin-bottom: 0em" src="https://bit.ly/3gLdBN6" alt="Duplicate Space" /></a>
@@ -745,6 +815,6 @@ main.launch(share=False, show_api=False, show_error=True)
 # main.launch(
 #     server_name="0.0.0.0",
 #     share=True,
-#     # server_port=7864,
+#     server_port=7899,
 #     show_api=False, show_error=True
 #     )