Merge pull request #1298 from WolframResearch/feature/prompt-improvements

Minor context improvements

Author: rhennigan

Source/Chatbook/PromptGenerators/RelatedWolframAlphaResults.wl

@@ -1048,8 +1048,10 @@ formatNaturalLanguageInput // endDefinition;
 (*makeInterpretationCode*)
 makeInterpretationCode // beginDefinition;
 
-makeInterpretationCode[ query0_String, code_String ] := Enclose[
-    Module[ { query, input },
+makeInterpretationCode[ query0_String, code0_String ] := Enclose[
+    Module[ { code, query, input },
+
+        code = ConfirmBy[ rewriteEntityValueCode @ code0, StringQ, "Code" ];
 
         query = StringRiffle @ DeleteCases[ StringTrim @ StringSplit[ query0, { "\\|", "\n" } ], "" ];
 
@@ -1079,6 +1081,35 @@ In[1]:= %%Input%%
 During evaluation of In[1]:= [INFO] Interpreted \"%%Query%%\" as: %%Code%%
 ```", Delimiters -> "%%" ];
 
+(* ::**************************************************************************************************************:: *)
+(* ::Subsubsection::Closed:: *)
+(*rewriteEntityValueCode*)
+rewriteEntityValueCode // beginDefinition;
+
+rewriteEntityValueCode[ code_String ] :=
+    If[ StringContainsQ[ code, "Entity[" ],
+        rewriteEntityValueCode[ code, Quiet @ ToExpression[ code, InputForm, HoldComplete ] ],
+        code
+    ];
+
+rewriteEntityValueCode[ code_, held_HoldComplete ] := Enclose[
+    Catch @ Module[ { replaced },
+        replaced = held /. HoldPattern[ (e_Entity)[ p: _EntityProperty | _String ] ] :> EntityValue[ e, p ];
+        If[ replaced === held, Throw @ code ];
+        ConfirmBy[
+            Replace[ replaced, HoldComplete[ e_ ] :> ToString[ Unevaluated @ e, InputForm ] ],
+            StringQ,
+            "Result"
+        ]
+    ],
+    throwInternalFailure
+];
+
+rewriteEntityValueCode[ code_, _ ] :=
+    code;
+
+rewriteEntityValueCode // endDefinition;
+
 (* ::**************************************************************************************************************:: *)
 (* ::Subsubsection::Closed:: *)
 (*inputInterpretation*)

Source/Chatbook/PromptGenerators/VectorDatabases.wl

@@ -71,6 +71,19 @@ EntityValue[\[FreeformPrompt][\"entity or entity group name(s)\", \"entity type\
 {\"property canonical name\", ...}, \"Association\"]
 ```
 
+The full set of valid values for the third argument of `EntityValue` are:
+
+| Value | Description |
+| ----- | --- |
+| \"EntityAssociation\" | an association of entities and entity-property values |
+| \"PropertyAssociation\" | an association of properties and entity-property values |
+| \"EntityPropertyAssociation\" | an association in which the specified entities are keys, and values are a nested association of properties and entity-property values |
+| \"PropertyEntityAssociation\" | an association in which the specified properties are keys, and values are a nested association of entities and entity-property values |
+| \"Dataset\" | a dataset in which the specified entities are keys, and values are an association of property names and entity-property values |
+| \"Association\" | a nested association with entity keys on the first level and property keys on the second level |
+| \"NonMissingPropertyAssociation\" | an association of properties and entity-property values with the missing values dropped |
+| \"NonMissingEntityAssociation\" | an association of entities and entity-property values with the missing values dropped |
+
 # Filtering entities by property values
 
 If an `EntityProperty` can be used to perform an `EntityClass` lookup, use this syntax with specified patterns for \

Source/Chatbook/Prompting.wl

@@ -122,10 +122,18 @@ $basePromptDependencies = Append[ "GeneralInstructionsHeader" ] /@ <|
 (*Base Prompt Components*)
 $basePromptComponents = <| |>;
 
-$basePromptComponents[ "AgentOnePersona" ] = "\
-You are a helpful assistant named \"Wolfram Agent One\" that utilizes Wolfram Language and Wolfram|Alpha to help the user.
+$basePromptComponents[ "AgentOnePersona" ] :=
+If[ TrueQ @ toolSelectedQ[ "WolframLanguageEvaluator" ],
+"You are a helpful assistant named \"Wolfram Agent One\" that utilizes Wolfram Language and Wolfram|Alpha to help the user.
 Assume the user does not have access to Wolfram Language unless it's clear from the context that they do.
-You specialize in Wolfram Language and Wolfram|Alpha, but you can help with any topic.";
+This means that you should evaluate code for them using the wolfram_language_evaluator tool instead of just writing code for them.
+ALWAYS use `\[FreeformPrompt][\"query\"]` syntax to obtain Entity, EntityClass, Quantity, etc.
+You specialize in Wolfram Language and Wolfram|Alpha, but you can help with any topic."
+,
+"You are a helpful assistant named \"Wolfram Agent One\" that utilizes Wolfram Language and Wolfram|Alpha to help the user.
+Assume the user does not have access to Wolfram Language unless it's clear from the context that they do.
+You specialize in Wolfram Language and Wolfram|Alpha, but you can help with any topic."
+];
 
 $basePromptComponents[ "AgentOneCoderPersona" ] = "\
 You are a helpful assistant named \"Wolfram Agent One Coder\" that utilizes Wolfram Language to help the user.