Bug fixes

Author: suncloudsmoon

Forge.cs

@@ -307,7 +307,7 @@ private static AsyncCollectionResult<StreamingChatCompletionUpdate> Review(Word.
                     ragContext.AppendLine(doc.DocumentString);
                 allText = ragContext.ToString();
             }
-            UserChatMessage userPrompt = new UserChatMessage($@"Document Content: ""{RAGControl.SubstringWithoutBounds(allText, (int)(ThisAddIn.ContextLength * 0.4))}""{Environment.NewLine}RAG Context: ""{ThisAddIn.RagControl.GetRAGContext(p.Text, (int)(ThisAddIn.ContextLength * 0.3))}""{Environment.NewLine}Please review the following paragraph extracted from the Document: ""{RAGControl.SubstringWithoutBounds(p.Text, (int)(ThisAddIn.ContextLength * 0.2))}""{Environment.NewLine}{prompt}");
+            UserChatMessage userPrompt = new UserChatMessage($@"Document Content: ""{RAGControl.SubstringTokens(allText, (int)(ThisAddIn.ContextLength * 0.4))}""{Environment.NewLine}RAG Context: ""{ThisAddIn.RagControl.GetRAGContext(p.Text, (int)(ThisAddIn.ContextLength * 0.3))}""{Environment.NewLine}Please review the following paragraph extracted from the Document: ""{RAGControl.SubstringTokens(p.Text, (int)(ThisAddIn.ContextLength * 0.2))}""{Environment.NewLine}{prompt}");
 
             ChatClient client = new ChatClient(ThisAddIn.Model, ThisAddIn.ApiKey, ThisAddIn.ClientOptions);
             return client.CompleteChatStreamingAsync(new List<ChatMessage> { SystemPrompt, userPrompt }, null, ThisAddIn.CancellationTokenSource.Token);

GenerateUserControl.cs

@@ -67,8 +67,8 @@ public static AsyncCollectionResult<StreamingChatCompletionUpdate> AskQuestion(S
             string document = (Globals.ThisAddIn.Application.ActiveDocument.Words.Count * 1.4 > ThisAddIn.ContextLength * 0.4) ? RAGControl.GetWordDocumentAsRAG(prompt, context) : context.Text;
 
             // 0.1 of context length leftover to account for UserChatMessage and other stuff
-            SystemChatMessage systemPromptBounded = new SystemChatMessage(RAGControl.SubstringWithoutBounds(systemPrompt.Content[0].Text, (int)(ThisAddIn.ContextLength * 0.1)));
-            UserChatMessage fullPrompt = new UserChatMessage($@"{RAGControl.SubstringWithoutBounds(prompt, (int) (ThisAddIn.ContextLength * 0.2))}{Environment.NewLine}RAG Context: ""{ThisAddIn.RagControl.GetRAGContext(prompt, (int)(ThisAddIn.ContextLength * 0.2))}""{Environment.NewLine}Document Content: ""{RAGControl.SubstringWithoutBounds(document, (int)(ThisAddIn.ContextLength * 0.4))}""");
+            SystemChatMessage systemPromptBounded = new SystemChatMessage(RAGControl.SubstringTokens(systemPrompt.Content[0].Text, (int)(ThisAddIn.ContextLength * 0.1)));
+            UserChatMessage fullPrompt = new UserChatMessage($@"{RAGControl.SubstringTokens(prompt, (int) (ThisAddIn.ContextLength * 0.2))}{Environment.NewLine}RAG Context: ""{ThisAddIn.RagControl.GetRAGContext(prompt, (int)(ThisAddIn.ContextLength * 0.2))}""{Environment.NewLine}Document Content: ""{RAGControl.SubstringTokens(document, (int)(ThisAddIn.ContextLength * 0.4))}""");
 
             ChatClient client = new ChatClient(ThisAddIn.Model, ThisAddIn.ApiKey, ThisAddIn.ClientOptions);
             return client.CompleteChatStreamingAsync(new List<ChatMessage>() { systemPromptBounded, fullPrompt }, null, ThisAddIn.CancellationTokenSource.Token);

OfficeAddInSetup/OfficeAddInSetup.vdproj

@@ -2345,7 +2345,7 @@
             }
             "{3C67513D-01DD-4637-8A68-80971EB9504F}:_AF016B7856C74F08A06EC9F3AA46C574"
             {
-            "DefaultLocation" = "8:[ProgramFilesFolder][Manufacturer]\\[ProductName]"
+            "DefaultLocation" = "8:[ProgramFiles64Folder][Manufacturer]\\[ProductName]"
             "Name" = "8:#1925"
             "AlwaysCreate" = "11:FALSE"
             "Condition" = "8:"
@@ -2406,7 +2406,7 @@
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:TextCraft"
         "ProductCode" = "8:{9A35238E-CCC7-4433-9616-E5DC353A48D3}"
-        "PackageCode" = "8:{863A915E-8A6F-4EC1-BBCC-4CAB091463A1}"
+        "PackageCode" = "8:{8E29852C-36E0-4844-9D3B-0F51BD125EDA}"
         "UpgradeCode" = "8:{E36CBC33-F0C8-472A-99B5-D882A25CC883}"
         "AspNetVersion" = "8:"
         "RestartWWWService" = "11:FALSE"
@@ -2427,7 +2427,7 @@
         "ARPIconIndex" = "3:0"
         "SearchPath" = "8:"
         "UseSystemSearchPath" = "11:TRUE"
-        "TargetPlatform" = "3:0"
+        "TargetPlatform" = "3:1"
         "PreBuildEvent" = "8:"
         "PostBuildEvent" = "8:"
         "RunPostBuildEvent" = "3:0"

RAGControl.cs

@@ -22,7 +22,7 @@ public partial class RAGControl : UserControl
         private HyperVectorDB.HyperVectorDB _db;
         private bool _isIndexing;
 
-        public const int CHUNK_LEN = 256;
+        public static readonly int CHUNK_LEN = TokensToCharCount(256);
 
         public RAGControl()
         {
@@ -209,11 +209,21 @@ public static List<string> SplitString(string str, int chunkSize)
             return result;
         }
 
-        public static string SubstringWithoutBounds(string text, int maxLen)
+        public static string SubstringTokens(string text, int maxTokens)
+        {
+            return SubstringWithoutBounds(text, TokensToCharCount(maxTokens));
+        }
+
+        private static string SubstringWithoutBounds(string text, int maxLen)
         {
             return (maxLen >= text.Length) ? text : text.Substring(0, maxLen);
         }
 
+        public static int TokensToCharCount(int tokenCount)
+        {
+            return tokenCount * 4; // https://platform.openai.com/tokenizer
+        }
+
         public static string GetWordDocumentAsRAG(string query, Word.Range context)
         {
             // Get RAG context

ThisAddIn.cs

@@ -162,7 +162,7 @@ private async void Document_CommentsEventHandler(Word.Selection selection)
                         chatHistory.Add(Forge.SystemPrompt);
 
                         string documentText = (this.Application.ActiveDocument.Words.Count * 1.2 > _contextLength * 0.4) ? RAGControl.GetWordDocumentAsRAG(c.Range.Text, this.Application.ActiveDocument.Range()) : this.Application.ActiveDocument.Range().Text;
-                        chatHistory.Add(new UserChatMessage($@"Document Content: ""{RAGControl.SubstringWithoutBounds(documentText, (int)(_contextLength * 0.4))}""{Environment.NewLine}Rag Context: {_ragControl.GetRAGContext(c.Range.Text, (int)(ContextLength * 0.2))}Please review the following paragraph extracted from the Document: ""{c.Range.Text}""{Environment.NewLine}Based on the previous AI comments, suggest additional specific improvements to the paragraph, focusing on clarity, coherence, structure, grammar, and overall effectiveness. Ensure that your suggestions are detailed and aimed at improving the paragraph within the context of the entire Document."));
+                        chatHistory.Add(new UserChatMessage($@"Document Content: ""{RAGControl.SubstringTokens(documentText, (int)(_contextLength * 0.4))}""{Environment.NewLine}Rag Context: {_ragControl.GetRAGContext(c.Range.Text, (int)(ContextLength * 0.2))}Please review the following paragraph extracted from the Document: ""{c.Range.Text}""{Environment.NewLine}Based on the previous AI comments, suggest additional specific improvements to the paragraph, focusing on clarity, coherence, structure, grammar, and overall effectiveness. Ensure that your suggestions are detailed and aimed at improving the paragraph within the context of the entire Document."));
                         chatHistory.Add(new AssistantChatMessage(c.Range.Text));
 
                         for (int i = 1; i <= c.Replies.Count; i++)