Refactor: support merging extracted layout with inferred layout

CHANGELOG.md

@@ -1,7 +1,9 @@
-## 0.11.4-dev0
+## 0.11.4-dev1
 
 ### Enhancements
 
+* **Refactor pdfminer code.** The pdfminer code is moved from `unstructured-inference` to `unstructured`.
+
 ### Features
 
 ### Fixes
@@ -23,8 +25,8 @@
 ## 0.11.1
 
 ### Enhancements
-* **Use `pikepdf` to repair invalid PDF structure** for PDFminer when we see error `PSSyntaxError` when PDFminer opens the document and creates the PDFminer pages object or processes a single PDF page.
 
+* **Use `pikepdf` to repair invalid PDF structure** for PDFminer when we see error `PSSyntaxError` when PDFminer opens the document and creates the PDFminer pages object or processes a single PDF page.
 * **Batch Source Connector support** For instances where it is more optimal to read content from a source connector in batches, a new batch ingest doc is added which created multiple ingest docs after reading them in in batches per process.
 
 ### Features

docs/requirements.txt

@@ -36,7 +36,7 @@ idna==3.6
     #   requests
 imagesize==1.4.1
     # via sphinx
-importlib-metadata==6.8.0
+importlib-metadata==6.9.0
     # via sphinx
 jinja2==3.1.2
     # via

examples/custom-layout-order/evaluate_natural_reading_order.py

@@ -8,7 +8,7 @@
 from PIL import Image
 
 from unstructured.documents.elements import PageBreak
-from unstructured.partition.pdf import partition_pdf
+from unstructured.partition.pdf_image.pdf import partition_pdf
 from unstructured.partition.utils.constants import SORT_MODE_BASIC, SORT_MODE_DONT, SORT_MODE_XY_CUT
 from unstructured.partition.utils.xycut import (
     bbox2points,

examples/layout-analysis/visualization.py

@@ -7,7 +7,7 @@
 from unstructured_inference.visualize import draw_bbox
 
 from unstructured.documents.elements import PageBreak
-from unstructured.partition.pdf import partition_pdf
+from unstructured.partition.pdf_image.pdf import partition_pdf
 
 CUR_DIR = pathlib.Path(__file__).parent.resolve()
 

requirements/build.txt

@@ -36,7 +36,7 @@ idna==3.6
     #   requests
 imagesize==1.4.1
     # via sphinx
-importlib-metadata==6.8.0
+importlib-metadata==6.9.0
     # via sphinx
 jinja2==3.1.2
     # via

requirements/dev.txt

@@ -91,7 +91,7 @@ idna==3.6
     #   anyio
     #   jsonschema
     #   requests
-importlib-metadata==6.8.0
+importlib-metadata==6.9.0
     # via
     #   build
     #   jupyter-client
@@ -138,7 +138,7 @@ jsonschema[format-nongpl]==4.20.0
     #   jupyter-events
     #   jupyterlab-server
     #   nbformat
-jsonschema-specifications==2023.11.1
+jsonschema-specifications==2023.11.2
     # via jsonschema
 jupyter==1.0.0
     # via -r dev.in
@@ -301,7 +301,7 @@ qtconsole==5.5.1
     # via jupyter
 qtpy==2.4.1
     # via qtconsole
-referencing==0.31.0
+referencing==0.31.1
     # via
     #   jsonschema
     #   jsonschema-specifications
@@ -319,7 +319,7 @@ rfc3986-validator==0.1.1
     # via
     #   jsonschema
     #   jupyter-events
-rpds-py==0.13.1
+rpds-py==0.13.2
     # via
     #   jsonschema
     #   referencing
@@ -354,7 +354,7 @@ tomli==2.0.1
     #   jupyterlab
     #   pip-tools
     #   pyproject-hooks
-tornado==6.3.3
+tornado==6.4
     # via
     #   ipykernel
     #   jupyter-client
@@ -395,7 +395,7 @@ urllib3==1.26.18
     #   -c constraints.in
     #   -c test.txt
     #   requests
-virtualenv==20.24.7
+virtualenv==20.25.0
     # via pre-commit
 wcwidth==0.2.12
     # via prompt-toolkit

requirements/extra-markdown.txt

@@ -4,7 +4,7 @@
 #
 #    pip-compile --output-file=extra-markdown.txt extra-markdown.in
 #
-importlib-metadata==6.8.0
+importlib-metadata==6.9.0
     # via markdown
 markdown==3.5.1
     # via -r extra-markdown.in

requirements/extra-msg.txt

@@ -6,5 +6,5 @@
 #
 msg-parser==1.2.0
     # via -r extra-msg.in
-olefile==0.46
+olefile==0.47
     # via msg-parser

requirements/extra-paddleocr.txt

@@ -59,7 +59,7 @@ imageio==2.33.0
     #   scikit-image
 imgaug==0.4.0
     # via unstructured-paddleocr
-importlib-metadata==6.8.0
+importlib-metadata==6.9.0
     # via flask
 importlib-resources==6.1.1
     # via matplotlib

requirements/extra-pdf-image.in

@@ -8,7 +8,7 @@ pikepdf
 pypdf
 # Do not move to contsraints.in, otherwise unstructured-inference will not be upgraded
 # when unstructured library is.
-unstructured-inference==0.7.15
+unstructured-inference==0.7.17
 # unstructured fork of pytesseract that provides an interface to allow for multiple output formats
 # from one tesseract call
 unstructured.pytesseract>=0.3.12

requirements/extra-pdf-image.txt

@@ -250,7 +250,7 @@ typing-extensions==4.8.0
     #   torch
 tzdata==2023.3
     # via pandas
-unstructured-inference==0.7.15
+unstructured-inference==0.7.17
     # via -r extra-pdf-image.in
 unstructured-pytesseract==0.3.12
     # via

requirements/ingest/airtable.txt

@@ -19,7 +19,7 @@ idna==3.6
     #   requests
 inflection==0.5.1
     # via pyairtable
-pyairtable==2.2.0
+pyairtable==2.2.1
     # via -r ingest/airtable.in
 pydantic==1.10.13
     # via

requirements/ingest/azure.txt

@@ -76,9 +76,7 @@ portalocker==2.8.2
 pycparser==2.21
     # via cffi
 pyjwt[crypto]==2.8.0
-    # via
-    #   msal
-    #   pyjwt
+    # via msal
 requests==2.31.0
     # via
     #   -c ingest/../base.txt

requirements/ingest/box.txt

@@ -9,9 +9,7 @@ attrs==23.1.0
 boxfs==0.2.1
     # via -r ingest/box.in
 boxsdk[jwt]==3.9.2
-    # via
-    #   boxfs
-    #   boxsdk
+    # via boxfs
 certifi==2023.11.17
     # via
     #   -c ingest/../base.txt

requirements/ingest/confluence.txt

@@ -4,7 +4,7 @@
 #
 #    pip-compile --output-file=ingest/confluence.txt ingest/confluence.in
 #
-atlassian-python-api==3.41.3
+atlassian-python-api==3.41.4
     # via -r ingest/confluence.in
 certifi==2023.11.17
     # via

requirements/ingest/embed-aws-bedrock.txt

@@ -46,6 +46,8 @@ frozenlist==1.4.0
     # via
     #   aiohttp
     #   aiosignal
+greenlet==3.0.1
+    # via sqlalchemy
 idna==3.6
     # via
     #   -c ingest/../base.txt
@@ -62,11 +64,11 @@ jsonpatch==1.33
     #   langchain-core
 jsonpointer==2.4
     # via jsonpatch
-langchain==0.0.341
+langchain==0.0.344
     # via -r ingest/embed-aws-bedrock.in
-langchain-core==0.0.6
+langchain-core==0.0.8
     # via langchain
-langsmith==0.0.67
+langsmith==0.0.68
     # via
     #   langchain
     #   langchain-core

requirements/ingest/embed-huggingface.txt

@@ -51,6 +51,8 @@ fsspec==2023.9.1
     #   -c ingest/../constraints.in
     #   huggingface-hub
     #   torch
+greenlet==3.0.1
+    # via sqlalchemy
 huggingface==0.0.1
     # via -r ingest/embed-huggingface.in
 huggingface-hub==0.19.4
@@ -77,11 +79,11 @@ jsonpatch==1.33
     #   langchain-core
 jsonpointer==2.4
     # via jsonpatch
-langchain==0.0.341
+langchain==0.0.344
     # via -r ingest/embed-huggingface.in
-langchain-core==0.0.6
+langchain-core==0.0.8
     # via langchain
-langsmith==0.0.67
+langsmith==0.0.68
     # via
     #   langchain
     #   langchain-core

requirements/ingest/embed-openai.txt

@@ -43,6 +43,8 @@ frozenlist==1.4.0
     # via
     #   aiohttp
     #   aiosignal
+greenlet==3.0.1
+    # via sqlalchemy
 h11==0.14.0
     # via httpcore
 httpcore==1.0.2
@@ -62,11 +64,11 @@ jsonpatch==1.33
     #   langchain-core
 jsonpointer==2.4
     # via jsonpatch
-langchain==0.0.341
+langchain==0.0.344
     # via -r ingest/embed-openai.in
-langchain-core==0.0.6
+langchain-core==0.0.8
     # via langchain
-langsmith==0.0.67
+langsmith==0.0.68
     # via
     #   langchain
     #   langchain-core
@@ -87,7 +89,7 @@ numpy==1.24.4
     #   -c ingest/../base.txt
     #   -c ingest/../constraints.in
     #   langchain
-openai==1.3.5
+openai==1.3.7
     # via -r ingest/embed-openai.in
 packaging==23.2
     # via
@@ -116,6 +118,7 @@ sniffio==1.3.0
     # via
     #   anyio
     #   httpx
+    #   openai
 sqlalchemy==2.0.23
     # via langchain
 tenacity==8.2.3

requirements/ingest/gcs.txt

@@ -46,7 +46,7 @@ google-api-core==2.14.0
     # via
     #   google-cloud-core
     #   google-cloud-storage
-google-auth==2.23.4
+google-auth==2.24.0
     # via
     #   gcsfs
     #   google-api-core

requirements/ingest/github.txt

@@ -30,9 +30,7 @@ pycparser==2.21
 pygithub==2.1.1
     # via -r ingest/github.in
 pyjwt[crypto]==2.8.0
-    # via
-    #   pygithub
-    #   pyjwt
+    # via pygithub
 pynacl==1.5.0
     # via pygithub
 python-dateutil==2.8.2

requirements/ingest/google-drive.txt

@@ -17,9 +17,9 @@ charset-normalizer==3.3.2
     #   requests
 google-api-core==2.14.0
     # via google-api-python-client
-google-api-python-client==2.108.0
+google-api-python-client==2.109.0
     # via -r ingest/google-drive.in
-google-auth==2.23.4
+google-auth==2.24.0
     # via
     #   google-api-core
     #   google-api-python-client

requirements/ingest/hubspot.txt

@@ -2,19 +2,19 @@
 # This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
-#    pip-compile requirements/ingest-hubspot.in
+#    pip-compile --output-file=ingest/hubspot.txt ingest/hubspot.in
 #
-certifi==2023.7.22
+certifi==2023.11.17
     # via hubspot-api-client
 hubspot-api-client==8.1.1
-    # via -r requirements/ingest-hubspot.in
+    # via -r ingest/hubspot.in
 python-dateutil==2.8.2
     # via hubspot-api-client
 six==1.16.0
     # via
     #   hubspot-api-client
     #   python-dateutil
-urllib3==1.26.17
+urllib3==2.1.0
     # via
-    #   -r requirements/ingest-hubspot.in
+    #   -r ingest/hubspot.in
     #   hubspot-api-client

requirements/ingest/jira.txt

@@ -4,7 +4,7 @@
 #
 #    pip-compile --output-file=ingest/jira.txt ingest/jira.in
 #
-atlassian-python-api==3.41.3
+atlassian-python-api==3.41.4
     # via -r ingest/jira.in
 certifi==2023.11.17
     # via

requirements/ingest/mongodb.txt

@@ -6,5 +6,5 @@
 #
 dnspython==2.4.2
     # via pymongo
-pymongo==4.6.0
+pymongo==4.6.1
     # via -r ingest/mongodb.in

requirements/ingest/onedrive.txt

@@ -40,9 +40,7 @@ office365-rest-python-client==2.4.2
 pycparser==2.21
     # via cffi
 pyjwt[crypto]==2.8.0
-    # via
-    #   msal
-    #   pyjwt
+    # via msal
 pytz==2023.3.post1
     # via office365-rest-python-client
 requests==2.31.0

requirements/ingest/outlook.txt

@@ -34,9 +34,7 @@ office365-rest-python-client==2.4.2
 pycparser==2.21
     # via cffi
 pyjwt[crypto]==2.8.0
-    # via
-    #   msal
-    #   pyjwt
+    # via msal
 pytz==2023.3.post1
     # via office365-rest-python-client
 requests==2.31.0

requirements/ingest/pinecone.in

@@ -1,3 +1,3 @@
--c constraints.in
--c base.txt
+-c ../constraints.in
+-c ../base.txt
 pinecone-client