From 2734fe9372fc71bd65fdcccec471a8913717a95c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 11 Dec 2024 08:58:02 +0100
Subject: [PATCH 1/2] python312Packages.fnllm: init at 0.0.11

A function-based LLM protocol and wrapper

https://github.com/microsoft/essex-toolkit/tree/main/python/fnllm
---
 .../python-modules/fnllm/default.nix          | 80 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 82 insertions(+)
 create mode 100644 pkgs/development/python-modules/fnllm/default.nix

diff --git a/pkgs/development/python-modules/fnllm/default.nix b/pkgs/development/python-modules/fnllm/default.nix
new file mode 100644
index 000000000000..9ef3701119f2
--- /dev/null
+++ b/pkgs/development/python-modules/fnllm/default.nix
@@ -0,0 +1,80 @@
+{
+  lib,
+  aiolimiter,
+  azure-identity,
+  azure-storage-blob,
+  buildPythonPackage,
+  fetchPypi,
+  hatchling,
+  httpx,
+  json-repair,
+  openai,
+  pydantic,
+  pytest-asyncio,
+  pytestCheckHook,
+  pythonOlder,
+  tenacity,
+  tiktoken,
+}:
+
+buildPythonPackage rec {
+  pname = "fnllm";
+  version = "0.0.11";
+  pyproject = true;
+
+  disabled = pythonOlder "3.11";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-EiCP+HyipL6mpmjb3wjXUr+VRJ9ZO9qsegppNM7gVEk=";
+  };
+
+  build-system = [ hatchling ];
+
+  dependencies = [
+    aiolimiter
+    httpx
+    json-repair
+    pydantic
+    tenacity
+  ];
+
+  optional-dependencies = {
+    azure = [
+      azure-identity
+      azure-storage-blob
+    ];
+    openai = [
+      openai
+      tiktoken
+    ];
+  };
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+
+  pythonImportsCheck = [ "fnllm" ];
+
+  disabledTests = [
+    # Tests require network access
+    "chat"
+    "embeddings"
+    "rate_limited"
+    "test_default_operations"
+    "test_estimate_request_tokens"
+    "test_replace_value"
+  ];
+
+  disabledTestPaths = [
+    "tests/unit/caching/test_blob.py"
+  ];
+
+  meta = {
+    description = "A function-based LLM protocol and wrapper";
+    homepage = "https://github.com/microsoft/essex-toolkit/tree/main/python/fnllm";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 19a640eaf5ef..6832568fb000 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4854,6 +4854,8 @@ self: super: with self; {
 
   glyphtools = callPackage ../development/python-modules/glyphtools { };
 
+  fnllm = callPackage ../development/python-modules/fnllm { };
+
   foobot-async = callPackage ../development/python-modules/foobot-async { };
 
   foolscap = callPackage ../development/python-modules/foolscap { };

From ad015ce53b5427b64c68b6dde129d457791f446a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 11 Dec 2024 09:03:50 +0100
Subject: [PATCH 2/2] python311Packages.graphrag: 0.5.0 -> 0.9.0

Diff: https://github.com/microsoft/graphrag/compare/refs/tags/v0.5.0...v0.9.0

Changelog: https://github.com/microsoft/graphrag/blob/v0.9.0/CHANGELOG.md
---
 pkgs/development/python-modules/graphrag/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/graphrag/default.nix b/pkgs/development/python-modules/graphrag/default.nix
index bad18d3388ef..32d75be5178d 100644
--- a/pkgs/development/python-modules/graphrag/default.nix
+++ b/pkgs/development/python-modules/graphrag/default.nix
@@ -12,6 +12,7 @@
   datashaper,
   devtools,
   environs,
+  fnllm,
   graspologic,
   json-repair,
   lancedb,
@@ -39,14 +40,14 @@
 
 buildPythonPackage rec {
   pname = "graphrag";
-  version = "0.5.0";
+  version = "0.9.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "graphrag";
     rev = "refs/tags/v${version}";
-    hash = "sha256-QK6ZdBDSSKi/WUsDQeEY5JfxgsmW/vK7yDfjMseAO/k=";
+    hash = "sha256-LD7cfea8uyCYVMhsHXQBHho7jiwEmlqYrrfZs/7oeyc=";
   };
 
   build-system = [
@@ -65,6 +66,7 @@ buildPythonPackage rec {
     datashaper
     devtools
     environs
+    fnllm
     graspologic
     json-repair
     lancedb