swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 04:19:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #301647 from fabaff/llama-index-bump

Browse source 
python312Packages.openai: 1.13.3 -> 1.16.2, python312Packages.llama-index-agent-openai: 0.2.1 -> 0.2.2, python312Packages.llamaindex-py-client: 0.1.15 -> 0.1.16
This commit is contained in:
Fabian Affolter 2024-04-05 00:49:54 +02:00 committed by GitHub
parent e636feeb6e d0698b4090
commit 6fb43f787f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 225 additions and 268 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
pkgs/development/python-modules/langchain-community/default.nix
View file

@ -1,23 +1,24 @@
{ lib {
, buildPythonPackage lib,
, fetchPypi buildPythonPackage,
, poetry-core fetchPypi,
, pythonOlder poetry-core,
, aiohttp pythonOlder,
, dataclasses-json aiohttp,
, langchain-core dataclasses-json,
, langsmith langchain-core,
, numpy langsmith,
, pyyaml numpy,
, requests pyyaml,
, sqlalchemy requests,
, tenacity sqlalchemy,
, typer tenacity,
typer,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "langchain-community"; pname = "langchain-community";
version = "0.0.29"; version = "0.0.31";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -25,14 +26,12 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
pname = "langchain_community"; pname = "langchain_community";
inherit version; inherit version;
hash = "sha256-2IEH+vqf4sVzPaljDGjZ7lHNM7HIiklQ56LZo49+eqM="; hash = "sha256-mpcLwrtZu0wgS2ltjGLCU09t2zEAUAXMG31/k05Ypfw=";
}; };
nativeBuildInputs = [ build-system = [ poetry-core ];
poetry-core
];
propagatedBuildInputs = [ dependencies = [
aiohttp aiohttp
dataclasses-json dataclasses-json
langchain-core langchain-core
@ -45,9 +44,7 @@ buildPythonPackage rec {
]; ];
passthru.optional-dependencies = { passthru.optional-dependencies = {
cli = [ cli = [ typer ];
typer
];
}; };
pythonImportsCheck = [ "langchain_community" ]; pythonImportsCheck = [ "langchain_community" ];

47
pkgs/development/python-modules/langchain-core/default.nix
View file

@ -1,22 +1,23 @@
{ lib {
, buildPythonPackage lib,
, fetchPypi anyio,
, pythonOlder buildPythonPackage,
, poetry-core fetchPypi,
, anyio jsonpatch,
, jsonpatch langsmith,
, langsmith packaging,
, packaging poetry-core,
, pydantic pydantic,
, pythonRelaxDepsHook pythonOlder,
, pyyaml pythonRelaxDepsHook,
, requests pyyaml,
, tenacity requests,
tenacity,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "langchain-core"; pname = "langchain-core";
version = "0.1.36"; version = "0.1.40";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -24,19 +25,19 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
pname = "langchain_core"; pname = "langchain_core";
inherit version; inherit version;
hash = "sha256-qiQyNwyj0qXW3RSoEKpkiL8vYi/3oKPcMPbg7Z1/X6g="; hash = "sha256-NMBvwObTU0tzjGP4VANEa0vnEWFmW34JH5uxnJFOwQA=";
}; };
pythonRelaxDeps = [ pythonRelaxDeps = [
"langsmith" "langsmith"
"packaging"
]; ];
nativeBuildInputs = [ build-system = [ poetry-core ];
poetry-core
pythonRelaxDepsHook
];
propagatedBuildInputs = [ nativeBuildInputs = [ pythonRelaxDepsHook ];
dependencies = [
anyio anyio
jsonpatch jsonpatch
langsmith langsmith
@ -47,9 +48,7 @@ buildPythonPackage rec {
tenacity tenacity
]; ];
pythonImportsCheck = [ pythonImportsCheck = [ "langchain_core" ];
"langchain_core"
];
# PyPI source does not have tests # PyPI source does not have tests
doCheck = false; doCheck = false;

169
pkgs/development/python-modules/langchain/default.nix
View file

@ -1,58 +1,57 @@
{ lib {
, bash lib,
, buildPythonPackage aiohttp,
, fetchFromGitHub async-timeout,
, pythonOlder azure-core,
, poetry-core azure-cosmos,
, aiohttp azure-identity,
, async-timeout bash,
, dataclasses-json buildPythonPackage,
, jsonpatch chardet,
, langsmith clarifai,
, langchain-core cohere,
, langchain-community dataclasses-json,
, langchain-text-splitters esprima,
, numpy fetchFromGitHub,
, pydantic freezegun,
, pyyaml huggingface-hub,
, requests jsonpatch,
, sqlalchemy langchain-community,
, tenacity langchain-core,
# optional dependencies langchain-text-splitters,
, azure-core langsmith,
, azure-cosmos lark,
, azure-identity manifest-ml,
, chardet nlpcloud,
, clarifai numpy,
, cohere openai,
, esprima pandas,
, huggingface-hub poetry-core,
, lark pydantic,
, manifest-ml pytest-asyncio,
, nlpcloud pytest-mock,
, openai pytest-socket,
, qdrant-client pytestCheckHook,
, sentence-transformers pythonOlder,
, tiktoken pyyaml,
, torch qdrant-client,
, transformers requests-mock,
, typer requests,
# test dependencies responses,
, freezegun sentence-transformers,
, pandas sqlalchemy,
, pytest-asyncio syrupy,
, pytest-mock tenacity,
, pytest-socket tiktoken,
, pytestCheckHook toml,
, requests-mock torch,
, responses transformers,
, syrupy typer,
, toml
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "langchain"; pname = "langchain";
version = "0.1.13"; version = "0.1.14";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -61,20 +60,16 @@ buildPythonPackage rec {
owner = "langchain-ai"; owner = "langchain-ai";
repo = "langchain"; repo = "langchain";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-tBEO0GOY1cqO5FOYnBXAOSupSRhcoI9u4Nu4FieId74="; hash = "sha256-wV6QFeJ/kV0nDVlA2qsJ9p1n3Yxy8Q/NZ1IX8cFtzcg=";
}; };
sourceRoot = "${src.name}/libs/langchain"; sourceRoot = "${src.name}/libs/langchain";
nativeBuildInputs = [ build-system = [ poetry-core ];
poetry-core
];
buildInputs = [ buildInputs = [ bash ];
bash
];
propagatedBuildInputs = [ dependencies = [
aiohttp aiohttp
dataclasses-json dataclasses-json
jsonpatch jsonpatch
@ -88,9 +83,7 @@ buildPythonPackage rec {
requests requests
sqlalchemy sqlalchemy
tenacity tenacity
] ++ lib.optionals (pythonOlder "3.11") [ ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ];
async-timeout
];
passthru.optional-dependencies = { passthru.optional-dependencies = {
llms = [ llms = [
@ -104,31 +97,19 @@ buildPythonPackage rec {
torch torch
transformers transformers
]; ];
qdrant = [ qdrant = [ qdrant-client ];
qdrant-client
];
openai = [ openai = [
openai openai
tiktoken tiktoken
]; ];
text_helpers = [ text_helpers = [ chardet ];
chardet clarifai = [ clarifai ];
]; cohere = [ cohere ];
clarifai = [
clarifai
];
cohere = [
cohere
];
docarray = [ docarray = [
# docarray # docarray
]; ];
embeddings = [ embeddings = [ sentence-transformers ];
sentence-transformers javascript = [ esprima ];
];
javascript = [
esprima
];
azure = [ azure = [
azure-identity azure-identity
azure-cosmos azure-cosmos
@ -140,11 +121,8 @@ buildPythonPackage rec {
# azure-search-documents # azure-search-documents
# azure-ai-textanalytics # azure-ai-textanalytics
]; ];
all = [ all = [ ];
]; cli = [ typer ];
cli = [
typer
];
}; };
nativeCheckInputs = [ nativeCheckInputs = [
@ -162,33 +140,34 @@ buildPythonPackage rec {
]; ];
pytestFlagsArray = [ pytestFlagsArray = [
# integration_tests have many network, db access and require `OPENAI_API_KEY`, etc. # integration_tests require network access, database access and require `OPENAI_API_KEY`, etc.
"tests/unit_tests" "tests/unit_tests"
"--only-core" "--only-core"
]; ];
disabledTests = [ disabledTests = [
# these tests have db access # These tests have database access
"test_table_info" "test_table_info"
"test_sql_database_run" "test_sql_database_run"
# These tests have network access
# these tests have network access
"test_socket_disabled" "test_socket_disabled"
"test_openai_agent_with_streaming"
# this test may require a specific version of langchain-community "test_openai_agent_tools_agent"
# This test may require a specific version of langchain-community
"test_compatible_vectorstore_documentation" "test_compatible_vectorstore_documentation"
# AssertionErrors
"test_callback_handlers"
"test_generic_fake_chat_model"
]; ];
pythonImportsCheck = [ pythonImportsCheck = [ "langchain" ];
"langchain"
];
meta = with lib; { meta = with lib; {
description = "Building applications with LLMs through composability"; description = "Building applications with LLMs through composability";
mainProgram = "langchain-server";
homepage = "https://github.com/langchain-ai/langchain"; homepage = "https://github.com/langchain-ai/langchain";
changelog = "https://github.com/langchain-ai/langchain/releases/tag/v${version}"; changelog = "https://github.com/langchain-ai/langchain/releases/tag/v${version}";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ natsukium ]; maintainers = with maintainers; [ natsukium ];
mainProgram = "langchain-server";
}; };
} }

43
pkgs/development/python-modules/langsmith/default.nix
View file

@ -1,21 +1,22 @@
{ lib {
, attr lib,
, buildPythonPackage attr,
, fetchFromGitHub buildPythonPackage,
, freezegun fetchFromGitHub,
, orjson freezegun,
, poetry-core orjson,
, pydantic poetry-core,
, pytest-asyncio pydantic,
, pytestCheckHook pytest-asyncio,
, pythonOlder pytestCheckHook,
, pythonRelaxDepsHook pythonOlder,
, requests pythonRelaxDepsHook,
requests,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "langsmith"; pname = "langsmith";
version = "0.1.38"; version = "0.1.40";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -24,14 +25,12 @@ buildPythonPackage rec {
owner = "langchain-ai"; owner = "langchain-ai";
repo = "langsmith-sdk"; repo = "langsmith-sdk";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-hK9zPEmO0LaRnbLTbc9ABE9a7UAZU9yZZUswu955CJU="; hash = "sha256-LdHCTPFrIhIOWV4m9pJx7GWQX1Xs6ajaXMgPFO+JQ8w=";
}; };
sourceRoot = "${src.name}/python"; sourceRoot = "${src.name}/python";
pythonRelaxDeps = [ pythonRelaxDeps = [ "orjson" ];
"orjson"
];
build-system = [ build-system = [
poetry-core poetry-core
@ -59,7 +58,7 @@ buildPythonPackage rec {
"test_as_runnable_batch" "test_as_runnable_batch"
"test_as_runnable_async" "test_as_runnable_async"
"test_as_runnable_async_batch" "test_as_runnable_async_batch"
# requires git repo # Test requires git repo
"test_git_info" "test_git_info"
# Tests require OpenAI API key # Tests require OpenAI API key
"test_chat_async_api" "test_chat_async_api"
@ -74,18 +73,16 @@ buildPythonPackage rec {
"tests/unit_tests/test_client.py" "tests/unit_tests/test_client.py"
]; ];
pythonImportsCheck = [ pythonImportsCheck = [ "langsmith" ];
"langsmith"
];
__darwinAllowLocalNetworking = true; __darwinAllowLocalNetworking = true;
meta = with lib; { meta = with lib; {
description = "Client library to connect to the LangSmith LLM Tracing and Evaluation Platform"; description = "Client library to connect to the LangSmith LLM Tracing and Evaluation Platform";
mainProgram = "langsmith";
homepage = "https://github.com/langchain-ai/langsmith-sdk"; homepage = "https://github.com/langchain-ai/langsmith-sdk";
changelog = "https://github.com/langchain-ai/langsmith-sdk/releases/tag/v${version}"; changelog = "https://github.com/langchain-ai/langsmith-sdk/releases/tag/v${version}";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ natsukium ]; maintainers = with maintainers; [ natsukium ];
mainProgram = "langsmith";
}; };
} }

29
pkgs/development/python-modules/llama-index-agent-openai/default.nix
View file

@ -1,16 +1,17 @@
{ lib {
, buildPythonPackage lib,
, fetchPypi buildPythonPackage,
, llama-index-core fetchPypi,
, llama-index-llms-openai llama-index-core,
, poetry-core llama-index-llms-openai,
, pythonOlder poetry-core,
, pythonRelaxDepsHook pythonOlder,
pythonRelaxDepsHook,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "llama-index-agent-openai"; pname = "llama-index-agent-openai";
version = "0.2.1"; version = "0.2.2";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -18,12 +19,10 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
pname = "llama_index_agent_openai"; pname = "llama_index_agent_openai";
inherit version; inherit version;
hash = "sha256-ydCixD0vdSuA99PdflbhEsSd3b0Gl0lzFTz9uTdLYrQ="; hash = "sha256-EgY92TLHQBV5b5c5hsxS14P1H9o45OrXKlbQ/RlZJe4=";
}; };
pythonRelaxDeps = [ pythonRelaxDeps = [ "llama-index-llms-openai" ];
"llama-index-llms-openai"
];
build-system = [ build-system = [
poetry-core poetry-core
@ -35,9 +34,7 @@ buildPythonPackage rec {
llama-index-llms-openai llama-index-llms-openai
]; ];
pythonImportsCheck = [ pythonImportsCheck = [ "llama_index.agent.openai" ];
"llama_index.agent.openai"
];
meta = with lib; { meta = with lib; {
description = "LlamaIndex Agent Integration for OpenAI"; description = "LlamaIndex Agent Integration for OpenAI";

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

@ -1,18 +1,19 @@
{ lib {
, asyncpg lib,
, buildPythonPackage asyncpg,
, fetchPypi buildPythonPackage,
, llama-index-core fetchPypi,
, pgvector llama-index-core,
, poetry-core pgvector,
, psycopg2 poetry-core,
, pythonRelaxDepsHook psycopg2,
, pythonOlder pythonRelaxDepsHook,
pythonOlder,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "llama-index-vector-stores-postgres"; pname = "llama-index-vector-stores-postgres";
version = "0.1.4.post1"; version = "0.1.5";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -20,12 +21,10 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
pname = "llama_index_vector_stores_postgres"; pname = "llama_index_vector_stores_postgres";
inherit version; inherit version;
hash = "sha256-E75oSh9MH8aX00y//jhNbehqYdIm5HfEjb5Swn7J/cQ="; hash = "sha256-9jE+1Gbx2y/CSqkpSfuYqgyX49yZwhwmJbiG/EHwTLw=";
}; };
pythonRemoveDeps = [ pythonRemoveDeps = [ "psycopg2-binary" ];
"psycopg2-binary"
];
build-system = [ build-system = [
poetry-core poetry-core
@ -39,9 +38,7 @@ buildPythonPackage rec {
psycopg2 psycopg2
]; ];
pythonImportsCheck = [ pythonImportsCheck = [ "llama_index.vector_stores.postgres" ];
"llama_index.vector_stores.postgres"
];
meta = with lib; { meta = with lib; {
description = "LlamaIndex Vector Store Integration for Postgres"; description = "LlamaIndex Vector Store Integration for Postgres";

29
pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix
View file

@ -1,16 +1,17 @@
{ lib {
, buildPythonPackage lib,
, fetchPypi buildPythonPackage,
, llama-index-core fetchPypi,
, qdrant-client llama-index-core,
, poetry-core qdrant-client,
, grpcio poetry-core,
, pythonOlder grpcio,
pythonOlder,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "llama-index-vector-stores-qdrant"; pname = "llama-index-vector-stores-qdrant";
version = "0.1.5"; version = "0.1.6";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -18,12 +19,10 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
pname = "llama_index_vector_stores_qdrant"; pname = "llama_index_vector_stores_qdrant";
inherit version; inherit version;
hash = "sha256-Q4+ehywPz+jrA36AtU9yiicRr2nU6BCO6Y42j0SKPdI="; hash = "sha256-MKmtxcHUqF3CzakGNXxvXy3jemoJNbdkCaqrgZ5Rtyo=";
}; };
build-system = [ build-system = [ poetry-core ];
poetry-core
];
dependencies = [ dependencies = [
grpcio grpcio
@ -31,9 +30,7 @@ buildPythonPackage rec {
qdrant-client qdrant-client
]; ];
pythonImportsCheck = [ pythonImportsCheck = [ "llama_index.vector_stores.qdrant" ];
"llama_index.vector_stores.qdrant"
];
meta = with lib; { meta = with lib; {
description = "LlamaIndex Vector Store Integration for Qdrant"; description = "LlamaIndex Vector Store Integration for Qdrant";

29
pkgs/development/python-modules/llamaindex-py-client/default.nix
View file

@ -1,15 +1,16 @@
{ lib {
, buildPythonPackage lib,
, fetchPypi buildPythonPackage,
, httpx fetchPypi,
, poetry-core httpx,
, pydantic poetry-core,
, pythonOlder pydantic,
pythonOlder,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "llamaindex-py-client"; pname = "llamaindex-py-client";
version = "0.1.15"; version = "0.1.16";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -17,14 +18,12 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
pname = "llamaindex_py_client"; pname = "llamaindex_py_client";
inherit version; inherit version;
hash = "sha256-x84mhVupdhU7tAFXw8GUIjxrdReZNbmI3UvWo/6Dqss="; hash = "sha256-6Zu8CFXmyqp166IZzbPPbJQ66U+hXMu2ijoI1FL9Y4A=";
}; };
nativeBuildInputs = [ build-system = [ poetry-core ];
poetry-core
];
propagatedBuildInputs = [ dependencies = [
httpx httpx
pydantic pydantic
]; ];
@ -32,9 +31,7 @@ buildPythonPackage rec {
# Module has no tests # Module has no tests
doCheck = false; doCheck = false;
pythonImportsCheck = [ pythonImportsCheck = [ "llama_index_client" ];
"llama_index_client"
];
meta = with lib; { meta = with lib; {
description = "Client for LlamaIndex"; description = "Client for LlamaIndex";

69
pkgs/development/python-modules/openai/default.nix
View file

@ -1,32 +1,31 @@
{ lib {
, buildPythonPackage lib,
, fetchFromGitHub anyio,
, pythonOlder buildPythonPackage,
, hatchling cached-property,
# propagated dirty-equals,
, httpx distro,
, pydantic fetchFromGitHub,
, typing-extensions hatch-fancy-pypi-readme,
, anyio hatchling,
, distro httpx,
, sniffio numpy,
, cached-property pandas,
, tqdm pandas-stubs,
# optional pydantic,
, numpy pytest-asyncio,
, pandas pytest-mock,
, pandas-stubs pytestCheckHook,
# tests pythonOlder,
, pytestCheckHook respx,
, pytest-asyncio sniffio,
, pytest-mock tqdm,
, respx typing-extensions,
, dirty-equals
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "openai"; pname = "openai";
version = "1.13.3"; version = "1.16.2";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7.1"; disabled = pythonOlder "3.7.1";
@ -35,14 +34,15 @@ buildPythonPackage rec {
owner = "openai"; owner = "openai";
repo = "openai-python"; repo = "openai-python";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-8SHXUrPLZ7lgvB0jqZlcvKq5Zv2d2UqXjJpgiBpR8P8="; hash = "sha256-7JWwEoVEdAy+tPcaYUPN7xA62Egzlv/2NNcDqvmDYh4=";
}; };
nativeBuildInputs = [ build-system = [
hatchling hatchling
hatch-fancy-pypi-readme
]; ];
propagatedBuildInputs = [ dependencies = [
httpx httpx
pydantic pydantic
typing-extensions typing-extensions
@ -50,9 +50,7 @@ buildPythonPackage rec {
distro distro
sniffio sniffio
tqdm tqdm
] ++ lib.optionals (pythonOlder "3.8") [ ] ++ lib.optionals (pythonOlder "3.8") [ cached-property ];
cached-property
];
passthru.optional-dependencies = { passthru.optional-dependencies = {
datalib = [ datalib = [
@ -62,9 +60,7 @@ buildPythonPackage rec {
]; ];
}; };
pythonImportsCheck = [ pythonImportsCheck = [ "openai" ];
"openai"
];
nativeCheckInputs = [ nativeCheckInputs = [
pytestCheckHook pytestCheckHook
@ -75,7 +71,8 @@ buildPythonPackage rec {
]; ];
pytestFlagsArray = [ pytestFlagsArray = [
"-W" "ignore::DeprecationWarning" "-W"
"ignore::DeprecationWarning"
]; ];
disabledTests = [ disabledTests = [
@ -94,10 +91,10 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Python client library for the OpenAI API"; description = "Python client library for the OpenAI API";
mainProgram = "openai";
homepage = "https://github.com/openai/openai-python"; homepage = "https://github.com/openai/openai-python";
changelog = "https://github.com/openai/openai-python/releases/tag/v${version}"; changelog = "https://github.com/openai/openai-python/releases/tag/v${version}";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ malo ]; maintainers = with maintainers; [ malo ];
mainProgram = "openai";
}; };
} }