node-red-contrib-ollama 0.2.2 → 0.2.4

package/nodes/ollama-chat.html

@@ -4,7 +4,9 @@
         color: 'rgb(186 230 253)',
         defaults: {
             name: { value: 'Ollama Chat' },
-            server: { value: '', type: 'ollama-config-server', required: false }
+            server: { value: '', type: 'ollama-config-server', required: false },
+            model: { value: '', type: 'ollama-config-model', required: true },
+            tools: { value: '', type: 'ollama-config-tools', required: false },
         },
         inputs: 1,
         outputs: 1,
@@ -25,6 +27,16 @@
         <label for="node-input-server"><i class="fa fa-server"></i> Server</label>
         <input type="text" id="node-input-server" />
     </div>
+
+    <div class="form-row">
+        <label for="node-input-model"><i class="fa fa-bookmark"></i> Model</label>
+        <input type="text" id="node-input-model" />
+    </div>
+
+    <div class="form-row">
+        <label for="node-input-tools"><i class="fa fa-cog"></i> Tools</label>
+        <input type="text" id="node-input-tools" />
+    </div>
 </script>
 
 <script type="text/html" data-help-name="ollama-chat">
@@ -49,10 +61,13 @@
                     <em>Alternative to the <code>Server</code> field.</em>
                 </dd>
 
-                <dt>
+                <dt class="optional">
                     payload.model <span class="property-type">string</span>
                 </dt>
-                <dd>The model to use for generating the next message.</dd>
+                <dd>
+                    The model to use for generating the next message.<br />
+                    <em>Alternative to the <code>Model</code> field.</em>
+                </dd>
 
                 <dt>
                     payload.messages <span class="property-type">array</span>
@@ -105,6 +120,7 @@
                 <dd>
                     Tools for the model to use if supported.<br />
                     Requires <code>stream</code> to be set to <code>false</code>.
+                    <em>Alternative to the <code>Model</code> field.</em>
 
                     <p>
                         For more information, see the Ollama API documentation:<br />

package/nodes/ollama-chat.js

@@ -8,21 +8,26 @@ module.exports = function( RED ) {
         node.on( 'input', async function( msg ) {
             const {
                 host: payloadHost,
-                model,
+                model: payloadModel,
                 messages,
                 format,
                 stream,
                 keep_alive,
-                tools,
+                tools: payloadTools,
                 options
             } = msg.payload
 
             const server = RED.nodes.getNode( config.server )
-
             const host = ( server ) ? server.host + ':' + server.port : payloadHost
 
             const ollama = new Ollama( { host } )
 
+            const modelConfig = RED.nodes.getNode( config.model )
+            const model = ( modelConfig ) ? modelConfig.name : payloadModel
+
+            const toolsConfig = RED.nodes.getNode( config.tools )
+            const tools = ( toolsConfig ) ? toolsConfig.json : payloadTools
+
             const response = await ollama.chat( {
                     model,
                     messages,

package/nodes/ollama-config-model.html

@@ -0,0 +1,18 @@
+<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

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

package/nodes/ollama-config-tools.html

@@ -0,0 +1,30 @@
+<script type="text/javascript">
+    RED.nodes.registerType( 'ollama-config-tools', {
+        category: 'config',
+        defaults: {
+            name: { value: 'Ollama Tools Config' },
+            json: { value: '' }
+        },
+        label: function() {
+            return this.name;
+        },
+        oneditprepare: function() {
+            $( '#node-config-input-json' ).typedInput( {
+                type: 'json',
+                types: [ 'json' ]
+            } )
+        }
+    } )
+</script>
+
+<script type="text/html" data-template-name="ollama-config-tools">
+    <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="Ollama Tools Config" />
+    </div>
+
+    <div class="form-row">
+        <label for="node-config-input-json"><i class="fa fa-cog"></i> JSON</label>
+        <input type="text" id="node-config-input-json" placeholder="" />
+    </div>
+</script>

package/nodes/ollama-config-tools.js

@@ -0,0 +1,10 @@
+module.exports = function( RED ) {
+    function OllamaConfigToolsNode( config ) {
+        RED.nodes.createNode( this, config )
+
+        this.name = config.name
+        this.json = config.json
+    }
+
+    RED.nodes.registerType( 'ollama-config-tools', OllamaConfigToolsNode )
+}

package/nodes/ollama-create.html

@@ -4,7 +4,8 @@
         color: 'rgb(186 230 253)',
         defaults: {
             name: { value: 'Ollama Create' },
-            server: { value: '', type: 'ollama-config-server', required: false }
+            server: { value: '', type: 'ollama-config-server', required: false },
+            model: { value: '', type: 'ollama-config-model', required: false },
         },
         inputs: 1,
         outputs: 1,
@@ -25,6 +26,11 @@
         <label for="node-input-server"><i class="fa fa-server"></i> Server</label>
         <input type="text" id="node-input-server" />
     </div>
+
+    <div class="form-row">
+        <label for="node-input-model"><i class="fa fa-bookmark"></i> Model</label>
+        <input type="text" id="node-input-model" />
+    </div>
 </script>
 
 <script type="text/html" data-help-name="ollama-create">
@@ -49,25 +55,28 @@
                     <em>Alternative to the <code>Server</code> field.</em>
                 </dd>
 
-                <dt>
+                <dt class="optional">
                     payload.model <span class="property-type">string</span>
                 </dt>
-                <p>The name of the model to create.</p>
+                <dd>
+                    The name of the model to create.<br />
+                    <em>Alternative to the <code>Model</code> field.</em>
+                </dd>
 
                 <dt class="optional">
                     payload.path <span class="property-type">string</span>
                 </dt>
-                <p>The path to the Modelfile to use for creating the model.</p>
+                <dd>The path to the Modelfile to use for creating the model.</dd>
 
                 <dt class="optional">
                     payload.modelfile <span class="property-type">string</span>
                 </dt>
-                <p>The content of the Modelfile to create.</p>
+                <dd>The content of the Modelfile to create.</dd>
 
                 <dt class="optional">
                     payload.stream <span class="property-type">boolean</span>
                 </dt>
-                <p>When true an AsyncGenerator is returned.</p>
+                <dd>When true an AsyncGenerator is returned.</dd>
             </dl>
         </dd>
     </dl>

package/nodes/ollama-create.js

@@ -8,18 +8,20 @@ module.exports = function( RED ) {
         node.on( 'input', async function( msg ) {
             const {
                 host: payloadHost,
-                model,
+                model: payloadModel,
                 modelfile,
                 stream,
                 path
             } = msg.payload
 
             const server = RED.nodes.getNode( config.server )
-
             const host = ( server ) ? server.host + ':' + server.port : payloadHost
 
             const ollama = new Ollama( { host } )
 
+            const modelConfig = RED.nodes.getNode( config.model )
+            const model = ( modelConfig ) ? modelConfig.name : payloadModel
+
             const response = await ollama.create( {
                 model,
                 modelfile,

package/nodes/ollama-delete.html

@@ -4,7 +4,8 @@
         color: 'rgb(186 230 253)',
         defaults: {
             name: { value: 'Ollama Delete' },
-            server: { value: '', type: 'ollama-config-server', required: false }
+            server: { value: '', type: 'ollama-config-server', required: false },
+            model: { value: '', type: 'ollama-config-model', required: false },
         },
         inputs: 1,
         outputs: 1,
@@ -25,6 +26,11 @@
         <label for="node-input-server"><i class="fa fa-server"></i> Server</label>
         <input type="text" id="node-input-server" />
     </div>
+
+    <div class="form-row">
+        <label for="node-input-model"><i class="fa fa-bookmark"></i> Model</label>
+        <input type="text" id="node-input-model" />
+    </div>
 </script>
 
 <script type="text/html" data-help-name="ollama-delete">
@@ -49,10 +55,13 @@
                     <em>Alternative to the <code>Server</code> field.</em>
                 </dd>
 
-                <dt>
+                <dt class="optional">
                     payload.model <span class="property-type">string</span>
                 </dt>
-                <dd>The name of the model to delete.</dd>
+                <dd>
+                    The name of the model to delete.<br />
+                    <em>Alternative to the <code>Model</code> field.</em>
+                </dd>
             </dl>
         </dd>
     </dl>

package/nodes/ollama-delete.js

@@ -8,15 +8,17 @@ module.exports = function( RED ) {
         node.on( 'input', async function( msg ) {
             const {
                 host: payloadHost,
-                model
+                model: payloadModel
             } = msg.payload
 
             const server = RED.nodes.getNode( config.server )
-
             const host = ( server ) ? server.host + ':' + server.port : payloadHost
 
             const ollama = new Ollama( { host } )
 
+            const modelConfig = RED.nodes.getNode( config.model )
+            const model = ( modelConfig ) ? modelConfig.name : payloadModel
+
             const response = await ollama.delete( { model } )
                 .catch( error => {
                     node.error( error )

package/nodes/ollama-embed.html

@@ -4,7 +4,8 @@
         color: 'rgb(186 230 253)',
         defaults: {
             name: { value: 'Ollama Embed' },
-            server: { value: '', type: 'ollama-config-server', required: false }
+            server: { value: '', type: 'ollama-config-server', required: false },
+            model: { value: '', type: 'ollama-config-model', required: false },
         },
         inputs: 1,
         outputs: 1,
@@ -25,6 +26,11 @@
         <label for="node-input-server"><i class="fa fa-server"></i> Server</label>
         <input type="text" id="node-input-server" />
     </div>
+
+    <div class="form-row">
+        <label for="node-input-model"><i class="fa fa-bookmark"></i> Model</label>
+        <input type="text" id="node-input-model" />
+    </div>
 </script>
 
 <script type="text/html" data-help-name="ollama-embed">
@@ -49,10 +55,13 @@
                     <em>Alternative to the <code>Server</code> field.</em>
                 </dd>
 
-                <dt>
+                <dt class="optional">
                     payload.model <span class="property-type">string</span>
                 </dt>
-                <dd>The name of the model used to generate the embeddings.</dd>
+                <dd>
+                    The name of the model used to generate the embeddings.<br />
+                    <em>Alternative to the <code>Model</code> field.</em>
+                </dd>
 
                 <dt>
                     payload.input <span class="property-type">string | array[string]</span>

package/nodes/ollama-embed.js

@@ -8,7 +8,7 @@ module.exports = function( RED ) {
         node.on( 'input', async function( msg ) {
             const {
                 host: payloadHost,
-                model,
+                model: payloadModel,
                 input,
                 truncate,
                 keep_alive,
@@ -16,11 +16,13 @@ module.exports = function( RED ) {
             } = msg.payload
 
             const server = RED.nodes.getNode( config.server )
-
             const host = ( server ) ? server.host + ':' + server.port : payloadHost
 
             const ollama = new Ollama( { host } )
 
+            const modelConfig = RED.nodes.getNode( config.model )
+            const model = ( modelConfig ) ? modelConfig.name : payloadModel
+
             const response = await ollama.embed( {
                 model,
                 input,

package/nodes/ollama-generate.html

@@ -4,7 +4,8 @@
         color: 'rgb(186 230 253)',
         defaults: {
             name: { value: 'Ollama Generate' },
-            server: { value: '', type: 'ollama-config-server', required: false }
+            server: { value: '', type: 'ollama-config-server', required: false },
+            model: { value: '', type: 'ollama-config-model', required: false },
         },
         inputs: 1,
         outputs: 1,
@@ -25,6 +26,11 @@
         <label for="node-input-server"><i class="fa fa-server"></i> Server</label>
         <input type="text" id="node-input-server" />
     </div>
+
+    <div class="form-row">
+        <label for="node-input-model"><i class="fa fa-bookmark"></i> Model</label>
+        <input type="text" id="node-input-model" />
+    </div>
 </script>
 
 <script type="text/html" data-help-name="ollama-generate">
@@ -49,10 +55,13 @@
                     <em>Alternative to the <code>Server</code> field.</em>
                 </dd>
 
-                <dt>
+                <dt class="optional">
                     payload.model <span class="property-type">string</span>
                 </dt>
-                <dd>The model to use for generating the next message.</dd>
+                <dd>
+                    The model to use for generating the next message.<br />
+                    <em>Alternative to the <code>Model</code> field.</em>
+                </dd>
 
                 <dt>
                     payload.prompt <span class="property-type">string</span>

package/nodes/ollama-generate.js

@@ -8,7 +8,7 @@ module.exports = function( RED ) {
         node.on( 'input', async function( msg ) {
             const {
                 host: payloadHost,
-                model,
+                model: payloadModel,
                 prompt,
                 suffix,
                 system,
@@ -22,11 +22,13 @@ module.exports = function( RED ) {
             } = msg.payload
 
             const server = RED.nodes.getNode( config.server )
-
             const host = ( server ) ? server.host + ':' + server.port : payloadHost
 
             const ollama = new Ollama( { host } )
 
+            const modelConfig = RED.nodes.getNode( config.model )
+            const model = ( modelConfig ) ? modelConfig.name : payloadModel
+
             const response = await ollama.generate( {
                 model,
                 prompt,

package/nodes/ollama-pull.html

@@ -4,7 +4,8 @@
         color: 'rgb(186 230 253)',
         defaults: {
             name: { value: 'Ollama Pull' },
-            server: { value: '', type: 'ollama-config-server', required: false }
+            server: { value: '', type: 'ollama-config-server', required: false },
+            model: { value: '', type: 'ollama-config-model', required: false },
         },
         inputs: 1,
         outputs: 1,
@@ -25,6 +26,11 @@
         <label for="node-input-server"><i class="fa fa-server"></i> Server</label>
         <input type="text" id="node-input-server" />
     </div>
+
+    <div class="form-row">
+        <label for="node-input-model"><i class="fa fa-bookmark"></i> Model</label>
+        <input type="text" id="node-input-model" />
+    </div>
 </script>
 
 <script type="text/html" data-help-name="ollama-pull">
@@ -49,10 +55,13 @@
                     <em>Alternative to the <code>Server</code> field.</em>
                 </dd>
 
-                <dt>
+                <dt class="optional">
                     payload.model <span class="property-type">string</span>
                 </dt>
-                <dd>The name of the model to download.</dd>
+                <dd>
+                    The name of the model to download.<br />
+                    <em>Alternative to the <code>Model</code> field.</em>
+                </dd>
 
                 <dt>
                     payload.insecure <span class="property-type">boolean</span>

package/nodes/ollama-pull.js

@@ -8,18 +8,24 @@ module.exports = function( RED ) {
         node.on( 'input', async function( msg ) {
             const {
                 host: payloadHost,
-                model,
+                model: payloadModel,
                 insecure,
                 stream
             } = msg.payload
 
             const server = RED.nodes.getNode( config.server )
-
             const host = ( server ) ? server.host + ':' + server.port : payloadHost
 
             const ollama = new Ollama( { host } )
 
-            const response = await ollama.pull( { model, insecure, stream } )
+            const modelConfig = RED.nodes.getNode( config.model )
+            const model = ( modelConfig ) ? modelConfig.name : payloadModel
+
+            const response = await ollama.pull( {
+                    model,
+                    insecure,
+                    stream
+                } )
                 .catch( error => {
                     node.error( error )
                 } )

package/nodes/ollama-push.html

@@ -4,7 +4,8 @@
         color: 'rgb(186 230 253)',
         defaults: {
             name: { value: 'Ollama Push' },
-            server: { value: '', type: 'ollama-config-server', required: false }
+            server: { value: '', type: 'ollama-config-server', required: false },
+            model: { value: '', type: 'ollama-config-model', required: false },
         },
         inputs: 1,
         outputs: 1,
@@ -25,6 +26,11 @@
         <label for="node-input-server"><i class="fa fa-server"></i> Server</label>
         <input type="text" id="node-input-server" />
     </div>
+
+    <div class="form-row">
+        <label for="node-input-model"><i class="fa fa-bookmark"></i> Model</label>
+        <input type="text" id="node-input-model" />
+    </div>
 </script>
 
 <script type="text/html" data-help-name="ollama-push">
@@ -49,10 +55,13 @@
                     <em>Alternative to the <code>Server</code> field.</em>
                 </dd>
 
-                <dt>
+                <dt class="optional">
                     payload.model <span class="property-type">string</span>
                 </dt>
-                <dd>The name of the model to upload.</dd>
+                <dd>
+                    The name of the model to upload.<br />
+                    <em>Alternative to the <code>Model</code> field.</em>
+                </dd>
 
                 <dt>
                     payload.insecure <span class="property-type">boolean</span>

package/nodes/ollama-push.js

@@ -8,18 +8,24 @@ module.exports = function( RED ) {
         node.on( 'input', async function( msg ) {
             const {
                 host: payloadHost,
-                model,
+                model: payloadModel,
                 insecure,
                 stream
             } = msg.payload
 
             const server = RED.nodes.getNode( config.server )
-
             const host = ( server ) ? server.host + ':' + server.port : payloadHost
 
             const ollama = new Ollama( { host } )
 
-            const response = await ollama.push( { model, insecure, stream } )
+            const modelConfig = RED.nodes.getNode( config.model )
+            const model = ( modelConfig ) ? modelConfig.name : payloadModel
+
+            const response = await ollama.push( {
+                    model,
+                    insecure,
+                    stream
+                } )
                 .catch( error => {
                     node.error( error )
                 } )

package/nodes/ollama-show.html

@@ -4,7 +4,8 @@
         color: 'rgb(186 230 253)',
         defaults: {
             name: { value: 'Ollama Show' },
-            server: { value: '', type: 'ollama-config-server', required: false }
+            server: { value: '', type: 'ollama-config-server', required: false },
+            model: { value: '', type: 'ollama-config-model', required: false },
         },
         inputs: 1,
         outputs: 1,
@@ -25,6 +26,11 @@
         <label for="node-input-server"><i class="fa fa-server"></i> Server</label>
         <input type="text" id="node-input-server" />
     </div>
+
+    <div class="form-row">
+        <label for="node-input-model"><i class="fa fa-bookmark"></i> Model</label>
+        <input type="text" id="node-input-model" />
+    </div>
 </script>
 
 <script type="text/html" data-help-name="ollama-show">
@@ -49,10 +55,13 @@
                     <em>Alternative to the <code>Server</code> field.</em>
                 </dd>
 
-                <dt>
+                <dt class="optional">
                     payload.model <span class="property-type">string</span>
                 </dt>
-                <dd>The model to show information for.</dd>
+                <dd>
+                    The model to show information for.<br />
+                    <em>Alternative to the <code>Model</code> field.</em>
+                </dd>
 
                 <dt class="optional">
                     payload.system <span class="property-type">string</span>

package/nodes/ollama-show.js

@@ -8,18 +8,20 @@ module.exports = function( RED ) {
         node.on( 'input', async function( msg ) {
             const {
                 host: payloadHost,
-                model,
+                model: payloadModel,
                 system,
                 template,
                 options
             } = msg.payload
 
             const server = RED.nodes.getNode( config.server )
-
             const host = ( server ) ? server.host + ':' + server.port : payloadHost
 
             const ollama = new Ollama( { host } )
 
+            const modelConfig = RED.nodes.getNode( config.model )
+            const model = ( modelConfig ) ? modelConfig.name : payloadModel
+
             const response = await ollama.show( {
                 model,
                 system,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-ollama",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "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",
@@ -29,7 +29,9 @@
       "ollama-show": "nodes/ollama-show.js",
       "ollama-ps": "nodes/ollama-ps.js",
       "ollama-abort": "nodes/ollama-abort.js",
-      "ollama-config-server": "nodes/ollama-config-server.js"
+      "ollama-config-server": "nodes/ollama-config-server.js",
+      "ollama-config-model": "nodes/ollama-config-model.js",
+      "ollama-config-tools": "nodes/ollama-config-tools.js"
     }
   },
   "engines": {