Skip to content

Commit

Permalink
ci: fix warnings and isorting
Browse files Browse the repository at this point in the history
  • Loading branch information
bmario committed Jul 15, 2023
1 parent dfbbf62 commit 09598a6
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
5 changes: 2 additions & 3 deletions metricq_source_bacpypes/config_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@

from pydantic import BaseModel
from pydantic.class_validators import validator
from pydantic.config import Extra
from pydantic.fields import Field
from pydantic.types import NonNegativeInt, PositiveFloat, PositiveInt
from pydantic.types import PositiveFloat, PositiveInt

_model_config = {"extra": "forbid", "frozen": True}
"""
Expand Down Expand Up @@ -42,7 +41,7 @@ class Group(BaseModel, **_model_config):
metrics: dict[str, Metric]
"""Dictionary of metrics, keys are the metric names prefixed by the host name"""

@validator("metrics")
@validator("metrics") # type: ignore
def metrics_not_empty(cls, v: dict[str, Metric]) -> dict[str, Metric]:
if len(v) == 0:
raise ValueError("Group must have at least one metric")
Expand Down
13 changes: 6 additions & 7 deletions metricq_source_bacpypes/source.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,16 @@
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

import asyncio
from itertools import chain
from contextlib import suppress
from itertools import chain
from typing import Any, Iterable, Optional, Sequence, cast

from bacpypes3.app import Application # type: ignore
from bacpypes3.basetypes import PropertyIdentifier # type: ignore
from bacpypes3.ipv4.app import NormalApplication # type: ignore
from bacpypes3.local.device import DeviceObject # type: ignore
from bacpypes3.primitivedata import ObjectIdentifier # type: ignore
from bacpypes3.basetypes import PropertyIdentifier # type: ignore
from bacpypes3.pdu import Address, IPv4Address # type: ignore

from bacpypes3.primitivedata import ObjectIdentifier # type: ignore
from metricq import JsonDict, MetadataDict, Source, Timedelta, Timestamp, rpc_handler
from metricq.logging import get_logger

Expand Down Expand Up @@ -109,10 +108,10 @@ def __init__(

self.identifier = config.identifier
self.unit = config.unit
self._property_parameter = [
self._property_parameter = (
ObjectIdentifier(self.identifier),
PropertyIdentifier("presentValue"),
]
)

@property
def name(self) -> str:
Expand All @@ -132,7 +131,7 @@ def metadata(self) -> JsonDict:
return metadata

@property
def property_parameter(self):
def property_parameter(self) -> tuple[ObjectIdentifier, PropertyIdentifier]:
return self._property_parameter

async def update(
Expand Down

0 comments on commit 09598a6

Please sign in to comment.