~gotmax23/fedrq: ReleaseConfig: make `repogs` a proper model field

d8cff5af8696d4c1df8e90cf0d76f9dde09ae45c — Maxwell G 1 year, 4 months ago e506341

ReleaseConfig: make `repogs` a proper model field

This allows us to remove the hacky __init__ override for which support
will be dropped in pydantic v2.

patch browse .tar.gz

1 files changed, 8 insertions(+), 9 deletions(-)

M src/fedrq/config.py

M src/fedrq/config.py => src/fedrq/config.py +8 -9

@@ 27,7 27,7 @@ if sys.version_info < (3, 11):
 else:
     import tomllib
 
-from pydantic import BaseModel, Field, PrivateAttr, validator
+from pydantic import BaseModel, Field, validator
 
 from fedrq._compat import StrEnum
 from fedrq._config import ConfigError


@@ 80,16 80,15 @@ class ReleaseConfig(BaseModel):
 
     full_def_paths: t.ClassVar[list[t.Union[Traversable, Path]]] = []
     repo_aliases: dict[str, str] = {}
-    _repogs = PrivateAttr()
+    repogs: Repos = Field(DefaultRepoGs, exclude=True)
 
-    @property
-    def repogs(self) -> Repos:
-        return self._repogs
+    class Config:
+        arbitrary_types_allowed = True
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self._repogs = DefaultRepoGs.new(
-            self.defs | AliasRepoG.from_str_mapping(self.repo_aliases)
+    @validator("repogs", always=True)
+    def v_repogs(cls, value: Repos, values: dict[str, t.Any]) -> Repos:
+        return (
+            value | values["defs"] | AliasRepoG.from_str_mapping(values["repo_aliases"])
         )
 
     @validator("defpaths")