node-red-contrib-ollama 0.2.5 → 0.3.0

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>

package/nodes/ollama-push.js

@@ -3,23 +3,36 @@ module.exports = function( RED ) {
 
     function OllamaPushNode( 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.push( {
                     model,

package/nodes/ollama-show.html

@@ -5,7 +5,13 @@
         defaults: {
             name: { value: 'Ollama Show' },
             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 },
+            system: { value: '', required: false },
+            systemType: { value: 'str', required: false },
+            template: { value: '', required: false },
+            templateType: { value: 'str', required: false },
+            options: { value: '', type: 'ollama-config-options', required: false },
         },
         inputs: 1,
         outputs: 1,
@@ -13,6 +19,37 @@
         label: function() {
             return this.name || 'ollama-show';
         },
+        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.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'
+            } )
+        }
     } )
 </script>
 
@@ -28,8 +65,26 @@
     </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-system"><i class="fa fa-comment"></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-comment"></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-options"><i class="fa fa-cog"></i> Options</label>
+        <input type="text" id="node-input-options" />
     </div>
 </script>
 
@@ -44,24 +99,19 @@
         </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 show information for.<br />
-                    <em>Alternative to the <code>Model</code> field.</em>
-                </dd>
+                <dd>The model to show information for.</dd>
 
                 <dt class="optional">
                     payload.system <span class="property-type">string</span>

package/nodes/ollama-show.js

@@ -3,34 +3,75 @@ module.exports = function( RED ) {
 
     function OllamaShowNode( config )  {
         RED.nodes.createNode( this, config )
-        const node = this
 
-        node.on( 'input', async function( msg ) {
-            const {
-                host: payloadHost,
-                model: payloadModel,
-                system,
-                template,
-                options
-            } = msg.payload
+        this.modelType = config.modelType || 'str'
+        this.systemType = config.systemType || 'str'
+        this.templateType = config.templateType || '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 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 optionsConfig = RED.nodes.getNode( config.options )
+            const options = msg?.payload?.options || ( optionsConfig ) ? JSON.parse( optionsConfig.json ) : null
 
             const response = await ollama.show( {
-                model,
-                system,
-                template,
-                options
-            } )
-            .catch( error => {
-                node.error( error )
-            } )
+                    model,
+                    system,
+                    template,
+                    options
+                } )
+                .catch( error => {
+                    node.error( error )
+                } )
 
             msg.payload = response
             node.send( msg )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-ollama",
-  "version": "0.2.5",
+  "version": "0.3.0",
   "description": "Add AI functionality to your flows! This module includes a set of nodes that enable easy communication with Ollama, enriching your projects with intelligent solutions.",
   "keywords": [
     "ai",
@@ -30,9 +30,9 @@
       "ollama-ps": "nodes/ollama-ps.js",
       "ollama-abort": "nodes/ollama-abort.js",
       "ollama-config-server": "nodes/ollama-config-server.js",
-      "ollama-config-model": "nodes/ollama-config-model.js",
       "ollama-config-format": "nodes/ollama-config-format.js",
-      "ollama-config-tools": "nodes/ollama-config-tools.js"
+      "ollama-config-tools": "nodes/ollama-config-tools.js",
+      "ollama-config-options": "nodes/ollama-config-options.js"
     }
   },
   "engines": {

package/nodes/ollama-config-model.html

@@ -1,18 +0,0 @@
-<script type="text/javascript">
-    RED.nodes.registerType( 'ollama-config-model', {
-        category: 'config',
-        defaults: {
-            name: { value: '', required: true }
-        },
-        label: function() {
-            return this.name;
-        }
-    } )
-</script>
-
-<script type="text/html" data-template-name="ollama-config-model">
-    <div class="form-row">
-        <label for="node-config-input-name"><i class="fa fa-server"></i> Name</label>
-        <input type="text" id="node-config-input-name" placeholder="llama3.3" />
-    </div>
-</script>

package/nodes/ollama-config-model.js

@@ -1,9 +0,0 @@
-module.exports = function( RED ) {
-    function OllamaConfigModelNode( config ) {
-        RED.nodes.createNode( this, config )
-
-        this.name = config.name
-    }
-
-    RED.nodes.registerType( 'ollama-config-model', OllamaConfigModelNode )
-}