updated api for tag support

This commit is contained in:
ari committed 2022-04-22 12:51:57 -04:00
1 parent 4f78e42699
commit baada590c5
10 files changed
+95 -69

No files matched your search

+21 -19
View File
@@ -1,15 +1,17 @@
from itertools import chain
from typing import Iterable, Iterator
from pydantic.error_wrappers import ValidationError
from src.automations.tags import TagManager
from src.json_serializer import normalize_obj
from .types import AutomationData, AutomationMetdata
from .types import AutomationData, AutomationMetdata, ExtenededAutomationData
from .parsers import _parse_actions
from .errors import InvalidAutomationFile
# Single loader
def load_automation(
automations_raw_data: Iterable[dict],
) -> Iterator[AutomationData]:
auto_raw: dict,
tags: dict,
) -> Iterator[ExtenededAutomationData]:
"""Converts an automation dictionary loaded directly from the config into
several python typed objects
@@ -17,22 +19,22 @@ def load_automation(
automations_raw_data (Iterable[dict])
Returns:
Iterator[AutomationData]
Iterator[ExtenededAutomationData]
"""
for auto_raw in automations_raw_data:
try:
yield AutomationData(
metadata=AutomationMetdata.parse_obj(auto_raw),
sequence=list(
_parse_actions(
chain(
auto_raw.get("condition", []),
auto_raw.get("action", []),
)
try:
yield ExtenededAutomationData(
metadata=AutomationMetdata.parse_obj(auto_raw),
sequence=list(
_parse_actions(
chain(
auto_raw.get("condition", []),
auto_raw.get("action", []),
)
),
trigger=[normalize_obj(obj) for obj in auto_raw.get("trigger", [])],
)
except ValidationError as err:
raise InvalidAutomationFile from err
)
),
trigger=[normalize_obj(obj) for obj in auto_raw.get("trigger", [])],
tags=tags,
)
except ValidationError as err:
raise InvalidAutomationFile from err
+10 -5
View File
@@ -1,6 +1,6 @@
from typing import Iterator, List, Optional
from src.automations.errors import FailedDeletion
from src.automations.types import AutomationData
from src.automations.types import AutomationData, ExtenededAutomationData
from src.hass_config.loader import HassConfig
from .loader import load_automation
@@ -14,21 +14,24 @@ class AutomationManager:
offset: int = 0,
limit: int = 10,
) -> Iterator[AutomationData]:
tags = self.hass_config.automation_tags
for i, auto in enumerate(self.hass_config.automations):
if i < offset:
continue
if i >= offset + limit:
break
yield from load_automation([auto])
yield from load_automation(auto, tags.get(i, {}))
def get(self, index: int) -> Optional[AutomationData]:
tags = self.hass_config.automation_tags
if index >= 0:
for i, auto in enumerate(self.hass_config.automations):
if i == index:
return next(load_automation(([auto])))
return next(load_automation(auto, tags.get(i, {})))
return None
def update(self, index: int, automation: AutomationData):
def update(self, index: int, automation: ExtenededAutomationData):
tags = self.hass_config.automation_tags
automations: List[dict] = []
updated = False
for i, orig_auto in enumerate(self.hass_config.automations):
@@ -39,8 +42,10 @@ class AutomationManager:
automations.append(orig_auto)
if not updated:
automations.append(automation.to_primitive())
tags[index] = automation.tags
self.hass_config.save_automations(automations)
self.hass_config.save_tags(tags)
def delete(self, index: int):
automations: List[dict] = []
deleted = False
+3 -3
View File
@@ -2,12 +2,12 @@
from pathlib import Path
from typing import Dict, List
from typing import Dict
from src.yaml_serializer import dump_yaml, load_yaml
class TagManager(Dict[str, List[str]]):
class TagManager(Dict[int, Dict[str, str]]):
def save(self, path: Path):
path.write_text(dump_yaml(self))
path.write_text(dump_yaml(dict(self)))
@classmethod
def load(cls, path: Path):
+3
View File
@@ -44,3 +44,6 @@ class AutomationData(BaseModel):
"condition": [],
"action": [action.to_primitive() for action in self.sequence],
}
class ExtenededAutomationData(AutomationData):
tags: Dict[str, str] = Field(default_factory=dict)