commit b06e408d0dd51270606513d48b936774799f1c0f · pyrox.dev/nixpkgs

+30 -8

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

···

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

     

       2
       2
       -
       index af37feb..18b078a 100644

     

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

     

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

     

       5
       5
       -
       @@ -1014,18 +1014,7 @@ def templates_path():

     

       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):

     

       6
       6
        
        )

     

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

     

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

     
···

       18
       18
        
       -    args += list(packages)

     

       19
       19
        
       -    sys.argv = args

     

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

     

       21
       21
       -
       +    click.echo("Install command has been disabled for Nix. If you want to install extra llm plugins, use llm.withPlugins([]) expression.")

     

       21
       21
       +
       +    click.echo(

     

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

     

       23
       23
       +
       +

     

       24
       24
       +
       +Example:

     

       25
       25
       +
       +

     

       26
       26
       +
       +```nix

     

       27
       27
       +
       +llm.withPlugins {

     

       28
       28
       +
       +  @listOfPackagedPlugins@

     

       29
       29
       +
       +}

     

       30
       30
       +
       +```

     

       31
       31
       +
       +"""

     

       32
       32
       +
       +    )

     

       22
       33
        
        

     

       23
       34
        
        

     

       24
       35
        
        @cli.command()

     

       25
       25
       -
       @@ -1033,8 +1022,7 @@ def install(packages, upgrade, editable, force_reinstall, no_cache_dir):

     

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

     

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

     

       27
       38
        
        def uninstall(packages, yes):

     

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

     

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

     

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

     

       31
       31
       -
       +    click.echo("Uninstall command has been disabled for Nix. If you want to uninstall extra llm plugins, just remove them from llm.withPlugins([]) list expression.")

     

       42
       42
       +
       +    click.echo(

     

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

     

       44
       44
       +
       +

     

       45
       45
       +
       +Example:

     

       46
       46
       +
       +

     

       47
       47
       +
       +```nix

     

       48
       48
       +
       +llm.withPlugins {

     

       49
       49
       +
       +  @listOfPackagedPlugins@

     

       50
       50
       +
       +}

     

       51
       51
       +
       +```

     

       52
       52
       +
       +"""

     

       53
       53
       +
       +    )

     

       32
       54
        
        

     

       33
       55
        
        

     

       34
       56
        
        @cli.command()

+29 -8

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

···

       6
       6
        
         fetchFromGitHub,

     

       7
       7
        
         pytestCheckHook,

     

       8
       8
        
         pythonOlder,

     

       9
       9
       +
         replaceVars,

     

       9
       10
        
         setuptools,

     

       10
       11
        
         click-default-group,

     

       11
       12
        
         condense-json,

     
···

       25
       26
        
         sqlite-utils,

     

       26
       27
        
       }:

     

       27
       28
        
       let

     

       28
       28
       -
         # The function signature of `withPlugins` is the list of all the plugins `llm` knows about.

     

       29
       29
       -
         # The plugin directory is at <https://llm.datasette.io/en/stable/plugins/directory.html>

     

       30
       30
       -
         withPluginsArgNames = lib.functionArgs withPlugins;

     

       31
       31
       -
       

     

       32
       29
        
         /**

     

       33
       30
        
           Make a derivation for `llm` that contains `llm` plus the relevant plugins.

     

       31
       31
       +
           The function signature of `withPlugins` is the list of all the plugins `llm` knows about.

     

       32
       32
       +
           Adding a parameter here requires that it be in `python3Packages` attrset.

     

       34
       33
        
       

     

       35
       34
        
           # Type

     

       36
       35
        
       

     
···

       81
       80
        
             llm-templates-github ? false,

     

       82
       81
        
             llm-venice ? false,

     

       83
       82
        
             llm-video-frames ? false,

     

       83
       83
       +
             ...

     

       84
       84
        
           }@args:

     

       85
       85
        
           let

     

       86
       86
        
             # Filter to just the attributes which are set to a true value.

     
···

       97
       97
        
               ps:

     

       98
       98
        
               let

     

       99
       99
        
                 # Throw a diagnostic if this list gets out of sync with the names in python3Packages

     

       100
       100
       -
                 allPluginsPresent = pluginNames == (lib.attrNames withPluginsArgNames);

     

       101
       101
       -
                 pluginNames = lib.attrNames (lib.intersectAttrs ps withPluginsArgNames);

     

       102
       102
       -
                 missingNamesList = lib.attrNames (lib.removeAttrs withPluginsArgNames pluginNames);

     

       100
       100
       +
                 allPluginsPresent = pluginNames == withPluginsArgNames;

     

       101
       101
       +
                 pluginNames = lib.attrNames (lib.intersectAttrs ps withPluginsArgs);

     

       102
       102
       +
                 missingNamesList = lib.attrNames (lib.removeAttrs withPluginsArgs pluginNames);

     

       103
       103
        
                 missingNames = lib.concatStringsSep ", " missingNamesList;

     

       104
       104
        
       

     

       105
       105
        
                 # The relevant plugins are the ones the user asked for.

     
···

       120
       120
        
           '';

     

       121
       121
        
       

     

       122
       122
        
         # Uses the `withPlugins` names to make a Python environment with everything.

     

       123
       123
       -
         withAllPlugins = withPlugins (lib.genAttrs (lib.attrNames withPluginsArgNames) (name: true));

     

       123
       123
       +
         withAllPlugins = withPlugins (lib.genAttrs withPluginsArgNames (name: true));

     

       124
       124
       +
       

     

       125
       125
       +
         # The function signature of `withPlugins` is the list of all the plugins `llm` knows about.

     

       126
       126
       +
         # The plugin directory is at <https://llm.datasette.io/en/stable/plugins/directory.html>

     

       127
       127
       +
         withPluginsArgs = lib.functionArgs withPlugins;

     

       128
       128
       +
         withPluginsArgNames = lib.attrNames withPluginsArgs;

     

       129
       129
       +
       

     

       130
       130
       +
         # In order to help with usability, we patch `llm install` and `llm uninstall` to tell users how to

     

       131
       131
       +
         # customize `llm` with plugins in Nix, including the name of the plugin, its description, and

     

       132
       132
       +
         # where it's coming from.

     

       133
       133
       +
         listOfPackagedPlugins = builtins.toFile "plugins.txt" (

     

       134
       134
       +
           lib.concatStringsSep "\n  " (

     

       135
       135
       +
             map (name: ''

     

       136
       136
       +
               # ${python.pkgs.${name}.meta.description} <${python.pkgs.${name}.meta.homepage}>

     

       137
       137
       +
                 ${name} = true;

     

       138
       138
       +
             '') withPluginsArgNames

     

       139
       139
       +
           )

     

       140
       140
       +
         );

     

       124
       141
        
       

     

       125
       142
        
         llm = buildPythonPackage rec {

     

       126
       143
        
           pname = "llm";

     
···

       139
       156
        
           };

     

       140
       157
        
       

     

       141
       158
        
           patches = [ ./001-disable-install-uninstall-commands.patch ];

     

       159
       159
       +
       

     

       160
       160
       +
           postPatch = ''

     

       161
       161
       +
             substituteInPlace llm/cli.py --replace-fail "@listOfPackagedPlugins@" "$(< ${listOfPackagedPlugins})"

     

       162
       162
       +
           '';

     

       142
       163
        
       

     

       143
       164
        
           dependencies = [

     

       144
       165
        
             click-default-group