Skip to content

Commit

Permalink
change dates for xdmod queries
Browse files Browse the repository at this point in the history
  • Loading branch information
claire-peters committed Nov 8, 2023
1 parent fefffb4 commit 0e2f8c0
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 3 deletions.
4 changes: 4 additions & 0 deletions coldfront/config/logging.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@
'coldfront.core.project': {
'handlers': ['key-events'],
'level': 'INFO',
},
'coldfront.core.allocation': {
'handlers': ['key-events'],
'level': 'INFO',
}
},
}
7 changes: 7 additions & 0 deletions coldfront/core/utils/fasrc.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@
MISSING_DATA_DIR = './local_data/missing/'


def get_quarter_start_end():
y = datetime.today().year
quarter_starts = [f'{y}-01-01', f'{y}-04-01', f'{y}-07-01', f'{y}-10-01']
quarter_ends = [f'{y}-03-31', f'{y}-06-30', f'{y}-09-30', f'{y}-12-31']
quarter = (datetime.today().month-1)//3
return (quarter_starts[quarter], quarter_ends[quarter])

def sort_by(list1, sorter, how='attr'):
"""split one list into two on basis of each item's ability to meet a condition
Parameters
Expand Down
10 changes: 7 additions & 3 deletions coldfront/plugins/xdmod/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
from requests.auth import HTTPBasicAuth

from coldfront.core.utils.common import import_from_settings
from coldfront.core.utils.fasrc import get_quarter_start_end


XDMOD_USER = import_from_settings('XDMOD_USER', '')
XDMOD_PASS = import_from_settings('XDMOD_PASS', '')
Expand Down Expand Up @@ -53,15 +55,17 @@ class XdmodNotFoundError(XdmodError):
pass

class XDModFetcher:

def __init__(self, start, end, resources=None,):
self.url = f'{XDMOD_API_URL}{_ENDPOINT_CORE_HOURS}'
if resources is None:
resources = []

payload = _DEFAULT_PARAMS
payload['start_date'] = start
payload['end_date'] = end
# payload['start_date'] = start
# payload['end_date'] = end
start_date, end_date = get_quarter_start_end()
payload['start_date'] = start_date
payload['end_date'] = end_date
payload['resource_filter'] = f'"{",".join(resources)}"'
payload['operation'] = 'get_data'
self.payload = payload
Expand Down

0 comments on commit 0e2f8c0

Please sign in to comment.