Refactor to put the AZ CLI related calls behind an interface

ai-cli.sln

@@ -34,6 +34,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		NuGet.config = NuGet.config
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClientsCLI", "src\clients.cli\ClientsCLI.csproj", "{A136A55F-C27B-4FC9-82ED-84A3790BFC3C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests", "tests\UnitTests\UnitTests.csproj", "{BA7F8DB9-2789-4410-99B5-AC38F85697FE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -176,6 +180,30 @@ Global
 		{306A3CD6-91C2-450B-9995-79701CE63FE2}.Release|x64.Build.0 = Release|Any CPU
 		{306A3CD6-91C2-450B-9995-79701CE63FE2}.Release|x86.ActiveCfg = Release|Any CPU
 		{306A3CD6-91C2-450B-9995-79701CE63FE2}.Release|x86.Build.0 = Release|Any CPU
+		{A136A55F-C27B-4FC9-82ED-84A3790BFC3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A136A55F-C27B-4FC9-82ED-84A3790BFC3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A136A55F-C27B-4FC9-82ED-84A3790BFC3C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A136A55F-C27B-4FC9-82ED-84A3790BFC3C}.Debug|x64.Build.0 = Debug|Any CPU
+		{A136A55F-C27B-4FC9-82ED-84A3790BFC3C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A136A55F-C27B-4FC9-82ED-84A3790BFC3C}.Debug|x86.Build.0 = Debug|Any CPU
+		{A136A55F-C27B-4FC9-82ED-84A3790BFC3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A136A55F-C27B-4FC9-82ED-84A3790BFC3C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A136A55F-C27B-4FC9-82ED-84A3790BFC3C}.Release|x64.ActiveCfg = Release|Any CPU
+		{A136A55F-C27B-4FC9-82ED-84A3790BFC3C}.Release|x64.Build.0 = Release|Any CPU
+		{A136A55F-C27B-4FC9-82ED-84A3790BFC3C}.Release|x86.ActiveCfg = Release|Any CPU
+		{A136A55F-C27B-4FC9-82ED-84A3790BFC3C}.Release|x86.Build.0 = Release|Any CPU
+		{BA7F8DB9-2789-4410-99B5-AC38F85697FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BA7F8DB9-2789-4410-99B5-AC38F85697FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA7F8DB9-2789-4410-99B5-AC38F85697FE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BA7F8DB9-2789-4410-99B5-AC38F85697FE}.Debug|x64.Build.0 = Debug|Any CPU
+		{BA7F8DB9-2789-4410-99B5-AC38F85697FE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BA7F8DB9-2789-4410-99B5-AC38F85697FE}.Debug|x86.Build.0 = Debug|Any CPU
+		{BA7F8DB9-2789-4410-99B5-AC38F85697FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BA7F8DB9-2789-4410-99B5-AC38F85697FE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BA7F8DB9-2789-4410-99B5-AC38F85697FE}.Release|x64.ActiveCfg = Release|Any CPU
+		{BA7F8DB9-2789-4410-99B5-AC38F85697FE}.Release|x64.Build.0 = Release|Any CPU
+		{BA7F8DB9-2789-4410-99B5-AC38F85697FE}.Release|x86.ActiveCfg = Release|Any CPU
+		{BA7F8DB9-2789-4410-99B5-AC38F85697FE}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -189,6 +217,7 @@ Global
 		{39876475-2D98-40CF-8B08-CD423A5EB4E8} = {C8AFF891-D6AA-4B8F-BC21-10404DF4B355}
 		{9499C018-FA08-4133-93B3-FC0F3863A6CC} = {C8AFF891-D6AA-4B8F-BC21-10404DF4B355}
 		{CED7C805-0435-4BF7-A42F-9F3BBF14A18F} = {644B75F1-C768-4DB3-BAF2-C69A1F36DD28}
+		{BA7F8DB9-2789-4410-99B5-AC38F85697FE} = {C8AFF891-D6AA-4B8F-BC21-10404DF4B355}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {002655B1-E1E1-4F2A-8D53-C9CD55136AE2}

src/ai/Program_AI.cs

@@ -7,10 +7,11 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
+using Azure.AI.CLI.Clients.AzPython;
+using Azure.AI.CLI.Common.Clients;
 using Azure.AI.Details.Common.CLI.Telemetry;
 using Azure.AI.Details.Common.CLI.Telemetry.Events;
 
-
 namespace Azure.AI.Details.Common.CLI
 {
     public class AiProgram
@@ -78,6 +79,17 @@ public AiProgramData()
             _telemetry = new Lazy<ITelemetry>(
                 () => TelemetryHelpers.InstantiateFromConfig(this),
                 System.Threading.LazyThreadSafetyMode.ExecutionAndPublication);
+
+            var environmentVariables = LegacyAzCli.GetUserAgentEnv();
+
+            LoginManager = new AzConsoleLoginManager(
+                () => Values?.GetOrDefault("init.service.interactive", true) ?? true,
+                environmentVariables);
+
+            var azCliClient = new AzCliClient(environmentVariables);
+            SubscriptionsClient = azCliClient;
+            CognitiveServicesClient = azCliClient;
+            SearchClient = azCliClient;
         }
 
         #region name data
@@ -182,7 +194,7 @@ public bool DispatchParseCommand(INamedValueTokens tokens, ICommandValues values
             var command = values.GetCommand(null) ?? tokens.PeekNextToken();
             var root = command.Split('.').FirstOrDefault();
 
-            return root switch 
+            return root switch
             {
                 "help" => HelpCommandParser.ParseCommand(tokens, values),
                 "init" => InitCommandParser.ParseCommand(tokens, values),
@@ -262,5 +274,11 @@ public bool DisplayKnownErrors(ICommandValues values, Exception ex)
 
         public IEventLoggerHelpers EventLoggerHelpers => new AiEventLoggerHelpers();
         public ITelemetry Telemetry => _telemetry.Value;
+
+        public ILoginManager LoginManager { get; }
+        public ISubscriptionsClient SubscriptionsClient { get; }
+        public ICognitiveServicesClient CognitiveServicesClient { get; }
+        public ISearchClient SearchClient { get; }
+        public ICommandValues Values { get; } = new CommandValues();
     }
 }

src/ai/ai-cli.csproj

@@ -133,6 +133,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\clients.cli\ClientsCLI.csproj" />
     <ProjectReference Include="..\common\common.csproj" />
     <ProjectReference Include="..\extensions\helper_functions_extension\helper_functions_extension.csproj" />
     <ProjectReference Include="..\extensions\speech_extension\speech-extension.csproj" />

src/ai/commands/init_command.cs

@@ -139,7 +139,7 @@ private async Task DoInitRootVerifyConfigFileAsync(bool interactive, string file
                     if (openai != null && search != null)
                     {
                         bool? useSaved = await DoInitRootConfirmVerifiedProjectResources(
-                            interactive, subscription, projectName, hubName, openai.Value, search.Value);
+                            interactive, subscription, projectName, hubName, openai, search);
 
                         detail = useSaved.HasValue
                             ? useSaved == true ? "saved_config" : "something_else"
@@ -186,18 +186,19 @@ private async Task DoInitRootVerifyConfigFileAsync(bool interactive, string file
 
             ConsoleHelpers.WriteLineWithHighlight("\n  `ATTACHED SERVICES AND RESOURCES`\n");
 
-            var message = "    Validating...";
-            Console.Write(message);
+            string indent = "    ";
+            using var cw = new ConsoleTempWriter($"{indent}Validating...");
 
             var (hubName, openai, search) = await AiSdkConsoleGui.VerifyResourceConnections(_values, validated?.Id, groupName, projectName);
             if (openai != null && search != null)
             {
-                Console.Write($"\r{new string(' ', message.Length)}\r");
                 return (hubName, openai, search);
             }
             else
             {
-                ConsoleHelpers.WriteLineWithHighlight($"\r{message} `#e_;WARNING: Configuration could not be validated!`");
+                cw.Clear();
+                Console.Write(indent);
+                ConsoleHelpers.WriteLineWithHighlight($"`#e_;WARNING: Configuration could not be validated!`");
                 Console.WriteLine();
                 return (null, null, null);
             }
@@ -292,20 +293,20 @@ private async ValueTask DoInitRootMenuPick()
             int selected = -1;
 
             var outcome = Program.Telemetry.Wrap(() =>
-            {
-                selected = ListBoxPicker.PickIndexOf(choices.Select(e => e.DisplayName).ToArray());
-                if (selected < 0)
                 {
-                    Console.WriteLine($"\r{label}: CANCELED (no selection)");
-                    return Outcome.Canceled;
-                }
+                    selected = ListBoxPicker.PickIndexOf(choices.Select(e => e.DisplayName).ToArray());
+                    if (selected < 0)
+                    {
+                        Console.WriteLine($"\r{label}: CANCELED (no selection)");
+                        return Outcome.Canceled;
+                    }
 
-                Console.Write($"\r{label.Trim()}: {choices.ElementAtOrDefault(selected)?.DisplayName}\n");
-                _values.Reset("telemetry.init.run_type", choices.ElementAtOrDefault(selected)?.Metadata);
+                    Console.Write($"\r{label.Trim()}: {choices.ElementAtOrDefault(selected)?.DisplayName}\n");
+                    _values.Reset("telemetry.init.run_type", choices.ElementAtOrDefault(selected)?.Metadata);
 
-                return Outcome.Success;
-            },
-            (outcome, ex, timeTaken) => choices.ElementAtOrDefault(selected)?.Metadata == "standalone"
+                    return Outcome.Success;
+                },
+                (outcome, ex, timeTaken) => choices.ElementAtOrDefault(selected)?.Metadata == "standalone"
                 ? null
                 : new InitTelemetryEvent(InitStage.Choice)
                 {
@@ -337,11 +338,11 @@ private async Task DoInitStandaloneResources(bool interactive)
 
             var choices = new[]
             {
-                new { DisplayName = "Azure AI Services (v2)", Value = "init-root-cognitiveservices-ai-services-kind-create-or-select", Metadata = "aiservices" },
+                new { DisplayName = "Azure AI Services (v2)",  Value = "init-root-cognitiveservices-ai-services-kind-create-or-select", Metadata = "aiservices" },
                 new { DisplayName = "Azure AI Services (v1)", Value = "init-root-cognitiveservices-cognitiveservices-kind-create-or-select", Metadata ="cognitiveservices" },
                 new { DisplayName = "Azure OpenAI", Value = "init-root-openai-create-or-select", Metadata = "openai" },
                 new { DisplayName = "Azure Search", Value = "init-root-search-create-or-select", Metadata = "search" },
-                new { DisplayName = "Azure Speech", Value = "init-root-speech-create-or-select", Metadata = "speech" }
+                new { DisplayName = "Azure Speech", Value = "init-root-speech-create-or-select", Metadata =  "speech" }
             };
 
             int picked = -1;
@@ -535,7 +536,7 @@ private async Task DoInitOpenAi(bool interactive, bool skipChat = false, bool al
             var regionFilter = _values.GetOrEmpty("init.service.resource.region.name");
             var groupFilter = _values.GetOrEmpty("init.service.resource.group.name");
             var resourceFilter = _values.GetOrEmpty("init.service.cognitiveservices.resource.name");
-            var kind = _values.GetOrDefault("init.service.cognitiveservices.resource.kind", "OpenAI;AIServices");
+            var kind = _values.GetOrDefault("init.service.cognitiveservices.resource.kind", "AIServices;OpenAI");
             var sku = _values.GetOrDefault("init.service.cognitiveservices.resource.sku", Program.CognitiveServiceResourceSku);
             var yes = _values.GetOrDefault("init.service.cognitiveservices.terms.agree", false);