diff --git a/pkgs/development/python-modules/llama-cloud-services/default.nix b/pkgs/development/python-modules/llama-cloud-services/default.nix index fcc8509ca390..016731daf7f1 100644 --- a/pkgs/development/python-modules/llama-cloud-services/default.nix +++ b/pkgs/development/python-modules/llama-cloud-services/default.nix @@ -2,32 +2,30 @@ lib, buildPythonPackage, click, - deepdiff, eval-type-backport, fetchFromGitHub, + gitUpdater, llama-cloud, llama-index-core, platformdirs, hatchling, pydantic, - pytest-asyncio, - pytestCheckHook, python-dotenv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "llama-cloud-services"; - version = "0.6.79"; + version = "0.6.94"; pyproject = true; src = fetchFromGitHub { owner = "run-llama"; repo = "llama_cloud_services"; - tag = "llama-cloud-services-py%40${version}"; + tag = "llama-cloud-services-py%40${finalAttrs.version}"; hash = "sha256-BjwXdv7ekehYGGnKk0ElVlxmGkmtam9RLECgxfM7lYc="; }; - sourceRoot = "${src.name}/py"; + sourceRoot = "${finalAttrs.src.name}/py"; pythonRelaxDeps = [ "llama-cloud" ]; @@ -48,11 +46,19 @@ buildPythonPackage rec { 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/${src.tag}"; + changelog = "https://github.com/run-llama/llama_cloud_services/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix b/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix index db455d4a5b8f..10d11c058b89 100644 --- a/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix +++ b/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + deprecated, hatchling, llama-cloud, llama-index-core, @@ -18,11 +19,15 @@ buildPythonPackage rec { hash = "sha256-teAHUqswVkq/GcV1laIQf1aXw7A7CFgXtPyoSjjrvVk="; }; - pythonRelaxDeps = [ "llama-cloud" ]; + pythonRelaxDeps = [ + "deprecated" + "llama-cloud" + ]; build-system = [ hatchling ]; dependencies = [ + deprecated llama-cloud llama-index-core ]; diff --git a/pkgs/development/python-modules/llama-parse/default.nix b/pkgs/development/python-modules/llama-parse/default.nix index 12e22cde1bb0..365d60aafbe9 100644 --- a/pkgs/development/python-modules/llama-parse/default.nix +++ b/pkgs/development/python-modules/llama-parse/default.nix @@ -21,6 +21,9 @@ buildPythonPackage rec { dependencies = [ llama-cloud-services ]; + # llama-cloud-services fails to read + pythonRelaxDeps = [ "llama-cloud-services" ]; + pythonImportsCheck = [ "llama_parse" ]; meta = {