Merge pull request #916 from WolframResearch/feature/always-use-llmki…

…t-for-na Ensure correct model/service is always used for Notebook Assistance
WolframResearch · Nov 14, 2024 · 7baa317 · 7baa317
2 parents 07fdb70 + 607038e
commit 7baa317
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/Source/Chatbook/ChatModes/ContentSuggestions.wl b/Source/Chatbook/ChatModes/ContentSuggestions.wl
@@ -10,8 +10,8 @@ Needs[ "Wolfram`Chatbook`ChatModes`Common`" ];
 (* ::**************************************************************************************************************:: *)
 (* ::Section::Closed:: *)
 (*Configuration*)
-$suggestionsService             := If[ TrueQ @ $llmKit && StringQ @ $llmKitService, $llmKitService, "OpenAI" ];
-$suggestionsAuthentication      := If[ TrueQ @ $llmKit, "LLMKit", Automatic ];
+$suggestionsService             := $llmKitService;
+$suggestionsAuthentication      := "LLMKit";
 $stripWhitespace                 = True;
 $defaultWLContextString          = "";
 $finishReason                    = None;

diff --git a/Source/Chatbook/ChatModes/ShowNotebookAssistance.wl b/Source/Chatbook/ChatModes/ShowNotebookAssistance.wl
@@ -15,6 +15,7 @@ $workspaceChatWidth := $workspaceChatWidth = Switch[ $OperatingSystem, "MacOSX",
 $notebookAssistanceBaseSettings = <|
     "AppName"           -> "NotebookAssistance",
     "LLMEvaluator"      -> "NotebookAssistant",
+    "Model"             -> <| "Service" -> "LLMKit", "Name" -> Automatic |>,
     "PromptGenerators"  -> { "RelatedDocumentation" },
     "ServiceCaller"     -> "NotebookAssistance",
     "ToolOptions"       -> <| "WolframLanguageEvaluator" -> <| "AppendURIPrompt" -> True, "Method" -> "Session" |> |>,

diff --git a/Source/Chatbook/Services.wl b/Source/Chatbook/Services.wl
@@ -16,6 +16,7 @@ $ContextAliases[ "llm`" ] = "LLMServices`";
 (*Configuration*)
 $llmKit               := $llmKit = $VersionNumber >= 14.1;
 $llmKitService        := LogChatTiming @ getLLMKitService[ ];
+$fallbackLLMKitService = "AzureOpenAI";
 $allowConnectionDialog = True;
 $enableLLMServices     = Automatic;
 $modelListCache        = <| |>;
@@ -57,7 +58,7 @@ getLLMKitService // beginDefinition;
 getLLMKitService[ ] := (LLMSynthesize; getLLMKitService @ Wolfram`LLMFunctions`Common`$LLMKitInfo);
 getLLMKitService[ KeyValuePattern[ "currentProvider" -> service_String ] ] := service;
 getLLMKitService[ None ] := getUpdatedLLMKitService[ ];
-getLLMKitService[ _ ] := None;
+getLLMKitService[ _ ] := $fallbackLLMKitService;
 getLLMKitService // endDefinition;
 
 (* ::**************************************************************************************************************:: *)