commit 36e9a7ddb91e5649e089d66d1caf6c1a50f19263 · pyrox.dev/nixpkgs

+2 -2

pkgs/development/python-modules/llm-echo/default.nix

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "llm-echo";

     

       14
       14
       -
         version = "0.3";

     

       14
       14
       +
         version = "0.3a3";

     

       15
       15
        
         pyproject = true;

     

       16
       16
        
       

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "simonw";

     

       19
       19
        
           repo = "llm-echo";

     

       20
       20
        
           tag = version;

     

       21
       21
       -
           hash = "sha256-KtdsvXJQRJ3EEJ25i6ccbVxMsWlDsxa+HJ7bFzyYGNI=";

     

       21
       21
       +
           hash = "sha256-4345UIyaQx+mYYBAFD5AaX5YbjbnJQt8bKMD5Vl8VJc=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         build-system = [

+23 -15

pkgs/development/python-modules/llm/001-disable-install-uninstall-commands.patch

···

       1
       1
       -
       diff --git i/llm/cli.py w/llm/cli.py

     

       2
       2
       -
       index 09e4e2d..8424a5e 100644

     

       3
       3
       -
       --- i/llm/cli.py

     

       4
       4
       -
       +++ w/llm/cli.py

     

       5
       5
       -
       @@ -2383,18 +2383,18 @@ def display_truncated(text):

     

       1
       1
       +
       diff --git a/llm/cli.py b/llm/cli.py

     

       2
       2
       +
       index 5d53e74..c2b4707 100644

     

       3
       3
       +
       --- a/llm/cli.py

     

       4
       4
       +
       +++ b/llm/cli.py

     

       5
       5
       +
       @@ -2895,30 +2895,38 @@ def display_truncated(text):

     

       6
       6
       +
            help="Include pre-release and development versions",

     

       6
       7
        
        )

     

       7
       7
       -
        def install(packages, upgrade, editable, force_reinstall, no_cache_dir):

     

       8
       8
       -
            """Install packages from PyPI into the same environment as LLM"""

     

       8
       8
       +
        def install(packages, upgrade, editable, force_reinstall, no_cache_dir, pre):

     

       9
       9
       +
       -    """Install packages from PyPI into the same environment as LLM"""

     

       9
       10
        
       -    args = ["pip", "install"]

     

       10
       11
        
       -    if upgrade:

     

       11
       12
        
       -        args += ["--upgrade"]

     
···

       15
       16
        
       -        args += ["--force-reinstall"]

     

       16
       17
        
       -    if no_cache_dir:

     

       17
       18
        
       -        args += ["--no-cache-dir"]

     

       19
       19
       +
       -    if pre:

     

       20
       20
       +
       -        args += ["--pre"]

     

       18
       21
        
       -    args += list(packages)

     

       19
       22
        
       -    sys.argv = args

     

       20
       23
        
       -    run_module("pip", run_name="__main__")

     

       21
       21
       -
       +    click.echo(

     

       24
       24
       +
       +    """Install packages from PyPI into the same environment as LLM. Disabled for nixpkgs."""

     

       25
       25
       +
       +    raise click.ClickException(

     

       22
       26
        
       +"""Install command has been disabled for Nix. To install extra `llm` plugins, use the `llm.withPlugins` function.

     

       23
       27
        
       +

     

       24
       28
        
       +Example:

     
···

       30
       34
        
       +```

     

       31
       35
        
       +"""

     

       32
       36
        
       +    )

     

       33
       33
       -
        

     

       34
       34
       -
        

     

       37
       37
       +
       

     

       38
       38
       +
       

     

       35
       39
        
        @cli.command()

     

       36
       36
       -
       @@ -2402,8 +2402,18 @@ def install(packages, upgrade, editable, force_reinstall, no_cache_dir):

     

       40
       40
       +
        @click.argument("packages", nargs=-1, required=True)

     

       37
       41
        
        @click.option("-y", "--yes", is_flag=True, help="Don't ask for confirmation")

     

       38
       42
        
        def uninstall(packages, yes):

     

       39
       39
       -
            """Uninstall Python packages from the LLM environment"""

     

       43
       43
       +
       -    """Uninstall Python packages from the LLM environment"""

     

       40
       44
        
       -    sys.argv = ["pip", "uninstall"] + list(packages) + (["-y"] if yes else [])

     

       41
       45
        
       -    run_module("pip", run_name="__main__")

     

       42
       42
       -
       +    click.echo(

     

       46
       46
       +
       +    """Uninstall Python packages from the LLM environment. Disabled for nixpkgs."""

     

       47
       47
       +
       +    raise click.ClickException(

     

       43
       48
        
       +"""Uninstall command has been disabled for Nix. To remove `llm` plugins, use the `llm.withPlugins` function with the desired set of plugins specified.

     

       44
       49
        
       +

     

       45
       50
        
       +Example:

     
···

       51
       56
        
       +```

     

       52
       57
        
       +"""

     

       53
       58
        
       +    )

     

       54
       54
       -
        

     

       55
       55
       -
        

     

       59
       59
       +
       

     

       60
       60
       +
       

     

       56
       61
        
        @cli.command()

     

       62
       62
       +
       --

     

       63
       63
       +
       2.49.0

     

       64
       64
       +

+13 -2

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

···

       23
       23
        
         cogapp,

     

       24
       24
        
         pytest-asyncio,

     

       25
       25
        
         pytest-httpx,

     

       26
       26
       +
         pytest-recording,

     

       26
       27
        
         sqlite-utils,

     

       28
       28
       +
         syrupy,

     

       29
       29
       +
         llm-echo,

     

       27
       30
        
       }:

     

       28
       31
        
       let

     

       29
       32
        
         /**

     
···

       142
       145
        
       

     

       143
       146
        
         llm = buildPythonPackage rec {

     

       144
       147
        
           pname = "llm";

     

       145
       145
       -
           version = "0.25";

     

       148
       148
       +
           version = "0.26";

     

       146
       149
        
           pyproject = true;

     

       147
       150
        
       

     

       148
       151
        
           build-system = [ setuptools ];

     
···

       153
       156
        
             owner = "simonw";

     

       154
       157
        
             repo = "llm";

     

       155
       158
        
             tag = version;

     

       156
       156
       -
             hash = "sha256-iH1P0VdpwIItY1In7vlM0Sn44Db23TqFp8GZ79/GMJs=";

     

       159
       159
       +
             hash = "sha256-KTlNajuZrR0kBX3LatepsNM3PfRVsQn+evEfXTu6juE=";

     

       157
       160
        
           };

     

       158
       161
        
       

     

       159
       162
        
           patches = [ ./001-disable-install-uninstall-commands.patch ];

     
···

       183
       186
        
             numpy

     

       184
       187
        
             pytest-asyncio

     

       185
       188
        
             pytest-httpx

     

       189
       189
       +
             pytest-recording

     

       190
       190
       +
             syrupy

     

       186
       191
        
             pytestCheckHook

     

       187
       192
        
           ];

     

       188
       193
        
       

     

       189
       194
        
           doCheck = true;

     

       195
       195
       +
       

     

       196
       196
       +
           # The tests make use of `llm_echo` but that would be a circular dependency.

     

       197
       197
       +
           # So we make a local copy in this derivation, as it's a super-simple package of one file.

     

       198
       198
       +
           preCheck = ''

     

       199
       199
       +
             cp ${llm-echo.src}/llm_echo.py llm_echo.py

     

       200
       200
       +
           '';

     

       190
       201
        
       

     

       191
       202
        
           pytestFlagsArray = [

     

       192
       203
        
             "-svv"