Skip to content

Fix inclusion started event model #1073

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 29, 2024
Merged

Fix inclusion started event model #1073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions test/model/test_controller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
association as association_pkg,
controller as controller_pkg,
)
from zwave_js_server.model.controller import Controller
from zwave_js_server.model.controller.firmware import ControllerFirmwareUpdateStatus
from zwave_js_server.model.controller.rebuild_routes import (
RebuildRoutesOptions,
Expand Down Expand Up @@ -2230,7 +2231,7 @@ async def test_unknown_event(controller):
)


async def test_additional_events(controller):
async def test_additional_events(controller: Controller) -> None:
"""Test that remaining events pass pydantic validation."""
event = Event(
"exclusion failed", {"source": "controller", "event": "exclusion failed"}
Expand All @@ -2250,7 +2251,7 @@ async def test_additional_events(controller):
controller.receive_event(event)
event = Event(
"inclusion started",
{"source": "controller", "event": "inclusion started", "secure": True},
{"source": "controller", "event": "inclusion started", "strategy": 0},
)
controller.receive_event(event)
event = Event(
Expand Down
6 changes: 3 additions & 3 deletions zwave_js_server/model/controller/event_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from typing import Literal, TypedDict

from ...const import RemoveNodeReason
from ...const import InclusionStrategy, RemoveNodeReason
from ...event import BaseEventModel
from ..node.data_model import FoundNodeDataType, NodeDataType
from .firmware import (
Expand Down Expand Up @@ -142,15 +142,15 @@ class InclusionStartedEventModel(BaseControllerEventModel):
"""Model for `inclusion started` event data."""

event: Literal["inclusion started"]
secure: bool
strategy: InclusionStrategy

@classmethod
def from_dict(cls, data: dict) -> InclusionStartedEventModel:
"""Initialize from dict."""
return cls(
source=data["source"],
event=data["event"],
secure=data["secure"],
strategy=data["strategy"],
)


Expand Down