Merge branch 'main' into feature/Prompt-Chaining

packages/ui/src/utils/genericHelper.js

@@ -285,3 +285,20 @@ export const getAvailableNodesForVariable = (nodes, edges, target, targetHandle)
     }
     return parentNodes
 }
+
+export const rearrangeToolsOrdering = (newValues, sourceNodeId) => {
+    // RequestsGet and RequestsPost have to be in order before other tools
+    newValues.push(`{{${sourceNodeId}.data.instance}}`)
+
+    const sortKey = (item) => {
+        if (item.includes('requestsGet')) {
+            return 0
+        } else if (item.includes('requestsPost')) {
+            return 1
+        } else {
+            return 2
+        }
+    }
+
+    newValues.sort((a, b) => sortKey(a) - sortKey(b))
+}

packages/ui/src/views/canvas/index.js

@@ -38,7 +38,7 @@ import useConfirm from 'hooks/useConfirm'
 import { IconX } from '@tabler/icons'
 
 // utils
-import { getUniqueNodeId, initNode, getEdgeLabelName } from 'utils/genericHelper'
+import { getUniqueNodeId, initNode, getEdgeLabelName, rearrangeToolsOrdering } from 'utils/genericHelper'
 import useNotifier from 'utils/useNotifier'
 
 const nodeTypes = { customNode: CanvasNode }
@@ -112,7 +112,11 @@ const Canvas = () => {
 
                     if (inputAnchor && inputAnchor.list) {
                         const newValues = node.data.inputs[targetInput] || []
-                        newValues.push(`{{${sourceNodeId}.data.instance}}`)
+                        if (targetInput === 'tools') {
+                            rearrangeToolsOrdering(newValues, sourceNodeId)
+                        } else {
+                            newValues.push(`{{${sourceNodeId}.data.instance}}`)
+                        }
                         value = newValues
                     } else if (inputParam && inputParam.acceptVariable) {
                         value = node.data.inputs[targetInput] || ''