ran linters

This commit is contained in:
ari committed 2022-05-16 10:42:47 -04:00
1 parent ef5e66a8f1
commit b17e4c75b3
27 files changed
+290 -266

No files matched your search

+9 -9
View File
@@ -1,8 +1,12 @@
from typing import Iterator, Union
from pydantic.error_wrappers import ValidationError
from src.json_serializer import normalize_obj
from .types import AutomationMetdata, ExtenededAutomationData
from .errors import InvalidAutomationFile
from .types import AutomationMetdata, ExtenededAutomationData
# Single loader
def load_automation(
@@ -35,17 +39,13 @@ def load_conditions(conditions: Union[dict, list, str]):
if isinstance(conditions, list):
return list(map(ensure_condition_dictionary, conditions))
else:
return [
ensure_condition_dictionary(conditions)
]
return [ensure_condition_dictionary(conditions)]
def ensure_condition_dictionary(c: Union[str, dict]):
c = normalize_obj(c)
if isinstance(c, str):
return {
"condition": "template",
"value_template": c
}
return {"condition": "template", "value_template": c}
elif isinstance(c, dict):
return c
raise InvalidAutomationFile(f"Invalid type for condition object {c}")
raise InvalidAutomationFile(f"Invalid type for condition object {c}")
+3 -1
View File
@@ -1,7 +1,9 @@
from typing import Iterator, List, Optional
from src.automations.errors import FailedDeletion
from src.automations.types import AutomationData, ExtenededAutomationData
from src.hass_config.loader import HassConfig
from .loader import load_automation
@@ -45,7 +47,7 @@ class AutomationManager:
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
+5 -6
View File
@@ -1,15 +1,14 @@
from pathlib import Path
from typing import Dict
from src.yaml_serializer import dump_yaml, load_yaml
class TagManager(Dict[int, Dict[str, str]]):
def save(self, path: Path):
path.write_text(dump_yaml(dict(self)))
@classmethod
def load(cls, path: Path):
with path.open('r') as fp:
return cls(load_yaml(fp))
with path.open("r") as fp:
return cls(load_yaml(fp))
+6 -3
View File
@@ -1,6 +1,8 @@
from typing import Dict, List, Literal, Optional, Union
from pydantic.fields import Field
from pydantic import BaseModel
from pydantic.fields import Field
class AutomationMetdata(BaseModel):
id: str
@@ -14,7 +16,7 @@ class AutomationData(BaseModel):
metadata: AutomationMetdata
trigger: List[dict] = []
condition: List[dict] = []
sequence: List[dict] = []
sequence: List[dict] = []
def to_primitive(self):
return {
@@ -24,5 +26,6 @@ class AutomationData(BaseModel):
"action": self.sequence,
}
class ExtenededAutomationData(AutomationData):
tags: Dict[str, str] = Field(default_factory=dict)
tags: Dict[str, str] = Field(default_factory=dict)