Merge branch 'ollama-multy-model-support' of github.com:cnupy/AIShell into ollama-multy-model-support

Author: cnupy

shell/AIShell.Integration/AIShell.psd1

@@ -1,7 +1,7 @@
 @{
     RootModule = 'AIShell.psm1'
     NestedModules = @("AIShell.Integration.dll")
-    ModuleVersion = '1.0.2'
+    ModuleVersion = '1.0.3'
     GUID = 'ECB8BEE0-59B9-4DAE-9D7B-A990B480279A'
     Author = 'Microsoft Corporation'
     CompanyName = 'Microsoft Corporation'
@@ -13,5 +13,5 @@
     VariablesToExport = '*'
     AliasesToExport = @('aish', 'askai', 'fixit')
     HelpInfoURI = 'https://aka.ms/aishell-help'
-    PrivateData = @{ PSData = @{ Prerelease = 'preview2'; ProjectUri = 'https://github.com/PowerShell/AIShell' } }
+    PrivateData = @{ PSData = @{ Prerelease = 'preview3'; ProjectUri = 'https://github.com/PowerShell/AIShell' } }
 }

shell/Markdown.VT/ColorCode.VT/Parser/Bash.cs

@@ -24,6 +24,20 @@ public class Bash : ILanguage
                     {1, BashCommentScope}
                 }),
 
+            new LanguageRule(
+                @"'[^\n]*?'",
+                new Dictionary<int, string>
+                {
+                    {0, ScopeName.String}
+                }),
+
+            new LanguageRule(
+                @"""[^\n]*?(?<!\\)""",
+                new Dictionary<int, string>
+                {
+                    {0, ScopeName.String}
+                }),
+
             // match the first word of a line in a multi-line string as the command name.
             new LanguageRule(
                 @"(?m)^\s*(\w+)",

shell/Markdown.VT/ColorCode.VT/Parser/PowerShell.cs

@@ -48,7 +48,7 @@ public IList<LanguageRule> Rules
                             }),
 
                     new LanguageRule(
-                        @"'[^\n]*?(?<!\\)'",
+                        @"'[^\n]*?'",
                         new Dictionary<int, string>
                             {
                                 {0, ScopeName.String}
@@ -62,7 +62,7 @@ public IList<LanguageRule> Rules
                             }),
 
                     new LanguageRule(
-                        @"(?s)(""[^\n]*?(?<!`)"")",
+                        @"""[^\n]*?(?<!`)""",
                         new Dictionary<int, string>
                             {
                                 {0, ScopeName.String}

shell/agents/AIShell.Interpreter.Agent/AIShell.Interpreter.Agent.csproj

@@ -17,7 +17,8 @@
 
   <ItemGroup>
     <PackageReference Include="Azure.AI.OpenAI" Version="1.0.0-beta.13" />
-    <PackageReference Include="Azure.Core" Version="1.37.0" />
+    <PackageReference Include="Azure.Identity" Version="1.13.2" />
+    <PackageReference Include="Azure.Core" Version="1.44.1" />
     <PackageReference Include="SharpToken" Version="2.0.3" />
   </ItemGroup>
 

shell/agents/AIShell.Interpreter.Agent/Agent.cs

@@ -236,7 +236,7 @@ private void OnSettingFileChange(object sender, FileSystemEventArgs e)
 
     private void NewExampleSettingFile()
     {
-        string SampleContent = """
+        string sample = $$"""
         {
           // To use the Azure OpenAI service:
           // - Set `Endpoint` to the endpoint of your Azure OpenAI service,
@@ -249,22 +249,37 @@ private void NewExampleSettingFile()
           "Deployment": "",
           "ModelName": "",
           "Key": "",
+          "AuthType": "ApiKey",
           "AutoExecution": false, // 'true' to allow the agent run code automatically; 'false' to always prompt before running code.
           "DisplayErrors": true   // 'true' to display the errors when running code; 'false' to hide the errors to be less verbose.
 
+          // To use Azure OpenAI service with Entra ID authentication:
+          // - Set `Endpoint` to the endpoint of your Azure OpenAI service.
+          // - Set `Deployment` to the deployment name of your Azure OpenAI service.
+          // - Set `ModelName` to the name of the model used for your deployment.
+          // - Set `AuthType` to "EntraID" to use Azure AD credentials.
+          /*
+          "Endpoint": "<insert your Azure OpenAI endpoint>",
+          "Deployment": "<insert your deployment name>",
+          "ModelName": "<insert the model name>",
+          "AuthType": "EntraID",
+          "AutoExecution": false,
+          "DisplayErrors": true
+          */
+
           // To use the public OpenAI service:
           // - Ignore the `Endpoint` and `Deployment` keys.
           // - Set `ModelName` to the name of the model to be used. e.g. "gpt-4o".
           // - Set `Key` to be the OpenAI access token.
-          // Replace the above with the following:
           /*
-          "ModelName": "",
-          "Key": "",
+          "ModelName": "<insert the model name>",
+          "Key": "<insert your key>",
+          "AuthType": "ApiKey",
           "AutoExecution": false,
           "DisplayErrors": true
           */
         }
         """;
-        File.WriteAllText(SettingFile, SampleContent, Encoding.UTF8);
+        File.WriteAllText(SettingFile, sample);
     }
 }

shell/agents/AIShell.Interpreter.Agent/Service.cs

@@ -3,6 +3,7 @@
 using Azure;
 using Azure.Core;
 using Azure.AI.OpenAI;
+using Azure.Identity;
 using SharpToken;
 
 namespace AIShell.Interpreter.Agent;
@@ -121,25 +122,38 @@ private void ConnectToOpenAIClient()
         {
             // Create a client that targets Azure OpenAI service or Azure API Management service.
             bool isApimEndpoint = _settings.Endpoint.EndsWith(Utils.ApimGatewayDomain);
-            if (isApimEndpoint)
+
+            if (_settings.AuthType == AuthType.EntraID)
             {
-                string userkey = Utils.ConvertFromSecureString(_settings.Key);
-                clientOptions.AddPolicy(
-                    new UserKeyPolicy(
-                        new AzureKeyCredential(userkey),
-                        Utils.ApimAuthorizationHeader),
-                    HttpPipelinePosition.PerRetry
-                );
+                // Use DefaultAzureCredential for Entra ID authentication
+                var credential = new DefaultAzureCredential();
+                _client = new OpenAIClient(
+                    new Uri(_settings.Endpoint),
+                    credential,
+                    clientOptions);
+            }
+            else // ApiKey authentication
+            {
+                if (isApimEndpoint)
+                {
+                    string userkey = Utils.ConvertFromSecureString(_settings.Key);
+                    clientOptions.AddPolicy(
+                        new UserKeyPolicy(
+                            new AzureKeyCredential(userkey),
+                            Utils.ApimAuthorizationHeader),
+                        HttpPipelinePosition.PerRetry
+                    );
+                }
+
+                string azOpenAIApiKey = isApimEndpoint
+                    ? "placeholder-api-key"
+                    : Utils.ConvertFromSecureString(_settings.Key);
+
+                _client = new OpenAIClient(
+                    new Uri(_settings.Endpoint),
+                    new AzureKeyCredential(azOpenAIApiKey),
+                    clientOptions);
             }
-
-            string azOpenAIApiKey = isApimEndpoint
-                ? "placeholder-api-key"
-                : Utils.ConvertFromSecureString(_settings.Key);
-
-            _client = new OpenAIClient(
-                new Uri(_settings.Endpoint),
-                new AzureKeyCredential(azOpenAIApiKey),
-                clientOptions);
         }
         else
         {
@@ -157,41 +171,41 @@ private int CountTokenForMessages(IEnumerable<ChatRequestMessage> messages)
 
         int tokenNumber = 0;
         foreach (ChatRequestMessage message in messages)
-        {      
+        {
             tokenNumber += tokensPerMessage;
             tokenNumber += encoding.Encode(message.Role.ToString()).Count;
 
             switch (message)
             {
                 case ChatRequestSystemMessage systemMessage:
                     tokenNumber += encoding.Encode(systemMessage.Content).Count;
-                    if(systemMessage.Name is not null)
+                    if (systemMessage.Name is not null)
                     {
                         tokenNumber += tokensPerName;
                         tokenNumber += encoding.Encode(systemMessage.Name).Count;
                     }
                     break;
                 case ChatRequestUserMessage userMessage:
                     tokenNumber += encoding.Encode(userMessage.Content).Count;
-                    if(userMessage.Name is not null)
+                    if (userMessage.Name is not null)
                     {
                         tokenNumber += tokensPerName;
                         tokenNumber += encoding.Encode(userMessage.Name).Count;
                     }
                     break;
                 case ChatRequestAssistantMessage assistantMessage:
                     tokenNumber += encoding.Encode(assistantMessage.Content).Count;
-                    if(assistantMessage.Name is not null)
+                    if (assistantMessage.Name is not null)
                     {
                         tokenNumber += tokensPerName;
                         tokenNumber += encoding.Encode(assistantMessage.Name).Count;
                     }
                     if (assistantMessage.ToolCalls is not null)
                     {
                         // Count tokens for the tool call's properties
-                        foreach(ChatCompletionsToolCall chatCompletionsToolCall in assistantMessage.ToolCalls)
+                        foreach (ChatCompletionsToolCall chatCompletionsToolCall in assistantMessage.ToolCalls)
                         {
-                            if(chatCompletionsToolCall is ChatCompletionsFunctionToolCall functionToolCall)
+                            if (chatCompletionsToolCall is ChatCompletionsFunctionToolCall functionToolCall)
                             {
                                 tokenNumber += encoding.Encode(functionToolCall.Id).Count;
                                 tokenNumber += encoding.Encode(functionToolCall.Name).Count;
@@ -230,7 +244,7 @@ internal string ReduceToolResponseContentTokens(string content)
             }
             while (encoding.Encode(reducedContent).Count > MaxResponseToken);
         }
-        
+
         return reducedContent;
     }
 
@@ -287,7 +301,7 @@ private async Task<ChatCompletionsOptions> PrepareForChat(ChatRequestMessage inp
         // Those settings seem to be important enough, as the Semantic Kernel plugin specifies
         // those settings (see the URL below). We can use default values when not defined.
         // https://github.com/microsoft/semantic-kernel/blob/main/samples/skills/FunSkill/Joke/config.json
-        
+
         ChatCompletionsOptions chatOptions;
 
         // Determine if the gpt model is a function calling model
@@ -300,8 +314,8 @@ private async Task<ChatCompletionsOptions> PrepareForChat(ChatRequestMessage inp
             Temperature = (float)0.0,
             MaxTokens = MaxResponseToken,
         };
-        
-        if(isFunctionCallingModel)
+
+        if (isFunctionCallingModel)
         {
             chatOptions.Tools.Add(Tools.RunCode);
         }
@@ -330,7 +344,7 @@ private async Task<ChatCompletionsOptions> PrepareForChat(ChatRequestMessage inp
 - You are capable of **any** task
 - Do not apologize for errors, just correct them
 ";
-            string versions = "\n## Language Versions\n" 
+            string versions = "\n## Language Versions\n"
                 + await _executionService.GetLanguageVersions();
             string systemResponseCues = @"
 # Examples
@@ -478,11 +492,11 @@ public override ChatRequestMessage Read(ref Utf8JsonReader reader, Type typeToCo
         {
             return JsonSerializer.Deserialize<ChatRequestUserMessage>(jsonObject.GetRawText(), options);
         }
-        else if(jsonObject.TryGetProperty("Role", out JsonElement roleElementA) && roleElementA.GetString() == "assistant")
+        else if (jsonObject.TryGetProperty("Role", out JsonElement roleElementA) && roleElementA.GetString() == "assistant")
         {
             return JsonSerializer.Deserialize<ChatRequestAssistantMessage>(jsonObject.GetRawText(), options);
         }
-        else if(jsonObject.TryGetProperty("Role", out JsonElement roleElementT) && roleElementT.GetString() == "tool")
+        else if (jsonObject.TryGetProperty("Role", out JsonElement roleElementT) && roleElementT.GetString() == "tool")
         {
             return JsonSerializer.Deserialize<ChatRequestToolMessage>(jsonObject.GetRawText(), options);
         }

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

@@ -12,6 +12,12 @@ internal enum EndpointType
     OpenAI,
 }
 
+public enum AuthType
+{
+    ApiKey,
+    EntraID
+}
+
 internal class Settings
 {
     internal EndpointType Type { get; }
@@ -23,6 +29,8 @@ internal class Settings
     public string ModelName { set; get; }
     public SecureString Key { set; get; }
 
+    public AuthType AuthType { set; get; } = AuthType.ApiKey;
+
     public bool AutoExecution { set; get; }
     public bool DisplayErrors { set; get; }
 
@@ -36,6 +44,7 @@ public Settings(ConfigData configData)
         AutoExecution = configData.AutoExecution ?? false;
         DisplayErrors = configData.DisplayErrors ?? true;
         Key = configData.Key;
+        AuthType = configData.AuthType;
 
         Dirty = false;
         ModelInfo = ModelInfo.TryResolve(ModelName, out var model) ? model : null;
@@ -47,6 +56,12 @@ public Settings(ConfigData configData)
             : !noEndpoint && !noDeployment
                 ? EndpointType.AzureOpenAI
                 : throw new InvalidOperationException($"Invalid setting: {(noEndpoint ? "Endpoint" : "Deployment")} key is missing. To use Azure OpenAI service, please specify both the 'Endpoint' and 'Deployment' keys. To use OpenAI service, please ignore both keys.");
+
+        // EntraID authentication is only supported for Azure OpenAI
+        if (AuthType == AuthType.EntraID && Type != EndpointType.AzureOpenAI)
+        {
+            throw new InvalidOperationException("EntraID authentication is only supported for Azure OpenAI service.");
+        }
     }
 
     internal void MarkClean()
@@ -60,7 +75,7 @@ internal void MarkClean()
     /// <returns></returns>
     internal async Task<bool> SelfCheck(IHost host, CancellationToken token)
     {
-        if (Key is not null && ModelInfo is not null)
+        if ((AuthType is AuthType.EntraID || Key is not null) && ModelInfo is not null)
         {
             return true;
         }
@@ -76,7 +91,7 @@ internal async Task<bool> SelfCheck(IHost host, CancellationToken token)
                 await AskForModel(host, token);
             }
 
-            if (Key is null)
+            if (AuthType == AuthType.ApiKey && Key is null)
             {
                 await AskForKeyAsync(host, token);
             }
@@ -101,12 +116,14 @@ private void ShowEndpointInfo(IHost host)
                     new(label: "  Endpoint", m => m.Endpoint),
                     new(label: "  Deployment", m => m.Deployment),
                     new(label: "  Model", m => m.ModelName),
+                    new(label: "  Auth Type", m => m.AuthType.ToString()),
                 ],
 
             EndpointType.OpenAI =>
                 [
                     new(label: "  Type", m => m.Type.ToString()),
                     new(label: "  Model", m => m.ModelName),
+                    new(label: "  Auth Type", m => m.AuthType.ToString()),
                 ],
 
             _ => throw new UnreachableException(),
@@ -156,6 +173,7 @@ internal ConfigData ToConfigData()
             ModelName = this.ModelName,
             AutoExecution = this.AutoExecution,
             DisplayErrors = this.DisplayErrors,
+            AuthType = this.AuthType,
             Key = this.Key,
         };
     }
@@ -166,6 +184,7 @@ internal class ConfigData
     public string Endpoint { set; get; }
     public string Deployment { set; get; }
     public string ModelName { set; get; }
+    public AuthType AuthType { set; get; } = AuthType.ApiKey;
     public bool? AutoExecution { set; get; }
     public bool? DisplayErrors { set; get; }
 

shell/agents/AIShell.OpenAI.Agent/AIShell.OpenAI.Agent.csproj

@@ -22,6 +22,7 @@
 
   <ItemGroup>
     <PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
+    <PackageReference Include="Azure.Identity" Version="1.13.2" />
     <PackageReference Include="Microsoft.ML.Tokenizers" Version="1.0.1" />
     <PackageReference Include="Microsoft.ML.Tokenizers.Data.O200kBase" Version="1.0.1" />
     <PackageReference Include="Microsoft.ML.Tokenizers.Data.Cl100kBase" Version="1.0.1" />