elelem-shell 0.2.0 → 0.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.release-please-manifest.json +1 -1
- data/CHANGELOG.md +7 -0
- data/README.md +11 -8
- data/lib/elelem/shell/default_provider.rb +16 -8
- data/lib/elelem/shell/version.rb +1 -1
- data/lib/elelem/shell.rb +1 -1
- data/spec/elelem/default_provider_spec.rb +39 -10
- data/spec/elelem/exe_spec.rb +2 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: f07631ded1bd99e50e1990e6df0f4a4fc6849d2178f4d46426d60f7c36b5d63d
|
|
4
|
+
data.tar.gz: 69d33a7ad0f8923586b0073727b909f938160ff75a8f086a60f290bef848a77f
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: fa1ada3901b75908de1992f9fb98c2e6ae85f9f42cbab7cf3af83dfd08bd2ac98630912ab7c667263a44a0cff17d345d36245f05ed21830fd09aa0eff0b74477
|
|
7
|
+
data.tar.gz: 25fb6ed6e830d78c7c66c3741e581a5ca4adffd088d972d8b2443b216bb15179d5e78de06a4587fb5547390bfff9d5d9311f77f5259cf8a25ded812832b2592f
|
data/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## [0.2.1](https://github.com/elelem-sh/shell/compare/v0.2.0...v0.2.1) (2026-11-17)
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
### Bug Fixes
|
|
7
|
+
|
|
8
|
+
* detect a hosted provider only when its model is set too, and treat a blank ELELEM_GGUF_MODEL as unset ([3676ffa](https://github.com/elelem-sh/shell/commit/3676ffa00477fcb21105c2d6b7c8b584350f4a3c))
|
|
9
|
+
|
|
3
10
|
## [0.2.0](https://github.com/elelem-sh/shell/compare/v0.1.0...v0.2.0) (2026-11-17)
|
|
4
11
|
|
|
5
12
|
|
data/README.md
CHANGED
|
@@ -19,17 +19,20 @@ Pick a provider with `-p NAME`. Without `-p`, the first match wins:
|
|
|
19
19
|
1. `ELELEM_PROVIDER`, its value
|
|
20
20
|
2. `ANTHROPIC_API_KEY`, anthropic
|
|
21
21
|
3. `OPENAI_API_KEY` or `OPENAI_BASE_URL`, openai
|
|
22
|
-
4. `GEMINI_API_KEY`, gemini
|
|
23
|
-
5. `OPENROUTER_API_KEY`, openrouter; `GROQ_API_KEY
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
22
|
+
4. `GEMINI_API_KEY` and `GEMINI_MODEL`, gemini
|
|
23
|
+
5. `OPENROUTER_API_KEY` and `OPENROUTER_MODEL`, openrouter; `GROQ_API_KEY` and
|
|
24
|
+
`GROQ_MODEL`, groq; `MISTRAL_API_KEY` and `MISTRAL_MODEL`, mistral;
|
|
25
|
+
`CEREBRAS_API_KEY` and `CEREBRAS_MODEL`, cerebras
|
|
26
|
+
6. `CLOUDFLARE_API_TOKEN`, `CLOUDFLARE_ACCOUNT_ID` and `CLOUDFLARE_MODEL`,
|
|
27
|
+
cloudflare
|
|
28
|
+
7. llama, when elelem-llama is installed and `ELELEM_GGUF_MODEL` is set, or
|
|
29
|
+
`~/.agents/models` holds `default.gguf` or exactly one `.gguf` file
|
|
28
30
|
8. `OLLAMA_HOST`, ollama
|
|
29
31
|
9. demo, which calls no model
|
|
30
32
|
|
|
31
|
-
A variable that is set but blank counts as unset.
|
|
32
|
-
|
|
33
|
+
A variable that is set but blank counts as unset. The hosted providers in
|
|
34
|
+
4 to 6 have no default model, so their key alone is not enough. `GITHUB_TOKEN`
|
|
35
|
+
is not detected; use `-p github`.
|
|
33
36
|
|
|
34
37
|
To run it without installing, use [rv](https://rv.dev):
|
|
35
38
|
|
|
@@ -7,12 +7,12 @@ module Elelem
|
|
|
7
7
|
KEYS = {
|
|
8
8
|
"anthropic" => [%w[ANTHROPIC_API_KEY]],
|
|
9
9
|
"openai" => [%w[OPENAI_API_KEY], %w[OPENAI_BASE_URL]],
|
|
10
|
-
"gemini" => [%w[GEMINI_API_KEY]],
|
|
11
|
-
"openrouter" => [%w[OPENROUTER_API_KEY]],
|
|
12
|
-
"groq" => [%w[GROQ_API_KEY]],
|
|
13
|
-
"mistral" => [%w[MISTRAL_API_KEY]],
|
|
14
|
-
"cerebras" => [%w[CEREBRAS_API_KEY]],
|
|
15
|
-
"cloudflare" => [%w[CLOUDFLARE_API_TOKEN CLOUDFLARE_ACCOUNT_ID]]
|
|
10
|
+
"gemini" => [%w[GEMINI_API_KEY GEMINI_MODEL]],
|
|
11
|
+
"openrouter" => [%w[OPENROUTER_API_KEY OPENROUTER_MODEL]],
|
|
12
|
+
"groq" => [%w[GROQ_API_KEY GROQ_MODEL]],
|
|
13
|
+
"mistral" => [%w[MISTRAL_API_KEY MISTRAL_MODEL]],
|
|
14
|
+
"cerebras" => [%w[CEREBRAS_API_KEY CEREBRAS_MODEL]],
|
|
15
|
+
"cloudflare" => [%w[CLOUDFLARE_API_TOKEN CLOUDFLARE_ACCOUNT_ID CLOUDFLARE_MODEL]]
|
|
16
16
|
}.freeze
|
|
17
17
|
|
|
18
18
|
def initialize(env = ENV, models_dir: "~/.agents/models")
|
|
@@ -26,7 +26,11 @@ module Elelem
|
|
|
26
26
|
|
|
27
27
|
private
|
|
28
28
|
|
|
29
|
-
def detected
|
|
29
|
+
def detected
|
|
30
|
+
return @detected if defined?(@detected)
|
|
31
|
+
|
|
32
|
+
@detected = value("ELELEM_PROVIDER") || keyed || local
|
|
33
|
+
end
|
|
30
34
|
|
|
31
35
|
def keyed
|
|
32
36
|
KEYS.find { |_, alternatives| alternatives.any? { |names| names.all? { |name| value(name) } } }&.first
|
|
@@ -40,12 +44,16 @@ module Elelem
|
|
|
40
44
|
|
|
41
45
|
def llama?
|
|
42
46
|
require "elelem/llama/model_resolver"
|
|
43
|
-
Llama::ModelResolver.resolve(model: nil, env:
|
|
47
|
+
Llama::ModelResolver.resolve(model: nil, env: resolver_env, models_dir: @models_dir)
|
|
44
48
|
true
|
|
45
49
|
rescue LoadError, RuntimeError
|
|
46
50
|
false
|
|
47
51
|
end
|
|
48
52
|
|
|
53
|
+
def resolver_env
|
|
54
|
+
value("ELELEM_GGUF_MODEL") ? @env : @env.to_h.except("ELELEM_GGUF_MODEL")
|
|
55
|
+
end
|
|
56
|
+
|
|
49
57
|
def value(name)
|
|
50
58
|
@env[name].to_s.strip.then { |text| text unless text.empty? }
|
|
51
59
|
end
|
data/lib/elelem/shell/version.rb
CHANGED
data/lib/elelem/shell.rb
CHANGED
|
@@ -12,7 +12,7 @@ require "elelem/skills"
|
|
|
12
12
|
|
|
13
13
|
module Elelem
|
|
14
14
|
module Shell
|
|
15
|
-
PROVIDER_FLAG = /\A(-p|--
|
|
15
|
+
PROVIDER_FLAG = /\A(-p|--pro)/
|
|
16
16
|
NOTICE = "elelem: no model or API key found; using the demo provider. " \
|
|
17
17
|
"Run curl -fsSL https://elelem.sh/install | sh, or set ANTHROPIC_API_KEY or OPENAI_API_KEY."
|
|
18
18
|
|
|
@@ -19,11 +19,6 @@ RSpec.describe Elelem::Shell do
|
|
|
19
19
|
"ANTHROPIC_API_KEY" => "anthropic",
|
|
20
20
|
"OPENAI_API_KEY" => "openai",
|
|
21
21
|
"OPENAI_BASE_URL" => "openai",
|
|
22
|
-
"GEMINI_API_KEY" => "gemini",
|
|
23
|
-
"OPENROUTER_API_KEY" => "openrouter",
|
|
24
|
-
"GROQ_API_KEY" => "groq",
|
|
25
|
-
"MISTRAL_API_KEY" => "mistral",
|
|
26
|
-
"CEREBRAS_API_KEY" => "cerebras",
|
|
27
22
|
"OLLAMA_HOST" => "ollama"
|
|
28
23
|
}.each do |name, provider|
|
|
29
24
|
it "picks #{provider} when #{name} is set" do
|
|
@@ -35,6 +30,24 @@ RSpec.describe Elelem::Shell do
|
|
|
35
30
|
end
|
|
36
31
|
end
|
|
37
32
|
|
|
33
|
+
{
|
|
34
|
+
"gemini" => "GEMINI",
|
|
35
|
+
"openrouter" => "OPENROUTER",
|
|
36
|
+
"groq" => "GROQ",
|
|
37
|
+
"mistral" => "MISTRAL",
|
|
38
|
+
"cerebras" => "CEREBRAS"
|
|
39
|
+
}.each do |provider, prefix|
|
|
40
|
+
it "picks #{provider} when #{prefix}_API_KEY and #{prefix}_MODEL are set" do
|
|
41
|
+
expect(detect("#{prefix}_API_KEY" => "key", "#{prefix}_MODEL" => "model")).to eq(provider)
|
|
42
|
+
end
|
|
43
|
+
|
|
44
|
+
it "ignores #{prefix}_API_KEY without #{prefix}_MODEL, since #{provider} has no default model" do
|
|
45
|
+
add_model
|
|
46
|
+
|
|
47
|
+
expect(detect("#{prefix}_API_KEY" => "key")).to eq("llama")
|
|
48
|
+
end
|
|
49
|
+
end
|
|
50
|
+
|
|
38
51
|
it "falls back to demo" do
|
|
39
52
|
expect(detect).to eq("demo")
|
|
40
53
|
end
|
|
@@ -49,15 +62,21 @@ RSpec.describe Elelem::Shell do
|
|
|
49
62
|
|
|
50
63
|
it "prefers the hosted providers in order" do
|
|
51
64
|
names = %w[ANTHROPIC_API_KEY OPENAI_API_KEY GEMINI_API_KEY OPENROUTER_API_KEY GROQ_API_KEY MISTRAL_API_KEY
|
|
52
|
-
CEREBRAS_API_KEY CLOUDFLARE_API_TOKEN
|
|
53
|
-
|
|
65
|
+
CEREBRAS_API_KEY CLOUDFLARE_API_TOKEN]
|
|
66
|
+
models = %w[GEMINI_MODEL OPENROUTER_MODEL GROQ_MODEL MISTRAL_MODEL CEREBRAS_MODEL CLOUDFLARE_MODEL]
|
|
67
|
+
env = (names + models + %w[CLOUDFLARE_ACCOUNT_ID]).to_h { |name| [name, "value"] }
|
|
54
68
|
picks = names.map { |name| detect(env).tap { env.delete(name) } }
|
|
55
69
|
|
|
56
|
-
expect(picks).to eq(%w[anthropic openai gemini openrouter groq mistral cerebras cloudflare
|
|
70
|
+
expect(picks).to eq(%w[anthropic openai gemini openrouter groq mistral cerebras cloudflare])
|
|
57
71
|
end
|
|
58
72
|
|
|
59
73
|
it "picks cloudflare when the token and the account id are set" do
|
|
60
|
-
expect(detect("CLOUDFLARE_API_TOKEN" => "token", "CLOUDFLARE_ACCOUNT_ID" => "id"
|
|
74
|
+
expect(detect("CLOUDFLARE_API_TOKEN" => "token", "CLOUDFLARE_ACCOUNT_ID" => "id",
|
|
75
|
+
"CLOUDFLARE_MODEL" => "model")).to eq("cloudflare")
|
|
76
|
+
end
|
|
77
|
+
|
|
78
|
+
it "ignores cloudflare without CLOUDFLARE_MODEL" do
|
|
79
|
+
expect(detect("CLOUDFLARE_API_TOKEN" => "token", "CLOUDFLARE_ACCOUNT_ID" => "id")).to eq("demo")
|
|
61
80
|
end
|
|
62
81
|
|
|
63
82
|
it "ignores a cloudflare token without an account id" do
|
|
@@ -82,6 +101,16 @@ RSpec.describe Elelem::Shell do
|
|
|
82
101
|
expect(detect("ELELEM_GGUF_MODEL" => "/nonexistent/model.gguf")).to eq("llama")
|
|
83
102
|
end
|
|
84
103
|
|
|
104
|
+
it "ignores a blank ELELEM_GGUF_MODEL" do
|
|
105
|
+
expect(detect("ELELEM_GGUF_MODEL" => " ")).to eq("demo")
|
|
106
|
+
end
|
|
107
|
+
|
|
108
|
+
it "ignores a blank ELELEM_GGUF_MODEL and still finds a model in the directory" do
|
|
109
|
+
add_model
|
|
110
|
+
|
|
111
|
+
expect(detect("ELELEM_GGUF_MODEL" => "")).to eq("llama")
|
|
112
|
+
end
|
|
113
|
+
|
|
85
114
|
it "skips llama when the models directory holds several models and no default" do
|
|
86
115
|
add_model("one.gguf")
|
|
87
116
|
add_model("two.gguf")
|
|
@@ -92,7 +121,7 @@ RSpec.describe Elelem::Shell do
|
|
|
92
121
|
it "prefers an API key to a local model" do
|
|
93
122
|
add_model
|
|
94
123
|
|
|
95
|
-
expect(detect("
|
|
124
|
+
expect(detect("ANTHROPIC_API_KEY" => "key")).to eq("anthropic")
|
|
96
125
|
end
|
|
97
126
|
|
|
98
127
|
it "prefers a local model to ollama" do
|
data/spec/elelem/exe_spec.rb
CHANGED
|
@@ -8,6 +8,7 @@ RSpec.describe "exe/elelem-shell" do
|
|
|
8
8
|
let(:detected) do
|
|
9
9
|
%w[ELELEM_PROVIDER ANTHROPIC_API_KEY OPENAI_API_KEY OPENAI_BASE_URL GEMINI_API_KEY OPENROUTER_API_KEY
|
|
10
10
|
GROQ_API_KEY MISTRAL_API_KEY CEREBRAS_API_KEY CLOUDFLARE_API_TOKEN CLOUDFLARE_ACCOUNT_ID ELELEM_GGUF_MODEL
|
|
11
|
+
MISTRAL_MODEL
|
|
11
12
|
OLLAMA_HOST]
|
|
12
13
|
end
|
|
13
14
|
|
|
@@ -42,7 +43,7 @@ RSpec.describe "exe/elelem-shell" do
|
|
|
42
43
|
end
|
|
43
44
|
|
|
44
45
|
it "shows the detected provider as the default" do
|
|
45
|
-
output, = run("help", "MISTRAL_API_KEY" => "key")
|
|
46
|
+
output, = run("help", "MISTRAL_API_KEY" => "key", "MISTRAL_MODEL" => "model")
|
|
46
47
|
|
|
47
48
|
expect(output).to include("(default: mistral)")
|
|
48
49
|
end
|