From 251590ee69d595b193d77d98ad9b19aafcc403b1 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 30 Dec 2023 17:21:02 +0000
Subject: [PATCH 1/3] python3Packages.openllm: fix `optional-dependencies.full`
 evaluation

Without the change wrong `openai` attribute is pulled and eval fails as:

    $ nix build --no-link -f. python3Packages.openllm.optional-dependencies.full
    error:
          145|     full = with passthru.optional-dependencies; (
          146|       agents ++ awq ++ baichuan ++ chatglm ++ ctranslate ++ falcon ++ fine-tune ++ ggml ++ gptq ++ mpt ++ openai ++ playground ++ starcoder ++ vllm
             |                                                                                                                  ^

       error: value is a set while a list was expected
---
 pkgs/development/python-modules/openllm/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/openllm/default.nix b/pkgs/development/python-modules/openllm/default.nix
index b1cad320a11d..d889860e4e67 100644
--- a/pkgs/development/python-modules/openllm/default.nix
+++ b/pkgs/development/python-modules/openllm/default.nix
@@ -143,7 +143,10 @@ buildPythonPackage rec {
       # vllm
     ];
     full = with passthru.optional-dependencies; (
-      agents ++ awq ++ baichuan ++ chatglm ++ ctranslate ++ falcon ++ fine-tune ++ ggml ++ gptq ++ mpt ++ openai ++ playground ++ starcoder ++ vllm
+      agents ++ awq ++ baichuan ++ chatglm ++ ctranslate ++ falcon ++ fine-tune ++ ggml ++ gptq ++ mpt
+      # disambiguate between derivation input and passthru field
+      ++ passthru.optional-dependencies.openai
+      ++ playground ++ starcoder ++ vllm
     );
     all = passthru.optional-dependencies.full;
   };

From 72f057295f1d7b731a4bce05ca56258e8ce9cbd9 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 6 Jan 2024 22:44:43 +0000
Subject: [PATCH 2/3] python3Packages.transformers: add
 `optional-dependencies.agents`

A few packages in `nixpkgs` are referring to `transformers.agents`.
as optional dependencies. Let's expose them.
---
 .../python-modules/transformers/default.nix           | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix
index efee6e3d1fa4..1191252f8b46 100644
--- a/pkgs/development/python-modules/transformers/default.nix
+++ b/pkgs/development/python-modules/transformers/default.nix
@@ -15,9 +15,11 @@
 , safetensors
 , tqdm
 # optional dependencies
+, diffusers
 , scikit-learn
 , tensorflow
 , onnxconverter-common
+, opencv4
 , tf2onnx
 , torch
 , accelerate
@@ -87,6 +89,15 @@ buildPythonPackage rec {
     vision = [ pillow ];
   in
     {
+    agents = [
+      diffusers
+      accelerate
+      datasets
+      torch
+      sentencepiece
+      opencv4
+      pillow
+    ];
     ja = [
       # fugashi
       # ipadic

From d1a64ffb9eb79c202d8c7104d71ae83e1ed1ab53 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 6 Jan 2024 22:50:13 +0000
Subject: [PATCH 3/3] python3Packages.openllm-client: revert "fix
 `optional-dependencies` attribute"

This reverts commit 7a851d25937ca85f4f42d8f16024dc74f7f3243e.

Instead of dropping `transformers.agents` use let's provide it instead.
---
 pkgs/development/python-modules/openllm-client/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/openllm-client/default.nix b/pkgs/development/python-modules/openllm-client/default.nix
index 082111392778..a1cc4fcc921e 100644
--- a/pkgs/development/python-modules/openllm-client/default.nix
+++ b/pkgs/development/python-modules/openllm-client/default.nix
@@ -47,7 +47,7 @@ buildPythonPackage rec {
       transformers
       # diffusers
       soundfile
-    ];
+    ] ++ transformers.optional-dependencies.agents;
     full = passthru.optional-dependencies.grpc ++ passthru.optional-dependencies.agents;
   };