python312Packages.txtai: 7.4.0 -> 8.0.0; fix (#352153)

pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix

@@ -7,7 +7,6 @@
   pgvector,
   poetry-core,
   psycopg2,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -15,8 +14,6 @@ buildPythonPackage rec {
   version = "0.2.6";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchPypi {
     pname = "llama_index_vector_stores_postgres";
     inherit version;
@@ -25,6 +22,10 @@ buildPythonPackage rec {
 
   pythonRemoveDeps = [ "psycopg2-binary" ];
 
+  pythonRelaxDeps = [
+    "pgvector"
+  ];
+
   build-system = [
     poetry-core
   ];
@@ -38,10 +39,10 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "llama_index.vector_stores.postgres" ];
 
-  meta = with lib; {
+  meta = {
     description = "LlamaIndex Vector Store Integration for Postgres";
     homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/vector_stores/llama-index-vector-stores-postgres";
-    license = licenses.mit;
+    license = lib.licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    maintainers = with lib.maintainers; [ fab ];
   };
 }

pkgs/development/python-modules/pgvector/default.nix

@@ -1,10 +1,17 @@
 {
   lib,
-  asyncpg,
   buildPythonPackage,
-  django,
   fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
   numpy,
+
+  # tests
+  asyncpg,
+  django,
   peewee,
   postgresql,
   postgresqlTestHook,
@@ -12,37 +19,38 @@
   psycopg2,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
+  scipy,
   sqlalchemy,
   sqlmodel,
 }:
 
 buildPythonPackage rec {
   pname = "pgvector";
-  version = "0.2.4";
+  version = "0.3.6";
-  format = "setuptools";
+  pyproject = true;
-
-  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "pgvector";
     repo = "pgvector-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-XKoaEwLW59pV4Dwis7p2L65XoO2zUEa1kXxz6Lgs2d8=";
+    hash = "sha256-ho0UgamZxsN+pv7QkpsDnN7f+I+SrexA2gVtmJF8/3Q=";
   };
 
-  propagatedBuildInputs = [ numpy ];
+  build-system = [ setuptools ];
+
+  dependencies = [ numpy ];
 
   nativeCheckInputs = [
     asyncpg
     django
     peewee
-    (postgresql.withPackages (p: with p; [ pgvector ]))
-    postgresqlTestHook
     psycopg
     psycopg2
+    (postgresql.withPackages (p: with p; [ pgvector ]))
+    postgresqlTestHook
     pytest-asyncio
     pytestCheckHook
+    scipy
     sqlalchemy
     sqlmodel
   ];
@@ -55,11 +63,13 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "pgvector" ];
 
-  meta = with lib; {
+  __darwinAllowLocalNetworking = true;
+
+  meta = {
     description = "Pgvector support for Python";
     homepage = "https://github.com/pgvector/pgvector-python";
     changelog = "https://github.com/pgvector/pgvector-python/blob/${src.rev}/CHANGELOG.md";
-    license = licenses.mit;
+    license = lib.licenses.mit;
-    maintainers = with maintainers; [ natsukium ];
+    maintainers = with lib.maintainers; [ natsukium ];
   };
 }

pkgs/development/python-modules/txtai/default.nix

@@ -1,10 +1,12 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
+
+  # build-system
   setuptools,
-  # propagated build input
+
+  # dependencies
   faiss,
   torch,
   transformers,
@@ -12,61 +14,80 @@
   numpy,
   pyyaml,
   regex,
+
   # optional-dependencies
+  # ann
+  annoy,
+  hnswlib,
+  pgvector,
+  sqlalchemy,
+  sqlite-vec,
+  # api
   aiohttp,
   fastapi,
-  uvicorn,
-  # TODO add apache-libcloud
-  # , apache-libcloud
-  rich,
-  duckdb,
   pillow,
+  python-multipart,
+  uvicorn,
+  # cloud
+  # apache-libcloud, (unpackaged)
+  # console
+  rich,
+  # database
+  duckdb,
+  # graph
+  # grand-cypher (unpackaged)
+  # grand-graph (unpackaged)
   networkx,
   python-louvain,
+  # model
   onnx,
   onnxruntime,
+  # pipeline-audio
+  # model2vec,
+  sounddevice,
   soundfile,
   scipy,
   ttstokenizer,
+  webrtcvad,
+  # pipeline-data
   beautifulsoup4,
   nltk,
   pandas,
   tika,
+  # pipeline-image
   imagehash,
   timm,
+  # pipeline-llm
+  litellm,
+  # llama-cpp-python, (unpackaged)
+  # pipeline-text
   fasttext,
   sentencepiece,
+  # pipeline-train
   accelerate,
+  bitsandbytes,
   onnxmltools,
-  annoy,
+  peft,
-  hnswlib,
+  skl2onnx,
-  # TODO add pymagnitude-lite
+  # vectors
-  #, pymagnitude-lite
+  # pymagnitude-lite, (unpackaged)
   scikit-learn,
   sentence-transformers,
+  skops,
+  # workflow
+  # apache-libcloud (unpackaged)
   croniter,
   openpyxl,
   requests,
   xmltodict,
-  pgvector,
+
-  sqlite-vec,
+  # tests
-  python-multipart,
-  # native check inputs
-  pytestCheckHook,
-  # check inputs
   httpx,
   msgpack,
-  sqlalchemy,
+  pytestCheckHook,
 }:
 let
-  version = "7.4.0";
+  version = "8.0.0";
-  api = [
-    aiohttp
-    fastapi
-    pillow
-    python-multipart
-    uvicorn
-  ];
   ann = [
     annoy
     hnswlib
@@ -74,30 +95,39 @@ let
     sqlalchemy
     sqlite-vec
   ];
+  api = [
+    aiohttp
+    fastapi
+    pillow
+    python-multipart
+    uvicorn
+  ];
   # cloud = [ apache-libcloud ];
   console = [ rich ];
-
   database = [
     duckdb
     pillow
+    sqlalchemy
   ];
-
   graph = [
+    # grand-cypher
+    # grand-graph
     networkx
     python-louvain
+    sqlalchemy
   ];
-
   model = [
     onnx
     onnxruntime
   ];
-
   pipeline-audio = [
     onnx
     onnxruntime
-    soundfile
     scipy
+    sounddevice
+    soundfile
     ttstokenizer
+    webrtcvad
   ];
   pipeline-data = [
     beautifulsoup4
@@ -110,25 +140,40 @@ let
     pillow
     timm
   ];
+  pipeline-llm = [
+    litellm
+    # llama-cpp-python
+  ];
   pipeline-text = [
     fasttext
     sentencepiece
   ];
   pipeline-train = [
     accelerate
+    bitsandbytes
     onnx
     onnxmltools
     onnxruntime
+    peft
+    skl2onnx
   ];
-  pipeline = pipeline-audio ++ pipeline-data ++ pipeline-image ++ pipeline-text ++ pipeline-train;
+  pipeline =
-
+    pipeline-audio
-  similarity = [
+    ++ pipeline-data
-    annoy
+    ++ pipeline-image
+    ++ pipeline-llm
+    ++ pipeline-text
+    ++ pipeline-train;
+  scoring = [ sqlalchemy ];
+  vectors = [
     fasttext
-    hnswlib
+    litellm
+    # llama-cpp-python
+    # model2vec
     # pymagnitude-lite
     scikit-learn
     sentence-transformers
+    skops
   ];
   workflow = [
     # apache-libcloud
@@ -139,7 +184,18 @@ let
     requests
     xmltodict
   ];
-  all = api ++ ann ++ console ++ database ++ graph ++ model ++ pipeline ++ similarity ++ workflow;
+  similarity = ann ++ vectors;
+  all =
+    api
+    ++ ann
+    ++ console
+    ++ database
+    ++ graph
+    ++ model
+    ++ pipeline
+    ++ scoring
+    ++ similarity
+    ++ workflow;
 
   optional-dependencies = {
     inherit
@@ -151,9 +207,11 @@ let
       model
       pipeline-audio
       pipeline-image
+      pipeline-llm
       pipeline-text
       pipeline-train
       pipeline
+      scoring
       similarity
       workflow
       all
@@ -165,17 +223,14 @@ buildPythonPackage {
   inherit version;
   pyproject = true;
 
-
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "neuml";
     repo = "txtai";
     rev = "refs/tags/v${version}";
-    hash = "sha256-DQB12mFUMsKJ8cACowI1Vc7k2n1npdTOQknRmHd5EIM=";
+    hash = "sha256-qhbtKZo0C4OcXdKBGBJhfBMmY0DzbEx6n7d4y4MenN0=";
   };
 
-  buildTools = [ setuptools ];
+  build-system = [ setuptools ];
 
   pythonRemoveDeps = [
     # We call it faiss, not faiss-cpu.
@@ -184,12 +239,13 @@ buildPythonPackage {
 
   dependencies = [
     faiss
-    torch
-    transformers
     huggingface-hub
+    msgpack
     numpy
     pyyaml
     regex
+    torch
+    transformers
   ];
 
   optional-dependencies = optional-dependencies;
@@ -203,21 +259,19 @@ buildPythonPackage {
   pythonImportsCheck = [ "txtai" ];
 
   nativeCheckInputs = [
-    pytestCheckHook
-  ] ++ optional-dependencies.ann ++ optional-dependencies.api ++ optional-dependencies.similarity;
-
-  checkInputs = [
     httpx
     msgpack
+    pytestCheckHook
     python-multipart
     sqlalchemy
-  ];
+  ] ++ optional-dependencies.ann ++ optional-dependencies.api ++ optional-dependencies.similarity;
 
   # The deselected paths depend on the huggingface hub and should be run as a passthru test
   # disabledTestPaths won't work as the problem is with the classes containing the tests
   # (in other words, it fails on __init__)
   pytestFlagsArray = [
     "test/python/test*.py"
+    "--deselect=test/python/testagent.py"
     "--deselect=test/python/testcloud.py"
     "--deselect=test/python/testconsole.py"
     "--deselect=test/python/testembeddings.py"