refactor of how automations are sorted

This commit is contained in:
ari committed 2022-08-27 13:58:41 -04:00
1 parent 80bfbdab80
commit fbbc5af12d
15 files changed
+155 -93

No files matched your search

@@ -12,5 +12,20 @@ tts:
script: !include scripts.yaml
scene: !include scenes.yaml
automation:
- id: "inline-auto"
alias: inline-auto
description: Example package auto
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
homeassistant:
packages: !include_dir_merge_named packages
+4 -4
View File
@@ -25,7 +25,7 @@ class db_tests(TestWithDB):
alias="test",
source_file="automation.yaml",
source_file_type="obj",
configuration_key="automation",
configuration_key=["automation"],
),
ExtenededAutomation(
id="test2",
@@ -33,7 +33,7 @@ class db_tests(TestWithDB):
source_file="automation.yaml",
source_file_type="obj",
action=[{"event": {"nice": "one"}, "event_type": "custom"}],
configuration_key="automation",
configuration_key=["automation"],
),
]
self.db.insert_automations(originals)
@@ -50,7 +50,7 @@ class db_tests(TestWithDB):
alias="test",
source_file="automation.yaml",
source_file_type="obj",
configuration_key="automation",
configuration_key=["automation"],
),
ExtenededAutomation(
id="test",
@@ -58,7 +58,7 @@ class db_tests(TestWithDB):
source_file="automation.yaml",
source_file_type="obj",
action=[{"event": {"nice": "one"}, "event_type": "custom"}],
configuration_key="automation",
configuration_key=["automation"],
),
]
with self.assertRaises(DBDataError) as err:
@@ -10,7 +10,6 @@ from src.automations.tags import TagManager
from src.automations.types import ExtenededAutomation
from src.hass_config.loader import HassConfig
from tests.utils import (
HA_CONFIG10_EXAMPLE,
HA_CONFIG2_EXAMPLE,
HA_CONFIG3_EXAMPLE,
HA_CONFIG4_EXAMPLE,
@@ -19,6 +18,7 @@ from tests.utils import (
HA_CONFIG7_EXAMPLE,
HA_CONFIG8_EXAMPLE,
HA_CONFIG9_EXAMPLE,
HA_CONFIG10_EXAMPLE,
HA_CONFIG_EXAMPLE,
)
@@ -29,7 +29,7 @@ class loader_tests(TestCase):
load_automation_path(
HA_CONFIG2_EXAMPLE,
HA_CONFIG2_EXAMPLE / "automations.yaml",
configuration_key="automation",
configuration_key=["automation"],
tag_manager=TagManager({"1652069225859": {"type": "routine"}}),
)
)
@@ -40,7 +40,7 @@ class loader_tests(TestCase):
id="1652069225859",
source_file="automations.yaml",
source_file_type="list",
configuration_key="automation",
configuration_key=["automation"],
alias="Climate - Pref temperature ",
description="",
mode="single",
@@ -73,7 +73,7 @@ class loader_tests(TestCase):
load_automation_path(
HA_CONFIG4_EXAMPLE,
HA_CONFIG4_EXAMPLE / "automations" / "notify_washer.yaml",
configuration_key="automation base",
configuration_key=["automation base"],
tag_manager=TagManager({"1659114647067": {"room": "laundry"}}),
)
)
@@ -84,7 +84,7 @@ class loader_tests(TestCase):
id="1659114647067",
source_file="automations/notify_washer.yaml",
source_file_type="obj",
configuration_key="automation base",
configuration_key=["automation base"],
alias="Notify Washer",
description="Example",
mode="single",
@@ -111,7 +111,7 @@ class loader_tests(TestCase):
load_automation_path(
HA_CONFIG9_EXAMPLE,
HA_CONFIG9_EXAMPLE / "automations.yaml",
configuration_key="automation base",
configuration_key=["automation base"],
tag_manager=TagManager({}),
)
)
@@ -125,7 +125,7 @@ class loader_tests(TestCase):
load_automation_path(
file_path.parent,
file_path,
configuration_key="automation ui",
configuration_key=["automation ui"],
tag_manager=TagManager(),
)
)
@@ -138,7 +138,7 @@ class loader_tests(TestCase):
load_automation_path(
file_path.parent,
file_path,
configuration_key="automation manual",
configuration_key=["automation manual"],
tag_manager=TagManager(),
)
)
+22 -20
View File
@@ -13,6 +13,7 @@ from src.hass_config.loader import HassConfig
from tests.utils import (
HA_CONFIG6_EXAMPLE,
HA_CONFIG8_EXAMPLE,
HA_CONFIG10_EXAMPLE,
HA_CONFIG_EXAMPLE,
create_copy_of_example_config,
)
@@ -46,7 +47,7 @@ class manager_tests(TestWithDB):
}
],
)
self.assertEqual(automation.configuration_key, "automation cools")
self.assertEqual(automation.configuration_key, ["automation cools"])
automation.trigger.append(
{"platform": "zone", "entity_id": "person.thor", "zone": "zone.azguard"}
)
@@ -76,19 +77,13 @@ class manager_tests(TestWithDB):
def test_bad_automations_file(self):
config_path, automation_manager = self.get_manager(HA_CONFIG_EXAMPLE)
(config_path / "automations.yaml").write_text("bob is an uncle")
with self.assertRaises(ErrorSet) as err:
automation_manager.reload()
self.assertEqual(len(err.exception.errors), 1)
self.assertIsInstance(err.exception.errors[0], InvalidAutomationFile)
automation_manager.reload()
self.assertEqual(automation_manager.count(), 0)
def test_one_bad_automations_file(self):
config_path, automation_manager = self.get_manager(HA_CONFIG6_EXAMPLE)
(config_path / "automations" / "ui.yaml").write_text("bob is an uncle")
with self.assertRaises(ErrorSet) as err:
automation_manager.reload()
self.assertEqual(len(err.exception.errors), 1)
self.assertIsInstance(err.exception.errors[0], InvalidAutomationFile)
automation_manager.reload()
self.assertEqual(automation_manager.count(), 10)
def test_delete_automation_in_single_file(self):
@@ -96,7 +91,7 @@ class manager_tests(TestWithDB):
self.assertTrue((config_path / "automations/include_dir_list/home/down.yaml").exists())
automation_manager.reload()
automation = automation_manager.get("1659114822642")
self.assertEqual(automation.configuration_key, "automation manual")
self.assertEqual(automation.configuration_key, ["automation manual"])
automation_manager.delete(automation)
automation_manager.reload()
with self.assertRaises(DBNoAutomationFound):
@@ -110,7 +105,7 @@ class manager_tests(TestWithDB):
)
automation_manager.reload()
automation = automation_manager.get("mlist2")
self.assertEqual(automation.configuration_key, "automation cools")
self.assertEqual(automation.configuration_key, ["automation cools"])
automation_manager.delete(automation)
automation_manager.reload()
with self.assertRaises(DBNoAutomationFound):
@@ -128,7 +123,7 @@ class manager_tests(TestWithDB):
automation_manager.update(
ExtenededAutomation(
id="newlymade",
configuration_key="automation manual",
configuration_key=["automation manual"],
source_file="automations/include_dir_list/home/left.yaml",
source_file_type="obj",
)
@@ -139,7 +134,7 @@ class manager_tests(TestWithDB):
automation_manager.get("newlymade"),
ExtenededAutomation(
id="newlymade",
configuration_key="automation manual",
configuration_key=["automation manual"],
source_file="automations/include_dir_list/home/left.yaml",
source_file_type="obj",
),
@@ -156,7 +151,7 @@ class manager_tests(TestWithDB):
automation_manager.update(
ExtenededAutomation(
id="newlymade",
configuration_key="automation cools",
configuration_key=["automation cools"],
source_file="automations/include_dir_merge_list/sub/list2.yaml",
source_file_type="list",
),
@@ -170,7 +165,7 @@ class manager_tests(TestWithDB):
automation_manager.get("newlymade"),
ExtenededAutomation(
id="newlymade",
configuration_key="automation cools",
configuration_key=["automation cools"],
source_file="automations/include_dir_merge_list/sub/list2.yaml",
source_file_type="list",
),
@@ -187,7 +182,7 @@ class manager_tests(TestWithDB):
automation_manager.update(
ExtenededAutomation(
id="newlymade",
configuration_key="automation cools",
configuration_key=["automation cools"],
source_file="automations/include_dir_merge_list/sub/list4.yaml",
source_file_type="list",
),
@@ -201,7 +196,7 @@ class manager_tests(TestWithDB):
automation_manager.get("newlymade"),
ExtenededAutomation(
id="newlymade",
configuration_key="automation cools",
configuration_key=["automation cools"],
source_file="automations/include_dir_merge_list/sub/list4.yaml",
source_file_type="list",
),
@@ -219,7 +214,7 @@ class manager_tests(TestWithDB):
automation_manager.update(
ExtenededAutomation(
id="newlymade",
configuration_key="automation cools",
configuration_key=["automation cools"],
source_file="automations/include_dir_merge_list/sub/list2.yaml",
source_file_type="obj",
),
@@ -245,7 +240,7 @@ class manager_tests(TestWithDB):
automation_manager.update(
ExtenededAutomation(
id="newlymade",
configuration_key="automation cools",
configuration_key=["automation cools"],
source_file="automations/include_dir_list/home/down.yaml",
source_file_type="list",
),
@@ -333,4 +328,11 @@ class manager_tests(TestWithDB):
_, automation_manager = self.get_manager(HA_CONFIG8_EXAMPLE)
automation_manager.reload()
auto = automation_manager.get("package-sub")
self.assertEqual(auto.configuration_key, "pacakage2")
self.assertEqual(auto.configuration_key, ["pacakage2"])
def test_load_inline_auto(self):
_, automation_manager = self.get_manager(HA_CONFIG10_EXAMPLE)
automation_manager.reload()
auto = automation_manager.get("inline-auto")
self.assertEqual(auto.source_file_type, ["inline"])
self.assertEqual(auto.configuration_key, ["automation"])
@@ -2,7 +2,11 @@ from unittest import TestCase
from src.automations.types import BaseAutomation
from src.hass_config.loader import HassConfig
from tests.utils import HA_CONFIG8_EXAMPLE, SAMPLES_FOLDER, create_dummy_config_folder
from tests.utils import (
HA_CONFIG8_EXAMPLE,
SAMPLES_FOLDER,
create_dummy_config_folder,
)
class loader_tests(TestCase):
+5 -5
View File
@@ -1,7 +1,7 @@
from pathlib import Path
from shutil import copytree
from tempfile import mkdtemp
from typing import List, Literal, Optional, Tuple
from typing import Literal, Optional, Tuple
from src.automations.manager import AutomationManager
from src.automations.types import BaseAutomation
@@ -49,7 +49,7 @@ def create_copy_of_example_config(config_to_copy: Path = HA_CONFIG_EXAMPLE) -> P
def get_dummy_automation_loader(
auto: List[BaseAutomation],
auto: list[BaseAutomation],
secrets: Optional[dict] = None,
other_config: Optional[dict] = None,
automation_in_conifguration_mode: Literal["include", "inline", "none"] = "include",
@@ -57,7 +57,7 @@ def get_dummy_automation_loader(
"""Creates a dummy /config structure for testing and return the loader and config
Args:
auto (List[BaseAutomation]): automations
auto (list[BaseAutomation]): automations
secrets (Optional[dict], optional): dictionary of secrets
other_config (Optional[dict], optional): some config stuff to place into configuration.yaml. Defaults to None.
automation_in_conifguration_mode (Literal['include', 'inline', 'none'], optional): whether to !include automation as a separete file or in the configuration yaml. Defaults to inline.
@@ -77,7 +77,7 @@ def get_dummy_automation_loader(
def create_dummy_config_folder(
auto: List[BaseAutomation],
auto: list[BaseAutomation],
secrets: Optional[dict] = None,
other_config: Optional[dict] = None,
automation_in_conifguration_mode: Literal["include", "inline", "none"] = "include",
@@ -85,7 +85,7 @@ def create_dummy_config_folder(
"""Creates a dummy /config structure for testing
Args:
auto (List[BaseAutomation]): automations
auto (list[BaseAutomation]): automations
secrets (Optional[dict], optional): dictionary of secrets
other_config (Optional[dict], optional): some config stuff to place into configuration.yaml. Defaults to None.
automation_in_conifguration_mode (Literal['include', 'inline', 'none'], optional): whether to !include automation as a separete file or in the configuration yaml. Defaults to inline.