Add different choices for input image

pages/App.py

@@ -49,6 +49,7 @@ def easyocr_coord_convert(in_list_coord):
     coord = in_list_coord
     return [[coord[0], coord[2]], [coord[1], coord[2]], [coord[1], coord[3]], [coord[0], coord[3]]]
 
+###
 @st.cache(show_spinner=False)
 def initializations():
     """Initializations for the app
@@ -194,7 +195,6 @@ def init_easyocr(in_params):
 
 ###
 @st.cache(show_spinner=False)
-#@st.experimental_memo(show_spinner=False)
 def init_ppocr(in_params):
     """Initialization of PPOCR reader
 
@@ -250,7 +250,6 @@ def init_readers(in_list_params):
     return out_list_readers
 
 ###
-#@st.cache(show_spinner=False)
 @st.experimental_memo(show_spinner=False)
 def load_image(in_image_file):
     """Load input file and open it
@@ -277,7 +276,6 @@ def load_image(in_image_file):
     return out_image_path, out_image_orig, out_image_cv2
 
 ###
-#@st.cache(show_spinner=False)
 @st.experimental_memo(show_spinner=False)
 def easyocr_detect(_in_reader, in_image_path, in_params):
     """Detection with EasyOCR
@@ -311,7 +309,6 @@ def easyocr_detect(_in_reader, in_image_path, in_params):
     return out_easyocr_boxes_coordinates, out_status
 
 ###
-#@st.cache(show_spinner=False)
 @st.experimental_memo(show_spinner=False)
 def ppocr_detect(_in_reader, in_image_path):
     """Detection with PPOCR
@@ -335,8 +332,6 @@ def ppocr_detect(_in_reader, in_image_path):
     return out_ppocr_boxes_coordinates, out_status
 
 ###
-#@st.cache(show_spinner=False, hash_funcs={torch.nn.parameter.Parameter: lambda _: None})
-#@st.cache(show_spinner=False)
 @st.experimental_memo(show_spinner=False)
 def mmocr_detect(_in_reader, in_image_path):
     """Detection with MMOCR
@@ -529,8 +524,7 @@ def draw_detected(in_image, in_boxes_coordinates, in_color, posit='None', in_thi
 
     return out_image_drawn
 
-##
-#@st.cache(show_spinner=False)
+###
 @st.experimental_memo(show_spinner=False)
 def get_cropped(in_boxes_coordinates, in_image_cv):
     """Construct list of cropped images corresponding of the input boxes coordinates list
@@ -652,7 +646,7 @@ def easyocr_recog(in_list_images, _in_reader_easyocr, in_params):
 
     return out_list_text_easyocr, out_list_confidence_easyocr, out_status
 
-##
+###
 @st.experimental_memo(suppress_st_warning=True, show_spinner=False)
 def ppocr_recog(in_list_images, in_params):
     """Recognition with PPOCR
@@ -691,7 +685,7 @@ def ppocr_recog(in_list_images, in_params):
 
     return out_list_text_ppocr, out_list_confidence_ppocr, out_status
 
-##
+###
 @st.experimental_memo(suppress_st_warning=True, show_spinner=False)
 def mmocr_recog(in_list_images, in_params):
     """Recognition with MMOCR
@@ -731,8 +725,7 @@ def mmocr_recog(in_list_images, in_params):
 
     return out_list_text_mmocr, out_list_confidence_mmocr, out_status
 
-##
-#@st.cache(show_spinner=False)
+###
 @st.experimental_memo(suppress_st_warning=True, show_spinner=False)
 def tesserocr_recog(in_img, in_params, in_nb_images):
     """Recognition with Tesseract
@@ -859,7 +852,7 @@ def draw_reco_images(in_image, in_boxes_coordinates, in_list_texts, in_list_conf
                         cols[ind_col].write(list_reco_status[ind], \
                                             use_column_width=True)
 
-##
+###
 def highlight():
     """Draw recognized text on original image, for each OCR solution used
 
@@ -897,6 +890,21 @@ def highlight():
         st.session_state.column_width = column_width
         st.session_state.columns_color = columns_color
 
+###
+@st.cache(show_spinner=False)
+def get_demo():
+    """Get the demo files
+
+    Returns:
+        PIL.Image   : input file opened with Pillow
+        PIL.Image   : input file opened with Pillow
+    """
+
+    out_img_demo_1 = Image.open("img_demo_1.jpg")
+    out_img_demo_2 = Image.open("img_demo_2.png")
+
+    return out_img_demo_1, out_img_demo_2
+
 ###################################################################################################
 ##   MAIN
 ###################################################################################################
@@ -912,6 +920,7 @@ st.markdown("##### *EasyOCR, PPOCR, MMOCR, Tesseract*")
 with st.spinner("Initializations in progress ..."):
     reader_type_list, reader_type_dict, color, list_dict_lang, \
     cols_size, dict_back_colors, fig_colorscale = initializations()
+    img_demo_1, img_demo_2 = get_demo()
 
 ##----------- Choose language & image -------------------------------------------------------------
 st.markdown("#### Choose languages for the text recognition:")
@@ -924,13 +933,24 @@ mmocr_key_lang = lang_col[2].selectbox(reader_type_list[2]+" :", list_dict_lang[
 mmocr_lang = list_dict_lang[2][mmocr_key_lang]
 tesserocr_key_lang = lang_col[3].selectbox(reader_type_list[3]+" :", list_dict_lang[3].keys(), 35)
 tesserocr_lang = list_dict_lang[3][tesserocr_key_lang]
-st.markdown("#### Upload image:")
 
-image_file = st.file_uploader("", type=["png","jpg","jpeg"])
-use_demo = st.checkbox('Use a demo file', False)
-
-if use_demo:
-    image_file = "img_demo.jpg"
+img_typ = st.radio("#### Choose image:", ['Upload file', 'Take a picture', 'Use a demo file'], index=0)
+
+if img_typ == 'Upload file':
+    image_file = st.file_uploader("Upload a file:", type=["png","jpg","jpeg"])
+if img_typ == 'Take a picture':
+    image_file = st.camera_input("Take a picture:")
+if img_typ == 'Use a demo file':
+    cols_demo = st.columns([1, 2, 2])
+    demo_used = cols_demo[0].radio('##### Choose a demo file:', ['File 1', 'File 2'], index=0)
+    cols_demo[1].markdown('##### File 1')
+    cols_demo[1].image(img_demo_1, use_column_width=True)
+    cols_demo[2].markdown('##### File 2')
+    cols_demo[2].image(img_demo_2, use_column_width=True)
+    if demo_used == 'File 1':
+        image_file = 'img_demo_1.jpg'
+    else:
+        image_file = 'img_demo_2.png'
 
 ##----------- Process input image -----------------------------------------------------------------
 if image_file is not None:
@@ -1146,8 +1166,8 @@ Use rectlar box to calculate faster, and polygonal box more accurate for curved
                  horizontal=True, on_change=highlight)
 
 ##----------- Form with hyperparameters for recognition -----------------------
+        st.markdown("##### Hyperparameters values for recognition")
         with st.form("form2"):
-            st.markdown("##### Hyperparameters values for recognition")
             with st.expander("Choose recognition hyperparameters for " + reader_type_list[0], \
                             expanded=False):
                 t0_decoder = st.selectbox('decoder', ['greedy', 'beamsearch', 'wordbeamsearch'], \