Merge pull request #105 from ayasyrev/changed_args

changed fields, set fields

Author: ayasyrev

src/model_constructor/helpers.py

@@ -93,24 +93,50 @@ def __repr_args__(self) -> list[tuple[str, str]]:
             if (str_value := self._get_str_value(field))
         ]
 
-    def __repr_changed_args__(self) -> list[str]:
-        """Return list repr for changed fields"""
+    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
             if field != "name"
         ]
 
+    def __repr_changed_fields__(self) -> list[str]:
+        """Return list repr for changed fields"""
+        return [
+            f"{field}: {self._get_str_value(field)}"
+            for field in self.changed_fields
+            if field != "name"
+        ]
+
+    @property
+    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
+        }
+
     def print_cfg(self) -> None:
         """Print full config"""
         print(self.__repr__())
 
-    def print_changed(self) -> None:
-        """Print changed fields."""
-        changed_fields = self.__repr_changed_args__()
-        if changed_fields:
+    def print_set_fields(self) -> None:
+        """Print fields changed at init."""
+        set_fields = self.__repr_set_fields__()
+        if set_fields:
+            print("Set fields:")
+            for field in set_fields:
+                print(field)
+        else:
+            print("Nothing changed")
+
+    def print_changed_fields(self) -> None:
+        """Print fields changed at init."""
+        if self.changed_fields:
             print("Changed fields:")
-            for i in changed_fields:
-                print("  ", i)
+            for field in self.changed_fields:
+                print(f"{field}: {self._get_str_value(field)}")
         else:
             print("Nothing changed")

src/model_constructor/model_constructor.py

@@ -216,7 +216,7 @@ def __call__(self) -> nn.Sequential:
             OrderedDict([("stem", self.stem), ("body", self.body), ("head", self.head)])  # type: ignore
         )
         self.init_cnn(model)  # pylint: disable=too-many-function-args
-        extra_repr = self.__repr_changed_args__()
+        extra_repr = self.__repr_changed_fields__()
         if extra_repr:
             model.extra_repr = lambda: ", ".join(extra_repr)
         return model

tests/test_helpers.py

@@ -50,7 +50,7 @@ def test_cfg_repr_print(capsys: CaptureFixture[str]):
     cfg = Cfg()
     repr_res = cfg.__repr__()
     assert repr_res == "Cfg(\n  )"
-    cfg.print_changed()
+    cfg.print_set_fields()
     out = capsys.readouterr().out
     assert out == "Nothing changed\n"
     cfg.name = "cfg_name"
@@ -59,13 +59,29 @@ def test_cfg_repr_print(capsys: CaptureFixture[str]):
     cfg.print_cfg()
     out = capsys.readouterr().out
     assert out == "Cfg(\n  name='cfg_name')\n"
-    # changed fields. default - name is not in changed
+    # Set fields. default - name is not in changed
     cfg = Cfg2(name="cfg_name")
-    cfg.print_changed()
+    cfg.print_set_fields()
     out = capsys.readouterr().out
     assert out == "Nothing changed\n"
     assert "name" in cfg.model_fields_set
     cfg = Cfg2(int_value=0)
-    cfg.print_changed()
+    cfg.print_set_fields()
     out = capsys.readouterr().out
-    assert out == "Changed fields:\n   int_value: 0\n"
+    assert out == "Set fields:\nint_value: 0\n"
+    # Changed fields
+    cfg = Cfg2(name="cfg_name")
+    assert cfg.changed_fields == {"name": "cfg_name"}
+    cfg.int_value = 1
+    cfg.name = None
+    assert cfg.changed_fields == {"int_value": 1}
+    # print
+    cfg.print_changed_fields()
+    out = capsys.readouterr().out
+    assert out == "Changed fields:\nint_value: 1\n"
+    # return to default
+    cfg.int_value = 10
+    assert not cfg.changed_fields
+    cfg.print_changed_fields()
+    out = capsys.readouterr().out
+    assert out == "Nothing changed\n"