From f45d1039b041922449067c9993496d919c3d831c Mon Sep 17 00:00:00 2001 From: vincent-4 Date: Sat, 15 Mar 2025 21:20:23 -0400 Subject: [PATCH 01/11] Upgrade a few dependencies. Doing this incrementally! --- .pre-commit-config.yaml | 2 +- docs/requirements-docs.txt | 2 +- requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0964e87f..104f9f21 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -13,7 +13,7 @@ repos: args: ["--config-file", "mypy.ini"] additional_dependencies: - types-setuptools - - litellm>=1.51.0 + - litellm>=1.63.2 - numpy>=1.25.0 - pandas>=2.0.0 - sentence-transformers>=3.0.1 diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt index 404a5c89..5869c759 100644 --- a/docs/requirements-docs.txt +++ b/docs/requirements-docs.txt @@ -3,7 +3,7 @@ sphinx-rtd-theme==2.0.0 backoff==2.2.1 faiss-cpu==1.8.0.post1 -litellm==1.51.0 +litellm==1.63.2 numpy==1.26.4 pandas==2.2.2 sentence-transformers==3.0.1 diff --git a/requirements.txt b/requirements.txt index 51e84f5b..cae6e06d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ backoff==2.2.1 faiss-cpu==1.8.0.post1 -litellm==1.51.0,<2.0.0 +litellm==1.63.2,<2.0.0 numpy==1.26.4 pandas==2.2.2 sentence-transformers==3.0.1 From 35993c37766d3bd04fc4965a3c52f1c0ceb99674 Mon Sep 17 00:00:00 2001 From: vincent-4 Date: Sat, 15 Mar 2025 21:43:49 -0400 Subject: [PATCH 02/11] Upgrade liteLLM in pyproject too --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 40bc13af..332751f7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,7 +24,7 @@ classifiers = [ dependencies = [ "backoff>=2.2.1,<3.0.0", "faiss-cpu>=1.8.0.post1,<2.0.0", - "litellm>=1.51.0,<2.0.0", + "litellm>=1.63.2,<2.0.0", "numpy>=1.25.0,<2.0.0", "pandas>=2.0.0,<3.0.0", "sentence-transformers>=3.0.1,<4.0.0", From 9f512558d6de48c7b9613e3fdbd2ebb0f3e1183b Mon Sep 17 00:00:00 2001 From: vincent-4 Date: Sat, 15 Mar 2025 21:47:00 -0400 Subject: [PATCH 03/11] Upgrade tiktoken --- .pre-commit-config.yaml | 2 +- docs/requirements-docs.txt | 2 +- pyproject.toml | 2 +- requirements.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 104f9f21..da466ac7 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -17,5 +17,5 @@ repos: - numpy>=1.25.0 - pandas>=2.0.0 - sentence-transformers>=3.0.1 - - tiktoken>=0.7.0 + - tiktoken>=0.9.0 - tqdm>=4.66.4 diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt index 5869c759..d3acf73d 100644 --- a/docs/requirements-docs.txt +++ b/docs/requirements-docs.txt @@ -7,5 +7,5 @@ litellm==1.63.2 numpy==1.26.4 pandas==2.2.2 sentence-transformers==3.0.1 -tiktoken==0.7.0 +tiktoken==0.9.0 tqdm==4.66.4 diff --git a/pyproject.toml b/pyproject.toml index 332751f7..160a8cda 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,7 @@ dependencies = [ "numpy>=1.25.0,<2.0.0", "pandas>=2.0.0,<3.0.0", "sentence-transformers>=3.0.1,<4.0.0", - "tiktoken>=0.7.0,<1.0.0", + "tiktoken>=0.9.0,<1.0.0", "tqdm>=4.66.4,<5.0.0", ] diff --git a/requirements.txt b/requirements.txt index cae6e06d..50f5987a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,5 +4,5 @@ litellm==1.63.2,<2.0.0 numpy==1.26.4 pandas==2.2.2 sentence-transformers==3.0.1 -tiktoken==0.7.0 +tiktoken==0.9.0 tqdm==4.66.4 From d5cc828dfbc89b18cbd6f1178960db891cc4436f Mon Sep 17 00:00:00 2001 From: vincent-4 Date: Sat, 15 Mar 2025 21:48:16 -0400 Subject: [PATCH 04/11] Upgrade sentence transformers --- .pre-commit-config.yaml | 2 +- docs/requirements-docs.txt | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index da466ac7..82188b43 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -16,6 +16,6 @@ repos: - litellm>=1.63.2 - numpy>=1.25.0 - pandas>=2.0.0 - - sentence-transformers>=3.0.1 + - sentence-transformers>=3.4.1 - tiktoken>=0.9.0 - tqdm>=4.66.4 diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt index d3acf73d..e46ad71a 100644 --- a/docs/requirements-docs.txt +++ b/docs/requirements-docs.txt @@ -6,6 +6,6 @@ faiss-cpu==1.8.0.post1 litellm==1.63.2 numpy==1.26.4 pandas==2.2.2 -sentence-transformers==3.0.1 +sentence-transformers==3.4.1 tiktoken==0.9.0 tqdm==4.66.4 diff --git a/pyproject.toml b/pyproject.toml index 160a8cda..70900ab4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,7 +27,7 @@ dependencies = [ "litellm>=1.63.2,<2.0.0", "numpy>=1.25.0,<2.0.0", "pandas>=2.0.0,<3.0.0", - "sentence-transformers>=3.0.1,<4.0.0", + "sentence-transformers>=3.4.1,<4.0.0", "tiktoken>=0.9.0,<1.0.0", "tqdm>=4.66.4,<5.0.0", ] From 63cfe0d261bcbd4ac0a3097f84354963b4d77873 Mon Sep 17 00:00:00 2001 From: vincent-4 Date: Sat, 15 Mar 2025 21:50:32 -0400 Subject: [PATCH 05/11] Upgrade numpy --- .pre-commit-config.yaml | 2 +- docs/requirements-docs.txt | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 82188b43..edb7c619 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,7 +14,7 @@ repos: additional_dependencies: - types-setuptools - litellm>=1.63.2 - - numpy>=1.25.0 + - numpy>=2.2.3 - pandas>=2.0.0 - sentence-transformers>=3.4.1 - tiktoken>=0.9.0 diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt index e46ad71a..48630043 100644 --- a/docs/requirements-docs.txt +++ b/docs/requirements-docs.txt @@ -4,7 +4,7 @@ sphinx-rtd-theme==2.0.0 backoff==2.2.1 faiss-cpu==1.8.0.post1 litellm==1.63.2 -numpy==1.26.4 +numpy==2.2.3 pandas==2.2.2 sentence-transformers==3.4.1 tiktoken==0.9.0 diff --git a/pyproject.toml b/pyproject.toml index 70900ab4..461e8bf1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,7 +25,7 @@ dependencies = [ "backoff>=2.2.1,<3.0.0", "faiss-cpu>=1.8.0.post1,<2.0.0", "litellm>=1.63.2,<2.0.0", - "numpy>=1.25.0,<2.0.0", + "numpy>=2.2.23.,<3.0.0", "pandas>=2.0.0,<3.0.0", "sentence-transformers>=3.4.1,<4.0.0", "tiktoken>=0.9.0,<1.0.0", From dbc25cf90c702d1dcd6a76d3ab8539d0276bf9c6 Mon Sep 17 00:00:00 2001 From: vincent-4 Date: Sat, 15 Mar 2025 21:50:51 -0400 Subject: [PATCH 06/11] Sentence and Numpy --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 50f5987a..c5fa06a7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ backoff==2.2.1 faiss-cpu==1.8.0.post1 litellm==1.63.2,<2.0.0 -numpy==1.26.4 +numpy==2.2.3 pandas==2.2.2 -sentence-transformers==3.0.1 +sentence-transformers==3.4.1 tiktoken==0.9.0 tqdm==4.66.4 From bdb568e4edea1ec932336e5c3c2e92201d1db11d Mon Sep 17 00:00:00 2001 From: vincent-4 Date: Sat, 15 Mar 2025 21:51:57 -0400 Subject: [PATCH 07/11] Upgrade pandas --- .pre-commit-config.yaml | 2 +- docs/requirements-docs.txt | 2 +- pyproject.toml | 2 +- requirements.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index edb7c619..21b71953 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,7 +15,7 @@ repos: - types-setuptools - litellm>=1.63.2 - numpy>=2.2.3 - - pandas>=2.0.0 + - pandas>=2.2.3 - sentence-transformers>=3.4.1 - tiktoken>=0.9.0 - tqdm>=4.66.4 diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt index 48630043..29a09a9a 100644 --- a/docs/requirements-docs.txt +++ b/docs/requirements-docs.txt @@ -5,7 +5,7 @@ backoff==2.2.1 faiss-cpu==1.8.0.post1 litellm==1.63.2 numpy==2.2.3 -pandas==2.2.2 +pandas==2.2.3 sentence-transformers==3.4.1 tiktoken==0.9.0 tqdm==4.66.4 diff --git a/pyproject.toml b/pyproject.toml index 461e8bf1..b10888f8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,7 +26,7 @@ dependencies = [ "faiss-cpu>=1.8.0.post1,<2.0.0", "litellm>=1.63.2,<2.0.0", "numpy>=2.2.23.,<3.0.0", - "pandas>=2.0.0,<3.0.0", + "pandas>=2.2.3,<3.0.0", "sentence-transformers>=3.4.1,<4.0.0", "tiktoken>=0.9.0,<1.0.0", "tqdm>=4.66.4,<5.0.0", diff --git a/requirements.txt b/requirements.txt index c5fa06a7..c7cf69f6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ backoff==2.2.1 faiss-cpu==1.8.0.post1 litellm==1.63.2,<2.0.0 numpy==2.2.3 -pandas==2.2.2 +pandas==2.2.3 sentence-transformers==3.4.1 tiktoken==0.9.0 tqdm==4.66.4 From 1b313cd7610d95c331e23c6d92389e42404f3171 Mon Sep 17 00:00:00 2001 From: vincent-4 Date: Sat, 15 Mar 2025 21:54:40 -0400 Subject: [PATCH 08/11] Upgrade Faiss cpu. Sus because maybe 3.8 will not work with these --- README.md | 2 +- docs/installation.rst | 4 ++-- docs/requirements-docs.txt | 2 +- pyproject.toml | 2 +- requirements.txt | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 47724c60..9d26b55c 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ If you are running on mac, please install Faiss via conda: ### CPU-only version ``` -conda install -c pytorch faiss-cpu=1.8.0 +conda install -c pytorch faiss-cpu=1.10.0 ``` ### GPU(+CPU) version diff --git a/docs/installation.rst b/docs/installation.rst index 793343fd..229e9f02 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -25,9 +25,9 @@ If you are running on mac, please install Faiss via conda: .. code-block:: console # CPU-only version - $ conda install -c pytorch faiss-cpu=1.8.0 + $ conda install -c pytorch faiss-cpu=11.10.0 # GPU(+CPU) version - $ conda install -c pytorch -c nvidia faiss-gpu=1.8.0 + $ conda install -c pytorch -c nvidia faiss-gpu=1.10.0 For more details, see `Installing FAISS via Conda `_. diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt index 29a09a9a..946c536e 100644 --- a/docs/requirements-docs.txt +++ b/docs/requirements-docs.txt @@ -2,7 +2,7 @@ sphinx==7.3.7 sphinx-rtd-theme==2.0.0 backoff==2.2.1 -faiss-cpu==1.8.0.post1 +faiss-cpu==1.10.0 litellm==1.63.2 numpy==2.2.3 pandas==2.2.3 diff --git a/pyproject.toml b/pyproject.toml index b10888f8..4d4a23c4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,7 +23,7 @@ classifiers = [ dependencies = [ "backoff>=2.2.1,<3.0.0", - "faiss-cpu>=1.8.0.post1,<2.0.0", + "faiss-cpu>=1.10.0.post1,<2.0.0", "litellm>=1.63.2,<2.0.0", "numpy>=2.2.23.,<3.0.0", "pandas>=2.2.3,<3.0.0", diff --git a/requirements.txt b/requirements.txt index c7cf69f6..979fcd76 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ backoff==2.2.1 -faiss-cpu==1.8.0.post1 +faiss-cpu==1.10.0 litellm==1.63.2,<2.0.0 numpy==2.2.3 pandas==2.2.3 From 241383a43efbbdee3088574dbe142ac260fbea3c Mon Sep 17 00:00:00 2001 From: vincent-4 Date: Sat, 15 Mar 2025 22:01:06 -0400 Subject: [PATCH 09/11] coma --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 4d4a23c4..f1c6af1b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,7 +25,7 @@ dependencies = [ "backoff>=2.2.1,<3.0.0", "faiss-cpu>=1.10.0.post1,<2.0.0", "litellm>=1.63.2,<2.0.0", - "numpy>=2.2.23.,<3.0.0", + "numpy>=2.2.23,<3.0.0", "pandas>=2.2.3,<3.0.0", "sentence-transformers>=3.4.1,<4.0.0", "tiktoken>=0.9.0,<1.0.0", From 74fec6ea2ab22f7d5dd84ab96a4815cdb75e52b8 Mon Sep 17 00:00:00 2001 From: vincent-4 Date: Sat, 15 Mar 2025 22:15:53 -0400 Subject: [PATCH 10/11] Not post1. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index f1c6af1b..ead685e3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,7 +23,7 @@ classifiers = [ dependencies = [ "backoff>=2.2.1,<3.0.0", - "faiss-cpu>=1.10.0.post1,<2.0.0", + "faiss-cpu>=1.10.0,<2.0.0", "litellm>=1.63.2,<2.0.0", "numpy>=2.2.23,<3.0.0", "pandas>=2.2.3,<3.0.0", From 7249ed0101a0568acefd944694275e9e175df1ce Mon Sep 17 00:00:00 2001 From: vincent-4 Date: Sat, 15 Mar 2025 22:24:01 -0400 Subject: [PATCH 11/11] properly type --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index ead685e3..c3cffd1f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,7 +25,7 @@ dependencies = [ "backoff>=2.2.1,<3.0.0", "faiss-cpu>=1.10.0,<2.0.0", "litellm>=1.63.2,<2.0.0", - "numpy>=2.2.23,<3.0.0", + "numpy>=2.2.3,<3.0.0", "pandas>=2.2.3,<3.0.0", "sentence-transformers>=3.4.1,<4.0.0", "tiktoken>=0.9.0,<1.0.0",