Skip to content

Commit

Permalink
build(deps): bump protobuf pin (#3625)
Browse files Browse the repository at this point in the history
Bumps max version of `protobuf<5.0` and sets min version of
`chromadb>0.4.14` in `requirements/ingest/chroma.in`. Also fixes some
type hints in `unstructured/ingest/v2/processes/connectors/chroma.py`
  • Loading branch information
Coniferish authored Sep 16, 2024
1 parent ba93f9a commit 46e04b1
Show file tree
Hide file tree
Showing 50 changed files with 132 additions and 108 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## 0.15.13-dev0
## 0.15.13-dev1

### Enhancements

Expand Down
2 changes: 1 addition & 1 deletion requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ httpcore==1.0.5
# via httpx
httpx==0.27.2
# via unstructured-client
idna==3.8
idna==3.10
# via
# anyio
# httpx
Expand Down
7 changes: 4 additions & 3 deletions requirements/deps/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
# extras. Putting a dependency here will only affect dependency sets that contain them -- in other
# words, if something does not require a constraint, it will not be installed.
####################################################################################################
# consistency with local-inference-pin
protobuf<4.24
# (jennings): Versions greater than 5.0 create dependency conflicts with other packages
protobuf<5.0
# TODO: Constriant due to multiple versions being installed during pip-compile
grpcio>=1.65.5
# TODO: Pinned in transformers package, remove when that gets updated
# TODO: Pinned in transformers package, remove when that gets updated (https://github.com/huggingface/transformers/blob/main/setup.py)
tokenizers>=0.19,<0.20
# TODO: Constaint due to boto, with python before 3.10 not requiring openssl 1.1.1, remove when that gets
# updated or we drop support for 3.9
Expand Down
6 changes: 3 additions & 3 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ distlib==0.3.8
# via virtualenv
filelock==3.16.0
# via virtualenv
identify==2.6.0
identify==2.6.1
# via pre-commit
importlib-metadata==8.5.0
# via
Expand All @@ -32,7 +32,7 @@ packaging==24.1
# build
pip-tools==7.4.1
# via -r ./dev.in
platformdirs==4.3.2
platformdirs==4.3.3
# via
# -c ./test.txt
# virtualenv
Expand All @@ -55,7 +55,7 @@ virtualenv==20.26.4
# via pre-commit
wheel==0.44.0
# via pip-tools
zipp==3.20.1
zipp==3.20.2
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
Expand Down
2 changes: 1 addition & 1 deletion requirements/extra-markdown.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ importlib-metadata==8.5.0
# markdown
markdown==3.7
# via -r ./extra-markdown.in
zipp==3.20.1
zipp==3.20.2
# via importlib-metadata
6 changes: 3 additions & 3 deletions requirements/extra-paddleocr.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ httpx==0.27.2
# via
# -c ./base.txt
# paddlepaddle
idna==3.8
idna==3.10
# via
# -c ./base.txt
# anyio
Expand Down Expand Up @@ -113,7 +113,7 @@ pillow==10.4.0
# pdf2image
# scikit-image
# unstructured-paddleocr
protobuf==4.23.4
protobuf==4.25.4
# via
# -c ././deps/constraints.txt
# paddlepaddle
Expand Down Expand Up @@ -175,5 +175,5 @@ urllib3==1.26.20
# -c ././deps/constraints.txt
# -c ./base.txt
# requests
zipp==3.20.1
zipp==3.20.2
# via importlib-resources
6 changes: 3 additions & 3 deletions requirements/extra-pdf-image.txt
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ huggingface-hub==0.24.7
# unstructured-inference
humanfriendly==10.0
# via coloredlogs
idna==3.8
idna==3.10
# via
# -c ./base.txt
# requests
Expand Down Expand Up @@ -166,7 +166,7 @@ proto-plus==1.24.0
# via
# google-api-core
# google-cloud-vision
protobuf==4.23.4
protobuf==4.25.4
# via
# -c ././deps/constraints.txt
# google-api-core
Expand Down Expand Up @@ -288,5 +288,5 @@ wrapt==1.16.0
# via
# -c ./base.txt
# deprecated
zipp==3.20.1
zipp==3.20.2
# via importlib-resources
2 changes: 1 addition & 1 deletion requirements/huggingface.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ huggingface-hub==0.24.7
# via
# tokenizers
# transformers
idna==3.8
idna==3.10
# via
# -c ./base.txt
# requests
Expand Down
2 changes: 1 addition & 1 deletion requirements/ingest/airtable.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ charset-normalizer==3.3.2
# via
# -c ./ingest/../base.txt
# requests
idna==3.8
idna==3.10
# via
# -c ./ingest/../base.txt
# requests
Expand Down
2 changes: 1 addition & 1 deletion requirements/ingest/astradb.txt
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ httpx[http2]==0.27.2
# astrapy
hyperframe==6.0.1
# via h2
idna==3.8
idna==3.10
# via
# -c ./ingest/../base.txt
# anyio
Expand Down
4 changes: 2 additions & 2 deletions requirements/ingest/azure-cognitive-search.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
azure-common==1.1.28
# via azure-search-documents
azure-core==1.30.2
azure-core==1.31.0
# via azure-search-documents
azure-search-documents==11.5.1
# via -r ./ingest/azure-cognitive-search.in
Expand All @@ -18,7 +18,7 @@ charset-normalizer==3.3.2
# via
# -c ./ingest/../base.txt
# requests
idna==3.8
idna==3.10
# via
# -c ./ingest/../base.txt
# requests
Expand Down
8 changes: 5 additions & 3 deletions requirements/ingest/azure.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ async-timeout==4.0.3
# via aiohttp
attrs==24.2.0
# via aiohttp
azure-core==1.30.2
azure-core==1.31.0
# via
# adlfs
# azure-identity
Expand Down Expand Up @@ -53,7 +53,7 @@ fsspec==2024.9.0
# via
# -r ./ingest/azure.in
# adlfs
idna==3.8
idna==3.10
# via
# -c ./ingest/../base.txt
# requests
Expand All @@ -76,7 +76,9 @@ portalocker==2.10.1
pycparser==2.22
# via cffi
pyjwt[crypto]==2.9.0
# via msal
# via
# msal
# pyjwt
requests==2.32.3
# via
# -c ./ingest/../base.txt
Expand Down
2 changes: 1 addition & 1 deletion requirements/ingest/box.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ fsspec==2024.9.0
# via
# -r ./ingest/box.in
# boxfs
idna==3.8
idna==3.10
# via
# -c ./ingest/../base.txt
# requests
Expand Down
2 changes: 1 addition & 1 deletion requirements/ingest/chroma.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-c ../deps/constraints.txt
-c ../base.txt
chromadb
chromadb>0.4.14
importlib-metadata>=8.2.0
# Future releases adds in typer-cli which breaks the resolution of typer as a library
typer<=0.9.0
Expand Down
10 changes: 5 additions & 5 deletions requirements/ingest/chroma.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ exceptiongroup==1.2.2
# via
# -c ./ingest/../base.txt
# anyio
fastapi==0.114.1
fastapi==0.114.2
# via chromadb
filelock==3.16.0
# via huggingface-hub
Expand Down Expand Up @@ -77,7 +77,7 @@ huggingface-hub==0.24.7
# via tokenizers
humanfriendly==10.0
# via coloredlogs
idna==3.8
idna==3.10
# via
# -c ./ingest/../base.txt
# anyio
Expand Down Expand Up @@ -130,9 +130,9 @@ packaging==24.1
# build
# huggingface-hub
# onnxruntime
posthog==3.6.5
posthog==3.6.6
# via chromadb
protobuf==4.23.4
protobuf==4.25.4
# via
# -c ./ingest/../deps/constraints.txt
# googleapis-common-protos
Expand Down Expand Up @@ -245,7 +245,7 @@ wrapt==1.16.0
# -c ./ingest/../base.txt
# deprecated
# opentelemetry-instrumentation
zipp==3.20.1
zipp==3.20.2
# via
# importlib-metadata
# importlib-resources
Expand Down
4 changes: 2 additions & 2 deletions requirements/ingest/clarifai.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ grpcio==1.66.1
# via
# -c ./ingest/../deps/constraints.txt
# clarifai-grpc
idna==3.8
idna==3.10
# via
# -c ./ingest/../base.txt
# requests
Expand All @@ -45,7 +45,7 @@ pillow==10.4.0
# via clarifai
prompt-toolkit==3.0.47
# via inquirerpy
protobuf==4.23.4
protobuf==4.25.4
# via
# -c ./ingest/../deps/constraints.txt
# clarifai-grpc
Expand Down
4 changes: 2 additions & 2 deletions requirements/ingest/confluence.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# pip-compile ./ingest/confluence.in
#
atlassian-python-api==3.41.15
atlassian-python-api==3.41.16
# via -r ./ingest/confluence.in
beautifulsoup4==4.12.3
# via
Expand All @@ -20,7 +20,7 @@ charset-normalizer==3.3.2
# requests
deprecated==1.2.14
# via atlassian-python-api
idna==3.8
idna==3.10
# via
# -c ./ingest/../base.txt
# requests
Expand Down
2 changes: 1 addition & 1 deletion requirements/ingest/databricks-volumes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ databricks-sdk==0.32.1
# via -r ./ingest/databricks-volumes.in
google-auth==2.34.0
# via databricks-sdk
idna==3.8
idna==3.10
# via
# -c ./ingest/../base.txt
# requests
Expand Down
2 changes: 1 addition & 1 deletion requirements/ingest/discord.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ frozenlist==1.4.1
# via
# aiohttp
# aiosignal
idna==3.8
idna==3.10
# via
# -c ./ingest/../base.txt
# yarl
Expand Down
2 changes: 1 addition & 1 deletion requirements/ingest/dropbox.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ fsspec==2024.9.0
# via
# -r ./ingest/dropbox.in
# dropboxdrivefs
idna==3.8
idna==3.10
# via
# -c ./ingest/../base.txt
# requests
Expand Down
2 changes: 1 addition & 1 deletion requirements/ingest/elasticsearch.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ frozenlist==1.4.1
# via
# aiohttp
# aiosignal
idna==3.8
idna==3.10
# via
# -c ./ingest/../base.txt
# yarl
Expand Down
17 changes: 11 additions & 6 deletions requirements/ingest/embed-aws-bedrock.txt
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ httpx==0.27.2
# via
# -c ./ingest/../base.txt
# langsmith
idna==3.8
idna==3.10
# via
# -c ./ingest/../base.txt
# anyio
Expand All @@ -80,18 +80,18 @@ jsonpatch==1.33
# via langchain-core
jsonpointer==3.0.0
# via jsonpatch
langchain==0.2.16
langchain==0.3.0
# via langchain-community
langchain-community==0.2.16
langchain-community==0.3.0
# via -r ./ingest/embed-aws-bedrock.in
langchain-core==0.2.39
langchain-core==0.3.0
# via
# langchain
# langchain-community
# langchain-text-splitters
langchain-text-splitters==0.2.4
langchain-text-splitters==0.3.0
# via langchain
langsmith==0.1.118
langsmith==0.1.120
# via
# langchain
# langchain-community
Expand Down Expand Up @@ -125,12 +125,17 @@ pydantic==2.9.1
# langchain
# langchain-core
# langsmith
# pydantic-settings
pydantic-core==2.23.3
# via pydantic
pydantic-settings==2.5.2
# via langchain-community
python-dateutil==2.9.0.post0
# via
# -c ./ingest/../base.txt
# botocore
python-dotenv==1.0.1
# via pydantic-settings
pyyaml==6.0.2
# via
# langchain
Expand Down
8 changes: 4 additions & 4 deletions requirements/ingest/embed-huggingface.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ huggingface-hub==0.24.7
# sentence-transformers
# tokenizers
# transformers
idna==3.8
idna==3.10
# via
# -c ./ingest/../base.txt
# anyio
Expand All @@ -67,11 +67,11 @@ jsonpatch==1.33
# via langchain-core
jsonpointer==3.0.0
# via jsonpatch
langchain-core==0.2.39
langchain-core==0.3.0
# via langchain-huggingface
langchain-huggingface==0.0.3
langchain-huggingface==0.1.0
# via -r ./ingest/embed-huggingface.in
langsmith==0.1.118
langsmith==0.1.120
# via langchain-core
markupsafe==2.1.5
# via jinja2
Expand Down
2 changes: 1 addition & 1 deletion requirements/ingest/embed-mixedbreadai.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ httpx==0.27.2
# via
# -c ./ingest/../base.txt
# mixedbread-ai
idna==3.8
idna==3.10
# via
# -c ./ingest/../base.txt
# anyio
Expand Down
Loading

0 comments on commit 46e04b1

Please sign in to comment.