Merge pull request #289 from VikParuchuri/dev

Patch cli script issue

Author: VikParuchuri

.github/workflows/scripts.yml

@@ -30,3 +30,5 @@ jobs:
         run: poetry run surya_layout benchmark_data/pdfs/switch_trans.pdf --page_range 0
       - name: Test table
         run: poetry run surya_table benchmark_data/pdfs/switch_trans.pdf --page_range 0
+      - name: Test detection folder
+        run: poetry run surya_detect benchmark_data/pdfs --page_range 0

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "surya-ocr"
-version = "0.9.2"
+version = "0.9.3"
 description = "OCR, layout, reading order, and table recognition in 90+ languages"
 authors = ["Vik Paruchuri <[email protected]>"]
 readme = "README.md"

surya/common/polygon.py

@@ -32,7 +32,7 @@ def convert_bbox_to_polygon(cls, value):
                 return value.tolist()
 
         raise ValueError(
-            f"Input must be either a bbox [x_min, y_min, x_max, y_max] or a polygon with 4 corners [(x,y), (x,y), (x,y), (x,y)].  You passed {value}.")
+            f"Input must be either a bbox [x_min, y_min, x_max, y_max] or a polygon with 4 corners [(x,y), (x,y), (x,y), (x,y)].  All values must be numeric. You passed {value} of type {type(value)}.  The first value is of type {type(value[0])}.")
 
     @property
     def height(self):

surya/detection/affinity.py

@@ -81,6 +81,7 @@ def get_detected_lines(image, slope_tol_deg=2, vertical=False, horizontal=False)
                 bbox[1], bbox[3] = bbox[3], bbox[1]
             if bbox[2] < bbox[0]:
                 bbox[0], bbox[2] = bbox[2], bbox[0]
+            bbox = [float(b) for b in bbox]
             row = ColumnLine(polygon=bbox, vertical=vertical_line, horizontal=horizontal_line)
             line_info.append(row)
 

surya/input/load.py

@@ -51,12 +51,12 @@ def load_from_folder(folder_path, page_range: List[int] | None = None, dpi=setti
     for path in image_paths:
         extension = filetype.guess(path)
         if extension and extension.extension == "pdf":
-            image, name, text_line = load_pdf(path, page_range, dpi=dpi)
+            image, name = load_pdf(path, page_range, dpi=dpi)
             images.extend(image)
             names.extend(name)
         else:
             try:
-                image, name, text_line = load_image(path)
+                image, name = load_image(path)
                 images.extend(image)
                 names.extend(name)
             except PIL.UnidentifiedImageError:

surya/scripts/streamlit_app.py

@@ -76,7 +76,7 @@ def table_recognition(img, highres_img, skip_table_detection: bool) -> (Image.Im
         table_imgs = [highres_img]
     else:
         _, layout_pred = layout_detection(img)
-        layout_tables_lowres = [l.bbox for l in layout_pred.bboxes if l.label == "Table"]
+        layout_tables_lowres = [l.bbox for l in layout_pred.bboxes if l.label in ["Table", "TableOfContents"]]
         table_imgs = []
         layout_tables = []
         for tb in layout_tables_lowres:

surya/scripts/table_recognition.py

@@ -42,7 +42,7 @@ def table_recognition_cli(input_path: str, skip_table_detection: bool, **kwargs)
             table_counts.append(1)
         else:
             # The bbox for the entire table
-            bbox = [l.bbox for l in layout_pred.bboxes if l.label == "Table"]
+            bbox = [l.bbox for l in layout_pred.bboxes if l.label in ["Table", "TableOfContents"]]
             # Number of tables per page
             table_counts.append(len(bbox))