From f198a8b94d22ffa5ffd3b74bed6244105c5a8bbb Mon Sep 17 00:00:00 2001 From: Marek Wolan Date: Wed, 9 Aug 2023 12:36:09 +0100 Subject: [PATCH] Fix bad merge --- src/primaite/simulator/core.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/primaite/simulator/core.py b/src/primaite/simulator/core.py index 779358ec..caba5210 100644 --- a/src/primaite/simulator/core.py +++ b/src/primaite/simulator/core.py @@ -126,6 +126,8 @@ class ActionManager: class SimComponent(BaseModel): """Extension of pydantic BaseModel with additional methods that must be defined by all classes in the simulator.""" + model_config = ConfigDict(arbitrary_types_allowed=True, extra=Extra.allow) + uuid: str """The component UUID.""" @@ -133,13 +135,6 @@ class SimComponent(BaseModel): if not kwargs.get("uuid"): kwargs["uuid"] = str(uuid4()) super().__init__(**kwargs) - - model_config = ConfigDict(arbitrary_types_allowed=True, extra=Extra.allow) - uuid: str = str(uuid4()) - "The component UUID." - - def __init__(self, **kwargs) -> None: - super().__init__(**kwargs) self.action_manager: Optional[ActionManager] = None @abstractmethod