node-red-contrib-prib-functions 0.23.2 → 0.26.0

package/lib/timeDimension.js

@@ -0,0 +1,36 @@
+const timePeriod={second:1000}
+timePeriod.minute=timePeriod.second*60
+timePeriod.hour=timePeriod.minute*60
+timePeriod.day=timePeriod.hour*24
+timePeriod.week=timePeriod.day*7
+timePeriod.fortnight=timePeriod.week*2
+
+const isPeriod={
+  second:t=>t%timePeriod.second,
+  minute:t=>t%timePeriod.minute
+}
+
+
+
+const timeDimension=(period=timePeriod.second,from=0,to=60,call)=>{
+  const fromDate=new Date(from).getMilliseconds%period
+  const toDate=new Date(to).getMilliseconds%increment
+  const periods=Object.keys(callFunctions)
+  for(let i=fromDate;i<toDate;i+increment){
+    call(i)
+  }
+}
+
+const repeat=(r,call)=>{for(let i=0;i<r; i++) call(i)}
+const secondsInMinute=call=>repeat(60,call)
+const minutesInHour=repeat(60,call)
+const hoursInDay=repeat(24,call)
+const daysInWeek=repeat(7,call)
+
+module.exports={
+  repeat:repeat,
+  secondsInMinute:secondsInMinute,
+  minutesInHour:minutesInHour,
+  hoursInDay:hoursInDay,
+  daysInWeek:daysInWeek
+}

package/lib/typedInput.js

@@ -1,3 +1,4 @@
+const { get } = require("http");
 
 const setGetFunction=(RED,node,propertyName)=>node["get"+propertyName[0].toUpperCase() + propertyName.slice(1)]=getFunction(RED,node,propertyName)
 
@@ -69,9 +70,24 @@ const setFunction=(RED,node,name)=>{
 
 const getValue=(RED,node,propertyName,defaultValue)=>propertyName in node?getFunction(RED,node,propertyName)():defaultValue
 
+const getArgFunctions=(RED,node,msg,propertyNames)=>{
+    const args=[]
+    propertyNames.forEach(property => {
+        args.push(node["get"+property])
+    });
+    return args
+}
+
+const getArgs=(RED,node,msg,propertyNames,argFunctions=getArgFunctions(RED,node,propertyNames))=>
+    argFunctions.reduce((args,propertyFunction)=>propertyFunction(RED,node,msg),[])
+const getArgsFromFunctions=(RED,node,msg,argFunctions)=>argFunctions.reduce((args,propertyFunction)=>propertyFunction(RED,node,msg),[])
+
 module.exports={
+    getArgs:getArgs,
+    getArgsFromFunctions:getArgsFromFunctions,
+    getArgFunctions:getArgFunctions,
     getFunction:getFunction,
+    getValue:getValue,
     setFunction:setFunction,
-    setGetFunction:setGetFunction,
-    getValue:getValue
+    setGetFunction:setGetFunction
 }

package/logisticRegression/icons/logisticregression.svg

@@ -0,0 +1,22 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+  <!-- Background -->
+  <rect width="32" height="32" fill="none"/>
+  
+  <!-- Axes -->
+  <line x1="4" y1="24" x2="28" y2="24" stroke="#666" stroke-width="1"/>
+  <line x1="4" y1="4" x2="4" y2="24" stroke="#666" stroke-width="1"/>
+  
+  <!-- Sigmoid curve (logistic function) -->
+  <path d="M 4 22 Q 8 20, 12 18 Q 16 14, 16 12 Q 16 10, 20 6 Q 24 4, 28 4" 
+        fill="none" stroke="#0066cc" stroke-width="2" stroke-linecap="round"/>
+  
+  <!-- Data points -->
+  <circle cx="8" cy="20" r="1.5" fill="#ff6600"/>
+  <circle cx="12" cy="16" r="1.5" fill="#ff6600"/>
+  <circle cx="16" cy="12" r="1.5" fill="#ff6600"/>
+  <circle cx="20" cy="8" r="1.5" fill="#ff6600"/>
+  <circle cx="24" cy="5" r="1.5" fill="#ff6600"/>
+  
+  <!-- Horizontal dashed line at 0.5 threshold -->
+  <line x1="4" y1="14" x2="28" y2="14" stroke="#999" stroke-width="0.5" stroke-dasharray="2,2"/>
+</svg>

package/logisticRegression/logisticRegression.html

@@ -0,0 +1,136 @@
+<script type="text/javascript">
+    RED.nodes.registerType('logisticRegression', {
+        category: 'function',
+        color: '#a6bbcf',
+        defaults: {
+            name: {value:"", required:false},
+            modelName: {value:"", required:true},
+            action: {value:"predict", required:true},
+            learningRate: {value:0.1, required:false},
+            iterations: {value:2000, required:false},
+            fitIntercept: {value:true, required:false},
+            l2: {value:0.0, required:false},
+            tolerance: {value:1e-7, required:false},
+            verbose: {value:false, required:false},
+            threshold: {value:0.5, required:false}
+        },
+        inputs: 1,
+        inputLabels: "in",
+		outputs:1,
+        outputLabels: ["Result"],
+		paletteLabel: "Logistic Regression",
+        icon: "logisticregression.svg",
+        label: function() {
+            return this.name || (this.action + " Logistic Regression");
+        },
+        labelStyle: function() {
+            return "node_label_italic";
+        },
+        oneditprepare: function() {
+            const node = this;
+            $("#node-input-action").change(function() {
+                const action = $(this).val();
+                if (action === 'fit') {
+                    $("#fit-params").show();
+                    $("#predict-params").hide();
+                } else {
+                    $("#fit-params").hide();
+                    $("#predict-params").show();
+                }
+            });
+            $("#node-input-action").change(); // trigger on load
+        }
+    });
+</script>
+
+<script type="text/x-red" data-template-name="logisticRegression">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Name">
+    </div>
+    <div class="form-row">
+        <label for="node-input-modelName"><i class="fa fa-database"></i> Model</label>
+        <input type="text" id="node-input-modelName" data-type="flow" data-value="">
+    </div>
+    <div class="form-row">
+        <label for="node-input-action"><i class="fa fa-cogs"></i> Action</label>
+        <select type="text" id="node-input-action">
+            <option value="fit">Fit Model</option>
+            <option value="predict">Predict Class</option>
+            <option value="predictProba">Predict Probability</option>
+        </select>
+    </div>
+    <div id="fit-params">
+        <div class="form-row">
+            <label for="node-input-learningRate">Learning Rate</label>
+            <input type="number" id="node-input-learningRate" step="0.01">
+        </div>
+        <div class="form-row">
+            <label for="node-input-iterations">Iterations</label>
+            <input type="number" id="node-input-iterations">
+        </div>
+        <div class="form-row">
+            <label for="node-input-fitIntercept">Fit Intercept</label>
+            <input type="checkbox" id="node-input-fitIntercept" checked>
+        </div>
+        <div class="form-row">
+            <label for="node-input-l2">L2 Regularization</label>
+            <input type="number" id="node-input-l2" step="0.01">
+        </div>
+        <div class="form-row">
+            <label for="node-input-tolerance">Tolerance</label>
+            <input type="number" id="node-input-tolerance" step="1e-8">
+        </div>
+        <div class="form-row">
+            <label for="node-input-verbose">Verbose</label>
+            <input type="checkbox" id="node-input-verbose">
+        </div>
+    </div>
+    <div id="predict-params" style="display:none;">
+        <div class="form-row">
+            <label for="node-input-threshold">Threshold (for predict)</label>
+            <input type="number" id="node-input-threshold" step="0.01" min="0" max="1">
+        </div>
+    </div>
+</script>
+
+<script type="text/x-red" data-help-name="logisticRegression">
+    <p>Logistic Regression node for binary classification using gradient descent optimization.</p>
+    
+    <h3>Actions</h3>
+    <ul>
+        <li><b>Fit Model:</b> Train the model with training data. Input msg.payload should be: 
+            <pre>{X: [[feature1, feature2, ...], ...], y: [0, 1, 0, ...]}</pre>
+            where X is array of feature vectors and y is array of binary labels (0 or 1)</li>
+        <li><b>Predict Class:</b> Predict class labels (0 or 1) for input features. Input msg.payload should be array of feature vectors: 
+            <pre>[[feature1, feature2, ...], ...]</pre></li>
+        <li><b>Predict Probability:</b> Predict probabilities for class 1. Same input format as Predict Class, returns array of probabilities between 0 and 1</li>
+    </ul>
+
+    <h3>Configuration Parameters</h3>
+    <ul>
+        <li><b>Learning Rate:</b> Step size for gradient descent optimization (default: 0.1). Smaller values lead to slower convergence, larger values may overshoot.</li>
+        <li><b>Iterations:</b> Number of gradient descent iterations for model training (default: 2000). More iterations allow better convergence.</li>
+        <li><b>Fit Intercept:</b> Whether to fit an intercept (bias) term in the model (default: true).</li>
+        <li><b>L2 Regularization:</b> Regularization parameter to prevent overfitting (default: 0.0). Higher values apply stronger regularization.</li>
+        <li><b>Tolerance:</b> Convergence tolerance for optimization (default: 1e-7). Algorithm stops when cost change is below this threshold.</li>
+        <li><b>Verbose:</b> Enable logging of training progress (default: false).</li>
+        <li><b>Threshold:</b> Decision threshold for class prediction (default: 0.5). Probabilities >= threshold predict class 1, otherwise class 0.</li>
+    </ul>
+
+    <h3>Model Storage</h3>
+    <p><b>Model:</b> Required name for the logistic regression model. For fit actions, this specifies where to store the trained model in the flow context. For predict actions, this selects which fitted model to use from the flow context. The dropdown shows all available flow context variables - select an existing fitted model or enter a new name to create one.</p>
+    <p>Models are stored in the flow context and can be shared between multiple Logistic Regression nodes in the same flow. Fit a model with one node, then use the same model name in predict nodes to make predictions.</p>
+
+    <h3>Example Payload</h3>
+    <p><b>For Fit:</b></p>
+    <pre>{
+  "X": [[0, 0], [0, 1], [1, 0], [1, 1]],
+  "y": [0, 1, 1, 1]
+}</pre>
+    <p><b>For Predict:</b></p>
+    <pre>[[0.5, 0.5], [1, 1]]</pre>
+
+    <h3>Output</h3>
+    <p>Results are returned in msg.result with appropriate format (fitted model confirmation for fit, predictions array for predict/predictProba).</p>
+</script>

package/logisticRegression/logisticRegression.js

@@ -0,0 +1,83 @@
+const logger = new (require("node-red-contrib-logger"))("Logistic Regression");
+logger.sendInfo("Copyright 2025 Jaroslav Peter Prib");
+
+const LogisticRegression = require('logisticegression');
+const actions = {
+	fit: (RED, node, msg) => {
+		if (!node.modelName) {
+			throw new Error("Model name is required for fitting");
+		}
+		if (!msg.payload || !msg.payload.X || !msg.payload.y) {
+			throw new Error("For fit, msg.payload must contain X and y arrays");
+		}
+		const model = new LogisticRegression({
+			learningRate: node.learningRate,
+			iterations: node.iterations,
+			fitIntercept: node.fitIntercept,
+			l2: node.l2,
+			tolerance: node.tolerance,
+			verbose: node.verbose
+		});
+		model.fit(msg.payload.X, msg.payload.y);
+		node.context().flow.set(node.modelName, model);
+		return "Model fitted and stored as: " + node.modelName;
+	},
+	predict: (RED, node, msg) => {
+		if (!node.modelName) {
+			throw new Error("Model name is required for prediction");
+		}
+		const model = node.context().flow.get(node.modelName);
+		if (!model) {
+			throw new Error("Model '" + node.modelName + "' not found. Please fit the model first.");
+		}
+		if (!Array.isArray(msg.payload)) {
+			throw new Error("For predict, msg.payload must be array of features");
+		}
+		return model.predict(msg.payload);
+	},
+	predictProba: (RED, node, msg) => {
+		if (!node.modelName) {
+			throw new Error("Model name is required for prediction");
+		}
+		const model = node.context().flow.get(node.modelName);
+		if (!model) {
+			throw new Error("Model '" + node.modelName + "' not found. Please fit the model first.");
+		}
+		if (!Array.isArray(msg.payload)) {
+			throw new Error("For predictProba, msg.payload must be array of features");
+		}
+		return model.predictProba(msg.payload);
+	}
+}
+
+module.exports = function (RED) {
+	function LogisticRegressionNode(config) {
+		RED.nodes.createNode(this, config);
+		const node = Object.assign(this, config,{
+			learningRate: 0.1,
+			iterations: 2000,
+			fitIntercept: true,
+			l2: 0.0,
+			tolerance: 1e-7,
+			verbose: false
+		});
+		node.callFunction = actions[config.action];
+		if (!node.callFunction) {
+			node.error("Unknown action: " + config.action);
+			node.status({ fill: "red", shape: "ring", text: "Unknown action: " + config.action });
+			return;
+		}
+		node.status({ fill: "yellow", shape: "ring", text: "model not fitted" });
+		node.on('input', function (msg) {
+			try {
+				msg.result = node.callFunction(RED, node, msg);
+				node.send(msg);
+				node.status({ fill: "green", shape: "dot", text: "Done" });
+			} catch (error) {
+				node.error(error.message, msg);
+				node.status({ fill: "red", shape: "ring", text: error.message });
+			}
+		});
+	}
+	RED.nodes.registerType("logisticRegression", LogisticRegressionNode);
+};

package/package.json

@@ -1,33 +1,36 @@
 {
 	"name": "node-red-contrib-prib-functions",
-	"version": "0.23.2",
+	"version": "0.26.0",
 	"description": "Node-RED added node functions.",
 	"dependencies": {
 		"avsc": ">=5.7.7",
 		"compressiontool": "*",
 		"fast-xml-parser": "^5.2.1",
+		"logisticegression": "git+https://gitlab.com/peter.prib/logisticregression.git",
 		"node": ">=22.15.0",
 		"node-red-contrib-logger": "latest",
 		"node-red-contrib-noderedbase": ">=0.0.16",
 		"node-red-contrib-prib-functions": "file:",
+		"node-red-node-data-generator":">=1.0.1",
 		"npm": "^11.3.0",
 		"xlsx": "*"
 	},
 	"devDependencies": {
 		"@node-red/runtime": ">=4.0.9",
 		"axios": ">=1.9.0",
-		"bcrypt": "^5.1.1",
 		"bl": "^6.1.0",
-		"mocha": "^11.2.2",
+		"should": ">=8.x",
 		"node-red": ">=4.0.9",
 		"node-red-node-test-helper": ">=0.3.4"
 	},
 	"scripts": {
-		"test": "mocha \"test/dataAnalysisE*.js\"",
-		"test2": "mocha \"test/transformNum*.js\"",
-		"test00": "mocha \"test/00*.js\"",
-		"test04": "mocha \"test/04*.js\"",
-		"startNodeRed": "node-red --userDir ./test/data --setting ./test/data/settings.js ./test/data/flow.json --title '***test nodered***'"
+		"test": "node test-runner.js",
+		"testLogisticRegression": "node test-runner.js",
+		"testTransform": "node test-runner.js transform",
+		"testDataAnalysis": "node test-runner.js dataanalysis",
+		"testColumnar": "node test-runner.js columnar",
+		"startNodeRed": "node-red --userDir ./test/data --setting ./test/data/settings.js ./test/data/flow.json --title '***test nodered***'",
+		"sharesNodeRed": "node-red --userDir ./test/data/shares --setting ./test/data/shares/settings.js ./test/data/shares/flow.json --title '***shares nodered***'"
 	},
 	"repository": {
 		"type": "git",
@@ -47,6 +50,9 @@
 		"ARMIA",
 		"arvo",
 		"backward substitution",
+		"columnar",
+		"columnar data",
+		"columnar storage",
 		"compare",
 		"Complement Minor",
 		"compression",
@@ -84,6 +90,7 @@
 		"levenshtein distance",
 		"load",
 		"load injector",
+		"logistic regression",
 		"matrix",
 		"maximum",
 		"mean",
@@ -108,6 +115,7 @@
 		"skew",
 		"SMA",
 		"snappy",
+		"sql",
 		"standard deviation",
 		"standardize",
 		"statistics",
@@ -138,9 +146,11 @@
 		"version": ">=2.0.0",
 		"nodes": {
 			"append": "append/append.js",
+			"filesystem": "filesystem/filesystem.js",
 			"dataAnalysis": "dataAnalysis/dataAnalysis.js",
 			"hostAvailable": "testing/hostAvailable.js",
 			"levenshteinDistance": "levenshteinDistance/levenshteinDistanceNode.js",
+			"logisticRegression": "logisticRegression/logisticRegression.js",
 			"load-injector": "testing/load-injector.js",
 			"matrix": "matrix/matrixNode.js",
 			"monitorflow": "monitor/monitorflow.js",
@@ -148,7 +158,9 @@
 			"os": "nodejs/os.js",
 			"spawnProcess": "spawnProcess/spawnProcess.js",
 			"test": "testing/test.js",
-			"transform": "transform/transform.js"
+			"transform": "transform/transform.js",
+			"gitlab": "gitlab/gitlab.js",
+			"columnar": "columnar/columnar.js"
 		}
 	},
 	"author": "Peter Prib",

package/test/02-graphdb.js

@@ -0,0 +1,46 @@
+const assert=require('assert')
+const should=require("should")
+const GraphDB = require('../lib/GraphDB.js')
+
+describe('GraphDB', function() {
+    it("define vertices", function(done) {
+        const graphDB=new GraphDB()
+        assert.equal(graphDB.getVerticesCount(),0)
+        assert.equal(graphDB.getEdgesCount(),0)
+        graphDB.addVertex({id:"a"})
+        assert.equal(graphDB.getVerticesCount(),1)
+        graphDB.addVertex({id:"b"})
+        assert.equal(graphDB.getVerticesCount(),2)
+        done()
+    });
+    const graphDB=new GraphDB()
+    const a=graphDB.addVertex({id:"a",name:"aname"})
+    const b=graphDB.addVertex({id:"b",name:"bname"})
+    const c=graphDB.addVertex({id:"c",name:"cname"})
+    it("find vertices", function(done) {
+        assert.deepEqual(graphDB.getVertices(v=>v.id=="d"),[])
+        assert.deepEqual(graphDB.getVertices(v=>v.id=="a"),[a])
+        assert.deepEqual(graphDB.getVertices(v=>v.id=="c"),[c])
+        assert.deepEqual(graphDB.getVertices(v=>v.id=="a"||v.id=="c"),[a,c])
+        done()
+    });
+    const ea=graphDB.addEdge(a,b,{id:"ea",name:"eaname"})
+    const eb=graphDB.addEdge(b,c,{id:"eb",name:"ebname"})
+    const ec=graphDB.addEdge(a,c,{id:"ec",name:"ecname"})
+     it("define edges", function(done) {
+        assert.throws(graphDB.addEdge({}),Error("from not type Vertex"))
+        assert.throws(graphDB.addEdge(a,{}),Error("to not type Vertex"))
+        assert.equal(graphDB.getEdgesCount(),0)
+        graphDB.addEdge(a,b)
+        assert.equal(graphDB.getEdgesCount(),1)
+        graphDB.addEdge(b,c,{cost:1})
+        assert.equal(graphDB.getEdgesCount(),2)
+        done()
+    });
+    it("find edges", function(done) {
+        assert.deepEqual(graphDB.getEdges(e=>e.id=="ed"),[])
+        assert.deepEqual(graphDB.getEdges(e=>e.id=="ea"),[a])
+        assert.deepEqual(graphDB.getEdges(e=>e.id=="ec"),[c])
+        assert.deepEqual(graphDB.getEdges(e=>e.id=="ea"||e.id=="ec"),[ea,ec])
+    });
+})