From 45b34474978c64a29795e0200f7150385531088c Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Wed, 17 Jan 2024 12:20:35 -0800
Subject: [PATCH 1/3] python311Packages.tokentrim: unstable-2023-09-07 ->
 0.1.13

---
 .../development/python-modules/tokentrim/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/tokentrim/default.nix b/pkgs/development/python-modules/tokentrim/default.nix
index c830d29b8a94..9588fadd6cb5 100644
--- a/pkgs/development/python-modules/tokentrim/default.nix
+++ b/pkgs/development/python-modules/tokentrim/default.nix
@@ -5,16 +5,16 @@
 , tiktoken
 }:
 
-buildPythonPackage {
+buildPythonPackage rec {
   pname = "tokentrim";
-  version = "unstable-2023-09-07";
-  format = "pyproject";
+  version = "0.1.13";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "KillianLucas";
-    repo = "tokentrim";
-    rev = "e98ad3a2ca0e321a7347f76c30be584175495139";
-    hash = "sha256-95xitHnbFFaj0xPuLMWvIvuJzoCO3VSd592X1RI9h3A=";
+    repo = pname;
+    rev = "refs/tags/v${version}";
+    hash = "sha256-zr2SLT3MBuMD98g9fdS0mLuijcssRQ/S3+tCq2Cw1/4=";
   };
 
   nativeBuildInputs = [

From 7f5dd771e582bfac76af797356b77d808e5e97ae Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Wed, 17 Jan 2024 12:20:49 -0800
Subject: [PATCH 2/3] open-interpreter: 0.1.11 -> 0.2.0

---
 pkgs/tools/llm/open-interpreter/default.nix | 55 ++++++++++++---------
 1 file changed, 33 insertions(+), 22 deletions(-)

diff --git a/pkgs/tools/llm/open-interpreter/default.nix b/pkgs/tools/llm/open-interpreter/default.nix
index b8624fdc4831..ced3141006fc 100644
--- a/pkgs/tools/llm/open-interpreter/default.nix
+++ b/pkgs/tools/llm/open-interpreter/default.nix
@@ -1,53 +1,64 @@
 { lib
 , python3
 , fetchFromGitHub
-, semgrep
 }:
-let
-  version = "0.1.11";
-in
-python3.pkgs.buildPythonApplication {
+
+python3.pkgs.buildPythonApplication rec {
   pname = "open-interpreter";
-  format = "pyproject";
-  inherit version;
+  version = "0.2.0";
+  pyproject = true;
+
+  disabled = python3.pkgs.pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "KillianLucas";
-    repo = "open-interpreter";
+    repo = pname;
     rev = "v${version}";
-    hash = "sha256-viUMGUBy5UNWag6P8tXE4TcJIx53Q/tASNV3bmCCK0g=";
+    hash = "sha256-XeJ6cADtyXtqoTXwYJu+i9d3NYbJCLpYOeZYmdImtwI=";
   };
 
+  # Remove unused dependency
+  postPatch = ''
+    substituteInPlace pyproject.toml --replace 'git-python = "^1.0.3"' ""
+  '';
+
+  pythonRelaxDeps = [
+    "tiktoken"
+  ];
+
   nativeBuildInputs = [
     python3.pkgs.poetry-core
+    python3.pkgs.pythonRelaxDepsHook
   ];
 
   propagatedBuildInputs = with python3.pkgs; [
     appdirs
     astor
-    gitpython
-    huggingface-hub
     inquirer
-    jinja2
     litellm
-    openai
-    # pyreadline3 # this is a windows deps
-    python-dotenv
     pyyaml
     rich
     six
     tiktoken
-    tokenizers
     tokentrim
     wget
-    yaspin
-  ] ++ [
-    semgrep
+    psutil
+    html2image
+    ipykernel
+    jupyter-client
+    matplotlib
+    toml
+    posthog
+    openai
+
+    # Not explicitly in pyproject.toml but required due to use of `pkgs_resources`
+    setuptools
   ];
 
-  # the import check phase fails trying to do a network request to openai
-  # because of litellm
-  # pythonImportsCheck = [ "interpreter" ];
+  pythonImportsCheck = [ "interpreter" ];
+
+  # Most tests required network access
+  doCheck = false;
 
   meta = with lib; {
     description = "OpenAI's Code Interpreter in your terminal, running locally";

From 25649226651bd2451baaacc9c97be2602065f20a Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Wed, 17 Jan 2024 12:34:45 -0800
Subject: [PATCH 3/3] python311Packages.open-interpreter: init at 0.2.0

---
 .../open-interpreter/default.nix              | 35 +++++++++++++++----
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/python-packages.nix            |  2 ++
 3 files changed, 32 insertions(+), 7 deletions(-)
 rename pkgs/{tools/llm => development/python-modules}/open-interpreter/default.nix (76%)

diff --git a/pkgs/tools/llm/open-interpreter/default.nix b/pkgs/development/python-modules/open-interpreter/default.nix
similarity index 76%
rename from pkgs/tools/llm/open-interpreter/default.nix
rename to pkgs/development/python-modules/open-interpreter/default.nix
index ced3141006fc..2f256aa32701 100644
--- a/pkgs/tools/llm/open-interpreter/default.nix
+++ b/pkgs/development/python-modules/open-interpreter/default.nix
@@ -1,14 +1,37 @@
 { lib
-, python3
 , fetchFromGitHub
+, buildPythonPackage
+, pythonOlder
+, pythonRelaxDepsHook
+, poetry-core
+
+, appdirs
+, astor
+, inquirer
+, litellm
+, pyyaml
+, rich
+, six
+, tiktoken
+, tokentrim
+, wget
+, psutil
+, html2image
+, ipykernel
+, jupyter-client
+, matplotlib
+, toml
+, posthog
+, openai
+, setuptools
 }:
 
-python3.pkgs.buildPythonApplication rec {
+buildPythonPackage rec {
   pname = "open-interpreter";
   version = "0.2.0";
   pyproject = true;
 
-  disabled = python3.pkgs.pythonOlder "3.9";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "KillianLucas";
@@ -27,11 +50,11 @@ python3.pkgs.buildPythonApplication rec {
   ];
 
   nativeBuildInputs = [
-    python3.pkgs.poetry-core
-    python3.pkgs.pythonRelaxDepsHook
+    poetry-core
+    pythonRelaxDepsHook
   ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  propagatedBuildInputs = [
     appdirs
     astor
     inquirer
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f18b99caaed..866b0d483e56 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11587,7 +11587,7 @@ with pkgs;
 
   open-ecard = callPackage ../tools/security/open-ecard { };
 
-  open-interpreter = callPackage ../tools/llm/open-interpreter { };
+  open-interpreter = with python3Packages; toPythonApplication open-interpreter;
 
   openjade = callPackage ../tools/text/sgml/openjade { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 314fd3f8ff8f..9ddfadf07d4a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8657,6 +8657,8 @@ self: super: with self; {
 
   open-garage = callPackage ../development/python-modules/open-garage { };
 
+  open-interpreter = callPackage ../development/python-modules/open-interpreter { };
+
   open-meteo = callPackage ../development/python-modules/open-meteo { };
 
   openai-triton = callPackage ../development/python-modules/openai-triton {