add1

scripts/simulateSensors.js

@@ -23,7 +23,7 @@ function generateReading(sensorId) {
     sensorId,
     timestamp: new Date().toISOString(),
     pH: (6.5 + Math.random() * 2).toFixed(2),
-    turbidity: (Math.random() * 10).toFixed(2),
+    turbidity: (100+Math.random() * 10).toFixed(2),
     temperature: (15 + Math.random() * 15).toFixed(2),
     hardness: (50 + Math.random() * 200).toFixed(2),
   };

services/mqttIngestion.js

@@ -53,7 +53,7 @@ async function getPotability(pH, hardness, turbidity, temperature) {
     try {
       // Step 1: Make initial API call to get EVENT_ID
       const postData = JSON.stringify({
-        data: [pH, turbidity, temperature, hardness]
+        data: [pH, hardness, turbidity, temperature]
       });
 
       const options = {
@@ -98,29 +98,34 @@ async function getPotability(pH, hardness, turbidity, temperature) {
 
                   for (const line of lines) {
                     if (!line.startsWith('data:')) continue;
-
+                    
                     const jsonStr = line.replace('data:', '').trim();
-                    const json = JSON.parse(jsonStr);
-                    if (Array.isArray(json) && json.length > 0) {
-                      lastValue = json[json.length - 1];
+                    if (!jsonStr) continue;
+                    
+                    try {
+                      const json = JSON.parse(jsonStr);
+                      if (Array.isArray(json) && json.length > 0) {
+                        // Find the string output that contains 'Probabilities'
+                        const validStr = json.find(s => typeof s === 'string' && s.includes('Probabilities'));
+                        if (validStr) {
+                          lastValue = validStr;
+                        }
+                      }
+                    } catch (e) {
+                      // ignore parse errors for partial chunks
                     }
                   }
 
-                  if (typeof lastValue !== 'string') {
-                    console.error('✗ Unexpected prediction payload:', lastValue);
-                    resolve(null);
-                    return;
-                  }
-
-                  if (!lastValue.includes('Probabilities')) {
-                    console.error('✗ Potability API returned an error or invalid response:', lastValue);
+                  if (!lastValue) {
+                    console.error('✗ Potability API returned an error or invalid response:', predData);
                     resolve(null);
                     return;
                   }
 
                   const match = lastValue.match(/ Potable:\s*([0-9.]+)/);
                   
-                  const potability = match ? 1-parseFloat(match[1]) : null;
+                  // Extract the Potable probability directly
+                  const potability = match ? parseFloat(match[1]) : null;
 
                   if (potability === null || Number.isNaN(potability)) {
                     console.error('✗ Could not extract Potable confidence from prediction:', lastValue);
@@ -184,7 +189,7 @@ async function processMessage(topic, message) {
     
     // Get potability prediction from external API
     console.log('🔄 Fetching potability prediction...');
-    const potability = await getPotability(data.pH, data.turbidity, data.temperature, data.hardness);
+    const potability = await getPotability(data.pH, data.hardness, data.turbidity, data.temperature);
 
     if (potability !== null && typeof potability === 'number' && !Number.isNaN(potability)) {
       data.potability = potability;

test_api.js

@@ -0,0 +1,39 @@
+const https = require('https');
+
+const POTABILITY_API = 'https://dpv007-newclear.hf.space/gradio_api/call/predict_potability';
+
+function test(pH, hardness, turbidity, temperature) {
+  const postData = JSON.stringify({
+    data: [pH, hardness, turbidity, temperature]
+  });
+
+  const options = {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'Content-Length': Buffer.byteLength(postData)
+    }
+  };
+
+  const req = https.request(POTABILITY_API, options, (res) => {
+    let data = '';
+    res.on('data', chunk => data += chunk);
+    res.on('end', () => {
+      console.log("POST Response:", data);
+      const eventId = JSON.parse(data).event_id;
+      
+      const predReq = https.request(`${POTABILITY_API}/${eventId}`, {method: 'GET'}, (predRes) => {
+        let predData = '';
+        predRes.on('data', chunk => predData += chunk);
+        predRes.on('end', () => {
+          console.log("GET Response:", predData);
+        });
+      });
+      predReq.end();
+    });
+  });
+  req.write(postData);
+  req.end();
+}
+
+test(6.96, 108.95, 15.57, 90.33);