Skip to content

Commit 09c1069

Browse files
committed
Update utils.py
1 parent 4a83462 commit 09c1069

File tree

1 file changed

+17
-18
lines changed

1 file changed

+17
-18
lines changed

openet/core/utils.py

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import argparse
22
import calendar
3-
import datetime
3+
from datetime import datetime, timedelta
44
import itertools
55
import json
66
import logging
77
import os
8-
import sys
98
import time
109

1110
import ee
@@ -34,7 +33,7 @@ def arg_valid_date(input_date):
3433
3534
"""
3635
try:
37-
return datetime.datetime.strptime(input_date, '%Y-%m-%d')
36+
return datetime.strptime(input_date, '%Y-%m-%d')
3837
except ValueError:
3938
msg = f'Not a valid date: "{input_date}".'
4039
raise argparse.ArgumentTypeError(msg)
@@ -95,7 +94,7 @@ def date_range(start_dt, end_dt, days=1, skip_leap_days=False):
9594
while curr_dt <= end_dt:
9695
if not skip_leap_days or curr_dt.month != 2 or curr_dt.day != 29:
9796
yield curr_dt
98-
curr_dt += datetime.timedelta(days=days)
97+
curr_dt += timedelta(days=days)
9998

10099

101100
def delay_task(delay_time=0, max_ready=-1):
@@ -187,7 +186,8 @@ def get_ee_assets(asset_id, start_dt=None, end_dt=None, retries=6):
187186
raise Exception('\nThe collection or folder does not exist, exiting')
188187
except Exception as e:
189188
logging.warning(
190-
f' Error getting asset list, retrying ({i}/{retries})\n {e}')
189+
f' Error getting asset list, retrying ({i}/{retries})\n {e}'
190+
)
191191
time.sleep((i+1) ** 2)
192192

193193
if asset_id_list is None:
@@ -224,17 +224,20 @@ def get_ee_tasks(states=['RUNNING', 'READY'], verbose=False, retries=6):
224224
break
225225
except Exception as e:
226226
logging.warning(
227-
f' Error getting task list, retrying ({i}/{retries})\n {e}')
227+
f' Error getting task list, retrying ({i}/{retries})\n {e}'
228+
)
228229
time.sleep((i+1) ** 2)
229230
if task_list is None:
230231
raise Exception('\nUnable to retrieve task list, exiting')
231232

232233
task_list = sorted(
233234
[task for task in task_list if task['state'] in states],
234-
key=lambda t: (t['state'], t['description'], t['id']))
235+
key=lambda t: (t['state'], t['description'], t['id'])
236+
)
235237
# task_list = sorted([
236238
# [t['state'], t['description'], t['id']] for t in task_list
237-
# if t['state'] in states])
239+
# if t['state'] in states
240+
# ])
238241

239242
# Convert the task list to a dictionary with the task name as the key
240243
return {task['description']: task for task in task_list}
@@ -263,18 +266,16 @@ def print_ee_tasks(tasks):
263266

264267
for desc, task in tasks.items():
265268
if task['state'] == 'RUNNING':
266-
start_dt = datetime.datetime.utcfromtimestamp(
267-
task['start_timestamp_ms'] / 1000)
268-
update_dt = datetime.datetime.utcfromtimestamp(
269-
task['update_timestamp_ms'] / 1000)
269+
start_dt = datetime.utcfromtimestamp(task['start_timestamp_ms'] / 1000)
270+
update_dt = datetime.utcfromtimestamp(task['update_timestamp_ms'] / 1000)
270271
logging.debug(' {:8s} {} {:0.2f} {}'.format(
271272
task['state'], task['description'],
272273
(update_dt - start_dt).total_seconds() / 3600,
273-
task['id']))
274+
task['id'])
275+
)
274276
# elif task['state'] in states:
275277
else:
276-
logging.debug(' {:8s} {}'.format(
277-
task['state'], task['description']))
278+
logging.debug(' {:8s} {}'.format(task['state'], task['description']))
278279

279280
logging.debug(f' Tasks: {len(tasks)}\n')
280281

@@ -337,7 +338,6 @@ def get_info(ee_obj, max_retries=4):
337338

338339
def ee_task_start(task, n=6):
339340
"""Make an exponential backoff Earth Engine request"""
340-
output = None
341341
for i in range(1, n):
342342
try:
343343
task.start()
@@ -543,8 +543,7 @@ def point_coll_value(coll, xy, scale=1):
543543
col_dict[k] = i + 4
544544
info_dict[k] = {}
545545
for row in output[1:]:
546-
date = datetime.datetime.utcfromtimestamp(row[3] / 1000.0).strftime(
547-
'%Y-%m-%d')
546+
date = datetime.utcfromtimestamp(row[3] / 1000.0).strftime('%Y-%m-%d')
548547
for k, v in col_dict.items():
549548
info_dict[k][date] = row[col_dict[k]]
550549
return info_dict

0 commit comments

Comments
 (0)