Merge pull request #452 from WolframResearch/bugfix/disable-tools-for…

…-palm Disable tools for PaLM by default
WolframResearch · Nov 13, 2023 · 1b5e117 · 1b5e117
2 parents 3f256c6 + 5c84c89
commit 1b5e117
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/Source/Chatbook/SendChat.wl b/Source/Chatbook/SendChat.wl
@@ -1299,15 +1299,15 @@ autoMaxContextTokens // endDefinition;
 
 autoMaxContextTokens0 // beginDefinition;
 autoMaxContextTokens0[ name_String ] := autoMaxContextTokens0 @ StringSplit[ name, "-"|Whitespace ];
-autoMaxContextTokens0[ { ___, "gpt", "4", "vision", ___ } ] := 2^17;
-autoMaxContextTokens0[ { ___, "gpt", "4", "turbo" , ___ } ] := 2^17;
-autoMaxContextTokens0[ { ___, "claude", "2"       , ___ } ] := 10^5;
-autoMaxContextTokens0[ { ___, "16k"               , ___ } ] := 2^14;
-autoMaxContextTokens0[ { ___, "32k"               , ___ } ] := 2^15;
-autoMaxContextTokens0[ { ___, "gpt", "4"          , ___ } ] := 2^13;
-autoMaxContextTokens0[ { ___, "gpt", "3.5"        , ___ } ] := 2^12;
+autoMaxContextTokens0[ { ___, "gpt", "4", "vision"  , ___ } ] := 2^17;
+autoMaxContextTokens0[ { ___, "gpt", "4", "turbo"   , ___ } ] := 2^17;
+autoMaxContextTokens0[ { ___, "claude", "2"         , ___ } ] := 10^5;
+autoMaxContextTokens0[ { ___, "16k"                 , ___ } ] := 2^14;
+autoMaxContextTokens0[ { ___, "32k"                 , ___ } ] := 2^15;
+autoMaxContextTokens0[ { ___, "gpt", "4"            , ___ } ] := 2^13;
+autoMaxContextTokens0[ { ___, "gpt", "3.5"          , ___ } ] := 2^12;
 autoMaxContextTokens0[ { ___, "chat", "bison", "001", ___ } ] := 20000;
-autoMaxContextTokens0[ _List                              ] := 2^12;
+autoMaxContextTokens0[ _List                                ] := 2^12;
 autoMaxContextTokens0 // endDefinition;
 
 (* ::**************************************************************************************************************:: *)
@@ -1388,7 +1388,8 @@ getNamedLLMEvaluator // endDefinition;
 (*FIXME: move to Tools.wl *)
 toolsEnabledQ[ KeyValuePattern[ "ToolsEnabled" -> enabled: True|False ] ] := enabled;
 toolsEnabledQ[ KeyValuePattern[ "Model" -> model_ ] ] := toolsEnabledQ @ toModelName @ model;
-toolsEnabledQ[ model_String ] := ! TrueQ @ StringStartsQ[ model, "gpt-3", IgnoreCase -> True ];
+toolsEnabledQ[ "chat-bison-001" ] := False;
+toolsEnabledQ[ model_String ] := ! TrueQ @ StringContainsQ[ model, "gpt-3", IgnoreCase -> True ];
 toolsEnabledQ[ ___ ] := False;
 
 (* ::**************************************************************************************************************:: *)

diff --git a/Source/Chatbook/ToolManager.wl b/Source/Chatbook/ToolManager.wl
@@ -575,7 +575,7 @@ toolModelWarning[ scope_, True ] := "";
 toolModelWarning[ scope_, False ] := $toolsDisabledWarning;
 toolModelWarning[ scope_, enabled_ ] := toolModelWarning[ scope, enabled, currentChatSettings[ scope, "Model" ] ];
 toolModelWarning[ scope_, enabled_, model_? toolsEnabledQ ] := "";
-toolModelWarning[ scope_, enabled_, model_String ] := toolModelWarning0[ scope, model ];
+toolModelWarning[ scope_, enabled_, model_ ] := toolModelWarning0[ scope, model ];
 toolModelWarning // endDefinition;
 
 
@@ -598,6 +598,11 @@ toolModelWarning0[ scope_, model_String ] := Enclose[
     throwInternalFailure[ toolModelWarning0[ scope, model ], ## ] &
 ];
 
+toolModelWarning0[ scope_, model: Except[ _String ] ] :=
+    With[ { name = toModelName @ model },
+        toolModelWarning0[ scope, name ] /; StringQ @ name
+    ];
+
 toolModelWarning0 // endDefinition;
 
 (* ::**************************************************************************************************************:: *)