From 6ce64dedbad8e6dfa0b0ab70b608f0d8fdf79102 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Oct 2024 22:09:45 +0100 Subject: [PATCH 01/11] python312Packages.llama-index-core: 0.11.16 -> 0.11.20 Diff: https://github.com/run-llama/llama_index/compare/refs/tags/v0.11.16...v0.11.20 Changelog: https://github.com/run-llama/llama_index/blob/0.11.20/CHANGELOG.md --- .../development/python-modules/llama-index-core/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix index 782d908b73337..7a43ff20d2f59 100644 --- a/pkgs/development/python-modules/llama-index-core/default.nix +++ b/pkgs/development/python-modules/llama-index-core/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pname = "llama-index-core"; - version = "0.11.16"; + version = "0.11.20"; pyproject = true; disabled = pythonOlder "3.8"; @@ -44,7 +44,7 @@ buildPythonPackage rec { owner = "run-llama"; repo = "llama_index"; rev = "refs/tags/v${version}"; - hash = "sha256-t4hQMlORpdWXkbKQhVSxD/pdxFtu+sJ4FQQxIXLoH94="; + hash = "sha256-r4xedtxoYv6CcxtDrgwau9LY3kOBg3jXlQm1g59L7x4="; }; sourceRoot = "${src.name}/${pname}"; @@ -63,6 +63,8 @@ buildPythonPackage rec { cp -r ${nltk-data.punkt}/tokenizers/punkt/* llama_index/core/_static/nltk_cache/tokenizers/punkt/ ''; + pythonRelaxDeps = [ "tenacity" ]; + build-system = [ poetry-core ]; dependencies = [ From 68b4067ba67551d4013374fb5488f37be8251bb6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Oct 2024 22:18:38 +0100 Subject: [PATCH 02/11] python312Packages.llama-cloud: 0.1.2 -> 0.1.4 --- pkgs/development/python-modules/llama-cloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-cloud/default.nix b/pkgs/development/python-modules/llama-cloud/default.nix index fe99fe37a9c21..1da515654a979 100644 --- a/pkgs/development/python-modules/llama-cloud/default.nix +++ b/pkgs/development/python-modules/llama-cloud/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-cloud"; - version = "0.1.2"; + version = "0.1.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_cloud"; inherit version; - hash = "sha256-fIB0fpp/MtS3OcLV1K3XNR+DbZLmM9asA/pAGJbTMJc="; + hash = "sha256-bwFVl5vZYWCVHLgSxIg28frOA3vHnM/Y0YWxjvTJ+vg="; }; build-system = [ poetry-core ]; From 854eb680d13e67085010bad0fdcc51b6ed2e00cb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Oct 2024 22:19:09 +0100 Subject: [PATCH 03/11] python312Packages.llama-index-graph-stores-neo4j: 0.3.2 -> 0.3.5 --- .../python-modules/llama-index-graph-stores-neo4j/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix index 62fe9f4660028..9b16410ab4f49 100644 --- a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix +++ b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-graph-stores-neo4j"; - version = "0.3.2"; + version = "0.3.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_graph_stores_neo4j"; inherit version; - hash = "sha256-O/iTlpbREmN1tbojbaqZ7gLAN2JdKmKEzhKCnpth6S0="; + hash = "sha256-r3/bxG4EZmeJ5fa4mmE2OTlbvGN780rsze5HoKQssiY="; }; build-system = [ poetry-core ]; From 9bdd02c88d6b43ebb13ae90f1253e933af435278 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Oct 2024 22:19:35 +0100 Subject: [PATCH 04/11] python312Packages.llama-index-llms-ollama: 0.3.3 -> 0.3.4 --- .../python-modules/llama-index-llms-ollama/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix index 7967890cb317a..04bb0ddd0caaa 100644 --- a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-llms-ollama"; - version = "0.3.3"; + version = "0.3.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_ollama"; inherit version; - hash = "sha256-J54Z9tWb81DcIIDVzaXqa9JkKd576gvGdMoiTDoTOII="; + hash = "sha256-Vt9uGIcIGvRSL57DK+LUYy2NTyYZ9yqnHqYJZiMeVKA="; }; build-system = [ poetry-core ]; From b1860f0ae1c16fb631342153b568b77cf1fbad28 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Oct 2024 22:19:56 +0100 Subject: [PATCH 05/11] python312Packages.llama-parse: 0.5.7 -> 0.5.12 --- pkgs/development/python-modules/llama-parse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-parse/default.nix b/pkgs/development/python-modules/llama-parse/default.nix index 7eabf44f7f79f..bc8719d4de36b 100644 --- a/pkgs/development/python-modules/llama-parse/default.nix +++ b/pkgs/development/python-modules/llama-parse/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-parse"; - version = "0.5.7"; + version = "0.5.12"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_parse"; inherit version; - hash = "sha256-sqKdvOMrmTQvuULRwhCr7w7qV99vJmZimQOe96kx/v8="; + hash = "sha256-4kFgbPNXRCXfdsD10BoxqVx5LG+++AqvcvjtZEi9FxU="; }; build-system = [ poetry-core ]; From 2e3561cb113512888dceb00f570c16f096ecc9e3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Oct 2024 22:20:17 +0100 Subject: [PATCH 06/11] python312Packages.llama-index-vector-stores-qdrant: 0.3.0 -> 0.3.3 --- .../llama-index-vector-stores-qdrant/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix index b45bfd7c0bd53..92fe05098613b 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-qdrant"; - version = "0.3.0"; + version = "0.3.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_qdrant"; inherit version; - hash = "sha256-mWY86wyS3aVd+cBhY8pCvn6w86Z0AdWrjOlz987Wg6I="; + hash = "sha256-YpecQB3OHi7id/Mvu73dn+gcXjXzVZR5+Sr0KwkIbDs="; }; build-system = [ poetry-core ]; From a29dbedba01cb9372751b19767e9f8487a61ff7d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Oct 2024 22:20:54 +0100 Subject: [PATCH 07/11] python312Packages.llama-index-multi-modal-llms-openai: 0.2.2 -> 0.2.3 --- .../llama-index-multi-modal-llms-openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix index fc9f3a108effa..333780fc2f689 100644 --- a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-multi-modal-llms-openai"; - version = "0.2.2"; + version = "0.2.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_multi_modal_llms_openai"; inherit version; - hash = "sha256-xyBc/Zoj4iAdtSfKP4+l70+yYKtsmxXnkWNjCpFu4Vk="; + hash = "sha256-jrm38f85Vu8JeeIbyD5qiF5AmHtxmfGV5GUl0G465AI="; }; build-system = [ poetry-core ]; From 35f3b601eeb72767ad096c7f88e48d7c1a696fd4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Oct 2024 22:21:09 +0100 Subject: [PATCH 08/11] python312Packages.llama-index-llms-openai: 0.2.12 -> 0.2.16 --- .../python-modules/llama-index-llms-openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-llms-openai/default.nix index 2f3e860947088..3ac980fd6ac35 100644 --- a/pkgs/development/python-modules/llama-index-llms-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-openai/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-llms-openai"; - version = "0.2.12"; + version = "0.2.16"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_openai"; inherit version; - hash = "sha256-RyG8GnZcyfiWuSgku07RTyicGfwVdlpmgJB4slY6dBE="; + hash = "sha256-fGZt0nBWwnigef9F1T8fv8jtNjdkqnuu7i4D30f5Byo="; }; pythonRemoveDeps = [ From 25b3bfec1b762fa942edb4c83b92ccfb49d82070 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Oct 2024 22:27:15 +0100 Subject: [PATCH 09/11] python312Packages.llama-index-legacy: relax tenacity --- .../development/python-modules/llama-index-legacy/default.nix | 2 ++ .../llama-index-vector-stores-chroma/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-legacy/default.nix b/pkgs/development/python-modules/llama-index-legacy/default.nix index f51ae416bb1d2..5ab6bd06bba31 100644 --- a/pkgs/development/python-modules/llama-index-legacy/default.nix +++ b/pkgs/development/python-modules/llama-index-legacy/default.nix @@ -20,6 +20,8 @@ buildPythonPackage rec { hash = "sha256-9pafEIXvsKvr1jZ+RvNRICDz9rnAhvRYpRmDDdYeggY="; }; + pythonRelaxDeps = [ "tenacity" ]; + build-system = [ poetry-core ]; dependencies = [ llama-index-core ]; diff --git a/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix index 6ab0835a135c0..629d27c8e554d 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-chroma"; - version = "0.2.0"; + version = "0.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_chroma"; inherit version; - hash = "sha256-n6fGNgXB4pbhea1e5QT0Co/sVnd8r3L5+pVCut5U2Uw="; + hash = "sha256-3vFadjVLtGWLFrrbklN6cudmJz1eVmsFdUYQBdpThH8="; }; build-system = [ poetry-core ]; From c7abe575227f011657aa13bb2a8840e4101fe3eb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Oct 2024 22:51:54 +0100 Subject: [PATCH 10/11] python312Pakcages.llama-index-core: disable failing test --- pkgs/development/python-modules/llama-index-core/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix index 7a43ff20d2f59..be4eef72fa7ec 100644 --- a/pkgs/development/python-modules/llama-index-core/default.nix +++ b/pkgs/development/python-modules/llama-index-core/default.nix @@ -129,6 +129,8 @@ buildPythonPackage rec { # Tests require network access "test_from_namespaced_persist_dir" "test_from_persist_dir" + # asyncio.exceptions.InvalidStateError: invalid state + "test_workflow_context_to_dict_mid_run" ]; meta = with lib; { From e0dea9c90600cf34b4b65182ad59515226d597c3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Oct 2024 23:11:28 +0100 Subject: [PATCH 11/11] python312Packages.chromadb: 0.5.11 -> 0.5.17 Changelog: https://github.com/chroma-core/chroma/releases/tag/0.5.17 --- pkgs/development/python-modules/chromadb/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix index f1105a0f4980d..1be9ca150285c 100644 --- a/pkgs/development/python-modules/chromadb/default.nix +++ b/pkgs/development/python-modules/chromadb/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { pname = "chromadb"; - version = "0.5.11"; + version = "0.5.17"; pyproject = true; disabled = pythonOlder "3.9"; @@ -61,13 +61,13 @@ buildPythonPackage rec { owner = "chroma-core"; repo = "chroma"; rev = "refs/tags/${version}"; - hash = "sha256-qE8eX97khcQa2JS9ZuJ1j3/pduXcQGyuVyvsnvKaemo="; + hash = "sha256-ui4wUV9jIvgPtnY5L8mHg9k3l3ccL4u1rir426wwuMg="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-zciqOK5EkvxX3ctkGdkAppOQAW4CJ554PZsw2ctrdG0="; + hash = "sha256-lF+TpoQF6vZoxjPX3CN6TnWiY72qoxrVu2hilWgNx2E="; }; pythonRelaxDeps = [ @@ -149,6 +149,8 @@ buildPythonPackage rec { # Tests are laky / timing sensitive "test_fastapi_server_token_authn_allows_when_it_should_allow" "test_fastapi_server_token_authn_rejects_when_it_should_reject" + # Issue with event loop + "test_http_client_bw_compatibility" ]; disabledTestPaths = [