python3Packages.llama-cloud: 0.1.45 -> 1.6.0; upgrade dependents; drop deprecated packages (#499644)
This commit is contained in:
@@ -1,64 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
click,
|
||||
eval-type-backport,
|
||||
fetchFromGitHub,
|
||||
gitUpdater,
|
||||
llama-cloud,
|
||||
llama-index-core,
|
||||
platformdirs,
|
||||
hatchling,
|
||||
pydantic,
|
||||
python-dotenv,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "llama-cloud-services";
|
||||
version = "0.6.94";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "run-llama";
|
||||
repo = "llama_cloud_services";
|
||||
tag = "llama-cloud-services-py%40${finalAttrs.version}";
|
||||
hash = "sha256-BjwXdv7ekehYGGnKk0ElVlxmGkmtam9RLECgxfM7lYc=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/py";
|
||||
|
||||
pythonRelaxDeps = [ "llama-cloud" ];
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
dependencies = [
|
||||
click
|
||||
eval-type-backport
|
||||
llama-cloud
|
||||
llama-index-core
|
||||
platformdirs
|
||||
pydantic
|
||||
python-dotenv
|
||||
];
|
||||
|
||||
# Missing dependency autoevals
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "llama_cloud_services" ];
|
||||
|
||||
# update script sets wrong version
|
||||
passthru = {
|
||||
skipBulkUpdate = true;
|
||||
updateScript = gitUpdater {
|
||||
rev-prefix = "llama-cloud-services-py@";
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Knowledge Agents and Management in the Cloud";
|
||||
homepage = "https://github.com/run-llama/llama_cloud_services";
|
||||
changelog = "https://github.com/run-llama/llama_cloud_services/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
})
|
||||
@@ -2,31 +2,67 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
hatchling,
|
||||
hatch-fancy-pypi-readme,
|
||||
pythonOlder,
|
||||
pythonAtLeast,
|
||||
|
||||
# Dependencies
|
||||
httpx,
|
||||
poetry-core,
|
||||
pydantic,
|
||||
anyio,
|
||||
distro,
|
||||
sniffio,
|
||||
|
||||
# Test dependencies
|
||||
pytestCheckHook,
|
||||
pytest-asyncio,
|
||||
pytest-xdist,
|
||||
dirty-equals,
|
||||
respx,
|
||||
llama-index-core,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "llama-cloud";
|
||||
version = "0.1.45";
|
||||
version = "1.6.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "llama_cloud";
|
||||
inherit version;
|
||||
hash = "sha256-FAJEAIzFcQ4xrpfGBDlzo6mWmlGw84FV+jOoQ0B46Ko=";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-sAx133a1m+zKcvJix1WllSnwwJ8M2nnghu7e/GLVmsg=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "hatchling==1.26.3" "hatchling>=1.26.3"
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
hatchling
|
||||
hatch-fancy-pypi-readme
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
httpx
|
||||
pydantic
|
||||
distro
|
||||
sniffio
|
||||
anyio
|
||||
];
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-asyncio
|
||||
pytest-xdist
|
||||
dirty-equals
|
||||
respx
|
||||
]
|
||||
++ lib.optional (pythonOlder "3.14") llama-index-core;
|
||||
|
||||
# Transitively requires google-pasta (broken on 3.14) through llama-index-core
|
||||
disabledTestPaths = lib.optional (pythonAtLeast "3.14") "tests/test_index.py";
|
||||
|
||||
pythonImportsCheck = [ "llama_cloud" ];
|
||||
|
||||
@@ -36,4 +72,4 @@ buildPythonPackage rec {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -6,18 +6,17 @@
|
||||
llama-index-core,
|
||||
llama-index-embeddings-openai,
|
||||
llama-index-llms-openai,
|
||||
llama-index-vector-stores-chroma,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "llama-index-cli";
|
||||
version = "0.5.5";
|
||||
version = "0.5.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_cli";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-ot5aIvZ19gkIyM0f2HPxMs8r/fNGL6ee9fvmuVcnows=";
|
||||
hash = "sha256-ThTQcv6/Ym0F+CHQSoWN6N2cx8mDdmWKCrmEifWmvPc=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
@@ -26,7 +25,6 @@ buildPythonPackage (finalAttrs: {
|
||||
llama-index-core
|
||||
llama-index-embeddings-openai
|
||||
llama-index-llms-openai
|
||||
llama-index-vector-stores-chroma
|
||||
];
|
||||
|
||||
# Tests are only available in the mono repo
|
||||
|
||||
@@ -31,24 +31,25 @@
|
||||
spacy,
|
||||
sqlalchemy,
|
||||
tenacity,
|
||||
tinytag,
|
||||
tiktoken,
|
||||
tree-sitter,
|
||||
typing-inspect,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "llama-index-core";
|
||||
version = "0.14.12";
|
||||
version = "0.14.19";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "run-llama";
|
||||
repo = "llama_index";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-grF9IToAMc3x5/40+u3lHU9RyjROWu1e3M6N1owq0f4=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-xcssJPBXq3bjSD13nsR6jRTmTWPVks8aKHZCZ3lSKY4=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/${pname}";
|
||||
sourceRoot = "${finalAttrs.src.name}/${finalAttrs.pname}";
|
||||
|
||||
# When `llama-index` is imported, it uses `nltk` to look for the following files and tries to
|
||||
# download them if they aren't present.
|
||||
@@ -96,6 +97,7 @@ buildPythonPackage rec {
|
||||
spacy
|
||||
sqlalchemy
|
||||
tenacity
|
||||
tinytag
|
||||
tiktoken
|
||||
typing-inspect
|
||||
];
|
||||
@@ -133,6 +135,8 @@ buildPythonPackage rec {
|
||||
"tests/tools/"
|
||||
"tests/schema/"
|
||||
"tests/multi_modal_llms/"
|
||||
"tests/prompts/"
|
||||
"tests/base/llms/"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
@@ -160,8 +164,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Data framework for your LLM applications";
|
||||
homepage = "https://github.com/run-llama/llama_index/";
|
||||
changelog = "https://github.com/run-llama/llama_index/blob/${src.tag}/CHANGELOG.md";
|
||||
changelog = "https://github.com/run-llama/llama_index/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -3,23 +3,27 @@
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
llama-index-core,
|
||||
openai,
|
||||
hatchling,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "llama-index-embeddings-openai";
|
||||
version = "0.5.2";
|
||||
version = "0.6.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_embeddings_openai";
|
||||
inherit version;
|
||||
hash = "sha256-CRvQw+kYJ0jogn3n15cTohnV9eDcl9G7eycc9SRSDks=";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-6z5mBr6By4kSUHPiPJfAphGdq7SCetvRRpfCAprXPyk=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
dependencies = [ llama-index-core ];
|
||||
dependencies = [
|
||||
llama-index-core
|
||||
openai
|
||||
];
|
||||
|
||||
# Tests are only available in the mono repo
|
||||
doCheck = false;
|
||||
@@ -32,4 +36,4 @@ buildPythonPackage rec {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,46 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
deprecated,
|
||||
hatchling,
|
||||
llama-cloud,
|
||||
llama-index-core,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-indices-managed-llama-cloud";
|
||||
version = "0.9.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_indices_managed_llama_cloud";
|
||||
inherit version;
|
||||
hash = "sha256-teAHUqswVkq/GcV1laIQf1aXw7A7CFgXtPyoSjjrvVk=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"deprecated"
|
||||
"llama-cloud"
|
||||
];
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
dependencies = [
|
||||
deprecated
|
||||
llama-cloud
|
||||
llama-index-core
|
||||
];
|
||||
|
||||
# Tests are only available in the mono repo
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "llama_index.indices.managed.llama_cloud" ];
|
||||
|
||||
meta = {
|
||||
description = "LlamaCloud Index and Retriever";
|
||||
homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/indices/llama-index-indices-managed-llama-cloud";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@@ -5,18 +5,17 @@
|
||||
hatchling,
|
||||
llama-index-core,
|
||||
llama-index-llms-openai,
|
||||
transformers,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "llama-index-llms-openai-like";
|
||||
version = "0.6.0";
|
||||
version = "0.7.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_llms_openai_like";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-aTjP7WLHeHa6Q/JlGaq/VVd1/Y4Ofhry3fN6n8kdyjI=";
|
||||
hash = "sha256-znzvNoax5i18CBNLTYylZwbMqBbkxAmOrt4zACgppvk=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
@@ -24,7 +23,6 @@ buildPythonPackage (finalAttrs: {
|
||||
dependencies = [
|
||||
llama-index-core
|
||||
llama-index-llms-openai
|
||||
transformers
|
||||
];
|
||||
|
||||
# Tests are only available in the mono repo
|
||||
|
||||
@@ -9,20 +9,15 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "llama-index-llms-openai";
|
||||
version = "0.6.26";
|
||||
version = "0.7.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_llms_openai";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-NHRgLsvDDIiotYXP1XN4kdRdp4JRpeBnxNvC08w9CNs=";
|
||||
hash = "sha256-NnpHdp9jqfZi5uP6kCT/27Q0nXbWZ+zeTAaDYNzJ3oM=";
|
||||
};
|
||||
|
||||
pythonRemoveDeps = [
|
||||
# Circular dependency
|
||||
"llama-index-agent-openai"
|
||||
];
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
dependencies = [
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
hatchling,
|
||||
llama-index-core,
|
||||
llama-index-llms-openai,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-multi-modal-llms-openai";
|
||||
version = "0.6.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_multi_modal_llms_openai";
|
||||
inherit version;
|
||||
hash = "sha256-4znltqFodiuXkTN51b6PqdZj/SF435/YmAH5P4fMnRk=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
dependencies = [
|
||||
llama-index-core
|
||||
llama-index-llms-openai
|
||||
];
|
||||
|
||||
# Tests are only available in the mono repo
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "llama_index.multi_modal_llms.openai" ];
|
||||
|
||||
meta = {
|
||||
description = "LlamaIndex Multi-Modal-Llms Integration for OpenAI";
|
||||
homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/multi_modal_llms/llama-index-multi-modal-llms-openai";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@@ -1,41 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
llama-index-core,
|
||||
llama-parse,
|
||||
hatchling,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-readers-llama-parse";
|
||||
version = "0.6.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_readers_llama_parse";
|
||||
inherit version;
|
||||
hash = "sha256-bghrcDSgAbsCBONDHLHO5bbsE/kwrL+aboLGSu1ysJ4=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "llama-parse" ];
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
llama-parse
|
||||
llama-index-core
|
||||
];
|
||||
|
||||
# Tests are only available in the mono repo
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "llama_index.readers.llama_parse" ];
|
||||
|
||||
meta = {
|
||||
description = "LlamaIndex Readers Integration for files";
|
||||
homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/readers/llama-index-readers-llama-parse";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@@ -4,12 +4,8 @@
|
||||
llama-index-cli,
|
||||
llama-index-core,
|
||||
llama-index-embeddings-openai,
|
||||
llama-index-indices-managed-llama-cloud,
|
||||
llama-index-legacy,
|
||||
llama-index-llms-openai,
|
||||
llama-index-multi-modal-llms-openai,
|
||||
llama-index-readers-file,
|
||||
llama-index-readers-llama-parse,
|
||||
nltk,
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
@@ -21,21 +17,14 @@ buildPythonPackage {
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"llama-index-core"
|
||||
"llama-index-multi-modal-llms-openai"
|
||||
];
|
||||
pythonRelaxDeps = [ "llama-index-core" ];
|
||||
|
||||
dependencies = [
|
||||
llama-index-cli
|
||||
llama-index-core
|
||||
llama-index-embeddings-openai
|
||||
llama-index-indices-managed-llama-cloud
|
||||
llama-index-legacy
|
||||
llama-index-llms-openai
|
||||
llama-index-multi-modal-llms-openai
|
||||
llama-index-readers-file
|
||||
llama-index-readers-llama-parse
|
||||
nltk
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "llama_index" ];
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
llama-cloud-services,
|
||||
hatchling,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-parse";
|
||||
version = "0.6.90";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "llama_parse";
|
||||
inherit version;
|
||||
hash = "sha256-7OqBGrj6lKe4Y90NNYQRPGMFRRM2i64ix6LYtnzPOu0=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
dependencies = [ llama-cloud-services ];
|
||||
|
||||
# llama-cloud-services fails to read
|
||||
pythonRelaxDeps = [ "llama-cloud-services" ];
|
||||
|
||||
pythonImportsCheck = [ "llama_parse" ];
|
||||
|
||||
meta = {
|
||||
description = "Parse files into RAG-Optimized formats";
|
||||
homepage = "https://pypi.org/project/llama-parse/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@@ -290,6 +290,11 @@ mapAliases {
|
||||
line_profiler = throw "'line_profiler' has been renamed to/replaced by 'line-profiler'"; # Converted to throw 2025-10-29
|
||||
linear-garage-door = throw "'linear-garage-door' has been superseded by 'nice-go'"; # Added 2025-11-16
|
||||
linear_operator = throw "'linear_operator' has been renamed to/replaced by 'linear-operator'"; # Converted to throw 2025-10-29
|
||||
llama-cloud-services = throw "'llama-cloud-services' has been removed as it was deprecated upstream in favor of 'llama-cloud'"; # Added 2026-03-25
|
||||
llama-index-indices-managed-llama-cloud = throw "'llama-index-indices-managed-llama-cloud' has been removed as it was deprecated upstream in favor of 'llama-cloud'"; # Added 2026-03-24
|
||||
llama-index-multi-modal-llms-openai = throw "'llama-index-multi-modal-llms-openai' has been removed as it was deprecated in favor of 'llama-index-llms-openai'"; # added 2026-03-25
|
||||
llama-index-readers-llama-parse = throw "'llama-index-readers-llama-parse' has been removed as it was deprecated upstream in favor of 'llama-cloud'"; # added 2026-03-25
|
||||
llama-parse = throw "'llama-parse' has been removed as it was deprecated upstream in favor of 'llama-cloud'"; # added 2026-03-25
|
||||
lmcloud = throw "'lmcloud' has been renamed to/replaced by 'pylamarzocco'"; # Converted to throw 2025-10-29
|
||||
logilab_common = throw "'logilab_common' has been renamed to/replaced by 'logilab-common'"; # Converted to throw 2025-10-29
|
||||
loo-py = throw "'loo-py' has been renamed to/replaced by 'loopy'"; # Converted to throw 2025-10-29
|
||||
|
||||
@@ -9005,8 +9005,6 @@ self: super: with self; {
|
||||
|
||||
llama-cloud = callPackage ../development/python-modules/llama-cloud { };
|
||||
|
||||
llama-cloud-services = callPackage ../development/python-modules/llama-cloud-services { };
|
||||
|
||||
llama-cpp-python = callPackage ../development/python-modules/llama-cpp-python { };
|
||||
|
||||
llama-index = callPackage ../development/python-modules/llama-index { };
|
||||
@@ -9047,10 +9045,6 @@ self: super: with self; {
|
||||
callPackage ../development/python-modules/llama-index-graph-stores-neptune
|
||||
{ };
|
||||
|
||||
llama-index-indices-managed-llama-cloud =
|
||||
callPackage ../development/python-modules/llama-index-indices-managed-llama-cloud
|
||||
{ };
|
||||
|
||||
llama-index-instrumentation =
|
||||
callPackage ../development/python-modules/llama-index-instrumentation
|
||||
{ };
|
||||
@@ -9065,10 +9059,6 @@ self: super: with self; {
|
||||
callPackage ../development/python-modules/llama-index-llms-openai-like
|
||||
{ };
|
||||
|
||||
llama-index-multi-modal-llms-openai =
|
||||
callPackage ../development/python-modules/llama-index-multi-modal-llms-openai
|
||||
{ };
|
||||
|
||||
llama-index-node-parser-docling =
|
||||
callPackage ../development/python-modules/llama-index-node-parser-docling
|
||||
{ };
|
||||
@@ -9085,10 +9075,6 @@ self: super: with self; {
|
||||
|
||||
llama-index-readers-json = callPackage ../development/python-modules/llama-index-readers-json { };
|
||||
|
||||
llama-index-readers-llama-parse =
|
||||
callPackage ../development/python-modules/llama-index-readers-llama-parse
|
||||
{ };
|
||||
|
||||
llama-index-readers-s3 = callPackage ../development/python-modules/llama-index-readers-s3 { };
|
||||
|
||||
llama-index-readers-twitter =
|
||||
@@ -9123,8 +9109,6 @@ self: super: with self; {
|
||||
|
||||
llama-index-workflows = callPackage ../development/python-modules/llama-index-workflows { };
|
||||
|
||||
llama-parse = callPackage ../development/python-modules/llama-parse { };
|
||||
|
||||
llama-stack-client = callPackage ../development/python-modules/llama-stack-client { };
|
||||
|
||||
llamaindex-py-client = callPackage ../development/python-modules/llamaindex-py-client { };
|
||||
|
||||
Reference in New Issue
Block a user