From 30a6f2ca6e852c4c175fb215c80a978dbd6c538c Mon Sep 17 00:00:00 2001 From: Ari Date: Fri, 26 Aug 2022 14:55:32 -0400 Subject: [PATCH] package setup work --- api/src/automations/loader.py | 10 ++++++++ api/src/hass_config/loader.py | 25 ++++++++++++++++++- api/src/yaml_serializer/__init__.py | 4 +-- .../automations/base.yaml | 0 .../include_dir_list/home/down.yaml | 0 .../automations/include_dir_list/home/up.yaml | 0 .../include_dir_list/notify_washer.yaml | 0 .../include_dir_merge_list/list1.yaml | 0 .../include_dir_merge_list/sub/list2.yaml | 0 .../sub2/sub3/list3.yaml | 0 .../automations/ui.yaml | 0 .../config-7 => config-10}/configuration.yaml | 4 +-- api/tests/samples/config-10/packages/ha.yaml | 2 ++ .../config-10/packages/sub/package2.yaml | 15 +++++++++++ .../config-7/config-7/automations/base.yaml | 23 ----------------- .../include_dir_list/home/down.yaml | 14 ----------- .../automations/include_dir_list/home/up.yaml | 13 ---------- .../include_dir_list/notify_washer.yaml | 13 ---------- .../include_dir_merge_list/list1.yaml | 7 ------ .../include_dir_merge_list/sub/list2.yaml | 14 ----------- .../sub2/sub3/list3.yaml | 14 ----------- .../config-7/config-7/automations/ui.yaml | 23 ----------------- .../config-8/config-7/configuration.yaml | 18 ------------- api/tests/samples/config-8/configuration.yaml | 5 +--- api/tests/samples/config-8/packages/ha.yaml | 1 + .../config-8/packages/sub/package2.yaml | 14 +++++++++++ api/tests/samples/config/configuration.yaml | 2 ++ .../unittests/hass_config/test_loader.py | 14 ++++++++++- 28 files changed, 85 insertions(+), 150 deletions(-) rename api/tests/samples/{config-8/config-7 => config-10}/automations/base.yaml (100%) rename api/tests/samples/{config-8/config-7 => config-10}/automations/include_dir_list/home/down.yaml (100%) rename api/tests/samples/{config-8/config-7 => config-10}/automations/include_dir_list/home/up.yaml (100%) rename api/tests/samples/{config-8/config-7 => config-10}/automations/include_dir_list/notify_washer.yaml (100%) rename api/tests/samples/{config-8/config-7 => config-10}/automations/include_dir_merge_list/list1.yaml (100%) rename api/tests/samples/{config-8/config-7 => config-10}/automations/include_dir_merge_list/sub/list2.yaml (100%) rename api/tests/samples/{config-8/config-7 => config-10}/automations/include_dir_merge_list/sub2/sub3/list3.yaml (100%) rename api/tests/samples/{config-8/config-7 => config-10}/automations/ui.yaml (100%) rename api/tests/samples/{config-8/config-7/config-7 => config-10}/configuration.yaml (86%) create mode 100644 api/tests/samples/config-10/packages/ha.yaml create mode 100644 api/tests/samples/config-10/packages/sub/package2.yaml delete mode 100644 api/tests/samples/config-8/config-7/config-7/automations/base.yaml delete mode 100644 api/tests/samples/config-8/config-7/config-7/automations/include_dir_list/home/down.yaml delete mode 100644 api/tests/samples/config-8/config-7/config-7/automations/include_dir_list/home/up.yaml delete mode 100644 api/tests/samples/config-8/config-7/config-7/automations/include_dir_list/notify_washer.yaml delete mode 100644 api/tests/samples/config-8/config-7/config-7/automations/include_dir_merge_list/list1.yaml delete mode 100644 api/tests/samples/config-8/config-7/config-7/automations/include_dir_merge_list/sub/list2.yaml delete mode 100644 api/tests/samples/config-8/config-7/config-7/automations/include_dir_merge_list/sub2/sub3/list3.yaml delete mode 100644 api/tests/samples/config-8/config-7/config-7/automations/ui.yaml delete mode 100644 api/tests/samples/config-8/config-7/configuration.yaml create mode 100644 api/tests/samples/config-8/packages/ha.yaml create mode 100644 api/tests/samples/config-8/packages/sub/package2.yaml diff --git a/api/src/automations/loader.py b/api/src/automations/loader.py index 905eca9..1440bc7 100644 --- a/api/src/automations/loader.py +++ b/api/src/automations/loader.py @@ -36,6 +36,16 @@ def extract_automation_paths( yield "", "automations.yaml" +def extract_package_automation_paths(hass_config: HassConfig): + if homeassistant_config := hass_config.configurations.get("homeassistant", None): + if isinstance(homeassistant_config, IncludedYamlDir): # type: ignore + homeassistant_config_d = homeassistant_config.to_normalized_json() + elif isinstance(homeassistant_config, dict): + homeassistant_config_d = homeassistant_config + else: + raise AssertionError("configurations.homeassistant must be a dictionary!") + + def get_base_automation_key(hass_config: HassConfig): found_any = False for key, value in extract_automation_keys(hass_config): diff --git a/api/src/hass_config/loader.py b/api/src/hass_config/loader.py index 5e3e11c..4512be8 100644 --- a/api/src/hass_config/loader.py +++ b/api/src/hass_config/loader.py @@ -2,7 +2,7 @@ from pathlib import Path from typing import Optional from src.automations.tags import TagManager -from src.yaml_serializer import IncludedYaml, load_yaml +from src.yaml_serializer import IncludedYaml, IncludedYamlDir, load_yaml class HassConfig: @@ -14,6 +14,29 @@ class HassConfig: with self.get_configuration_path().open("r") as f: return dict(load_yaml(f, root_path=self.root_path)) # type: ignore + @property + def homeassistant(self) -> dict: + if homeassistant_config := self.configurations.get("homeassistant", None): + if isinstance(homeassistant_config, IncludedYamlDir): # type: ignore + homeassistant_config = homeassistant_config.to_normalized_json() + if isinstance(homeassistant_config, dict): + return homeassistant_config + else: + raise AssertionError("configurations.homeassistant must be a dictionary!") + return {} + + @property + def pacakges(self) -> dict: + if packages_config := self.homeassistant.get("packages", None): + if isinstance(packages_config, IncludedYamlDir): # type: ignore + packages_config = packages_config.to_normalized_json() + if isinstance(packages_config, dict): + return packages_config + else: + raise AssertionError("configurations.homeassistant.packages must be a dictionary!") + + return {} + @property def automation_tags(self) -> TagManager: tag_path = self.get_automation_tags_path() diff --git a/api/src/yaml_serializer/__init__.py b/api/src/yaml_serializer/__init__.py index 8093e79..3bd600c 100644 --- a/api/src/yaml_serializer/__init__.py +++ b/api/src/yaml_serializer/__init__.py @@ -81,7 +81,7 @@ class IncludedYamlDirMergedNamed(NamedTuple): def to_normalized_json(self): out = {} for path, data in load_dir_yaml(self.path): - overlap = set(data.key()).intersection(set(out.keys())) + overlap = set(data.keys()).intersection(set(out.keys())) if len(overlap) > 0: raise AssertionError( f"The keys {overlap} were found in more than 1 file, cannot handle overlapping keys due to undefined behavior expectation. See {path}" @@ -114,7 +114,7 @@ class IncludedYamlDirNamed(NamedTuple): def to_normalized_json(self): out = {} for path, data in load_dir_yaml(self.path): - if out.get(path.name, None): + if out.get(path.name, None) is None: out[path.name] = data else: raise AssertionError( diff --git a/api/tests/samples/config-8/config-7/automations/base.yaml b/api/tests/samples/config-10/automations/base.yaml similarity index 100% rename from api/tests/samples/config-8/config-7/automations/base.yaml rename to api/tests/samples/config-10/automations/base.yaml diff --git a/api/tests/samples/config-8/config-7/automations/include_dir_list/home/down.yaml b/api/tests/samples/config-10/automations/include_dir_list/home/down.yaml similarity index 100% rename from api/tests/samples/config-8/config-7/automations/include_dir_list/home/down.yaml rename to api/tests/samples/config-10/automations/include_dir_list/home/down.yaml diff --git a/api/tests/samples/config-8/config-7/automations/include_dir_list/home/up.yaml b/api/tests/samples/config-10/automations/include_dir_list/home/up.yaml similarity index 100% rename from api/tests/samples/config-8/config-7/automations/include_dir_list/home/up.yaml rename to api/tests/samples/config-10/automations/include_dir_list/home/up.yaml diff --git a/api/tests/samples/config-8/config-7/automations/include_dir_list/notify_washer.yaml b/api/tests/samples/config-10/automations/include_dir_list/notify_washer.yaml similarity index 100% rename from api/tests/samples/config-8/config-7/automations/include_dir_list/notify_washer.yaml rename to api/tests/samples/config-10/automations/include_dir_list/notify_washer.yaml diff --git a/api/tests/samples/config-8/config-7/automations/include_dir_merge_list/list1.yaml b/api/tests/samples/config-10/automations/include_dir_merge_list/list1.yaml similarity index 100% rename from api/tests/samples/config-8/config-7/automations/include_dir_merge_list/list1.yaml rename to api/tests/samples/config-10/automations/include_dir_merge_list/list1.yaml diff --git a/api/tests/samples/config-8/config-7/automations/include_dir_merge_list/sub/list2.yaml b/api/tests/samples/config-10/automations/include_dir_merge_list/sub/list2.yaml similarity index 100% rename from api/tests/samples/config-8/config-7/automations/include_dir_merge_list/sub/list2.yaml rename to api/tests/samples/config-10/automations/include_dir_merge_list/sub/list2.yaml diff --git a/api/tests/samples/config-8/config-7/automations/include_dir_merge_list/sub2/sub3/list3.yaml b/api/tests/samples/config-10/automations/include_dir_merge_list/sub2/sub3/list3.yaml similarity index 100% rename from api/tests/samples/config-8/config-7/automations/include_dir_merge_list/sub2/sub3/list3.yaml rename to api/tests/samples/config-10/automations/include_dir_merge_list/sub2/sub3/list3.yaml diff --git a/api/tests/samples/config-8/config-7/automations/ui.yaml b/api/tests/samples/config-10/automations/ui.yaml similarity index 100% rename from api/tests/samples/config-8/config-7/automations/ui.yaml rename to api/tests/samples/config-10/automations/ui.yaml diff --git a/api/tests/samples/config-8/config-7/config-7/configuration.yaml b/api/tests/samples/config-10/configuration.yaml similarity index 86% rename from api/tests/samples/config-8/config-7/config-7/configuration.yaml rename to api/tests/samples/config-10/configuration.yaml index af77e38..456b04a 100644 --- a/api/tests/samples/config-8/config-7/config-7/configuration.yaml +++ b/api/tests/samples/config-10/configuration.yaml @@ -13,6 +13,4 @@ script: !include scripts.yaml scene: !include scenes.yaml homeassistant: - packages: - ha: - automation: !include automations/ui.yaml + packages: !include_dir_merge_named packages diff --git a/api/tests/samples/config-10/packages/ha.yaml b/api/tests/samples/config-10/packages/ha.yaml new file mode 100644 index 0000000..e922bfc --- /dev/null +++ b/api/tests/samples/config-10/packages/ha.yaml @@ -0,0 +1,2 @@ +ha: + automation: !include ../automations/ui.yaml diff --git a/api/tests/samples/config-10/packages/sub/package2.yaml b/api/tests/samples/config-10/packages/sub/package2.yaml new file mode 100644 index 0000000..e257fc3 --- /dev/null +++ b/api/tests/samples/config-10/packages/sub/package2.yaml @@ -0,0 +1,15 @@ +package2: + automation: + - id: "package-ha" + alias: package ha + description: Example package auto + mode: single + trigger: + - platform: homeassistant + event: start + condition: [] + action: + - service: counter.increment + data: {} + target: + entity_id: counter.up_times diff --git a/api/tests/samples/config-8/config-7/config-7/automations/base.yaml b/api/tests/samples/config-8/config-7/config-7/automations/base.yaml deleted file mode 100644 index b933716..0000000 --- a/api/tests/samples/config-8/config-7/config-7/automations/base.yaml +++ /dev/null @@ -1,23 +0,0 @@ -- id: "base1" - alias: BASE - description: Example - mode: single - trigger: - - platform: homeassistant - event: start - condition: [] - action: - - service: counter.increment - data: {} - target: - entity_id: counter.up_times -- id: "base2" - alias: base 2 - description: "" - trigger: - - platform: sun - event: sunrise - offset: 0 - condition: [] - action: [] - mode: single diff --git a/api/tests/samples/config-8/config-7/config-7/automations/include_dir_list/home/down.yaml b/api/tests/samples/config-8/config-7/config-7/automations/include_dir_list/home/down.yaml deleted file mode 100644 index bbe9f33..0000000 --- a/api/tests/samples/config-8/config-7/config-7/automations/include_dir_list/home/down.yaml +++ /dev/null @@ -1,14 +0,0 @@ -id: "1659114822642" -alias: On Home Down -description: Example -mode: single -trigger: - - platform: homeassistant - event: shutdown -condition: [] -action: - - service: counter.increment - target: - entity_id: - - counter.up_times - data: {} diff --git a/api/tests/samples/config-8/config-7/config-7/automations/include_dir_list/home/up.yaml b/api/tests/samples/config-8/config-7/config-7/automations/include_dir_list/home/up.yaml deleted file mode 100644 index 6f670e3..0000000 --- a/api/tests/samples/config-8/config-7/config-7/automations/include_dir_list/home/up.yaml +++ /dev/null @@ -1,13 +0,0 @@ -id: "1659114647066" -alias: HA Up -description: Example -mode: single -trigger: - - platform: homeassistant - event: start -condition: [] -action: - - service: counter.increment - data: {} - target: - entity_id: counter.up_times diff --git a/api/tests/samples/config-8/config-7/config-7/automations/include_dir_list/notify_washer.yaml b/api/tests/samples/config-8/config-7/config-7/automations/include_dir_list/notify_washer.yaml deleted file mode 100644 index 835a43a..0000000 --- a/api/tests/samples/config-8/config-7/config-7/automations/include_dir_list/notify_washer.yaml +++ /dev/null @@ -1,13 +0,0 @@ -id: "1659114647067" -alias: Notify Washer -description: Example -mode: single -trigger: - - platform: homeassistant - event: start -condition: [] -action: - - service: counter.increment - data: {} - target: - entity_id: counter.up_times diff --git a/api/tests/samples/config-8/config-7/config-7/automations/include_dir_merge_list/list1.yaml b/api/tests/samples/config-8/config-7/config-7/automations/include_dir_merge_list/list1.yaml deleted file mode 100644 index c8db855..0000000 --- a/api/tests/samples/config-8/config-7/config-7/automations/include_dir_merge_list/list1.yaml +++ /dev/null @@ -1,7 +0,0 @@ -- id: "mlist1" - alias: Merged List 1 - description: "" - trigger: [] - condition: [] - action: [] - mode: single diff --git a/api/tests/samples/config-8/config-7/config-7/automations/include_dir_merge_list/sub/list2.yaml b/api/tests/samples/config-8/config-7/config-7/automations/include_dir_merge_list/sub/list2.yaml deleted file mode 100644 index e0374c1..0000000 --- a/api/tests/samples/config-8/config-7/config-7/automations/include_dir_merge_list/sub/list2.yaml +++ /dev/null @@ -1,14 +0,0 @@ -- id: "mlist2" - alias: Merged List 2 - description: "" - trigger: [] - condition: [] - action: [] - mode: single -- id: "mlist3" - alias: Merged List 3 - description: "" - trigger: [] - condition: [] - action: [] - mode: single diff --git a/api/tests/samples/config-8/config-7/config-7/automations/include_dir_merge_list/sub2/sub3/list3.yaml b/api/tests/samples/config-8/config-7/config-7/automations/include_dir_merge_list/sub2/sub3/list3.yaml deleted file mode 100644 index ab55fe7..0000000 --- a/api/tests/samples/config-8/config-7/config-7/automations/include_dir_merge_list/sub2/sub3/list3.yaml +++ /dev/null @@ -1,14 +0,0 @@ -- id: "sublist3-mlist2" - alias: Sublist 3 - Merged List 2 - description: "" - trigger: [] - condition: [] - action: [] - mode: single -- id: "sublist3-mlist3" - alias: Sublist 3 - Merged List 3 - description: "" - trigger: [] - condition: [] - action: [] - mode: single diff --git a/api/tests/samples/config-8/config-7/config-7/automations/ui.yaml b/api/tests/samples/config-8/config-7/config-7/automations/ui.yaml deleted file mode 100644 index 1751e24..0000000 --- a/api/tests/samples/config-8/config-7/config-7/automations/ui.yaml +++ /dev/null @@ -1,23 +0,0 @@ -- id: "ui1" - alias: UI 1 - description: Example - mode: single - trigger: - - platform: homeassistant - event: start - condition: [] - action: - - service: counter.increment - data: {} - target: - entity_id: counter.up_times -- id: "ui2" - alias: UI 2 - description: "" - trigger: - - platform: sun - event: sunrise - offset: 0 - condition: [] - action: [] - mode: single diff --git a/api/tests/samples/config-8/config-7/configuration.yaml b/api/tests/samples/config-8/config-7/configuration.yaml deleted file mode 100644 index af77e38..0000000 --- a/api/tests/samples/config-8/config-7/configuration.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# Loads default set of integrations. Do not remove. -default_config: - -# Text to speech -tts: - - platform: google_translate - -# automation manual: !include_dir_list ./automations/include_dir_list -# automation ui: !include automations/ui.yaml -# automation: !include automations/base.yaml -# automation cools: !include_dir_merge_list automations/include_dir_merge_list -script: !include scripts.yaml -scene: !include scenes.yaml - -homeassistant: - packages: - ha: - automation: !include automations/ui.yaml diff --git a/api/tests/samples/config-8/configuration.yaml b/api/tests/samples/config-8/configuration.yaml index 1def5de..04d0bd3 100644 --- a/api/tests/samples/config-8/configuration.yaml +++ b/api/tests/samples/config-8/configuration.yaml @@ -13,7 +13,4 @@ script: !include scripts.yaml scene: !include scenes.yaml homeassistant: - packages: !include_dir_merge_named packages - packages base: - ha: - automation: !include automations/ui.yaml + packages: !include_dir_named packages diff --git a/api/tests/samples/config-8/packages/ha.yaml b/api/tests/samples/config-8/packages/ha.yaml new file mode 100644 index 0000000..6bae0a9 --- /dev/null +++ b/api/tests/samples/config-8/packages/ha.yaml @@ -0,0 +1 @@ +automation: !include ../automations/ui.yaml diff --git a/api/tests/samples/config-8/packages/sub/package2.yaml b/api/tests/samples/config-8/packages/sub/package2.yaml new file mode 100644 index 0000000..921be97 --- /dev/null +++ b/api/tests/samples/config-8/packages/sub/package2.yaml @@ -0,0 +1,14 @@ +automation: + - id: "package-ha" + alias: package ha + description: Example package auto + mode: single + trigger: + - platform: homeassistant + event: start + condition: [] + action: + - service: counter.increment + data: {} + target: + entity_id: counter.up_times diff --git a/api/tests/samples/config/configuration.yaml b/api/tests/samples/config/configuration.yaml index 2707225..5b9ebc4 100644 --- a/api/tests/samples/config/configuration.yaml +++ b/api/tests/samples/config/configuration.yaml @@ -1,2 +1,4 @@ # empty configuration file cloud: + +homeassistant: diff --git a/api/tests/unittests/hass_config/test_loader.py b/api/tests/unittests/hass_config/test_loader.py index 4ff249b..a60df03 100644 --- a/api/tests/unittests/hass_config/test_loader.py +++ b/api/tests/unittests/hass_config/test_loader.py @@ -2,7 +2,7 @@ from unittest import TestCase from src.automations.types import BaseAutomation from src.hass_config.loader import HassConfig -from tests.utils import create_dummy_config_folder +from tests.utils import HA_CONFIG8_EXAMPLE, SAMPLES_FOLDER, create_dummy_config_folder class loader_tests(TestCase): @@ -41,3 +41,15 @@ class loader_tests(TestCase): (folder / "automations.yaml").unlink() hass_config = HassConfig(folder) self.assertIsInstance(hass_config.configurations, dict) + + def test_load_homeassitant(self): + for folder in SAMPLES_FOLDER.iterdir(): + with self.subTest(name=folder.name): + hass_config = HassConfig(folder) + assert isinstance(hass_config.homeassistant, dict) + + def test_load_packages(self): + for folder in SAMPLES_FOLDER.iterdir(): + with self.subTest(name=folder.name): + hass_config = HassConfig(folder) + assert isinstance(hass_config.pacakges, dict)