From 7578c597fa551cec1561ae6afdde3f49ce3e9739 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 30 Oct 2023 22:23:19 +0900 Subject: [PATCH 1/4] python311Packages.langsmith: 0.0.49 -> 0.0.53 Diff: https://github.com/langchain-ai/langsmith-sdk/compare/refs/tags/v0.0.49...v0.0.53 Changelog: https://github.com/langchain-ai/langsmith-sdk/releases/tag/v0.0.53 --- pkgs/development/python-modules/langsmith/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index 5d85b5d69501..bf3230c910bd 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.0.49"; + version = "0.0.53"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-vOa9FNzeJB8QgJ6FW+4vxNfDnBbrKtByIwW3sGP8/ho="; + hash = "sha256-5w6bCNYoZAIrFkruw7E3Tw0G0no05x/g2hHESC3T2lw="; }; sourceRoot = "${src.name}/python"; @@ -44,6 +44,11 @@ buildPythonPackage rec { disabledTests = [ # These tests require network access "integration_tests" + # due to circular import + "test_as_runnable" + "test_as_runnable_batch" + "test_as_runnable_async" + "test_as_runnable_async_batch" ]; disabledTestPaths = [ From 9d89f7ceef377d9c0294386873e138012c0b1ae7 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 30 Oct 2023 22:21:28 +0900 Subject: [PATCH 2/4] python311Packages.langchain: 0.0.320 -> 0.0.325 Diff: https://github.com/hwchase17/langchain/compare/refs/tags/v0.0.320...v0.0.325 Changelog: https://github.com/hwchase17/langchain/releases/tag/v0.0.325 --- pkgs/development/python-modules/langchain/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index a2d00f4ba836..3abd60644a24 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -88,8 +88,8 @@ buildPythonPackage rec { pname = "langchain"; - version = "0.0.320"; - format = "pyproject"; + version = "0.0.325"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -97,7 +97,7 @@ buildPythonPackage rec { owner = "hwchase17"; repo = "langchain"; rev = "refs/tags/v${version}"; - hash = "sha256-Yw3gGt/OvrQ4IYauFUt6pBWOecy+PaWiGXoo5dWev5M="; + hash = "sha256-/bk4RafDDL4nozyFOiikyU4auBSftej21m5/FnEtDog="; }; sourceRoot = "${src.name}/libs/langchain"; From 0d00863e3cebc25ac227bddac00fc747317a4b5a Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 30 Oct 2023 23:12:14 +0900 Subject: [PATCH 3/4] python311Packages.langchain: clean up dependencies --- .../python-modules/langchain/default.nix | 25 ++++++------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index 3abd60644a24..e14f008d0cb7 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -11,16 +11,13 @@ , dataclasses-json , jsonpatch , langsmith -, numexpr , numpy -, openapi-schema-pydantic , pydantic , pyyaml , requests , sqlalchemy , tenacity # optional dependencies -, anthropic , atlassian-python-api , azure-core , azure-cosmos @@ -56,6 +53,7 @@ , pgvector , pinecone-client , psycopg2 +, pymongo , pyowm , pypdf , pytesseract @@ -65,11 +63,10 @@ , redis , requests-toolbelt , sentence-transformers -, spacy -, steamship , tiktoken , torch , transformers +, typer , weaviate-client , wikipedia # test dependencies @@ -117,11 +114,9 @@ buildPythonPackage rec { requests pyyaml numpy - openapi-schema-pydantic dataclasses-json tenacity aiohttp - numexpr langsmith anyio jsonpatch @@ -131,18 +126,15 @@ buildPythonPackage rec { passthru.optional-dependencies = { llms = [ - anthropic clarifai cohere openai - # openllm # openlm nlpcloud huggingface-hub manifest-ml torch transformers - # xinference ]; qdrant = [ qdrant-client @@ -180,13 +172,11 @@ buildPythonPackage rec { # azure-search-documents ]; all = [ - anthropic clarifai cohere openai nlpcloud huggingface-hub - # jina manifest-ml elasticsearch opensearch-py @@ -194,7 +184,6 @@ buildPythonPackage rec { faiss sentence-transformers transformers - spacy nltk wikipedia beautifulsoup4 @@ -203,6 +192,8 @@ buildPythonPackage rec { jinja2 pinecone-client # pinecone-text + # marqo + pymongo weaviate-client redis google-api-python-client @@ -236,7 +227,6 @@ buildPythonPackage rec { # O365 jq # docarray - steamship pdfminer-six lxml requests-toolbelt @@ -250,14 +240,15 @@ buildPythonPackage rec { # tigrisdb # nebula3-python # awadb - # esprima - # octoai-sdk + esprima rdflib # amadeus - # xinference librosa python-arango ]; + cli = [ + typer + ]; }; nativeCheckInputs = [ From c114a76e93fad77a4601f56dff5cfcf5b88e2a45 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 30 Oct 2023 23:21:38 +0900 Subject: [PATCH 4/4] python311Packages.openapi-schema-pydantic: remove It has been removed since it is no longer maintained --- .../openapi-schema-pydantic/default.nix | 44 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 pkgs/development/python-modules/openapi-schema-pydantic/default.nix diff --git a/pkgs/development/python-modules/openapi-schema-pydantic/default.nix b/pkgs/development/python-modules/openapi-schema-pydantic/default.nix deleted file mode 100644 index 1930dc237f05..000000000000 --- a/pkgs/development/python-modules/openapi-schema-pydantic/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pythonOlder -, pydantic -, pytestCheckHook -}: - -buildPythonPackage rec { - pname = "openapi-schema-pydantic"; - version = "1.2.4"; - format = "setuptools"; - - disabled = pythonOlder "3.6"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-PiLPWLdKafdSzH5fFTf25EFkKC2ycAy7zTu5nd0GUZY="; - }; - - propagatedBuildInputs = [ - pydantic - ]; - - nativeCheckInputs = [ - pytestCheckHook - ]; - - disabledTests = [ - # these tests are broken with `pydantic >= 1.10` - # but this library seems to work fine. - # e.g. https://github.com/hwchase17/langchain/blob/d86ed15d8884d5a3f120a433b9dda065647e4534/poetry.lock#L6011-L6012 - "test_pydantic_discriminator_schema_generation" - "test_pydantic_discriminator_openapi_generation" - ]; - - meta = with lib; { - description = "OpenAPI (v3) specification schema as pydantic class"; - homepage = "https://github.com/kuimono/openapi-schema-pydantic"; - changelog = "https://github.com/kuimono/openapi-schema-pydantic/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ natsukium ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 5357761aa23f..f11511b81f96 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -246,6 +246,7 @@ mapAliases ({ notifymuch = throw "notifymuch has been promoted to a top-level attribute"; # added 2022-10-02 Nuitka = nuitka; # added 2023-02-19 ntlm-auth = throw "ntlm-auth has been removed, because it relies on the md4 implementation provided by openssl. Use pyspnego instead."; + openapi-schema-pydantic = throw "openapi-schema-pydantic has been removed, since it is no longer maintained"; # added 2023-10-30 opsdroid_get_image_size = opsdroid-get-image-size; # added 2023-10-16 ordereddict = throw "ordereddict has been removed because it is only useful on unsupported python versions."; # added 2022-05-28 pafy = throw "pafy has been removed because it is unmaintained and only a dependency of mps-youtube, itself superseded by yewtube"; # Added 2023-01-19 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2293e7c1643b..bba8bb474a06 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8423,8 +8423,6 @@ self: super: with self; { openant = callPackage ../development/python-modules/openant { }; - openapi-schema-pydantic = callPackage ../development/python-modules/openapi-schema-pydantic { }; - openapi-schema-validator = callPackage ../development/python-modules/openapi-schema-validator { }; openapi-spec-validator = callPackage ../development/python-modules/openapi-spec-validator { };