Merge pull request #818 from WolframResearch/main

Release v1.5.1

.gitattributes

@@ -0,0 +1 @@
+*.jsonl filter=lfs diff=lfs merge=lfs -text

.github/workflows/Build.yml

@@ -12,6 +12,7 @@ concurrency:
 env:
   RESOURCE_PUBLISHER_TOKEN: ${{ secrets.RESOURCE_PUBLISHER_TOKEN }}
   WOLFRAMSCRIPT_ENTITLEMENTID: ${{ secrets.WOLFRAMSCRIPT_ENTITLEMENTID }}
+  OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
 
 jobs:
 
@@ -42,5 +43,8 @@ jobs:
       with:
         path: ${{ env.PACLET_BUILD_DIR }}
 
+    - name: InstallTestDependencies
+      run: wolframscript -f Scripts/InstallTestDependencies.wls
+
     - name: Test
       run: wolframscript -f Scripts/TestPaclet.wls

.github/workflows/Release.yml

@@ -12,6 +12,7 @@ concurrency:
 env:
   RESOURCE_PUBLISHER_TOKEN: ${{ secrets.RESOURCE_PUBLISHER_TOKEN }}
   WOLFRAMSCRIPT_ENTITLEMENTID: ${{ secrets.WOLFRAMSCRIPT_ENTITLEMENTID }}
+  OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
 
 jobs:
 
@@ -37,6 +38,9 @@ jobs:
     - name: Build
       run: wolframscript -f Scripts/BuildPaclet.wls
 
+    - name: InstallTestDependencies
+      run: wolframscript -f Scripts/InstallTestDependencies.wls
+
     - name: Test
       run: wolframscript -f Scripts/TestPaclet.wls
 
@@ -98,6 +102,9 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
 
+    - name: Unformat
+      run: wolframscript -f Scripts/UnformatFiles.wls
+
     - name: BuildMX
       run: wolframscript -f Scripts/BuildMX.wls
 

.gitignore

@@ -1,3 +1,5 @@
-build
 .DS_Store
+Assets/VectorDatabases/**/*.usearch
+Assets/VectorDatabases/**/*.wxf
+build
 Source/Chatbook/64Bit/Chatbook.mx

Developer/CacheTokenizers.wl

@@ -0,0 +1,61 @@
+(* This is used to backport tokenizers from later versions of WL to 13.3 so they can be included in the MX build. *)
+
+(* ::Section::Closed:: *)
+(*Package Header*)
+BeginPackage[ "Wolfram`ChatbookDeveloper`" ];
+
+`CacheTokenizers;
+
+Begin[ "`Private`" ];
+
+PacletInstall[ "Wolfram/LLMFunctions" ];
+Block[ { $ContextPath }, Get[ "Wolfram`LLMFunctions`" ] ];
+
+Get[ "Wolfram`Chatbook`" ];
+Needs[ "Wolfram`Chatbook`Common`" ];
+Needs[ "Developer`" -> None ];
+
+(* ::**************************************************************************************************************:: *)
+(* ::Section::Closed:: *)
+(*Paths*)
+$pacletDirectory    = DirectoryName[ $InputFileName, 2 ];
+$tokenizerDirectory = FileNameJoin @ { $pacletDirectory, "Assets", "Tokenizers" };
+
+(* ::**************************************************************************************************************:: *)
+(* ::Section::Closed:: *)
+(*Aliases*)
+ensureDirectory = GeneralUtilities`EnsureDirectory;
+readWXFFile     = Developer`ReadWXFFile;
+writeWXFFile    = Developer`WriteWXFFile;
+
+(* ::**************************************************************************************************************:: *)
+(* ::Section::Closed:: *)
+(*CacheTokenizers*)
+CacheTokenizers // ClearAll;
+
+CacheTokenizers[ ] :=
+    Enclose @ Module[ { tokenizers, exported },
+        tokenizers = ConfirmBy[ Select[ cachedTokenizer @ All, MatchQ[ _NetEncoder ] ], AssociationQ, "Tokenizers" ];
+        ConfirmAssert[ Length @ tokenizers > 0, "LengthCheck" ];
+        exported = ConfirmBy[ Association @ KeyValueMap[ exportTokenizer, tokenizers ], AssociationQ, "Exported" ];
+        exported
+    ];
+
+(* ::**************************************************************************************************************:: *)
+(* ::Subsection::Closed:: *)
+(*exportTokenizer*)
+exportTokenizer // ClearAll;
+exportTokenizer[ name_String, tokenizer_NetEncoder ] :=
+    Enclose @ Module[ { dir, file, exported },
+        dir = ConfirmBy[ ensureDirectory @ $tokenizerDirectory, DirectoryQ, "Directory" ];
+        file = FileNameJoin @ { dir, name <> ".wxf" };
+        exported = ConfirmBy[ writeWXFFile[ file, tokenizer, PerformanceGoal -> "Size" ], FileExistsQ, "Export" ];
+        ConfirmMatch[ readWXFFile[ exported ][ "Hello world" ], { __Integer }, "Verification" ];
+        name -> exported
+    ];
+
+(* ::**************************************************************************************************************:: *)
+(* ::Section::Closed:: *)
+(*Package Footer*)
+End[ ];
+EndPackage[ ];

Developer/Resources/Styles.wl

@@ -33,9 +33,9 @@ Cell[
     |>,
 
     ComponentwiseContextMenu -> <|
-        "CellBracket" -> contextMenu[ $askMenuItem, $excludeMenuItem, Delimiter, "CellBracket" ],
-        "CellGroup"   -> contextMenu[ $excludeMenuItem, Delimiter, "CellGroup" ],
-        "CellRange"   -> contextMenu[ $excludeMenuItem, Delimiter, "CellRange" ]
+        "CellBracket" -> contextMenu[ { $askMenuItem, $excludeMenuItem, Delimiter }, "CellBracket" ],
+        "CellGroup"   -> contextMenu[ { $excludeMenuItem, Delimiter }, "CellGroup" ],
+        "CellRange"   -> contextMenu[ { $excludeMenuItem, Delimiter }, "CellRange" ]
     |>,
 
     PrivateCellOptions -> {
@@ -59,7 +59,7 @@ Cell[
 
 Cell[
     StyleData[ "Text" ],
-    ContextMenu -> contextMenu[ $askMenuItem, Delimiter, "Text" ]
+    ContextMenu -> contextMenu[ { $askMenuItem, Delimiter }, "Text" ]
 ]
 
 
@@ -77,7 +77,7 @@ Cell[
         "*" -> "Item",
         ">" -> "ExternalLanguageDefault"
     },
-    ContextMenu -> contextMenu[ $askMenuItem, Delimiter, "Input" ],
+    ContextMenu -> contextMenu[ { $askMenuItem, Delimiter }, "Input" ],
     CellEpilog :> With[ { $CellContext`cell = (FinishDynamic[ ]; EvaluationCell[ ]) },
         Quiet @ Needs[ "Wolfram`Chatbook`" -> None ];
         Symbol[ "Wolfram`Chatbook`ChatbookAction" ][ "AIAutoAssist", $CellContext`cell ]
@@ -92,7 +92,7 @@ Cell[
 
 Cell[
     StyleData[ "Output" ],
-    ContextMenu -> contextMenu[ $askMenuItem, Delimiter, "Output" ],
+    ContextMenu -> contextMenu[ { $askMenuItem, Delimiter }, "Output" ],
     CellTrayWidgets -> <| "GearMenu" -> <| "Condition" -> False |> |>
 ]
 
@@ -334,7 +334,7 @@ Cell[
     TaggingRules         -> <| "ChatNotebookSettings" -> <| |> |>,
     CellTrayWidgets      -> <|
         "ChatWidget"   -> <| "Visible" -> False |>,
-        "ChatFeedback" -> <| "Content" -> Cell[ BoxData @ ToBoxes @ $feedbackButtons, "ChatFeedback" ] |>
+        "ChatFeedback" -> <| "Content" -> Cell[ BoxData @ ToBoxes @ $feedbackButtonsV, "ChatFeedback" ] |>
     |>,
     menuInitializer[ "ChatOutput", RGBColor[ "#ecf0f5" ] ]
 ]
@@ -611,7 +611,8 @@ Cell[
             BaselinePosition -> Scaled[ 0.275 ],
             FrameMargins     -> { { 3, 3 }, { 2, 2 } },
             FrameStyle       -> Directive[ AbsoluteThickness[ 1 ], GrayLevel[ 0.92941 ] ],
-            ImageMargins     -> { { 0, 0 }, { 0, 0 } }
+            ImageMargins     -> { { 0, 0 }, { 0, 0 } },
+            BaseStyle        -> { "InlineCode", AutoSpacing -> False, AutoMultiplicationSymbol -> False }
         ]
     }
 ]
@@ -1084,13 +1085,18 @@ Cell[
 Cell[
     StyleData[ "UserMessageBox" ],
     TemplateBoxOptions -> {
-        DisplayFunction -> Function @ Evaluate @ FrameBox[
-            Cell[ #, "Text", Background -> None ],
-            Background     -> RGBColor[ "#edf4fc" ],
-            FrameMargins   -> 8,
-            FrameStyle     -> RGBColor[ "#a3c9f2" ],
-            RoundingRadius -> 10,
-            StripOnInput   -> False
+        DisplayFunction -> Function @ Evaluate @ PaneBox[
+            FrameBox[
+                #,
+                BaseStyle      -> { "Text", Editable -> False, Selectable -> False },
+                Background     -> RGBColor[ "#edf4fc" ],
+                FrameMargins   -> 8,
+                FrameStyle     -> RGBColor[ "#a3c9f2" ],
+                RoundingRadius -> 10,
+                StripOnInput   -> False
+            ],
+            Alignment -> Right,
+            ImageSize -> { Full, Automatic }
         ]
     }
 ]
@@ -1103,20 +1109,38 @@ Cell[
 Cell[
     StyleData[ "AssistantMessageBox" ],
     TemplateBoxOptions -> {
-        DisplayFunction -> Function @ Evaluate @ FrameBox[
-            #,
-            BaseStyle      -> "Text",
-            Background     -> RGBColor[ "#fcfdff" ],
-            FrameMargins   -> 8,
-            FrameStyle     -> RGBColor[ "#c9ccd0" ],
-            ImageSize      -> { Scaled[ 1 ], Automatic },
-            RoundingRadius -> 10,
-            StripOnInput   -> False
+        DisplayFunction -> Function @ Evaluate @ TagBox[
+            FrameBox[
+                #,
+                BaseStyle      -> { "Text", Editable -> False, Selectable -> False },
+                Background     -> RGBColor[ "#fcfdff" ],
+                FrameMargins   -> 8,
+                FrameStyle     -> RGBColor[ "#c9ccd0" ],
+                ImageSize      -> { Scaled[ 1 ], Automatic },
+                RoundingRadius -> 10,
+                StripOnInput   -> False
+            ],
+            EventHandlerTag @ {
+                "MouseEntered" :>
+                    With[ { cell = EvaluationCell[ ] },
+                        Quiet @ Needs[ "Wolfram`Chatbook`" -> None ];
+                        Symbol[ "Wolfram`Chatbook`ChatbookAction" ][ "AttachAssistantMessageButtons", cell ]
+                    ],
+                Method         -> "Preemptive",
+                PassEventsDown -> Automatic,
+                PassEventsUp   -> True
+            }
         ]
     }
 ]
 
 
+Cell[
+    StyleData[ "FeedbackButtonsHorizontal" ],
+    TemplateBoxOptions -> { DisplayFunction -> Function @ Evaluate @ ToBoxes @ $feedbackButtonsH }
+]
+
+
 (* ::Subsection::Closed:: *)
 (*DropShadowPaneBox*)
 

Developer/Resources/WorkspaceStyles.wl

@@ -19,7 +19,6 @@ Cell[
     TaggingRules           -> <| "ChatNotebookSettings" -> $workspaceDefaultSettings |>,
     WindowClickSelect      -> True,
     WindowElements         -> { "VerticalScrollBar" },
-    WindowFrame            -> "ModelessDialog",
     WindowFrameElements    -> { "CloseBox", "ResizeArea" },
     WindowMargins          -> { { 0, Automatic }, { 0, 0 } },
     WindowSize             -> { $sideChatWidth, Automatic },
@@ -39,12 +38,12 @@ Cell[
 Cell[
     StyleData[ "ChatInput" ],
     CellDingbat           -> None,
+    CellEventActions      -> None,
     CellFrame             -> 0,
     CellFrameLabelMargins -> 6,
     CellMargins           -> { { 15, 10 }, { 5, 10 } },
-    Selectable            -> True,
+    Selectable            -> False,
     ShowCellBracket       -> False,
-    TextAlignment         -> Right,
     CellFrameLabels       -> {
         { None, None },
         {
@@ -74,9 +73,9 @@ Cell[
     Background      -> None,
     CellDingbat     -> None,
     CellFrame       -> 0,
-    CellMargins     -> { { 10, 15 }, { 15, 12 } },
+    CellMargins     -> { { 10, 15 }, { 25, 12 } },
     Initialization  -> None,
-    Selectable      -> True,
+    Selectable      -> False,
     ShowCellBracket -> False,
     CellFrameLabels -> {
         { None, None },
@@ -121,6 +120,16 @@ Cell[
     )
 ]
 
+(* ::**************************************************************************************************************:: *)
+(* ::Section::Closed:: *)
+(*CodeAssistanceWelcomeCell*)
+Cell[
+    StyleData[ "CodeAssistanceWelcomeCell" ],
+    CellMargins          -> { { 10, 10 }, { 30, 10 } },
+    ShowStringCharacters -> False,
+    TaggingRules         -> <| "ChatNotebookSettings" -> <| "ExcludeFromChat" -> True |> |>
+]
+
 (* ::**************************************************************************************************************:: *)
 (* ::Section::Closed:: *)
 (*Template Boxes*)
@@ -159,6 +168,52 @@ Cell[
     }
 ]
 
+(* ::**************************************************************************************************************:: *)
+(* ::Subsection::Closed:: *)
+(*WelcomeToCodeAssistanceSplash*)
+Cell[
+    StyleData[ "WelcomeToCodeAssistanceSplash" ],
+    TemplateBoxOptions -> {
+        DisplayFunction -> Function @ Evaluate @ ToBoxes @ Framed[
+            Pane[
+                Grid[
+                    {
+                        { Magnify[ RawBoxes @ TemplateBox[ { }, "ChatIconCodeAssistant" ], 5 ] },
+                        {
+                            Style[
+                                "Welcome to Code Assistance Chat",
+                                FontWeight -> Bold,
+                                FontSize   -> 17,
+                                FontColor  -> GrayLevel[ 0.25 ]
+                            ]
+                        },
+                        { "Ask me anything using the input field below." },
+                        {
+                            Button[
+                                "View Tutorial \[RightGuillemet]",
+                                MessageDialog[ "Not implemented yet." ],
+                                Appearance -> None,
+                                BaseStyle  -> { "Link" }
+                            ]
+                        }
+                    },
+                    BaseStyle -> { "Text", FontSize -> 13, FontColor -> GrayLevel[ 0.5 ], LineBreakWithin -> False },
+                    Spacings  -> { 1, { 0, 1.25, 1.25, 0.75 } }
+                ],
+                Alignment       -> { Center, Automatic },
+                ImageSize       -> { Scaled[ 1 ], Automatic },
+                ImageSizeAction -> "ShrinkToFit"
+            ],
+            Alignment      -> { Center, Automatic },
+            Background     -> RGBColor[ "#fcfdff" ],
+            FrameMargins   -> { { 10, 10 }, { 10, 10 } },
+            FrameStyle     -> RGBColor[ "#ecf0f5" ],
+            ImageSize      -> { Automatic, Automatic },
+            RoundingRadius -> 10
+        ]
+    }
+]
+
 (* ::**************************************************************************************************************:: *)
 (* ::Section::Closed:: *)
 (*Package Footer*)