manager code

This commit is contained in:
ari committed 2021-12-30 23:16:15 -05:00
1 parent 8adb86b2ec
commit ef5715ea6c
9 files changed
+66 -35

No files matched your search

+3 -3
View File
@@ -1,5 +1,5 @@
from itertools import chain from itertools import chain
from typing import Iterable from typing import Iterable, Iterator
from src.json_serializer import normalize_obj from src.json_serializer import normalize_obj
from .types import AutomationData, AutomationMetdata from .types import AutomationData, AutomationMetdata
from .parsers import _parse_actions from .parsers import _parse_actions
@@ -7,7 +7,7 @@ from .parsers import _parse_actions
# Single loader # Single loader
def load_automation( def load_automation(
automations_raw_data: Iterable[dict], automations_raw_data: Iterable[dict],
) -> Iterable[AutomationData]: ) -> Iterator[AutomationData]:
"""Converts an automation dictionary loaded directly from the config into """Converts an automation dictionary loaded directly from the config into
several python typed objects several python typed objects
@@ -15,7 +15,7 @@ def load_automation(
automations_raw_data (Iterable[dict]) automations_raw_data (Iterable[dict])
Returns: Returns:
Iterable[AutomationData] Iterator[AutomationData]
""" """
for auto_raw in automations_raw_data: for auto_raw in automations_raw_data:
+27 -2
View File
@@ -1,3 +1,28 @@
from typing import Iterator, Optional
from src.automations.types import AutomationData
from src.hass_config.loader import HassConfig
from .loader import load_automation
class AutomationManager: class AutomationManager:
def __init__(self) -> None: def __init__(self, hass_config: HassConfig) -> None:
pass self.hass_config = hass_config
def find(
self,
offset: int = 0,
limit: int = 10,
) -> Iterator[AutomationData]:
for i, auto in enumerate(self.hass_config.automations):
if i < offset:
continue
if i > offset + limit:
break
yield from load_automation([auto])
def get(self, index: int) -> Optional[AutomationData]:
if index >= 0:
for i, auto in enumerate(self.hass_config.automations):
if i == index:
return next(load_automation(([auto])))
return None
+3 -3
View File
@@ -21,8 +21,8 @@ class HassConfig:
if "automation" in config: if "automation" in config:
automation_ref = config["automation"] automation_ref = config["automation"]
if isinstance(automation_ref, IncludedYaml): if isinstance(automation_ref, IncludedYaml):
automation_path = automation_ref.path automation_path = self.root_path / automation_ref.path_str
else: else:
return list(config["automation"]) return config["automation"]
with automation_path.open("r") as f: with automation_path.open("r") as f:
return list(load_yaml(f)) # type: ignore return load_yaml(f) # type: ignore
+3 -3
View File
@@ -9,15 +9,15 @@ class IncludedYaml(NamedTuple):
this data type will represent it. this data type will represent it.
""" """
path: Path # original node path path_str: str # original node path
@classmethod @classmethod
def to_yaml(cls, representer: BaseRepresenter, node: "IncludedYaml"): def to_yaml(cls, representer: BaseRepresenter, node: "IncludedYaml"):
return representer.represent_scalar("!include", str(node.path.absolute())) return representer.represent_scalar("!include", node.path_str)
@classmethod @classmethod
def from_yaml(cls, _constructor, node: Node): def from_yaml(cls, _constructor, node: Node):
return cls(Path(node.value).absolute()) return cls(node.value)
class SecretValue(NamedTuple): class SecretValue(NamedTuple):
@@ -0,0 +1,23 @@
from unittest import TestCase
from tests.utils import HA_CONFIG_EXAMPLE, create_dummy_config_folder
from src.hass_config.loader import HassConfig
from src.automations.manager import AutomationManager
example_hass_config = HassConfig(HA_CONFIG_EXAMPLE)
example_automation_loader = AutomationManager(example_hass_config)
class manager_tests(TestCase):
def test_find_limit_and_get(self):
first_auto_with_find = list(example_automation_loader.find(limit=1))
first_auto_with_get = example_automation_loader.get(0)
self.assertEqual(first_auto_with_find[0], first_auto_with_get)
def test_find_at_most_with_offset(self):
autos = list(example_automation_loader.find(limit=10, offset=10))
self.assertTrue(len(autos), 10)
def test_find_invalid(self):
self.assertIsNone(example_automation_loader.get(-1))
self.assertIsNone(example_automation_loader.get(1_000))
self.assertIsNone(example_automation_loader.get(31))
@@ -221,21 +221,6 @@ class parser_tests(TestCase):
for expected, parsed in zip(expected_process, _parse_actions(raw_conditions)): for expected, parsed in zip(expected_process, _parse_actions(raw_conditions)):
self.assertEqual(parsed, expected) self.assertEqual(parsed, expected)
# def test_finding_with_AutomationLoader(self):
# automation_loader = AutomationLoader(load_hass_config(SAMPLE_HA_PATH))
# first_auto_with_find = list(automation_loader.find(limit=1))
# first_auto_with_get = automation_loader.get(0)
# self.assertEqual(first_auto_with_find[0], first_auto_with_get)
# kitchen_autos = list(automation_loader.find(alias="kitchen"))
# self.assertTrue(len(kitchen_autos), 3)
# self.assertIsNone(automation_loader.get(-1))
# self.assertIsNone(automation_loader.get(1_000))
# self.assertIsNone(automation_loader.get(31))
# self.assertEqual(len(automation_loader), 31)
# def test_invalid_automations(self): # def test_invalid_automations(self):
# with self.assertRaises(AutomationLoaderException): # with self.assertRaises(AutomationLoaderException):
# AutomationLoader( # AutomationLoader(
@@ -1,9 +1,7 @@
from unittest import TestCase from unittest import TestCase
from src.automations.types import AutomationData, AutomationMetdata from src.automations.types import AutomationData, AutomationMetdata
from src.hass_config.loader import HassConfig from src.hass_config.loader import HassConfig
from tests.utils import HA_CONFIG_EXAMPLE, create_dummy_config_folder from tests.utils import create_dummy_config_folder
example_hass_config = HassConfig(HA_CONFIG_EXAMPLE)
class loader_tests(TestCase): class loader_tests(TestCase):
@@ -17,7 +15,7 @@ class loader_tests(TestCase):
self.assertTrue("automation" in hass_config.configurations) self.assertTrue("automation" in hass_config.configurations)
self.assertEqual(hass_config.automations[0]["id"], "test") self.assertEqual(hass_config.automations[0]["id"], "test")
def test_load_automation_from_config_yaml_inclue(self): def test_load_automation_from_config_yaml_include(self):
folder = create_dummy_config_folder( folder = create_dummy_config_folder(
[AutomationData(metadata=AutomationMetdata(id="test"))], [AutomationData(metadata=AutomationMetdata(id="test"))],
automation_in_conifguration_mode="include", automation_in_conifguration_mode="include",
+4 -4
View File
@@ -17,11 +17,11 @@ class dumping_yamls_tests(TestCase):
yaml = dump_yaml( yaml = dump_yaml(
{ {
"automations": IncludedYaml( "automations": IncludedYaml(
Path("automations.yaml"), "automations.yaml",
) )
} }
) )
self.assertEqual(yaml, f"automations: !include {Path('automations.yaml').absolute()}\n") self.assertEqual(yaml, "automations: !include automations.yaml\n")
def test_dumping_secrets(self): def test_dumping_secrets(self):
yaml = dump_yaml({"google_password": SecretValue("gpass", "supersec")}) yaml = dump_yaml({"google_password": SecretValue("gpass", "supersec")})
@@ -48,7 +48,7 @@ class dumping_yamls_tests(TestCase):
"name": "cool", "name": "cool",
"google_password": SecretValue("gpass", "n/a"), "google_password": SecretValue("gpass", "n/a"),
"sensor": IncludedYamlDir("include_dir_list", "sensors/*yaml"), "sensor": IncludedYamlDir("include_dir_list", "sensors/*yaml"),
"automations": IncludedYaml(Path("automations.yaml").absolute()), "automations": IncludedYaml("automations.yaml"),
}, },
) )
self.assertEqual( self.assertEqual(
@@ -56,5 +56,5 @@ class dumping_yamls_tests(TestCase):
"name: cool\n" "name: cool\n"
"google_password: !secret gpass\n" "google_password: !secret gpass\n"
"sensor: !include_dir_list sensors/*yaml\n" "sensor: !include_dir_list sensors/*yaml\n"
f"automations: !include {Path('automations.yaml').absolute()}\n", f"automations: !include automations.yaml\n",
) )
+1 -1
View File
@@ -35,7 +35,7 @@ def create_dummy_config_folder(
configuration_yaml["automation"] = auto_prims configuration_yaml["automation"] = auto_prims
elif automation_in_conifguration_mode == "include": elif automation_in_conifguration_mode == "include":
configuration_yaml["automation"] = IncludedYaml( configuration_yaml["automation"] = IncludedYaml(
Path(root_folder / "automations.yaml"), "automations.yaml",
) )
if automation_in_conifguration_mode != "inline": if automation_in_conifguration_mode != "inline":
(root_folder / "automations.yaml").write_text(dump_yaml(auto_prims)) (root_folder / "automations.yaml").write_text(dump_yaml(auto_prims))