diff --git a/pkgs/development/python-modules/llama-cloud-services/default.nix b/pkgs/development/python-modules/llama-cloud-services/default.nix index a580fd06601d..b0d1a6c461f6 100644 --- a/pkgs/development/python-modules/llama-cloud-services/default.nix +++ b/pkgs/development/python-modules/llama-cloud-services/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "llama-cloud-services"; - version = "0.6.36"; + version = "0.6.37"; pyproject = true; src = fetchFromGitHub { owner = "run-llama"; repo = "llama_cloud_services"; tag = "v${version}"; - hash = "sha256-m3XC4CiDUJemy7enWMG5iYGX6s7LGSfc16vGmDWhAic="; + hash = "sha256-Ag8HZZjKgJk6D9uipntydYwVS8TKqZH7pOWaJ9EPuE0="; }; pythonRelaxDeps = [ "llama-cloud" ]; diff --git a/pkgs/development/python-modules/llama-cloud/default.nix b/pkgs/development/python-modules/llama-cloud/default.nix index a5be40deffb2..c0468d9d5979 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.23"; + version = "0.1.29"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_cloud"; inherit version; - hash = "sha256-PYSiSoYPBG05oQbAZ0LsDqOaV0rEK7+RcG/gJfROIz4="; + hash = "sha256-aZWUPtTx0f5lT36l0BlwYRxdxwYC3q+TeGt/lUXnDx4="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-cli/default.nix b/pkgs/development/python-modules/llama-index-cli/default.nix index e7080e0754dc..d5c2e61913fa 100644 --- a/pkgs/development/python-modules/llama-index-cli/default.nix +++ b/pkgs/development/python-modules/llama-index-cli/default.nix @@ -2,28 +2,25 @@ lib, buildPythonPackage, fetchPypi, + hatchling, llama-index-core, llama-index-embeddings-openai, llama-index-llms-openai, llama-index-vector-stores-chroma, - poetry-core, - pythonOlder, }: buildPythonPackage rec { pname = "llama-index-cli"; - version = "0.4.1"; + version = "0.4.3"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchPypi { pname = "llama_index_cli"; inherit version; - hash = "sha256-P5fx+PX0Ad+1trxxcHF8F23NmBU4AXQwBz7xL/3L3fo="; + hash = "sha256-2ugYOhBVG72JaGuU7SlKbPRGM8PdYoXE+ZHIUDG3pV8="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ llama-index-core diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix index c8c0148f37c1..1884be89b303 100644 --- a/pkgs/development/python-modules/llama-index-core/default.nix +++ b/pkgs/development/python-modules/llama-index-core/default.nix @@ -12,6 +12,7 @@ fsspec, hatchling, jsonpath-ng, + llama-index-workflows, llamaindex-py-client, nest-asyncio, networkx, @@ -38,16 +39,16 @@ buildPythonPackage rec { pname = "llama-index-core"; - version = "0.12.37"; + version = "0.12.44"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "run-llama"; repo = "llama_index"; tag = "v${version}"; - hash = "sha256-M6DiCJZu9mtb8NxzEiBsbpLJmpStNScTtHdr70H7Dvk="; + hash = "sha256-i/aH/PU2e03jy6dWYhrn2QhTrc4UMr7cRGqhkbMbqug="; }; sourceRoot = "${src.name}/${pname}"; @@ -66,7 +67,10 @@ buildPythonPackage rec { cp -r ${nltk-data.punkt}/tokenizers/punkt/* llama_index/core/_static/nltk_cache/tokenizers/punkt/ ''; - pythonRelaxDeps = [ "tenacity" ]; + pythonRelaxDeps = [ + "setuptools" + "tenacity" + ]; build-system = [ hatchling ]; @@ -80,6 +84,7 @@ buildPythonPackage rec { filetype fsspec jsonpath-ng + llama-index-workflows llamaindex-py-client nest-asyncio networkx @@ -129,6 +134,8 @@ buildPythonPackage rec { "tests/text_splitter/" "tests/token_predictor/" "tests/tools/" + "tests/schema/" + "tests/multi_modal_llms/" ]; disabledTests = [ @@ -144,6 +151,7 @@ buildPythonPackage rec { "test_from_persist_dir" "test_mimetype_raw_data" "test_multiple_documents_context" + "test_resource" # asyncio.exceptions.InvalidStateError: invalid state "test_workflow_context_to_dict_mid_run" "test_SimpleDirectoryReader" 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 e72790208bb2..39c334ced50f 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-embeddings-huggingface"; - version = "0.5.4"; + version = "0.5.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_embeddings_huggingface"; inherit version; - hash = "sha256-nFjFrPt38Heo5DZgsbA3RgEmqNGAwXVwP/MeidqxnT4="; + hash = "sha256-f26aAx2RRvI131l8DM1igM3pa5tDf5kFLOebty5frF4="; }; build-system = [ hatchling ]; 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 4f225c8abf44..e5052ea8a0a4 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 @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-indices-managed-llama-cloud"; - version = "0.7.1"; + version = "0.7.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,9 +18,11 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_indices_managed_llama_cloud"; inherit version; - hash = "sha256-+GtifVEN1PvlFEdzTxmBG9ipVcQtUx8jeoVpi50eQUA="; + hash = "sha256-f9cwopZ9wg60Iq4vpAKLTPcCMRSlz621IyNVE3dUGG8="; }; + pythonRelaxDeps = [ "llama-cloud" ]; + build-system = [ hatchling ]; dependencies = [ diff --git a/pkgs/development/python-modules/llama-index-instrumentation/default.nix b/pkgs/development/python-modules/llama-index-instrumentation/default.nix new file mode 100644 index 000000000000..d521e38c2726 --- /dev/null +++ b/pkgs/development/python-modules/llama-index-instrumentation/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildPythonPackage, + deprecated, + fetchPypi, + hatchling, + pydantic, +}: + +buildPythonPackage rec { + pname = "llama-index-instrumentation"; + version = "0.2.0"; + pyproject = true; + + src = fetchPypi { + pname = "llama_index_instrumentation"; + inherit version; + hash = "sha256-roMzUiSH4iozcykkqaCN+0VvVJk8XJfYNA2zxiC3bxM="; + }; + + pythonRelaxDeps = [ "pydantic" ]; + + build-system = [ hatchling ]; + + dependencies = [ + deprecated + pydantic + ]; + + pythonImportsCheck = [ "llama_index_instrumentation" ]; + + meta = { + description = "Support for instrumentation in LlamaIndex applications"; + homepage = "https://pypi.org/project/llama-index-instrumentation/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} 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 afd8c6e45f44..85be869d1e2d 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.5.6"; + version = "0.6.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_ollama"; inherit version; - hash = "sha256-RDiMv6riuVcvbqZzTAcBXHcoI/vm0ssmx9/jT65R3cU="; + hash = "sha256-G+QIHwupyd07XScMLoAJwlaztqExLLOKDHJNuousEwQ="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix b/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix index 8eaea6ae5860..7fb71c87f8e5 100644 --- a/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-llms-openai-like"; - version = "0.3.5"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_openai_like"; inherit version; - hash = "sha256-1TId/2bYHYuQCMdvROlcSZFTZDUyrMhZop5xRicvrNk="; + hash = "sha256-Fa4cFrAboL+oItU5APA+NcGf/ke1KJWCNL8ZQqkfWHw="; }; build-system = [ hatchling ]; 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 6b70c3c24aaf..6c8184258300 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.44"; + version = "0.4.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_openai"; inherit version; - hash = "sha256-BJUGpYQYi2xWXYca624RpsUiln1LT18ZE+tG/Xuz1zE="; + hash = "sha256-Vkr4qzn7Pzrf6uc6WcDcpGwJmrhEoo5yXu4MVR1Iafg="; }; pythonRemoveDeps = [ 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 41b0172b4bdf..63bac0367ff0 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 @@ -2,26 +2,23 @@ lib, buildPythonPackage, fetchPypi, + hatchling, llama-index-core, llama-index-llms-openai, - poetry-core, - pythonOlder, }: buildPythonPackage rec { pname = "llama-index-multi-modal-llms-openai"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchPypi { pname = "llama_index_multi_modal_llms_openai"; inherit version; - hash = "sha256-tv0SaEKrjDQobWtkENK2lfuZbOa/htUA2SS12kTfC0E="; + hash = "sha256-3zr/AMNgI8X4xJ+XKjJfcYI+0PTdnNR5lV12r8FGV18="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ llama-index-core diff --git a/pkgs/development/python-modules/llama-index-program-openai/default.nix b/pkgs/development/python-modules/llama-index-program-openai/default.nix index 6f8fea48c093..7c1a0b2a59dd 100644 --- a/pkgs/development/python-modules/llama-index-program-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-program-openai/default.nix @@ -2,29 +2,26 @@ lib, buildPythonPackage, fetchPypi, + hatchling, llama-index-agent-openai, llama-index-core, llama-index-llms-openai, - poetry-core, - pythonOlder, }: buildPythonPackage rec { pname = "llama-index-program-openai"; - version = "0.3.1"; + version = "0.3.2"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchPypi { pname = "llama_index_program_openai"; inherit version; - hash = "sha256-YDmmzb/2LGOIwH6CoVf+Lt07vvDFrfKSrYVGv07HW4I="; + hash = "sha256-BMlZouYWSJiUvS7uu5lQDW8cF9WIw9oN3HXr0+t0Ue4="; }; pythonRelaxDeps = [ "llama-index-agent-openai" ]; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ llama-index-agent-openai diff --git a/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix b/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix index 38b6e5dc8568..bea21efd68fa 100644 --- a/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix @@ -2,27 +2,24 @@ lib, buildPythonPackage, fetchPypi, + hatchling, llama-index-core, llama-index-llms-openai, llama-index-program-openai, - poetry-core, - pythonOlder, }: buildPythonPackage rec { pname = "llama-index-question-gen-openai"; - version = "0.3.0"; + version = "0.3.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchPypi { pname = "llama_index_question_gen_openai"; inherit version; - hash = "sha256-79O0aCMoCOnTR0ZwquqwDkG5D3X1LQyb+/ESB+CWPWI="; + hash = "sha256-XpMRtDPMJYH/ilMfoZ+zqiGBW6/3WqrN7xF2CslSKqk="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; 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 8584919c8c48..1fb8eaf7c126 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 @@ -3,14 +3,14 @@ buildPythonPackage, chromadb, fetchPypi, + hatchling, llama-index-core, pythonOlder, - poetry-core, }: buildPythonPackage rec { pname = "llama-index-vector-stores-chroma"; - version = "0.4.1"; + version = "0.4.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,10 +18,10 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_chroma"; inherit version; - hash = "sha256-cO50zPMErdoEFx0BTkg3WcaKHJL2eeosoua29Ftv7wg="; + hash = "sha256-F0YzgV4KiDiutiiBbiz10djG+PaEf0J+ADLTUHHq0ME="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ chromadb diff --git a/pkgs/development/python-modules/llama-index-workflows/default.nix b/pkgs/development/python-modules/llama-index-workflows/default.nix new file mode 100644 index 000000000000..78d738d83a71 --- /dev/null +++ b/pkgs/development/python-modules/llama-index-workflows/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + eval-type-backport, + fetchPypi, + hatchling, + llama-index-instrumentation, + pydantic, +}: + +buildPythonPackage rec { + pname = "llama-index-workflows"; + version = "1.0.1"; + pyproject = true; + + src = fetchPypi { + pname = "llama_index_workflows"; + inherit version; + hash = "sha256-B6aM9YBA1GmvjQX1YhdBiuZARVfwJUv/IqdIGYeBjj8="; + }; + + pythonRelaxDeps = [ "pydantic" ]; + + build-system = [ hatchling ]; + + dependencies = [ + eval-type-backport + llama-index-instrumentation + pydantic + ]; + + pythonImportsCheck = [ "workflows" ]; + + meta = { + description = "An event-driven, async-first, step-based way to control the execution flow of AI applications like Agents"; + homepage = "https://pypi.org/project/llama-index-workflows/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/llama-parse/default.nix b/pkgs/development/python-modules/llama-parse/default.nix index 6010964e118b..6a74e6fb123e 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.6.23"; + version = "0.6.37"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_parse"; inherit version; - hash = "sha256-7lddEmYN5XJkkArkFOfGFkbbn73QMP15X7TOTSjYP4U="; + hash = "sha256-ZKeUdxHnnQns1j4MnKaHGvRbE6cFfd6BJGkT11bUZnQ="; }; build-system = [ poetry-core ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 84bcd5c4a20b..8bf8b075bc19 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8323,6 +8323,10 @@ self: super: with self; { callPackage ../development/python-modules/llama-index-indices-managed-llama-cloud { }; + llama-index-instrumentation = + callPackage ../development/python-modules/llama-index-instrumentation + { }; + llama-index-legacy = callPackage ../development/python-modules/llama-index-legacy { }; llama-index-llms-ollama = callPackage ../development/python-modules/llama-index-llms-ollama { }; @@ -8385,6 +8389,8 @@ self: super: with self; { callPackage ../development/python-modules/llama-index-vector-stores-qdrant { }; + llama-index-workflows = callPackage ../development/python-modules/llama-index-workflows { }; + llama-parse = callPackage ../development/python-modules/llama-parse { }; llamaindex-py-client = callPackage ../development/python-modules/llamaindex-py-client { };