@flowfuse/nr-assistant 0.4.1-878c0e5-202508111007.0 → 0.5.1-78995c8-202508280848.0

package/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 0.5.0
+ - Bump actions/checkout from 4.2.2 to 5.0.0 (#69)
+ - Bump flowfuse/github-actions-workflows from 0.40.0 to 0.42.0 (#68)
+ - Add tables codelens feature (#72) @Steve-Mcl
+
 ### 0.4.0
  - update package for 0.4.0 release
  - Bump flowfuse/github-actions-workflows from 0.39.0 to 0.40.0 (#60)

package/index.html

@@ -24,6 +24,7 @@
         const modulesAllowed = RED.settings.functionExternalModules !== false
         const assistantOptions = {
             enabled: false,
+            tablesEnabled: false,
             requestTimeout: AI_TIMEOUT
         }
         let assistantInitialised = false
@@ -42,6 +43,7 @@
                     if (topic === 'nr-assistant/initialise') {
                         assistantOptions.enabled = !!msg?.enabled
                         assistantOptions.requestTimeout = msg?.requestTimeout || AI_TIMEOUT
+                        assistantOptions.tablesEnabled = msg?.tablesEnabled === true
                         initAssistant(msg)
                         RED.actions.add('flowfuse-nr-assistant:function-builder', showFunctionBuilderPrompt, { label: '@flowfuse/nr-assistant/flowfuse-nr-assistant:function-builder.action.label' })
                         setMenuShortcutKey('ff-assistant-function-builder', 'red-ui-workspace', 'ctrl-alt-f', 'flowfuse-nr-assistant:function-builder')
@@ -69,7 +71,7 @@
         }
         RED.plugins.registerPlugin('flowfuse-nr-assistant', plugin)
 
-        function initAssistant () {
+        function initAssistant (options) {
             if (assistantInitialised) {
                 return
             }
@@ -88,6 +90,7 @@
             const jsonCommandId = 'nr-assistant-json-inline'
             const cssCommandId = 'nr-assistant-css-inline'
             const db2uiTemplateCommandId = 'nr-assistant-html-dashboard2-template-inline'
+            const ffTablesNodeCommandId = 'nr-assistant-ff-tables-node-inline'
 
             debug('registering code lens providers...')
 
@@ -264,6 +267,48 @@
                 }
             })
 
+            assistantOptions.tablesEnabled && monaco.languages.registerCodeLensProvider('sql', {
+                provideCodeLenses: function (model, token) {
+                    debug('SQL CodeLens provider called', model, token)
+                    const thisEditor = getMonacoEditorForModel(model)
+                    if (!thisEditor) {
+                        return
+                    }
+                    const node = RED.view.selection()?.nodes?.[0]
+                    // only support tables query nodes for now
+                    if (!node || node.type !== 'tables-query' || node._def?.set?.id !== '@flowfuse/nr-tables-nodes/tables-query') {
+                        return
+                    }
+                    return {
+                        lenses: [
+                            {
+                                range: {
+                                    startLineNumber: 1,
+                                    startColumn: 1,
+                                    endLineNumber: 2,
+                                    endColumn: 1
+                                },
+                                id: ffTablesNodeCommandId
+                            }
+                        ],
+                        dispose: () => { }
+                    }
+                },
+                resolveCodeLens: function (model, codeLens, token) {
+                    debug('SQL CodeLens resolve called', model, codeLens, token)
+                    if (codeLens.id !== ffTablesNodeCommandId) {
+                        return codeLens
+                    }
+                    codeLens.command = {
+                        id: codeLens.id,
+                        title: 'Ask the FlowFuse Assistant 🪄',
+                        tooltip: 'Click to ask FlowFuse Assistant for help with PostgreSQL',
+                        arguments: [model, codeLens, token]
+                    }
+                    return codeLens
+                }
+            })
+
             debug('registering commands...')
 
             monaco.editor.registerCommand(funcCommandId, function (accessor, model, codeLens, token) {
@@ -581,6 +626,69 @@
                 }
             })
 
+            assistantOptions.tablesEnabled && monaco.editor.registerCommand(ffTablesNodeCommandId, function (accessor, model, codeLens, token) {
+                debug('running command', ffTablesNodeCommandId)
+                const node = RED.view.selection()?.nodes?.[0]
+                if (!node) {
+                    console.warn('No node selected') // should not happen
+                    return
+                }
+                if (!assistantOptions.enabled) {
+                    RED.notify(plugin._('errors.assistant-not-enabled'), 'warning')
+                    return
+                }
+                const thisEditor = getMonacoEditorForModel(model)
+                if (thisEditor) {
+                    if (!document.body.contains(thisEditor.getDomNode())) {
+                        console.warn('Editor is no longer in the DOM, cannot proceed.')
+                        return
+                    }
+
+                    // FUTURE: for including selected text in the context for features like "fix my code", "refactor this", "what is this?" etc
+                    // const userSelection = triggeredEditor.getSelection()
+                    // const selectedText = model.getValueInRange(userSelection)
+                    /** @type {PromptOptions} */
+                    const promptOptions = {
+                        method: 'flowfuse-tables-query',
+                        lang: 'sql',
+                        dialect: 'g',
+                        type: node.type
+                        // selectedText: model.getValueInRange(userSelection)
+                    }
+                    /** @type {PromptUIOptions} */
+                    const uiOptions = {
+                        title: 'FlowFuse Assistant : FlowFuse Query',
+                        explanation: 'The FlowFuse Assistant can help you write SQL queries.',
+                        description: 'Enter a short description of what you want it to do.'
+                    }
+                    doPrompt(node, thisEditor, promptOptions, uiOptions, (error, response) => {
+                        if (error) {
+                            console.warn('Error processing request', error)
+                            return
+                        }
+                        debug('sql response', response)
+                        const responseData = response?.data
+                        if (responseData && responseData.sql) {
+                            // ensure the editor is still present in the DOM
+                            if (!document.body.contains(thisEditor.getDomNode())) {
+                                console.warn('Editor is no longer in the DOM')
+                                return
+                            }
+                            thisEditor.focus()
+                            const currentSelection = thisEditor.getSelection()
+                            thisEditor.executeEdits('', [
+                                {
+                                    range: new monaco.Range(currentSelection.startLineNumber, currentSelection.startColumn, currentSelection.endLineNumber, currentSelection.endColumn),
+                                    text: responseData.sql
+                                }
+                            ])
+                        }
+                    })
+                } else {
+                    console.warn('Could not find editor for model', model.uri.toString())
+                }
+            })
+
             const toolbarMenuButton = $('<li><a id="red-ui-header-button-ff-ai" class="button" href="#"></a></li>')
             const toolbarMenuButtonAnchor = toolbarMenuButton.find('a')
             const deployButtonLi = $('#red-ui-header-button-deploy').closest('li')

package/lib/assistant.js

@@ -6,20 +6,12 @@ const { getLongestUpstreamPath } = require('./flowGraph')
 const { hasProperty } = require('./utils')
 const semver = require('semver')
 
-const FF_ASSISTANT_USER_AGENT = 'FlowFuse Assistant Plugin/' + require('../package.json').version
-
+// import typedef AssistantSettings
 /**
- * @typedef {Object} AssistantSettings
- * @property {boolean} enabled - Whether the Assistant is enabled
- * @property {number} requestTimeout - The timeout for requests to the Assistant backend in milliseconds
- * @property {string} url - The URL of the Assistant server
- * @property {string} token - The authentication token for the Assistant server
- * @property {Object} [got] - The got instance to use for HTTP requests
- * @property {Object} completions - Settings for completions
- * @property {string} completions.modelUrl - The URL to the ML model
- * @property {string} completions.vocabularyUrl - The URL to the completions vocabulary lookup data
+ * @typedef {import('./settings.js').AssistantSettings} AssistantSettings
  */
 
+const FF_ASSISTANT_USER_AGENT = 'FlowFuse Assistant Plugin/' + require('../package.json').version
 class Assistant {
     constructor () {
         // Main properties
@@ -70,7 +62,7 @@ class Assistant {
             await this.dispose() // Dispose of any existing instance before initializing a new one
             this.RED = RED
             this.options = options || {}
-            this.got = this.options.got || require('got') // got can me passed in for testing purposes
+            this.got = this.options.got || require('got') // got can be passed in for testing purposes
 
             if (!this.options.enabled) {
                 RED.log.info('FlowFuse Assistant Plugin is not enabled')
@@ -88,6 +80,7 @@ class Assistant {
 
             const clientSettings = {
                 enabled: this.options.enabled !== false && !!this.options.url,
+                tablesEnabled: this.options.tables?.enabled === true,
                 requestTimeout: this.options.requestTimeout || 60000
             }
             RED.comms.publish('nr-assistant/initialise', clientSettings, true /* retain */)

package/lib/settings.js

@@ -1,4 +1,23 @@
+/**
+ * @typedef {Object} AssistantSettings
+ * @property {boolean} enabled - Whether the Assistant is enabled
+ * @property {number} requestTimeout - The timeout for requests to the Assistant backend in milliseconds
+ * @property {string} url - The URL of the Assistant server
+ * @property {string} token - The authentication token for the Assistant server
+ * @property {Object} [got] - The got instance to use for HTTP requests
+ * @property {Object} completions - Settings for completions
+ * @property {string} completions.modelUrl - The URL to the ML model
+ * @property {string} completions.vocabularyUrl - The URL to the completions vocabulary lookup data
+ * @property {Object} tables - Settings for tables
+ * @property {Boolean} tables.enabled - Whether the tables feature is enabled
+ */
+
 module.exports = {
+    /**
+     * Get the Assistant settings from the RED instance.
+     * @param {Object} RED - The RED instance
+     * @returns {AssistantSettings} - The Assistant settings
+     */
     getSettings: (RED) => {
         const assistantSettings = (RED.settings.flowforge && RED.settings.flowforge.assistant) || {}
         if (assistantSettings.enabled !== true) {
@@ -13,6 +32,9 @@ module.exports = {
             modelUrl: null,
             vocabularyUrl: null
         }
+        assistantSettings.tables = {
+            enabled: !!(RED.settings.flowforge?.tables?.token) // for MVP, use the presence of a token is an indicator that tables are enabled
+        }
         return assistantSettings
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@flowfuse/nr-assistant",
-    "version": "0.4.1-878c0e5-202508111007.0",
+    "version": "0.5.1-78995c8-202508280848.0",
     "description": "FlowFuse Node-RED assistant plugin",
     "main": "index.js",
     "scripts": {