Copilot Chat: Revert "Copilot Chat: Use standard semantic skills to d…

…efine chat prompts" (#2035)

Reverts #1853 -- this PR has caused some issues
with Copilot Chat deployments that need further investigation.

samples/apps/copilot-chat-app/webapi/CopilotChat/Extensions/SemanticKernelExtensions.cs

@@ -51,7 +51,8 @@ public static IKernel RegisterCopilotChatSkills(this IKernel kernel, IServicePro
                 chatSessionRepository: sp.GetRequiredService<ChatSessionRepository>(),
                 promptOptions: sp.GetRequiredService<IOptions<PromptsOptions>>(),
                 documentImportOptions: sp.GetRequiredService<IOptions<DocumentMemoryOptions>>(),
-                planner: sp.GetRequiredService<CopilotChatPlanner>()),
+                planner: sp.GetRequiredService<CopilotChatPlanner>(),
+                logger: sp.GetRequiredService<ILogger<ChatSkill>>()),
             nameof(ChatSkill));
 
         return kernel;

samples/apps/copilot-chat-app/webapi/CopilotChat/Options/PromptsOptions.cs

@@ -11,14 +11,19 @@ namespace SemanticKernel.Service.CopilotChat.Options;
 /// </summary>
 public class PromptsOptions
 {
-    public const string PropertyName = "ReusablePromptVariables";
+    public const string PropertyName = "Prompts";
 
     /// <summary>
     /// Token limit of the chat model.
     /// </summary>
     /// <remarks>https://platform.openai.com/docs/models/overview for token limits.</remarks>
     [Required, Range(0, int.MaxValue)] public int CompletionTokenLimit { get; set; }
 
+    /// <summary>
+    /// The token count left for the model to generate text after the prompt.
+    /// </summary>
+    [Required, Range(0, int.MaxValue)] public int ResponseTokenLimit { get; set; }
+
     /// <summary>
     /// Weight of memories in the contextual part of the final prompt.
     /// Contextual prompt excludes all the system commands and user intent.
@@ -52,14 +57,103 @@ public class PromptsOptions
     // System
     [Required, NotEmptyOrWhitespace] public string KnowledgeCutoffDate { get; set; } = string.Empty;
     [Required, NotEmptyOrWhitespace] public string InitialBotMessage { get; set; } = string.Empty;
+    [Required, NotEmptyOrWhitespace] public string SystemDescription { get; set; } = string.Empty;
+    [Required, NotEmptyOrWhitespace] public string SystemResponse { get; set; } = string.Empty;
+
+    internal string[] SystemAudiencePromptComponents => new string[]
+    {
+        this.SystemAudience,
+        "{{ChatSkill.ExtractChatHistory}}",
+        this.SystemAudienceContinuation
+    };
+
+    internal string SystemAudienceExtraction => string.Join("\n", this.SystemAudiencePromptComponents);
+
+    internal string[] SystemIntentPromptComponents => new string[]
+    {
+        this.SystemDescription,
+        this.SystemIntent,
+        "{{ChatSkill.ExtractChatHistory}}",
+        this.SystemIntentContinuation
+    };
+
+    internal string SystemIntentExtraction => string.Join("\n", this.SystemIntentPromptComponents);
+
+    // Intent extraction
+    [Required, NotEmptyOrWhitespace] public string SystemIntent { get; set; } = string.Empty;
+    [Required, NotEmptyOrWhitespace] public string SystemIntentContinuation { get; set; } = string.Empty;
+
+    // Audience extraction
+    [Required, NotEmptyOrWhitespace] public string SystemAudience { get; set; } = string.Empty;
+    [Required, NotEmptyOrWhitespace] public string SystemAudienceContinuation { get; set; } = string.Empty;
 
     // Memory extraction
+    [Required, NotEmptyOrWhitespace] public string SystemCognitive { get; set; } = string.Empty;
     [Required, NotEmptyOrWhitespace] public string MemoryFormat { get; set; } = string.Empty;
+    [Required, NotEmptyOrWhitespace] public string MemoryAntiHallucination { get; set; } = string.Empty;
+    [Required, NotEmptyOrWhitespace] public string MemoryContinuation { get; set; } = string.Empty;
+
+    // Long-term memory
+    [Required, NotEmptyOrWhitespace] public string LongTermMemoryName { get; set; } = string.Empty;
+    [Required, NotEmptyOrWhitespace] public string LongTermMemoryExtraction { get; set; } = string.Empty;
+
+    internal string[] LongTermMemoryPromptComponents => new string[]
+    {
+        this.SystemCognitive,
+        $"{this.LongTermMemoryName} Description:\n{this.LongTermMemoryExtraction}",
+        this.MemoryAntiHallucination,
+        $"Chat Description:\n{this.SystemDescription}",
+        "{{ChatSkill.ExtractChatHistory}}",
+        this.MemoryContinuation
+    };
+
+    internal string LongTermMemory => string.Join("\n", this.LongTermMemoryPromptComponents);
+
+    // Working memory
+    [Required, NotEmptyOrWhitespace] public string WorkingMemoryName { get; set; } = string.Empty;
+    [Required, NotEmptyOrWhitespace] public string WorkingMemoryExtraction { get; set; } = string.Empty;
+
+    internal string[] WorkingMemoryPromptComponents => new string[]
+    {
+        this.SystemCognitive,
+        $"{this.WorkingMemoryName} Description:\n{this.WorkingMemoryExtraction}",
+        this.MemoryAntiHallucination,
+        $"Chat Description:\n{this.SystemDescription}",
+        "{{ChatSkill.ExtractChatHistory}}",
+        this.MemoryContinuation
+    };
+
+    internal string WorkingMemory => string.Join("\n", this.WorkingMemoryPromptComponents);
 
     // Memory map
-    internal List<string> MemoryTypes => new()
+    internal IDictionary<string, string> MemoryMap => new Dictionary<string, string>()
     {
-        "LongTermMemory",
-        "WorkingMemory"
+        { this.LongTermMemoryName, this.LongTermMemory },
+        { this.WorkingMemoryName, this.WorkingMemory }
     };
+
+    // Chat commands
+    internal string SystemChatContinuation = "SINGLE RESPONSE FROM BOT TO USER:\n[{{TimeSkill.Now}} {{timeSkill.Second}}] bot:";
+
+    internal string[] SystemChatPromptComponents => new string[]
+    {
+        this.SystemDescription,
+        this.SystemResponse,
+        "{{$audience}}",
+        "{{$userIntent}}",
+        "{{$chatContext}}",
+        this.SystemChatContinuation
+    };
+
+    internal string SystemChatPrompt => string.Join("\n\n", this.SystemChatPromptComponents);
+
+    internal double ResponseTemperature { get; } = 0.7;
+    internal double ResponseTopP { get; } = 1;
+    internal double ResponsePresencePenalty { get; } = 0.5;
+    internal double ResponseFrequencyPenalty { get; } = 0.5;
+
+    internal double IntentTemperature { get; } = 0.7;
+    internal double IntentTopP { get; } = 1;
+    internal double IntentPresencePenalty { get; } = 0.5;
+    internal double IntentFrequencyPenalty { get; } = 0.5;
 }