feat: remove overwrite of from_dict

and use `args_from_dict` in `RtspCamera`
zauberzeug · Feb 5, 2025 · 3519faf · 3519faf
1 parent a4b7690
commit 3519faf
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git a/rosys/vision/mjpeg_camera/mjpeg_camera.py b/rosys/vision/mjpeg_camera/mjpeg_camera.py
@@ -57,10 +57,6 @@ def to_dict(self) -> dict:
             'ip': self.ip,
         }
 
-    @classmethod
-    def from_dict(cls, data: dict) -> Self:
-        return cls(**data)
-
     @property
     def is_connected(self) -> bool:
         return (self.device is not None) and self.device.is_connected

diff --git a/rosys/vision/rtsp_camera/rtsp_camera.py b/rosys/vision/rtsp_camera/rtsp_camera.py
@@ -61,7 +61,7 @@ def to_dict(self) -> dict[str, Any]:
     def from_dict(cls, data: dict[str, Any]) -> Self:
         if 'jovision_profile' in data:
             data['substream'] = data['jovision_profile']
-        return cls(**data)
+        return cls(**cls.args_from_dict(data))
 
     @property
     def is_connected(self) -> bool:

diff --git a/rosys/vision/usb_camera/usb_camera.py b/rosys/vision/usb_camera/usb_camera.py
@@ -46,10 +46,6 @@ def to_dict(self) -> dict[str, Any]:
             name: param.value for name, param in self._parameters.items()
         }
 
-    @classmethod
-    def from_dict(cls, data: dict[str, Any]) -> Self:
-        return cls(**data)
-
     @property
     def is_connected(self) -> bool:
         return self.device is not None