diff --git a/custom_components/frigate/camera.py b/custom_components/frigate/camera.py index 76d3bcf9..9d62252f 100644 --- a/custom_components/frigate/camera.py +++ b/custom_components/frigate/camera.py @@ -15,7 +15,6 @@ from homeassistant.components.camera import ( Camera, CameraEntityFeature, - StreamType, WebRTCAnswer, WebRTCSendMessage, ) @@ -437,13 +436,6 @@ async def stream_source(self) -> str | None: class FrigateCameraWebRTC(FrigateCamera): """A Frigate camera with WebRTC support.""" - # TODO: this property can be removed after this fix is released: - # https://github.com/home-assistant/core/pull/130932/files#diff-75655c0eec1c3e736cad1bdb5627100a4595ece9accc391b5c85343bb998594fR598-R603 - @property - def frontend_stream_type(self) -> StreamType | None: - """Return the type of stream supported by this camera.""" - return StreamType.WEB_RTC - async def async_handle_async_webrtc_offer( self, offer_sdp: str, session_id: str, send_message: WebRTCSendMessage ) -> None: @@ -463,13 +455,6 @@ async def async_on_webrtc_candidate(self, session_id: str, candidate: Any) -> No class BirdseyeCameraWebRTC(BirdseyeCamera): """A Frigate birdseye camera with WebRTC support.""" - # TODO: this property can be removed after this fix is released: - # https://github.com/home-assistant/core/pull/130932/files#diff-75655c0eec1c3e736cad1bdb5627100a4595ece9accc391b5c85343bb998594fR598-R603 - @property - def frontend_stream_type(self) -> StreamType | None: - """Return the type of stream supported by this camera.""" - return StreamType.WEB_RTC - async def async_handle_async_webrtc_offer( self, offer_sdp: str, session_id: str, send_message: WebRTCSendMessage ) -> None: diff --git a/hacs.json b/hacs.json index 2e75605c..4872fdb2 100644 --- a/hacs.json +++ b/hacs.json @@ -1,5 +1,5 @@ { "hacs": "1.6.0", "name": "Frigate", - "homeassistant": "2024.11.0" + "homeassistant": "2024.12.0b0" } diff --git a/requirements.txt b/requirements.txt index a487ffda..a9c77299 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ aiohttp aiohttp_cors attr janus -homeassistant==2024.11.3 +homeassistant==2024.12.0b0 paho-mqtt python-dateutil yarl diff --git a/requirements_dev.txt b/requirements_dev.txt index 8b45a4b9..4c9e3888 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -4,7 +4,7 @@ flake8 mypy pre-commit pytest -pytest-homeassistant-custom-component==0.13.184 +pytest-homeassistant-custom-component==0.13.185 pylint-pytest pylint pytest-aiohttp diff --git a/tests/test_camera.py b/tests/test_camera.py index 859f7b94..ad336a5a 100644 --- a/tests/test_camera.py +++ b/tests/test_camera.py @@ -203,7 +203,9 @@ async def test_frigate_camera_setup_webrtc( "type": "camera/webrtc/candidate", "entity_id": TEST_CAMERA_FRONT_DOOR_ENTITY_ID, "session_id": "session_id", - "candidate": "candidate", + "candidate": { + "candidate": "candidate", + }, } ) @@ -293,7 +295,9 @@ async def test_frigate_camera_setup_birdseye_webrtc( "type": "camera/webrtc/candidate", "entity_id": TEST_CAMERA_BIRDSEYE_ENTITY_ID, "session_id": "session_id", - "candidate": "candidate", + "candidate": { + "candidate": "candidate", + }, } )