Update app.py

app.py

@@ -355,27 +355,49 @@ app.config['UPLOAD_FOLDER'] = UPLOAD_FOLDER
 # Zapier webhook settings
 ZAPIER_WEBHOOK_URL = os.getenv('ZAPIER_WEBHOOK_URL')  # Load webhook URL from environment variable
 
+def send_to_zapier(image_path):
+    if not ZAPIER_WEBHOOK_URL:
+        logging.error("Zapier webhook URL not set.")
+        return {"error": "Zapier webhook URL not set. Please set the ZAPIER_WEBHOOK_URL environment variable."}
+    try:
+        payload = {
+            'image_url': request.url_root + image_path,
+            'filename': os.path.basename(image_path),
+            'content_type': 'image/jpeg'
+        }
+
+        session = requests.Session()
+        retries = Retry(total=3, backoff_factor=1, status_forcelist=[502, 503, 504])
+        session.mount('https://', HTTPAdapter(max_retries=retries))
+        logging.debug(f"Sending image URL to Zapier webhook: {ZAPIER_WEBHOOK_URL}")
+        response = session.post(ZAPIER_WEBHOOK_URL, json=payload, timeout=10)
+        response.raise_for_status()
+        logging.debug("Image URL sent to Zapier successfully.")
+        return {"status": "success"}
+    except requests.exceptions.RequestException as e:
+        logging.error(f"Failed to send to Zapier: {str(e)}")
+        if e.response is not None:
+            logging.error(f"Response details: {e.response.text}")
+        return {"error": f"Failed to send to Zapier: {str(e)}"}
+
 
 
 @app.route('/camera')
 def camera():
-    return render_template('camera.html')  # Render the camera capture page
+    return render_template('camera.html')
 
 @app.route('/capture', methods=['POST'])
 def capture():
     try:
-        # Get the base64 encoded image from the request
         data = request.form['image']
         header, encoded = data.split(",", 1)
         binary_data = base64.b64decode(encoded)
         
-        # Save the image to the server
         filename = f"capture_{len(os.listdir(app.config['UPLOAD_FOLDER'])) + 1}.jpg"
         filepath = os.path.join(app.config['UPLOAD_FOLDER'], filename)
         with open(filepath, "wb") as f:
             f.write(binary_data)
         
-        # Return the URL of the saved image
         image_url = f"/{filepath}"
         return jsonify({
             'status': 'success',
@@ -388,12 +410,10 @@ def capture():
 @app.route('/upload_zapier', methods=['POST'])
 def upload_zapier():
     try:
-        # Get the image URL from the request
         image_url = request.form['image_url']
         if not image_url.startswith('/static/captures/'):
             return jsonify({'status': 'error', 'message': 'Invalid image path.'})
         
-        # Send the image URL to Zapier
         result = send_to_zapier(image_url.lstrip('/'))
         if 'error' in result:
             return jsonify({'status': 'error', 'message': result['error']})
@@ -402,30 +422,6 @@ def upload_zapier():
         logging.error(f"Error in upload_zapier: {str(e)}")
         return jsonify({'status': 'error', 'message': str(e)})
 
-def send_to_zapier(image_path):
-    if not ZAPIER_WEBHOOK_URL:
-        logging.error("Zapier webhook URL not set.")
-        return {"error": "Zapier webhook URL not set. Please set the ZAPIER_WEBHOOK_URL environment variable."}
-    try:
-        payload = {
-            'image_url': request.url_root + image_path,
-            'filename': os.path.basename(image_path),
-            'content_type': 'image/jpeg'
-        }
-
-        session = requests.Session()
-        retries = Retry(total=3, backoff_factor=1, status_forcelist=[502, 503, 504])
-        session.mount('https://', HTTPAdapter(max_retries=retries))
-        logging.debug(f"Sending image URL to Zapier webhook: {ZAPIER_WEBHOOK_URL}")
-        response = session.post(ZAPIER_WEBHOOK_URL, json=payload, timeout=10)
-        response.raise_for_status()
-        logging.debug("Image URL sent to Zapier successfully.")
-        return {"status": "success"}
-    except requests.exceptions.RequestException as e:
-        logging.error(f"Failed to send to Zapier: {str(e)}")
-        if e.response is not None:
-            logging.error(f"Response details: {e.response.text}")
-        return {"error": f"Failed to send to Zapier: {str(e)}"}