From c1ae6e53190f57d7fb659d305675909235870292 Mon Sep 17 00:00:00 2001 From: Ian Arawjo Date: Mon, 23 Oct 2023 16:43:21 -0400 Subject: [PATCH] Escape braces in join node output --- chainforge/react-server/build/asset-manifest.json | 6 +++--- chainforge/react-server/build/index.html | 2 +- chainforge/react-server/src/JoinNode.js | 13 ++++++++----- setup.py | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/chainforge/react-server/build/asset-manifest.json b/chainforge/react-server/build/asset-manifest.json index 9385821..07d464f 100644 --- a/chainforge/react-server/build/asset-manifest.json +++ b/chainforge/react-server/build/asset-manifest.json @@ -1,15 +1,15 @@ { "files": { "main.css": "/static/css/main.60127273.css", - "main.js": "/static/js/main.46935eb5.js", + "main.js": "/static/js/main.56cc0d38.js", "static/js/787.4c72bb55.chunk.js": "/static/js/787.4c72bb55.chunk.js", "index.html": "/index.html", "main.60127273.css.map": "/static/css/main.60127273.css.map", - "main.46935eb5.js.map": "/static/js/main.46935eb5.js.map", + "main.56cc0d38.js.map": "/static/js/main.56cc0d38.js.map", "787.4c72bb55.chunk.js.map": "/static/js/787.4c72bb55.chunk.js.map" }, "entrypoints": [ "static/css/main.60127273.css", - "static/js/main.46935eb5.js" + "static/js/main.56cc0d38.js" ] } \ No newline at end of file diff --git a/chainforge/react-server/build/index.html b/chainforge/react-server/build/index.html index 010839c..67f88fb 100644 --- a/chainforge/react-server/build/index.html +++ b/chainforge/react-server/build/index.html @@ -1 +1 @@ -ChainForge
\ No newline at end of file +ChainForge
\ No newline at end of file diff --git a/chainforge/react-server/src/JoinNode.js b/chainforge/react-server/src/JoinNode.js index 676f827..ad55d37 100644 --- a/chainforge/react-server/src/JoinNode.js +++ b/chainforge/react-server/src/JoinNode.js @@ -6,6 +6,7 @@ import fetch_from_backend from './fetch_from_backend'; import { IconArrowMerge, IconList } from '@tabler/icons-react'; import { Divider, NativeSelect, Text, Popover, Tooltip, Center, Modal, Box } from '@mantine/core'; import { useDisclosure } from '@mantine/hooks'; +import { escapeBraces } from './backend/template'; const formattingOptions = [ {value: "\n\n", label:"double newline \\n\\n"}, @@ -16,17 +17,19 @@ const formattingOptions = [ ]; const joinTexts = (texts, formatting) => { + const escaped_texts = texts.map(t => escapeBraces(t)); + if (formatting === "\n\n" || formatting === "\n") - return texts.join(formatting); + return escaped_texts.join(formatting); else if (formatting === "-") - return texts.map((t) => ('- ' + t)).join("\n"); + return escaped_texts.map((t) => ('- ' + t)).join("\n"); else if (formatting === "1.") - return texts.map((t, i) => (`${i+1}. ${t}`)).join("\n"); + return escaped_texts.map((t, i) => (`${i+1}. ${t}`)).join("\n"); else if (formatting === '[]') - return JSON.stringify(texts); + return JSON.stringify(escaped_texts); console.error(`Could not join: Unknown formatting option: ${formatting}`); - return texts; + return escaped_texts; }; const getVarsAndMetavars = (input_data) => { diff --git a/setup.py b/setup.py index 41c8a95..18fe0db 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ def readme(): setup( name='chainforge', - version='0.2.6.4', + version='0.2.6.5', packages=find_packages(), author="Ian Arawjo", description="A Visual Programming Environment for Prompt Engineering",