aj/MoneyMap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor: Consolidate AI endpoint config to AI:ModelsEndpoint

Browse Source 
- Simplify model dropdown to single flat list with local models first
- Show loaded/unloaded status with bullet indicators
- Remove separate Ollama:BaseUrl and LlamaCpp:BaseUrl configs
- All AI vision clients now use AI:ModelsEndpoint (default: athena.lan:11434)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
AJ Isaacs
2026-01-15 23:41:05 -05:00
parent 38b7d8a9ca
commit 29d26b4771
2 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
MoneyMap/Pages/ViewReceipt.cshtml
View File

@@ -165,27 +165,23 @@
<div class="mb-2"> <div class="mb-2">
<label for="model" class="form-label small">AI Model</label> <label for="model" class="form-label small">AI Model</label>
<select name="model" id="model" class="form-select form-select-sm"> <select name="model" id="model" class="form-select form-select-sm">
@if (Model.AvailableModels.Any())
{
<optgroup label="Local (llama.cpp)">
@foreach (var m in Model.AvailableModels) @foreach (var m in Model.AvailableModels)
{ {
var modelValue = $"llamacpp:{m.Id}"; var modelValue = $"llamacpp:{m.Id}";
<option value="@modelValue" selected="@(Model.SelectedModel == modelValue)"> var isSelected = Model.SelectedModel == modelValue;
@(m.IsLoaded ? "[Loaded] " : "")@m.Id <option value="@modelValue" selected="@isSelected">
@(m.IsLoaded ? "● " : "○ ")@m.Id
</option> </option>
} }
</optgroup> <option value="gpt-4o-mini" selected="@(Model.SelectedModel == "gpt-4o-mini")">GPT-4o Mini</option>
} <option value="gpt-4o" selected="@(Model.SelectedModel == "gpt-4o")">GPT-4o</option>
<optgroup label="OpenAI"> <option value="claude-3-5-haiku-20241022" selected="@(Model.SelectedModel == "claude-3-5-haiku-20241022")">Claude 3.5 Haiku</option>
<option value="gpt-4o-mini" selected="@(Model.SelectedModel == "gpt-4o-mini")">GPT-4o Mini (Fast & Cheap)</option> <option value="claude-3-5-sonnet-20241022" selected="@(Model.SelectedModel == "claude-3-5-sonnet-20241022")">Claude 3.5 Sonnet</option>
<option value="gpt-4o" selected="@(Model.SelectedModel == "gpt-4o")">GPT-4o (Smarter)</option>
</optgroup>
<optgroup label="Anthropic">
<option value="claude-3-5-haiku-20241022" selected="@(Model.SelectedModel == "claude-3-5-haiku-20241022")">Claude 3.5 Haiku (Fast)</option>
<option value="claude-3-5-sonnet-20241022" selected="@(Model.SelectedModel == "claude-3-5-sonnet-20241022")">Claude 3.5 Sonnet (Best)</option>
</optgroup>
</select> </select>
<div class="form-text small">
<span style="color: #28a745;">●</span> Loaded
<span class="ms-2" style="color: #6c757d;">○</span> Not loaded
</div>
</div> </div>
<button type="submit" class="btn btn-primary btn-sm w-100"> <button type="submit" class="btn btn-primary btn-sm w-100">
Parse Receipt Parse Receipt

8
MoneyMap/Services/AIVisionClient.cs
View File

@@ -240,7 +240,7 @@ namespace MoneyMap.Services
/// </summary> /// </summary>
public async Task<List<LlamaCppModel>> GetAvailableModelsAsync() public async Task<List<LlamaCppModel>> GetAvailableModelsAsync()
{ {
var baseUrl = _configuration["LlamaCpp:BaseUrl"] ?? "http://athena.lan:11434"; var baseUrl = _configuration["AI:ModelsEndpoint"] ?? "http://athena.lan:11434";
try try
{ {
@@ -278,7 +278,7 @@ namespace MoneyMap.Services
/// </summary> /// </summary>
public async Task<VisionApiResult> SendTextPromptAsync(string prompt, string? model = null) public async Task<VisionApiResult> SendTextPromptAsync(string prompt, string? model = null)
{ {
var baseUrl = _configuration["LlamaCpp:BaseUrl"] ?? "http://athena.lan:11434"; var baseUrl = _configuration["AI:ModelsEndpoint"] ?? "http://athena.lan:11434";
var llamaModel = model ?? "GLM-4.6V-UD-Q4_K_XL-00001-of-00002"; var llamaModel = model ?? "GLM-4.6V-UD-Q4_K_XL-00001-of-00002";
if (llamaModel.StartsWith("llamacpp:")) if (llamaModel.StartsWith("llamacpp:"))
llamaModel = llamaModel[9..]; llamaModel = llamaModel[9..];
@@ -340,7 +340,7 @@ namespace MoneyMap.Services
public async Task<VisionApiResult> AnalyzeImageAsync(string base64Image, string mediaType, string prompt, string model) public async Task<VisionApiResult> AnalyzeImageAsync(string base64Image, string mediaType, string prompt, string model)
{ {
var baseUrl = _configuration["LlamaCpp:BaseUrl"] ?? "http://athena.lan:8080"; var baseUrl = _configuration["AI:ModelsEndpoint"] ?? "http://athena.lan:11434";
// Strip "llamacpp:" prefix if present // Strip "llamacpp:" prefix if present
var llamaModel = model.StartsWith("llamacpp:") ? model[9..] : model; var llamaModel = model.StartsWith("llamacpp:") ? model[9..] : model;
@@ -441,7 +441,7 @@ namespace MoneyMap.Services
public async Task<VisionApiResult> AnalyzeImageAsync(string base64Image, string mediaType, string prompt, string model) public async Task<VisionApiResult> AnalyzeImageAsync(string base64Image, string mediaType, string prompt, string model)
{ {
var baseUrl = _configuration["Ollama:BaseUrl"] ?? "http://athena.lan:11434"; var baseUrl = _configuration["AI:ModelsEndpoint"] ?? "http://athena.lan:11434";
// Strip "ollama:" prefix if present // Strip "ollama:" prefix if present
var ollamaModel = model.StartsWith("ollama:") ? model[7..] : model; var ollamaModel = model.StartsWith("ollama:") ? model[7..] : model;