From c0957e49d1b4c69ce47c5e73f2a2b2cbf1bc19ea Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 28 Jun 2023 22:46:17 +0900 Subject: [PATCH 1/3] python310Packages.clarifai-grpc: init at 9.5.0 --- .../python-modules/clarifai-grpc/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/clarifai-grpc/default.nix diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix new file mode 100644 index 000000000000..cec151526074 --- /dev/null +++ b/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, googleapis-common-protos +, grpcio +, protobuf +, requests +}: + +buildPythonPackage rec { + pname = "clarifai-grpc"; + version = "9.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-amMUgRXtvcrALfWwat7W0W60FJQnEeMvHhyxxBCMqUg="; + }; + + propagatedBuildInputs = [ + googleapis-common-protos + grpcio + protobuf + requests + ]; + + # almost all tests require network access + doCheck = false; + + pythonImportsCheck = [ "clarifai_grpc" ]; + + meta = with lib; { + description = "Clarifai gRPC API Client"; + homepage = "https://github.com/Clarifai/clarifai-python-grpc"; + changelog = "https://github.com/Clarifai/clarifai-python-grpc/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 05d7bde590a0..37bf0a595b1d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1861,6 +1861,8 @@ self: super: with self; { ckcc-protocol = callPackage ../development/python-modules/ckcc-protocol { }; + clarifai-grpc = callPackage ../development/python-modules/clarifai-grpc { }; + claripy = callPackage ../development/python-modules/claripy { }; classify-imports = callPackage ../development/python-modules/classify-imports { }; From 4f84f7c81b7813c286ac96ac9c4bc4f2f36505e1 Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 28 Jun 2023 22:46:50 +0900 Subject: [PATCH 2/3] python310Packages.clarifai: init at 9.5.2 --- .../python-modules/clarifai/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/clarifai/default.nix diff --git a/pkgs/development/python-modules/clarifai/default.nix b/pkgs/development/python-modules/clarifai/default.nix new file mode 100644 index 000000000000..ffc02aa60480 --- /dev/null +++ b/pkgs/development/python-modules/clarifai/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, clarifai-grpc +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "clarifai"; + version = "9.5.2"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "Clarifai"; + repo = "clarifai-python-utils"; + rev = "refs/tags/${version}"; + hash = "sha256-29by0YAQ7qc0gL/3lAFOk4FLDB5Qv4X9QDyK49gfyAo="; + }; + + propagatedBuildInputs = [ + clarifai-grpc + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "clarifai" ]; + + meta = with lib; { + description = "Clarifai Python Utilities"; + homepage = "https://github.com/Clarifai/clarifai-python-utils"; + changelog = "https://github.com/Clarifai/clarifai-python-utils/releases/tag/${src.rev}"; + license = licenses.asl20; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 37bf0a595b1d..b33521c6729e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1861,6 +1861,8 @@ self: super: with self; { ckcc-protocol = callPackage ../development/python-modules/ckcc-protocol { }; + clarifai = callPackage ../development/python-modules/clarifai { }; + clarifai-grpc = callPackage ../development/python-modules/clarifai-grpc { }; claripy = callPackage ../development/python-modules/claripy { }; From 5f2679727ce37057300e2aded0d6819955690ffe Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 28 Jun 2023 22:54:01 +0900 Subject: [PATCH 3/3] python310Packages.langchain: add clarifai as an optional-dependency --- pkgs/development/python-modules/langchain/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index 07cc537d019f..ca41ea2258d5 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -17,6 +17,7 @@ , bash # optional dependencies , anthropic +, clarifai , cohere , openai , nlpcloud @@ -123,6 +124,7 @@ buildPythonPackage rec { passthru.optional-dependencies = { llms = [ anthropic + clarifai cohere openai nlpcloud @@ -140,6 +142,9 @@ buildPythonPackage rec { text_helpers = [ chardet ]; + clarifai = [ + clarifai + ]; cohere = [ cohere ]; @@ -157,6 +162,7 @@ buildPythonPackage rec { ]; all = [ anthropic + clarifai cohere openai nlpcloud