From c1938a498710596a774df3d89d76cfed97d66a3a Mon Sep 17 00:00:00 2001 From: Simon Willison Date: Sat, 1 Jul 2023 10:33:49 -0700 Subject: [PATCH] Fix for --key being beaten by env variable, closes #71 --- llm/cli.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/llm/cli.py b/llm/cli.py index 7da1c0b..b1e0bc9 100644 --- a/llm/cli.py +++ b/llm/cli.py @@ -492,10 +492,10 @@ def get_key(key_arg, default_key, env_var=None): keys = load_keys() if key_arg in keys: return keys[key_arg] - if env_var and os.environ.get(env_var): - return os.environ[env_var] if key_arg: return key_arg + if env_var and os.environ.get(env_var): + return os.environ[env_var] default = keys.get(default_key) if not default: message = "No key found - add one using 'llm keys set {}'".format(default_key)