Merge pull request #889 from WolframResearch/bugfix/rename-code-assis…

…t-to-notebook-assist Finish renaming "Code Assistance" to "Notebook Assistance"
WolframResearch · Nov 7, 2024 · e146eec · e146eec
2 parents 8c60ea2 + b246355
commit e146eec
Show file tree

Hide file tree

Showing 18 changed files with 258 additions and 223 deletions.
diff --git a/FrontEnd/TextResources/ChatbookStrings.tr b/FrontEnd/TextResources/ChatbookStrings.tr
@@ -195,8 +195,8 @@
 
 "AttachedChatFieldHint" -> "Ask me anything",
 
-"MenuItemShowCodeAssistanceWindow" -> "Notebook Assistant Chat\[Ellipsis]",
-"MenuItemShowCodeAssistanceInline" -> "Notebook Assistant for Selection",
+"MenuItemShowNotebookAssistanceWindow" -> "Notebook Assistant Chat\[Ellipsis]",
+"MenuItemShowNotebookAssistanceInline" -> "Notebook Assistant for Selection",
 "MenuItemShowContentSuggestions" -> "AI Content Suggestion",
 
 "WorkspaceWindowTitle" -> "Notebook Assistant",
@@ -208,10 +208,10 @@
 "WorkspaceSourcesOpenNotebooks" -> "Open Notebooks",
 
 "InlineChatButtonTooltipClose" -> "Close",
-"InlineChatButtonTooltipViewCodeAssist" -> "View in Code Assistance Chat",
+"InlineChatButtonTooltipViewNotebookAssist" -> "View in Notebook Assistance Chat",
 
-"CodeAssistanceInputGettingStarted" -> "Help me get started",
-"CodeAssistanceInputErrorMessage" -> "What went wrong?"
+"NotebookAssistanceInputGettingStarted" -> "Help me get started",
+"NotebookAssistanceInputErrorMessage" -> "What went wrong?"
 }
 @|
 @|

diff --git a/FrontEnd/TextResources/ChineseSimplified/ChatbookStrings.tr b/FrontEnd/TextResources/ChineseSimplified/ChatbookStrings.tr
@@ -195,8 +195,8 @@
 
 "AttachedChatFieldHint" -> "\:6709\:95EE\:5FC5\:7B54",
 
-"MenuItemShowCodeAssistanceWindow" -> "\:4E0E\:7B14\:8BB0\:672C\:52A9\:624B\:804A\:5929\[Ellipsis]",
-"MenuItemShowCodeAssistanceInline" -> "\:4E3A\:6240\:9009\:5185\:5BB9\:5BFB\:6C42\:7B14\:8BB0\:672C\:52A9\:624B\:7684\:5E2E\:52A9",
+"MenuItemShowNotebookAssistanceWindow" -> "\:4E0E\:7B14\:8BB0\:672C\:52A9\:624B\:804A\:5929\[Ellipsis]",
+"MenuItemShowNotebookAssistanceInline" -> "\:4E3A\:6240\:9009\:5185\:5BB9\:5BFB\:6C42\:7B14\:8BB0\:672C\:52A9\:624B\:7684\:5E2E\:52A9",
 "MenuItemShowContentSuggestions" -> "AI \:5185\:5BB9\:5EFA\:8BAE",
 
 "WorkspaceWindowTitle" -> "\:7B14\:8BB0\:672C\:52A9\:624B",
@@ -208,10 +208,10 @@
 "WorkspaceSourcesOpenNotebooks" -> "\:6253\:5F00\:7B14\:8BB0\:672C",
 
 "InlineChatButtonTooltipClose" -> "\:5173\:95ED",
-"InlineChatButtonTooltipViewCodeAssist" -> "\:5728\:4EE3\:7801\:534F\:52A9\:804A\:5929\:4E2D\:67E5\:770B",
+"InlineChatButtonTooltipViewNotebookAssist" -> "\:5728\:4EE3\:7801\:534F\:52A9\:804A\:5929\:4E2D\:67E5\:770B",
 
-"CodeAssistanceInputGettingStarted" -> "\:5E2E\:52A9\:6211\:5F00\:59CB\:4F7F\:7528",
-"CodeAssistanceInputErrorMessage" -> "\:51FA\:4EC0\:4E48\:95EE\:9898\:4E86\:ff1f"
+"NotebookAssistanceInputGettingStarted" -> "\:5E2E\:52A9\:6211\:5F00\:59CB\:4F7F\:7528",
+"NotebookAssistanceInputErrorMessage" -> "\:51FA\:4EC0\:4E48\:95EE\:9898\:4E86\:ff1f"
 }
 @|
 @|

diff --git a/FrontEnd/TextResources/ChineseTraditional/ChatbookStrings.tr b/FrontEnd/TextResources/ChineseTraditional/ChatbookStrings.tr
@@ -195,8 +195,8 @@
 
 "AttachedChatFieldHint" -> "\:6B61\:8FCE\:8A62\:554F\:4EFB\:4F55\:4E8B\:60C5",
 
-"MenuItemShowCodeAssistanceWindow" -> "Notebook Assistant Chat\[Ellipsis]",
-"MenuItemShowCodeAssistanceInline" -> "Notebook Assistant for Selection",
+"MenuItemShowNotebookAssistanceWindow" -> "Notebook Assistant Chat\[Ellipsis]",
+"MenuItemShowNotebookAssistanceInline" -> "Notebook Assistant for Selection",
 "MenuItemShowContentSuggestions" -> "AI \:5167\:5BB9\:5EFA\:8B70",
 
 "WorkspaceWindowTitle" -> "Notebook Assistant",
@@ -208,10 +208,10 @@
 "WorkspaceSourcesOpenNotebooks" -> "Open Notebooks",
 
 "InlineChatButtonTooltipClose" -> "Close",
-"InlineChatButtonTooltipViewCodeAssist" -> "View in Code Assistance Chat",
+"InlineChatButtonTooltipViewNotebookAssist" -> "View in Notebook Assistance Chat",
 
-"CodeAssistanceInputGettingStarted" -> "\:6C42\:52A9\:5982\:4F55\:958B\:59CB",
-"CodeAssistanceInputErrorMessage" -> "\:54EA\:88E1\:51FA\:4E86\:554F\:984C\:FF1F"
+"NotebookAssistanceInputGettingStarted" -> "\:6C42\:52A9\:5982\:4F55\:958B\:59CB",
+"NotebookAssistanceInputErrorMessage" -> "\:54EA\:88E1\:51FA\:4E86\:554F\:984C\:FF1F"
 }
 @|
 @|

diff --git a/FrontEnd/TextResources/French/ChatbookStrings.tr b/FrontEnd/TextResources/French/ChatbookStrings.tr
@@ -195,8 +195,8 @@
 
 "AttachedChatFieldHint" -> "Demande\[Hyphen]moi quelque chose",
 
-"MenuItemShowCodeAssistanceWindow" -> "Notebook Assistant Chat\[Ellipsis]",
-"MenuItemShowCodeAssistanceInline" -> "Notebook Assistant for Selection",
+"MenuItemShowNotebookAssistanceWindow" -> "Notebook Assistant Chat\[Ellipsis]",
+"MenuItemShowNotebookAssistanceInline" -> "Notebook Assistant for Selection",
 "MenuItemShowContentSuggestions" -> "Suggestion de contenu par l\[CloseCurlyQuote]IA",
 
 "WorkspaceWindowTitle" -> "Notebook Assistant",
@@ -208,10 +208,10 @@
 "WorkspaceSourcesOpenNotebooks" -> "Open Notebooks",
 
 "InlineChatButtonTooltipClose" -> "Close",
-"InlineChatButtonTooltipViewCodeAssist" -> "View in Code Assistance Chat",
+"InlineChatButtonTooltipViewNotebookAssist" -> "View in Notebook Assistance Chat",
 
-"CodeAssistanceInputGettingStarted" -> "Aide\[Hyphen]moi \[AGrave] d\[EAcute]marrer",
-"CodeAssistanceInputErrorMessage" -> "Qu\[CloseCurlyQuote]est\[Hyphen]ce qui n\[CloseCurlyQuote]a pas fonctionn\[EAcute]\[NonBreakingSpace]?"
+"NotebookAssistanceInputGettingStarted" -> "Aide\[Hyphen]moi \[AGrave] d\[EAcute]marrer",
+"NotebookAssistanceInputErrorMessage" -> "Qu\[CloseCurlyQuote]est\[Hyphen]ce qui n\[CloseCurlyQuote]a pas fonctionn\[EAcute]\[NonBreakingSpace]?"
 }
 @|
 @|

diff --git a/FrontEnd/TextResources/Japanese/ChatbookStrings.tr b/FrontEnd/TextResources/Japanese/ChatbookStrings.tr
@@ -195,8 +195,8 @@
 
 "AttachedChatFieldHint" -> "\:4f55\:3067\:3082\:805e\:3044\:3066\:304f\:3060\:3055\:3044",
 
-"MenuItemShowCodeAssistanceWindow" -> "Notebook Assistant Chat\[Ellipsis]",
-"MenuItemShowCodeAssistanceInline" -> "Notebook Assistant for Selection",
+"MenuItemShowNotebookAssistanceWindow" -> "Notebook Assistant Chat\[Ellipsis]",
+"MenuItemShowNotebookAssistanceInline" -> "Notebook Assistant for Selection",
 "MenuItemShowContentSuggestions" -> "AI\:306B\:3088\:308B\:30B3\:30F3\:30C6\:30F3\:30C4\:306E\:63D0\:6848",
 
 "WorkspaceWindowTitle" -> "Notebook Assistant",
@@ -208,10 +208,10 @@
 "WorkspaceSourcesOpenNotebooks" -> "Open Notebooks",
 
 "InlineChatButtonTooltipClose" -> "Close",
-"InlineChatButtonTooltipViewCodeAssist" -> "View in Code Assistance Chat",
+"InlineChatButtonTooltipViewNotebookAssist" -> "View in Notebook Assistance Chat",
 
-"CodeAssistanceInputGettingStarted" -> "\:3069\:306E\:3088\:3046\:306B\:59CB\:3081\:307E\:3057\:3087\:3046\:304B\:FF1F",
-"CodeAssistanceInputErrorMessage" -> "\:4F55\:304C\:9593\:9055\:3063\:3066\:3044\:307E\:3057\:305F\:304B\:FF1F"
+"NotebookAssistanceInputGettingStarted" -> "\:3069\:306E\:3088\:3046\:306B\:59CB\:3081\:307E\:3057\:3087\:3046\:304B\:FF1F",
+"NotebookAssistanceInputErrorMessage" -> "\:4F55\:304C\:9593\:9055\:3063\:3066\:3044\:307E\:3057\:305F\:304B\:FF1F"
 }
 @|
 @|

diff --git a/FrontEnd/TextResources/Korean/ChatbookStrings.tr b/FrontEnd/TextResources/Korean/ChatbookStrings.tr
@@ -196,8 +196,8 @@
 
 "AttachedChatFieldHint" -> "\:BB34\:C5C7\:C774\:B4E0 \:BB3C\:C5B4\:BCF4\:C138\:C694",
 
-"MenuItemShowCodeAssistanceWindow" -> "Notebook Assistant Chat\[Ellipsis]",
-"MenuItemShowCodeAssistanceInline" -> "Notebook Assistant for Selection",
+"MenuItemShowNotebookAssistanceWindow" -> "Notebook Assistant Chat\[Ellipsis]",
+"MenuItemShowNotebookAssistanceInline" -> "Notebook Assistant for Selection",
 "MenuItemShowContentSuggestions" -> "AI\:C5D0 \:C758\:D55C \:CF58\:D150\:CE20 \:C81C\:C548",
 
 "WorkspaceWindowTitle" -> "Notebook Assistant",
@@ -209,10 +209,10 @@
 "WorkspaceSourcesOpenNotebooks" -> "Open Notebooks",
 
 "InlineChatButtonTooltipClose" -> "Close",
-"InlineChatButtonTooltipViewCodeAssist" -> "View in Code Assistance Chat",
+"InlineChatButtonTooltipViewNotebookAssist" -> "View in Notebook Assistance Chat",
 
-"CodeAssistanceInputGettingStarted" -> "\:C2DC\:C791\:C5D0 \:B3C4\:C6C0 \:BC1B\:AE30",
-"CodeAssistanceInputErrorMessage" -> "\:BB34\:C5C7\:C774 \:C798\:BABB\:B418\:C5C8\:B098\:C694?"
+"NotebookAssistanceInputGettingStarted" -> "\:C2DC\:C791\:C5D0 \:B3C4\:C6C0 \:BC1B\:AE30",
+"NotebookAssistanceInputErrorMessage" -> "\:BB34\:C5C7\:C774 \:C798\:BABB\:B418\:C5C8\:B098\:C694?"
 }
 @|
 @|

diff --git a/FrontEnd/TextResources/Spanish/ChatbookStrings.tr b/FrontEnd/TextResources/Spanish/ChatbookStrings.tr
@@ -195,8 +195,8 @@
 
 "AttachedChatFieldHint" -> "Preg\[UAcute]ntame lo que sea",
 
-"MenuItemShowCodeAssistanceWindow" -> "Notebook Assistant Chat\[Ellipsis]",
-"MenuItemShowCodeAssistanceInline" -> "Notebook Assistant for Selection",
+"MenuItemShowNotebookAssistanceWindow" -> "Notebook Assistant Chat\[Ellipsis]",
+"MenuItemShowNotebookAssistanceInline" -> "Notebook Assistant for Selection",
 "MenuItemShowContentSuggestions" -> "Sugerencia de contenido de IA",
 
 "WorkspaceWindowTitle" -> "Notebook Assistant",
@@ -208,10 +208,10 @@
 "WorkspaceSourcesOpenNotebooks" -> "Open Notebooks",
 
 "InlineChatButtonTooltipClose" -> "Close",
-"InlineChatButtonTooltipViewCodeAssist" -> "View in Code Assistance Chat",
+"InlineChatButtonTooltipViewNotebookAssist" -> "View in Notebook Assistance Chat",
 
-"CodeAssistanceInputGettingStarted" -> "Ay\[UAcute]dame a comenzar",
-"CodeAssistanceInputErrorMessage" -> "\[DownQuestion]Qu\[EAcute] sali\[OAcute] mal?"
+"NotebookAssistanceInputGettingStarted" -> "Ay\[UAcute]dame a comenzar",
+"NotebookAssistanceInputErrorMessage" -> "\[DownQuestion]Qu\[EAcute] sali\[OAcute] mal?"
 }
 @|
 @|

diff --git a/Source/Chatbook/ChatModes/ChatModes.wl b/Source/Chatbook/ChatModes/ChatModes.wl
@@ -34,12 +34,12 @@ $InlineChat = False;
 (* ::Section::Closed:: *)
 (*Load Subcontexts*)
 $subcontexts = {
-    "Wolfram`Chatbook`ChatModes`CodeAssistanceInstructions`",
     "Wolfram`Chatbook`ChatModes`Common`",
     "Wolfram`Chatbook`ChatModes`ContentSuggestions`",
     "Wolfram`Chatbook`ChatModes`Context`",
     "Wolfram`Chatbook`ChatModes`Evaluate`",
-    "Wolfram`Chatbook`ChatModes`ShowCodeAssistance`",
+    "Wolfram`Chatbook`ChatModes`NotebookAssistanceInstructions`",
+    "Wolfram`Chatbook`ChatModes`ShowNotebookAssistance`",
     "Wolfram`Chatbook`ChatModes`UI`"
 };
 

diff --git a/Source/Chatbook/ChatModes/Common.wl b/Source/Chatbook/ChatModes/Common.wl
@@ -11,7 +11,7 @@ HoldComplete[
     `createWorkspaceChat,
     `evaluateAttachedInlineChat,
     `findCurrentWorkspaceChat,
-    `getCodeAssistanceInput,
+    `getNotebookAssistanceInput,
     `getContextFromSelection,
     `getSelectionInfo,
     `moveChatInputToBottom,

diff --git a/...k/ChatModes/CodeAssistanceInstructions.wl → ...atModes/NotebookAssistanceInstructions.wl b/...k/ChatModes/CodeAssistanceInstructions.wl → ...atModes/NotebookAssistanceInstructions.wl
@@ -1,6 +1,6 @@
 (* ::Section::Closed:: *)
 (*Package Header*)
-BeginPackage[ "Wolfram`Chatbook`ChatModes`CodeAssistanceInstructions`" ];
+BeginPackage[ "Wolfram`Chatbook`ChatModes`NotebookAssistanceInstructions`" ];
 Begin[ "`Private`" ];
 
 Needs[ "Wolfram`Chatbook`"                  ];
@@ -10,65 +10,65 @@ Needs[ "Wolfram`Chatbook`ChatModes`Common`" ];
 (* ::**************************************************************************************************************:: *)
 (* ::Section::Closed:: *)
 (*Configuration*)
-$codeAssistanceInputKeys = { "GettingStarted", "ErrorMessage" };
-$$codeAssistanceInputKey = Alternatives @@ $codeAssistanceInputKeys;
+$notebookAssistanceInputKeys = { "GettingStarted", "ErrorMessage" };
+$$notebookAssistanceInputKey = Alternatives @@ $notebookAssistanceInputKeys;
 
 (* ::**************************************************************************************************************:: *)
 (* ::Section::Closed:: *)
-(*$CodeAssistanceInputs*)
-$CodeAssistanceInputs := loadCodeAssistanceInputs[ ];
+(*$NotebookAssistanceInputs*)
+$NotebookAssistanceInputs := loadNotebookAssistanceInputs[ ];
 
 (* ::**************************************************************************************************************:: *)
 (* ::Subsection::Closed:: *)
-(*loadCodeAssistanceInputs*)
-loadCodeAssistanceInputs // beginDefinition;
+(*loadNotebookAssistanceInputs*)
+loadNotebookAssistanceInputs // beginDefinition;
 
-loadCodeAssistanceInputs[ ] := Enclose[
+loadNotebookAssistanceInputs[ ] := Enclose[
     Module[ { as },
-        as = ConfirmBy[ AssociationMap[ loadCodeAssistanceInput, $codeAssistanceInputKeys ], AssociationQ, "Inputs" ];
+        as = ConfirmBy[ AssociationMap[ loadNotebookAssistanceInput, $notebookAssistanceInputKeys ], AssociationQ, "Inputs" ];
         WithCleanup[
-            Unprotect @ $CodeAssistanceInputs,
-            $CodeAssistanceInputs = ConfirmBy[ as, AllTrue @ StringQ, "Result" ],
-            Protect @ $CodeAssistanceInputs
+            Unprotect @ $NotebookAssistanceInputs,
+            $NotebookAssistanceInputs = ConfirmBy[ as, AllTrue @ StringQ, "Result" ],
+            Protect @ $NotebookAssistanceInputs
         ]
     ],
     throwInternalFailure
 ];
 
-loadCodeAssistanceInputs // endDefinition;
+loadNotebookAssistanceInputs // endDefinition;
 
 (* ::**************************************************************************************************************:: *)
 (* ::Subsubsection::Closed:: *)
-(*loadCodeAssistanceInput*)
-loadCodeAssistanceInput // beginDefinition;
+(*loadNotebookAssistanceInput*)
+loadNotebookAssistanceInput // beginDefinition;
 
-loadCodeAssistanceInput[ name: $$codeAssistanceInputKey ] := Enclose[
+loadNotebookAssistanceInput[ name: $$notebookAssistanceInputKey ] := Enclose[
     usingFrontEnd @ ConfirmBy[
-        trRaw[ "CodeAssistanceInput"<>name ],
+        trRaw[ "NotebookAssistanceInput"<>name ],
         StringQ,
-        "LoadCodeAssistanceInput"
+        "LoadNotebookAssistanceInput"
     ],
     throwInternalFailure
 ];
 
-loadCodeAssistanceInput // endDefinition;
+loadNotebookAssistanceInput // endDefinition;
 
 (* ::**************************************************************************************************************:: *)
 (* ::Subsection::Closed:: *)
-(*getCodeAssistanceInput*)
-getCodeAssistanceInput // beginDefinition;
+(*getNotebookAssistanceInput*)
+getNotebookAssistanceInput // beginDefinition;
 
-getCodeAssistanceInput[ name_String ] := Enclose[
+getNotebookAssistanceInput[ name_String ] := Enclose[
     Module[ { inputs, result },
-        inputs = ConfirmBy[ $CodeAssistanceInputs, AssociationQ, "Inputs" ];
+        inputs = ConfirmBy[ $NotebookAssistanceInputs, AssociationQ, "Inputs" ];
         result = ConfirmMatch[ Lookup[ inputs, name ], _Missing | $$string, "Result" ];
-        If[ StringQ @ result, needsBasePrompt[ "CodeAssistance"<>name ] ];
+        If[ StringQ @ result, needsBasePrompt[ "NotebookAssistance"<>name ] ];
         result
     ],
     throwInternalFailure
 ];
 
-getCodeAssistanceInput // endDefinition;
+getNotebookAssistanceInput // endDefinition;
 
 (* ::**************************************************************************************************************:: *)
 (* ::Section::Closed:: *)