Repository navigation
Conversation
…l#558) Devices reporting kind osprey_floodlight logged 'Unknown kind: osprey_floodlight' and showed up as 'Unknown Stickup Cam' with no light or siren entities, even though the device reports led_status, health.floodlight_on/siren_on and settings.floodlight_settings (brightness/duration/always_on). Add the kind to a new FLOODLIGHT_CAM_2K_KINDS list so RingStickUpCam reports model 'Floodlight Cam 2K' and grants light, siren, motion and video capabilities via the existing floodlight branches. Model name follows the issue title ('Floodlight Cam 2K'); the body's 'Ring Floodlight Cam 4K Pro?' guess is unconfirmed, so the maintainer may rename. Mirrors the cocoa_floodlight -> Floodlight Cam Plus precedent of one list per floodlight generation. Add an osprey_floodlight fixture device (fields from the reporter's attached device JSON: wired, firmware cam-1.5.13222, floodlight settings duration 60 / brightness 10 / always_on false) and a regression test asserting model and capabilities.
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Add support for osprey_floodlight (Floodlight Cam 2K)
Fixes #558.
Problem
A Ring Floodlight Cam 2K reports
kind: osprey_floodlight, which was in noneof the library's kind lists. The library logged
ERROR [ring_doorbell.stickup_cam] Unknown kind: osprey_floodlight, and inHome Assistant the device showed up as an "Unknown Stickup Cam" with camera
and motion only — no light or siren entities — even though the device reports
led_status,health.floodlight_on/health.siren_on, andsettings.floodlight_settings(brightness: 10,duration: 60,always_on: false). Related Home Assistant issue:home-assistant/core#184792.
Fix
ring_doorbell/const.py:FLOODLIGHT_CAM_2K_KINDS = ["osprey_floodlight"].RingStickUpCam.modelinring_doorbell/stickup_cam.pyreturns"Floodlight Cam 2K"for that list, and the list is added to the existingLIGHT, SIREN, and MOTION_DETECTION/VIDEO
has_capabilityunions alongsidethe other floodlight lists. No new device class is needed —
RingStickUpCamalready handles floodlights, and the light/siren control endpoints are
constructed generically from the device id.
is wired (
settings.power_mode: "wired",battery_life: null).Model-name choice — please confirm
The issue title calls this device "Floodlight Cam 2K", while the body
speculates it might be "Ring Floodlight Cam 4K Pro?". I went with
"Floodlight Cam 2K" because:
?) and nothing inthe attached device JSON supports 4K or Pro — firmware
cam-1.5.13222and the floodlight settings match an ordinary floodlight;
(
cocoa_floodlight→ "Floodlight Cam Plus",floodlight_pro→"Floodlight Cam Pro") rather than folding a distinct device into the
plain "Floodlight Cam" list (
hp_cam_v1,floodlight_v2).If Ring's official name for this hardware is different, I am happy to rename
the list/model — the capability fix itself does not depend on the name.
Tests
tests/fixtures/ring_devices.json(id 987654,osprey_floodlight, fields taken from the reporter's attached device JSON:wired, firmware
cam-1.5.13222, floodlight settings duration 60 /brightness 10 / always_on
false,led_status: "off",siren_status: {seconds_remaining: 0}).test_osprey_floodlight_attributesintests/test_ring.pyassertsmodel "Floodlight Cam 2K" and light/siren/motion/video/history True,
battery False, lights
"off", siren0.assert 'Unknown Stickup Cam' == 'Floodlight Cam 2K', with theUnknown kind: osprey_floodlighterror logged. After the fix it passes.device list, so
test_list's expected output was updated accordingly.ruff checkandruff format --checkare clean on the changed files;mypyoverring_doorbellreports no issues. (Repo-wideruff checkstill shows the same 2 pre-existing findings in untouched files,
ring_doorbell/__init__.pyRUF022 andring_doorbell/auth.pyA004.)Edge cases
osprey_floodlightis added. The separate open issue Add support for Floodlight Cam Pro 2nd Gen (cocoa_floodlight_v2) #545(
cocoa_floodlight_v2, Floodlight Cam Pro 2nd Gen) is a different kind andis intentionally not bundled here.
entries only match
osprey_floodlight.AI assistance
This contribution was drafted with AI assistance (code review by an
independent AI reviewer against the exact commit, and the fix/test code
written with AI tooling). The evidence — the reporter's device JSON fields,
the before/after test runs, and the full test suite — was verified locally,
and the model-name decision above is flagged for maintainer confirmation.