From 5ed4f2a3cb64f729adb430bc04f4ea35a5819c1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 15 Mar 2024 08:20:05 +0000
Subject: [PATCH 1/2] python3.pkgs.instructor: init at 0.6.4

---
 .../python-modules/instructor/default.nix     | 41 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/python-modules/instructor/default.nix

diff --git a/pkgs/development/python-modules/instructor/default.nix b/pkgs/development/python-modules/instructor/default.nix
new file mode 100644
index 000000000000..476741835116
--- /dev/null
+++ b/pkgs/development/python-modules/instructor/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, python3
+, fetchPypi
+, buildPythonPackage
+}:
+
+buildPythonPackage rec {
+  pname = "instructor";
+  version = "0.6.4";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-Af52TGnkqY/t0cPkHoRfhFqa/tuOpQXAI/fFfMTcM4Y=";
+  };
+
+  nativeBuildInputs = [
+    python3.pkgs.poetry-core
+  ];
+
+  propagatedBuildInputs = with python3.pkgs; [
+    aiohttp
+    docstring-parser
+    openai
+    pydantic
+    rich
+    tenacity
+    typer
+  ];
+
+  pythonImportsCheck = [ "instructor" ];
+
+  meta = with lib; {
+    description = "Structured outputs for llm";
+    homepage = "https://github.com/jxnl/instructor";
+    changelog = "https://github.com/jxnl/instructor/releases/tag/v${version}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ mic92 ];
+    mainProgram = "instructor";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 19a56ac7ff08..e7965818ffd4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5682,6 +5682,8 @@ self: super: with self; {
 
   insteon-frontend-home-assistant = callPackage ../development/python-modules/insteon-frontend-home-assistant { };
 
+  instructor = callPackage ../development/python-modules/instructor { };
+
   intake = callPackage ../development/python-modules/intake { };
 
   intake-parquet = callPackage ../development/python-modules/intake-parquet { };

From 4dbb8d8bc270967ff4a818a25b43f96f6e967684 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 15 Mar 2024 08:20:26 +0000
Subject: [PATCH 2/2] shell_gpt: 1.0.1 -> 1.4.0

---
 pkgs/tools/llm/shell_gpt/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/llm/shell_gpt/default.nix b/pkgs/tools/llm/shell_gpt/default.nix
index ed3f27633e81..99ef7b3bf899 100644
--- a/pkgs/tools/llm/shell_gpt/default.nix
+++ b/pkgs/tools/llm/shell_gpt/default.nix
@@ -6,12 +6,12 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "shell_gpt";
-  version = "1.0.1";
-  format = "pyproject";
+  version = "1.4.0";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-/rBD2n5IZzSeC5dmVQRZY8UrzUOkAEVHp8KwIfV1hec=";
+    sha256 = "sha256-r/xQRqnLJhGZORjYUaYWKjqY4fQCW4WKkE+n8k0VMbA=";
   };
 
   nativeBuildInputs = with python3.pkgs; [
@@ -27,6 +27,8 @@ python3.pkgs.buildPythonApplication rec {
     typer
     requests
     hatchling
+    openai
+    instructor
   ];
 
   pythonRelaxDeps = [ "requests" "rich" "distro" "typer" ];