Some refactoring and updates

Author: daxian-dbw

shell/agents/AIShell.Ollama.Agent/Command.cs

@@ -89,11 +89,11 @@ private async Task UsePresetAction(string name)
         try
         {
             ModelConfig chosenPreset = (string.IsNullOrEmpty(name)
-                ? host.PromptForSelectionAsync(
+                ? await host.PromptForSelectionAsync(
                     title: "[orange1]Please select a [Blue]Preset[/] to use[/]:",
                     choices: setting.Presets,
                     converter: PresetName,
-                    CancellationToken.None).GetAwaiter().GetResult()
+                    CancellationToken.None)
                 : setting.Presets.FirstOrDefault(c => c.Name == name)) ?? throw new InvalidOperationException($"The preset '{name}' doesn't exist.");
             await setting.UsePreset(host, chosenPreset);
             host.MarkupLine($"Using the preset [green]{chosenPreset.Name}[/]:");
@@ -155,7 +155,7 @@ private void ShowSystemPromptAction()
         }
         catch (InvalidOperationException ex)
         {
-            host.WriteErrorLine($"{ex.Message}");
+            host.WriteErrorLine(ex.Message);
         }
     }
 
@@ -181,7 +181,7 @@ private void SetSystemPromptAction(string prompt)
         }
         catch (InvalidOperationException ex)
         {
-            host.WriteErrorLine($"{ex.Message}.");
+            host.WriteErrorLine(ex.Message);
         }
     }
 }
@@ -215,7 +215,7 @@ public ModelCommand(OllamaAgent agent)
         AddCommand(use);
     }
 
-    private void ListModelAction(string name)
+    private async Task ListModelAction(string name)
     {
         IHost host = Shell.Host;
 
@@ -233,19 +233,19 @@ private void ListModelAction(string name)
         {
             if (string.IsNullOrEmpty(name))
             {
-                settings.ListAllModels(host).GetAwaiter().GetResult();
+                await settings.ListAllModels(host);
                 return;
             }
 
-            settings.ShowOneModel(host, name).GetAwaiter().GetResult();
+            await settings.ShowOneModel(host, name);
         }
         catch (InvalidOperationException ex)
         {
             host.WriteErrorLine(ex.Message);
         }
     }
 
-    private void UseModelAction(string name)
+    private async Task UseModelAction(string name)
     {
         // Reload the setting file if needed.
         _agnet.ReloadSettings();
@@ -261,26 +261,28 @@ private void UseModelAction(string name)
 
         try
         {
-            if (!settings.PerformSelfcheck(host))
+            bool success = await settings.PerformSelfcheck(host, checkEndpointOnly: true);
+            if (!success)
             {
                 return;
             }
 
-            if (settings.GetAllModels().GetAwaiter().GetResult().Count is 0)
+            var allModels = await settings.GetAllModels();
+            if (allModels.Count is 0)
             {
-                host.WriteErrorLine("No models found.");
+                host.WriteErrorLine($"No models found from '{settings.Endpoint}'.");
                 return;
             }
 
             if (string.IsNullOrEmpty(name))
             {
-                name = host.PromptForSelectionAsync(
+                name = await host.PromptForSelectionAsync(
                     title: "[orange1]Please select a [Blue]Model[/] to use[/]:",
-                    choices: settings.GetAllModels(host).GetAwaiter().GetResult(),
-                    CancellationToken.None).GetAwaiter().GetResult();
+                    choices: allModels,
+                    CancellationToken.None);
             }
 
-            settings.UseModel(host, name).GetAwaiter().GetResult();
+            await settings.UseModel(host: null, name);
             host.MarkupLine($"Using the model [green]{name}[/]");
         }
         catch (InvalidOperationException ex)

shell/agents/AIShell.Ollama.Agent/OllamaAgent.cs

@@ -170,21 +170,22 @@ public async Task<bool> ChatAsync(string input, IShell shell)
         // Reload the setting file if needed.
         ReloadSettings();
 
-        if (!_settings.PerformSelfcheck(host))
+        bool success = await _settings.PerformSelfcheck(host);
+        if (!success)
         {
             return false;
         }
 
-        var activeModel = await _settings.GetActiveModel(host).ConfigureAwait(false);
+        ModelConfig config = _settings.RunningConfig;
 
         // Prepare request
         _request.Prompt = input;
-        _request.Model = activeModel;
+        _request.Model = config.ModelName;
         _request.Stream = _settings.Stream;
 
-        if (!string.IsNullOrWhiteSpace(_settings.RunningConfig.SystemPrompt))
+        if (!string.IsNullOrWhiteSpace(config.SystemPrompt))
         {
-            _request.System = _settings.RunningConfig.SystemPrompt;
+            _request.System = config.SystemPrompt;
         }
 
         try
@@ -249,7 +250,7 @@ public async Task<bool> ChatAsync(string input, IShell shell)
         catch (HttpRequestException e)
         {
             host.WriteErrorLine($"{e.Message}");
-            host.WriteErrorLine($"Ollama active model: \"{activeModel}\"");
+            host.WriteErrorLine($"Ollama active model: \"{config.ModelName}\"");
             host.WriteErrorLine($"Ollama endpoint:     \"{_settings.Endpoint}\"");
             host.WriteErrorLine($"Ollama settings:     \"{SettingFile}\"");
         }

shell/agents/AIShell.Ollama.Agent/Settings.cs

@@ -52,9 +52,14 @@ private async Task<bool> EnsureModelsInitialized(IHost host, CancellationToken c
             return true;
         }
 
-        if (!PerformSelfcheck(host))
+        // Skip the self check when host is null.
+        if (host is not null)
         {
-            return false;
+            bool success = await PerformSelfcheck(host, checkEndpointOnly: true);
+            if (!success)
+            {
+                return false;
+            }
         }
 
         using OllamaApiClient client = new(Endpoint);
@@ -77,6 +82,7 @@ internal async Task<ICollection<string>> GetAllModels(IHost host = null, Cancell
     internal void EnsureModelNameIsValid(string name)
     {
         ArgumentException.ThrowIfNullOrEmpty(name);
+
         if (!_availableModels.Contains(name.AddLatestTagIfNecessery()))
         {
             throw new InvalidOperationException($"A model with the name '{name}' doesn't exist. The available models are: [{string.Join(", ", _availableModels)}].");
@@ -94,7 +100,7 @@ internal void SetSystemPrompt(IHost host, string prompt)
     }
 
     private static List<IRenderElement<string>> GetRenderModelElements(Func<string, bool> isActive) => [
-        new CustomElement<string>(label: "Model Name", m => m),
+        new CustomElement<string>(label: "Name", m => m),
         new CustomElement<string>(label: "Active", m => isActive(m) ? "true" : string.Empty)
     ];
 
@@ -165,64 +171,50 @@ internal void ShowOnePreset(IHost host, string name)
             ]);
     }
 
-    internal async Task<string> GetActiveModel(IHost host, CancellationToken cancellationToken = default)
+    internal async Task<bool> PerformSelfcheck(IHost host, bool checkEndpointOnly = false)
     {
-        if (_runningConfigChecked is false)
-        {
-            if (await EnsureModelsInitialized(host, cancellationToken).ConfigureAwait(false))
-            {
-                if (string.IsNullOrEmpty(RunningConfig.ModelName))
-                {
-                    // There is no model set, so use the first one available.
-                    if (_availableModels.Count == 0)
-                    {
-                        throw new InvalidOperationException($"No models are available to use from '{Endpoint}'.");
-                    }
-
-                    RunningConfig = RunningConfig with { ModelName = _availableModels.First() };
-                    host.MarkupLine($"No Ollama model is configured. Using the first available model [green]'{RunningConfig.ModelName}'[/].");
-                }
-                else
-                {
-                    EnsureModelNameIsValid(RunningConfig.ModelName);
-                }
-
-                _runningConfigChecked = true;
-            }
-            else    
-            {
-                throw new InvalidOperationException($"Error initializing models from '{Endpoint}'.");
-            }
-        }
-
-        return RunningConfig.ModelName;
-    }
+        _isRunningLocalHost ??= IsLocalHost().IsMatch(new Uri(Endpoint).Host);
 
-    internal bool PerformSelfcheck(IHost host)
-    {
-        if (_isRunningLocalHost is null)
+        if (_isRunningLocalHost is true && Process.GetProcessesByName("ollama").Length is 0)
         {
-            var endpointUri = new Uri(Endpoint);
-            _isRunningLocalHost = IsLocalHost().IsMatch(endpointUri.Host);
+            host.WriteErrorLine("Please be sure the Ollama is installed and server is running. Check all the prerequisites in the README of this agent are met.");
+            return false;
         }
 
-        if (_isRunningLocalHost is true && Process.GetProcessesByName("ollama").Length is 0)
+        if (!checkEndpointOnly && !_runningConfigChecked)
         {
-            var message = "Please be sure the Ollama is installed and server is running. Check all the prerequisites in the README of this agent are met.";
-            if (host is null)
+            await EnsureModelsInitialized(host: null).ConfigureAwait(false);
+            if (string.IsNullOrEmpty(RunningConfig.ModelName))
             {
-                throw new InvalidOperationException(message);
+                // There is no model set, so use the first one available.
+                if (_availableModels.Count is 0)
+                {
+                    host.WriteErrorLine($"No models are available to use from '{Endpoint}'.");
+                    return false;
+                }
+
+                RunningConfig = RunningConfig with { ModelName = _availableModels.First() };
+                host.MarkupLine($"No Ollama model is configured. Using the first available model [green]'{RunningConfig.ModelName}'[/].");
             }
             else
             {
-                host.WriteErrorLine(message);
-                return false;
+                try
+                {
+                    EnsureModelNameIsValid(RunningConfig.ModelName);
+                }
+                catch (InvalidOperationException e)
+                {
+                    host.WriteErrorLine(e.Message);
+                    return false;
+                }
             }
+
+            _runningConfigChecked = true;
         }
 
         return true;
     }
-    
+
     /// <summary>
     /// Defines a generated regular expression to match localhost addresses
     /// "localhost", "127.0.0.1" and "[::1]" with case-insensitivity.
@@ -286,5 +278,6 @@ internal partial class SourceGenerationContext : JsonSerializerContext { }
 
 static class TagExtensions
 {
-    public static string AddLatestTagIfNecessery(this string model) => model.IndexOf(":") == -1 ? string.Concat(model, ":latest") : model;
+    public static string AddLatestTagIfNecessery(this string model) =>
+        model.Contains(':') ? model : string.Concat(model, ":latest");
 }