Update app.py

app.py

@@ -1,48 +1,43 @@
-from flask import Flask, jsonify, request
-from flask_cors import CORS
+import requests
 import logging
 import json
 import base64
 import uuid
 import os
 from datetime import datetime
+from flask import Flask, jsonify, request
 from threading import Thread
 import time
+from flask_cors import CORS
 
 app = Flask(__name__)
 CORS(app)  # This will enable CORS for all routes
 
+# Constants
+TRACKING_FILE = 'https://capitolphotobooths.com/monday/trackings.json'  # Update this path to your specific file location
+UPDATE_INTERVAL = 60 * 10  # 10 minutes
 
+UPS_CLIENT_ID = 'LKrZBgcSZ2v7vtAn3VAmEEBXqpkXD8zIEcZum97Eb8sSl7Fx'
+UPS_CLIENT_SECRET = 'DBAV77mzTWgI5oqWwXlA12hi62hgyUkesoGsREZsmjd1WHMSugpDUuBGTjyUiteT'
+FEDEX_API_KEY = 'l705da56bf34254c3495f351772a6ea2d3'
+FEDEX_SECRET_KEY = 'ae27688af74341f094228fc67a36a8cc'
 
-TRACKING_FILE = 'trackings.json'
-
+# Initialize tracking file
 def initialize_tracking_file():
     if not os.path.exists(TRACKING_FILE):
         with open(TRACKING_FILE, 'w') as f:
             json.dump({}, f)
 
-# Call this function when your app starts
 initialize_tracking_file()
 
 # Configure logging
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
 logger = logging.getLogger(__name__)
 
-app = Flask(__name__)
-
-UPS_CLIENT_ID = 'LKrZBgcSZ2v7vtAn3VAmEEBXqpkXD8zIEcZum97Eb8sSl7Fx'
-UPS_CLIENT_SECRET = 'DBAV77mzTWgI5oqWwXlA12hi62hgyUkesoGsREZsmjd1WHMSugpDUuBGTjyUiteT'
-FEDEX_API_KEY = 'l705da56bf34254c3495f351772a6ea2d3'
-FEDEX_SECRET_KEY = 'ae27688af74341f094228fc67a36a8cc'
-
-TRACKING_FILE = 'trackings.json'
-UPDATE_INTERVAL = 60 * 10  # 10 minute
-
+# Functions to get access tokens
 def get_fedex_access_token():
     url = "https://apis.fedex.com/oauth/token"
-    headers = {
-        'Content-Type': "application/x-www-form-urlencoded"
-    }
+    headers = {'Content-Type': "application/x-www-form-urlencoded"}
     payload = {
         'grant_type': 'client_credentials',
         'client_id': FEDEX_API_KEY,
@@ -76,9 +71,7 @@ def get_ups_access_token():
     credentials = base64.b64encode(f"{UPS_CLIENT_ID}:{UPS_CLIENT_SECRET}".encode()).decode()
     headers['Authorization'] = f'Basic {credentials}'
 
-    data = {
-        'grant_type': 'client_credentials'
-    }
+    data = {'grant_type': 'client_credentials'}
 
     try:
         logger.info("Requesting UPS token")
@@ -92,73 +85,7 @@ def get_ups_access_token():
             logger.error(f"Response content: {e.response.text}")
         raise
 
-def fetch_ups_tracking_info(tracking_number):
-    access_token = get_ups_access_token()
-    url = f"https://onlinetools.ups.com/api/track/v1/details/{tracking_number}"
-    headers = {
-        'Authorization': f'Bearer {access_token}',
-        'Content-Type': 'application/json',
-        'Accept': 'application/json',
-        'User-Agent': 'OCMTrackingApp/1.0',
-        'transId': str(uuid.uuid4()),
-        'transactionSrc': 'OCMTrackingApp'
-    }
-    params = {
-        "locale": "en_US",
-        "returnSignature": "false",
-        "returnMilestones": "false",
-        "returnPOD": "false"
-    }
-    try:
-        logger.info(f"Requesting UPS tracking info for {tracking_number}")
-        response = requests.get(url, headers=headers, params=params)
-        response.raise_for_status()
-        data = response.json()
-
-        shipment = data['trackResponse']['shipment'][0]
-        package = shipment['package'][0]
-        events = package.get('activity', [])
-
-        if events:
-            sorted_events = sorted(events, key=lambda x: x['date'] + x['time'], reverse=True)
-            latest_event = sorted_events[0]
-        else:
-            latest_event = None
-
-        def format_date(date_str, time_str):
-            if not date_str or not time_str or date_str == 'N/A' or time_str == 'N/A':
-                return 'N/A'
-            try:
-                date = datetime.strptime(date_str + time_str, '%Y%m%d%H%M%S')
-                return date.strftime('%m/%d/%Y %I:%M %p')
-            except ValueError:
-                logger.warning(f"Unable to parse date: {date_str} or time: {time_str}")
-                return 'N/A'
-
-        delivery_date = 'N/A'
-        delivery_time = 'N/A'
-        if 'deliveryDate' in package:
-            if isinstance(package['deliveryDate'], list) and package['deliveryDate']:
-                delivery_date = package['deliveryDate'][0].get('date', 'N/A')
-            elif isinstance(package['deliveryDate'], dict):
-                delivery_date = package['deliveryDate'].get('date', 'N/A')
-        if 'deliveryTime' in package:
-            delivery_time = package['deliveryTime'].get('endTime', 'N/A')
-
-        return {
-            'status': latest_event['status']['type'] if latest_event else 'N/A',
-            'courier': 'UPS',
-            'estimatedDelivery': format_date(delivery_date, delivery_time),
-            'latestLocation': latest_event['location']['address'].get('city', 'N/A') if latest_event else 'N/A',
-            'latestCheckpoint': latest_event['status']['description'] if latest_event else 'N/A',
-            'lastUpdateDateTime': format_date(latest_event['date'], latest_event['time']) if latest_event else 'N/A',
-        }
-    except requests.exceptions.RequestException as e:
-        logger.error(f"Error fetching UPS tracking info: {e}")
-        if hasattr(e, 'response'):
-            logger.error(f"Response content: {e.response.text}")
-        raise
-
+# Functions to fetch tracking info
 def fetch_fedex_tracking_info(tracking_number):
     access_token = get_fedex_access_token()
     url = "https://apis.fedex.com/track/v1/trackingnumbers"
@@ -169,11 +96,7 @@ def fetch_fedex_tracking_info(tracking_number):
     }
     payload = {
         "trackingInfo": [
-            {
-                "trackingNumberInfo": {
-                    "trackingNumber": tracking_number
-                }
-            }
+            {"trackingNumberInfo": {"trackingNumber": tracking_number}}
         ],
         "includeDetailedScans": True
     }
@@ -209,12 +132,10 @@ def fetch_fedex_tracking_info(tracking_number):
         else:
             location = 'N/A'
 
-        # Get the latest event time
         latest_event_time = format_date(latest_status.get('scanDateTime'))
         if latest_event_time == 'N/A' and scan_events:
             latest_event_time = format_date(scan_events[0].get('date'))
 
-        # Get delivery time if the package is delivered
         delivery_time = 'N/A'
         if latest_status.get('statusByLocale') == 'Delivered':
             for date_time in track_results.get('dateAndTimes', []):
@@ -222,14 +143,12 @@ def fetch_fedex_tracking_info(tracking_number):
                     delivery_time = format_date(date_time.get('dateTime'))
                     break
 
-        # Append reasonDescription to latestCheckpoint if there's a shipment exception
         latest_checkpoint = latest_status.get('description', 'N/A')
         if latest_status.get('code') == 'SE':
             reason_description = latest_status.get('ancillaryDetails', [{}])[0].get('reasonDescription', '')
             if reason_description:
                 latest_checkpoint += f" ({reason_description})"
 
-        # Return the delivery time if available, otherwise return the latest event time
         last_update_date_time = delivery_time if delivery_time != 'N/A' else latest_event_time
 
         return {
@@ -253,6 +172,73 @@ def fetch_fedex_tracking_info(tracking_number):
         logger.error(f"Response content: {data}")
         raise
 
+def fetch_ups_tracking_info(tracking_number):
+    access_token = get_ups_access_token()
+    url = f"https://onlinetools.ups.com/api/track/v1/details/{tracking_number}"
+    headers = {
+        'Authorization': f'Bearer {access_token}',
+        'Content-Type': 'application/json',
+        'Accept': 'application/json',
+        'User-Agent': 'OCMTrackingApp/1.0',
+        'transId': str(uuid.uuid4()),
+        'transactionSrc': 'OCMTrackingApp'
+    }
+    params = {
+        "locale": "en_US",
+        "returnSignature": "false",
+        "returnMilestones": "false",
+        "returnPOD": "false"
+    }
+    try:
+        logger.info(f"Requesting UPS tracking info for {tracking_number}")
+        response = requests.get(url, headers=headers, params=params)
+        response.raise_for_status()
+        data = response.json()
+
+        shipment = data['trackResponse']['shipment'][0]
+        package = shipment['package'][0]
+        events = package.get('activity', [])
+
+        if events:
+            sorted_events = sorted(events, key=lambda x: x['date'] + x['time'], reverse=True)
+            latest_event = sorted_events[0]
+        else:
+            latest_event = None
+
+        def format_date(date_str, time_str):
+            if not date_str or not time_str or date_str == 'N/A' or time_str == 'N/A':
+                return 'N/A'
+            try:
+                date = datetime.strptime(date_str + time_str, '%Y%m%d%H%M%S')
+                return date.strftime('%m/%d/%Y %I:%M %p')
+            except ValueError:
+                logger.warning(f"Unable to parse date: {date_str} or time: {time_str}")
+                return 'N/A'
+
+        delivery_date = 'N/A'
+        delivery_time = 'N/A'
+        if 'deliveryDate' in package:
+            if isinstance(package['deliveryDate'], list) and package['deliveryDate']:
+                delivery_date = package['deliveryDate'][0].get('date', 'N/A')
+            elif isinstance(package['deliveryDate'], dict):
+                delivery_date = package['deliveryDate'].get('date', 'N/A')
+        if 'deliveryTime' in package:
+            delivery_time = package['deliveryTime'].get('endTime', 'N/A')
+
+        return {
+            'status': latest_event['status']['type'] if latest_event else 'N/A',
+            'courier': 'UPS',
+            'estimatedDelivery': format_date(delivery_date, delivery_time),
+            'latestLocation': latest_event['location']['address'].get('city', 'N/A') if latest_event else 'N/A',
+            'latestCheckpoint': latest_event['status']['description'] if latest_event else 'N/A',
+            'lastUpdateDateTime': format_date(latest_event['date'], latest_event['time']) if latest_event else 'N/A',
+        }
+    except requests.exceptions.RequestException as e:
+        logger.error(f"Error fetching UPS tracking info: {e}")
+        if hasattr(e, 'response'):
+            logger.error(f"Response content: {e.response.text}")
+        raise
+
 def load_trackings():
     try:
         if os.path.exists(TRACKING_FILE):
@@ -260,32 +246,30 @@ def load_trackings():
                 content = file.read().strip()
                 if content:
                     trackings = json.loads(content)
-                    print(f"Loaded {len(trackings)} trackings from file")
+                    logger.info(f"Loaded {len(trackings)} trackings from file")
                     return trackings
                 else:
-                    print("Tracking file is empty")
+                    logger.info("Tracking file is empty")
                     return {}
         else:
-            print(f"Tracking file {TRACKING_FILE} not found")
+            logger.info(f"Tracking file {TRACKING_FILE} not found")
             return {}
     except json.JSONDecodeError:
-        print("Error decoding JSON, file might be corrupted")
+        logger.error("Error decoding JSON, file might be corrupted")
         return {}
     except Exception as e:
-        print(f"Error loading trackings: {str(e)}")
-        import traceback
-        print(traceback.format_exc())
+        logger.error(f"Error loading trackings: {str(e)}")
+        logger.error(f"Traceback: {traceback.format_exc()}")
         return {}
 
 def save_trackings(trackings):
     try:
         with open(TRACKING_FILE, 'w') as file:
             json.dump(trackings, file, indent=4)
-        print(f"Saved {len(trackings)} trackings to file")
+        logger.info(f"Saved {len(trackings)} trackings to file")
     except Exception as e:
-        print(f"Error saving trackings to {TRACKING_FILE}: {str(e)}")
-        import traceback
-        print(traceback.format_exc())
+        logger.error(f"Error saving trackings to {TRACKING_FILE}: {str(e)}")
+        logger.error(f"Traceback: {traceback.format_exc()}")
         raise
 
 def update_tracking_info():
@@ -329,6 +313,7 @@ def get_ups_tracking():
         tracking_info = fetch_ups_tracking_info(tracking_number)
         return jsonify(tracking_info), 200
     except Exception as e:
+        logger.error(f"Error in get_ups_tracking: {e}")
         return jsonify({"status": "error", "message": str(e)}), 500
 
 @app.route('/fedex', methods=['POST'])
@@ -341,6 +326,7 @@ def get_fedex_tracking():
         tracking_info = fetch_fedex_tracking_info(tracking_number)
         return jsonify(tracking_info), 200
     except Exception as e:
+        logger.error(f"Error in get_fedex_tracking: {e}")
         return jsonify({"status": "error", "message": str(e)}), 500
 
 @app.route('/save_tracking', methods=['POST'])
@@ -350,7 +336,7 @@ def save_tracking():
         if not tracking_info:
             return jsonify({"status": "error", "message": "No data received"}), 400
 
-        print("Received tracking info:", tracking_info)  # Debug print
+        logger.info("Received tracking info: %s", tracking_info)  # Debug print
 
         trackings = load_trackings()
         tracking_number = tracking_info['tracking']
@@ -362,22 +348,20 @@ def save_tracking():
             trackings[tracking_number] = tracking_info
         
         save_trackings(trackings)
-        print(f"Saved tracking: {tracking_number}")
+        logger.info(f"Saved tracking: {tracking_number}")
         return jsonify({"status": "success", "message": "Tracking saved successfully"}), 200
     except Exception as e:
-        print(f"Error saving tracking: {str(e)}")
-        import traceback
-        print(traceback.format_exc())
+        logger.error(f"Error saving tracking: {str(e)}")
         return jsonify({"status": "error", "message": str(e)}), 500
 
 @app.route('/load_trackings', methods=['GET'])
 def get_trackings():
     try:
         trackings = load_trackings()
-        print("Loaded trackings:", trackings)
+        logger.info("Loaded trackings: %s", trackings)
         return jsonify(trackings), 200
     except Exception as e:
-        print(f"Error in get_trackings: {str(e)}")
+        logger.error(f"Error in get_trackings: {str(e)}")
         return jsonify({"status": "error", "message": str(e)}), 500
 
 if __name__ == '__main__':
@@ -385,4 +369,4 @@ if __name__ == '__main__':
     update_thread = Thread(target=update_tracking_info, daemon=True)
     update_thread.start()
 
-    app.run(host='0.0.0.0', port=7860)
+    app.run(host='0.0.0.0', port=7860)