node-red-contrib-ollama 0.2.6 → 0.3.0

package/nodes/ollama-generate.html

@@ -6,7 +6,22 @@
             name: { value: 'Ollama Generate' },
             server: { value: '', type: 'ollama-config-server', required: false },
             format: { value: '', type: 'ollama-config-format', required: false },
-            model: { value: '', type: 'ollama-config-model', required: false },
+            model: { value: '', required: false },
+            modelType: { value: 'str', required: false },
+            prompt: { value: '', required: true },
+            promptType: { value: 'str', required: false },
+            suffix: { value: '', required: false },
+            suffixType: { value: 'str', required: false },
+            system: { value: '', required: false },
+            systemType: { value: 'str', required: false },
+            template: { value: '', required: false },
+            templateType: { value: 'str', required: false },
+            raw: { value: false },
+            images: { value: '', required: false },
+            imagesType: { value: 'json', required: false },
+            stream: { value: false },
+            keepAlive: { value: '5m', required: false },
+            keepAliveType: { value: 'str', required: false },
             options: { value: '', type: 'ollama-config-options', required: false },
         },
         inputs: 1,
@@ -15,6 +30,77 @@
         label: function() {
             return this.name || 'ollama-generate';
         },
+        oneditprepare: function() {
+            if( !this.modelType ) {
+                this.modelType = 'str'
+            }
+
+            $( '#node-input-model' ).typedInput( {
+                type: 'str',
+                types: [ 'str', 'msg', 'flow', 'global' ],
+                typeField: '#node-input-modelType'
+            } )
+
+            if( !this.promptType ) {
+                this.promptType = 'str'
+            }
+
+            $( '#node-input-prompt' ).typedInput( {
+                type: 'str',
+                types: [ 'str', 'msg', 'flow', 'global' ],
+                typeField: '#node-input-promptType'
+            } )
+
+            if( !this.suffixType ) {
+                this.suffixType = 'str'
+            }
+
+            $( '#node-input-suffix' ).typedInput( {
+                type: 'str',
+                types: [ 'str', 'msg', 'flow', 'global' ],
+                typeField: '#node-input-suffixType'
+            } )
+
+            if( !this.systemType ) {
+                this.systemType = 'str'
+            }
+
+            $( '#node-input-system' ).typedInput( {
+                type: 'str',
+                types: [ 'str', 'msg', 'flow', 'global' ],
+                typeField: '#node-input-systemType'
+            } )
+
+            if( !this.templateType ) {
+                this.templateType = 'str'
+            }
+
+            $( '#node-input-template' ).typedInput( {
+                type: 'str',
+                types: [ 'str', 'msg', 'flow', 'global' ],
+                typeField: '#node-input-templateType'
+            } )
+
+            if( !this.imagesType ) {
+                this.imagesType = 'json'
+            }
+
+            $( '#node-input-images' ).typedInput( {
+                type: 'json',
+                types: [ 'json', 'msg', 'flow', 'global' ],
+                typeField: '#node-input-imagesType'
+            } )
+
+            if( !this.keepAliveType ) {
+                this.keepAliveType = 'str'
+            }
+
+            $( '#node-input-keepAlive' ).typedInput( {
+                type: 'str',
+                types: [ 'str', 'num' ],
+                typeField: '#node-input-keepAliveType'
+            } )
+        }
     } )
 </script>
 
@@ -35,8 +121,55 @@
     </div>
 
     <div class="form-row">
-        <label for="node-input-model"><i class="fa fa-bookmark"></i> Model</label>
+        <label for="node-input-model"><i class="fa fa-comment"></i> Model</label>
         <input type="text" id="node-input-model" />
+        <input type="hidden" id="node-input-modelType" />
+    </div>
+
+    <div class="form-row">
+        <label for="node-input-prompt"><i class="fa fa-comment"></i> Prompt</label>
+        <input type="text" id="node-input-prompt" />
+        <input type="hidden" id="node-input-promptType" />
+    </div>
+
+    <div class="form-row">
+        <label for="node-input-suffix"><i class="fa fa-comment"></i> Suffix</label>
+        <input type="text" id="node-input-suffix" />
+        <input type="hidden" id="node-input-suffixType" />
+    </div>
+
+    <div class="form-row">
+        <label for="node-input-system"><i class="fa fa-cog"></i> System</label>
+        <input type="text" id="node-input-system" />
+        <input type="hidden" id="node-input-systemType" />
+    </div>
+
+    <div class="form-row">
+        <label for="node-input-template"><i class="fa fa-cog"></i> Template</label>
+        <input type="text" id="node-input-template" />
+        <input type="hidden" id="node-input-templateType" />
+    </div>
+
+    <div class="form-row">
+        <label for="node-input-raw"><i class="fa fa-cog"></i> Raw</label>
+        <input type="checkbox" id="node-input-raw" />
+    </div>
+
+    <div class="form-row">
+        <label for="node-input-images"><i class="fa fa-cog"></i> Images</label>
+        <input type="text" id="node-input-images" />
+        <input type="hidden" id="node-input-imagesType" />
+    </div>
+
+    <div class="form-row">
+        <label for="node-input-stream"><i class="fa fa-cog"></i> Stream</label>
+        <input type="checkbox" id="node-input-stream" />
+    </div>
+
+    <div class="form-row">
+        <label for="node-input-keepAlive"><i class="fa fa-cog"></i> Keep Alive</label>
+        <input type="text" id="node-input-keepAlive" />
+        <input type="hidden" id="node-input-keepAliveType" />
     </div>
 
     <div class="form-row">
@@ -56,31 +189,26 @@
         </dt>
 
         <dd>
-            The payload object.
+            The payload object is an alternative way to configure the node.<br />
+            Any properties in the payload object will override the node configuration.
 
             <dl class="message-properties">
                 <dt class="optional">
                     payload.host <span class="property-type">string</span>
                 </dt>
-                <dd>
-                    The host of the Ollama instance.<br />
-                    <em>Alternative to the <code>Server</code> field.</em>
-                </dd>
+                <dd>The host of the Ollama instance.</dd>
 
                 <dt class="optional">
                     payload.model <span class="property-type">string</span>
                 </dt>
-                <dd>
-                    The model to use for generating the next message.<br />
-                    <em>Alternative to the <code>Model</code> field.</em>
-                </dd>
+                <dd>The model to use for generating the next message.</dd>
 
-                <dt>
+                <dt class="optional">
                     payload.prompt <span class="property-type">string</span>
                 </dt>
                 <dd>The prompt to generate a response for.</dd>
 
-                <dt>
+                <dt class="optional">
                     payload.suffix <span class="property-type">string</span>
                 </dt>
                 <dd>The text after the model response.</dd>
@@ -93,18 +221,12 @@
                 <dt class="optional">
                     payload.format <span class="property-type">string</span>
                 </dt>
-                <dd>
-                    The format to return a response in. Currently the only accepted value is <code>json</code><br />
-                    <em>Alternative to the <code>Format</code> field.</em>
-                </dd>
+                <dd>The format to return a response in. Currently the only accepted value is <code>json</code></dd>
 
                 <dt class="optional">
                     payload.options <span class="property-type">object</span>
                 </dt>
-                <dd>
-                    Additional model parameters listed in the documentation for the <a href="https://github.com/ollama/ollama/blob/main/docs/modelfile.md#valid-parameters-and-values">Modelfile</a>.<br />
-                    <em>Alternative to the <code>Options</code> field.</em>
-                </dd>
+                <dd>Additional model parameters listed in the documentation for the <a href="https://github.com/ollama/ollama/blob/main/docs/modelfile.md#valid-parameters-and-values">Modelfile</a>.</dd>
 
                 <dt class="optional">
                     payload.system <span class="property-type">string</span>

package/nodes/ollama-generate.js

@@ -3,37 +3,134 @@ module.exports = function( RED ) {
 
     function OllamaGenerateNode( config )  {
         RED.nodes.createNode( this, config )
-        const node = this
 
-        node.on( 'input', async function( msg ) {
-            const {
-                host: payloadHost,
-                model: payloadModel,
-                prompt,
-                suffix,
-                system,
-                template,
-                raw,
-                images,
-                format: payloadFormat,
-                stream,
-                keep_alive,
-                options: payloadOptions
-            } = msg.payload
+        this.modelType = config.modelType || 'str'
+        this.promptType = config.promptType || 'str'
+        this.suffixType = config.suffixType || 'str'
+        this.systemType = config.systemType || 'str'
+        this.templateType = config.templateType || 'str'
+        this.raw = config.raw || false
+        this.imagesType = config.imagesType || 'json'
+        this.stream = config.stream || false
+        this.keepAliveType = config.keepAliveType || 'str'
 
+        const node = this
+        node.on( 'input', async function( msg ) {
             const server = RED.nodes.getNode( config.server )
-            const host = ( server ) ? server.host + ':' + server.port : payloadHost
+            const host = msg?.payload?.host || ( server ) ? server.host + ':' + server.port : null
 
             const ollama = new Ollama( { host } )
 
-            const modelConfig = RED.nodes.getNode( config.model )
-            const model = ( modelConfig ) ? modelConfig.name : payloadModel
+            let model = null
+            if( msg?.payload?.model ) {
+                model = msg?.payload?.model
+            } else if( !!config.model ) {
+                if( node.modelType === 'str' ) {
+                    model = config.model
+                } else if( node.modelType === 'msg' ) {
+                    model = msg[ config.model ]
+                } else if( node.modelType === 'flow' ) {
+                    model = node.context().flow.get( config.model )
+                } else if( node.modelType === 'global' ) {
+                    model = node.context().global.get( config.model )
+                }
+            }
+
+            let prompt = null
+            if( msg?.payload?.prompt ) {
+                prompt = msg?.payload?.prompt
+            } else if( !!config.prompt ) {
+                if( node.promptType === 'str' ) {
+                    prompt = config.prompt
+                } else if( node.promptType === 'msg' ) {
+                    prompt = msg[ config.prompt ]
+                } else if( node.promptType === 'flow' ) {
+                    prompt = node.context().flow.get( config.prompt )
+                } else if( node.promptType === 'global' ) {
+                    prompt = node.context().global.get( config.prompt )
+                }
+            }
+
+            let suffix = null
+            if( msg?.payload?.suffix ) {
+                suffix = msg?.payload?.suffix
+            } else if( !!config.suffix ) {
+                if( node.suffixType === 'str' ) {
+                    suffix = config.suffix
+                } else if( node.suffixType === 'msg' ) {
+                    suffix = msg[ config.suffix ]
+                } else if( node.suffixType === 'flow' ) {
+                    suffix = node.context().flow.get( config.suffix )
+                } else if( node.suffixType === 'global' ) {
+                    suffix = node.context().global.get( config.suffix )
+                }
+            }
+
+            let system = null
+            if( msg?.payload?.system ) {
+                system = msg?.payload?.system
+            } else if( !!config.system ) {
+                if( node.systemType === 'str' ) {
+                    system = config.system
+                } else if( node.systemType === 'msg' ) {
+                    system = msg[ config.system ]
+                } else if( node.systemType === 'flow' ) {
+                    system = node.context().flow.get( config.system )
+                } else if( node.systemType === 'global' ) {
+                    system = node.context().global.get( config.system )
+                }
+            }
+
+            let template = null
+            if( msg?.payload?.template ) {
+                template = msg?.payload?.template
+            } else if( !!config.template ) {
+                if( node.templateType === 'str' ) {
+                    template = config.template
+                } else if( node.templateType === 'msg' ) {
+                    template = msg[ config.template ]
+                } else if( node.templateType === 'flow' ) {
+                    template = node.context().flow.get( config.template )
+                } else if( node.templateType === 'global' ) {
+                    template = node.context().global.get( config.template )
+                }
+            }
+
+            const raw = ( msg?.payload?.raw !== undefined ) ? msg?.payload?.raw : node.raw
+
+            let images = null
+            if( msg?.payload?.images ) {
+                images = msg?.payload?.images
+            } else if( !!config.images ) {
+                if( node.imagesType === 'json' ) {
+                    images = JSON.parse( config.images )
+                } else if( node.imagesType === 'msg' ) {
+                    images = msg[ config.images ]
+                } else if( node.imagesType === 'flow' ) {
+                    images = node.context().flow.get( config.images )
+                } else if( node.imagesType === 'global' ) {
+                    images = node.context().global.get( config.images )
+                }
+            }
 
             const formatConfig = RED.nodes.getNode( config.format )
-            const format = ( formatConfig ) ? formatConfig.json : payloadFormat
+            const format = msg?.payload?.format || ( formatConfig ) ? formatConfig.json : null
+
+            const stream = ( msg?.payload?.stream !== undefined ) ? msg?.payload?.stream : node.stream
+
+            let keep_alive = null
+            if( msg?.payload?.keep_alive ) {
+                keep_alive = msg?.payload?.keep_alive
+            } else if( !!config.keepAlive ) {
+                if( node.keepAliveType === 'str' ) {
+                    keep_alive = config.keepAlive
+                } else if( node.keepAliveType === 'num' ) {
+                    keep_alive = Number( config.keepAlive )
+                }
+            }
 
             const optionsConfig = RED.nodes.getNode( config.options )
-            const options = ( optionsConfig ) ? optionsConfig.json : payloadOptions
+            const options = msg?.payload?.options || ( optionsConfig ) ? JSON.parse( optionsConfig.json ) : null
 
             const response = await ollama.generate( {
                 model,

package/nodes/ollama-list.html

@@ -38,16 +38,14 @@
         </dt>
 
         <dd>
-            The payload object.
+            The payload object is an alternative way to configure the node.<br />
+            Any properties in the payload object will override the node configuration.
 
             <dl class="message-properties">
                 <dt class="optional">
                     payload.host <span class="property-type">string</span>
                 </dt>
-                <dd>
-                    The host of the Ollama instance.<br />
-                    <em>Alternative to the <code>Server</code> field.</em>
-                </dd>
+                <dd>The host of the Ollama instance.</dd>
             </dl>
         </dd>
     </dl>

package/nodes/ollama-list.js

@@ -6,13 +6,9 @@ module.exports = function( RED ) {
         const node = this
 
         node.on( 'input', async function( msg ) {
-            const {
-                host: payloadHost
-            } = msg.payload
-
             const server = RED.nodes.getNode( config.server )
 
-            const host = ( server ) ? server.host + ':' + server.port : payloadHost
+            const host = msg?.payload?.host || ( server ) ? server.host + ':' + server.port : null
 
             const ollama = new Ollama( { host } )
 

package/nodes/ollama-ps.html

@@ -38,16 +38,14 @@
         </dt>
 
         <dd>
-            The payload object.
+            The payload object is an alternative way to configure the node.<br />
+            Any properties in the payload object will override the node configuration.
 
             <dl class="message-properties">
                 <dt class="optional">
                     payload.host <span class="property-type">string</span>
                 </dt>
-                <dd>
-                    The host of the Ollama instance.<br />
-                    <em>Alternative to the <code>Server</code> field.</em>
-                </dd>
+                <dd>The host of the Ollama instance.</dd>
             </dl>
         </dd>
     </dl>

package/nodes/ollama-ps.js

@@ -6,13 +6,9 @@ module.exports = function( RED ) {
         const node = this
 
         node.on( 'input', async function( msg ) {
-            const {
-                host: payloadHost
-            } = msg.payload
-
             const server = RED.nodes.getNode( config.server )
 
-            const host = ( server ) ? server.host + ':' + server.port : payloadHost
+            const host = msg?.payload?.host || ( server ) ? server.host + ':' + server.port : null
 
             const ollama = new Ollama( { host } )
 

package/nodes/ollama-pull.html

@@ -5,7 +5,10 @@
         defaults: {
             name: { value: 'Ollama Pull' },
             server: { value: '', type: 'ollama-config-server', required: false },
-            model: { value: '', type: 'ollama-config-model', required: false },
+            model: { value: '', required: false },
+            modelType: { value: 'str', required: false },
+            insecure: { value: false },
+            stream: { value: false },
         },
         inputs: 1,
         outputs: 1,
@@ -13,6 +16,17 @@
         label: function() {
             return this.name || 'ollama-pull';
         },
+        oneditprepare: function() {
+            if( !this.modelType ) {
+                this.modelType = 'str'
+            }
+
+            $( '#node-input-model' ).typedInput( {
+                type: 'str',
+                types: [ 'str', 'msg', 'flow', 'global' ],
+                typeField: '#node-input-modelType'
+            } )
+        }
     } )
 </script>
 
@@ -28,8 +42,19 @@
     </div>
 
     <div class="form-row">
-        <label for="node-input-model"><i class="fa fa-bookmark"></i> Model</label>
+        <label for="node-input-model"><i class="fa fa-comment"></i> Model</label>
         <input type="text" id="node-input-model" />
+        <input type="hidden" id="node-input-modelType" />
+    </div>
+
+    <div class="form-row">
+        <label for="node-input-insecure"><i class="fa fa-lock"></i> Insecure</label>
+        <input type="checkbox" id="node-input-insecure" />
+    </div>
+
+    <div class="form-row">
+        <label for="node-input-stream"><i class="fa fa-cog"></i> Stream</label>
+        <input type="checkbox" id="node-input-stream" />
     </div>
 </script>
 
@@ -44,31 +69,26 @@
         </dt>
 
         <dd>
-            The payload object.
+            The payload object is an alternative way to configure the node.<br />
+            Any properties in the payload object will override the node configuration.
 
             <dl class="message-properties">
                 <dt class="optional">
                     payload.host <span class="property-type">string</span>
                 </dt>
-                <dd>
-                    The host of the Ollama instance.<br />
-                    <em>Alternative to the <code>Server</code> field.</em>
-                </dd>
+                <dd>The host of the Ollama instance.</dd>
 
                 <dt class="optional">
                     payload.model <span class="property-type">string</span>
                 </dt>
-                <dd>
-                    The name of the model to download.<br />
-                    <em>Alternative to the <code>Model</code> field.</em>
-                </dd>
+                <dd>The name of the model to download.</dd>
 
-                <dt>
+                <dt class="optional">
                     payload.insecure <span class="property-type">boolean</span>
                 </dt>
                 <dd>Pull from servers whose identity cannot be verified.</dd>
 
-                <dt>
+                <dt class="optional">
                     payload.stream <span class="property-type">boolean</span>
                 </dt>
                 <dd>When true an AsyncGenerator is returned.</dd>

package/nodes/ollama-pull.js

@@ -3,23 +3,36 @@ module.exports = function( RED ) {
 
     function OllamaPulltNode( config )  {
         RED.nodes.createNode( this, config )
-        const node = this
 
-        node.on( 'input', async function( msg ) {
-            const {
-                host: payloadHost,
-                model: payloadModel,
-                insecure,
-                stream
-            } = msg.payload
+        this.modelType = config.modelType || 'str'
+        this.insecure = config.insecure || false
+        this.stream = config.stream || false
 
+        const node = this
+        node.on( 'input', async function( msg ) {
             const server = RED.nodes.getNode( config.server )
-            const host = ( server ) ? server.host + ':' + server.port : payloadHost
+            const host = msg?.payload?.host || ( server ) ? server.host + ':' + server.port : null
 
             const ollama = new Ollama( { host } )
 
-            const modelConfig = RED.nodes.getNode( config.model )
-            const model = ( modelConfig ) ? modelConfig.name : payloadModel
+            let model = null
+            if( msg?.payload?.model ) {
+                model = msg?.payload?.model
+            } else if( !!config.model ) {
+                if( node.modelType === 'str' ) {
+                    model = config.model
+                } else if( node.modelType === 'msg' ) {
+                    model = msg[ config.model ]
+                } else if( node.modelType === 'flow' ) {
+                    model = node.context().flow.get( config.model )
+                } else if( node.modelType === 'global' ) {
+                    model = node.context().global.get( config.model )
+                }
+            }
+
+            const insecure = ( msg?.payload?.insecure !== undefined ) ? msg?.payload?.insecure : node.insecure
+
+            const stream = ( msg?.payload?.stream !== undefined ) ? msg?.payload?.stream : node.stream
 
             const response = await ollama.pull( {
                     model,

package/nodes/ollama-push.html

@@ -5,7 +5,10 @@
         defaults: {
             name: { value: 'Ollama Push' },
             server: { value: '', type: 'ollama-config-server', required: false },
-            model: { value: '', type: 'ollama-config-model', required: false },
+            model: { value: '', required: false },
+            modelType: { value: 'str', required: false },
+            insecure: { value: false },
+            stream: { value: false },
         },
         inputs: 1,
         outputs: 1,
@@ -13,6 +16,17 @@
         label: function() {
             return this.name || 'ollama-push';
         },
+        oneditprepare: function() {
+            if( !this.modelType ) {
+                this.modelType = 'str'
+            }
+
+            $( '#node-input-model' ).typedInput( {
+                type: 'str',
+                types: [ 'str', 'msg', 'flow', 'global' ],
+                typeField: '#node-input-modelType'
+            } )
+        }
     } )
 </script>
 
@@ -28,8 +42,19 @@
     </div>
 
     <div class="form-row">
-        <label for="node-input-model"><i class="fa fa-bookmark"></i> Model</label>
+        <label for="node-input-model"><i class="fa fa-comment"></i> Model</label>
         <input type="text" id="node-input-model" />
+        <input type="hidden" id="node-input-modelType" />
+    </div>
+
+    <div class="form-row">
+        <label for="node-input-insecure"><i class="fa fa-lock"></i> Insecure</label>
+        <input type="checkbox" id="node-input-insecure" />
+    </div>
+
+    <div class="form-row">
+        <label for="node-input-stream"><i class="fa fa-cog"></i> Stream</label>
+        <input type="checkbox" id="node-input-stream" />
     </div>
 </script>
 
@@ -44,31 +69,26 @@
         </dt>
 
         <dd>
-            The payload object.
+            The payload object is an alternative way to configure the node.<br />
+            Any properties in the payload object will override the node configuration.
 
             <dl class="message-properties">
                 <dt class="optional">
                     payload.host <span class="property-type">string</span>
                 </dt>
-                <dd>
-                    The host of the Ollama instance.<br />
-                    <em>Alternative to the <code>Server</code> field.</em>
-                </dd>
+                <dd>The host of the Ollama instance.</dd>
 
                 <dt class="optional">
                     payload.model <span class="property-type">string</span>
                 </dt>
-                <dd>
-                    The name of the model to upload.<br />
-                    <em>Alternative to the <code>Model</code> field.</em>
-                </dd>
+                <dd>The name of the model to upload.</dd>
 
-                <dt>
+                <dt class="optional">
                     payload.insecure <span class="property-type">boolean</span>
                 </dt>
                 <dd>Push to servers whose identity cannot be verified.</dd>
 
-                <dt>
+                <dt class="optional">
                     payload.stream <span class="property-type">boolean</span>
                 </dt>
                 <dd>When true an AsyncGenerator is returned.</dd>