From f6cadae0e1373773d7863067d505e326c9ae64e2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 12 May 2025 18:28:37 +0200 Subject: [PATCH 1/8] python312Packages.llama-index-vector-stores-postgres: 0.4.2 -> 0.5.3 --- .../llama-index-vector-stores-postgres/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix index ac33f12511f8..4081d58faade 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix @@ -5,30 +5,26 @@ fetchPypi, llama-index-core, pgvector, - poetry-core, + hatchling, psycopg2, }: buildPythonPackage rec { pname = "llama-index-vector-stores-postgres"; - version = "0.4.2"; + version = "0.5.3"; pyproject = true; src = fetchPypi { pname = "llama_index_vector_stores_postgres"; inherit version; - hash = "sha256-RxmlwcxPmqc4ILzG0112Pp16960Lbf2113aDavDqDgA="; + hash = "sha256-P4gn+1mm4m8iah7F1yAbMm9+cAfyt+WKxH4Jcq+9O2k="; }; pythonRemoveDeps = [ "psycopg2-binary" ]; - pythonRelaxDeps = [ - "pgvector" - ]; + pythonRelaxDeps = [ "pgvector" ]; - build-system = [ - poetry-core - ]; + build-system = [ hatchling ]; dependencies = [ asyncpg From 7efba6d0f69daf0de192626c72627bb002813027 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 12 May 2025 18:29:28 +0200 Subject: [PATCH 2/8] python312Packages.llama-index-llms-openai: 0.3.33 -> 0.3.38 --- .../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 c4c506a436fe..933ec25e387a 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.3.33"; + version = "0.3.38"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_openai"; inherit version; - hash = "sha256-ESlCyiIcIjPtLPmV/a8IZfK3+SldmwHFp/yu83PBrIc="; + hash = "sha256-vNHVISv3yUgwGVhxmh3zYb5is3tWIHMuTJzoBLwHi3c="; }; pythonRemoveDeps = [ From f9aa2ca7fff52f1619ae52cf2e61bb3128cc6e11 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 12 May 2025 18:30:51 +0200 Subject: [PATCH 3/8] python312Packages.llama-index-graph-stores-neptune: 0.3.2 -> 0.3.3 --- .../llama-index-graph-stores-neptune/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix index e2d995905121..98bf1e735e19 100644 --- a/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix +++ b/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix @@ -1,16 +1,16 @@ { lib, + boto3, buildPythonPackage, fetchPypi, - boto3, + hatchling, llama-index-core, - poetry-core, pythonOlder, }: buildPythonPackage rec { pname = "llama-index-graph-stores-neptune"; - version = "0.3.2"; + version = "0.3.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,10 +18,10 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_graph_stores_neptune"; inherit version; - hash = "sha256-jSZ86qdK5KklPFtgyruPtYhJ2Yesd8C1QufhojhKO0A="; + hash = "sha256-IqY4dEWcbM9371vuZ7C9NlDux9O/j6wF7Hcc4aiBiIE="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ boto3 From 4e03a8ac2b907ea502007ed1ab4883ad26287515 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 12 May 2025 18:32:06 +0200 Subject: [PATCH 4/8] python312Packages.llama-index-embeddings-huggingface: 0.5.3 -> 0.5.4 --- .../llama-index-embeddings-huggingface/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix b/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix index 180d1449382e..e72790208bb2 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix @@ -3,14 +3,14 @@ buildPythonPackage, fetchPypi, llama-index-core, - poetry-core, + hatchling, pythonOlder, sentence-transformers, }: buildPythonPackage rec { pname = "llama-index-embeddings-huggingface"; - version = "0.5.3"; + version = "0.5.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,10 +18,10 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_embeddings_huggingface"; inherit version; - hash = "sha256-P+yzY8wNBYkGia78LRvaLwJDGFfgRW/a8ujElg+drq8="; + hash = "sha256-nFjFrPt38Heo5DZgsbA3RgEmqNGAwXVwP/MeidqxnT4="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ llama-index-core From 7d11816d36e6ed2f4108ab787aaac316fd8b972e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 12 May 2025 18:33:14 +0200 Subject: [PATCH 5/8] python312Packages.llama-index-agent-openai: 0.4.6 -> 0.4.7 --- .../llama-index-agent-openai/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-agent-openai/default.nix b/pkgs/development/python-modules/llama-index-agent-openai/default.nix index 30c2c669e290..d6ffbbec17bd 100644 --- a/pkgs/development/python-modules/llama-index-agent-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-agent-openai/default.nix @@ -2,15 +2,15 @@ lib, buildPythonPackage, fetchPypi, + hatchling, llama-index-core, llama-index-llms-openai, - poetry-core, pythonOlder, }: buildPythonPackage rec { pname = "llama-index-agent-openai"; - version = "0.4.6"; + version = "0.4.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,14 +18,12 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_agent_openai"; inherit version; - hash = "sha256-T2bBcxg2q2bEtEElWpXzOlF0PkmTuKqdr0MMsxqn1I4="; + hash = "sha256-+xu6sfCkIzCVA2QaLO2Nwa5sB9WomLT3Ft4NuZV0bg0="; }; pythonRelaxDeps = [ "llama-index-llms-openai" ]; - build-system = [ - poetry-core - ]; + build-system = [ hatchling ]; dependencies = [ llama-index-core From 2d72f28a381e9c71ecc7aee25ee77ef7b520fd84 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 12 May 2025 18:43:03 +0200 Subject: [PATCH 6/8] python312Packages.llama-index-core: 0.12.23 -> 0.12.35 Changelog: https://github.com/run-llama/llama_index/blob/v0.12.35/CHANGELOG.md --- .../python-modules/llama-index-core/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix index 33c01cac7a97..b5b77dc0b4d6 100644 --- a/pkgs/development/python-modules/llama-index-core/default.nix +++ b/pkgs/development/python-modules/llama-index-core/default.nix @@ -1,6 +1,8 @@ { lib, aiohttp, + aiosqlite, + banks, buildPythonPackage, dataclasses-json, deprecated, @@ -8,17 +10,17 @@ fetchFromGitHub, filetype, fsspec, + hatchling, jsonpath-ng, llamaindex-py-client, nest-asyncio, networkx, - nltk, nltk-data, + nltk, numpy, openai, pandas, pillow, - poetry-core, pytest-asyncio, pytest-mock, pytestCheckHook, @@ -36,7 +38,7 @@ buildPythonPackage rec { pname = "llama-index-core"; - version = "0.12.23"; + version = "0.12.35"; pyproject = true; disabled = pythonOlder "3.8"; @@ -45,7 +47,7 @@ buildPythonPackage rec { owner = "run-llama"; repo = "llama_index"; tag = "v${version}"; - hash = "sha256-GFzaorzjeQGreyUjRXP7v7djbSq2boLWZjwO4R2W9E4="; + hash = "sha256-qBLCuQjkUNER70wJiWH6pEN4D2J9L8emGQukdlWAAYU="; }; sourceRoot = "${src.name}/${pname}"; @@ -66,10 +68,12 @@ buildPythonPackage rec { pythonRelaxDeps = [ "tenacity" ]; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ aiohttp + aiosqlite + banks dataclasses-json deprecated dirtyjson @@ -139,6 +143,8 @@ buildPythonPackage rec { # asyncio.exceptions.InvalidStateError: invalid state "test_workflow_context_to_dict_mid_run" "test_SimpleDirectoryReader" + # RuntimeError + "test_str" ]; meta = with lib; { From 86cfd4121ceebbb24c97625df4bafbeb876061ff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 12 May 2025 23:59:13 +0200 Subject: [PATCH 7/8] python312Packages.curated-transformers: 0.1.1 -> 2.0.1 Changelog: https://github.com/explosion/curated-transformers/releases/tag/v2.0.1 --- .../curated-transformers/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/curated-transformers/default.nix b/pkgs/development/python-modules/curated-transformers/default.nix index 332b95fe060c..1c6fd8fdad10 100644 --- a/pkgs/development/python-modules/curated-transformers/default.nix +++ b/pkgs/development/python-modules/curated-transformers/default.nix @@ -1,26 +1,36 @@ { lib, buildPythonPackage, + catalogue, + curated-tokenizers, fetchFromGitHub, + huggingface-hub, setuptools, + tokenizers, torch, }: buildPythonPackage rec { pname = "curated-transformers"; - version = "0.1.1"; + version = "2.0.1"; pyproject = true; src = fetchFromGitHub { owner = "explosion"; repo = "curated-transformers"; tag = "v${version}"; - hash = "sha256-QhJZnQIa9TilwdQCUlxnQCEc6Suj669cht6WHUAr/Gw="; + hash = "sha256-2sedBVpwCppviWix+d3tJFTrLBe+2IBlWnCKgV6MucA="; }; build-system = [ setuptools ]; - dependencies = [ torch ]; + dependencies = [ + catalogue + curated-tokenizers + huggingface-hub + tokenizers + torch + ]; # Unit tests are hard to use, since most tests rely on downloading # models from Hugging Face Hub. From e58d3c0f59fc93035306bdd07dc750efc6e97992 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 May 2025 22:29:32 +0200 Subject: [PATCH 8/8] python312Packages.lama-index: update build-system --- pkgs/development/python-modules/llama-index/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index/default.nix b/pkgs/development/python-modules/llama-index/default.nix index 73cbb09fdcc3..8bba3b0d5704 100644 --- a/pkgs/development/python-modules/llama-index/default.nix +++ b/pkgs/development/python-modules/llama-index/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage, - poetry-core, + hatchling, llama-index-agent-openai, llama-index-cli, llama-index-core, @@ -22,7 +22,7 @@ buildPythonPackage { pyproject = true; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; pythonRelaxDeps = [ "llama-index-core"