Simplify hosted handlers setup

Fix queue task scheduler
Increase queue retry attempts from 10 to 20
Fix queue names
Rename curl script
Code docs

Author: dluc

NOTES.md

@@ -69,7 +69,7 @@ as a web service.
 * `lib-python`: reusable libraries for python webservices and handlers.
 * `tools`: command line tools, e.g. scripts to start RabbitMQ locally.
 * `samples`: samples showing how to upload files, how to use encoder/retrieval, etc.
-  * `upload-one-file.sh`: Bash command line tool to upload one document to the
+  * `upload-file.sh`: Bash command line tool to upload one document to the
     memory web service.
   * `FileImportExamples`: C# examples showing how to upload multiple files to the
     memory web service, using different approaches: 

SemanticMemory.sln

@@ -18,7 +18,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "clients", "clients", "{B0F7
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "curl", "curl", "{7761EC04-9E17-44EE-A6D8-9FB97F14AF61}"
 	ProjectSection(SolutionItems) = preProject
-		clients\curl\upload-one-file.sh = clients\curl\upload-one-file.sh
+		clients\curl\README.md = clients\curl\README.md
+		clients\curl\upload-file.sh = clients\curl\upload-file.sh
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{6335B02C-9964-4B39-9795-C5F5F0392515}"

clients/curl/README.md

@@ -0,0 +1,13 @@
+Simple client for command line uploads to Semantic Memory.
+
+Instructions:
+
+```bash
+./upload-file.sh -h
+```
+
+Example:
+
+```bash
+./upload-file.sh -f test.pdf -s http://127.0.0.1:9001/upload -u curlUser -c curlDataCollection -i curlExample01
+```

clients/curl/test.pdf

@@ -13,7 +13,7 @@ Help for Bash script
 
 Usage:
 
-    ./upload-one-file.sh -f <file path> -u <id> -c <list> -i <id> -s <url>
+    ./upload-file.sh -f <file path> -u <id> -c <list> -i <id> -s <url>
 
     -f file path           Path to the document to upload.
     -u userId              User ID.
@@ -25,7 +25,7 @@ Usage:
 
 Example:
 
-    ./upload-one-file.sh -f myFile.pdf -u me -c "notes meetings" -i "bash test" -s http://127.0.0.1:9001/upload
+    ./upload-file.sh -f myFile.pdf -u me -c "notes meetings" -i "bash test" -s http://127.0.0.1:9001/upload
 
 
 For more information visit https://github.com/microsoft/semantic-memory
@@ -123,7 +123,7 @@ for x in $COLLECTIONS; do
 done
 
 # Send HTTP request using curl
-set -x
+#set -x
 curl -v \
   -F 'file1=@"'"${FILENAME}"'"' \
   -F 'user="'"${USER_ID}"'"' \

clients/curl/upload-one-file.sh clients/curl/upload-file.shclients/curl/upload-one-file.sh renamed to clients/curl/upload-file.sh

@@ -3,7 +3,7 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.SemanticKernel.SemanticMemory.Core.Configuration;
+using Microsoft.SemanticKernel.SemanticMemory.Core.AppBuilders;
 using Microsoft.SemanticKernel.SemanticMemory.Core.Handlers;
 using Microsoft.SemanticKernel.SemanticMemory.Core.Pipeline;
 using Microsoft.SemanticKernel.SemanticMemory.Core20;
@@ -47,7 +47,10 @@ private async Task ImportFilesInternalAsync(string[] files, ImportFileOptions op
         }
 
         // TODO: .Then("index")
-        pipeline.Then("extract").Then("partition").Build();
+        pipeline
+            .Then("extract")
+            .Then("partition")
+            .Build();
 
         // Execute pipeline
         await orchestrator.RunPipelineAsync(pipeline).ConfigureAwait(false);

clients/dotnet/MemoryPipelineClient/MemoryPipelineClient.cs

@@ -2,7 +2,7 @@
 
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Microsoft.SemanticKernel.SemanticMemory.Core.Configuration;
+using Microsoft.SemanticKernel.SemanticMemory.Core.AppBuilders;
 using Microsoft.SemanticKernel.SemanticMemory.Core.ContentStorage;
 using Microsoft.SemanticKernel.SemanticMemory.Core.Handlers;
 using Microsoft.SemanticKernel.SemanticMemory.Core.Pipeline;

clients/samples/FileImportExamples/Example3_CustomInProcessPipeline.cs

@@ -47,8 +47,6 @@
 if (examplesToRun.Contains(3))
 {
     Console.WriteLine("============================");
-    Console.WriteLine("Press Enter to continue...");
-    Console.ReadLine();
     Example3_CustomInProcessPipeline.RunAsync().Wait();
     Console.WriteLine("============================");
 }

clients/samples/FileImportExamples/Program.cs

@@ -3,8 +3,9 @@
 using System;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
+using Microsoft.SemanticKernel.SemanticMemory.Core.Configuration;
 
-namespace Microsoft.SemanticKernel.SemanticMemory.Core.Configuration;
+namespace Microsoft.SemanticKernel.SemanticMemory.Core.AppBuilders;
 
 public static class AppBuilder
 {

…/dotnet/Core/Configuration/AppBuilder.cs lib/dotnet/Core/AppBuilders/AppBuilder.cslib/dotnet/Core/Configuration/AppBuilder.cs renamed to lib/dotnet/Core/AppBuilders/AppBuilder.cs lib/dotnet/Core/Configuration/AppBuilder.cs renamed to lib/dotnet/Core/AppBuilders/AppBuilder.cs

@@ -9,7 +9,7 @@
 using Microsoft.SemanticKernel.SemanticMemory.Core.Pipeline;
 using Microsoft.SemanticKernel.SemanticMemory.Core.Pipeline.Queue;
 
-namespace Microsoft.SemanticKernel.SemanticMemory.Core;
+namespace Microsoft.SemanticKernel.SemanticMemory.Core.AppBuilders;
 
 #pragma warning disable CA1724 // The name conflicts with MSExtensions
 public static class DependencyInjection
@@ -184,7 +184,13 @@ public static void UseDistributedPipeline(this IServiceCollection services, SKMe
         }
     }
 
-    public static void UseDefaultHandler<THandler>(this IServiceCollection services, string stepName) where THandler : class
+    /// <summary>
+    /// Register the handler as a DI service, passing the step name to ctor
+    /// </summary>
+    /// <param name="services">DI service collection</param>
+    /// <param name="stepName">Pipeline step name</param>
+    /// <typeparam name="THandler">Handler class</typeparam>
+    public static void UseHandler<THandler>(this IServiceCollection services, string stepName) where THandler : class
     {
         services.AddTransient<THandler>(serviceProvider => ActivatorUtilities.CreateInstance<THandler>(serviceProvider, stepName));
     }