diff --git a/pkgs/development/python-modules/llama-index-agent-openai/default.nix b/pkgs/development/python-modules/llama-index-agent-openai/default.nix deleted file mode 100644 index a7b7ca7ed607..000000000000 --- a/pkgs/development/python-modules/llama-index-agent-openai/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - hatchling, - llama-index-core, - llama-index-llms-openai, - pythonOlder, -}: - -buildPythonPackage rec { - pname = "llama-index-agent-openai"; - version = "0.4.12"; - pyproject = true; - - disabled = pythonOlder "3.8"; - - src = fetchPypi { - pname = "llama_index_agent_openai"; - inherit version; - hash = "sha256-0v5T/rac/kV1LttzKL8NJfapBxs8BWeH5mG5Plt0iig="; - }; - - pythonRelaxDeps = [ "llama-index-llms-openai" ]; - - build-system = [ hatchling ]; - - dependencies = [ - llama-index-core - llama-index-llms-openai - ]; - - pythonImportsCheck = [ "llama_index.agent.openai" ]; - - meta = with lib; { - description = "LlamaIndex Agent Integration for OpenAI"; - homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/agent/llama-index-agent-openai"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix b/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix index 2bf7acb72d83..8d09ffdb7126 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix @@ -4,7 +4,7 @@ fetchPypi, google-generativeai, llama-index-core, - poetry-core, + hatchling, pythonOlder, }: @@ -23,7 +23,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "google-generativeai" ]; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ google-generativeai diff --git a/pkgs/development/python-modules/llama-index-embeddings-google/default.nix b/pkgs/development/python-modules/llama-index-embeddings-google/default.nix index e984a934cc0b..d5728bb1a8b8 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-google/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-google/default.nix @@ -4,7 +4,7 @@ fetchPypi, google-generativeai, llama-index-core, - poetry-core, + hatchling, pythonOlder, }: @@ -23,7 +23,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "google-generativeai" ]; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ google-generativeai diff --git a/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix b/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix index b6e00c2d616c..e912fba6adca 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix @@ -4,7 +4,7 @@ fetchPypi, llama-index-core, ollama, - poetry-core, + hatchling, pythonOlder, }: @@ -23,7 +23,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "ollama" ]; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ llama-index-core diff --git a/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix b/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix index 1f4da3f6b17c..23cb2b564f1b 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchPypi, llama-index-core, - poetry-core, + hatchling, pythonOlder, }: @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-rFh4OaERCJ6opiVfkhQBbXqBOzg7u7+SB3mb4RAHWOs="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ llama-index-core ]; diff --git a/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix index f08c410a191e..f279ad97093f 100644 --- a/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix +++ b/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix @@ -4,7 +4,7 @@ fetchPypi, llama-index-core, nebula3-python, - poetry-core, + hatchling, pythonOlder, }: @@ -21,7 +21,7 @@ buildPythonPackage rec { hash = "sha256-BzArWYZIY1SRl1q48wAdAy+mWoId+lNbcsw9LQmmw7Q="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ llama-index-core 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 ee1a9fa73c3f..8acce41c0663 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 @@ -4,7 +4,7 @@ fetchPypi, neo4j, llama-index-core, - poetry-core, + hatchling, pythonOlder, }: @@ -21,7 +21,7 @@ buildPythonPackage rec { hash = "sha256-Iumsnln5iGMAoB3aY4haecm87jYXlEW4/2+uppW8m9c="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ neo4j diff --git a/pkgs/development/python-modules/llama-index-program-openai/default.nix b/pkgs/development/python-modules/llama-index-program-openai/default.nix deleted file mode 100644 index 7c1a0b2a59dd..000000000000 --- a/pkgs/development/python-modules/llama-index-program-openai/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - hatchling, - llama-index-agent-openai, - llama-index-core, - llama-index-llms-openai, -}: - -buildPythonPackage rec { - pname = "llama-index-program-openai"; - version = "0.3.2"; - pyproject = true; - - src = fetchPypi { - pname = "llama_index_program_openai"; - inherit version; - hash = "sha256-BMlZouYWSJiUvS7uu5lQDW8cF9WIw9oN3HXr0+t0Ue4="; - }; - - pythonRelaxDeps = [ "llama-index-agent-openai" ]; - - build-system = [ hatchling ]; - - dependencies = [ - llama-index-agent-openai - llama-index-core - llama-index-llms-openai - ]; - - pythonImportsCheck = [ "llama_index.program.openai" ]; - - meta = with lib; { - description = "LlamaIndex Program Integration for OpenAI"; - homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/program/llama-index-program-openai"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; - }; -} 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 deleted file mode 100644 index bea21efd68fa..000000000000 --- a/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - hatchling, - llama-index-core, - llama-index-llms-openai, - llama-index-program-openai, -}: - -buildPythonPackage rec { - pname = "llama-index-question-gen-openai"; - version = "0.3.1"; - pyproject = true; - - src = fetchPypi { - pname = "llama_index_question_gen_openai"; - inherit version; - hash = "sha256-XpMRtDPMJYH/ilMfoZ+zqiGBW6/3WqrN7xF2CslSKqk="; - }; - - build-system = [ hatchling ]; - - dependencies = [ - llama-index-core - llama-index-llms-openai - llama-index-program-openai - ]; - - # Tests are only available in the mono repo - doCheck = false; - - pythonImportsCheck = [ "llama_index.question_gen.openai" ]; - - meta = with lib; { - description = "LlamaIndex Question Gen Integration for Openai Generator"; - homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/question_gen/llama-index-question-gen-openai"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/llama-index-readers-database/default.nix b/pkgs/development/python-modules/llama-index-readers-database/default.nix index c52b6f97c072..01c58c2754ad 100644 --- a/pkgs/development/python-modules/llama-index-readers-database/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-database/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchPypi, llama-index-core, - poetry-core, + hatchling, pythonOlder, }: @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-5eaNufjXiM4sgc101d19Z3W3CQLE3m8uLa1GOPh05ek="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ llama-index-core ]; diff --git a/pkgs/development/python-modules/llama-index-readers-file/default.nix b/pkgs/development/python-modules/llama-index-readers-file/default.nix index c3af3b457026..8c055851158a 100644 --- a/pkgs/development/python-modules/llama-index-readers-file/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-file/default.nix @@ -29,6 +29,7 @@ buildPythonPackage rec { "pymupdf" "pypdf" "striprtf" + "pandas" ]; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/llama-index-readers-json/default.nix b/pkgs/development/python-modules/llama-index-readers-json/default.nix index 434430ee7969..0bc7703b836e 100644 --- a/pkgs/development/python-modules/llama-index-readers-json/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-json/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchPypi, llama-index-core, - poetry-core, + hatchling, pythonOlder, }: @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-ThQWERdEzPIAUaYWQDkSJdIIvixrKv0eN4LGRaNaS3U="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ llama-index-core ]; diff --git a/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix b/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix index 9b415779ee92..3b0d41172897 100644 --- a/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix @@ -4,7 +4,7 @@ fetchPypi, llama-index-core, llama-parse, - poetry-core, + hatchling, pythonOlder, }: @@ -23,9 +23,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "llama-parse" ]; - nativeBuildInputs = [ - poetry-core - ]; + build-system = [ hatchling ]; propagatedBuildInputs = [ llama-parse diff --git a/pkgs/development/python-modules/llama-index-readers-s3/default.nix b/pkgs/development/python-modules/llama-index-readers-s3/default.nix index 9f40cadfdf5c..a5e7e59fb0c5 100644 --- a/pkgs/development/python-modules/llama-index-readers-s3/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-s3/default.nix @@ -4,7 +4,7 @@ fetchPypi, llama-index-core, llama-index-readers-file, - poetry-core, + hatchling, pythonOlder, s3fs, }: @@ -22,7 +22,7 @@ buildPythonPackage rec { hash = "sha256-3wzxfKkwhC4YfUYPBa/XKqIZQ6zLgB9SSHR+vPhwzOA="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ llama-index-core diff --git a/pkgs/development/python-modules/llama-index-readers-twitter/default.nix b/pkgs/development/python-modules/llama-index-readers-twitter/default.nix index 97e07d49f89d..455f0d8252b6 100644 --- a/pkgs/development/python-modules/llama-index-readers-twitter/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-twitter/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchPypi, llama-index-core, - poetry-core, + hatchling, pythonOlder, tweepy, }: @@ -21,7 +21,7 @@ buildPythonPackage rec { hash = "sha256-AfruOaKbPJasPS0eQjr6501yt32nQ7PvFwD2QVdgBYA="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ llama-index-core diff --git a/pkgs/development/python-modules/llama-index-readers-txtai/default.nix b/pkgs/development/python-modules/llama-index-readers-txtai/default.nix index a6cfc2c6568b..78dfbf23f35a 100644 --- a/pkgs/development/python-modules/llama-index-readers-txtai/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-txtai/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchPypi, llama-index-core, - poetry-core, + hatchling, pythonOlder, }: @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-0eOJ9r27lG6WwOz27+N5qldROoaU5UAewtY4N4m8Kcs="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ llama-index-core ]; diff --git a/pkgs/development/python-modules/llama-index-readers-weather/default.nix b/pkgs/development/python-modules/llama-index-readers-weather/default.nix index 6b24f3b8f9f5..16d821e901c8 100644 --- a/pkgs/development/python-modules/llama-index-readers-weather/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-weather/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchPypi, llama-index-core, - poetry-core, + hatchling, pyowm, pythonOlder, pytestCheckHook, @@ -22,7 +22,7 @@ buildPythonPackage rec { hash = "sha256-qgrHlJXOKWY5UnB2lZAJun3xA9sxn5+ZNNI6+aDnE98="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ llama-index-core diff --git a/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix index 7449e0113e1a..38e63021e9ae 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix @@ -4,7 +4,7 @@ fetchPypi, google-generativeai, llama-index-core, - poetry-core, + hatchling, pythonOlder, }: @@ -24,7 +24,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "google-generativeai" ]; build-system = [ - poetry-core + hatchling ]; dependencies = [ diff --git a/pkgs/development/python-modules/llama-index/default.nix b/pkgs/development/python-modules/llama-index/default.nix index 8bba3b0d5704..c0c36f235dd0 100644 --- a/pkgs/development/python-modules/llama-index/default.nix +++ b/pkgs/development/python-modules/llama-index/default.nix @@ -1,7 +1,6 @@ { buildPythonPackage, hatchling, - llama-index-agent-openai, llama-index-cli, llama-index-core, llama-index-embeddings-openai, @@ -9,8 +8,6 @@ llama-index-legacy, llama-index-llms-openai, llama-index-multi-modal-llms-openai, - llama-index-program-openai, - llama-index-question-gen-openai, llama-index-readers-file, llama-index-readers-llama-parse, }: @@ -30,7 +27,6 @@ buildPythonPackage { ]; dependencies = [ - llama-index-agent-openai llama-index-cli llama-index-core llama-index-embeddings-openai @@ -38,8 +34,6 @@ buildPythonPackage { llama-index-legacy llama-index-llms-openai llama-index-multi-modal-llms-openai - llama-index-program-openai - llama-index-question-gen-openai llama-index-readers-file llama-index-readers-llama-parse ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2e8e93b25913..1933dcc869dc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8442,8 +8442,6 @@ self: super: with self; { llama-index = callPackage ../development/python-modules/llama-index { }; - llama-index-agent-openai = callPackage ../development/python-modules/llama-index-agent-openai { }; - llama-index-cli = callPackage ../development/python-modules/llama-index-cli { }; llama-index-core = callPackage ../development/python-modules/llama-index-core { }; @@ -8502,14 +8500,6 @@ self: super: with self; { callPackage ../development/python-modules/llama-index-multi-modal-llms-openai { }; - llama-index-program-openai = - callPackage ../development/python-modules/llama-index-program-openai - { }; - - llama-index-question-gen-openai = - callPackage ../development/python-modules/llama-index-question-gen-openai - { }; - llama-index-readers-database = callPackage ../development/python-modules/llama-index-readers-database { };