From 0b9c9f85cd487b4d0670d4c938c7d03e84ab0b22 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 25 Dec 2024 20:23:06 +0800 Subject: [PATCH 1/3] python312Packages.pinecone-plugin-interface: init at 0.0.7 --- .../pinecone-plugin-interface/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/pinecone-plugin-interface/default.nix diff --git a/pkgs/development/python-modules/pinecone-plugin-interface/default.nix b/pkgs/development/python-modules/pinecone-plugin-interface/default.nix new file mode 100644 index 000000000000..69ad39d108fd --- /dev/null +++ b/pkgs/development/python-modules/pinecone-plugin-interface/default.nix @@ -0,0 +1,31 @@ +{ + buildPythonPackage, + lib, + fetchPypi, + poetry-core, +}: + +buildPythonPackage rec { + pname = "pinecone-plugin-interface"; + version = "0.0.7"; + + pyproject = true; + + src = fetchPypi { + pname = "pinecone_plugin_interface"; + inherit version; + hash = "sha256-uOZnXkGEczOqE5I8xE2qP4VnbXFXMkaC3BZAWIqYKEY="; + }; + + build-system = [ + poetry-core + ]; + + meta = { + homepage = "https://www.pinecone.io/"; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + description = "Plugin interface for the Pinecone python client"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f15d0ec2bb3e..6dd3441f9b53 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10270,6 +10270,8 @@ self: super: with self; { pinecone-client = callPackage ../development/python-modules/pinecone-client { }; + pinecone-plugin-interface = callPackage ../development/python-modules/pinecone-plugin-interface { }; + psrpcore = callPackage ../development/python-modules/psrpcore { }; pyaprilaire = callPackage ../development/python-modules/pyaprilaire { }; From 92020ff3c3e15d1ee1fcc3fef1fb7f16a670b10e Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 25 Dec 2024 20:42:26 +0800 Subject: [PATCH 2/3] python312Packages.pinecone-plugin-inference: init at 3.1.0 --- .../pinecone-plugin-inference/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/pinecone-plugin-inference/default.nix diff --git a/pkgs/development/python-modules/pinecone-plugin-inference/default.nix b/pkgs/development/python-modules/pinecone-plugin-inference/default.nix new file mode 100644 index 000000000000..a184093457bd --- /dev/null +++ b/pkgs/development/python-modules/pinecone-plugin-inference/default.nix @@ -0,0 +1,36 @@ +{ + buildPythonPackage, + lib, + fetchPypi, + poetry-core, + pinecone-plugin-interface, +}: + +buildPythonPackage rec { + pname = "pinecone-plugin-inference"; + version = "3.1.0"; + + pyproject = true; + + src = fetchPypi { + pname = "pinecone_plugin_inference"; + inherit version; + hash = "sha256-7/gmF44f5EhXe+L/PY27Byvvu9wtiI4hRiRSOhw3zY0="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + pinecone-plugin-interface + ]; + + meta = { + homepage = "https://www.pinecone.io/"; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + description = "Embeddings plugin for Pinecone SDK"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6dd3441f9b53..05ff236d922f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10272,6 +10272,8 @@ self: super: with self; { pinecone-plugin-interface = callPackage ../development/python-modules/pinecone-plugin-interface { }; + pinecone-plugin-inference = callPackage ../development/python-modules/pinecone-plugin-inference { }; + psrpcore = callPackage ../development/python-modules/psrpcore { }; pyaprilaire = callPackage ../development/python-modules/pyaprilaire { }; From ce8e4bca5641eb86d7d2f94f17e17f2fcd71754c Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 25 Dec 2024 20:51:50 +0800 Subject: [PATCH 3/3] python312Packages.pinecone-plugin: 4.1.2 -> 5.4.2 --- .../pinecone-client/default.nix | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/pinecone-client/default.nix b/pkgs/development/python-modules/pinecone-client/default.nix index 9ade9dc4d2ce..c3a77eae2bf3 100644 --- a/pkgs/development/python-modules/pinecone-client/default.nix +++ b/pkgs/development/python-modules/pinecone-client/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, dnspython, - fetchPypi, + fetchFromGitHub, loguru, numpy, poetry-core, @@ -10,27 +10,33 @@ pythonOlder, pyyaml, requests, + pandas, setuptools, tqdm, typing-extensions, + pinecone-plugin-interface, + pinecone-plugin-inference, urllib3, + googleapis-common-protos, + lz4, + protobuf, + grpcio, }: buildPythonPackage rec { pname = "pinecone-client"; - version = "4.1.2"; + version = "5.4.2"; pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - pname = "pinecone_client"; - inherit version; - hash = "sha256-+onGBXkuyU3jbUyVhSULR7C2Q0B0VwU+yokAhCS+YoE="; + src = fetchFromGitHub { + owner = "pinecone-io"; + repo = "pinecone-python-client"; + tag = "v${version}"; + hash = "sha256-5BCjqcJ+xCTTF/Q+PrgNV4Y/GcT2cfNqvY1ydUL6EZ8="; }; - pythonRelaxDeps = [ "urllib3" ]; - build-system = [ setuptools poetry-core @@ -41,6 +47,8 @@ buildPythonPackage rec { loguru numpy python-dateutil + pinecone-plugin-interface + pinecone-plugin-inference pyyaml requests tqdm @@ -48,16 +56,13 @@ buildPythonPackage rec { urllib3 ]; - # Tests require network access - doCheck = false; - pythonImportsCheck = [ "pinecone" ]; - meta = with lib; { + meta = { description = "Pinecone python client"; homepage = "https://www.pinecone.io/"; changelog = "https://github.com/pinecone-io/pinecone-python-client/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ happysalada ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ happysalada ]; }; }