Update app.py

app.py

@@ -1,10 +1,11 @@
 import os
-import folium
-from flask import Flask, render_template, jsonify, request, redirect, url_for, session
-import firebase_admin
-from firebase_admin import credentials, firestore
+import time
+import requests
 import pickle
 import numpy as np
+from flask import Flask, render_template, redirect, url_for, session
+import firebase_admin
+from firebase_admin import credentials, firestore
 from twilio.rest import Client
 
 # Initialize Flask app
@@ -12,20 +13,10 @@ 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",
-  "private_key_id": "7d509b09fd4ba89f490e0d76a6aa69bf12750739",
-  "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCcFcmms+X9z6xg\n3HXrTsKzqFtCn05jUij4wSnd1ZqoJclWP2H01jiLAzKWGjJaTi6iBOnPT7uPSo8d\nlKe0GjBn9OstHRv1CzEBP1CW4B7jrcZqBbA5nsx/XCkrzgxjJ2OCLmtyBUf/3s7j\nC2bkAu4aGyToZJwuqw1BleXBgevocjkaSW/RvWGlpSTg9OHsgRaGYALw50WzPqdv\nCioW8ioN8IGAM4TIZtsHSayBkruC3PbW+9krnevcx08f3hPi0I2OB51GxKsOGRj8\nVGxb+LUaUaAauCqV9LaCwK9qwtBZopXx2QwbR/vZGgsXk3BvAVsopbmxeyqtj/a4\nc2x7wL17AgMBAAECggEARqXH9afkuGqo09jFmOG31/iigfe4U9VKzTklOY7m5yff\nRyX+MQNLaYRjf7RQyTYs/lGqAJdOxk9RkuqHs8nM0ij1z6Am2NWdczqUwA2mfZhY\nwAFeH96EIjt1OSoUykZ4UGKxaFUCn0paq0KsahT3b6KMpJFxbeAnamGuMlWbkUR4\n1kb1vWVe/XjBMlrDVoOMYvclo/dn7oPmYMtbufrMsdn9eb4JQf1PRfAno6JdE1RB\nHZs5/kkZv8sKXc0lw+RpD35Syl3MTxIAr/PDK8cgnytS5BInZxV2iEcdvNN3/JsC\n7hJPrqb6JOZHl0WnOxXDWvBI8jREoiNTMBqT9JVcCQKBgQDUATBaeLf4ydMOtgLt\nIVuSGto6lSt3hpi85MMYeqRr/MSbltdAEVis8opCTTCBFCQgqdiqXyIKbOvKyn47\n9PLoWciyhK3TJq8u3Oaxfk1wfGdr+Q6/d8LVZQSw1X0wrTOWAdQL9Em78mhpJrvr\nSuwOKjBlP3FgilabeDrfwjFFOQKBgQC8edtC4smOaOU1ovgWFhHumcryrNtCPv9K\nb8A3687+lawzETkQ68xBpuzxRbnW7gFJfk4iVjUErdP21LLvD9hu4e2gmQfVhNQ6\nGT7eBB41l/KVPjSghgMf5fcThBeHCK1C9V9Y56nyqZoQUvbi41cJeXDbK6urtn5L\no7p2gm2sUwKBgQCoV+lVbdZoL5rwa4cXVQ2pjrkLG7hQSQivtddVcM1vEl/sTHLP\n5PZNHqq6yyBg3uVxKm1pm/Ej5im19eUXJwJbji/X0ZNVv7oLtE1bU7eaQq69Bh+3\n2hlT6cs3v86RAHed/gWrGGgUXgCavq8pv2yCMu4K973HsxHiki3tz/3fwQKBgHvr\nHocmduDEBNe0E6rpzdZzlWTi07IFm3IEcXwS9WCbZcGZtEx0zDHqH2Uus9YlXAFH\nIvYeefNemrtx80eMwn982fC6TNVM5QBh8tykFnykL6GCabWVBt7lIwLY2WM2CDy6\n+XqJrkpWym2rLpnUYThgeRwQ5WkbroPq3UDn1lXzAoGBAJVQ9pe4KCfkFP+lX7eq\n8KXFnBuVB5EQ+VDrob9KyaGRyJ5mxYqMgQc9xgYhUSGmwzkXdB3hdsCRwft5n6rr\nKNerrFH+yUwBQUXaJCY2gSUOGbKUfKGdFjoITTlpZAxnkvojk9OKz8c2HlBdE0yL\nQrbuvPr0goYJXoZj3mbDp9lO\n-----END PRIVATE KEY-----\n",
-  "client_email": "firebase-adminsdk-cf1z8@snippetscript-37175.iam.gserviceaccount.com",
-  "client_id": "103525651848757260255",
-  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
-  "token_uri": "https://oauth2.googleapis.com/token",
-  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
-  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-adminsdk-cf1z8%40snippetscript-37175.iam.gserviceaccount.com",
-  "universe_domain": "googleapis.com"
-})
-firebase_admin.initialize_app(cred)
+FIREBASE_CREDENTIALS_PATH = r"snippetscript-37175-firebase-adminsdk-cf1z8-7d509b09fd.json"
+if not firebase_admin._apps:
+    cred = credentials.Certificate(FIREBASE_CREDENTIALS_PATH)
+    firebase_admin.initialize_app(cred)
 
 # Firestore client
 db = firestore.client()
@@ -40,6 +31,14 @@ TO_PHONE = '+916382792828'
 with open('model.pkl', 'rb') as f:
     loaded_model = pickle.load(f)
 
+# ThingSpeak Configuration
+THINGSPEAK_API_KEY = "P54KXM40TA3CB6W4"
+CHANNEL_ID = "2784385"
+
+# Global variable to track the last entry ID
+last_entry_id = None
+
+
 def predict_conc(pdiff):
     try:
         if pdiff > 3.19:
@@ -53,6 +52,7 @@ def predict_conc(pdiff):
         print(f"Error in predict_conc: {e}")
         return None
 
+
 def send_msg(field1, suggestion):
     client = Client(ACCOUNT_SID, AUTH_TOKEN)
     try:
@@ -65,6 +65,7 @@ def send_msg(field1, suggestion):
     except Exception as e:
         print(f"Failed to send message: {e}")
 
+
 def on_snapshot(doc_snapshot, changes, read_time):
     for change in changes:
         if change.type.name == 'ADDED':
@@ -77,10 +78,11 @@ def on_snapshot(doc_snapshot, changes, read_time):
             print(f"New data detected: {new_data}")
             concentration = predict_conc(float(field1))
             if concentration == "0":
-                send_msg(0, "The water is safe for use!!")
+                send_msg(0, "The water is safe for use!")
             else:
                 send_msg(concentration, "You may boil the water to 50\u00b0C to eradicate the bacteria.")
 
+
 def start_firestore_listener():
     try:
         thingspeak_ref = db.collection('thingspeak_data')
@@ -89,82 +91,47 @@ def start_firestore_listener():
     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'))
-
-
-
-import requests
-import firebase_admin
-from firebase_admin import credentials, firestore
-import time
-
-# Replace with your actual credentials
-THINGSPEAK_API_KEY = "P54KXM40TA3CB6W4"
-CHANNEL_ID = "2784385"
-FIREBASE_CREDENTIALS_PATH = r"snippetscript-37175-firebase-adminsdk-cf1z8-7d509b09fd.json"
-
-# Global variable to track the last entry ID
-last_entry_id = None
-
-def initialize_firebase():
-    """Initialize Firebase connection"""
-    try:
-        # Initialize Firebase app (only once)
-        cred = credentials.Certificate(FIREBASE_CREDENTIALS_PATH)
-        firebase_admin.initialize_app(cred)
-        
-        # Create Firestore client
-        return firestore.client()
-    except Exception as e:
-        print(f"Firebase initialization error: {e}")
-        return None
 
 def fetch_thingspeak_data():
     """Fetch data from ThingSpeak"""
     global last_entry_id
     try:
-        url = f"https://api.thingspeak.com/channels/2784385/feeds.json?api_key=P54KXM40TA3CB6W4"
+        url = f"https://api.thingspeak.com/channels/{CHANNEL_ID}/feeds.json?api_key={THINGSPEAK_API_KEY}"
         response = requests.get(url)
         response.raise_for_status()  # Raise an exception for bad responses
         data = response.json()
-        
+
         # Check if there are feeds
         if not data.get('feeds'):
             print("No new feeds found.")
             return None
-        
+
         # Get the latest feed
         latest_feed = data['feeds'][-1]
-        
+
         # Check if this is a new entry
         current_entry_id = latest_feed.get('entry_id')
-        
+
         if current_entry_id != last_entry_id:
             last_entry_id = current_entry_id
             return latest_feed
-        
+
         print("No new entries since last check.")
         return None
-    
+
     except requests.RequestException as e:
         print(f"ThingSpeak data fetch error: {e}")
         return None
 
-def store_data_in_firestore(firestore_client, data):
+
+def store_data_in_firestore(data):
     """Store data in Firestore"""
     try:
         # Validate data
         if not data:
             print("No data to store.")
             return
-        
+
         # Create a document with timestamp
         doc_data = {
             'field1': data.get('field1'),
@@ -172,38 +139,48 @@ def store_data_in_firestore(firestore_client, data):
             'entry_id': data.get('entry_id'),
             'timestamp': firestore.SERVER_TIMESTAMP
         }
-        
+
         # Add to Firestore collection
-        firestore_client.collection('thingspeak_data').add(doc_data)
+        db.collection('thingspeak_data').add(doc_data)
         print("New data successfully stored in Firestore")
     except Exception as e:
         print(f"Firestore storage error: {e}")
 
 
-firestore_client = initialize_firebase()
+@app.route('/')
+def index():
+    return render_template('index.html')
 
-if not firestore_client:
-    print("Failed to initialize Firestore. Exiting.")
-    return
 
-# Main data collection loop
-try:
-    while True:
-        # Fetch data from ThingSpeak
-        thingspeak_data = fetch_thingspeak_data()
-        
-        if thingspeak_data:
-            # Store data in Firestore only if there's a new entry
-            store_data_in_firestore(firestore_client, thingspeak_data)
-        
-        # Wait before next iteration
-        time.sleep(5)  # Adjust interval as needed
+@app.route('/logout')
+def logout():
+    session.pop('user_phone', None)
+    return redirect(url_for('index'))
 
-except KeyboardInterrupt:
-    print("Data collection stopped by user.")
-except Exception as e:
-    print(f"Unexpected error: {e}")
 
 if __name__ == '__main__':
-    start_firestore_listener()
+    # Start the Firestore listener in a separate thread
+    import threading
+    listener_thread = threading.Thread(target=start_firestore_listener)
+    listener_thread.start()
+
+    # Main data collection loop
+    try:
+        while True:
+            # Fetch data from ThingSpeak
+            thingspeak_data = fetch_thingspeak_data()
+
+            if thingspeak_data:
+                # Store data in Firestore only if there's a new entry
+                store_data_in_firestore(thingspeak_data)
+
+            # Wait before next iteration
+            time.sleep(5)  # Adjust interval as needed
+
+    except KeyboardInterrupt:
+        print("Data collection stopped by user.")
+    except Exception as e:
+        print(f"Unexpected error: {e}")
+
+    # Run Flask app
     app.run(host='0.0.0.0', port=7860, debug=True)