Unverified Commit 3ba70354 authored by Yt's avatar Yt Committed by GitHub
Browse files

Merge pull request #293132 from natsukium/openllm/update

python311Packages.openllm-core: 0.4.41 -> 0.4.44
parents a484345e 9ee15d69
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -29,20 +29,20 @@ buildPythonPackage rec {
      --replace-fail "hatch-vcs==0.3.0" "hatch-vcs"
  '';

  nativeBuildInputs = [
  build-system = [
    hatch-fancy-pypi-readme
    hatch-vcs
    hatchling
  ];

  propagatedBuildInputs = [
  dependencies = [
    anyio
    distro
    httpx
    openllm-core
  ];

  passthru.optional-dependencies = {
  optional-dependencies = {
    grpc = [
      bentoml
    ] ++ bentoml.optional-dependencies.grpc;
@@ -54,7 +54,7 @@ buildPythonPackage rec {
      # diffusers
      soundfile
    ] ++ transformers.optional-dependencies.agents;
    full = passthru.optional-dependencies.grpc ++ passthru.optional-dependencies.agents;
    full = optional-dependencies.grpc ++ optional-dependencies.agents;
  };

  # there is no tests
+11 −8
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@

buildPythonPackage rec {
  pname = "openllm-core";
  version = "0.4.41";
  version = "0.4.44";
  pyproject = true;

  disabled = pythonOlder "3.8";
@@ -33,15 +33,12 @@ buildPythonPackage rec {
    owner = "bentoml";
    repo = "OpenLLM";
    rev = "refs/tags/v${version}";
    hash = "sha256-9mr6sw4/h5cYSmo1CDT2SKq4NVz1ZcoyqnYOwhlfaiQ=";
    hash = "sha256-kRR715Vnt9ZAmxuWvtH0z093crH0JFrEKPtbjO3QMRc=";
  };

  sourceRoot = "source/openllm-core";

  nativeBuildInputs = [
    hatch-fancy-pypi-readme
    hatch-vcs
    hatchling
    pythonRelaxDepsHook
  ];

@@ -55,7 +52,13 @@ buildPythonPackage rec {
    "cattrs"
  ];

  propagatedBuildInputs = [
  build-system = [
    hatch-fancy-pypi-readme
    hatch-vcs
    hatchling
  ];

  dependencies = [
    attrs
    cattrs
    # not listed in pyproject.toml, but required at runtime
@@ -67,7 +70,7 @@ buildPythonPackage rec {
    typing-extensions
  ];

  passthru.optional-dependencies = {
  optional-dependencies = {
    vllm = [
      # vllm
    ];
@@ -83,7 +86,7 @@ buildPythonPackage rec {
      # trl
    ] ++ transformers.optional-dependencies.torch
      ++ transformers.optional-dependencies.tokenizers;
    full = with passthru.optional-dependencies; (
    full = with optional-dependencies; (
      vllm
      # use absolute path to disambiguate with derivbation argument
      ++ passthru.optional-dependencies.bentoml
+11 −9
Original line number Diff line number Diff line
@@ -54,9 +54,6 @@ buildPythonPackage rec {
  sourceRoot = "source/openllm-python";

  nativeBuildInputs = [
    hatch-fancy-pypi-readme
    hatch-vcs
    hatchling
    pythonRelaxDepsHook
  ];

@@ -65,7 +62,13 @@ buildPythonPackage rec {
    "cuda-python"
  ];

  propagatedBuildInputs = [
  build-system = [
    hatch-fancy-pypi-readme
    hatch-vcs
    hatchling
  ];

  dependencies = [
    accelerate
    bentoml
    bitsandbytes
@@ -79,14 +82,13 @@ buildPythonPackage rec {
    safetensors
    scipy
    sentencepiece
    tabulate
    transformers
  ] ++ bentoml.optional-dependencies.io
  ++ tabulate.optional-dependencies.widechars
  ++ transformers.optional-dependencies.tokenizers
  ++ transformers.optional-dependencies.torch;

  passthru.optional-dependencies = {
  optional-dependencies = {
    agents = [
      # diffusers
      soundfile
@@ -142,13 +144,13 @@ buildPythonPackage rec {
    vllm = [
      # vllm
    ];
    full = with passthru.optional-dependencies; (
    full = with optional-dependencies; (
      agents ++ awq ++ baichuan ++ chatglm ++ ctranslate ++ falcon ++ fine-tune ++ ggml ++ gptq ++ mpt
      # disambiguate between derivation input and passthru field
      ++ passthru.optional-dependencies.openai
      ++ optional-dependencies.openai
      ++ playground ++ starcoder ++ vllm
    );
    all = passthru.optional-dependencies.full;
    all = optional-dependencies.full;
  };

  nativeCheckInputs = [