alemi/treepuncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat: parse Optional types in config object

Browse source
This commit is contained in:
əlemi 2022-07-03 00:02:39 +02:00
parent 61811f542b
commit a563984e48
No known key found for this signature in database
GPG key ID: BBCBFE5D7244634E
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/treepuncher/addon.py
View file

@ -1,7 +1,7 @@
import json import json
import logging import logging
from typing import TYPE_CHECKING, Dict, Any, Union, List, Callable, get_type_hints, get_args, get_origin from typing import TYPE_CHECKING, Dict, Any, Optional, Union, List, Callable, get_type_hints, get_args, get_origin
from dataclasses import dataclass, MISSING, fields from dataclasses import dataclass, MISSING, fields
from .scaffold import ConfigObject from .scaffold import ConfigObject
@ -29,13 +29,17 @@ def parse_with_hint(val:str, hint:Any) -> Any:
if hint is dict or get_origin(hint) is dict: if hint is dict or get_origin(hint) is dict:
return json.loads(val) return json.loads(val)
if hint is Union or get_origin(hint) is Union: if hint is Union or get_origin(hint) is Union:
# TODO str will never fail, should be tried last. for t in get_args(hint):
# cheap fix: sort keys by name so that "str" comes last if t is type(None) and val in ("null", ""):
for t in sorted(get_args(hint), key=lambda x : str(x)): return None
if t is str:
continue # try this last, will always succeed
try: try:
return t(val) return t(val)
except ValueError: except ValueError:
pass pass
if any(t is str for t in get_args(hint)):
return str(val)
return (get_origin(hint) or hint)(val) # try to instantiate directly return (get_origin(hint) or hint)(val) # try to instantiate directly
class Addon: class Addon: