From 061f467e8205b928dafba73399418ef28aa32617 Mon Sep 17 00:00:00 2001
From: Ian Arawjo <fatso784@gmail.com>
Date: Mon, 16 Oct 2023 21:59:31 -0400
Subject: [PATCH] more wip

---
 chainforge/react-server/src/JoinNode.js       | 19 ++++++++++++-------
 .../react-server/src/LLMResponseInspector.js  |  2 +-
 chainforge/react-server/src/PromptNode.js     |  2 +-
 .../react-server/src/text-fields-node.css     |  2 +-
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/chainforge/react-server/src/JoinNode.js b/chainforge/react-server/src/JoinNode.js
index 5cabdac..ebcd86f 100644
--- a/chainforge/react-server/src/JoinNode.js
+++ b/chainforge/react-server/src/JoinNode.js
@@ -171,17 +171,18 @@ const JoinNode = ({ data, id }) => {
 
     // Refresh the dropdown list with available vars/metavars:
     setGroupByVars([DEFAULT_GROUPBY_VAR_ALL].concat(
-      vars.map(varname => ({label: `within ${varname}`, value: `V${varname}`})))
+      vars.map(varname => ({label: `by ${varname}`, value: `V${varname}`})))
     .concat(
-      metavars.filter(varname => !varname.startsWith('LLM_')).map(varname => ({label: `within ${varname} (meta)`, value: `M${varname}`})))
+      metavars.filter(varname => !varname.startsWith('LLM_')).map(varname => ({label: `by ${varname} (meta)`, value: `M${varname}`})))
     );
 
     const joinByVars = (input) => {
       const varname = groupByVar.substring(1);
+      const isMetavar = groupByVar[0] === 'M';
       const [groupedResps, unspecGroup] = groupResponsesBy(input, 
-        (groupByVar[0] === 'V') ? 
-          (r) => (r.fill_history ? r.fill_history[varname] : undefined) : 
-          (r) => (r.metavars ? r.metavars[varname] : undefined)
+        isMetavar ? 
+          (r) => (r.metavars ? r.metavars[varname] : undefined) :
+          (r) => (r.fill_history ? r.fill_history[varname] : undefined)
       );
       console.log(groupedResps);
 
@@ -195,7 +196,8 @@ const JoinNode = ({ data, id }) => {
           vars[varname] = var_val;
         return {
           text: joinTexts(resp_objs.map(r => r.text !== undefined ? r.text : r), formatting),
-          fill_history: vars,
+          fill_history: isMetavar ? {} : vars,
+          metavars: isMetavar ? vars : {},
           llm: llm,
           // NOTE: We lose all other metadata here, because we could've joined across other vars or metavars values.
         };
@@ -207,6 +209,7 @@ const JoinNode = ({ data, id }) => {
         joined_texts.push({
           text: joinTexts(unspecGroup.map(u => u.text !== undefined ? u.text : u), formatting),
           fill_history: {},
+          metavars: {},
           llm: llm,
         });
       }
@@ -228,6 +231,7 @@ const JoinNode = ({ data, id }) => {
         joined_texts.push(joinTexts(nonLLMRespGroup, formatting));
 
       setJoinedTexts(joined_texts);
+      setDataPropsForNode(id, { fields: joined_texts });
       console.log(joined_texts);
     } else {
       // Join across LLMs (join irrespective of LLM):
@@ -235,6 +239,7 @@ const JoinNode = ({ data, id }) => {
         // If groupByVar is set to non-ALL (not "A"), then we need to group responses by that variable first: 
         const joined_texts = joinByVars(input_data.__input);
         setJoinedTexts(joined_texts);
+        setDataPropsForNode(id, { fields: joined_texts });
       } else {
         // Since templates could be chained, we need to run this 
         // through the prompt generator: 
@@ -252,12 +257,12 @@ const JoinNode = ({ data, id }) => {
             joined_texts = {text: joined_texts, fill_history: {}, llm: input_data.__input[0].llm};
 
           setJoinedTexts([joined_texts]);
+          setDataPropsForNode(id, { fields: [joined_texts] });
           console.log(joined_texts);
         });
       }
     }
 
-
   }, [formatting, pullInputData, groupByVar, groupByLLM]);
 
   if (data.input) {
diff --git a/chainforge/react-server/src/LLMResponseInspector.js b/chainforge/react-server/src/LLMResponseInspector.js
index 97570d6..797d44f 100644
--- a/chainforge/react-server/src/LLMResponseInspector.js
+++ b/chainforge/react-server/src/LLMResponseInspector.js
@@ -475,7 +475,7 @@ const LLMResponseInspector = ({ jsonResponses, wideFormat }) => {
                     value={multiSelectValue}
                     clearSearchOnChange={true}
                     clearSearchOnBlur={true}
-                    w='80%' />
+                    w={wideFormat ? '80%' : '100%'} />
         <Checkbox checked={onlyShowScores} 
                   label="Only show scores" 
                   onChange={(e) => setOnlyShowScores(e.currentTarget.checked)}
diff --git a/chainforge/react-server/src/PromptNode.js b/chainforge/react-server/src/PromptNode.js
index 7e3be9f..592f73c 100644
--- a/chainforge/react-server/src/PromptNode.js
+++ b/chainforge/react-server/src/PromptNode.js
@@ -425,7 +425,7 @@ const PromptNode = ({ data, id, type: node_type }) => {
     const rejected = (err) => {
         setStatus('error');
         setContChatToggleDisabled(false);
-        triggerAlert(err.message);
+        triggerAlert(err.message || err);
     };
 
     // Fetch info about the number of queries we'll need to make 
diff --git a/chainforge/react-server/src/text-fields-node.css b/chainforge/react-server/src/text-fields-node.css
index c061888..1bc300f 100644
--- a/chainforge/react-server/src/text-fields-node.css
+++ b/chainforge/react-server/src/text-fields-node.css
@@ -659,7 +659,7 @@
   .text-field-fixed .mantine-Textarea-wrapper textarea {
     resize: vertical;
     overflow-y: auto;
-    width: 280px;
+    width: 230px;
     padding: calc(0.5rem / 3);
     font-size: 10pt;
     font-family: monospace;