Update app.py

app.py

@@ -4,14 +4,14 @@ from flask import Flask, render_template, jsonify, request, redirect, url_for, s
 import firebase_admin
 from firebase_admin import credentials, firestore
 import pickle
+import numpy as np
+from twilio.rest import Client
+
 # Initialize Flask app
 app = Flask(__name__)
 app.secret_key = os.urandom(24)  # For session management
 
-
-
-
-
+# Firebase Admin SDK initialization
 cred = credentials.Certificate({
   "type": "service_account",
   "project_id": "snippetscript-37175",
@@ -27,181 +27,77 @@ cred = credentials.Certificate({
 })
 firebase_admin.initialize_app(cred)
 
+# Firestore client
 db = firestore.client()
 
-@app.route('/')
-def index():
-    return render_template('index.html')
-
-@app.route('/user-dashboard.html')
-def user_dashboard():
-    return render_template('user-dashboard.html')
-
-@app.route('/get-previous-results', methods=['GET'])
-def get_previous_results():
-    try:
-        # Simulating a ThingSpeak API call or shared data
-        # response = requests.get("https://api.thingspeak.com/...", params=...)
-        # thingspeak_data = response.json()
-
-        # Returning shared data for all users
-        return jsonify({"status": "success", "data": thingspeak_data})
-    except Exception as e:
-        return jsonify({"status": "error", "message": str(e)})
-
-# @app.route('/login', methods=['POST'])
-# def login():
-#     phone = request.form['loginPhone']
-#     password = request.form['loginPassword']
-
-#     # Query Firestore to find user
-#     users_ref = db.collection('users')
-#     query = users_ref.where('phone', '==', phone).where('password', '==', password)
-    
-#     try:
-#         users = query.stream()
-#         user_list = list(users)
-        
-#         if len(user_list) > 0:
-#             # User found, start session
-#             session['user_phone'] = phone
-#             return redirect(url_for('user_dashboard'))
-#         else:
-#             return "Invalid credentials", 401
-    
-#     except Exception as e:
-#         return str(e), 500
-
-# @app.route('/dashboard')
-# def user_dashboard():
-#     if 'user_phone' not in session:
-#         return redirect(url_for('index'))
-    
-#     # Fetch user details from Firestore
-#     user_ref = db.collection('users').document(session['user_phone'])
-#     user = user_ref.get()
-    
-#     if user.exists:
-#         user_data = user.to_dict()
-#         return render_template('user-dashboard.html', user=user_data)
-#     else:
-        # return "User not found", 404
-
-# @app.route('/admin.html')
-# def admin():
-#     return render_template('admin.html')
-@app.route('/admin.html')
-def admin():
-    # Create a map centered on Delhi
-    delhi_coordinates = [28.6139, 77.2090]
-    folium_map = folium.Map(location=delhi_coordinates, zoom_start=12)
-
-    # Add predefined markers in Delhi
-    markers = [
-        {"name": "India Gate", "coordinates": [28.6129, 77.2295]},
-        {"name": "Red Fort", "coordinates": [28.6562, 77.2410]},
-        {"name": "Qutub Minar", "coordinates": [28.5245, 77.1855]},
-    ]
-
-    # Add markers to the map
-    for marker in markers:
-        folium.Marker(
-            location=marker["coordinates"],
-            popup=marker["name"],
-            icon=folium.Icon(color="blue", icon="info-sign"),
-        ).add_to(folium_map)
-
-    # Use a valid Folium tile layer
-    folium.TileLayer('OpenStreetMap').add_to(folium_map)
-
-    # Add Layer Control for toggling between tile layers
-    folium.LayerControl().add_to(folium_map)
-
-    # Generate the map HTML
-    map_html = folium_map._repr_html_()
-
-    # Render the template with the map
-    return render_template('admin.html', map=map_html)
-
-@app.route('/logout')
-def logout():
-    # Remove the user's phone number from the session
-    session.pop('user_phone', None)
-
-    # Redirect to the index route (function name, not the file name)
-    return redirect(url_for('index'))
-
-
-
-from twilio.rest import Client
-import firebase_admin
-from firebase_admin import credentials, firestore
-
 # Twilio Configuration
 ACCOUNT_SID = 'AC97ad50edcf94fdd7d4576be9651bf4bf'
 AUTH_TOKEN = '6d8b2559ffbbdbc5d06542e545220aaa'
 FROM_PHONE = '+12708175529'
 TO_PHONE = '+916382792828'
-import numpy as np
-import joblib
-# Save model using joblib
 
-# Load model using joblib
-with open('model.pkl','rb') as f:
-  loaded_model=pickle.load( f)
-def predict_conc(pdiff):
-    if pdiff>3.19:
-        return 0
-    pdiff_value = pdiff  # Replace 1.5 with your input value for "Average Potential Difference"
-    new_data = np.array([[pdiff_value]])
-    prediction = loaded_model.predict(new_data)
-    concentration = 10**prediction[0]  # Reverse log transformation
-    return f"{concentration:.4f}"
+# Load model using pickle
+with open('model.pkl', 'rb') as f:
+    loaded_model = pickle.load(f)
 
-    
+def predict_conc(pdiff):
+    try:
+        if pdiff > 3.19:
+            return 0
+        pdiff_value = pdiff  # Input for "Average Potential Difference"
+        new_data = np.array([[pdiff_value]])
+        prediction = loaded_model.predict(new_data)
+        concentration = 10**prediction[0]  # Reverse log transformation
+        return f"{concentration:.4f}"
+    except Exception as e:
+        print(f"Error in predict_conc: {e}")
+        return None
 
-# Function to send SMS using Twilio
-def send_msg(field1,suggestion):
-    # if field;1
-    
+def send_msg(field1, suggestion):
     client = Client(ACCOUNT_SID, AUTH_TOKEN)
     try:
         message = client.messages.create(
             from_=FROM_PHONE,
-            body=f"""Test Results:\nE.coli Level: {field1} CFU/mL.
-Status: safe
-Suggestions:\n
-{suggestion}""",
+            body=f"""Test Results:\nE.coli Level: {field1} CFU/mL.\nStatus: {'safe' if field1 == 0 else 'unsafe'}\nSuggestions:\n{suggestion}""",
             to=TO_PHONE
         )
         print(f"Message sent successfully! SID: {message.sid}")
     except Exception as e:
         print(f"Failed to send message: {e}")
 
-# Firestore Listener for new data in the 'thingspeak_data' collection
 def on_snapshot(doc_snapshot, changes, read_time):
     for change in changes:
-        if change.type.name == 'ADDED':  # Detects new documents added to the collection
+        if change.type.name == 'ADDED':
             new_data = change.document.to_dict()
-            field1 = new_data.get('field1', 'N/A')  # Replace 'field1' with your actual field key
+            field1 = new_data.get('field1')
+            if field1 is None:
+                print("field1 is missing in the document.")
+                continue
+
             print(f"New data detected: {new_data}")
-            concentration=predict_conc(field1)
-            if concentration==0:
-                send_msg(0,"The water is safe for use!!")
-                
+            concentration = predict_conc(float(field1))
+            if concentration == "0":
+                send_msg(0, "The water is safe for use!!")
             else:
-                send_msg(concentration,"You may boil the water to 50°C to eradicate the bacteria.")
-                
-              # Trigger the Twilio SMS function
+                send_msg(concentration, "You may boil the water to 50\u00b0C to eradicate the bacteria.")
 
-# Initialize Firestore Listener
 def start_firestore_listener():
-    thingspeak_ref = db.collection('thingspeak_data')
-    thingspeak_watch = thingspeak_ref.on_snapshot(on_snapshot)
-    print("Listening for new data in Firestore...")
-
+    try:
+        thingspeak_ref = db.collection('thingspeak_data')
+        thingspeak_ref.on_snapshot(on_snapshot)
+        print("Firestore listener started.")
+    except Exception as e:
+        print(f"Error starting Firestore listener: {e}")
 
+@app.route('/')
+def index():
+    return render_template('index.html')
 
+@app.route('/logout')
+def logout():
+    session.pop('user_phone', None)
+    return redirect(url_for('index'))
 
 if __name__ == '__main__':
-    app.run(host='0.0.0.0', port=7860, debug=True)
+    start_firestore_listener()
+    app.run(host='0.0.0.0', port=7860, debug=True)