11import sys
22from argparse import ArgumentParser
33from enum import Enum
4+ from logging import Logger
45from pathlib import Path
56from types import UnionType
6- from typing import Literal , Union , get_args , get_origin
7+ from typing import Any , Literal , TypeVar , Union , cast , get_args , get_origin
78
89from pkn .logging import getSimpleLogger
910
1819 "parse_extra_args_model" ,
1920)
2021
21- _log = None
22+ _log : Logger
23+ ModelT = TypeVar ("ModelT" , bound = BaseModel )
2224
2325
2426def _initlog (level : str = "WARNING" ):
@@ -38,7 +40,7 @@ def _add_argument(parser: ArgumentParser, name: str, arg_type: type, default_val
3840 parser .add_argument (name , type = arg_type , default = default_value , ** kwargs )
3941
4042
41- def parse_extra_args (subparser : ArgumentParser | None = None , argv : list [str ] | None = None ) -> list [str ]:
43+ def parse_extra_args (subparser : ArgumentParser | None = None , argv : list [str ] | None = None ) -> tuple [ dict [ str , Any ], list [str ] ]:
4244 if subparser is None :
4345 subparser = ArgumentParser (prog = "p2a" , allow_abbrev = False )
4446
@@ -126,7 +128,7 @@ def _recurse_add_fields(parser: ArgumentParser, model: Union["BaseModel", type["
126128 ########################
127129 # MARK: str, int, float
128130 try :
129- _add_argument (parser = parser , name = arg_name , arg_type = field_type , default_value = default_value )
131+ _add_argument (parser = parser , name = arg_name , arg_type = cast ( type , field_type ) , default_value = default_value )
130132 except TypeError :
131133 # TODO: handle more complex types if needed
132134 _add_argument (parser = parser , name = arg_name , arg_type = str , default_value = default_value )
@@ -200,7 +202,10 @@ def _recurse_add_fields(parser: ArgumentParser, model: Union["BaseModel", type["
200202 #################################
201203 # MARK: List[str|int|float|bool]
202204 _add_argument (
203- parser = parser , name = arg_name , arg_type = str , default_value = "," .join (map (str , default_value )) if isinstance (field , str ) else None
205+ parser = parser ,
206+ name = arg_name ,
207+ arg_type = str ,
208+ default_value = "," .join (map (str , default_value )) if isinstance (default_value , list ) else None ,
204209 )
205210 elif get_origin (field_type ) in (dict , dict ):
206211 ######################
@@ -319,7 +324,7 @@ def create_model_parser(model: "BaseModel") -> ArgumentParser:
319324 return parser
320325
321326
322- def parse_extra_args_model (model : "BaseModel" , argv : list [str ] | None = None ) -> Union [ "BaseModel" , dict ]:
327+ def parse_extra_args_model (model : ModelT , argv : list [str ] | None = None ) -> tuple [ ModelT , list [ str ] ]:
323328 # Parse the extra args and update the model
324329 args , kwargs = parse_extra_args (create_model_parser (model ), argv )
325330
@@ -330,8 +335,8 @@ def parse_extra_args_model(model: "BaseModel", argv: list[str] | None = None) ->
330335 parts = key .split ("." )
331336
332337 # Accounting
333- sub_model = model
334- parent_model = None
338+ sub_model : Any = model
339+ parent_model : Any = None
335340
336341 for i , part in enumerate (parts [:- 1 ]):
337342 if part .isdigit () and isinstance (sub_model , list ):
@@ -457,7 +462,7 @@ def parse_extra_args_model(model: "BaseModel", argv: list[str] | None = None) ->
457462
458463 # Grab the field from the model class and make a type adapter
459464 field = model_to_set .__class__ .model_fields [key ]
460- adapter = TypeAdapter (field .annotation )
465+ adapter = TypeAdapter (cast ( Any , field .annotation ) )
461466
462467 if value is not None :
463468 _log .debug (f"Setting field '{ key } ' on model '{ model_to_set .__class__ .__name__ } ' with raw value '{ value } '" )
0 commit comments