Skip to content

Commit

Permalink
Merge branch 'main' into sebastian/fix-title-depth
Browse files Browse the repository at this point in the history
  • Loading branch information
LaverdeS authored Sep 27, 2023
2 parents de387ad + 5c7b4f5 commit 27ce065
Show file tree
Hide file tree
Showing 31 changed files with 569 additions and 127 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
* **Improves salesforce partitioning** Partitions Salesforce data as xlm instead of text for improved detail and flexibility. Partitions htmlbody instead of textbody for Salesforce emails. Importance: Allows all Salesforce fields to be ingested and gives Salesforce emails more detailed partitioning.
* **Add document level language detection functionality.** Introduces the "auto" default for the languages param, which then detects the languages present in the document using the `langdetect` package. Adds the document languages as ISO 639-3 codes to the element metadata. Implemented only for the partition_text function to start.
* **PPTX partitioner refactored in preparation for enhancement.** Behavior should be unchanged except that shapes enclosed in a group-shape are now included, as many levels deep as required (a group-shape can itself contain a group-shape).
* **Embeddings support for the SharePoint SourceConnector via unstructured-ingest CLI** The SharePoint connector can now optionally create embeddings from the elements it pulls out during partition and upload those embeddings to Azure Cognitive Search index.

### Features

Expand Down
17 changes: 16 additions & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ charset-normalizer==3.2.0
# requests
docutils==0.18.1
# via
# myst-parser
# sphinx
# sphinx-rtd-theme
# sphinx-tabs
Expand All @@ -38,10 +39,21 @@ imagesize==1.4.1
importlib-metadata==6.8.0
# via sphinx
jinja2==3.1.2
# via sphinx
# via
# myst-parser
# sphinx
markdown-it-py==3.0.0
# via
# mdit-py-plugins
# myst-parser
markupsafe==2.1.3
# via jinja2
mdit-py-plugins==0.4.0
# via myst-parser
mdurl==0.1.2
# via markdown-it-py
myst-parser==2.0.0
# via -r requirements/build.in
packaging==23.1
# via
# -c requirements/base.txt
Expand All @@ -53,6 +65,8 @@ pygments==2.16.1
# sphinx-tabs
pytz==2023.3.post1
# via babel
pyyaml==6.0.1
# via myst-parser
requests==2.31.0
# via
# -c requirements/base.txt
Expand All @@ -67,6 +81,7 @@ sphinx==6.2.1
# via
# -r requirements/build.in
# furo
# myst-parser
# sphinx-basic-ng
# sphinx-rtd-theme
# sphinx-tabs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@
"name": "text",
"type": "Edm.String"
},
{
"name": "embeddings",
"type": "Collection(Edm.Single)",
"dimensions": 400,
"vectorSearchConfiguration": "embeddings-config"
},
{
"name": "type",
"type": "Edm.String"
Expand Down Expand Up @@ -162,5 +168,19 @@
}
]
}
]
],
"vectorSearch": {
"algorithmConfigurations": [
{
"name": "embeddings-config",
"kind": "hnsw",
"hnswParameters": {
"metric": "cosine",
"m": 4,
"efConstruction": 400,
"efSearch": 500
}
}
]
}
}
2 changes: 1 addition & 1 deletion requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ charset-normalizer==3.2.0
# via requests
click==8.1.7
# via nltk
dataclasses-json==0.6.0
dataclasses-json==0.6.1
# via -r requirements/base.in
emoji==2.8.0
# via -r requirements/base.in
Expand Down
2 changes: 1 addition & 1 deletion requirements/build.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile --config=pyproject.toml requirements/build.in
# pip-compile requirements/build.in
#
alabaster==0.7.13
# via sphinx
Expand Down
2 changes: 2 additions & 0 deletions requirements/constraints.in
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,5 @@ matplotlib==3.7.2
# NOTE(crag) - pin to available pandas for python 3.8 (at least in CI)
fsspec==2023.9.1
pandas<2.0.4
# langchain limits this to 3.1.7
anyio==3.1.7
2 changes: 1 addition & 1 deletion requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ tornado==6.3.3
# jupyterlab
# notebook
# terminado
traitlets==5.10.0
traitlets==5.10.1
# via
# comm
# ipykernel
Expand Down
2 changes: 1 addition & 1 deletion requirements/extra-pdf-image.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ fsspec==2023.9.1
# via
# -c requirements/constraints.in
# huggingface-hub
huggingface-hub==0.17.2
huggingface-hub==0.17.3
# via
# timm
# transformers
Expand Down
2 changes: 1 addition & 1 deletion requirements/huggingface.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ fsspec==2023.9.1
# via
# -c requirements/constraints.in
# huggingface-hub
huggingface-hub==0.17.2
huggingface-hub==0.17.3
# via transformers
idna==3.4
# via
Expand Down
2 changes: 1 addition & 1 deletion requirements/ingest-azure.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ azure-datalake-store==0.0.53
# via adlfs
azure-identity==1.14.0
# via adlfs
azure-storage-blob==12.18.1
azure-storage-blob==12.18.2
# via adlfs
certifi==2023.7.22
# via
Expand Down
2 changes: 1 addition & 1 deletion requirements/ingest-delta-table.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# pip-compile requirements/ingest-delta-table.in
#
deltalake==0.10.2
deltalake==0.11.0
# via -r requirements/ingest-delta-table.in
fsspec==2023.9.1
# via
Expand Down
20 changes: 10 additions & 10 deletions requirements/ingest-notion.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,33 +4,33 @@
#
# pip-compile requirements/ingest-notion.in
#
anyio==4.0.0
# via httpcore
certifi==2023.7.22
# via
# -c requirements/base.txt
# -c requirements/constraints.in
# httpcore
# httpx
exceptiongroup==1.1.3
# via anyio
h11==0.14.0
charset-normalizer==3.2.0
# via
# -c requirements/base.txt
# httpx
h11==0.12.0
# via httpcore
htmlbuilder==1.0.0
# via -r requirements/ingest-notion.in
httpcore==0.18.0
httpcore==0.13.3
# via httpx
httpx==0.25.0
httpx==0.20.0
# via notion-client
idna==3.4
# via
# -c requirements/base.txt
# anyio
# httpx
# rfc3986
notion-client==2.0.0
# via -r requirements/ingest-notion.in
rfc3986[idna2008]==1.5.0
# via httpx
sniffio==1.3.0
# via
# anyio
# httpcore
# httpx
5 changes: 5 additions & 0 deletions requirements/ingest-openai.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
-c constraints.in
-c base.txt
langchain
tiktoken
openai
115 changes: 115 additions & 0 deletions requirements/ingest-openai.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile requirements/ingest-openai.in
#
aiohttp==3.8.5
# via
# langchain
# openai
aiosignal==1.3.1
# via aiohttp
async-timeout==4.0.3
# via
# aiohttp
# langchain
attrs==23.1.0
# via aiohttp
certifi==2023.7.22
# via
# -c requirements/base.txt
# -c requirements/constraints.in
# requests
charset-normalizer==3.2.0
# via
# -c requirements/base.txt
# aiohttp
# requests
dataclasses-json==0.6.1
# via
# -c requirements/base.txt
# langchain
frozenlist==1.4.0
# via
# aiohttp
# aiosignal
idna==3.4
# via
# -c requirements/base.txt
# requests
# yarl
langchain==0.0.298
# via -r requirements/ingest-openai.in
langsmith==0.0.40
# via langchain
marshmallow==3.20.1
# via
# -c requirements/base.txt
# dataclasses-json
multidict==6.0.4
# via
# aiohttp
# yarl
mypy-extensions==1.0.0
# via
# -c requirements/base.txt
# typing-inspect
numexpr==2.8.6
# via langchain
numpy==1.24.4
# via
# -c requirements/constraints.in
# langchain
# numexpr
openai==0.28.1
# via -r requirements/ingest-openai.in
packaging==23.1
# via
# -c requirements/base.txt
# marshmallow
pydantic==1.10.12
# via
# -c requirements/constraints.in
# langchain
# langsmith
pyyaml==6.0.1
# via langchain
regex==2023.8.8
# via
# -c requirements/base.txt
# tiktoken
requests==2.31.0
# via
# -c requirements/base.txt
# langchain
# langsmith
# openai
# tiktoken
sqlalchemy==2.0.21
# via langchain
tenacity==8.2.3
# via langchain
tiktoken==0.5.1
# via -r requirements/ingest-openai.in
tqdm==4.66.1
# via
# -c requirements/base.txt
# openai
typing-extensions==4.8.0
# via
# -c requirements/base.txt
# pydantic
# sqlalchemy
# typing-inspect
typing-inspect==0.9.0
# via
# -c requirements/base.txt
# dataclasses-json
urllib3==1.26.16
# via
# -c requirements/base.txt
# -c requirements/constraints.in
# requests
yarl==1.9.2
# via aiohttp
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ def load_requirements(file_list: Optional[Union[str, List[str]]] = None) -> List
"huggingface": load_requirements("requirements/huggingface.in"),
"local-inference": all_doc_reqs,
"paddleocr": load_requirements("requirements/extra-paddleocr.in"),
"openai": load_requirements("requirements/ingest-openai.in"),
},
package_dir={"unstructured": "unstructured"},
package_data={"unstructured": ["nlp/*.txt"]},
Expand Down
26 changes: 25 additions & 1 deletion test_unstructured_ingest/files/azure_cognitive_index_schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@
"name": "text",
"type": "Edm.String"
},
{
"name": "embeddings",
"type": "Collection(Edm.Single)",
"dimensions": 1536,
"vectorSearchConfiguration": "embeddings-config"
},
{
"name": "type",
"type": "Edm.String"
Expand Down Expand Up @@ -107,6 +113,10 @@
"name": "page_number",
"type": "Edm.String"
},
{
"name": "page_name",
"type": "Edm.String"
},
{
"name": "url",
"type": "Edm.String"
Expand Down Expand Up @@ -161,5 +171,19 @@
}
]
}
]
],
"vectorSearch": {
"algorithmConfigurations": [
{
"name": "embeddings-config",
"kind": "hnsw",
"hnswParameters": {
"metric": "cosine",
"m": 4,
"efConstruction": 400,
"efSearch": 500
}
}
]
}
}
Loading

0 comments on commit 27ce065

Please sign in to comment.