Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Parse comma-separated list as python list #39

Merged
merged 5 commits into from
Jul 25, 2024
Merged

Parse comma-separated list as python list #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e553a32
Add support to parse bash array as python array
WalterKolczynski-NOAA Jul 24, 2024
bb1eab4
Modify list detection to use comma-separated values
WalterKolczynski-NOAA Jul 25, 2024
ef5ae37
Fix list parsing error, add pytest
WalterKolczynski-NOAA Jul 25, 2024
92b525c
Fix pynorm issues
WalterKolczynski-NOAA Jul 25, 2024
c68d7dc
Update pytest to test string in list
WalterKolczynski-NOAA Jul 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/wxflow/configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,21 +156,27 @@ def cast_strdict_as_dtypedict(ctx: Dict[str, str]) -> Dict[str, Any]:
def cast_as_dtype(string: str) -> Union[str, int, float, bool, Any]:
"""
Cast a value into known datatype

Parameters
----------
string: str

Returns
-------
value : str or int or float or datetime
value : str, int, float, bool or datetime; or List of these
default: str
"""
TRUTHS = ['y', 'yes', 't', 'true', '.t.', '.true.']
BOOLS = ['n', 'no', 'f', 'false', '.f.', '.false.'] + TRUTHS
BOOLS = [x.upper() for x in BOOLS] + BOOLS + ['Yes', 'No', 'True', 'False']

def _cast_or_not(type: Any, string: str):
if ',' in string:
# Convert comma-separated list to python list
return [cast_as_dtype(elem.strip()) for elem in string.split(',')]

def _cast_or_not(to_type: Any, string: str):
DavidHuber-NOAA marked this conversation as resolved.
Show resolved Hide resolved
try:
return type(string)
return to_type(string)
except ValueError:
return string

Expand Down
24 changes: 23 additions & 1 deletion tests/test_configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@
export SOME_BOOL4=NO
export SOME_BOOL5=.false.
export SOME_BOOL6=.F.
export SOME_LIST1="3, 15, -999"
export SOME_LIST2="0.2,3.5,-9999."
export SOME_LIST3="20221225, 202212251845"
export SOME_LIST4="YES, .false., .T."
export SOME_LIST5="0.2, test_str, 15, 20221225, NO"
"""

file1 = """#!/bin/bash
Expand Down Expand Up @@ -60,7 +65,12 @@
'SOME_BOOL3': True,
'SOME_BOOL4': False,
'SOME_BOOL5': False,
'SOME_BOOL6': False
'SOME_BOOL6': False,
'SOME_LIST1': [3, 15, -999],
'SOME_LIST2': [0.2, 3.5, -9999.],
'SOME_LIST3': [datetime(2022, 12, 25, 0, 0, 0), datetime(2022, 12, 25, 18, 45, 0)],
'SOME_LIST4': [True, False, True],
'SOME_LIST5': [0.2, 'test_str', 15, datetime(2022, 12, 25, 0, 0, 0), False],
}

file0_dict_set_envvar = file0_dict.copy()
Expand Down Expand Up @@ -107,6 +117,14 @@
('20221215T1830Z', datetime(2022, 12, 15, 18, 30, 0)),
]

list_dtypes = [
('3, 15, -999', [3, 15, -999]),
('0.2,3.5,-9999.', [0.2, 3.5, -9999.]),
('20221215,20221215T1830Z', [datetime(2022, 12, 15, 0, 0, 0), datetime(2022, 12, 15, 18, 30, 0)]),
('YES, .false., .T.', [True, False, True]),
('0.2, test_str, 15, 20221225, NO', [0.2, 'test_str', 15, datetime(2022, 12, 25, 0, 0, 0), False]),
]


def evaluate(dtypes):
for pair in dtypes:
Expand Down Expand Up @@ -134,6 +152,10 @@ def test_cast_as_dtype_datetimes():
evaluate(datetime_dtypes)


def test_cast_as_dtype_list():
evaluate(list_dtypes)


@pytest.fixture
def create_configs(tmp_path):

Expand Down