Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 8 additions & 5 deletions src/model_constructor/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ def instantiate_module(
name = path_list[1]
try:
mod = importlib.import_module(default_path)
except ImportError:
raise ImportError(f"Module {default_path} not found")
except ImportError as exc:
raise ImportError(f"Module {default_path} not found") from exc
if hasattr(mod, name):
module = getattr(mod, name)
if is_module(module):
Expand Down Expand Up @@ -86,6 +86,9 @@ def _get_str_value(self, field: str) -> str:
def __repr__(self) -> str:
return f"{self.__repr_name__()}(\n {self.__repr_str__(chr(10) + ' ')})"

def __str__(self) -> str:
return f"{self.__repr_name__()}(\n {self.__repr_str__(chr(10) + ' ')})"

def __repr_args__(self) -> List[Tuple[str, str]]:
return [
(field, str_value)
Expand All @@ -97,7 +100,7 @@ def __repr_set_fields__(self) -> List[str]:
"""Return list repr for fields set at init"""
return [
f"{field}: {self._get_str_value(field)}"
for field in self.model_fields_set # pylint: disable=E1133
for field in self.model_fields_set # pylint: disable=E1133:not-an-iterable
if field != "name"
]

Expand All @@ -114,8 +117,8 @@ def changed_fields(self) -> Dict[str, Any]:
# return "\n".join(self.__repr_changed_fields__())
return {
field: self._get_str_value(field)
for field in self.model_fields # pylint: disable=E1133
if getattr(self, field) != self.model_fields[field].default
for field, value in self.model_fields.items()
if getattr(self, field) != value.default
}

def print_cfg(self) -> None:
Expand Down
2 changes: 1 addition & 1 deletion src/model_constructor/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "dev_0.4.1"
__version__ = "0.4.1_dev"
12 changes: 9 additions & 3 deletions tests/test_helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,23 +48,29 @@ def test_instantiate_module():
def test_cfg_repr_print(capsys: CaptureFixture[str]):
"""test repr and print results"""
cfg = Cfg()
repr_res = cfg.__repr__()
repr_res = repr(cfg)
assert repr_res == "Cfg(\n )"
cfg.print_set_fields()
out = capsys.readouterr().out
assert out == "Nothing changed\n"
cfg.name = "cfg_name"
repr_res = cfg.__repr__()
repr_res = repr(cfg)
assert repr_res == "Cfg(\n name='cfg_name')"
cfg.print_cfg()
out = capsys.readouterr().out
assert out == "Cfg(\n name='cfg_name')\n"

# print
print(cfg)
out = capsys.readouterr().out
assert out == "Cfg(\n name='cfg_name')\n"

# Set fields. default - name is not in changed
cfg = Cfg2(name="cfg_name")
cfg.print_set_fields()
out = capsys.readouterr().out
assert out == "Nothing changed\n"
assert "name" in cfg.model_fields_set
assert "name" in cfg.model_fields_set # pylint: disable=E1135:unsupported-membership-test
cfg = Cfg2(int_value=0)
cfg.print_set_fields()
out = capsys.readouterr().out
Expand Down