Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,10 @@ running ShellOracle with this method will not automatically insert the result in
### Ollama

Before using ShellOracle with Ollama, pull the model you chose in the configure step.
For example, if you chose `qwen2.5-coder`, run:
For example, if you chose `gemma4:12b`, run:

```shell
ollama pull qwen2.5-coder
ollama pull gemma4:12b
```

Refer to the [Ollama docs](https://ollama.ai) for installation, available models, and usage.
Expand Down
2 changes: 1 addition & 1 deletion src/shelloracle/providers/deepseek.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class Deepseek(Provider):
name = "Deepseek"

api_key = Setting(default="")
model = Setting(default="deepseek-chat")
model = Setting(default="deepseek-flash")

def __init__(self, *args, **kwargs) -> None:
super().__init__(*args, **kwargs)
Expand Down
2 changes: 1 addition & 1 deletion src/shelloracle/providers/google.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class Google(Provider):
name = "Google"

api_key = Setting(default="")
model = Setting(default="gemini-2.5-flash") # Default model to use
model = Setting(default="gemini-3.8-flash") # Default model to use

def __init__(self, *args, **kwargs) -> None:
super().__init__(*args, **kwargs)
Expand Down
2 changes: 1 addition & 1 deletion src/shelloracle/providers/localai.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class LocalAI(Provider):

host = Setting(default="localhost")
port = Setting(default=8080)
model = Setting(default="mistral")
model = Setting(default="qwen3.8-9b-q4")

@property
def endpoint(self) -> str:
Expand Down
2 changes: 1 addition & 1 deletion src/shelloracle/providers/ollama.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class Ollama(Provider):

host = Setting(default="localhost")
port = Setting(default=11434)
model = Setting(default="qwen2.5-coder")
model = Setting(default="gemma4:12b")

@property
def endpoint(self) -> str:
Expand Down
2 changes: 1 addition & 1 deletion src/shelloracle/providers/openai.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class OpenAI(Provider):
name = "OpenAI"

api_key = Setting(default="")
model = Setting(default="gpt-4.1-mini")
model = Setting(default="gpt-5.6-luna")

def __init__(self, *args, **kwargs) -> None:
super().__init__(*args, **kwargs)
Expand Down
2 changes: 1 addition & 1 deletion src/shelloracle/providers/xai.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class XAI(Provider):
name = "XAI"

api_key = Setting(default="")
model = Setting(default="grok-3-mini-fast")
model = Setting(default="grok-4.20-0309-non-reasoning")

def __init__(self, *args, **kwargs) -> None:
super().__init__(*args, **kwargs)
Expand Down
4 changes: 2 additions & 2 deletions tests/providers/test_deepseek.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def deepseek_config(self):
"provider": {
"Deepseek": {
"api_key": "sk-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
"model": "deepseek-chat",
"model": "deepseek-flash",
}
},
}
Expand All @@ -32,7 +32,7 @@ def test_api_key(self, deepseek_instance):
)

def test_model(self, deepseek_instance):
assert deepseek_instance.model == "deepseek-chat"
assert deepseek_instance.model == "deepseek-flash"

@pytest.mark.asyncio
async def test_generate(self, mock_asyncopenai, deepseek_instance):
Expand Down
4 changes: 2 additions & 2 deletions tests/providers/test_localai.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class TestOpenAI:
def localai_config(self):
return {
"shelloracle": {"provider": "LocalAI"},
"provider": {"LocalAI": {"host": "localhost", "port": 8080, "model": "mistral"}},
"provider": {"LocalAI": {"host": "localhost", "port": 8080, "model": "qwen3.8-9b-q4"}},
}

@pytest.fixture
Expand All @@ -19,7 +19,7 @@ def test_name(self):
assert LocalAI.name == "LocalAI"

def test_model(self, localai_instance):
assert localai_instance.model == "mistral"
assert localai_instance.model == "qwen3.8-9b-q4"

@pytest.mark.asyncio
async def test_generate(self, mock_asyncopenai, localai_instance):
Expand Down
4 changes: 2 additions & 2 deletions tests/providers/test_ollama.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class TestOllama:
def ollama_config(self):
config = {
"shelloracle": {"provider": "Ollama"},
"provider": {"Ollama": {"host": "localhost", "port": 11434, "model": "qwen2.5-coder"}},
"provider": {"Ollama": {"host": "localhost", "port": 11434, "model": "gemma4:12b"}},
}
return Configuration(config)

Expand All @@ -28,7 +28,7 @@ def test_port(self, ollama_instance):
assert ollama_instance.port == 11434

def test_model(self, ollama_instance):
assert ollama_instance.model == "qwen2.5-coder"
assert ollama_instance.model == "gemma4:12b"

def test_endpoint(self, ollama_instance):
assert ollama_instance.endpoint == "http://localhost:11434/api/generate"
Expand Down
4 changes: 2 additions & 2 deletions tests/providers/test_openai.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def openai_config(self):
config = {
"shelloracle": {"provider": "OpenAI"},
"provider": {
"OpenAI": {"api_key": "sk-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", "model": "gpt-4.1-mini"}
"OpenAI": {"api_key": "sk-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", "model": "gpt-5.6-luna"}
},
}
return Configuration(config)
Expand All @@ -26,7 +26,7 @@ def test_api_key(self, openai_instance):
assert openai_instance.api_key == "sk-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"

def test_model(self, openai_instance):
assert openai_instance.model == "gpt-4.1-mini"
assert openai_instance.model == "gpt-5.6-luna"

@pytest.mark.asyncio
async def test_generate(self, mock_asyncopenai, openai_instance):
Expand Down
4 changes: 2 additions & 2 deletions tests/providers/test_xai.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def xai_config(self):
"provider": {
"XAI": {
"api_key": "xai-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
"model": "grok-3-mini-fast",
"model": "grok-4.20-0309-non-reasoning",
}
},
}
Expand All @@ -32,7 +32,7 @@ def test_api_key(self, xai_instance):
)

def test_model(self, xai_instance):
assert xai_instance.model == "grok-3-mini-fast"
assert xai_instance.model == "grok-4.20-0309-non-reasoning"

@pytest.mark.asyncio
async def test_generate(self, mock_asyncopenai, xai_instance):
Expand Down
6 changes: 3 additions & 3 deletions tests/test_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def default_config(self):
return Configuration(
{
"shelloracle": {"provider": "Ollama", "spinner_style": "earth"},
"provider": {"Ollama": {"host": "localhost", "port": 11434, "model": "qwen2.5-coder"}},
"provider": {"Ollama": {"host": "localhost", "port": 11434, "model": "gemma4:12b"}},
}
)

Expand Down Expand Up @@ -42,7 +42,7 @@ def test_no_spinner_style(self, caplog):
config = Configuration(
{
"shelloracle": {"provider": "Ollama"},
"provider": {"Ollama": {"host": "localhost", "port": 11434, "model": "qwen2.5-coder"}},
"provider": {"Ollama": {"host": "localhost", "port": 11434, "model": "gemma4:12b"}},
}
)
assert config.spinner_style is None
Expand All @@ -52,7 +52,7 @@ def test_invalid_spinner_style(self, caplog):
config = Configuration(
{
"shelloracle": {"provider": "Ollama", "spinner_style": "invalid"},
"provider": {"Ollama": {"host": "localhost", "port": 11434, "model": "qwen2.5-coder"}},
"provider": {"Ollama": {"host": "localhost", "port": 11434, "model": "gemma4:12b"}},
}
)
assert config.spinner_style is None
Expand Down