node-red-contrib-ollama 0.2.5 → 0.2.6

package/nodes/ollama-chat.html

@@ -8,6 +8,7 @@
             model: { value: '', type: 'ollama-config-model', required: true },
             format: { value: '', type: 'ollama-config-format', required: false },
             tools: { value: '', type: 'ollama-config-tools', required: false },
+            options: { value: '', type: 'ollama-config-options', required: false },
         },
         inputs: 1,
         outputs: 1,
@@ -43,6 +44,11 @@
         <label for="node-input-tools"><i class="fa fa-cog"></i> Tools</label>
         <input type="text" id="node-input-tools" />
     </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>
 
 <script type="text/html" data-help-name="ollama-chat">
@@ -142,6 +148,7 @@
                 </dt>
                 <dd>
                     Options to configure the runtime.<br />
+                    <em>Alternative to the <code>Options</code> field.</em>
 
                     <h4>Options</h4>
                     <dl class="message-properties">

package/nodes/ollama-chat.js

@@ -14,7 +14,7 @@ module.exports = function( RED ) {
                 stream,
                 keep_alive,
                 tools: payloadTools,
-                options
+                options: payloadOptions
             } = msg.payload
 
             const server = RED.nodes.getNode( config.server )
@@ -31,6 +31,9 @@ module.exports = function( RED ) {
             const toolsConfig = RED.nodes.getNode( config.tools )
             const tools = ( toolsConfig ) ? toolsConfig.json : payloadTools
 
+            const optionsConfig = RED.nodes.getNode( config.options )
+            const options = ( optionsConfig ) ? optionsConfig.json : payloadOptions
+
             const response = await ollama.chat( {
                     model,
                     messages,

package/nodes/ollama-config-options.html

@@ -0,0 +1,25 @@
+<script type="text/javascript">
+    RED.nodes.registerType( 'ollama-config-options', {
+        category: 'config',
+        defaults: {
+            name: { value: 'Ollama Options 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-options">
+    <div class="form-row">
+        <label for="node-config-input-json"><i class="fa fa-server"></i> JSON</label>
+        <input type="text" id="node-config-input-json" />
+    </div>
+</script>

package/nodes/ollama-config-options.js

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

package/nodes/ollama-embed.html

@@ -6,6 +6,7 @@
             name: { value: 'Ollama Embed' },
             server: { value: '', type: 'ollama-config-server', required: false },
             model: { value: '', type: 'ollama-config-model', required: false },
+            options: { value: '', type: 'ollama-config-options', required: false },
         },
         inputs: 1,
         outputs: 1,
@@ -31,6 +32,11 @@
         <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-options"><i class="fa fa-cog"></i> Options</label>
+        <input type="text" id="node-input-options" />
+    </div>
 </script>
 
 <script type="text/html" data-help-name="ollama-embed">
@@ -83,6 +89,7 @@
                 </dt>
                 <dd>
                     Options to configure the runtime.<br />
+                    <em>Alternative to the <code>Options</code> field.</em>
 
                     <h4>Options</h4>
                     <dl class="message-properties">

package/nodes/ollama-embed.js

@@ -12,7 +12,7 @@ module.exports = function( RED ) {
                 input,
                 truncate,
                 keep_alive,
-                options
+                options: payloadOptions
             } = msg.payload
 
             const server = RED.nodes.getNode( config.server )
@@ -23,6 +23,9 @@ module.exports = function( RED ) {
             const modelConfig = RED.nodes.getNode( config.model )
             const model = ( modelConfig ) ? modelConfig.name : payloadModel
 
+            const optionsConfig = RED.nodes.getNode( config.options )
+            const options = ( optionsConfig ) ? optionsConfig.json : payloadOptions
+
             const response = await ollama.embed( {
                 model,
                 input,

package/nodes/ollama-generate.html

@@ -7,6 +7,7 @@
             server: { value: '', type: 'ollama-config-server', required: false },
             format: { value: '', type: 'ollama-config-format', required: false },
             model: { value: '', type: 'ollama-config-model', required: false },
+            options: { value: '', type: 'ollama-config-options', required: false },
         },
         inputs: 1,
         outputs: 1,
@@ -37,6 +38,11 @@
         <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-options"><i class="fa fa-cog"></i> Options</label>
+        <input type="text" id="node-input-options" />
+    </div>
 </script>
 
 <script type="text/html" data-help-name="ollama-generate">
@@ -96,7 +102,8 @@
                     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>.
+                    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>
 
                 <dt class="optional">

package/nodes/ollama-generate.js

@@ -18,7 +18,7 @@ module.exports = function( RED ) {
                 format: payloadFormat,
                 stream,
                 keep_alive,
-                options
+                options: payloadOptions
             } = msg.payload
 
             const server = RED.nodes.getNode( config.server )
@@ -32,6 +32,9 @@ module.exports = function( RED ) {
             const formatConfig = RED.nodes.getNode( config.format )
             const format = ( formatConfig ) ? formatConfig.json : payloadFormat
 
+            const optionsConfig = RED.nodes.getNode( config.options )
+            const options = ( optionsConfig ) ? optionsConfig.json : payloadOptions
+
             const response = await ollama.generate( {
                 model,
                 prompt,

package/nodes/ollama-show.html

@@ -6,6 +6,7 @@
             name: { value: 'Ollama Show' },
             server: { value: '', type: 'ollama-config-server', required: false },
             model: { value: '', type: 'ollama-config-model', required: false },
+            options: { value: '', type: 'ollama-config-options', required: false },
         },
         inputs: 1,
         outputs: 1,
@@ -31,6 +32,11 @@
         <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-options"><i class="fa fa-cog"></i> Options</label>
+        <input type="text" id="node-input-options" />
+    </div>
 </script>
 
 <script type="text/html" data-help-name="ollama-show">
@@ -75,7 +81,10 @@
                 <dt class="optional">
                     payload.options <span class="property-type">object</span>
                 </dt>
-                <dd>Options to configure the runtime.</dd>
+                <dd>
+                    Options to configure the runtime.<br />
+                    <em>Alternative to the <code>Server</code> field.</em>
+                </dd>
             </dl>
         </dd>
     </dl>

package/nodes/ollama-show.js

@@ -11,7 +11,7 @@ module.exports = function( RED ) {
                 model: payloadModel,
                 system,
                 template,
-                options
+                options: payloadOptions
             } = msg.payload
 
             const server = RED.nodes.getNode( config.server )
@@ -22,6 +22,9 @@ module.exports = function( RED ) {
             const modelConfig = RED.nodes.getNode( config.model )
             const model = ( modelConfig ) ? modelConfig.name : payloadModel
 
+            const optionsConfig = RED.nodes.getNode( config.options )
+            const options = ( optionsConfig ) ? optionsConfig.json : payloadOptions
+
             const response = await ollama.show( {
                 model,
                 system,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-ollama",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "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",
@@ -32,7 +32,8 @@
       "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": {