From 8c2348adb9ccd274051b66aad140a7b751012f2c Mon Sep 17 00:00:00 2001 From: John <43506685+Coniferish@users.noreply.github.com> Date: Wed, 7 Aug 2024 11:08:10 -0400 Subject: [PATCH 1/2] update pin for importlib-metadata --- requirements/deps/constraints.txt | 4 - requirements/dev.txt | 3 +- requirements/extra-markdown.txt | 6 +- requirements/extra-paddleocr.txt | 2 +- requirements/extra-pdf-image.txt | 2 +- requirements/ingest/azure.txt | 2 +- requirements/ingest/chroma.in | 2 +- requirements/ingest/chroma.txt | 85 +++++----------------- requirements/ingest/databricks-volumes.txt | 2 +- requirements/ingest/discord.txt | 2 +- requirements/ingest/elasticsearch.txt | 2 +- requirements/ingest/embed-aws-bedrock.txt | 2 +- requirements/ingest/embed-octoai.txt | 2 +- requirements/ingest/embed-openai.txt | 2 +- requirements/ingest/embed-vertexai.txt | 6 +- requirements/ingest/embed-voyageai.txt | 2 +- requirements/ingest/gcs.txt | 6 +- requirements/ingest/google-drive.txt | 2 +- requirements/ingest/s3.txt | 2 +- requirements/ingest/salesforce.txt | 2 +- requirements/ingest/singlestore.txt | 6 +- 21 files changed, 44 insertions(+), 100 deletions(-) diff --git a/requirements/deps/constraints.txt b/requirements/deps/constraints.txt index 34a98af59e..8a064c9b56 100644 --- a/requirements/deps/constraints.txt +++ b/requirements/deps/constraints.txt @@ -57,7 +57,3 @@ fsspec==2024.5.0 wrapt>=1.14.0 langchain-community>=0.2.5 - -# NOTE(robinson): choma was pinned to importlib-metadata>=7.1.0 but 7.1.0 was installed -# instead of 7.2.0. Need to investigate -importlib-metadata==7.1.0 diff --git a/requirements/dev.txt b/requirements/dev.txt index a376e7bfe3..065ab4cb6d 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -110,9 +110,8 @@ idna==3.7 # httpx # jsonschema # requests -importlib-metadata==7.1.0 +importlib-metadata==8.2.0 # via - # -c ././deps/constraints.txt # build # jupyter-client # jupyter-lsp diff --git a/requirements/extra-markdown.txt b/requirements/extra-markdown.txt index 723574a04f..d49fa64139 100644 --- a/requirements/extra-markdown.txt +++ b/requirements/extra-markdown.txt @@ -4,10 +4,8 @@ # # pip-compile ./extra-markdown.in # -importlib-metadata==7.1.0 - # via - # -c ././deps/constraints.txt - # markdown +importlib-metadata==8.2.0 + # via markdown markdown==3.6 # via -r ./extra-markdown.in zipp==3.19.2 diff --git a/requirements/extra-paddleocr.txt b/requirements/extra-paddleocr.txt index 1ea54f91bb..5ba24f7463 100644 --- a/requirements/extra-paddleocr.txt +++ b/requirements/extra-paddleocr.txt @@ -58,7 +58,7 @@ matplotlib==3.7.2 # via # -c ././deps/constraints.txt # imgaug -more-itertools==10.3.0 +more-itertools==10.4.0 # via cssutils networkx==3.2.1 # via scikit-image diff --git a/requirements/extra-pdf-image.txt b/requirements/extra-pdf-image.txt index 991176cdd5..c57f23bd7b 100644 --- a/requirements/extra-pdf-image.txt +++ b/requirements/extra-pdf-image.txt @@ -48,7 +48,7 @@ fsspec==2024.5.0 # torch google-api-core[grpc]==2.19.1 # via google-cloud-vision -google-auth==2.32.0 +google-auth==2.33.0 # via # google-api-core # google-cloud-vision diff --git a/requirements/ingest/azure.txt b/requirements/ingest/azure.txt index de5d1dfbb0..121985ad46 100644 --- a/requirements/ingest/azure.txt +++ b/requirements/ingest/azure.txt @@ -6,7 +6,7 @@ # adlfs==2024.7.0 # via -r ./ingest/azure.in -aiohappyeyeballs==2.3.4 +aiohappyeyeballs==2.3.5 # via aiohttp aiohttp==3.10.1 # via adlfs diff --git a/requirements/ingest/chroma.in b/requirements/ingest/chroma.in index 77016b60df..4f9fa502ea 100644 --- a/requirements/ingest/chroma.in +++ b/requirements/ingest/chroma.in @@ -1,7 +1,7 @@ -c ../deps/constraints.txt -c ../base.txt chromadb -importlib-metadata>=7.1.0 +importlib-metadata>=8.2.0 # Future releases adds in typer-cli which breaks the resolution of typer as a library typer<=0.9.0 # tenacity 9.0.0 is being installed via chroma, but other dependencies (langchain) restrict tenacity diff --git a/requirements/ingest/chroma.txt b/requirements/ingest/chroma.txt index c2ffe69438..054561901b 100644 --- a/requirements/ingest/chroma.txt +++ b/requirements/ingest/chroma.txt @@ -13,33 +13,30 @@ anyio==3.7.1 # httpx # starlette # watchfiles -asgiref==3.8.1 - # via opentelemetry-instrumentation-asgi backoff==2.2.1 # via # -c ./ingest/../base.txt + # opentelemetry-exporter-otlp-proto-grpc # posthog bcrypt==4.2.0 # via chromadb -build==1.2.1 - # via chromadb cachetools==5.4.0 # via google-auth certifi==2024.7.4 # via # -c ./ingest/../base.txt # -c ./ingest/../deps/constraints.txt - # httpcore # httpx # kubernetes + # pulsar-client # requests charset-normalizer==3.3.2 # via # -c ./ingest/../base.txt # requests -chroma-hnswlib==0.7.6 +chroma-hnswlib==0.7.3 # via chromadb -chromadb==0.5.5 +chromadb==0.4.17 # via -r ./ingest/chroma.in click==8.1.7 # via @@ -49,10 +46,7 @@ click==8.1.7 coloredlogs==15.0.1 # via onnxruntime deprecated==1.2.14 - # via - # opentelemetry-api - # opentelemetry-exporter-otlp-proto-grpc - # opentelemetry-semantic-conventions + # via opentelemetry-api exceptiongroup==1.2.2 # via # -c ./ingest/../base.txt @@ -67,7 +61,7 @@ fsspec==2024.5.0 # via # -c ./ingest/../deps/constraints.txt # huggingface-hub -google-auth==2.32.0 +google-auth==2.33.0 # via kubernetes googleapis-common-protos==1.63.2 # via opentelemetry-exporter-otlp-proto-grpc @@ -80,16 +74,8 @@ h11==0.14.0 # -c ./ingest/../base.txt # httpcore # uvicorn -httpcore==1.0.5 - # via - # -c ./ingest/../base.txt - # httpx httptools==0.6.1 # via uvicorn -httpx==0.27.0 - # via - # -c ./ingest/../base.txt - # chromadb huggingface-hub==0.24.5 # via tokenizers humanfriendly==10.0 @@ -100,18 +86,12 @@ idna==3.7 # anyio # httpx # requests -importlib-metadata==7.1.0 - # via - # -c ./ingest/../deps/constraints.txt - # -r ./ingest/chroma.in - # build - # opentelemetry-api +importlib-metadata==8.2.0 + # via -r ./ingest/chroma.in importlib-resources==6.4.0 # via chromadb kubernetes==30.1.0 # via chromadb -mmh3==4.1.0 - # via chromadb monotonic==1.6 # via posthog mpmath==1.3.0 @@ -128,46 +108,21 @@ oauthlib==3.2.2 # requests-oauthlib onnxruntime==1.18.1 # via chromadb -opentelemetry-api==1.26.0 +opentelemetry-api==1.16.0 # via # chromadb # opentelemetry-exporter-otlp-proto-grpc - # opentelemetry-instrumentation - # opentelemetry-instrumentation-asgi - # opentelemetry-instrumentation-fastapi # opentelemetry-sdk - # opentelemetry-semantic-conventions -opentelemetry-exporter-otlp-proto-common==1.26.0 - # via opentelemetry-exporter-otlp-proto-grpc -opentelemetry-exporter-otlp-proto-grpc==1.26.0 +opentelemetry-exporter-otlp-proto-grpc==1.16.0 # via chromadb -opentelemetry-instrumentation==0.47b0 - # via - # opentelemetry-instrumentation-asgi - # opentelemetry-instrumentation-fastapi -opentelemetry-instrumentation-asgi==0.47b0 - # via opentelemetry-instrumentation-fastapi -opentelemetry-instrumentation-fastapi==0.47b0 - # via chromadb -opentelemetry-proto==1.26.0 - # via - # opentelemetry-exporter-otlp-proto-common - # opentelemetry-exporter-otlp-proto-grpc -opentelemetry-sdk==1.26.0 +opentelemetry-proto==1.16.0 + # via opentelemetry-exporter-otlp-proto-grpc +opentelemetry-sdk==1.16.0 # via # chromadb # opentelemetry-exporter-otlp-proto-grpc -opentelemetry-semantic-conventions==0.47b0 - # via - # opentelemetry-instrumentation-asgi - # opentelemetry-instrumentation-fastapi - # opentelemetry-sdk -opentelemetry-util-http==0.47b0 - # via - # opentelemetry-instrumentation-asgi - # opentelemetry-instrumentation-fastapi -orjson==3.10.6 - # via chromadb +opentelemetry-semantic-conventions==0.37b0 + # via opentelemetry-sdk overrides==7.7.0 # via chromadb packaging==23.2 @@ -185,6 +140,8 @@ protobuf==4.23.4 # googleapis-common-protos # onnxruntime # opentelemetry-proto +pulsar-client==3.5.0 + # via chromadb pyasn1==0.6.0 # via # pyasn1-modules @@ -199,8 +156,6 @@ pydantic-core==2.20.1 # via pydantic pypika==0.48.9 # via chromadb -pyproject-hooks==1.1.0 - # via build python-dateutil==2.9.0.post0 # via # -c ./ingest/../base.txt @@ -217,6 +172,7 @@ pyyaml==6.0.2 requests==2.32.3 # via # -c ./ingest/../base.txt + # chromadb # huggingface-hub # kubernetes # posthog @@ -246,8 +202,6 @@ tenacity==8.5.0 # chromadb tokenizers==0.19.1 # via chromadb -tomli==2.0.1 - # via build tqdm==4.66.5 # via # -c ./ingest/../base.txt @@ -260,7 +214,6 @@ typer==0.9.0 typing-extensions==4.12.2 # via # -c ./ingest/../base.txt - # asgiref # chromadb # fastapi # huggingface-hub @@ -280,7 +233,7 @@ uvicorn[standard]==0.30.5 # via chromadb uvloop==0.19.0 # via uvicorn -watchfiles==0.22.0 +watchfiles==0.23.0 # via uvicorn websocket-client==1.8.0 # via kubernetes diff --git a/requirements/ingest/databricks-volumes.txt b/requirements/ingest/databricks-volumes.txt index 171b79113c..70807f674f 100644 --- a/requirements/ingest/databricks-volumes.txt +++ b/requirements/ingest/databricks-volumes.txt @@ -17,7 +17,7 @@ charset-normalizer==3.3.2 # requests databricks-sdk==0.29.0 # via -r ./ingest/databricks-volumes.in -google-auth==2.32.0 +google-auth==2.33.0 # via databricks-sdk idna==3.7 # via diff --git a/requirements/ingest/discord.txt b/requirements/ingest/discord.txt index 9c93e66738..4ee37f95a0 100644 --- a/requirements/ingest/discord.txt +++ b/requirements/ingest/discord.txt @@ -4,7 +4,7 @@ # # pip-compile ./ingest/discord.in # -aiohappyeyeballs==2.3.4 +aiohappyeyeballs==2.3.5 # via aiohttp aiohttp==3.10.1 # via discord-py diff --git a/requirements/ingest/elasticsearch.txt b/requirements/ingest/elasticsearch.txt index 0b15f8301e..ccc3d37788 100644 --- a/requirements/ingest/elasticsearch.txt +++ b/requirements/ingest/elasticsearch.txt @@ -4,7 +4,7 @@ # # pip-compile ./ingest/elasticsearch.in # -aiohappyeyeballs==2.3.4 +aiohappyeyeballs==2.3.5 # via aiohttp aiohttp==3.10.1 # via elasticsearch diff --git a/requirements/ingest/embed-aws-bedrock.txt b/requirements/ingest/embed-aws-bedrock.txt index d8fb5e5de2..f87c7ea75e 100644 --- a/requirements/ingest/embed-aws-bedrock.txt +++ b/requirements/ingest/embed-aws-bedrock.txt @@ -4,7 +4,7 @@ # # pip-compile ./ingest/embed-aws-bedrock.in # -aiohappyeyeballs==2.3.4 +aiohappyeyeballs==2.3.5 # via aiohttp aiohttp==3.10.1 # via diff --git a/requirements/ingest/embed-octoai.txt b/requirements/ingest/embed-octoai.txt index f1a39e8634..c2f58b68f7 100644 --- a/requirements/ingest/embed-octoai.txt +++ b/requirements/ingest/embed-octoai.txt @@ -49,7 +49,7 @@ idna==3.7 # requests jiter==0.5.0 # via openai -openai==1.40.0 +openai==1.40.1 # via -r ./ingest/embed-octoai.in pydantic==2.8.2 # via openai diff --git a/requirements/ingest/embed-openai.txt b/requirements/ingest/embed-openai.txt index 09d646b8db..91beb70f6d 100644 --- a/requirements/ingest/embed-openai.txt +++ b/requirements/ingest/embed-openai.txt @@ -59,7 +59,7 @@ langchain-openai==0.1.20 # via -r ./ingest/embed-openai.in langsmith==0.1.98 # via langchain-core -openai==1.40.0 +openai==1.40.1 # via langchain-openai orjson==3.10.6 # via langsmith diff --git a/requirements/ingest/embed-vertexai.txt b/requirements/ingest/embed-vertexai.txt index 8d810610df..035d0beb29 100644 --- a/requirements/ingest/embed-vertexai.txt +++ b/requirements/ingest/embed-vertexai.txt @@ -4,7 +4,7 @@ # # pip-compile ./ingest/embed-vertexai.in # -aiohappyeyeballs==2.3.4 +aiohappyeyeballs==2.3.5 # via aiohttp aiohttp==3.10.1 # via @@ -48,7 +48,7 @@ google-api-core[grpc]==2.19.1 # google-cloud-core # google-cloud-resource-manager # google-cloud-storage -google-auth==2.32.0 +google-auth==2.33.0 # via # google-api-core # google-cloud-aiplatform @@ -66,7 +66,7 @@ google-cloud-core==2.4.1 # google-cloud-storage google-cloud-resource-manager==1.12.5 # via google-cloud-aiplatform -google-cloud-storage==2.18.0 +google-cloud-storage==2.18.1 # via # google-cloud-aiplatform # langchain-google-vertexai diff --git a/requirements/ingest/embed-voyageai.txt b/requirements/ingest/embed-voyageai.txt index 73605cc1d7..6db8f82e0c 100644 --- a/requirements/ingest/embed-voyageai.txt +++ b/requirements/ingest/embed-voyageai.txt @@ -4,7 +4,7 @@ # # pip-compile ./ingest/embed-voyageai.in # -aiohappyeyeballs==2.3.4 +aiohappyeyeballs==2.3.5 # via aiohttp aiohttp==3.10.1 # via diff --git a/requirements/ingest/gcs.txt b/requirements/ingest/gcs.txt index 8642c88571..5e423387a5 100644 --- a/requirements/ingest/gcs.txt +++ b/requirements/ingest/gcs.txt @@ -4,7 +4,7 @@ # # pip-compile ./ingest/gcs.in # -aiohappyeyeballs==2.3.4 +aiohappyeyeballs==2.3.5 # via aiohttp aiohttp==3.10.1 # via gcsfs @@ -48,7 +48,7 @@ google-api-core==2.19.1 # via # google-cloud-core # google-cloud-storage -google-auth==2.32.0 +google-auth==2.33.0 # via # gcsfs # google-api-core @@ -59,7 +59,7 @@ google-auth-oauthlib==1.2.1 # via gcsfs google-cloud-core==2.4.1 # via google-cloud-storage -google-cloud-storage==2.18.0 +google-cloud-storage==2.18.1 # via gcsfs google-crc32c==1.5.0 # via diff --git a/requirements/ingest/google-drive.txt b/requirements/ingest/google-drive.txt index 9f7e8a29e9..4193eecb2f 100644 --- a/requirements/ingest/google-drive.txt +++ b/requirements/ingest/google-drive.txt @@ -19,7 +19,7 @@ google-api-core==2.19.1 # via google-api-python-client google-api-python-client==2.140.0 # via -r ./ingest/google-drive.in -google-auth==2.32.0 +google-auth==2.33.0 # via # google-api-core # google-api-python-client diff --git a/requirements/ingest/s3.txt b/requirements/ingest/s3.txt index f599de5a4c..6a4d0a0f74 100644 --- a/requirements/ingest/s3.txt +++ b/requirements/ingest/s3.txt @@ -6,7 +6,7 @@ # aiobotocore==2.12.3 # via s3fs -aiohappyeyeballs==2.3.4 +aiohappyeyeballs==2.3.5 # via aiohttp aiohttp==3.10.1 # via diff --git a/requirements/ingest/salesforce.txt b/requirements/ingest/salesforce.txt index 5aa0ef27de..29114da44d 100644 --- a/requirements/ingest/salesforce.txt +++ b/requirements/ingest/salesforce.txt @@ -29,7 +29,7 @@ lxml==5.2.2 # via # -c ./ingest/../base.txt # zeep -more-itertools==10.3.0 +more-itertools==10.4.0 # via simple-salesforce platformdirs==3.10.0 # via diff --git a/requirements/ingest/singlestore.txt b/requirements/ingest/singlestore.txt index 84f3cbb14f..b3ea506061 100644 --- a/requirements/ingest/singlestore.txt +++ b/requirements/ingest/singlestore.txt @@ -19,10 +19,8 @@ idna==3.7 # via # -c ./ingest/../base.txt # requests -importlib-metadata==7.1.0 - # via - # -c ./ingest/../deps/constraints.txt - # build +importlib-metadata==8.2.0 + # via build packaging==23.2 # via # -c ./ingest/../base.txt From 1408302ba106d160c357959d66f1a25a13c9965e Mon Sep 17 00:00:00 2001 From: John <43506685+Coniferish@users.noreply.github.com> Date: Wed, 7 Aug 2024 11:51:28 -0400 Subject: [PATCH 2/2] bump botocore pin to match aiobotocore --- requirements/deps/constraints.txt | 2 +- requirements/ingest/embed-aws-bedrock.txt | 4 ++-- requirements/ingest/s3.txt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements/deps/constraints.txt b/requirements/deps/constraints.txt index 8a064c9b56..7da1129d1d 100644 --- a/requirements/deps/constraints.txt +++ b/requirements/deps/constraints.txt @@ -46,7 +46,7 @@ packaging<24.0 urllib3<1.27 # TODO: Constriant due to aiobotocore, remove when that gets updates: -botocore<1.34.52 +botocore<1.34.132 # NOTE(jennings): pinned due to later versions not supporting api_key_auth in UnstructuredClient unstructured-client>=0.15.1 diff --git a/requirements/ingest/embed-aws-bedrock.txt b/requirements/ingest/embed-aws-bedrock.txt index f87c7ea75e..2c97a997d1 100644 --- a/requirements/ingest/embed-aws-bedrock.txt +++ b/requirements/ingest/embed-aws-bedrock.txt @@ -20,9 +20,9 @@ async-timeout==4.0.3 # langchain attrs==24.2.0 # via aiohttp -boto3==1.34.51 +boto3==1.34.131 # via -r ./ingest/embed-aws-bedrock.in -botocore==1.34.51 +botocore==1.34.131 # via # -c ./ingest/../deps/constraints.txt # boto3 diff --git a/requirements/ingest/s3.txt b/requirements/ingest/s3.txt index 6a4d0a0f74..418f348375 100644 --- a/requirements/ingest/s3.txt +++ b/requirements/ingest/s3.txt @@ -4,7 +4,7 @@ # # pip-compile ./ingest/s3.in # -aiobotocore==2.12.3 +aiobotocore==2.13.1 # via s3fs aiohappyeyeballs==2.3.5 # via aiohttp @@ -20,7 +20,7 @@ async-timeout==4.0.3 # via aiohttp attrs==24.2.0 # via aiohttp -botocore==1.34.51 +botocore==1.34.131 # via # -c ./ingest/../deps/constraints.txt # aiobotocore