change order

app.py

@@ -100,7 +100,7 @@ def make_prompt_row():
 def make_sidebar():
     with st.sidebar:
         input_image = st.file_uploader("", type=["png", "jpg"], key='input_image', on_change=on_upload)
-        generation_mode = st.selectbox("Generation mode", ["Inpainting", "Segmentation conditioning"], on_change=on_change_radio)
+        generation_mode = st.selectbox("Generation mode", ["Segmentation conditioning", "Inpainting"], on_change=on_change_radio)
 
         paint_mode = st.sidebar.selectbox("Painting mode", ("freedraw", "polygon"))
         if paint_mode == "freedraw":
@@ -152,18 +152,19 @@ def make_editing_canvas(canvas_color, brush, _reset_state, generation_mode, pain
             **canvas_dict,
         )
         if 'seg' not in st.session_state:
-            image = get_image()
-            print("Preparing image segmentation")
-            real_seg = segment_image(Image.fromarray(image))
-            st.session_state['seg'] = real_seg
-            # get unique RGB colors from this segmentation map
-            unique_colors = np.unique(real_seg.reshape(-1, real_seg.shape[2]), axis=0)
-            st.session_state['unique_colors'] = unique_colors
-            # multiselect to choose multiple colors
-            chosen_colors = st.multiselect(
-                "Choose colors", list(unique_colors), format_func=map_colors, key='chosen_colors'
-            )
-            print(chosen_colors)
+            with st.spinner(text="Preparing image segmentation"):
+                image = get_image()
+                print("Preparing image segmentation")
+                real_seg = segment_image(Image.fromarray(image))
+                st.session_state['seg'] = real_seg
+                # get unique RGB colors from this segmentation map
+                unique_colors = np.unique(real_seg.reshape(-1, real_seg.shape[2]), axis=0)
+                st.session_state['unique_colors'] = unique_colors
+                # multiselect to choose multiple colors
+                chosen_colors = st.multiselect(
+                    "Choose colors", list(unique_colors), format_func=map_colors, key='chosen_colors'
+                )
+                print(chosen_colors)
 
         if st.button("generate image", key='generate_button'):
             image = get_image()

config.py

@@ -4,10 +4,19 @@ from palette import COLOR_MAPPING_, COLOR_MAPPING
 HEIGHT = 512
 WIDTH = 512
 
-COLOR_NAMES = list(COLOR_MAPPING.keys())
-COLOR_RGB = [tuple(int(k[i:i+2], 16) for i in (1, 3, 5)) for k in COLOR_MAPPING_.keys()] + [(0, 0, 0), (255, 255, 255)]
-INVERSE_COLORS = {v: k for k, v in COLOR_MAPPING_.items()}
+def to_rgb(color: str) -> tuple:
+    """Convert hex color to rgb.
+    Args:
+        color (str): hex color
+    Returns:
+        tuple: rgb color
+    """
+    return tuple(int(color[i:i+2], 16) for i in (1, 3, 5))
 
+COLOR_NAMES = list(COLOR_MAPPING.keys())
+COLOR_RGB = [to_rgb(k) for k in COLOR_MAPPING_.keys()] + [(0, 0, 0), (255, 255, 255)]
+INVERSE_COLORS = {v: to_rgb(k) for k, v in COLOR_MAPPING_.items()}
+COLOR_MAPPING_RGB = {to_rgb(k): v for k, v in COLOR_MAPPING_.items()}
 
 def map_colors(color: str) -> str:
     """Map color to hex value.