Update app.py

app.py

@@ -23,13 +23,19 @@ Paddle OCR
 """
 def ocr_with_paddle(img):
     finaltext = ''
-    ocr = PaddleOCR(lang='vi', use_angle_cls=True)
-    # img_path = 'exp.jpeg'
-    result = ocr.ocr(img)
-    
-    for i in range(len(result[0])):
-        text = result[0][i][1][0]
-        finaltext += ' '+ text
+    ocr = PaddleOCR(lang='en')  # Không hỗ trợ đa ngôn ngữ kiểu 'vi|en', phải chạy 2 lần
+    result_en = ocr.ocr(img)
+
+    ocr_vi = PaddleOCR(lang='vi')
+    result_vi = ocr_vi.ocr(img)
+
+    def extract_text(result):
+        return ' '.join([line[1][0] for line in result[0]])
+
+    en_text = extract_text(result_en)
+    vi_text = extract_text(result_vi)
+
+    finaltext = f"[EN]: {en_text}\n[VI]: {vi_text}"
     return finaltext
 
 """
@@ -37,13 +43,12 @@ Keras OCR
 """
 def ocr_with_keras(img):
     output_text = ''
-    pipeline=keras_ocr.pipeline.Pipeline()
-    images=[keras_ocr.tools.read(img)]
-    predictions=pipeline.recognize(images)
-    first=predictions[0]
-    for text,box in first:
-        output_text += ' '+ text
-    return output_text
+    pipeline = keras_ocr.pipeline.Pipeline()
+    images = [keras_ocr.tools.read(img)]
+    predictions = pipeline.recognize(images)
+    for text, box in predictions[0]:
+        output_text += ' ' + text
+    return "[Detected]: " + output_text
 
 """
 easy OCR
@@ -56,38 +61,37 @@ def get_grayscale(image):
 def thresholding(src):
     return cv2.threshold(src,127,255, cv2.THRESH_TOZERO)[1]
 def ocr_with_easy(img):
-    gray_scale_image=get_grayscale(img)
+    gray_scale_image = get_grayscale(img)
     thresholding(gray_scale_image)
-    cv2.imwrite('image.png',gray_scale_image)
-    reader = easyocr.Reader(['vi'])
-    bounds = reader.readtext('image.png',paragraph="False",detail = 0)
-    bounds = ''.join(bounds)
-    return bounds
+    cv2.imwrite('image.png', gray_scale_image)
+    reader = easyocr.Reader(['vi', 'en'])  # Hỗ trợ tiếng Việt và tiếng Anh
+    bounds = reader.readtext('image.png', paragraph=False, detail=0)
+    result_text = '\n'.join(bounds)
+    return result_text
         
 """
 Generate OCR
 """
-def generate_ocr(Method,img):
-    
+def generate_ocr(Method, img):
+    if img is None or not (img).any():
+        raise gr.Error("Please upload an image!")
+
     text_output = ''
-    if (img).any():
-        add_csv = []
-        image_id = 1
-        print("Method___________________",Method)
-        if Method == 'EasyOCR':
-            text_output = ocr_with_easy(img)
-        if Method == 'KerasOCR':
-            text_output = ocr_with_keras(img)
-        if Method == 'PaddleOCR':
-            text_output = ocr_with_paddle(img)
-       
-        try:
-            flag(Method,text_output,img)
-        except Exception as e:
-            print(e)
-        return text_output
-    else:
-        raise gr.Error("Please upload an image!!!!")
+    print("Method selected:", Method)
+    
+    if Method == 'EasyOCR':
+        text_output = ocr_with_easy(img)
+    elif Method == 'KerasOCR':
+        text_output = ocr_with_keras(img)
+    elif Method == 'PaddleOCR':
+        text_output = ocr_with_paddle(img)
+
+    try:
+        flag(Method, text_output, img)
+    except Exception as e:
+        print("Flag error:", e)
+    
+    return text_output
     
     # except Exception as e:
     #     print("Error in ocr generation ==>",e)