pingu_98/cara
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added conditionals type checks

Browse source
This commit is contained in:
lrdossan 2024-10-22 09:56:16 +02:00
parent 5ab7fca081
commit 1b56a6acd9
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
caimira/src/caimira/calculator/models/monte_carlo/models.py
View file

@ -84,14 +84,17 @@ def _build_mc_model(model: dataclass_instance) -> typing.Type[MCModelBase[_Model
else:
# Check that we don't need to do anything with this type.
for item in new_field.type.__args__:
if getattr(item, '__module__', None) == 'source.models.models':
raise ValueError(
f"unsupported type annotation transformation required for {new_field.type}")
if hasattr(new_field.type, "__args__"):
for item in new_field.type.__args__:
if getattr(item, '__module__', None) == 'source.models.models':
raise ValueError(
f"unsupported type annotation transformation required for {new_field.type}")
elif field_type.__module__ == 'source.models.models':
mc_model = getattr(sys.modules[__name__], new_field.type.__name__)
field_type = typing.Union[new_field.type, mc_model]
if isinstance(new_field.type, type):
mc_model = getattr(sys.modules[__name__], new_field.type.__name__)
field_type = typing.Union[new_field.type, mc_model]
else:
raise ValueError(f"Expected a class/type but got {new_field.type}")
fields.append((new_field.name, field_type, new_field))
bases = []
@ -120,7 +123,7 @@ def _build_mc_model(model: dataclass_instance) -> typing.Type[MCModelBase[_Model
_MODEL_CLASSES = [
cls for cls in vars(models).values()
if dataclasses.is_dataclass(cls)
if dataclasses.is_dataclass(cls) and isinstance(cls, type)
]

5
cern_caimira/src/cern_caimira/apps/expert_apps/state.py
View file

@ -25,8 +25,11 @@ class StateBuilder:
def resolve_builder(self, field: dataclasses.Field):
method_name = [
f'build_name_{field.name}',
f'build_type_{field.type.__name__}',
]
if isinstance(field.type, type):
method_name.append(f'build_type_{field.type.__name__}')
for name in method_name:
method = getattr(self, name, None)
if method is not None: