Skip to content

Commit

Permalink
pin unstructured-client (Unstructured-IO#2392)
Browse files Browse the repository at this point in the history
Replacement for Unstructured-IO#2311 since python 3.8 was dropped as a supported
version.

Unstructured-client added `api_key_auth` as a param to
`UnstructuredClient` in [version
0.9.0](Unstructured-IO/unstructured-python-client@8c93115).

This pins the version of `unstructured-client` so users do not receive
`TypeError: UnstructuredClient.__init__() got an unexpected keyword
argument 'api_key_auth'`
  • Loading branch information
Coniferish committed Jan 15, 2024
1 parent 36faf67 commit 1f0826a
Show file tree
Hide file tree
Showing 18 changed files with 44 additions and 42 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## 0.12.1-dev6
## 0.12.1-dev7

### Enhancements

Expand All @@ -14,6 +14,7 @@
### Fixes

* **Fix GCS connector converting JSON to string with single quotes.** FSSpec serialization caused conversion of JSON token to string with single quotes. GCS requires token in form of dict so this format is now assured.
* **Pin version of unstructured-client** Set minimum version of unstructured-client to avoid raising a TypeError when passing `api_key_auth` to `UnstructuredClient`
* **Fix the serialization of the Pinecone destination connector.** Presence of the PineconeIndex object breaks serialization due to TypeError: cannot pickle '_thread.lock' object. This removes that object before serialization.
* **Fix the serialization of the Elasticsearch destination connector.** Presence of the _client object breaks serialization due to TypeError: cannot pickle '_thread.lock' object. This removes that object before serialization.

Expand Down
4 changes: 2 additions & 2 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# pip-compile --output-file=build.txt build.in
#
alabaster==0.7.15
alabaster==0.7.16
# via sphinx
babel==2.14.0
# via sphinx
Expand Down Expand Up @@ -38,7 +38,7 @@ imagesize==1.4.1
# via sphinx
importlib-metadata==7.0.1
# via sphinx
jinja2==3.1.2
jinja2==3.1.3
# via
# myst-parser
# sphinx
Expand Down
3 changes: 2 additions & 1 deletion requirements/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@ numpy
rapidfuzz
backoff
typing-extensions
unstructured-client
# NOTE(jennings): pinned due to later versions not supporting api_key_auth in UnstructuredClient
unstructured-client>=0.15.1
wrapt
2 changes: 1 addition & 1 deletion requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ langdetect==1.0.9
# via -r base.in
lxml==5.1.0
# via -r base.in
marshmallow==3.20.1
marshmallow==3.20.2
# via
# dataclasses-json
# unstructured-client
Expand Down
4 changes: 2 additions & 2 deletions requirements/build.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# pip-compile --output-file=build.txt build.in
#
alabaster==0.7.15
alabaster==0.7.16
# via sphinx
babel==2.14.0
# via sphinx
Expand Down Expand Up @@ -38,7 +38,7 @@ imagesize==1.4.1
# via sphinx
importlib-metadata==7.0.1
# via sphinx
jinja2==3.1.2
jinja2==3.1.3
# via
# myst-parser
# sphinx
Expand Down
6 changes: 3 additions & 3 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ isoduration==20.11.0
# via jsonschema
jedi==0.19.1
# via ipython
jinja2==3.1.2
jinja2==3.1.3
# via
# jupyter-server
# jupyterlab
Expand Down Expand Up @@ -162,7 +162,7 @@ jupyter-events==0.9.0
# via jupyter-server
jupyter-lsp==2.2.1
# via jupyterlab
jupyter-server==2.12.2
jupyter-server==2.12.4
# via
# jupyter-lsp
# jupyterlab
Expand Down Expand Up @@ -193,7 +193,7 @@ mistune==3.0.2
# via nbconvert
nbclient==0.9.0
# via nbconvert
nbconvert==7.14.0
nbconvert==7.14.1
# via
# jupyter
# jupyter-server
Expand Down
2 changes: 1 addition & 1 deletion requirements/extra-markdown.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
importlib-metadata==7.0.1
# via markdown
markdown==3.5.1
markdown==3.5.2
# via -r extra-markdown.in
zipp==3.17.0
# via importlib-metadata
10 changes: 5 additions & 5 deletions requirements/extra-paddleocr.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ attrdict==2.0.1
# via unstructured-paddleocr
babel==2.14.0
# via flask-babel
bce-python-sdk==0.8.99
bce-python-sdk==0.9.2
# via visualdl
blinker==1.7.0
# via flask
Expand All @@ -35,7 +35,7 @@ cssutils==2.9.0
# via premailer
cycler==0.12.1
# via matplotlib
cython==3.0.7
cython==3.0.8
# via unstructured-paddleocr
et-xmlfile==1.1.0
# via openpyxl
Expand All @@ -45,7 +45,7 @@ flask==3.0.0
# visualdl
flask-babel==4.0.0
# via visualdl
fonttools==4.47.0
fonttools==4.47.2
# via matplotlib
future==0.18.3
# via bce-python-sdk
Expand All @@ -65,7 +65,7 @@ importlib-resources==6.1.1
# via matplotlib
itsdangerous==2.1.2
# via flask
jinja2==3.1.2
jinja2==3.1.3
# via
# flask
# flask-babel
Expand Down Expand Up @@ -151,7 +151,7 @@ psutil==5.9.7
# via visualdl
pyclipper==1.3.0.post5
# via unstructured-paddleocr
pycryptodome==3.19.1
pycryptodome==3.20.0
# via bce-python-sdk
pyparsing==3.0.9
# via
Expand Down
6 changes: 3 additions & 3 deletions requirements/extra-pdf-image.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ filelock==3.13.1
# transformers
flatbuffers==23.5.26
# via onnxruntime
fonttools==4.47.0
fonttools==4.47.2
# via matplotlib
fsspec==2023.12.2
# via
Expand All @@ -59,7 +59,7 @@ importlib-resources==6.1.1
# via matplotlib
iopath==0.1.10
# via layoutparser
jinja2==3.1.2
jinja2==3.1.3
# via torch
kiwisolver==1.4.5
# via matplotlib
Expand Down Expand Up @@ -162,7 +162,7 @@ pyparsing==3.0.9
# matplotlib
pypdf==3.17.4
# via -r extra-pdf-image.in
pypdfium2==4.25.0
pypdfium2==4.26.0
# via pdfplumber
pytesseract==0.3.10
# via layoutparser
Expand Down
2 changes: 1 addition & 1 deletion requirements/huggingface.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ idna==3.6
# via
# -c base.txt
# requests
jinja2==3.1.2
jinja2==3.1.3
# via torch
joblib==1.3.2
# via
Expand Down
8 changes: 4 additions & 4 deletions requirements/ingest/chroma.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,15 @@ deprecated==1.2.14
# opentelemetry-exporter-otlp-proto-grpc
exceptiongroup==1.2.0
# via anyio
fastapi==0.108.0
fastapi==0.109.0
# via chromadb
filelock==3.13.1
# via huggingface-hub
flatbuffers==23.5.26
# via onnxruntime
fsspec==2023.12.2
# via huggingface-hub
google-auth==2.26.1
google-auth==2.26.2
# via kubernetes
googleapis-common-protos==1.62.0
# via opentelemetry-exporter-otlp-proto-grpc
Expand Down Expand Up @@ -153,7 +153,7 @@ packaging==23.2
# build
# huggingface-hub
# onnxruntime
posthog==3.3.0
posthog==3.3.1
# via chromadb
protobuf==4.23.4
# via
Expand Down Expand Up @@ -211,7 +211,7 @@ six==1.16.0
# python-dateutil
sniffio==1.3.0
# via anyio
starlette==0.32.0.post1
starlette==0.35.1
# via fastapi
sympy==1.12
# via onnxruntime
Expand Down
8 changes: 4 additions & 4 deletions requirements/ingest/embed-aws-bedrock.txt
Original file line number Diff line number Diff line change
Expand Up @@ -67,18 +67,18 @@ jsonpointer==2.4
# via jsonpatch
langchain==0.1.0
# via -r ingest/embed-aws-bedrock.in
langchain-community==0.0.10
langchain-community==0.0.11
# via langchain
langchain-core==0.1.8
langchain-core==0.1.10
# via
# langchain
# langchain-community
langsmith==0.0.78
langsmith==0.0.80
# via
# langchain
# langchain-community
# langchain-core
marshmallow==3.20.1
marshmallow==3.20.2
# via
# -c ingest/../base.txt
# dataclasses-json
Expand Down
10 changes: 5 additions & 5 deletions requirements/ingest/embed-huggingface.txt
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ idna==3.6
# anyio
# requests
# yarl
jinja2==3.1.2
jinja2==3.1.3
# via torch
joblib==1.3.2
# via
Expand All @@ -81,20 +81,20 @@ jsonpointer==2.4
# via jsonpatch
langchain==0.1.0
# via -r ingest/embed-huggingface.in
langchain-community==0.0.10
langchain-community==0.0.11
# via langchain
langchain-core==0.1.8
langchain-core==0.1.10
# via
# langchain
# langchain-community
langsmith==0.0.78
langsmith==0.0.80
# via
# langchain
# langchain-community
# langchain-core
markupsafe==2.1.3
# via jinja2
marshmallow==3.20.1
marshmallow==3.20.2
# via
# -c ingest/../base.txt
# dataclasses-json
Expand Down
10 changes: 5 additions & 5 deletions requirements/ingest/embed-openai.txt
Original file line number Diff line number Diff line change
Expand Up @@ -67,18 +67,18 @@ jsonpointer==2.4
# via jsonpatch
langchain==0.1.0
# via -r ingest/embed-openai.in
langchain-community==0.0.10
langchain-community==0.0.11
# via langchain
langchain-core==0.1.8
langchain-core==0.1.10
# via
# langchain
# langchain-community
langsmith==0.0.78
langsmith==0.0.80
# via
# langchain
# langchain-community
# langchain-core
marshmallow==3.20.1
marshmallow==3.20.2
# via
# -c ingest/../base.txt
# dataclasses-json
Expand All @@ -95,7 +95,7 @@ numpy==1.26.3
# -c ingest/../base.txt
# langchain
# langchain-community
openai==1.7.0
openai==1.7.2
# via -r ingest/embed-openai.in
packaging==23.2
# via
Expand Down
2 changes: 1 addition & 1 deletion requirements/ingest/gcs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ google-api-core==2.15.0
# via
# google-cloud-core
# google-cloud-storage
google-auth==2.26.1
google-auth==2.26.2
# via
# gcsfs
# google-api-core
Expand Down
2 changes: 1 addition & 1 deletion requirements/ingest/google-drive.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ google-api-core==2.15.0
# via google-api-python-client
google-api-python-client==2.113.0
# via -r ingest/google-drive.in
google-auth==2.26.1
google-auth==2.26.2
# via
# google-api-core
# google-api-python-client
Expand Down
2 changes: 1 addition & 1 deletion requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ requests==2.31.0
# via
# -c base.txt
# label-studio-sdk
ruff==0.1.11
ruff==0.1.13
# via -r test.in
six==1.16.0
# via
Expand Down
2 changes: 1 addition & 1 deletion unstructured/__version__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.12.1-dev6" # pragma: no cover
__version__ = "0.12.1-dev7" # pragma: no cover

0 comments on commit 1f0826a

Please sign in to comment.