Jacobmadwed commited on
Commit
bc0cd4c
·
verified ·
1 Parent(s): 1d9ed1e

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +122 -102
app.py CHANGED
@@ -40,19 +40,19 @@ def get_fedex_access_token():
40
  'client_id': FEDEX_API_KEY,
41
  'client_secret': FEDEX_SECRET_KEY
42
  }
43
-
44
  try:
45
  logger.info("Requesting FedEx token")
46
  logger.info(f"FedEx API Key: {FEDEX_API_KEY}")
47
  logger.info(f"Request URL: {url}")
48
  logger.info(f"Request headers: {headers}")
49
  logger.info(f"Request payload: {payload}")
50
-
51
  response = requests.post(url, data=payload, headers=headers)
52
  logger.info(f"Response status code: {response.status_code}")
53
  logger.info(f"Response headers: {dict(response.headers)}")
54
  logger.info(f"Response content: {response.text}")
55
-
56
  response.raise_for_status()
57
  token_data = response.json()
58
  return token_data['access_token']
@@ -104,14 +104,14 @@ def get_ups_access_token():
104
  'transId': str(uuid.uuid4()),
105
  'transactionSrc': 'OCMTrackingApp'
106
  }
107
-
108
  credentials = base64.b64encode(f"{UPS_CLIENT_ID}:{UPS_CLIENT_SECRET}".encode()).decode()
109
  headers['Authorization'] = f'Basic {credentials}'
110
-
111
  data = {
112
  'grant_type': 'client_credentials'
113
  }
114
-
115
  try:
116
  logger.info("Requesting UPS token")
117
  response = requests.post(token_url, headers=headers, data=data)
@@ -124,6 +124,75 @@ def get_ups_access_token():
124
  logger.error(f"Response content: {e.response.text}")
125
  raise
126
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
127
  def fetch_fedex_tracking_info(tracking_number):
128
  access_token = get_fedex_access_token()
129
  url = "https://apis.fedex.com/track/v1/trackingnumbers"
@@ -142,25 +211,25 @@ def fetch_fedex_tracking_info(tracking_number):
142
  ],
143
  "includeDetailedScans": True
144
  }
145
-
146
  try:
147
  logger.info(f"Requesting FedEx tracking info for {tracking_number}")
148
  logger.info(f"Request URL: {url}")
149
  logger.info(f"Request headers: {headers}")
150
  logger.info(f"Request payload: {payload}")
151
-
152
  response = requests.post(url, json=payload, headers=headers)
153
  logger.info(f"Response status code: {response.status_code}")
154
  logger.info(f"Response headers: {dict(response.headers)}")
155
  logger.info(f"Response content: {response.text}")
156
-
157
  response.raise_for_status()
158
  data = response.json()
159
-
160
  track_results = data['output']['completeTrackResults'][0]['trackResults'][0]
161
  latest_status = track_results['latestStatusDetail']
162
  scan_events = track_results.get('scanEvents', [])
163
-
164
  def format_date(date_str):
165
  if not date_str or date_str == 'N/A':
166
  return 'N/A'
@@ -170,21 +239,15 @@ def fetch_fedex_tracking_info(tracking_number):
170
  except ValueError:
171
  logger.warning(f"Unable to parse date: {date_str}")
172
  return 'N/A'
173
-
174
  estimated_delivery = 'N/A'
175
- if 'standardTransitTimeWindow' in track_results:
176
- estimated_delivery = format_date(track_results['standardTransitTimeWindow']['window']['ends'])
177
- elif 'estimatedDeliveryTimeWindow' in track_results:
178
- estimated_delivery = format_date(track_results['estimatedDeliveryTimeWindow']['window']['ends'])
179
 
180
  if 'scanLocation' in latest_status and 'city' in latest_status['scanLocation']:
181
  location = f"{latest_status['scanLocation']['city']}, {latest_status['scanLocation'].get('stateOrProvinceCode', 'N/A')}"
182
  else:
183
  location = 'N/A'
184
-
185
- destination_city = 'N/A'
186
- if 'destinationLocation' in track_results:
187
- destination_city = f"{track_results['destinationLocation']['locationContactAndAddress']['address']['city']}, {track_results['destinationLocation']['locationContactAndAddress']['address'].get('stateOrProvinceCode', 'N/A')}"
188
 
189
  # Get the latest event time
190
  latest_event_time = format_date(latest_status.get('scanDateTime'))
@@ -199,8 +262,10 @@ def fetch_fedex_tracking_info(tracking_number):
199
  delivery_time = format_date(date_time.get('dateTime'))
200
  break
201
 
202
- # Return the delivery time if available, otherwise return the latest event time
203
- last_update_date_time = delivery_time if delivery_time != 'N/A' else latest_event_time
 
 
204
 
205
  return {
206
  'status': latest_status.get('statusByLocale', 'N/A'),
@@ -209,7 +274,6 @@ def fetch_fedex_tracking_info(tracking_number):
209
  'latestLocation': location,
210
  'latestCheckpoint': latest_status.get('description', 'N/A'),
211
  'lastUpdateDateTime': last_update_date_time,
212
- 'destinationCity': destination_city,
213
  'latestEventId': latest_status.get('code', 'N/A'),
214
  'rawTimestamp': latest_status.get('scanDateTime') or (scan_events[0].get('date') if scan_events else 'N/A')
215
  }
@@ -226,88 +290,44 @@ def fetch_fedex_tracking_info(tracking_number):
226
  logger.error(f"Response content: {data}")
227
  raise
228
 
229
- def fetch_ups_tracking_info(tracking_number):
230
- access_token = get_ups_access_token()
231
- url = f"https://onlinetools.ups.com/api/track/v1/details/{tracking_number}"
232
- headers = {
233
- 'Authorization': f'Bearer {access_token}',
234
- 'Content-Type': 'application/json',
235
- 'Accept': 'application/json',
236
- 'User-Agent': 'OCMTrackingApp/1.0',
237
- 'transId': str(uuid.uuid4()),
238
- 'transactionSrc': 'OCMTrackingApp'
239
  }
240
- params = {
241
- "locale": "en_US",
242
- "returnSignature": "false",
243
- "returnMilestones": "false",
244
- "returnPOD": "false"
 
 
 
 
 
 
 
 
 
 
245
  }
246
- try:
247
- logger.info(f"Requesting UPS tracking info for {tracking_number}")
248
- response = requests.get(url, headers=headers, params=params)
249
- response.raise_for_status()
250
- data = response.json()
251
-
252
- shipment = data['trackResponse']['shipment'][0]
253
- package = shipment['package'][0]
254
- events = package.get('activity', [])
255
-
256
- if events:
257
- sorted_events = sorted(events, key=lambda x: x['date'] + x['time'], reverse=True)
258
- latest_event = sorted_events[0]
259
- else:
260
- latest_event = None
261
-
262
- def format_date(date_str, time_str):
263
- if not date_str or not time_str or date_str == 'N/A' or time_str == 'N/A':
264
- return 'N/A'
265
- try:
266
- date = datetime.strptime(date_str + time_str, '%Y%m%d%H%M%S')
267
- return date.strftime('%m/%d/%Y %I:%M %p')
268
- except ValueError:
269
- logger.warning(f"Unable to parse date: {date_str} or time: {time_str}")
270
- return 'N/A'
271
-
272
- delivery_date = 'N/A'
273
- delivery_time = 'N/A'
274
- if 'deliveryDate' in package:
275
- if isinstance(package['deliveryDate'], list) and package['deliveryDate']:
276
- delivery_date = package['deliveryDate'][0].get('date', 'N/A')
277
- elif isinstance(package['deliveryDate'], dict):
278
- delivery_date = package['deliveryDate'].get('date', 'N/A')
279
- if 'deliveryTime' in package:
280
- delivery_time = package['deliveryTime'].get('endTime', 'N/A')
281
-
282
- destination_city = 'N/A'
283
- if 'destination' in shipment:
284
- destination_city = shipment['destination']['address'].get('city', 'N/A')
285
-
286
- return {
287
- 'status': latest_event['status']['type'] if latest_event else 'N/A',
288
- 'courier': 'UPS',
289
- 'estimatedDelivery': format_date(delivery_date, delivery_time),
290
- 'latestLocation': latest_event['location']['address'].get('city', 'N/A') if latest_event else 'N/A',
291
- 'latestCheckpoint': latest_event['status']['description'] if latest_event else 'N/A',
292
- 'lastUpdateDateTime': format_date(latest_event['date'], latest_event['time']) if latest_event else 'N/A',
293
- 'destinationCity': destination_city,
294
- 'latestEventId': latest_event['status']['statusCode'] if latest_event else 'N/A',
295
- 'rawTimestamp': latest_event['date'] + latest_event['time'] if latest_event else None
296
- }
297
- except requests.exceptions.RequestException as e:
298
- logger.error(f"Error fetching UPS tracking info: {e}")
299
- if hasattr(e, 'response'):
300
- logger.error(f"Response content: {e.response.text}")
301
- raise
302
 
303
- def update_monday_columns(item_id, status, courier, estimatedDelivery, latestLocation, latestCheckpoint, lastUpdateDateTime, destinationCity, latestEventId):
304
  column_values = {
305
  COLUMN_IDS['courier']: courier,
306
  COLUMN_IDS['estimatedDelivery']: estimatedDelivery,
307
  COLUMN_IDS['latestLocation']: latestLocation,
308
  COLUMN_IDS['latestCheckpoint']: latestCheckpoint,
309
- COLUMN_IDS['lastUpdateDateTime']: lastUpdateDateTime,
310
- 'text27__1': destinationCity
311
  }
312
  logger.info(f'Updating item {item_id} with values: {json.dumps(column_values, indent=2)}')
313
  mutation = f"""
@@ -389,7 +409,7 @@ def update_specific_tracking():
389
  courier = request.json.get('courier')
390
  if not tracking_number or not courier:
391
  return jsonify({"status": "error", "message": "Tracking number and courier are required"}), 400
392
-
393
  try:
394
  items = fetch_board_items()
395
  for item in items:
@@ -400,12 +420,12 @@ def update_specific_tracking():
400
  tracking_details = fetch_fedex_tracking_info(tracking_number)
401
  else:
402
  return jsonify({"status": "error", "message": f"Unsupported courier: {courier}"}), 400
403
-
404
  latest_event_id = tracking_details.pop('latestEventId')
405
  tracking_details.pop('rawTimestamp') # Remove raw timestamp before updating
406
  update_monday_columns(item['id'], **tracking_details, latestEventId=latest_event_id)
407
  return jsonify({"status": "success", "message": f"Updated tracking for {tracking_number}"}), 200
408
-
409
  return jsonify({"status": "error", "message": "Tracking number not found in board"}), 404
410
  except Exception as e:
411
  return jsonify({"status": "error", "message": str(e)}), 500
@@ -418,5 +438,5 @@ if __name__ == '__main__':
418
  thread = Thread(target=background_task)
419
  thread.daemon = True
420
  thread.start()
421
-
422
- app.run(host='0.0.0.0', port=7860)
 
40
  'client_id': FEDEX_API_KEY,
41
  'client_secret': FEDEX_SECRET_KEY
42
  }
43
+
44
  try:
45
  logger.info("Requesting FedEx token")
46
  logger.info(f"FedEx API Key: {FEDEX_API_KEY}")
47
  logger.info(f"Request URL: {url}")
48
  logger.info(f"Request headers: {headers}")
49
  logger.info(f"Request payload: {payload}")
50
+
51
  response = requests.post(url, data=payload, headers=headers)
52
  logger.info(f"Response status code: {response.status_code}")
53
  logger.info(f"Response headers: {dict(response.headers)}")
54
  logger.info(f"Response content: {response.text}")
55
+
56
  response.raise_for_status()
57
  token_data = response.json()
58
  return token_data['access_token']
 
104
  'transId': str(uuid.uuid4()),
105
  'transactionSrc': 'OCMTrackingApp'
106
  }
107
+
108
  credentials = base64.b64encode(f"{UPS_CLIENT_ID}:{UPS_CLIENT_SECRET}".encode()).decode()
109
  headers['Authorization'] = f'Basic {credentials}'
110
+
111
  data = {
112
  'grant_type': 'client_credentials'
113
  }
114
+
115
  try:
116
  logger.info("Requesting UPS token")
117
  response = requests.post(token_url, headers=headers, data=data)
 
124
  logger.error(f"Response content: {e.response.text}")
125
  raise
126
 
127
+ def fetch_ups_tracking_info(tracking_number):
128
+ access_token = get_ups_access_token()
129
+ url = f"https://onlinetools.ups.com/api/track/v1/details/{tracking_number}"
130
+ headers = {
131
+ 'Authorization': f'Bearer {access_token}',
132
+ 'Content-Type': 'application/json',
133
+ 'Accept': 'application/json',
134
+ 'User-Agent': 'OCMTrackingApp/1.0',
135
+ 'transId': str(uuid.uuid4()),
136
+ 'transactionSrc': 'OCMTrackingApp'
137
+ }
138
+ params = {
139
+ "locale": "en_US",
140
+ "returnSignature": "false",
141
+ "returnMilestones": "false",
142
+ "returnPOD": "false"
143
+ }
144
+ try:
145
+ logger.info(f"Requesting UPS tracking info for {tracking_number}")
146
+ response = requests.get(url, headers=headers, params=params)
147
+ response.raise_for_status()
148
+ data = response.json()
149
+
150
+ shipment = data['trackResponse']['shipment'][0]
151
+ package = shipment['package'][0]
152
+ events = package.get('activity', [])
153
+
154
+ if events:
155
+ sorted_events = sorted(events, key=lambda x: x['date'] + x['time'], reverse=True)
156
+ latest_event = sorted_events[0]
157
+ else:
158
+ latest_event = None
159
+
160
+ def format_date(date_str, time_str):
161
+ if not date_str or not time_str or date_str == 'N/A' or time_str == 'N/A':
162
+ return 'N/A'
163
+ try:
164
+ date = datetime.strptime(date_str + time_str, '%Y%m%d%H%M%S')
165
+ return date.strftime('%m/%d/%Y %I:%M %p')
166
+ except ValueError:
167
+ logger.warning(f"Unable to parse date: {date_str} or time: {time_str}")
168
+ return 'N/A'
169
+
170
+ delivery_date = 'N/A'
171
+ delivery_time = 'N/A'
172
+ if 'deliveryDate' in package:
173
+ if isinstance(package['deliveryDate'], list) and package['deliveryDate']:
174
+ delivery_date = package['deliveryDate'][0].get('date', 'N/A')
175
+ elif isinstance(package['deliveryDate'], dict):
176
+ delivery_date = package['deliveryDate'].get('date', 'N/A')
177
+ if 'deliveryTime' in package:
178
+ delivery_time = package['deliveryTime'].get('endTime', 'N/A')
179
+
180
+ return {
181
+ 'status': latest_event['status']['type'] if latest_event else 'N/A',
182
+ 'courier': 'UPS',
183
+ 'estimatedDelivery': format_date(delivery_date, delivery_time),
184
+ 'latestLocation': latest_event['location']['address'].get('city', 'N/A') if latest_event else 'N/A',
185
+ 'latestCheckpoint': latest_event['status']['description'] if latest_event else 'N/A',
186
+ 'lastUpdateDateTime': format_date(latest_event['date'], latest_event['time']) if latest_event else 'N/A',
187
+ 'latestEventId': latest_event['status']['statusCode'] if latest_event else 'N/A',
188
+ 'rawTimestamp': latest_event['date'] + latest_event['time'] if latest_event else None
189
+ }
190
+ except requests.exceptions.RequestException as e:
191
+ logger.error(f"Error fetching UPS tracking info: {e}")
192
+ if hasattr(e, 'response'):
193
+ logger.error(f"Response content: {e.response.text}")
194
+ raise
195
+
196
  def fetch_fedex_tracking_info(tracking_number):
197
  access_token = get_fedex_access_token()
198
  url = "https://apis.fedex.com/track/v1/trackingnumbers"
 
211
  ],
212
  "includeDetailedScans": True
213
  }
214
+
215
  try:
216
  logger.info(f"Requesting FedEx tracking info for {tracking_number}")
217
  logger.info(f"Request URL: {url}")
218
  logger.info(f"Request headers: {headers}")
219
  logger.info(f"Request payload: {payload}")
220
+
221
  response = requests.post(url, json=payload, headers=headers)
222
  logger.info(f"Response status code: {response.status_code}")
223
  logger.info(f"Response headers: {dict(response.headers)}")
224
  logger.info(f"Response content: {response.text}")
225
+
226
  response.raise_for_status()
227
  data = response.json()
228
+
229
  track_results = data['output']['completeTrackResults'][0]['trackResults'][0]
230
  latest_status = track_results['latestStatusDetail']
231
  scan_events = track_results.get('scanEvents', [])
232
+
233
  def format_date(date_str):
234
  if not date_str or date_str == 'N/A':
235
  return 'N/A'
 
239
  except ValueError:
240
  logger.warning(f"Unable to parse date: {date_str}")
241
  return 'N/A'
242
+
243
  estimated_delivery = 'N/A'
244
+ if 'estimatedDeliveryTimeWindow' in track_results:
245
+ estimated_delivery = format_date(track_results['estimatedDeliveryTimeWindow'].get('window', {}).get('ends'))
 
 
246
 
247
  if 'scanLocation' in latest_status and 'city' in latest_status['scanLocation']:
248
  location = f"{latest_status['scanLocation']['city']}, {latest_status['scanLocation'].get('stateOrProvinceCode', 'N/A')}"
249
  else:
250
  location = 'N/A'
 
 
 
 
251
 
252
  # Get the latest event time
253
  latest_event_time = format_date(latest_status.get('scanDateTime'))
 
262
  delivery_time = format_date(date_time.get('dateTime'))
263
  break
264
 
265
+ # Combine latest event time and delivery time
266
+ last_update_date_time = f"{latest_event_time} (Latest)" if latest_event_time != 'N/A' else 'N/A'
267
+ if delivery_time != 'N/A':
268
+ last_update_date_time += f" | {delivery_time} (Delivered)"
269
 
270
  return {
271
  'status': latest_status.get('statusByLocale', 'N/A'),
 
274
  'latestLocation': location,
275
  'latestCheckpoint': latest_status.get('description', 'N/A'),
276
  'lastUpdateDateTime': last_update_date_time,
 
277
  'latestEventId': latest_status.get('code', 'N/A'),
278
  'rawTimestamp': latest_status.get('scanDateTime') or (scan_events[0].get('date') if scan_events else 'N/A')
279
  }
 
290
  logger.error(f"Response content: {data}")
291
  raise
292
 
293
+ def update_monday_columns(item_id, status, courier, estimatedDelivery, latestLocation, latestCheckpoint, lastUpdateDateTime, latestEventId):
294
+ column_values = {
295
+ COLUMN_IDS['courier']: courier,
296
+ COLUMN_IDS['estimatedDelivery']: estimatedDelivery,
297
+ COLUMN_IDS['latestLocation']: latestLocation,
298
+ COLUMN_IDS['latestCheckpoint']: latestCheckpoint,
299
+ COLUMN_IDS['lastUpdateDateTime']: lastUpdateDateTime
 
 
 
300
  }
301
+ logger.info(f'Updating item {item_id} with values: {json.dumps(column_values, indent=2)}')
302
+ mutation = f"""
303
+ mutation {{
304
+ change_multiple_column_values(
305
+ board_id: {BOARD_ID},
306
+ item_id: {item_id},
307
+ column_values: {json.dumps(json.dumps(column_values))}
308
+ ) {{
309
+ id
310
+ }}
311
+ }}
312
+ """
313
+ headers = {
314
+ 'Authorization': MONDAY_API_KEY,
315
+ 'Content-Type': 'application/json'
316
  }
317
+ response = requests.post('https://api.monday.com/v2', headers=headers, json={'query': mutation})
318
+ response.raise_for_status()
319
+ result = response.json()
320
+ if 'errors' in result:
321
+ raise Exception(result['errors'][0]['message'])
322
+ logger.info(f'Successfully updated item {item_id}')
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
323
 
324
+ def update_monday_columns(item_id, status, courier, estimatedDelivery, latestLocation, latestCheckpoint, lastUpdateDateTime, latestEventId):
325
  column_values = {
326
  COLUMN_IDS['courier']: courier,
327
  COLUMN_IDS['estimatedDelivery']: estimatedDelivery,
328
  COLUMN_IDS['latestLocation']: latestLocation,
329
  COLUMN_IDS['latestCheckpoint']: latestCheckpoint,
330
+ COLUMN_IDS['lastUpdateDateTime']: lastUpdateDateTime
 
331
  }
332
  logger.info(f'Updating item {item_id} with values: {json.dumps(column_values, indent=2)}')
333
  mutation = f"""
 
409
  courier = request.json.get('courier')
410
  if not tracking_number or not courier:
411
  return jsonify({"status": "error", "message": "Tracking number and courier are required"}), 400
412
+
413
  try:
414
  items = fetch_board_items()
415
  for item in items:
 
420
  tracking_details = fetch_fedex_tracking_info(tracking_number)
421
  else:
422
  return jsonify({"status": "error", "message": f"Unsupported courier: {courier}"}), 400
423
+
424
  latest_event_id = tracking_details.pop('latestEventId')
425
  tracking_details.pop('rawTimestamp') # Remove raw timestamp before updating
426
  update_monday_columns(item['id'], **tracking_details, latestEventId=latest_event_id)
427
  return jsonify({"status": "success", "message": f"Updated tracking for {tracking_number}"}), 200
428
+
429
  return jsonify({"status": "error", "message": "Tracking number not found in board"}), 404
430
  except Exception as e:
431
  return jsonify({"status": "error", "message": str(e)}), 500
 
438
  thread = Thread(target=background_task)
439
  thread.daemon = True
440
  thread.start()
441
+
442
+ app.run(host='0.0.0.0', port=7860)