Skip to content

Commit

Permalink
Merge pull request #594 from WolframResearch/main
Browse files Browse the repository at this point in the history
Release v1.4.3
  • Loading branch information
rhennigan authored Feb 8, 2024
2 parents 6cd862a + 37e298d commit 4abdb41
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 11 deletions.
2 changes: 1 addition & 1 deletion PacletInfo.wl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PacletObject[ <|
"Name" -> "Wolfram/Chatbook",
"PublisherID" -> "Wolfram",
"Version" -> "1.4.2",
"Version" -> "1.4.3",
"WolframVersion" -> "13.3+",
"Description" -> "Wolfram Notebooks + LLMs",
"License" -> "MIT",
Expand Down
13 changes: 4 additions & 9 deletions Source/Chatbook/Settings.wl
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,14 @@ CurrentChatSettings[\"key$\"] is equivalent to CurrentChatSettings[EvaluationCel
" ];

CurrentChatSettings[ ] := catchMine @
If[ TrueQ @ $Notebooks,
CurrentChatSettings @ $currentEvaluationObject,
If[ TrueQ[ $Notebooks || $CloudEvaluation ],
CurrentChatSettings @ $FrontEnd,
$defaultChatSettings
];

CurrentChatSettings[ key_String ] := catchMine @
If[ TrueQ @ $Notebooks,
CurrentChatSettings[ $currentEvaluationObject, key ],
If[ TrueQ[ $Notebooks || $CloudEvaluation ],
CurrentChatSettings[ $FrontEnd, key ],
Lookup[ $defaultChatSettings, key, Inherited ]
];

Expand Down Expand Up @@ -646,11 +646,6 @@ getPrecedingDelimiter[ cell_CellObject, nbo_, { before0___CellObject, cell_, ___

getPrecedingDelimiter // endDefinition;

(* ::**************************************************************************************************************:: *)
(* ::Subsection::Closed:: *)
(*$currentEvaluationObject*)
$currentEvaluationObject := $FrontEndSession;

(* ::**************************************************************************************************************:: *)
(* ::Subsection::Closed:: *)
(*verifyInheritance*)
Expand Down
15 changes: 14 additions & 1 deletion Tests/CurrentChatSettings.wlt
Original file line number Diff line number Diff line change
Expand Up @@ -129,5 +129,18 @@ VerificationTest[
],
Except[ _? FailureQ ],
SameTest -> MatchQ,
TestID -> "CurrentChatSettings-Regression@@Tests/CurrentChatSettings.wlt:119,1-133,2"
TestID -> "CurrentChatSettings-Regression#426@@Tests/CurrentChatSettings.wlt:119,1-133,2"
]

(* ::**************************************************************************************************************:: *)
(* ::Subsection::Closed:: *)
(*#592*)
VerificationTest[
If[ StringQ @ Environment[ "GITHUB_ACTIONS" ],
Missing[ "TestSkipped" ],
CloudEvaluate[ CurrentChatSettings[ "Model" ] ]
],
Except[ _? FailureQ ],
SameTest -> MatchQ,
TestID -> "CurrentChatSettings-Regression#592@@Tests/CurrentChatSettings.wlt:138,1-146,2"
]

0 comments on commit 4abdb41

Please sign in to comment.