Merge remote-tracking branch 'origin/main' into ralphe/refactor_azcli…

…_to_interface
Azure · Apr 1, 2024 · 2c0811a · 2c0811a
2 parents ce4f9b7 + f0aac19
commit 2c0811a
Show file tree

Hide file tree

Showing 126 changed files with 1,777 additions and 1,781 deletions.
diff --git a/.azure/pipelines/build.yaml b/.azure/pipelines/build.yaml
@@ -7,7 +7,7 @@ pr:
   - main
 
 pool:
-  name: SkymanUbuntu2004Hosted
+  name: $(UbuntuPipelineName)
 
 parameters:
 - name: signNugetPackages
@@ -79,16 +79,15 @@ stages:
           projects: 'src/ai/ai-cli.csproj'
           arguments: '--configuration Release -p:CLIAssemblyVersion=$(AICLISemVerVersion) -p:CLIAssemblyInformationalVersion=$(AICLIVersion) -p:PackageVersion=$(AICLIVersion) -o "$(Build.ArtifactStagingDirectory)"'
       - task: UseDotNet@2
-        displayName: 'Use .NET Core 2.1 (signing requirement)'
+        displayName: 'Use .NET Core 6.0 (signing requirement for EsrpCodeSigning@4)'
         inputs:
           packageType: 'sdk'
-          version: '2.1.x'
-      - ${{ if eq(parameters.signNugetPackages, true) }}:
-        - template: sign-nuget.yaml
-          parameters:
-            displayName: 'Sign AI CLI NuGet package'
-            folderPath: '$(Build.ArtifactStagingDirectory)'
-            pattern: '$(AICLINuPkgFileName)'
+          version: '6.0.x'
+      - template: sign-nuget.yaml
+        parameters:
+          displayName: 'Sign AI CLI NuGet package'
+          folderPath: '$(Build.ArtifactStagingDirectory)'
+          pattern: '$(AICLINuPkgFileName)'
       - task: Bash@3
         displayName: 'Create installation script'
         inputs:
@@ -117,14 +116,14 @@ stages:
       - task: AzureCLI@2
         displayName: Upload NuGet package
         inputs:
-          azureSubscription: 'Carbon Dropper (CSSpeechStorage Drop)'
+          azureSubscription: 'Carbon Dropper2 (CSSpeechStorage Drop)'
           scriptType: 'bash'
           arguments: '$(Build.ArtifactStagingDirectory)/$(AICLINuPkgFileName) private/ai/$(AICLINuPkgFileName)'
           scriptPath: './.azure/pipelines/scripts/upload-file.sh'
       - task: AzureCLI@2
         displayName: Upload installation script
         inputs:
-          azureSubscription: 'Carbon Dropper (CSSpeechStorage Drop)'
+          azureSubscription: 'Carbon Dropper2 (CSSpeechStorage Drop)'
           scriptType: 'bash'
           arguments: '$(Build.ArtifactStagingDirectory)/InstallAzureAICLIDeb-$(AICLIVersion).sh private/ai/InstallAzureAICLIDeb-$(AICLIVersion).sh'
           scriptPath: './.azure/pipelines/scripts/upload-file.sh'
@@ -220,7 +219,7 @@ stages:
   dependsOn: SetupStage
   condition: and(succeeded(), or(eq(variables['IsRelease'], 'true'), eq(variables['PublishDevBuild'], 'true')))
   pool:
-    name: SkymanWS2022Compliant
+    name: $(WindowsPipelineName)
   jobs:
     - job: BuildWindowsInstaller
       variables:
@@ -270,7 +269,7 @@ stages:
 
       - task: AzureCLI@2
         inputs:
-          azureSubscription: 'Carbon Dropper (CSSpeechStorage Drop)'
+          azureSubscription: 'Carbon Dropper2 (CSSpeechStorage Drop)'
           scriptType: 'bash'
           arguments: '$(Build.ArtifactStagingDirectory)/Azure-AI-CLI-Setup-$(AICLIVersion)-x64.exe private/ai/Azure-AI-CLI-Setup-$(AICLIVersion)-x64.exe'
           scriptPath: './.azure/pipelines/scripts/upload-file.sh'

diff --git a/.azure/pipelines/sign-dll-exe.yaml b/.azure/pipelines/sign-dll-exe.yaml
@@ -12,7 +12,7 @@ parameters:
     default: true
 
 steps:
-- task: EsrpCodeSigning@2
+- task: EsrpCodeSigning@4
   displayName: ${{ parameters.displayName }}
   inputs:
     ConnectedServiceName: 'Speech SDK ESRP Signing Alternate'

diff --git a/.azure/pipelines/sign-nuget.yaml b/.azure/pipelines/sign-nuget.yaml
@@ -12,7 +12,7 @@ parameters:
     default: true
 
 steps:
-- task: EsrpCodeSigning@1
+- task: EsrpCodeSigning@4
   displayName: ${{ parameters.displayName }}
   inputs:
     ConnectedServiceName: 'Speech SDK ESRP Signing Alternate'

diff --git a/.github/workflows/ado-sync.yaml b/.github/workflows/ado-sync.yaml
diff --git a/.github/workflows/sync-to-ado.yaml b/.github/workflows/sync-to-ado.yaml
diff --git a/NuGet.config b/NuGet.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <clear /> 
-    <add key="CarbonSpx" value="https://msasg.pkgs.visualstudio.com/Skyman/_packaging/CarbonSpx/nuget/v3/index.json" />
+    <clear />
+    <add key="CarbonPre" value="https://pkgs.dev.azure.com/speedme/_packaging/CarbonPre/nuget/v3/index.json" />
   </packageSources>
 </configuration>
diff --git a/src/ai/Program_AI.cs b/src/ai/Program_AI.cs
@@ -18,49 +18,39 @@ public class AiProgram
     {
         static async Task<int> Main(string[] args)
         {
-            IProgramData data = null;
+            bool isDebug = args.Length > 0 && args[0] == "debug";
+            if (isDebug) Console.WriteLine($"StopWatch: Started at {DateTime.Now}");
+
             Stopwatch stopwatch = new Stopwatch();
-            int exitCode = int.MinValue;
+            stopwatch.Start();
 
-            try
-            {
-                bool isDebug = args.Length > 0 && args[0] == "debug";
-                if (isDebug)
-                {
-                    Console.WriteLine($"StopWatch: Started at {DateTime.Now}");
-                }
+            var exitCode = TryCatchHelpers.TryCatchNoThrow(() => Program.Main(new AiProgramData(), args), -1, out var ex);
 
-                stopwatch.Start();
+            stopwatch.Stop();
+            var elapsed = stopwatch.Elapsed;
+            if (isDebug) Console.WriteLine($"StopWatch: Stopped at {DateTime.Now} ({GetStopWatchElapsedAsString(elapsed)})");
 
-                data = new AiProgramData();
-                exitCode = Program.Main(data, args);
-                stopwatch.Stop();
+            stopwatch.Restart();
+            await LogExitEventAsync(elapsed, exitCode);
 
-                if (isDebug)
-                {
-                    Console.WriteLine($"StopWatch: Stopped at {DateTime.Now} ({GetStopWatchElapsedAsString(stopwatch.Elapsed)})");
-                }
+            stopwatch.Stop();
+            if (isDebug) Console.WriteLine($"StopWatch: Telemetry completed at {DateTime.Now} ({GetStopWatchElapsedAsString(stopwatch.Elapsed)})");
 
-                return exitCode;
-            }
-            catch (Exception)
-            {
-                exitCode = -1;
-                throw;
-            }
-            finally
+            if (ex != null) throw ex;
+            return exitCode;
+        }
+
+        static async Task LogExitEventAsync(TimeSpan elapsed, int exitCode)
+        {
+            if (Program.Telemetry != null)
             {
-                if (data?.Telemetry != null)
+                Program.Telemetry.LogEvent(new ExitedTelemetryEvent()
                 {
-                    data.Telemetry.LogEvent(new ExitedTelemetryEvent()
-                    {
-                        ExitCode = exitCode,
-                        Elapsed = stopwatch.Elapsed
-                    });
-
-                    await data.Telemetry.DisposeAsync()
-                        .ConfigureAwait(false);
-                }
+                    ExitCode = exitCode,
+                    Elapsed = elapsed
+                });
+
+                await Program.Telemetry.DisposeAsync();
             }
         }
 

diff --git a/src/ai/commands/chat_command.cs b/src/ai/commands/chat_command.cs
@@ -27,9 +27,8 @@ namespace Azure.AI.Details.Common.CLI
 {
     public class ChatCommand : Command
     {
-        internal ChatCommand(ICommandValues values)
+        internal ChatCommand(ICommandValues values) : base(values)
         {
-            _values = values.ReplaceValues();
             _quiet = _values.GetOrDefault("x.quiet", false);
             _verbose = _values.GetOrDefault("x.verbose", true);
         }
@@ -1067,35 +1066,35 @@ private void StartCommand()
             // _display = new DisplayHelper(_values);
 
             // _output = new OutputHelper(_values);
-            // _output.StartOutput();
+            // _output!.StartOutput();
 
             // var id = _values["chat.input.id"];
-            // _output.EnsureOutputAll("chat.input.id", id);
-            // _output.EnsureOutputEach("chat.input.id", id);
+            // _output!.EnsureOutputAll("chat.input.id", id);
+            // _output!.EnsureOutputEach("chat.input.id", id);
 
             _lock = new SpinLock();
             _lock.StartLock();
         }
 
         private void StopCommand()
         {
-            _lock.StopLock(5000);
+            _lock!.StopLock(5000);
 
             LogHelpers.EnsureStopLogFile(_values);
-            // _output.CheckOutput();
-            // _output.StopOutput();
+            // _output!.CheckOutput();
+            // _output!.StopOutput();
 
             _stopEvent.Set();
         }
 
-        private SpinLock _lock = null;
+        private SpinLock? _lock = null;
         private readonly bool _quiet = false;
         private readonly bool _verbose = false;
 
         private AzureEventSourceListener _azureEventSourceListener;
 
-        // OutputHelper _output = null;
-        // DisplayHelper _display = null;
+        // OutputHelper? _output = null;
+        // DisplayHelper? _display = null;
 
 #nullable enable
         private int? TryParse(string? s, int? defaultValue)

diff --git a/src/ai/commands/dev_command.cs b/src/ai/commands/dev_command.cs
@@ -15,9 +15,8 @@ namespace Azure.AI.Details.Common.CLI
 {
     public class DevCommand : Command
     {
-        internal DevCommand(ICommandValues values)
+        internal DevCommand(ICommandValues values) : base(values)
         {
-            _values = values.ReplaceValues();
             _quiet = _values.GetOrDefault("x.quiet", false);
             _verbose = _values.GetOrDefault("x.verbose", false);
         }
@@ -206,24 +205,24 @@ private void StartCommand()
             // _display = new DisplayHelper(_values);
 
             // _output = new OutputHelper(_values);
-            // _output.StartOutput();
+            // _output!.StartOutput();
 
             _lock = new SpinLock();
             _lock.StartLock();
         }
 
         private void StopCommand()
         {
-            _lock.StopLock(5000);
+            _lock!.StopLock(5000);
 
             // LogHelpers.EnsureStopLogFile(_values);
-            // _output.CheckOutput();
-            // _output.StopOutput();
+            // _output!.CheckOutput();
+            // _output!.StopOutput();
 
             _stopEvent.Set();
         }
 
-        private SpinLock _lock = null;
+        private SpinLock? _lock = null;
         private readonly bool _quiet;
         private readonly bool _verbose;
     }

diff --git a/src/ai/commands/eval_command.cs b/src/ai/commands/eval_command.cs
@@ -20,9 +20,8 @@ namespace Azure.AI.Details.Common.CLI
 {
     public class EvalCommand : Command
     {
-        internal EvalCommand(ICommandValues values)
+        internal EvalCommand(ICommandValues values) : base(values)
         {
-            _values = values.ReplaceValues();
             _quiet = _values.GetOrDefault("x.quiet", false);
             _verbose = _values.GetOrDefault("x.verbose", true);
         }