Skip to content

Generalized options for multi command support #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pilardi merged 1 commit into from
Jan 4, 2026
Merged

Generalized options for multi command support #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,11 @@ to change the setting, where *setting* is any of the available [settings](#setti
By default the system uses [`qwen3-coder:480b-cloud`](https://ollama.com/library/qwen3-coder:480b-cloud), however you can try other models such as [`nemotron-3-nano:30b-cloud`](https://ollama.com/library/nemotron-3-nano). ie:

```bash
ollama pull nemotron-3-nano:30b-cloud && git-llm-utils commit --model ollama/nemotron-3-nano:30b-cloud
ollama pull nemotron-3-nano:30b-cloud && git-llm-utils --model ollama/nemotron-3-nano:30b-cloud commit
```
Local models are also supported however the quality of the message will drasticall vary based on the size of it (even worse for non-thinking models), ie:
```bash
ollama pull deepseek-coder:6.7b && git-llm-utils commit --model ollama/deepseek-coder:6.7b --reasoning none
ollama pull deepseek-coder:6.7b && git-llm-utils --model ollama/deepseek-coder:6.7b --reasoning none commit
```

## References:
Expand Down
147 changes: 29 additions & 118 deletions src/git_llm_utils/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,11 @@ def set_config(
else:
unset_config(s.key, scope=scope, repository=Runtime.repository)

@staticmethod
def set_value(setting: str, given: Any = None):
if setting in Runtime.settings:
return Runtime.settings[setting][0].set_value(given)

@staticmethod
def get_value(setting: str, given: Any = None) -> Optional[Any]:
if setting in Runtime.settings:
Expand Down Expand Up @@ -252,41 +257,22 @@ def __new__(cls, loader: SettingLoader, option: typer.models.OptionInfo):


@app.command(help="Reads the respository description")
def description(
description_file: str = Setting.DESCRIPTION_FILE.option, # type: ignore
) -> Optional[str]:
print(read_file(file_path=Path(Runtime.repository or ".", description_file)))
def description() -> Optional[str]:
description_file = Runtime.get_value(Setting.DESCRIPTION_FILE.value) # type: ignore
print(read_file(file_path=Path(Runtime.repository or ".", description_file))) # type: ignore


@app.command(
help=f"Passes the status output as input to the given command arguments, as in `git-llm-utils command -- {' '.join(COMMIT_COMMAND)}`"
)
def command(
args: list[str],
with_emojis: bool | None = Setting.EMOJIS.option, # type: ignore
with_comments: bool | None = Setting.COMMENTS.option, # type: ignore
model: str | None = Setting.MODEL.option, # type: ignore
reasoning: str | None = Setting.MODEL_REASONING.option, # type: ignore
max_input_tokens: int | None = Setting.MAX_INPUT_TOKENS.option, # type: ignore
max_output_tokens: int | None = Setting.MAX_OUTPUT_TOKENS.option, # type: ignore
api_key: str | None | None = Setting.API_KEY.option, # type: ignore
api_url: str | None | None = Setting.API_URL.option, # type: ignore
description_file: str | None = Setting.DESCRIPTION_FILE.option, # type: ignore
tools: bool | None = Setting.TOOLS.option, # type: ignore
editor: str | None = Setting.EDITOR.option, # type: ignore
):
output = StringIO()
generated = _message(
with_emojis=with_emojis,
with_comments=with_comments,
model=model,
reasoning=reasoning,
max_input_tokens=max_input_tokens,
max_output_tokens=max_output_tokens,
api_key=api_key,
api_url=api_url,
description_file=description_file,
tools=tools,
output=output,
)
value = output.getvalue()
Expand All @@ -310,86 +296,30 @@ def command(
help=f"commit the current change set using the status message using `{' '.join(COMMIT_COMMAND)}`"
)
def commit(
with_emojis: bool | None = Setting.EMOJIS.option, # type: ignore
with_comments: bool | None = Setting.COMMENTS.option, # type: ignore
model: str | None = Setting.MODEL.option, # type: ignore
reasoning: str | None = Setting.MODEL_REASONING.option, # type: ignore
max_input_tokens: int | None = Setting.MAX_INPUT_TOKENS.option, # type: ignore
max_output_tokens: int | None = Setting.MAX_OUTPUT_TOKENS.option, # type: ignore
api_key: str | None | None = Setting.API_KEY.option, # type: ignore
api_url: str | None | None = Setting.API_URL.option, # type: ignore
description_file: str | None = Setting.DESCRIPTION_FILE.option, # type: ignore
tools: bool | None = Setting.TOOLS.option, # type: ignore
editor: str | None = Setting.EDITOR.option, # type: ignore
):
command(
COMMIT_COMMAND,
with_emojis=with_emojis,
with_comments=with_comments,
model=model,
reasoning=reasoning,
max_input_tokens=max_input_tokens,
max_output_tokens=max_output_tokens,
api_key=api_key,
api_url=api_url,
description_file=description_file,
tools=tools,
editor=editor,
)


@app.command(help="Generates a status message based on the git staged changes")
def status(
with_emojis: bool | None = Setting.EMOJIS.option, # type: ignore
model: str | None = Setting.MODEL.option, # type: ignore
reasoning: str | None = Setting.MODEL_REASONING.option, # type: ignore
max_input_tokens: int | None = Setting.MAX_INPUT_TOKENS.option, # type: ignore
max_output_tokens: int | None = Setting.MAX_OUTPUT_TOKENS.option, # type: ignore
api_key: str | None | None = Setting.API_KEY.option, # type: ignore
api_url: str | None | None = Setting.API_URL.option, # type: ignore
description_file: str | None = Setting.DESCRIPTION_FILE.option, # type: ignore
tools: bool | None = Setting.TOOLS.option, # type: ignore
):
def status():
res = _message(
with_emojis=with_emojis,
with_comments=False,
model=model,
reasoning=reasoning,
max_input_tokens=max_input_tokens,
max_output_tokens=max_output_tokens,
api_key=api_key,
api_url=api_url,
description_file=description_file,
tools=tools,
output=sys.stdout,
)
if res:
print()


@app.command(help="Verifies the configuration allows accessing the llm")
def verify(
with_emojis: bool | None = Setting.EMOJIS.option, # type: ignore
model: str | None = Setting.MODEL.option, # type: ignore
reasoning: str | None = Setting.MODEL_REASONING.option, # type: ignore
max_input_tokens: int | None = Setting.MAX_INPUT_TOKENS.option, # type: ignore
max_output_tokens: int | None = Setting.MAX_OUTPUT_TOKENS.option, # type: ignore
api_key: str | None | None = Setting.API_KEY.option, # type: ignore
api_url: str | None | None = Setting.API_URL.option, # type: ignore
description_file: str | None = Setting.DESCRIPTION_FILE.option, # type: ignore
tools: bool | None = Setting.TOOLS.option, # type: ignore
):
def verify():
res = _message(
with_emojis=with_emojis,
with_comments=False,
model=model,
reasoning=reasoning,
max_input_tokens=max_input_tokens,
max_output_tokens=max_output_tokens,
api_key=api_key,
api_url=api_url,
description_file=description_file,
tools=tools,
output=sys.stdout,
get_changes=lambda _: """diff --git a/Readme.md b/Readme.md
new file mode 100644
Expand All @@ -410,16 +340,7 @@ def verify(
help=f"Generates a commit message based on the git staged changes for the {MESSAGE_HOOK} hook"
)
def generate(
with_emojis: bool | None = Setting.EMOJIS.option, # type: ignore
with_comments: bool | None = Setting.COMMENTS.option, # type: ignore
model: str | None = Setting.MODEL.option, # type: ignore
reasoning: str | None = Setting.MODEL_REASONING.option, # type: ignore
max_input_tokens: int | None = Setting.MAX_INPUT_TOKENS.option, # type: ignore
max_output_tokens: int | None = Setting.MAX_OUTPUT_TOKENS.option, # type: ignore
api_key: str | None = Setting.API_KEY.option, # type: ignore
api_url: str | None = Setting.API_URL.option, # type: ignore
description_file: str | None = Setting.DESCRIPTION_FILE.option, # type: ignore
tools: bool | None = Setting.TOOLS.option, # type: ignore
manual: bool | None = Setting.MANUAL.option, # type: ignore
manual_override: bool = typer.Option(
None,
Expand All @@ -436,31 +357,13 @@ def generate(
return False

return _message(
with_emojis=with_emojis,
with_comments=with_comments,
model=model,
reasoning=reasoning,
max_input_tokens=max_input_tokens,
max_output_tokens=max_output_tokens,
api_key=api_key,
api_url=api_url,
description_file=description_file,
tools=tools,
output=output,
)


def _message(
with_emojis: bool | None = Setting.EMOJIS.option, # type: ignore
with_comments: bool | None = Setting.COMMENTS.option, # type: ignore
model: str | None = Setting.MODEL.option, # type: ignore
reasoning: str | None = Setting.MODEL_REASONING.option, # type: ignore
max_input_tokens: int | None = Setting.MAX_INPUT_TOKENS.option, # type: ignore
max_output_tokens: int | None = Setting.MAX_OUTPUT_TOKENS.option, # type: ignore
api_key: str | None = Setting.API_KEY.option, # type: ignore
api_url: str | None = Setting.API_URL.option, # type: ignore
description_file: str | None = Setting.DESCRIPTION_FILE.option, # type: ignore
tools: bool | None = Setting.TOOLS.option, # type: ignore
with_comments: bool | None,
output: TextIO = typer.Option(
hidden=True, parser=lambda _: sys.stdout, default=sys.stdout
),
Expand All @@ -471,20 +374,19 @@ def _message(
print(NO_CHANGES_MESSAGE, file=output)
return False

description_file = Runtime.get_value(Setting.DESCRIPTION_FILE.value)
file_path = (
description_file and Path(Runtime.repository or ".", description_file) or None
)
client = LLMClient(
use_emojis=Runtime.get_value(Setting.EMOJIS.value, with_emojis), # type: ignore
model_name=Runtime.get_value(Setting.MODEL.value, model), # type: ignore
model_reasoning=Runtime.get_value(Setting.MODEL_REASONING.value, reasoning), # type: ignore
max_tokens=Runtime.get_value(Setting.MAX_INPUT_TOKENS.value, max_input_tokens), # type: ignore
max_output_tokens=Runtime.get_value(
Setting.MAX_OUTPUT_TOKENS.value, max_output_tokens
), # type: ignore
api_key=Runtime.get_value(Setting.API_KEY.value, api_key),
api_url=Runtime.get_value(Setting.API_URL.value, api_url),
use_tools=Runtime.get_value(Setting.TOOLS.value, tools)
use_emojis=Runtime.get_value(Setting.EMOJIS.value), # type: ignore
model_name=Runtime.get_value(Setting.MODEL.value), # type: ignore
model_reasoning=Runtime.get_value(Setting.MODEL_REASONING.value),
max_tokens=Runtime.get_value(Setting.MAX_INPUT_TOKENS.value), # type: ignore
max_output_tokens=Runtime.get_value(Setting.MAX_OUTPUT_TOKENS.value), # type: ignore
api_key=Runtime.get_value(Setting.API_KEY.value),
api_url=Runtime.get_value(Setting.API_URL.value),
use_tools=Runtime.get_value(Setting.TOOLS.value)
and file_path is not None
and file_path.exists(), # type: ignore
respository_description=lambda: read_file(file_path), # type: ignore
Expand Down Expand Up @@ -716,6 +618,15 @@ def _(
allow_from_autoenv=True,
envvar="GIT_LLM_REPO",
),
description_file: str | None = Setting.DESCRIPTION_FILE.option, # type: ignore
model: str | None = Setting.MODEL.option, # type: ignore
api_key: str | None = Setting.API_KEY.option, # type: ignore
api_url: str | None = Setting.API_URL.option, # type: ignore
tools: bool | None = Setting.TOOLS.option, # type: ignore
reasoning: str | None = Setting.MODEL_REASONING.option, # type: ignore
max_input_tokens: int | None = Setting.MAX_INPUT_TOKENS.option, # type: ignore
max_output_tokens: int | None = Setting.MAX_OUTPUT_TOKENS.option, # type: ignore
with_emojis: bool | None = Setting.EMOJIS.option, # type: ignore
confirm: bool = typer.Option(
help="Requests confirmation before changing a setting",
callback=Runtime._set_confirm,
Expand Down
42 changes: 21 additions & 21 deletions tests/test_generate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

from types import SimpleNamespace
from typing import Any
from git_llm_utils.app import generate, NO_CHANGES_MESSAGE
from git_llm_utils.app import generate, Runtime, Setting, NO_CHANGES_MESSAGE
from git_llm_utils.llm import LLMClient


Expand All @@ -32,12 +32,12 @@ def _mock(monkeypatch, changes: str | Any = None, message: str | Any = None):
def test_generate_manual_does_nothing(monkeypatch):
_mock(monkeypatch)
res = StringIO()
Runtime.set_value(Setting.MAX_INPUT_TOKENS.value, 1000)
Runtime.set_value(Setting.MAX_OUTPUT_TOKENS.value, 1000)
generate(
manual=True,
manual_override=False,
output=res,
max_input_tokens=1000,
max_output_tokens=1000,
)
res.seek(0)
assert res.read() == ""
Expand All @@ -46,32 +46,32 @@ def test_generate_manual_does_nothing(monkeypatch):
def test_generate_with_no_change(monkeypatch):
_mock(monkeypatch)
res = StringIO()
Runtime.set_value(Setting.MAX_INPUT_TOKENS.value, 1000)
Runtime.set_value(Setting.MAX_OUTPUT_TOKENS.value, 1000)
generate(
manual=False,
manual_override=True,
output=res,
max_input_tokens=1000,
max_output_tokens=1000,
)
res.seek(0)
assert res.read() == f"{NO_CHANGES_MESSAGE}\n"


def test_generate_with_comments(monkeypatch):
_mock(monkeypatch, "test", "test")
Runtime.set_value(Setting.MODEL.value, "test")
Runtime.set_value(Setting.API_KEY.value, "test")
Runtime.set_value(Setting.API_URL.value, "test")
Runtime.set_value(Setting.MODEL_REASONING.value, "high")
Runtime.set_value(Setting.MAX_INPUT_TOKENS.value, 1000)
Runtime.set_value(Setting.MAX_OUTPUT_TOKENS.value, 1000)
Runtime.set_value(Setting.EMOJIS.value, False)
Runtime.set_value(Setting.DESCRIPTION_FILE.value, None)
res = StringIO()
generate(
manual=False,
manual_override=True,
with_comments=True,
description_file=None,
with_emojis=False,
model="test",
reasoning="high",
max_input_tokens=1000,
max_output_tokens=1000,
api_key="test",
api_url="test",
output=res,
)
res.seek(0)
Expand All @@ -80,19 +80,19 @@ def test_generate_with_comments(monkeypatch):

def test_generate_without_comments(monkeypatch):
_mock(monkeypatch, "test", "test")
Runtime.set_value(Setting.MODEL.value, "test")
Runtime.set_value(Setting.API_KEY.value, "test")
Runtime.set_value(Setting.API_URL.value, "test")
Runtime.set_value(Setting.MODEL_REASONING.value, "high")
Runtime.set_value(Setting.MAX_INPUT_TOKENS.value, 1000)
Runtime.set_value(Setting.MAX_OUTPUT_TOKENS.value, 1000)
Runtime.set_value(Setting.EMOJIS.value, False)
Runtime.set_value(Setting.DESCRIPTION_FILE.value, None)
res = StringIO()
generate(
manual=False,
manual_override=True,
with_comments=False,
description_file=None,
with_emojis=False,
model="test",
reasoning="high",
max_input_tokens=1000,
max_output_tokens=1000,
api_key="test",
api_url="test",
output=res,
)
res.seek(0)
Expand Down
Loading