From ee624a4f6c54bd391df3140a42706c6d4616dfd8 Mon Sep 17 00:00:00 2001 From: Reetika Roy Date: Thu, 12 Dec 2024 14:46:04 -0800 Subject: [PATCH 1/3] add openai in reqs --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f48a785a9..5b0c9649b 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,8 @@ env-tests-optional: env env-tests llama-index-embeddings-huggingface \ llama-index-embeddings-openai \ unstructured \ - chromadb + chromadb \ + langchain-openai env-tests-db: env-tests poetry run pip install \ From 9d99c4c47f36c698abececee0e12161109107419 Mon Sep 17 00:00:00 2001 From: Reetika Roy Date: Mon, 16 Dec 2024 14:58:38 -0800 Subject: [PATCH 2/3] update langchain --- src/apps/langchain/pyproject.toml | 15 ++++++++++++--- src/providers/langchain/pyproject.toml | 9 ++++++++- src/providers/openai/pyproject.toml | 9 ++++++++- 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/src/apps/langchain/pyproject.toml b/src/apps/langchain/pyproject.toml index b92efe656..34d7ad39f 100644 --- a/src/apps/langchain/pyproject.toml +++ b/src/apps/langchain/pyproject.toml @@ -29,9 +29,18 @@ classifiers = [ [tool.poetry.dependencies] python = "^3.8.1" trulens-core = { version = "^1.0.0" } -langchain = ">=0.2.10" -langchain-core = ">=0.2.0" -pydantic = "^2.4.2" +langchain = [ + { version = ">=0.2.10,<0.3.0", python = "<3.9" }, + { version = ">=0.3.0", python = ">=3.9" }, +] +langchain-core = [ + { version = ">=0.2.0,<0.3.0", python = "<3.9" }, + { version = ">=0.3.0", python = ">=3.9" }, +] +pydantic = [ + { version = ">=1.0.0,<2.0.0", python = "<3.9" }, + { version = ">=2.0.0", python = ">=3.9" }, +] [tool.poetry.group.dev.dependencies] trulens-core = { path = "../../core" } diff --git a/src/providers/langchain/pyproject.toml b/src/providers/langchain/pyproject.toml index 987026b57..a93e94b8f 100644 --- a/src/providers/langchain/pyproject.toml +++ b/src/providers/langchain/pyproject.toml @@ -30,7 +30,14 @@ classifiers = [ python = "^3.8.1" trulens-core = { version = "^1.0.0" } trulens-feedback = { version = "^1.0.0" } -langchain-core = ">=0.2.0" +langchain-core = [ + { version = ">=0.2.0,<0.3.0", python = "<3.9" }, + { version = ">=0.3.0", python = ">=3.9" }, +] +pydantic = [ + { version = ">=1.0.0,<2.0.0", python = "<3.9" }, + { version = ">=2.0.0", python = ">=3.9" }, +] [tool.poetry.group.dev.dependencies] trulens-core = { path = "../../core" } diff --git a/src/providers/openai/pyproject.toml b/src/providers/openai/pyproject.toml index 65237b018..d42577e38 100644 --- a/src/providers/openai/pyproject.toml +++ b/src/providers/openai/pyproject.toml @@ -31,7 +31,14 @@ python = "^3.8.1" trulens-core = { version = "^1.0.0" } trulens-feedback = { version = "^1.0.0" } openai = ">=1.52.1" -langchain-community = ">=0.0.20" +langchain-community = [ + { version = ">=0.0.20,<0.3.0", python = "<3.9" }, + { version = ">=0.3.0", python = ">=3.9" }, +] +pydantic = [ + { version = ">=1.0.0,<2.0.0", python = "<3.9" }, + { version = ">=2.0.0", python = ">=3.9" }, +] [tool.poetry.group.dev.dependencies] trulens-core = { path = "../../core" } From 9810adeee6c73e93a86940cee141b2ff88b31334 Mon Sep 17 00:00:00 2001 From: corey Date: Mon, 16 Dec 2024 16:28:24 -0800 Subject: [PATCH 3/3] set pydantic versions --- src/apps/langchain/pyproject.toml | 4 ++-- src/apps/llamaindex/pyproject.toml | 5 ++++- src/apps/nemo/pyproject.toml | 5 ++++- src/core/pyproject.toml | 5 ++++- src/feedback/pyproject.toml | 5 ++++- src/providers/langchain/pyproject.toml | 4 ++-- src/providers/openai/pyproject.toml | 4 ++-- 7 files changed, 22 insertions(+), 10 deletions(-) diff --git a/src/apps/langchain/pyproject.toml b/src/apps/langchain/pyproject.toml index 34d7ad39f..1b6f35e81 100644 --- a/src/apps/langchain/pyproject.toml +++ b/src/apps/langchain/pyproject.toml @@ -38,8 +38,8 @@ langchain-core = [ { version = ">=0.3.0", python = ">=3.9" }, ] pydantic = [ - { version = ">=1.0.0,<2.0.0", python = "<3.9" }, - { version = ">=2.0.0", python = ">=3.9" }, + { version = "^1.0.0", python = "<3.9" }, + { version = ">=2.4.2", python = ">=3.9" }, ] [tool.poetry.group.dev.dependencies] diff --git a/src/apps/llamaindex/pyproject.toml b/src/apps/llamaindex/pyproject.toml index b72d794ac..e7ee9c02e 100644 --- a/src/apps/llamaindex/pyproject.toml +++ b/src/apps/llamaindex/pyproject.toml @@ -30,7 +30,10 @@ classifiers = [ python = "^3.8.1" trulens-core = { version = "^1.0.0" } trulens-apps-langchain = { version = "^1.0.0" } -pydantic = "^2.4.2" +pydantic = [ + { version = "^1.0.0", python = "<3.9" }, + { version = ">=2.4.2", python = ">=3.9" }, +] llama-index = ">=0.11" tiktoken = [ { version = ">=0.3.3", python = "<3.13" }, diff --git a/src/apps/nemo/pyproject.toml b/src/apps/nemo/pyproject.toml index ef2323bbc..c32470ad6 100644 --- a/src/apps/nemo/pyproject.toml +++ b/src/apps/nemo/pyproject.toml @@ -30,7 +30,10 @@ classifiers = [ python = "^3.8.1,<3.13" trulens-core = { version = "^1.0.0" } trulens-apps-langchain = { version = "^1.0.0" } -pydantic = "^2.4.2" +pydantic = [ + { version = "^1.0.0", python = "<3.9" }, + { version = ">=2.4.2", python = ">=3.9" }, +] nemoguardrails = ">=0.9" onnxruntime = [ { version = ">=1.14.0,<1.20.0", python = "<3.10" }, diff --git a/src/core/pyproject.toml b/src/core/pyproject.toml index 406ecdcb3..d4b110b71 100644 --- a/src/core/pyproject.toml +++ b/src/core/pyproject.toml @@ -35,7 +35,10 @@ numpy = [ munch = "^2.5" dill = ">=0.3.8" typing_extensions = "^4.9" -pydantic = "^2.4.2" +pydantic = [ + { version = "^1.0.0", python = "<3.9" }, + { version = ">=2.4.2", python = ">=3.9" }, +] pandas = ">=1.0.0" rich = "^13.6" requests = "^2.31" diff --git a/src/feedback/pyproject.toml b/src/feedback/pyproject.toml index 8bdc07cf1..bf00fc881 100644 --- a/src/feedback/pyproject.toml +++ b/src/feedback/pyproject.toml @@ -30,7 +30,10 @@ classifiers = [ python = "^3.8.1" trulens-core = { version = "^1.0.0" } nltk = "^3.9.1" -pydantic = "^2.4.2" +pydantic = [ + { version = "^1.0.0", python = "<3.9" }, + { version = ">=2.4.2", python = ">=3.9" }, +] requests = "^2.31" numpy = [ { version = ">=1.23.0,<1.25.0", python = "<3.9" }, diff --git a/src/providers/langchain/pyproject.toml b/src/providers/langchain/pyproject.toml index a93e94b8f..796d0a688 100644 --- a/src/providers/langchain/pyproject.toml +++ b/src/providers/langchain/pyproject.toml @@ -35,8 +35,8 @@ langchain-core = [ { version = ">=0.3.0", python = ">=3.9" }, ] pydantic = [ - { version = ">=1.0.0,<2.0.0", python = "<3.9" }, - { version = ">=2.0.0", python = ">=3.9" }, + { version = "^1.0.0", python = "<3.9" }, + { version = ">=2.4.2", python = ">=3.9" }, ] [tool.poetry.group.dev.dependencies] diff --git a/src/providers/openai/pyproject.toml b/src/providers/openai/pyproject.toml index d42577e38..63cc7a97c 100644 --- a/src/providers/openai/pyproject.toml +++ b/src/providers/openai/pyproject.toml @@ -36,8 +36,8 @@ langchain-community = [ { version = ">=0.3.0", python = ">=3.9" }, ] pydantic = [ - { version = ">=1.0.0,<2.0.0", python = "<3.9" }, - { version = ">=2.0.0", python = ">=3.9" }, + { version = "^1.0.0", python = "<3.9" }, + { version = ">=2.4.2", python = ">=3.9" }, ] [tool.poetry.group.dev.dependencies]