node-red-contrib-ollama 0.2.3 → 0.2.5

package/nodes/ollama-chat.html

@@ -6,6 +6,8 @@
             name: { value: 'Ollama Chat' },
             server: { value: '', type: 'ollama-config-server', required: false },
             model: { value: '', type: 'ollama-config-model', required: true },
+            format: { value: '', type: 'ollama-config-format', required: false },
+            tools: { value: '', type: 'ollama-config-tools', required: false },
         },
         inputs: 1,
         outputs: 1,
@@ -31,6 +33,16 @@
         <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-format"><i class="fa fa-cog"></i> Format</label>
+        <input type="text" id="node-input-format" />
+    </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">
@@ -96,7 +108,10 @@
                 <dt class="optional">
                     payload.format <span class="property-type">string</span>
                 </dt>
-                <dd>The format of the response (only <code>json</code> for now).</dd>
+                <dd>
+                    The format of the response (only <code>json</code> for now).<br />
+                    <em>Alternative to the <code>Format</code> field.</em>
+                </dd>
 
                 <dt class="optional">
                     payload.stream <span class="property-type">boolean</span>
@@ -113,7 +128,8 @@
                 </dt>
                 <dd>
                     Tools for the model to use if supported.<br />
-                    Requires <code>stream</code> to be set to <code>false</code>.
+                    Requires <code>stream</code> to be set to <code>false</code>.<br />
+                    <em>Alternative to the <code>Model</code> field.</em>
 
                     <p>
                         For more information, see the Ollama API documentation:<br />

package/nodes/ollama-chat.js

@@ -10,10 +10,10 @@ module.exports = function( RED ) {
                 host: payloadHost,
                 model: payloadModel,
                 messages,
-                format,
+                format: payloadFormat,
                 stream,
                 keep_alive,
-                tools,
+                tools: payloadTools,
                 options
             } = msg.payload
 
@@ -25,6 +25,12 @@ module.exports = function( RED ) {
             const modelConfig = RED.nodes.getNode( config.model )
             const model = ( modelConfig ) ? modelConfig.name : payloadModel
 
+            const formatConfig = RED.nodes.getNode( config.format )
+            const format = ( formatConfig ) ? formatConfig.json : payloadFormat
+
+            const toolsConfig = RED.nodes.getNode( config.tools )
+            const tools = ( toolsConfig ) ? toolsConfig.json : payloadTools
+
             const response = await ollama.chat( {
                     model,
                     messages,

package/nodes/ollama-config-format.html

@@ -0,0 +1,30 @@
+<script type="text/javascript">
+    RED.nodes.registerType( 'ollama-config-format', {
+        category: 'config',
+        defaults: {
+            name: { value: 'Ollama Format 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-format">
+    <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 Format 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-format.js

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

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-generate.html

@@ -5,6 +5,7 @@
         defaults: {
             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 },
         },
         inputs: 1,
@@ -27,6 +28,11 @@
         <input type="text" id="node-input-server" />
     </div>
 
+    <div class="form-row">
+        <label for="node-input-format"><i class="fa fa-cog"></i> Format</label>
+        <input type="text" id="node-input-format" />
+    </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" />
@@ -81,7 +87,10 @@
                 <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></dd>
+                <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>
 
                 <dt class="optional">
                     payload.options <span class="property-type">object</span>

package/nodes/ollama-generate.js

@@ -15,7 +15,7 @@ module.exports = function( RED ) {
                 template,
                 raw,
                 images,
-                format,
+                format: payloadFormat,
                 stream,
                 keep_alive,
                 options
@@ -29,6 +29,9 @@ module.exports = function( RED ) {
             const modelConfig = RED.nodes.getNode( config.model )
             const model = ( modelConfig ) ? modelConfig.name : payloadModel
 
+            const formatConfig = RED.nodes.getNode( config.format )
+            const format = ( formatConfig ) ? formatConfig.json : payloadFormat
+
             const response = await ollama.generate( {
                 model,
                 prompt,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-ollama",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "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,7 +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-model": "nodes/ollama-config-model.js",
+      "ollama-config-format": "nodes/ollama-config-format.js",
+      "ollama-config-tools": "nodes/ollama-config-tools.js"
     }
   },
   "engines": {