Add Camera platform to Prosegur by dgomes · Pull Request #76428 · home-assistant/core

dgomes · 2022-08-07T22:59:14Z

Proposed change

Adds the camera platform to the integration

Changelog of pyprosegur: dgomes/pyprosegur@0.0.5...0.0.8

Type of change

Dependency upgrade
Bugfix (non-breaking change which fixes an issue)
New integration (thank you!)
New feature (which adds functionality to an existing integration)
Deprecation (breaking change to happen in the future)
Breaking change (fix/feature causing existing functionality to break)
Code quality improvements to existing code or addition of tests

Additional information

This PR fixes or closes issue: fixes #
This PR is related to issue:
Link to documentation pull request: Add Camera to Prosegur home-assistant.io#25419

Checklist

The code change is tested and works locally.
Local tests pass. Your PR cannot be merged unless tests pass
There is no commented out code in this PR.
I have followed the development checklist
The code has been formatted using Black (black --fast homeassistant tests)
Tests have been added to verify that the new code works.

If user exposed functionality or configuration variables are added/changed:

Documentation added/updated for www.home-assistant.io

If the code communicates with devices, web services, or third-party tools:

The manifest file has all fields filled out correctly.
Updated and included derived files by running: python3 -m script.hassfest.
New or updated dependencies have been added to requirements_all.txt.
Updated by running python3 -m script.gen_requirements_all.
For the updated dependencies - a link to the changelog, or at minimum a diff between library versions is added to the PR description.
Untested files have been added to .coveragerc.

The integration reached or maintains the following Integration Quality Scale:

No score or internal
🥈 Silver
🥇 Gold
🏆 Platinum

To help with the load of incoming pull requests:

I have reviewed two other open pull requests in this repository.

epenet · 2022-08-08T14:06:00Z

Also, please remember to add a link to changelog

dgomes · 2022-08-25T17:34:05Z

Example diagnostic dump:

{
  "home_assistant": {
    "installation_type": "Home Assistant Core",
    "version": "2022.9.0.dev0",
    "dev": true,
    "hassio": false,
    "virtualenv": true,
    "python_version": "3.10.6",
    "docker": false,
    "arch": "x86_64",
    "timezone": "Europe/Lisbon",
    "os_name": "Darwin",
    "os_version": "12.5.1",
    "run_as_root": false
  },
  "custom_components": {
    "openhasp": {
      "version": "0.6.5",
      "requirements": [
        "jsonschema>=3.2.0"
      ]
    },
    "generic_water_heater": {
      "version": "0.0.3",
      "requirements": []
    },
    "hacs": {
      "version": "1.26.2",
      "requirements": [
        "aiogithubapi>=22.2.4"
      ]
    },
    "erse": {
      "version": "2.1.5",
      "requirements": [
        "pyerse==0.0.4"
      ]
    }
  },
  "integration_manifest": {
    "domain": "prosegur",
    "name": "Prosegur Alarm",
    "config_flow": true,
    "documentation": "https://www.home-assistant.io/integrations/prosegur",
    "requirements": [
      "pyprosegur==0.0.8"
    ],
    "codeowners": [
      "@dgomes"
    ],
    "iot_class": "cloud_polling",
    "loggers": [
      "pyprosegur"
    ],
    "is_built_in": true
  },
  "data": {
    "installation": {
      "installationId": "1102262",
      "description": "**REDACTED**",
      "image": 1,
      "installationType": "RSI",
      "pinControl": false,
      "status": "DA",
      "preboarding": false,
      "hasDomotic": false,
      "detectors": [
        {
          "id": "884540",
          "description": "**REDACTED**",
          "type": "Camera",
          "streaming": false
        },
        {
          "id": "884541",
          "description": "**REDACTED**",
          "type": "Camera",
          "streaming": false
        },
        {
          "id": "884542",
          "description": "**REDACTED**",
          "type": "Camera",
          "streaming": false
        }
      ],
      "videoDetectors": [],
      "services": [
        {
          "type": "A",
          "statusCode": 200
        },
        {
          "type": "V",
          "statusCode": 200
        },
        {
          "type": "PB",
          "statusCode": 200
        }
      ],
      "partitions": [],
      "domoticDevices": [],
      "accessLevels": [],
      "latitude": "**REDACTED**",
      "longitude": "**REDACTED**",
      "contractId": "**REDACTED**",
      "address": "**REDACTED**"
    },
    "activity": {
      "result": {
        "code": 200,
        "message": "User events list found successfully",
        "description": "OK"
      },
      "data": [
        {
          "id": "4606293595",
          "installationId": "1102262",
          "connectionId": "B20029219",
          "logId": "-1",
          "description": "Disarming by DGOMES",
          "operation": "DA",
          "creationDate": 1661412894000
        },
        {
          "id": "4605999545",
          "installationId": "1102262",
          "connectionId": "B20029219",
          "logId": "-1",
          "description": "Full arming by DGOMES",
          "operation": "AT",
          "creationDate": 1661388353000
        }
      ]
    }
  }
}

github-actions · 2022-11-24T16:06:50Z

There hasn't been any activity on this pull request recently. This pull request has been automatically marked as stale because of that and will be closed if no further activity occurs within 7 days.
Thank you for your contributions.

balloob · 2022-12-28T12:26:50Z

+    platform.async_register_entity_service(
+        SERVICE_REQUEST_IMAGE,
+        {},
+        "async_request_image",


Why do you need this? We have an update entity service

The camera sends a still picture through an MMS service, so it's not advisable to update periodically and only use it seldomly (Prosegur will throttle your request heavily).

Prosegur Mobile App also requires this explicit request.

Some more explanation:

The alarm camera will trigger on it's self based on motion sensing and send image to Prosegur server

User might request an out of order camera capture (that's the service I'm proposing)

This service is therefore independent from update entity service which will periodically get the last camera capture available on Prosegur server.

This service is therefore independent from update entity service which will periodically get the last camera capture available on Prosegur server.

The update entity service allows to request a single update (yes, it could be used periodically in an automation, but by itself it isn't periodically).

update_service -> request image from Prosegur server
request_image -> request Prosegur to refresh it's server stored image

balloob

Looks good. 1 tiny change.

Co-authored-by: Paulus Schoutsen <paulus@home-assistant.io>

dgomes · 2023-02-27T08:44:25Z

Thanks! 🎉

MartinHjelmare

Please address the comments in a new PR. Thanks!

MartinHjelmare · 2023-02-27T09:05:23Z

+@pytest.fixture
+def mock_install() -> AsyncMock:
+    """Return the mocked alarm install."""
+    install = AsyncMock()


The installation doesn't need to be an AsyncMock. It can be a MagicMock or Mock.

It actually does:

async def async_alarm_arm_home(self, code: str | None = None) -> None: """Send arm away command.""" > await self._installation.arm_partially(self._auth) E TypeError: object MagicMock can't be used in 'await' expression

Either mock the attributes of the installation explicitly or spec the installation according to the original target.

* address late comments on #76428 * adress review * extra tweaks

probot-home-assistant Bot added dependency Pull requests marked as a dependency upgrade has-tests integration: prosegur new-feature new-platform labels Aug 7, 2022

homeassistant added the cla-signed label Aug 7, 2022

probot-home-assistant Bot added the by-code-owner label Aug 7, 2022

epenet reviewed Aug 8, 2022

View reviewed changes

Comment thread homeassistant/components/prosegur/alarm_control_panel.py Outdated

Comment thread homeassistant/components/prosegur/camera.py Outdated

Comment thread homeassistant/components/prosegur/diagnostics.py Outdated

dgomes force-pushed the prosegur_camera branch from e31589e to 31f70bb Compare August 16, 2022 21:25

github-actions Bot added the stale label Nov 24, 2022

dgomes removed the stale label Nov 24, 2022

dgomes mentioned this pull request Dec 27, 2022

Add Camera to Prosegur home-assistant/home-assistant.io#25419

Merged

8 tasks

dgomes requested a review from epenet December 27, 2022 23:52

balloob reviewed Dec 28, 2022

View reviewed changes

dgomes force-pushed the prosegur_camera branch from e221c43 to 04d675d Compare February 24, 2023 16:11

dgomes added 9 commits February 24, 2023 17:34

add camera to prosegur

ee34dd8

add tests

50e690a

address review

82f4e3e

better tests

75a2d69

clean

817f036

clean

93fbaa7

fix tests

16055c3

leftover from merge

4bdd855

sorting missing

c535be0

dgomes force-pushed the prosegur_camera branch from 35dcb2b to c535be0 Compare February 24, 2023 17:34

balloob reviewed Feb 26, 2023

View reviewed changes

Comment thread homeassistant/components/prosegur/services.yaml

balloob approved these changes Feb 26, 2023

View reviewed changes

Update homeassistant/components/prosegur/services.yaml

874a34c

Co-authored-by: Paulus Schoutsen <paulus@home-assistant.io>

balloob merged commit c8fc2dc into home-assistant:dev Feb 27, 2023

dgomes deleted the prosegur_camera branch February 27, 2023 08:44

MartinHjelmare reviewed Feb 27, 2023

View reviewed changes

dgomes restored the prosegur_camera branch February 27, 2023 20:22

dgomes added a commit to dgomes/home-assistant that referenced this pull request Feb 27, 2023

address late comments on home-assistant#76428

cb4fb98

dgomes added a commit to dgomes/home-assistant that referenced this pull request Feb 27, 2023

address late comments on home-assistant#76428

71b71a5

dgomes mentioned this pull request Feb 27, 2023

Prosegur late review comments #88859

Merged

19 tasks

MartinHjelmare pushed a commit that referenced this pull request Feb 28, 2023

Prosegur late review comments (#88859)

07c25b3

* address late comments on #76428 * adress review * extra tweaks

github-actions Bot locked and limited conversation to collaborators Feb 28, 2023

Uh oh!

Conversation

dgomes commented Aug 7, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Proposed change

Type of change

Additional information

Checklist

Uh oh!

Uh oh!

Uh oh!

Uh oh!

epenet commented Aug 8, 2022

Uh oh!

dgomes commented Aug 25, 2022 • edited by epenet Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Nov 24, 2022

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dgomes Dec 28, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

balloob left a comment

Choose a reason for hiding this comment

Uh oh!

dgomes commented Feb 27, 2023

Uh oh!

MartinHjelmare left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

dgomes commented Aug 7, 2022 •

edited

Loading

dgomes commented Aug 25, 2022 •

edited by epenet

Loading

dgomes Dec 28, 2022 •

edited

Loading