From be7278f19630c69dcceb9ba059a4a9c0068dffe5 Mon Sep 17 00:00:00 2001 From: John <43506685+Coniferish@users.noreply.github.com> Date: Sun, 18 Aug 2024 17:20:02 -0400 Subject: [PATCH 1/8] remove pyparsing constraint --- requirements/deps/constraints.txt | 2 -- requirements/extra-paddleocr.txt | 6 ++---- requirements/extra-pdf-image.txt | 6 ++---- requirements/ingest/google-drive.txt | 6 ++---- 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/requirements/deps/constraints.txt b/requirements/deps/constraints.txt index 6bd153fb89..8c7efc2977 100644 --- a/requirements/deps/constraints.txt +++ b/requirements/deps/constraints.txt @@ -11,8 +11,6 @@ wheel>=0.38.1 # NOTE(robinson) - The following pins are to address # vulnerabilities in dependency scans certifi>=2023.7.22 -# From pycocotools in local-inference -pyparsing<3.1.0 scipy<1.11.4 IPython<8.13 # NOTE(alan) Pinned to avoid error that occurs with 2.4.3: diff --git a/requirements/extra-paddleocr.txt b/requirements/extra-paddleocr.txt index b2159d1c2f..ecfb1bd1ca 100644 --- a/requirements/extra-paddleocr.txt +++ b/requirements/extra-paddleocr.txt @@ -148,10 +148,8 @@ protobuf==4.23.4 # paddlepaddle pyclipper==1.3.0.post5 # via unstructured-paddleocr -pyparsing==3.0.9 - # via - # -c ././deps/constraints.txt - # matplotlib +pyparsing==3.1.2 + # via matplotlib python-dateutil==2.9.0.post0 # via # -c ./base.txt diff --git a/requirements/extra-pdf-image.txt b/requirements/extra-pdf-image.txt index e80f4762c2..cd17de2879 100644 --- a/requirements/extra-pdf-image.txt +++ b/requirements/extra-pdf-image.txt @@ -192,10 +192,8 @@ pycocotools==2.0.8 # effdet pycparser==2.22 # via cffi -pyparsing==3.0.9 - # via - # -c ././deps/constraints.txt - # matplotlib +pyparsing==3.1.2 + # via matplotlib pypdf==4.3.1 # via # -c ./base.txt diff --git a/requirements/ingest/google-drive.txt b/requirements/ingest/google-drive.txt index 774bef8251..0199e2d489 100644 --- a/requirements/ingest/google-drive.txt +++ b/requirements/ingest/google-drive.txt @@ -50,10 +50,8 @@ pyasn1==0.6.0 # rsa pyasn1-modules==0.4.0 # via google-auth -pyparsing==3.0.9 - # via - # -c ./ingest/../deps/constraints.txt - # httplib2 +pyparsing==3.1.2 + # via httplib2 requests==2.32.3 # via # -c ./ingest/../base.txt From d92c0086971609f6cce61077ce89d5dbdcf193fc Mon Sep 17 00:00:00 2001 From: John <43506685+Coniferish@users.noreply.github.com> Date: Sun, 18 Aug 2024 17:45:57 -0400 Subject: [PATCH 2/8] add grpcio constraint --- requirements/deps/constraints.txt | 1 + requirements/dev.txt | 167 ++++++++---------------------- requirements/test.txt | 72 ++++++++++--- 3 files changed, 107 insertions(+), 133 deletions(-) diff --git a/requirements/deps/constraints.txt b/requirements/deps/constraints.txt index 8c7efc2977..8391e33c8a 100644 --- a/requirements/deps/constraints.txt +++ b/requirements/deps/constraints.txt @@ -13,6 +13,7 @@ wheel>=0.38.1 certifi>=2023.7.22 scipy<1.11.4 IPython<8.13 +grpcio>=1.65.5 # NOTE(alan) Pinned to avoid error that occurs with 2.4.3: # AttributeError: 'ResourcePath' object has no attribute 'collection' Office365-REST-Python-Client<2.4.3 diff --git a/requirements/dev.txt b/requirements/dev.txt index 835470e220..9c35a1c60a 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -8,29 +8,24 @@ anyio==3.7.1 # via # -c ././deps/constraints.txt # -c ./base.txt - # httpx + # -c ./test.txt # jupyter-server appnope==0.1.4 # via # ipykernel # ipython argon2-cffi==23.1.0 - # via jupyter-server + # via + # jupyter-server + # notebook argon2-cffi-bindings==21.2.0 # via argon2-cffi -arrow==1.3.0 - # via isoduration asttokens==2.4.1 # via stack-data -async-lru==2.0.4 - # via jupyterlab attrs==24.2.0 # via # -c ./test.txt # jsonschema - # referencing -babel==2.16.0 - # via jupyterlab-server backcall==0.2.0 # via ipython beautifulsoup4==4.12.3 @@ -41,23 +36,10 @@ bleach==6.1.0 # via nbconvert build==1.2.1 # via pip-tools -certifi==2024.7.4 - # via - # -c ././deps/constraints.txt - # -c ./base.txt - # -c ./test.txt - # httpcore - # httpx - # requests cffi==1.17.0 # via argon2-cffi-bindings cfgv==3.4.0 # via pre-commit -charset-normalizer==3.3.2 - # via - # -c ./base.txt - # -c ./test.txt - # requests click==8.1.7 # via # -c ./base.txt @@ -75,6 +57,8 @@ defusedxml==0.7.1 # via nbconvert distlib==0.3.8 # via virtualenv +entrypoints==0.4 + # via jupyter-client exceptiongroup==1.2.2 # via # -c ./base.txt @@ -86,20 +70,6 @@ fastjsonschema==2.20.0 # via nbformat filelock==3.15.4 # via virtualenv -fqdn==1.5.1 - # via jsonschema -h11==0.14.0 - # via - # -c ./base.txt - # httpcore -httpcore==1.0.5 - # via - # -c ./base.txt - # httpx -httpx==0.27.0 - # via - # -c ./base.txt - # jupyterlab identify==2.6.0 # via pre-commit idna==3.7 @@ -107,22 +77,16 @@ idna==3.7 # -c ./base.txt # -c ./test.txt # anyio - # httpx - # jsonschema - # requests importlib-metadata==8.2.0 # via # build - # jupyter-client - # jupyter-lsp - # jupyterlab - # jupyterlab-server # nbconvert ipykernel==6.29.5 # via # jupyter # jupyter-console - # jupyterlab + # nbclassic + # notebook # qtconsole ipython==8.12.3 # via @@ -131,40 +95,33 @@ ipython==8.12.3 # ipykernel # ipywidgets # jupyter-console +ipython-genutils==0.2.0 + # via + # nbclassic + # notebook ipywidgets==8.1.3 # via jupyter -isoduration==20.11.0 - # via jsonschema jedi==0.19.1 # via ipython jinja2==3.1.4 # via # jupyter-server - # jupyterlab - # jupyterlab-server # nbconvert -json5==0.9.25 - # via jupyterlab-server -jsonpointer==3.0.0 - # via jsonschema -jsonschema[format-nongpl]==4.23.0 + # notebook +jsonschema[format-nongpl]==3.2.0 # via # -c ./test.txt # jupyter-events - # jupyterlab-server # nbformat -jsonschema-specifications==2023.12.1 - # via - # -c ./test.txt - # jsonschema jupyter==1.0.0 # via -r ./dev.in -jupyter-client==8.6.2 +jupyter-client==7.4.9 # via # ipykernel # jupyter-console # jupyter-server # nbclient + # notebook # qtconsole jupyter-console==6.6.3 # via jupyter @@ -175,32 +132,19 @@ jupyter-core==5.7.2 # jupyter-client # jupyter-console # jupyter-server - # jupyterlab # nbclient # nbconvert # nbformat + # notebook # qtconsole -jupyter-events==0.10.0 +jupyter-events==0.6.3 # via jupyter-server -jupyter-lsp==2.2.5 - # via jupyterlab -jupyter-server==2.14.2 - # via - # jupyter-lsp - # jupyterlab - # jupyterlab-server - # notebook - # notebook-shim +jupyter-server==2.10.0 + # via notebook-shim jupyter-server-terminals==0.5.3 # via jupyter-server -jupyterlab==4.2.4 - # via notebook jupyterlab-pygments==0.3.0 # via nbconvert -jupyterlab-server==2.27.3 - # via - # jupyterlab - # notebook jupyterlab-widgets==3.0.11 # via ipywidgets markupsafe==2.1.5 @@ -213,28 +157,35 @@ matplotlib-inline==0.1.7 # ipython mistune==3.0.2 # via nbconvert +nbclassic==1.1.0 + # via notebook nbclient==0.10.0 # via nbconvert nbconvert==7.16.4 # via # jupyter # jupyter-server + # notebook nbformat==5.10.4 # via # jupyter-server # nbclient # nbconvert + # notebook nest-asyncio==1.6.0 # via # -c ./base.txt # ipykernel + # jupyter-client + # nbclassic + # notebook nodeenv==1.9.1 # via pre-commit -notebook==7.2.1 +notebook==6.5.7 # via jupyter notebook-shim==0.2.4 # via - # jupyterlab + # nbclassic # notebook overrides==7.7.0 # via jupyter-server @@ -246,8 +197,6 @@ packaging==23.2 # build # ipykernel # jupyter-server - # jupyterlab - # jupyterlab-server # nbconvert # qtconsole # qtpy @@ -270,7 +219,9 @@ platformdirs==3.10.0 pre-commit==3.8.0 # via -r ./dev.in prometheus-client==0.20.0 - # via jupyter-server + # via + # jupyter-server + # notebook prompt-toolkit==3.0.47 # via # ipython @@ -297,11 +248,14 @@ pyproject-hooks==1.1.0 # via # build # pip-tools +pyrsistent==0.20.0 + # via + # -c ./test.txt + # jsonschema python-dateutil==2.9.0.post0 # via # -c ./base.txt # -c ./test.txt - # arrow # jupyter-client python-json-logger==2.0.7 # via jupyter-events @@ -316,48 +270,33 @@ pyzmq==26.1.1 # jupyter-client # jupyter-console # jupyter-server + # notebook # qtconsole qtconsole==5.5.2 # via jupyter qtpy==2.4.1 # via qtconsole -referencing==0.35.1 - # via - # -c ./test.txt - # jsonschema - # jsonschema-specifications - # jupyter-events -requests==2.32.3 - # via - # -c ./base.txt - # -c ./test.txt - # jupyterlab-server rfc3339-validator==0.1.4 - # via - # jsonschema - # jupyter-events + # via jupyter-events rfc3986-validator==0.1.1 - # via - # jsonschema - # jupyter-events -rpds-py==0.20.0 - # via - # -c ./test.txt - # jsonschema - # referencing + # via jupyter-events send2trash==1.8.3 - # via jupyter-server + # via + # jupyter-server + # notebook six==1.16.0 # via # -c ./base.txt # -c ./test.txt # asttokens # bleach + # jsonschema # python-dateutil # rfc3339-validator sniffio==1.3.1 # via # -c ./base.txt + # -c ./test.txt # anyio # httpx soupsieve==2.6 @@ -370,20 +309,19 @@ terminado==0.18.1 # via # jupyter-server # jupyter-server-terminals + # notebook tinycss2==1.3.0 # via nbconvert tomli==2.0.1 # via # -c ./test.txt # build - # jupyterlab # pip-tools tornado==6.4.1 # via # ipykernel # jupyter-client # jupyter-server - # jupyterlab # notebook # terminado traitlets==5.14.3 @@ -397,34 +335,21 @@ traitlets==5.14.3 # jupyter-core # jupyter-events # jupyter-server - # jupyterlab # matplotlib-inline # nbclient # nbconvert # nbformat + # notebook # qtconsole -types-python-dateutil==2.9.0.20240316 - # via arrow typing-extensions==4.12.2 # via # -c ./base.txt # -c ./test.txt - # async-lru # ipython -uri-template==1.3.0 - # via jsonschema -urllib3==1.26.19 - # via - # -c ././deps/constraints.txt - # -c ./base.txt - # -c ./test.txt - # requests virtualenv==20.26.3 # via pre-commit wcwidth==0.2.13 # via prompt-toolkit -webcolors==24.8.0 - # via jsonschema webencodings==0.5.1 # via # bleach diff --git a/requirements/test.txt b/requirements/test.txt index f0d68496f5..9c217a5ba5 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -6,12 +6,15 @@ # annotated-types==0.7.0 # via pydantic +anyio==3.7.1 + # via + # -c ././deps/constraints.txt + # -c ./base.txt + # httpx appdirs==1.4.4 # via label-studio-tools attrs==24.2.0 - # via - # jsonschema - # referencing + # via jsonschema autoflake==2.3.1 # via -r ./test.in black==24.8.0 @@ -20,6 +23,8 @@ certifi==2024.7.4 # via # -c ././deps/constraints.txt # -c ./base.txt + # httpcore + # httpx # requests charset-normalizer==3.3.2 # via @@ -29,6 +34,7 @@ click==8.1.7 # via # -c ./base.txt # black + # nltk coverage[toml]==7.6.1 # via # -r ./test.in @@ -36,6 +42,7 @@ coverage[toml]==7.6.1 exceptiongroup==1.2.2 # via # -c ./base.txt + # anyio # pytest flake8==7.1.1 # via @@ -52,11 +59,19 @@ grpcio==1.64.3 idna==3.7 # via # -c ./base.txt + # anyio + # httpx # requests # yarl +ijson==3.3.0 + # via label-studio-sdk iniconfig==2.0.0 # via pytest -jsonschema==4.23.0 +joblib==1.4.2 + # via + # -c ./base.txt + # nltk +jsonschema==3.2.0 # via label-studio-sdk jsonschema-specifications==2023.12.1 # via jsonschema @@ -72,7 +87,6 @@ lxml==5.3.0 # via # -c ./base.txt # label-studio-sdk - # label-studio-tools mccabe==0.7.0 # via flake8 multidict==6.0.5 @@ -84,14 +98,26 @@ mypy-extensions==1.0.0 # -c ./base.txt # black # mypy +nltk==3.9.1 + # via + # -c ./base.txt + # label-studio-sdk +numpy==1.26.4 + # via + # -c ./base.txt + # pandas packaging==23.2 # via # -c ././deps/constraints.txt # -c ./base.txt # black # pytest +pandas==2.2.2 + # via label-studio-sdk pathspec==0.12.1 # via black +pillow==10.4.0 + # via label-studio-sdk platformdirs==3.10.0 # via # -c ././deps/constraints.txt @@ -112,6 +138,8 @@ pyflakes==3.2.0 # via # autoflake # flake8 +pyrsistent==0.20.0 + # via jsonschema pytest==8.3.2 # via # pytest-cov @@ -124,20 +152,22 @@ python-dateutil==2.9.0.post0 # via # -c ./base.txt # freezegun + # pandas +pytz==2024.1 + # via pandas pyyaml==6.0.2 # via vcrpy -referencing==0.35.1 +regex==2024.7.24 # via - # jsonschema - # jsonschema-specifications + # -c ./base.txt + # nltk requests==2.32.3 # via # -c ./base.txt # label-studio-sdk -rpds-py==0.20.0 - # via - # jsonschema - # referencing + # requests-mock +requests-mock==1.12.1 + # via label-studio-sdk ruff==0.4.10 # via -r ./test.in semantic-version==2.10.0 @@ -145,7 +175,13 @@ semantic-version==2.10.0 six==1.16.0 # via # -c ./base.txt + # jsonschema # python-dateutil +sniffio==1.3.1 + # via + # -c ./base.txt + # anyio + # httpx toml==0.10.2 # via liccheck tomli==2.0.1 @@ -155,6 +191,10 @@ tomli==2.0.1 # coverage # mypy # pytest +tqdm==4.66.5 + # via + # -c ./base.txt + # nltk types-click==7.1.8 # via -r ./test.in types-markdown==3.6.0.20240316 @@ -169,9 +209,14 @@ typing-extensions==4.12.2 # via # -c ./base.txt # black + # label-studio-sdk # mypy # pydantic # pydantic-core +tzdata==2024.1 + # via pandas +ujson==5.10.0 + # via label-studio-sdk urllib3==1.26.19 # via # -c ././deps/constraints.txt @@ -189,3 +234,6 @@ xmljson==0.2.1 # via label-studio-sdk yarl==1.9.4 # via vcrpy + +# The following packages are considered to be unsafe in a requirements file: +# setuptools From e1c91aa194de779ad7aba3f0ceccf262ef30b0b3 Mon Sep 17 00:00:00 2001 From: John <43506685+Coniferish@users.noreply.github.com> Date: Mon, 19 Aug 2024 11:28:09 -0400 Subject: [PATCH 3/8] type hinting --- test_unstructured/staging/test_label_studio.py | 16 ++++++++++------ unstructured/staging/label_studio.py | 4 ++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/test_unstructured/staging/test_label_studio.py b/test_unstructured/staging/test_label_studio.py index 71b24cd6bd..6d5382e8c7 100644 --- a/test_unstructured/staging/test_label_studio.py +++ b/test_unstructured/staging/test_label_studio.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import logging import re @@ -6,7 +8,7 @@ from label_studio_sdk.client import Client from test_unstructured.unit_utils import assign_hash_ids -from unstructured.documents.elements import NarrativeText, Title +from unstructured.documents.elements import Element, NarrativeText, Title from unstructured.staging import label_studio @@ -19,7 +21,9 @@ def elements(): "test_unstructured/vcr_fixtures/cassettes/label_studio_upload.yaml", allow_playback_repeats=True, ) -def test_upload_label_studio_data_with_sdk(caplog, elements): +def test_upload_label_studio_data_with_sdk( + caplog: pytest.LogCaptureFixture, elements: list[Element] +): """ Testing Instructions ==================== @@ -69,7 +73,7 @@ def test_upload_label_studio_data_with_sdk(caplog, elements): assert bool(success_posting_tasks_status.search(caplog.text)) -def test_convert_to_label_studio_data(elements): +def test_convert_to_label_studio_data(elements: list[Element]): label_studio_data = label_studio.stage_for_label_studio(elements) assert label_studio_data[0]["data"]["text"] == "Title 1" @@ -79,13 +83,13 @@ def test_convert_to_label_studio_data(elements): assert "ref_id" in label_studio_data[1]["data"] -def test_specify_text_name(elements): +def test_specify_text_name(elements: list[Element]): label_studio_data = label_studio.stage_for_label_studio(elements, text_field="random_text") assert "random_text" in label_studio_data[0]["data"] assert label_studio_data[0]["data"]["random_text"] == "Title 1" -def test_specify_id_name(elements): +def test_specify_id_name(elements: list[Element]): label_studio_data = label_studio.stage_for_label_studio(elements, id_field="random_id") assert "random_id" in label_studio_data[0]["data"] @@ -129,7 +133,7 @@ def test_created_annotation(): (1.25, True, ValueError), ], ) -def test_init_prediction(score, raises, exception): +def test_init_prediction(score: float | None, raises: bool, exception: Exception | None): result = [ label_studio.LabelStudioResult( type="choices", diff --git a/unstructured/staging/label_studio.py b/unstructured/staging/label_studio.py index c94fe4352f..407edcf386 100644 --- a/unstructured/staging/label_studio.py +++ b/unstructured/staging/label_studio.py @@ -2,7 +2,7 @@ from dataclasses import dataclass from typing import Any, Dict, List, Optional, Union -from unstructured.documents.elements import Text +from unstructured.documents.elements import Element LABEL_STUDIO_TYPE = List[Dict[str, Dict[str, str]]] @@ -110,7 +110,7 @@ def __post_init__(self): def stage_for_label_studio( - elements: List[Text], + elements: List[Element], annotations: Optional[List[List[LabelStudioAnnotation]]] = None, predictions: Optional[List[List[LabelStudioPrediction]]] = None, text_field: str = "text", From 5a912011ea423450fefec72d69d0e2144d0716ea Mon Sep 17 00:00:00 2001 From: John <43506685+Coniferish@users.noreply.github.com> Date: Mon, 19 Aug 2024 11:34:33 -0400 Subject: [PATCH 4/8] update label_studio_sdk client import --- test_unstructured/staging/test_label_studio.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_unstructured/staging/test_label_studio.py b/test_unstructured/staging/test_label_studio.py index 6d5382e8c7..6d3be972b7 100644 --- a/test_unstructured/staging/test_label_studio.py +++ b/test_unstructured/staging/test_label_studio.py @@ -5,7 +5,7 @@ import pytest import vcr -from label_studio_sdk.client import Client +from label_studio_sdk import Client from test_unstructured.unit_utils import assign_hash_ids from unstructured.documents.elements import Element, NarrativeText, Title From 84b1e69a3e025f5795e8351f02b4101422e1b31f Mon Sep 17 00:00:00 2001 From: John <43506685+Coniferish@users.noreply.github.com> Date: Tue, 20 Aug 2024 15:40:51 -0400 Subject: [PATCH 5/8] update dependencies after rebase --- requirements/base.txt | 2 +- requirements/deps/constraints.txt | 3 -- requirements/dev.txt | 3 +- requirements/extra-markdown.txt | 2 +- requirements/extra-paddleocr.txt | 2 +- requirements/extra-pdf-image.txt | 4 +-- requirements/huggingface.txt | 2 +- requirements/ingest/azure.txt | 4 +-- requirements/ingest/chroma.txt | 6 ++-- requirements/ingest/clarifai.txt | 4 +-- requirements/ingest/delta-table.txt | 2 +- requirements/ingest/discord.txt | 4 +-- requirements/ingest/elasticsearch.txt | 4 +-- requirements/ingest/embed-aws-bedrock.txt | 38 +++++++++++++++++--- requirements/ingest/embed-huggingface.txt | 34 ++++++++++++++++-- requirements/ingest/embed-octoai.txt | 2 +- requirements/ingest/embed-openai.txt | 5 +-- requirements/ingest/embed-vertexai.txt | 42 +++++++++++++++++++---- requirements/ingest/embed-voyageai.txt | 36 +++++++++++++++++-- requirements/ingest/gcs.txt | 4 +-- requirements/ingest/google-drive.txt | 2 +- requirements/ingest/opensearch.txt | 3 +- requirements/ingest/qdrant.txt | 2 +- requirements/ingest/s3.txt | 4 +-- requirements/ingest/singlestore.txt | 2 +- requirements/ingest/weaviate.txt | 2 +- requirements/test.txt | 26 ++++++++------ 27 files changed, 183 insertions(+), 61 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index cc53655884..835d9a742d 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -59,7 +59,7 @@ langdetect==1.0.9 # via -r ./base.in lxml==5.3.0 # via -r ./base.in -marshmallow==3.21.3 +marshmallow==3.22.0 # via # dataclasses-json # unstructured-client diff --git a/requirements/deps/constraints.txt b/requirements/deps/constraints.txt index 8391e33c8a..6424eac907 100644 --- a/requirements/deps/constraints.txt +++ b/requirements/deps/constraints.txt @@ -55,6 +55,3 @@ fsspec==2024.5.0 wrapt>=1.14.0 langchain-community>=0.2.5 - -grpcio==1.64.3 -label-studio-sdk==0.0.34 diff --git a/requirements/dev.txt b/requirements/dev.txt index 9c35a1c60a..cc17624311 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -77,7 +77,7 @@ idna==3.7 # -c ./base.txt # -c ./test.txt # anyio -importlib-metadata==8.2.0 +importlib-metadata==8.4.0 # via # build # nbconvert @@ -298,7 +298,6 @@ sniffio==1.3.1 # -c ./base.txt # -c ./test.txt # anyio - # httpx soupsieve==2.6 # via # -c ./base.txt diff --git a/requirements/extra-markdown.txt b/requirements/extra-markdown.txt index 1f36f6c1b7..7a19cc2b2f 100644 --- a/requirements/extra-markdown.txt +++ b/requirements/extra-markdown.txt @@ -4,7 +4,7 @@ # # pip-compile ./extra-markdown.in # -importlib-metadata==8.2.0 +importlib-metadata==8.4.0 # via markdown markdown==3.7 # via -r ./extra-markdown.in diff --git a/requirements/extra-paddleocr.txt b/requirements/extra-paddleocr.txt index ecfb1bd1ca..2c2366744f 100644 --- a/requirements/extra-paddleocr.txt +++ b/requirements/extra-paddleocr.txt @@ -174,7 +174,7 @@ scipy==1.11.3 # -c ././deps/constraints.txt # imgaug # scikit-image -shapely==2.0.5 +shapely==2.0.6 # via # imgaug # unstructured-paddleocr diff --git a/requirements/extra-pdf-image.txt b/requirements/extra-pdf-image.txt index cd17de2879..2175ae859d 100644 --- a/requirements/extra-pdf-image.txt +++ b/requirements/extra-pdf-image.txt @@ -58,7 +58,7 @@ googleapis-common-protos==1.63.2 # via # google-api-core # grpcio-status -grpcio==1.64.3 +grpcio==1.65.5 # via # -c ././deps/constraints.txt # google-api-core @@ -273,7 +273,7 @@ tqdm==4.66.5 # huggingface-hub # iopath # transformers -transformers==4.44.0 +transformers==4.44.1 # via unstructured-inference typing-extensions==4.12.2 # via diff --git a/requirements/huggingface.txt b/requirements/huggingface.txt index b0a8ede171..502369c86b 100644 --- a/requirements/huggingface.txt +++ b/requirements/huggingface.txt @@ -101,7 +101,7 @@ tqdm==4.66.5 # huggingface-hub # sacremoses # transformers -transformers==4.44.0 +transformers==4.44.1 # via -r ./huggingface.in typing-extensions==4.12.2 # via diff --git a/requirements/ingest/azure.txt b/requirements/ingest/azure.txt index 336733ff59..a48e41147b 100644 --- a/requirements/ingest/azure.txt +++ b/requirements/ingest/azure.txt @@ -6,9 +6,9 @@ # adlfs==2024.7.0 # via -r ./ingest/azure.in -aiohappyeyeballs==2.3.7 +aiohappyeyeballs==2.4.0 # via aiohttp -aiohttp==3.10.4 +aiohttp==3.10.5 # via adlfs aiosignal==1.3.1 # via aiohttp diff --git a/requirements/ingest/chroma.txt b/requirements/ingest/chroma.txt index 3bf8d33bd9..7e85c0815e 100644 --- a/requirements/ingest/chroma.txt +++ b/requirements/ingest/chroma.txt @@ -65,7 +65,7 @@ google-auth==2.34.0 # via kubernetes googleapis-common-protos==1.63.2 # via opentelemetry-exporter-otlp-proto-grpc -grpcio==1.64.3 +grpcio==1.65.5 # via # -c ./ingest/../deps/constraints.txt # chromadb @@ -87,7 +87,7 @@ idna==3.7 # anyio # httpx # requests -importlib-metadata==8.2.0 +importlib-metadata==8.4.0 # via -r ./ingest/chroma.in importlib-resources==6.4.3 # via chromadb @@ -240,7 +240,7 @@ watchfiles==0.23.0 # via uvicorn websocket-client==1.8.0 # via kubernetes -websockets==12.0 +websockets==13.0 # via uvicorn wrapt==1.16.0 # via diff --git a/requirements/ingest/clarifai.txt b/requirements/ingest/clarifai.txt index 7ec568b99b..1c9b15f5d5 100644 --- a/requirements/ingest/clarifai.txt +++ b/requirements/ingest/clarifai.txt @@ -15,13 +15,13 @@ charset-normalizer==3.3.2 # requests clarifai==10.7.0 # via -r ./ingest/clarifai.in -clarifai-grpc==10.7.2 +clarifai-grpc==10.7.1 # via clarifai contextlib2==21.6.0 # via schema googleapis-common-protos==1.63.2 # via clarifai-grpc -grpcio==1.64.3 +grpcio==1.65.5 # via # -c ./ingest/../deps/constraints.txt # clarifai-grpc diff --git a/requirements/ingest/delta-table.txt b/requirements/ingest/delta-table.txt index 84bfb7cdff..68ac94c100 100644 --- a/requirements/ingest/delta-table.txt +++ b/requirements/ingest/delta-table.txt @@ -4,7 +4,7 @@ # # pip-compile ./ingest/delta-table.in # -deltalake==0.19.0 +deltalake==0.19.1 # via -r ./ingest/delta-table.in fsspec==2024.5.0 # via diff --git a/requirements/ingest/discord.txt b/requirements/ingest/discord.txt index daccb6e9f3..1bf060390b 100644 --- a/requirements/ingest/discord.txt +++ b/requirements/ingest/discord.txt @@ -4,9 +4,9 @@ # # pip-compile ./ingest/discord.in # -aiohappyeyeballs==2.3.7 +aiohappyeyeballs==2.4.0 # via aiohttp -aiohttp==3.10.4 +aiohttp==3.10.5 # via discord-py aiosignal==1.3.1 # via aiohttp diff --git a/requirements/ingest/elasticsearch.txt b/requirements/ingest/elasticsearch.txt index ff3055c61a..0425b68307 100644 --- a/requirements/ingest/elasticsearch.txt +++ b/requirements/ingest/elasticsearch.txt @@ -4,9 +4,9 @@ # # pip-compile ./ingest/elasticsearch.in # -aiohappyeyeballs==2.3.7 +aiohappyeyeballs==2.4.0 # via aiohttp -aiohttp==3.10.4 +aiohttp==3.10.5 # via elasticsearch aiosignal==1.3.1 # via aiohttp diff --git a/requirements/ingest/embed-aws-bedrock.txt b/requirements/ingest/embed-aws-bedrock.txt index 9efe196583..d8be08387b 100644 --- a/requirements/ingest/embed-aws-bedrock.txt +++ b/requirements/ingest/embed-aws-bedrock.txt @@ -4,9 +4,9 @@ # # pip-compile ./ingest/embed-aws-bedrock.in # -aiohappyeyeballs==2.3.7 +aiohappyeyeballs==2.4.0 # via aiohttp -aiohttp==3.10.4 +aiohttp==3.10.5 # via # langchain # langchain-community @@ -14,6 +14,11 @@ aiosignal==1.3.1 # via aiohttp annotated-types==0.7.0 # via pydantic +anyio==3.7.1 + # via + # -c ./ingest/../base.txt + # -c ./ingest/../deps/constraints.txt + # httpx async-timeout==4.0.3 # via # aiohttp @@ -31,6 +36,8 @@ certifi==2024.7.4 # via # -c ./ingest/../base.txt # -c ./ingest/../deps/constraints.txt + # httpcore + # httpx # requests charset-normalizer==3.3.2 # via @@ -40,13 +47,31 @@ dataclasses-json==0.6.7 # via # -c ./ingest/../base.txt # langchain-community +exceptiongroup==1.2.2 + # via + # -c ./ingest/../base.txt + # anyio frozenlist==1.4.1 # via # aiohttp # aiosignal +h11==0.14.0 + # via + # -c ./ingest/../base.txt + # httpcore +httpcore==1.0.5 + # via + # -c ./ingest/../base.txt + # httpx +httpx==0.27.0 + # via + # -c ./ingest/../base.txt + # langsmith idna==3.7 # via # -c ./ingest/../base.txt + # anyio + # httpx # requests # yarl jmespath==1.0.1 @@ -70,12 +95,12 @@ langchain-core==0.2.33 # langchain-text-splitters langchain-text-splitters==0.2.2 # via langchain -langsmith==0.1.99 +langsmith==0.1.100 # via # langchain # langchain-community # langchain-core -marshmallow==3.21.3 +marshmallow==3.22.0 # via # -c ./ingest/../base.txt # dataclasses-json @@ -128,6 +153,11 @@ six==1.16.0 # via # -c ./ingest/../base.txt # python-dateutil +sniffio==1.3.1 + # via + # -c ./ingest/../base.txt + # anyio + # httpx sqlalchemy==2.0.32 # via # langchain diff --git a/requirements/ingest/embed-huggingface.txt b/requirements/ingest/embed-huggingface.txt index b91a513346..ea7b0c91a7 100644 --- a/requirements/ingest/embed-huggingface.txt +++ b/requirements/ingest/embed-huggingface.txt @@ -6,15 +6,26 @@ # annotated-types==0.7.0 # via pydantic +anyio==3.7.1 + # via + # -c ./ingest/../base.txt + # -c ./ingest/../deps/constraints.txt + # httpx certifi==2024.7.4 # via # -c ./ingest/../base.txt # -c ./ingest/../deps/constraints.txt + # httpcore + # httpx # requests charset-normalizer==3.3.2 # via # -c ./ingest/../base.txt # requests +exceptiongroup==1.2.2 + # via + # -c ./ingest/../base.txt + # anyio filelock==3.15.4 # via # huggingface-hub @@ -25,6 +36,18 @@ fsspec==2024.5.0 # -c ./ingest/../deps/constraints.txt # huggingface-hub # torch +h11==0.14.0 + # via + # -c ./ingest/../base.txt + # httpcore +httpcore==1.0.5 + # via + # -c ./ingest/../base.txt + # httpx +httpx==0.27.0 + # via + # -c ./ingest/../base.txt + # langsmith huggingface-hub==0.24.6 # via # langchain-huggingface @@ -34,6 +57,8 @@ huggingface-hub==0.24.6 idna==3.7 # via # -c ./ingest/../base.txt + # anyio + # httpx # requests jinja2==3.1.4 # via torch @@ -49,7 +74,7 @@ langchain-core==0.2.33 # via langchain-huggingface langchain-huggingface==0.0.3 # via -r ./ingest/embed-huggingface.in -langsmith==0.1.99 +langsmith==0.1.100 # via langchain-core markupsafe==2.1.5 # via jinja2 @@ -107,6 +132,11 @@ scipy==1.11.3 # sentence-transformers sentence-transformers==3.0.1 # via langchain-huggingface +sniffio==1.3.1 + # via + # -c ./ingest/../base.txt + # anyio + # httpx sympy==1.13.2 # via torch tenacity==8.5.0 @@ -128,7 +158,7 @@ tqdm==4.66.5 # huggingface-hub # sentence-transformers # transformers -transformers==4.44.0 +transformers==4.44.1 # via # langchain-huggingface # sentence-transformers diff --git a/requirements/ingest/embed-octoai.txt b/requirements/ingest/embed-octoai.txt index cac4f297ba..d3031a9c2f 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.41.0 +openai==1.41.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 619c83976e..09b2e9e3de 100644 --- a/requirements/ingest/embed-openai.txt +++ b/requirements/ingest/embed-openai.txt @@ -40,6 +40,7 @@ httpcore==1.0.5 httpx==0.27.0 # via # -c ./ingest/../base.txt + # langsmith # openai idna==3.7 # via @@ -57,9 +58,9 @@ langchain-core==0.2.33 # via langchain-openai langchain-openai==0.1.22 # via -r ./ingest/embed-openai.in -langsmith==0.1.99 +langsmith==0.1.100 # via langchain-core -openai==1.41.0 +openai==1.41.1 # via langchain-openai orjson==3.10.7 # via langsmith diff --git a/requirements/ingest/embed-vertexai.txt b/requirements/ingest/embed-vertexai.txt index e58a614bc9..aee188f540 100644 --- a/requirements/ingest/embed-vertexai.txt +++ b/requirements/ingest/embed-vertexai.txt @@ -4,9 +4,9 @@ # # pip-compile ./ingest/embed-vertexai.in # -aiohappyeyeballs==2.3.7 +aiohappyeyeballs==2.4.0 # via aiohttp -aiohttp==3.10.4 +aiohttp==3.10.5 # via # langchain # langchain-community @@ -14,6 +14,11 @@ aiosignal==1.3.1 # via aiohttp annotated-types==0.7.0 # via pydantic +anyio==3.7.1 + # via + # -c ./ingest/../base.txt + # -c ./ingest/../deps/constraints.txt + # httpx async-timeout==4.0.3 # via # aiohttp @@ -26,6 +31,8 @@ certifi==2024.7.4 # via # -c ./ingest/../base.txt # -c ./ingest/../deps/constraints.txt + # httpcore + # httpx # requests charset-normalizer==3.3.2 # via @@ -37,6 +44,10 @@ dataclasses-json==0.6.7 # langchain-community docstring-parser==0.16 # via google-cloud-aiplatform +exceptiongroup==1.2.2 + # via + # -c ./ingest/../base.txt + # anyio frozenlist==1.4.1 # via # aiohttp @@ -85,7 +96,7 @@ googleapis-common-protos[grpc]==1.63.2 # grpcio-status grpc-google-iam-v1==0.13.1 # via google-cloud-resource-manager -grpcio==1.64.3 +grpcio==1.65.5 # via # -c ./ingest/../deps/constraints.txt # google-api-core @@ -94,9 +105,23 @@ grpcio==1.64.3 # grpcio-status grpcio-status==1.62.3 # via google-api-core +h11==0.14.0 + # via + # -c ./ingest/../base.txt + # httpcore +httpcore==1.0.5 + # via + # -c ./ingest/../base.txt + # httpx +httpx==0.27.0 + # via + # -c ./ingest/../base.txt + # langsmith idna==3.7 # via # -c ./ingest/../base.txt + # anyio + # httpx # requests # yarl jsonpatch==1.33 @@ -121,12 +146,12 @@ langchain-google-vertexai==1.0.8 # via -r ./ingest/embed-vertexai.in langchain-text-splitters==0.2.2 # via langchain -langsmith==0.1.99 +langsmith==0.1.100 # via # langchain # langchain-community # langchain-core -marshmallow==3.21.3 +marshmallow==3.22.0 # via # -c ./ingest/../base.txt # dataclasses-json @@ -203,12 +228,17 @@ requests==2.32.3 # langsmith rsa==4.9 # via google-auth -shapely==2.0.5 +shapely==2.0.6 # via google-cloud-aiplatform six==1.16.0 # via # -c ./ingest/../base.txt # python-dateutil +sniffio==1.3.1 + # via + # -c ./ingest/../base.txt + # anyio + # httpx sqlalchemy==2.0.32 # via # langchain diff --git a/requirements/ingest/embed-voyageai.txt b/requirements/ingest/embed-voyageai.txt index 191f807ba6..4aaea71420 100644 --- a/requirements/ingest/embed-voyageai.txt +++ b/requirements/ingest/embed-voyageai.txt @@ -4,9 +4,9 @@ # # pip-compile ./ingest/embed-voyageai.in # -aiohappyeyeballs==2.3.7 +aiohappyeyeballs==2.4.0 # via aiohttp -aiohttp==3.10.4 +aiohttp==3.10.5 # via # langchain # voyageai @@ -16,6 +16,11 @@ aiosignal==1.3.1 # via aiohttp annotated-types==0.7.0 # via pydantic +anyio==3.7.1 + # via + # -c ./ingest/../base.txt + # -c ./ingest/../deps/constraints.txt + # httpx async-timeout==4.0.3 # via # aiohttp @@ -26,18 +31,38 @@ certifi==2024.7.4 # via # -c ./ingest/../base.txt # -c ./ingest/../deps/constraints.txt + # httpcore + # httpx # requests charset-normalizer==3.3.2 # via # -c ./ingest/../base.txt # requests +exceptiongroup==1.2.2 + # via + # -c ./ingest/../base.txt + # anyio frozenlist==1.4.1 # via # aiohttp # aiosignal +h11==0.14.0 + # via + # -c ./ingest/../base.txt + # httpcore +httpcore==1.0.5 + # via + # -c ./ingest/../base.txt + # httpx +httpx==0.27.0 + # via + # -c ./ingest/../base.txt + # langsmith idna==3.7 # via # -c ./ingest/../base.txt + # anyio + # httpx # requests # yarl jsonpatch==1.33 @@ -55,7 +80,7 @@ langchain-text-splitters==0.2.2 # via langchain langchain-voyageai==0.1.1 # via -r ./ingest/embed-voyageai.in -langsmith==0.1.99 +langsmith==0.1.100 # via # langchain # langchain-core @@ -92,6 +117,11 @@ requests==2.32.3 # langchain # langsmith # voyageai +sniffio==1.3.1 + # via + # -c ./ingest/../base.txt + # anyio + # httpx sqlalchemy==2.0.32 # via langchain tenacity==8.5.0 diff --git a/requirements/ingest/gcs.txt b/requirements/ingest/gcs.txt index ef9e619359..b89bbb1cd2 100644 --- a/requirements/ingest/gcs.txt +++ b/requirements/ingest/gcs.txt @@ -4,9 +4,9 @@ # # pip-compile ./ingest/gcs.in # -aiohappyeyeballs==2.3.7 +aiohappyeyeballs==2.4.0 # via aiohttp -aiohttp==3.10.4 +aiohttp==3.10.5 # via gcsfs aiosignal==1.3.1 # via aiohttp diff --git a/requirements/ingest/google-drive.txt b/requirements/ingest/google-drive.txt index 0199e2d489..de9017d162 100644 --- a/requirements/ingest/google-drive.txt +++ b/requirements/ingest/google-drive.txt @@ -17,7 +17,7 @@ charset-normalizer==3.3.2 # requests google-api-core==2.19.1 # via google-api-python-client -google-api-python-client==2.141.0 +google-api-python-client==2.142.0 # via -r ./ingest/google-drive.in google-auth==2.34.0 # via diff --git a/requirements/ingest/opensearch.txt b/requirements/ingest/opensearch.txt index 30cb02c299..d3b8298026 100644 --- a/requirements/ingest/opensearch.txt +++ b/requirements/ingest/opensearch.txt @@ -20,7 +20,7 @@ idna==3.7 # via # -c ./ingest/../base.txt # requests -opensearch-py==2.6.0 +opensearch-py==2.7.0 # via -r ./ingest/opensearch.in python-dateutil==2.9.0.post0 # via @@ -33,7 +33,6 @@ requests==2.32.3 six==1.16.0 # via # -c ./ingest/../base.txt - # opensearch-py # python-dateutil urllib3==1.26.19 # via diff --git a/requirements/ingest/qdrant.txt b/requirements/ingest/qdrant.txt index 0068b190f7..baf59956e1 100644 --- a/requirements/ingest/qdrant.txt +++ b/requirements/ingest/qdrant.txt @@ -21,7 +21,7 @@ exceptiongroup==1.2.2 # via # -c ./ingest/../base.txt # anyio -grpcio==1.64.3 +grpcio==1.65.5 # via # -c ./ingest/../deps/constraints.txt # grpcio-tools diff --git a/requirements/ingest/s3.txt b/requirements/ingest/s3.txt index fe7c697335..fc5ca8fb99 100644 --- a/requirements/ingest/s3.txt +++ b/requirements/ingest/s3.txt @@ -6,9 +6,9 @@ # aiobotocore==2.13.2 # via s3fs -aiohappyeyeballs==2.3.7 +aiohappyeyeballs==2.4.0 # via aiohttp -aiohttp==3.10.4 +aiohttp==3.10.5 # via # aiobotocore # s3fs diff --git a/requirements/ingest/singlestore.txt b/requirements/ingest/singlestore.txt index b1278f87f6..5d753dd868 100644 --- a/requirements/ingest/singlestore.txt +++ b/requirements/ingest/singlestore.txt @@ -19,7 +19,7 @@ idna==3.7 # via # -c ./ingest/../base.txt # requests -importlib-metadata==8.2.0 +importlib-metadata==8.4.0 # via build packaging==23.2 # via diff --git a/requirements/ingest/weaviate.txt b/requirements/ingest/weaviate.txt index 2b1df81622..77d4964e50 100644 --- a/requirements/ingest/weaviate.txt +++ b/requirements/ingest/weaviate.txt @@ -32,7 +32,7 @@ exceptiongroup==1.2.2 # via # -c ./ingest/../base.txt # anyio -grpcio==1.64.3 +grpcio==1.65.5 # via # -c ./ingest/../deps/constraints.txt # grpcio-health-checking diff --git a/requirements/test.txt b/requirements/test.txt index 9c217a5ba5..9cb5c467f1 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -12,7 +12,7 @@ anyio==3.7.1 # -c ./base.txt # httpx appdirs==1.4.4 - # via label-studio-tools + # via label-studio-sdk attrs==24.2.0 # via jsonschema autoflake==2.3.1 @@ -52,10 +52,22 @@ flake8-print==5.0.0 # via -r ./test.in freezegun==1.5.1 # via -r ./test.in -grpcio==1.64.3 +grpcio==1.65.5 # via # -c ././deps/constraints.txt # -r ./test.in +h11==0.14.0 + # via + # -c ./base.txt + # httpcore +httpcore==1.0.5 + # via + # -c ./base.txt + # httpx +httpx==0.27.0 + # via + # -c ./base.txt + # label-studio-sdk idna==3.7 # via # -c ./base.txt @@ -73,14 +85,8 @@ joblib==1.4.2 # nltk jsonschema==3.2.0 # via label-studio-sdk -jsonschema-specifications==2023.12.1 - # via jsonschema -label-studio-sdk==0.0.34 - # via - # -c ././deps/constraints.txt - # -r ./test.in -label-studio-tools==0.0.4 - # via label-studio-sdk +label-studio-sdk==1.0.5 + # via -r ./test.in liccheck==0.9.2 # via -r ./test.in lxml==5.3.0 From 50e22234b20aaa9a865f9e4114b09636eaeacbbd Mon Sep 17 00:00:00 2001 From: John <43506685+Coniferish@users.noreply.github.com> Date: Tue, 20 Aug 2024 15:41:51 -0400 Subject: [PATCH 6/8] bump changelog --- CHANGELOG.md | 2 +- unstructured/__version__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 21c86340d1..d8e427b127 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 0.15.6 +## 0.15.7 ### Enhancements diff --git a/unstructured/__version__.py b/unstructured/__version__.py index 986e0018a9..d57a4f1713 100644 --- a/unstructured/__version__.py +++ b/unstructured/__version__.py @@ -1 +1 @@ -__version__ = "0.15.6" # pragma: no cover +__version__ = "0.15.7" # pragma: no cover From 8fdac823e38def186efdc1b057155ef45245900c Mon Sep 17 00:00:00 2001 From: John <43506685+Coniferish@users.noreply.github.com> Date: Tue, 20 Aug 2024 15:52:05 -0400 Subject: [PATCH 7/8] bump changelog --- CHANGELOG.md | 2 +- unstructured/__version__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d8e427b127..76bb4c67bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 0.15.7 +## 0.15.8-dev0 ### Enhancements diff --git a/unstructured/__version__.py b/unstructured/__version__.py index d57a4f1713..7aeca3079b 100644 --- a/unstructured/__version__.py +++ b/unstructured/__version__.py @@ -1 +1 @@ -__version__ = "0.15.7" # pragma: no cover +__version__ = "0.15.8-dev0" # pragma: no cover From 8d8a315ea0e45a06e49ede663d12aa264bbbee00 Mon Sep 17 00:00:00 2001 From: John <43506685+Coniferish@users.noreply.github.com> Date: Tue, 20 Aug 2024 17:50:06 -0400 Subject: [PATCH 8/8] remove anyio pin --- CHANGELOG.md | 2 +- requirements/base.txt | 7 +++---- requirements/deps/constraints.txt | 2 -- requirements/dev.txt | 4 ++-- requirements/extra-paddleocr.txt | 4 ++-- requirements/ingest/astradb.txt | 7 +++++-- requirements/ingest/chroma.txt | 4 ++-- requirements/ingest/embed-aws-bedrock.txt | 4 ++-- requirements/ingest/embed-huggingface.txt | 4 ++-- requirements/ingest/embed-octoai.txt | 4 ++-- requirements/ingest/embed-openai.txt | 4 ++-- requirements/ingest/embed-vertexai.txt | 6 +++--- requirements/ingest/embed-voyageai.txt | 4 ++-- requirements/ingest/notion.txt | 7 +++++-- requirements/ingest/qdrant.txt | 4 ++-- requirements/ingest/weaviate.txt | 4 ++-- requirements/test.txt | 4 ++-- unstructured/__version__.py | 2 +- 18 files changed, 40 insertions(+), 37 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76bb4c67bf..7bd7c5c1f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 0.15.8-dev0 +## 0.15.8-dev1 ### Enhancements diff --git a/requirements/base.txt b/requirements/base.txt index 835d9a742d..2dbb2abfad 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -4,10 +4,8 @@ # # pip-compile ./base.in # -anyio==3.7.1 - # via - # -c ././deps/constraints.txt - # httpx +anyio==4.4.0 + # via httpx backoff==2.2.1 # via -r ./base.in beautifulsoup4==4.12.3 @@ -121,6 +119,7 @@ tqdm==4.66.5 typing-extensions==4.12.2 # via # -r ./base.in + # anyio # emoji # pypdf # typing-inspect diff --git a/requirements/deps/constraints.txt b/requirements/deps/constraints.txt index 6424eac907..f7dd75da3f 100644 --- a/requirements/deps/constraints.txt +++ b/requirements/deps/constraints.txt @@ -25,8 +25,6 @@ Office365-REST-Python-Client<2.4.3 weaviate-client>3.25.0 # TODO: Pinned in transformers package, remove when that gets updated tokenizers>=0.19,<0.20 -# langchain limits anyio to below 4.0 -anyio<4.0 # NOTE(crag): earlier versions fail in compilation step when pip installing the package pycocotools>=2.0.7 # NOTE(crag): python3.8-python3.11 compat (if it ends up being required) diff --git a/requirements/dev.txt b/requirements/dev.txt index cc17624311..92b63a0a0e 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -4,9 +4,8 @@ # # pip-compile ./dev.in # -anyio==3.7.1 +anyio==4.4.0 # via - # -c ././deps/constraints.txt # -c ./base.txt # -c ./test.txt # jupyter-server @@ -344,6 +343,7 @@ typing-extensions==4.12.2 # via # -c ./base.txt # -c ./test.txt + # anyio # ipython virtualenv==20.26.3 # via pre-commit diff --git a/requirements/extra-paddleocr.txt b/requirements/extra-paddleocr.txt index 2c2366744f..a34182ba59 100644 --- a/requirements/extra-paddleocr.txt +++ b/requirements/extra-paddleocr.txt @@ -4,9 +4,8 @@ # # pip-compile ./extra-paddleocr.in # -anyio==3.7.1 +anyio==4.4.0 # via - # -c ././deps/constraints.txt # -c ./base.txt # httpx astor==0.8.1 @@ -198,6 +197,7 @@ tqdm==4.66.5 typing-extensions==4.12.2 # via # -c ./base.txt + # anyio # paddlepaddle unstructured-paddleocr==2.8.0.1 # via -r ./extra-paddleocr.in diff --git a/requirements/ingest/astradb.txt b/requirements/ingest/astradb.txt index 3c4682b73a..dfd6f9b943 100644 --- a/requirements/ingest/astradb.txt +++ b/requirements/ingest/astradb.txt @@ -4,10 +4,9 @@ # # pip-compile ./ingest/astradb.in # -anyio==3.7.1 +anyio==4.4.0 # via # -c ./ingest/../base.txt - # -c ./ingest/../deps/constraints.txt # httpx astrapy==1.4.1 # via -r ./ingest/astradb.in @@ -90,6 +89,10 @@ sniffio==1.3.1 # httpx toml==0.10.2 # via astrapy +typing-extensions==4.12.2 + # via + # -c ./ingest/../base.txt + # anyio urllib3==1.26.19 # via # -c ./ingest/../base.txt diff --git a/requirements/ingest/chroma.txt b/requirements/ingest/chroma.txt index 7e85c0815e..abbf3c7328 100644 --- a/requirements/ingest/chroma.txt +++ b/requirements/ingest/chroma.txt @@ -6,10 +6,9 @@ # annotated-types==0.7.0 # via pydantic -anyio==3.7.1 +anyio==4.4.0 # via # -c ./ingest/../base.txt - # -c ./ingest/../deps/constraints.txt # httpx # starlette # watchfiles @@ -217,6 +216,7 @@ typer==0.9.0 typing-extensions==4.12.2 # via # -c ./ingest/../base.txt + # anyio # chromadb # fastapi # huggingface-hub diff --git a/requirements/ingest/embed-aws-bedrock.txt b/requirements/ingest/embed-aws-bedrock.txt index d8be08387b..d088f5d9fc 100644 --- a/requirements/ingest/embed-aws-bedrock.txt +++ b/requirements/ingest/embed-aws-bedrock.txt @@ -14,10 +14,9 @@ aiosignal==1.3.1 # via aiohttp annotated-types==0.7.0 # via pydantic -anyio==3.7.1 +anyio==4.4.0 # via # -c ./ingest/../base.txt - # -c ./ingest/../deps/constraints.txt # httpx async-timeout==4.0.3 # via @@ -170,6 +169,7 @@ tenacity==8.5.0 typing-extensions==4.12.2 # via # -c ./ingest/../base.txt + # anyio # langchain-core # pydantic # pydantic-core diff --git a/requirements/ingest/embed-huggingface.txt b/requirements/ingest/embed-huggingface.txt index ea7b0c91a7..5c3bf8b78b 100644 --- a/requirements/ingest/embed-huggingface.txt +++ b/requirements/ingest/embed-huggingface.txt @@ -6,10 +6,9 @@ # annotated-types==0.7.0 # via pydantic -anyio==3.7.1 +anyio==4.4.0 # via # -c ./ingest/../base.txt - # -c ./ingest/../deps/constraints.txt # httpx certifi==2024.7.4 # via @@ -165,6 +164,7 @@ transformers==4.44.1 typing-extensions==4.12.2 # via # -c ./ingest/../base.txt + # anyio # huggingface-hub # langchain-core # pydantic diff --git a/requirements/ingest/embed-octoai.txt b/requirements/ingest/embed-octoai.txt index d3031a9c2f..656a3f6ec2 100644 --- a/requirements/ingest/embed-octoai.txt +++ b/requirements/ingest/embed-octoai.txt @@ -6,10 +6,9 @@ # annotated-types==0.7.0 # via pydantic -anyio==3.7.1 +anyio==4.4.0 # via # -c ./ingest/../base.txt - # -c ./ingest/../deps/constraints.txt # httpx # openai certifi==2024.7.4 @@ -78,6 +77,7 @@ tqdm==4.66.5 typing-extensions==4.12.2 # via # -c ./ingest/../base.txt + # anyio # openai # pydantic # pydantic-core diff --git a/requirements/ingest/embed-openai.txt b/requirements/ingest/embed-openai.txt index 09b2e9e3de..ed481c6f1a 100644 --- a/requirements/ingest/embed-openai.txt +++ b/requirements/ingest/embed-openai.txt @@ -6,10 +6,9 @@ # annotated-types==0.7.0 # via pydantic -anyio==3.7.1 +anyio==4.4.0 # via # -c ./ingest/../base.txt - # -c ./ingest/../deps/constraints.txt # httpx # openai certifi==2024.7.4 @@ -104,6 +103,7 @@ tqdm==4.66.5 typing-extensions==4.12.2 # via # -c ./ingest/../base.txt + # anyio # langchain-core # openai # pydantic diff --git a/requirements/ingest/embed-vertexai.txt b/requirements/ingest/embed-vertexai.txt index aee188f540..19e7b1cc2a 100644 --- a/requirements/ingest/embed-vertexai.txt +++ b/requirements/ingest/embed-vertexai.txt @@ -14,10 +14,9 @@ aiosignal==1.3.1 # via aiohttp annotated-types==0.7.0 # via pydantic -anyio==3.7.1 +anyio==4.4.0 # via # -c ./ingest/../base.txt - # -c ./ingest/../deps/constraints.txt # httpx async-timeout==4.0.3 # via @@ -67,7 +66,7 @@ google-auth==2.34.0 # google-cloud-core # google-cloud-resource-manager # google-cloud-storage -google-cloud-aiplatform==1.62.0 +google-cloud-aiplatform==1.63.0 # via langchain-google-vertexai google-cloud-bigquery==3.25.0 # via google-cloud-aiplatform @@ -251,6 +250,7 @@ tenacity==8.5.0 typing-extensions==4.12.2 # via # -c ./ingest/../base.txt + # anyio # langchain-core # pydantic # pydantic-core diff --git a/requirements/ingest/embed-voyageai.txt b/requirements/ingest/embed-voyageai.txt index 4aaea71420..37abe9c611 100644 --- a/requirements/ingest/embed-voyageai.txt +++ b/requirements/ingest/embed-voyageai.txt @@ -16,10 +16,9 @@ aiosignal==1.3.1 # via aiohttp annotated-types==0.7.0 # via pydantic -anyio==3.7.1 +anyio==4.4.0 # via # -c ./ingest/../base.txt - # -c ./ingest/../deps/constraints.txt # httpx async-timeout==4.0.3 # via @@ -132,6 +131,7 @@ tenacity==8.5.0 typing-extensions==4.12.2 # via # -c ./ingest/../base.txt + # anyio # langchain-core # pydantic # pydantic-core diff --git a/requirements/ingest/notion.txt b/requirements/ingest/notion.txt index c9c3939231..504d5995ff 100644 --- a/requirements/ingest/notion.txt +++ b/requirements/ingest/notion.txt @@ -4,10 +4,9 @@ # # pip-compile ./ingest/notion.in # -anyio==3.7.1 +anyio==4.4.0 # via # -c ./ingest/../base.txt - # -c ./ingest/../deps/constraints.txt # httpx certifi==2024.7.4 # via @@ -45,3 +44,7 @@ sniffio==1.3.1 # -c ./ingest/../base.txt # anyio # httpx +typing-extensions==4.12.2 + # via + # -c ./ingest/../base.txt + # anyio diff --git a/requirements/ingest/qdrant.txt b/requirements/ingest/qdrant.txt index baf59956e1..4af409e9f9 100644 --- a/requirements/ingest/qdrant.txt +++ b/requirements/ingest/qdrant.txt @@ -6,10 +6,9 @@ # annotated-types==0.7.0 # via pydantic -anyio==3.7.1 +anyio==4.4.0 # via # -c ./ingest/../base.txt - # -c ./ingest/../deps/constraints.txt # httpx certifi==2024.7.4 # via @@ -75,6 +74,7 @@ sniffio==1.3.1 typing-extensions==4.12.2 # via # -c ./ingest/../base.txt + # anyio # pydantic # pydantic-core urllib3==1.26.19 diff --git a/requirements/ingest/weaviate.txt b/requirements/ingest/weaviate.txt index 77d4964e50..1cd614e59d 100644 --- a/requirements/ingest/weaviate.txt +++ b/requirements/ingest/weaviate.txt @@ -6,10 +6,9 @@ # annotated-types==0.7.0 # via pydantic -anyio==3.7.1 +anyio==4.4.0 # via # -c ./ingest/../base.txt - # -c ./ingest/../deps/constraints.txt # httpx authlib==1.3.1 # via weaviate-client @@ -83,6 +82,7 @@ sniffio==1.3.1 typing-extensions==4.12.2 # via # -c ./ingest/../base.txt + # anyio # pydantic # pydantic-core urllib3==1.26.19 diff --git a/requirements/test.txt b/requirements/test.txt index 9cb5c467f1..106e8d042a 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -6,9 +6,8 @@ # annotated-types==0.7.0 # via pydantic -anyio==3.7.1 +anyio==4.4.0 # via - # -c ././deps/constraints.txt # -c ./base.txt # httpx appdirs==1.4.4 @@ -214,6 +213,7 @@ types-urllib3==1.26.25.14 typing-extensions==4.12.2 # via # -c ./base.txt + # anyio # black # label-studio-sdk # mypy diff --git a/unstructured/__version__.py b/unstructured/__version__.py index 7aeca3079b..4848da1a0a 100644 --- a/unstructured/__version__.py +++ b/unstructured/__version__.py @@ -1 +1 @@ -__version__ = "0.15.8-dev0" # pragma: no cover +__version__ = "0.15.8-dev1" # pragma: no cover