Update app.py

app.py

@@ -14,9 +14,7 @@ app.secret_key = os.urandom(24)  # For session management
 
 # Firebase Admin SDK initialization
 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)
+firebase_admin.initialize_app(cred)
 
 # Firestore client
 db = firestore.client()
@@ -31,14 +29,6 @@ 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:
@@ -52,7 +42,6 @@ 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,7 +54,6 @@ 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':
@@ -78,11 +66,10 @@ 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')
@@ -91,47 +78,82 @@ 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/{CHANNEL_ID}/feeds.json?api_key={THINGSPEAK_API_KEY}"
+        url = f"https://api.thingspeak.com/channels/2784385/feeds.json?api_key=P54KXM40TA3CB6W4"
         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(data):
+def store_data_in_firestore(firestore_client, 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'),
@@ -139,48 +161,38 @@ def store_data_in_firestore(data):
             'entry_id': data.get('entry_id'),
             'timestamp': firestore.SERVER_TIMESTAMP
         }
-
+        
         # Add to Firestore collection
-        db.collection('thingspeak_data').add(doc_data)
+        firestore_client.collection('thingspeak_data').add(doc_data)
         print("New data successfully stored in Firestore")
     except Exception as e:
         print(f"Firestore storage error: {e}")
 
 
-@app.route('/')
-def index():
-    return render_template('index.html')
+firestore_client = initialize_firebase()
 
+if not firestore_client:
+    print("Failed to initialize Firestore. Exiting.")
+    return
 
-@app.route('/logout')
-def logout():
-    session.pop('user_phone', None)
-    return redirect(url_for('index'))
+# 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
 
+except KeyboardInterrupt:
+    print("Data collection stopped by user.")
+except Exception as e:
+    print(f"Unexpected error: {e}")
 
 if __name__ == '__main__':
-    # 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
+    start_firestore_listener()
     app.run(host='0.0.0.0', port=7860, debug=True)