vllm: amd-aiter optional dependency

Author: CertainLach

pkgs/development/python-modules/mistral-common/default.nix

@@ -5,118 +5,131 @@
 
   # build-system
   setuptools,
+  wheel,
+  build,
 
   # dependencies
   jsonschema,
   numpy,
-  opencv-python-headless,
   pillow,
   pydantic,
   pydantic-extra-types,
   requests,
-  sentencepiece,
   tiktoken,
   typing-extensions,
 
-  # tests
+  # optional-dependencies
   click,
   fastapi,
   huggingface-hub,
-  openai,
-  pycountry,
+  jinja2,
+  llguidance,
+  opencv-python-headless,
   pydantic-settings,
   pytestCheckHook,
+  sentencepiece,
   soundfile,
   soxr,
+  uvloop,
+
+  # tests
+  openai,
+  pycountry,
   uvicorn,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "mistral-common";
-  version = "1.8.8";
+  version = "1.11.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mistralai";
     repo = "mistral-common";
-    tag = "v${version}";
-    hash = "sha256-rvW2idAqdCZi7+DsHJXczJKbfceZQ4lQyHScLOqxFIc=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-DejbLY2i6Hp1J+spxMut5RKugj7rDyrZmp6v+5wqyWY=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [
+    setuptools
+    wheel
+    build
+  ];
 
   dependencies = [
     jsonschema
     numpy
-    opencv-python-headless
     pillow
     pydantic
     pydantic-extra-types
     requests
-    sentencepiece
     tiktoken
     typing-extensions
   ];
 
-  optional-dependencies = lib.fix (self: {
-    opencv = [
-      opencv-python-headless
-    ];
-    sentencepiece = [
-      sentencepiece
-    ];
-    soundfile = [
-      soundfile
-    ];
-    soxr = [
-      soxr
-    ];
-    audio = self.soundfile ++ self.soxr;
-    image = self.opencv;
-    hf-hub = [
-      huggingface-hub
-    ];
-    server = [
-      click
-      fastapi
-      pydantic-settings
-    ]
-    ++ fastapi.optional-dependencies.standard;
-  });
+  optional-dependencies =
+    let
+      self = finalAttrs.finalPackage.optional-dependencies;
+    in
+    {
+      opencv = [
+        opencv-python-headless
+      ];
+      sentencepiece = [
+        sentencepiece
+      ];
+      soundfile = [
+        soundfile
+      ];
+      soxr = [
+        soxr
+      ];
+      audio = self.soundfile ++ self.soxr;
+      image = self.opencv;
+      guidance = [
+        jinja2
+        llguidance
+      ];
+      hf-hub = [
+        huggingface-hub
+      ];
+      server = [
+        click
+        fastapi
+        pydantic-settings
+        uvloop
+      ]
+      ++ fastapi.optional-dependencies.standard;
+      all =
+        self.opencv
+        ++ self.sentencepiece
+        ++ self.audio
+        ++ self.image
+        ++ self.guidance
+        ++ self.hf-hub
+        ++ self.server;
+    };
 
   pythonImportsCheck = [ "mistral_common" ];
 
   nativeCheckInputs = [
-    click
-    fastapi
-    huggingface-hub
     openai
     pycountry
-    pydantic-settings
     pytestCheckHook
-    soundfile
-    soxr
     uvicorn
-  ];
+  ]
+  ++ finalAttrs.finalPackage.optional-dependencies.all;
 
   disabledTests = [
-    # Require internet
-    "test_download_gated_image"
-    "test_image_encoder_formats"
-    "test_image_processing"
-
-    # AssertionError: Regex pattern did not match.
-    "test_from_url"
-
     # AssertionError, Extra items in the right set
     "test_openai_chat_fields"
   ];
 
   meta = {
     description = "Tools to help you work with Mistral models";
     homepage = "https://github.com/mistralai/mistral-common";
-    changelog = "https://github.com/mistralai/mistral-common/releases/tag/v${version}";
+    changelog = "https://github.com/mistralai/mistral-common/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ bgamari ];
   };
-}
+})

pkgs/development/python-modules/opentelemetry-api/default.nix

@@ -14,15 +14,15 @@
 let
   self = buildPythonPackage rec {
     pname = "opentelemetry-api";
-    version = "1.34.0";
+    version = "1.40.0";
     pyproject = true;
 
     # to avoid breakage, every package in opentelemetry-python must inherit this version, src, and meta
     src = fetchFromGitHub {
       owner = "open-telemetry";
       repo = "opentelemetry-python";
       tag = "v${version}";
-      hash = "sha256-fAXcS2VyDMk+UDW3ru5ZvwzXjydsY1uFcT2GvZuiGWw=";
+      hash = "sha256-1KVy9s+zjlB4w7E45PMCWRxPus24bgBmmM3k2R9d+Jg=";
     };
 
     sourceRoot = "${src.name}/opentelemetry-api";

pkgs/development/python-modules/opentelemetry-instrumentation/default.nix

@@ -12,15 +12,15 @@
 
 buildPythonPackage rec {
   pname = "opentelemetry-instrumentation";
-  version = "0.55b0";
+  version = "0.61b0";
   pyproject = true;
 
   # To avoid breakage, every package in opentelemetry-python-contrib must inherit this version, src, and meta
   src = fetchFromGitHub {
     owner = "open-telemetry";
     repo = "opentelemetry-python-contrib";
     tag = "v${version}";
-    hash = "sha256-UM9ezCh3TVwyj257O0rvTCIgfrddobWcVIgJmBUj/Vo=";
+    hash = "sha256-DT13gcYPNYXBPnf622WsA16C+7sabJfOshDquHn06Ok=";
   };
 
   sourceRoot = "${src.name}/opentelemetry-instrumentation";

pkgs/development/python-modules/opentelemetry-semantic-conventions-ai/default.nix

@@ -0,0 +1,38 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  hatchling,
+  opentelemetry-sdk,
+  opentelemetry-semantic-conventions,
+}:
+let
+  version = "0.4.15";
+in
+buildPythonPackage {
+  pname = "opentelemetry-semantic-conventions-ai";
+  inherit version;
+  pyproject = true;
+
+  src = fetchPypi {
+    pname = "opentelemetry_semantic_conventions_ai";
+    inherit version;
+    hash = "sha256-Et4XLR4R0hxugrv1eMfopxNYmn/adq+e14VjJWSii4E=";
+  };
+
+  build-system = [ hatchling ];
+
+  dependencies = [
+    opentelemetry-sdk
+    opentelemetry-semantic-conventions
+  ];
+
+  pythonImportsCheck = [ "opentelemetry.semconv_ai" ];
+
+  meta = {
+    description = "Open-source observability for your GenAI or LLM application, based on OpenTelemetry";
+    homepage = "https://github.com/traceloop/openllmetry";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ lach ];
+  };
+}

pkgs/development/python-modules/vllm/0006-drop-rocm-extra-reqs.patch

@@ -2,19 +2,17 @@ diff --git a/requirements/rocm.txt b/requirements/rocm.txt
 index 375f0a019..04a59dc3b 100644
 --- a/requirements/rocm.txt
 +++ b/requirements/rocm.txt
-@@ -9,4 +9,2 @@ ray[cgraph]>=2.48.0 # Ray Compiled Graph, required for pipeline parallelism in V1.
+@@ -10,13 +10,7 @@
+ # Dependencies for AMD GPUs
+ datasets
  peft
 -pytest-asyncio
 -tensorizer==2.10.1
  packaging>=24.2
-@@ -12,6 +10,2 @@ tensorizer==2.10.1
- packaging>=24.2
 -setuptools>=77.0.3,<80.0.0
 -setuptools-scm>=8
--runai-model-streamer[s3,gcs]==0.15.3
+-runai-model-streamer[s3,gcs,azure]==0.15.7
 -conch-triton-kernels==1.2.1
  timm>=1.0.17
- grpcio-tools>=1.76.0
-@@ -17,2 +13,1 @@ conch-triton-kernels==1.2.1
- timm>=1.0.17
--grpcio-tools>=1.76.0
+ # amd-quark: required for Quark quantization on ROCm
+ # To be consistent with test_quark.py

pkgs/development/python-modules/vllm/0007-drop-quack-reqs.patch

@@ -0,0 +1,12 @@
+diff --git a/requirements/cuda.txt b/requirements/cuda.txt
+index 22477dc82..84fe34730 100644
+--- a/requirements/cuda.txt
++++ b/requirements/cuda.txt
+@@ -14,7 +14,3 @@
+ # Cap nvidia-cudnn-frontend (transitive dep of flashinfer) due to
+ # breaking changes in 1.19.0
+ nvidia-cudnn-frontend>=1.13.0,<1.19.0
+-
+-# QuACK and Cutlass DSL for FA4 (cute-DSL implementation)
+-nvidia-cutlass-dsl>=4.4.0.dev1
+-quack-kernels>=0.2.7