Reviewing NET SDK. DotNetDemo uses project reference instead of NuGet for debugging SDK.

Author: matthewDDennis

src/SDK/NET/Analysis/ModuleWorkerBase.cs

@@ -262,9 +262,13 @@ private async Task ProcessQueue(CancellationToken token, int taskNumber)
                     if (request is null)
                         continue;
 
+                    string? command = request.payload?.command?.ToLower();
+                    if (command == null)
+                        continue;
+
                     // Special shutdown request
                     string? requestModuleId = request.payload?.GetValue("moduleId");
-                    if (request.payload?.command?.EqualsIgnoreCase("quit") == true &&
+                    if (command =="quit" &&
                         requestModuleId?.EqualsIgnoreCase(_moduleId) == true)
                     {
                         await ShutDown(0);
@@ -274,77 +278,24 @@ private async Task ProcessQueue(CancellationToken token, int taskNumber)
                     ExpandoObject response;
 
                     Stopwatch stopWatch = Stopwatch.StartNew();
-                    if (request.payload?.command?.EqualsIgnoreCase("get_module_status") == true)
-                    {
-                        response = GetModuleStatus(request);
-                    }
-                    else if (request.payload?.command?.EqualsIgnoreCase("get_command_status") == true)
-                    {
-                        response = await GetCommandStatus(request).ConfigureAwait(false);
-                    }
-                    else if (request.payload?.command?.EqualsIgnoreCase("cancel_command") == true)
-                    {
-                        response = CancelRequest(request).ToExpando();
-                    }
-                    else
+
+                    // the switch statement is easier to read than a series of if/else statements
+                    response = command switch
                     {
-                        ModuleResponse moduleResponse = Process(request);
-                        if (!_doNotLogCommands.Contains(request.reqtype))
-                            UpdateStatistics(moduleResponse);
-
-                        if (moduleResponse.LongProcessMethod is not null)
-                        {
-                            if (_longRunningTask is not null && !_longRunningTask.IsCompleted)
-                            {
-                                response = new { 
-                                    Success   = false,
-                                    CommandId = _longRunningCommandId,
-                                    Error     = "A long running command is already in progress"
-                                }.ToExpando();
-                            }
-                            else
-                            {
-                                // We have a previous long running process that is now done, but we
-                                // have not stored (nor returned) the result. We can read the result
-                                // now, but we have to start a new process, so...???
-                                // if (_longRunningTask is not null && _longRunningTask.IsCompleted &&
-                                //     _lastLongRunningLastOutput is null)
-                                //    _lastLongRunningLastOutput = ...
-
-                                // Store request Id as the command Id for later, reset the last result
-                                string? commandId = request.reqid;
-
-                                _longRunningCommandId  = commandId;
-                                _lastLongRunningOutput = null;
-                                _longRunningTask       = null;
-
-                                // Start the long running process
-                                Console.WriteLine("Starting long process with command ID " + commandId);
-
-                                _longProcessCancellationTokenSource = new CancellationTokenSource();
-                                CancellationToken cancellationToken = _longProcessCancellationTokenSource.Token;
-                                _longRunningTask = Task.Run(() => moduleResponse.LongProcessMethod(request, cancellationToken),
-                                                            cancellationToken);
-
-                                response = new { 
-                                    Success       = true,
-                                    CommandId     = commandId,
-                                    Message       = "Command is running in the background",
-                                    CommandStatus = "running"
-                                }.ToExpando();
-                            }
-                        }
-                        else
-                            response = moduleResponse.ToExpando();
-                    }
+                        "get_module_status"  => GetModuleStatus(request),
+                        "get_command_status" => await GetCommandStatus(request).ConfigureAwait(false),
+                        "cancel_command"     => CancelRequest(request).ToExpando(),
+                        _                    => ProcessModuleCommands(request)
+                    };
+
                     stopWatch.Stop();
 
                     // Fill in system-added values for the response
                     response = response.Merge(new {
                         ModuleName = ModuleName,
                         ModuleId   = _moduleId,
                         ProcessMs  = stopWatch.ElapsedMilliseconds,
-                        Command    = request.payload?.command ?? string.Empty,
+                        Command    = command ?? string.Empty,
                         RequestId  = request.reqid
                     }.ToExpando());
 
@@ -379,6 +330,61 @@ private async Task ProcessQueue(CancellationToken token, int taskNumber)
             _cancellationTokenSource.Cancel();
         }
 
+        private ExpandoObject ProcessModuleCommands(BackendRequest request)
+        {
+            ExpandoObject response;
+            ModuleResponse moduleResponse = Process(request);
+            if (!_doNotLogCommands.Contains(request.reqtype))
+                UpdateStatistics(moduleResponse);
+
+            if (moduleResponse.LongProcessMethod is not null)
+            {
+                if (_longRunningTask is not null && !_longRunningTask.IsCompleted)
+                {
+                    response = new
+                    {
+                        Success = false,
+                        CommandId = _longRunningCommandId,
+                        Error = "A long running command is already in progress"
+                    }.ToExpando();
+                }
+                else
+                {
+                    // We have a previous long running process that is now done, but we
+                    // have not stored (nor returned) the result. We can read the result
+                    // now, but we have to start a new process, so...???
+                    // if (_longRunningTask is not null && _longRunningTask.IsCompleted &&
+                    //     _lastLongRunningLastOutput is null)
+                    //    _lastLongRunningLastOutput = ...
+
+                    // Store request Id as the command Id for later, reset the last result
+                    string? commandId = request.reqid;
+
+                    _longRunningCommandId = commandId;
+                    _lastLongRunningOutput = null;
+                    _longRunningTask = null;
+
+                    // Start the long running process
+                    Console.WriteLine("Starting long process with command ID " + commandId);
+
+                    _longProcessCancellationTokenSource = new CancellationTokenSource();
+                    CancellationToken cancellationToken = _longProcessCancellationTokenSource.Token;
+                    _longRunningTask = moduleResponse.LongProcessMethod(request, cancellationToken);
+
+                    response = new
+                    {
+                        Success = true,
+                        CommandId = commandId,
+                        Message = "Command is running in the background",
+                        CommandStatus = "running"
+                    }.ToExpando();
+                }
+            }
+            else
+                response = moduleResponse.ToExpando();
+            return response;
+        }
+
         /// <summary>
         /// This stops the application
         /// </summary>

src/demos/modules/DotNetLongProcess/DotNetLongProcess.csproj

@@ -60,7 +60,6 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="CodeProject.AI.Module.SDK" Version="1.0.1" />
 		<PackageReference Include="SkiaSharp" Version="2.88.6" />
 		<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
 	</ItemGroup>
@@ -90,6 +89,10 @@
 	  <Content Include="favicon.ico" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <ProjectReference Include="..\..\..\SDK\NET\NET.csproj" />
+	</ItemGroup>
+
 	<ItemGroup>
 	  <None Update="explore.html">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>