Fix bad merge

This commit is contained in:
Marek Wolan
2023-08-09 12:36:09 +01:00
parent 51baabb35b
commit f198a8b94d

View File

@@ -126,6 +126,8 @@ class ActionManager:
class SimComponent(BaseModel): class SimComponent(BaseModel):
"""Extension of pydantic BaseModel with additional methods that must be defined by all classes in the simulator.""" """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 uuid: str
"""The component UUID.""" """The component UUID."""
@@ -133,13 +135,6 @@ class SimComponent(BaseModel):
if not kwargs.get("uuid"): if not kwargs.get("uuid"):
kwargs["uuid"] = str(uuid4()) kwargs["uuid"] = str(uuid4())
super().__init__(**kwargs) 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 self.action_manager: Optional[ActionManager] = None
@abstractmethod @abstractmethod