Unverified Commit bc50837c authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

Merge pull request #299110 from fabaff/llama-index-legacy-refactor 

python311Packages.llama-index-legacy: 0.10.22 -> 0.9.48
parents 994e8b66 b3246705

pkgs/development/python-modules/clarifai/default.nix

+8 −5
Original line number Diff line number Diff line
@@ -17,13 +17,14 @@ 
, rich

, schema

, setuptools

, tabulate

, tqdm

, tritonclient

}:



buildPythonPackage rec {

  pname = "clarifai";

  version = "10.1.1";

  version = "10.2.1";

  pyproject = true;



  disabled = pythonOlder "3.8";
@@ -32,7 +33,7 @@ buildPythonPackage rec { 
    owner = "Clarifai";

    repo = "clarifai-python";

    rev = "refs/tags/${version}";

    hash = "sha256-36XceC40cL0SywY0Mus/s8OCO0ujWqxEIKZW+fvd7lw=";

    hash = "sha256-jI85xMApeEd0Hl6h4Am5qxWoSSTWHsmb7FxUjJPmBQM=";

  };



  pythonRelaxDeps = [
@@ -43,12 +44,12 @@ buildPythonPackage rec { 
    "opencv-python"

  ];



  nativeBuildInputs = [

  build-system = [

    pythonRelaxDepsHook

    setuptools

  ];



  propagatedBuildInputs = [

  dependencies = [

    clarifai-grpc

    inquirerpy

    llama-index-core
@@ -60,6 +61,7 @@ buildPythonPackage rec { 
    pyyaml

    rich

    schema

    tabulate

    tqdm

    tritonclient

  ];
@@ -87,6 +89,7 @@ buildPythonPackage rec { 
    # Tests require network access and API key

    "tests/test_app.py"

    "tests/test_data_upload.py"

    "tests/test_eval.py"

    "tests/test_model_predict.py"

    "tests/test_model_train.py"

    "tests/test_search.py"
@@ -102,10 +105,10 @@ buildPythonPackage rec { 


  meta = with lib; {

    description = "Clarifai Python Utilities";

    mainProgram = "clarifai";

    homepage = "https://github.com/Clarifai/clarifai-python";

    changelog = "https://github.com/Clarifai/clarifai-python/releases/tag/${version}";

    license = licenses.asl20;

    maintainers = with maintainers; [ natsukium ];

    mainProgram = "clarifai";

  };

}

pkgs/development/python-modules/llama-index-core/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 


buildPythonPackage rec {

  pname = "llama-index-core";

  version = "0.10.20";

  version = "0.10.23";

  pyproject = true;



  disabled = pythonOlder "3.8";
@@ -39,7 +39,7 @@ buildPythonPackage rec { 
    owner = "run-llama";

    repo = "llama_index";

    rev = "refs/tags/v${version}";

    hash = "sha256-F7k5gtmhFdn369Ws5PSJ/xTid6ONstoWPotk+DmDtLw=";

    hash = "sha256-koFdHpcMX4Qg+LLDcjHx4wYxHnrJaAqebpba0ejINzo=";

  };



  sourceRoot = "${src.name}/${pname}";

pkgs/development/python-modules/llama-index-embeddings-openai/default.nix

+22 −7
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, fetchFromGitHub

, fetchPypi

, llama-index-core

, poetry-core

, pythonOlder

}:



buildPythonPackage rec {

  pname = "llama-index-embeddings-openai";



  inherit (llama-index-core) version src meta;



  version = "0.1.7";

  pyproject = true;



  sourceRoot = "${src.name}/llama-index-integrations/embeddings/${pname}";

  disabled = pythonOlder "3.8";



  src = fetchPypi {

    pname = "llama_index_embeddings_openai";

    inherit version;

    hash = "sha256-xxzJggaAxM7fyYRdyHuU9oUdHMzh5Ib8kSmPj6jZ8n0=";

  };



  nativeBuildInputs = [

  build-system = [

    poetry-core

  ];



  propagatedBuildInputs = [

  dependencies = [

    llama-index-core

  ];



  # Tests are only available in the mono repo

  doCheck = false;



  pythonImportsCheck = [

    "llama_index.embeddings.openai"

  ];



  meta = with lib; {

    description = "LlamaIndex Embeddings Integration for OpenAI";

    homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/readers/llama-index-readers-s3";

    license = licenses.mit;

    maintainers = with maintainers; [ fab ];

  };

}

pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix

+22 −7
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, fetchFromGitHub

, fetchPypi

, poetry-core

, llama-index-core

, pythonOlder

}:



buildPythonPackage rec {

  pname = "llama-index-indices-managed-llama-cloud";



  inherit (llama-index-core) version src meta;



  version = "0.1.5";

  pyproject = true;



  sourceRoot = "${src.name}/llama-index-integrations/indices/${pname}";

  disabled = pythonOlder "3.8";



  src = fetchPypi {

    pname = "llama_index_indices_managed_llama_cloud";

    inherit version;

    hash = "sha256-R83enwa73dUI8O/PQd5CXoUXGsLI/ail+yqJZz4cjHE=";

  };



  nativeBuildInputs = [

  build-system = [

    poetry-core

  ];



  propagatedBuildInputs = [

  dependencies = [

    llama-index-core

  ];



  # Tests are only available in the mono repo

  doCheck = false;



  pythonImportsCheck = [

    "llama_index.indices.managed.llama_cloud"

  ];



  meta = with lib; {

    description = "LlamaCloud Index and Retriever";

    homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/indices/llama-index-indices-managed-llama-cloud";

    license = licenses.mit;

    maintainers = with maintainers; [ fab ];

  };

}

pkgs/development/python-modules/llama-index-legacy/default.nix

+23 −8
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, fetchFromGitHub

, poetry-core

, fetchPypi

, llama-index-core

, poetry-core

, pythonOlder

}:



buildPythonPackage rec {

  pname = "llama-index-legacy";



  inherit (llama-index-core) version src meta;



  version = "0.9.48";

  pyproject = true;



  sourceRoot = "${src.name}/${pname}";

  disabled = pythonOlder "3.8";



  nativeBuildInputs = [

  src = fetchPypi {

    pname = "llama_index_legacy";

    inherit version;

    hash = "sha256-gt3EaR7b9JUz1lWCwkm6IsA/6W+9PpL3dY3M7yjkODQ=";

  };



  build-system = [

    poetry-core

  ];



  propagatedBuildInputs = [

  dependencies = [

    llama-index-core

  ];



  # Tests are only available in the mono repo

  doCheck = false;



  meta = with lib; {

    description = "LlamaIndex Readers Integration for files";

    homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-legacy";

    license = licenses.mit;

    maintainers = with maintainers; [ fab ];

  };

}