v2 initial work
This commit is contained in:
1 parent
2bc7e11bb1
commit
3a89fe5efc
36 files changed
+830
-4
No files matched your search
@@ -0,0 +1,14 @@
|
||||
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: {}
|
||||
@@ -0,0 +1,13 @@
|
||||
id: "1659114647066"
|
||||
alias: On Home Up
|
||||
description: Example
|
||||
mode: single
|
||||
trigger:
|
||||
- platform: homeassistant
|
||||
event: start
|
||||
condition: []
|
||||
action:
|
||||
- service: counter.increment
|
||||
data: {}
|
||||
target:
|
||||
entity_id: counter.up_times
|
||||
@@ -0,0 +1,13 @@
|
||||
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
|
||||
@@ -0,0 +1,4 @@
|
||||
# Loads default set of integrations. Do not remove.
|
||||
default_config:
|
||||
|
||||
automation: !include_dir_list ./automations
|
||||
@@ -0,0 +1,14 @@
|
||||
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: {}
|
||||
@@ -0,0 +1,13 @@
|
||||
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
|
||||
@@ -0,0 +1,13 @@
|
||||
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
|
||||
@@ -0,0 +1,7 @@
|
||||
- id: "mlist1"
|
||||
alias: Merged List 1
|
||||
description: ""
|
||||
trigger: []
|
||||
condition: []
|
||||
action: []
|
||||
mode: single
|
||||
@@ -0,0 +1,14 @@
|
||||
- id: "mlist2"
|
||||
alias: Merged List 2
|
||||
description: ""
|
||||
trigger: []
|
||||
condition: []
|
||||
action: []
|
||||
mode: single
|
||||
- id: "mlist3"
|
||||
alias: Merged List 3
|
||||
description: ""
|
||||
trigger: []
|
||||
condition: []
|
||||
action: []
|
||||
mode: single
|
||||
@@ -0,0 +1,14 @@
|
||||
- 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
|
||||
@@ -0,0 +1,23 @@
|
||||
- id: '165911464702444'
|
||||
alias: In File
|
||||
description: Example
|
||||
mode: single
|
||||
trigger:
|
||||
- platform: homeassistant
|
||||
event: start
|
||||
condition: []
|
||||
action:
|
||||
- service: counter.increment
|
||||
data: {}
|
||||
target:
|
||||
entity_id: counter.up_times
|
||||
- id: '1660439437914'
|
||||
alias: NEW
|
||||
description: ''
|
||||
trigger:
|
||||
- platform: sun
|
||||
event: sunrise
|
||||
offset: 0
|
||||
condition: []
|
||||
action: []
|
||||
mode: single
|
||||
@@ -0,0 +1,12 @@
|
||||
# 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 cools: !include_dir_merge_list automations/include_dir_merge_list
|
||||
script: !include scripts.yaml
|
||||
scene: !include scenes.yaml
|
||||
@@ -0,0 +1,7 @@
|
||||
- id: "1660439557193"
|
||||
alias: SHOULD NOT BE LOADED!
|
||||
description: ""
|
||||
trigger: []
|
||||
condition: []
|
||||
action: []
|
||||
mode: single
|
||||
@@ -0,0 +1,23 @@
|
||||
- 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
|
||||
@@ -0,0 +1,14 @@
|
||||
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: {}
|
||||
@@ -0,0 +1,13 @@
|
||||
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
|
||||
@@ -0,0 +1,13 @@
|
||||
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
|
||||
@@ -0,0 +1,7 @@
|
||||
- id: "mlist1"
|
||||
alias: Merged List 1
|
||||
description: ""
|
||||
trigger: []
|
||||
condition: []
|
||||
action: []
|
||||
mode: single
|
||||
@@ -0,0 +1,14 @@
|
||||
- id: "mlist2"
|
||||
alias: Merged List 2
|
||||
description: ""
|
||||
trigger: []
|
||||
condition: []
|
||||
action: []
|
||||
mode: single
|
||||
- id: "mlist3"
|
||||
alias: Merged List 3
|
||||
description: ""
|
||||
trigger: []
|
||||
condition: []
|
||||
action: []
|
||||
mode: single
|
||||
@@ -0,0 +1,14 @@
|
||||
- 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
|
||||
@@ -0,0 +1,23 @@
|
||||
- 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
|
||||
Whitespace-only changes.
@@ -0,0 +1,81 @@
|
||||
from src.automations_v2.types import ExtenededAutomationData
|
||||
from .utils import TestWithDB
|
||||
|
||||
|
||||
class db_tests(TestWithDB):
|
||||
def test_db_creation(self):
|
||||
with self.db.get_cur() as cur:
|
||||
cur.execute("SELECT name FROM sqlite_schema WHERE type ='table'")
|
||||
tables = cur.fetchall()
|
||||
self.assertListEqual(tables, [("autos",)])
|
||||
self.db.create_db()
|
||||
with self.db.get_cur() as cur:
|
||||
cur.execute("SELECT name FROM sqlite_schema WHERE type ='table'")
|
||||
tables = cur.fetchall()
|
||||
self.assertListEqual(tables, [("autos",)])
|
||||
|
||||
def test_insert_automations(self):
|
||||
originals = [
|
||||
ExtenededAutomationData(
|
||||
id="test",
|
||||
alias="test",
|
||||
source_file="automation.yaml",
|
||||
source_file_type="obj",
|
||||
),
|
||||
ExtenededAutomationData(
|
||||
id="test2",
|
||||
alias="test",
|
||||
source_file="automation.yaml",
|
||||
source_file_type="obj",
|
||||
action=[{"event": {"nice": "one"}, "event_type": "custom"}],
|
||||
),
|
||||
]
|
||||
self.db.upsert_automations(originals)
|
||||
for original in originals:
|
||||
with self.subTest(original=original):
|
||||
self.assertEqual(self.db.get_automation(original.id), original)
|
||||
autos = list(self.db.list_automations(0, 10))
|
||||
self.assertEqual(len(autos), 2)
|
||||
|
||||
def test_insert_repeat_automations(self):
|
||||
originals = [
|
||||
ExtenededAutomationData(
|
||||
id="test",
|
||||
alias="test",
|
||||
source_file="automation.yaml",
|
||||
source_file_type="obj",
|
||||
),
|
||||
ExtenededAutomationData(
|
||||
id="test",
|
||||
alias="test",
|
||||
source_file="automation.yaml",
|
||||
source_file_type="obj",
|
||||
action=[{"event": {"nice": "one"}, "event_type": "custom"}],
|
||||
),
|
||||
]
|
||||
self.db.upsert_automations(originals)
|
||||
autos = list(self.db.list_automations(0, 10))
|
||||
self.assertEqual(len(autos), 1)
|
||||
self.assertTrue(autos[0] == originals[1])
|
||||
|
||||
def test_delete_automations(self):
|
||||
originals = [
|
||||
ExtenededAutomationData(
|
||||
id="test",
|
||||
alias="test",
|
||||
source_file="automation.yaml",
|
||||
source_file_type="obj",
|
||||
),
|
||||
ExtenededAutomationData(
|
||||
id="test2",
|
||||
alias="test",
|
||||
source_file="automation.yaml",
|
||||
source_file_type="obj",
|
||||
action=[{"event": {"nice": "one"}, "event_type": "custom"}],
|
||||
),
|
||||
]
|
||||
self.assertEqual(self.db.count_automations(), 0)
|
||||
self.db.upsert_automations(originals)
|
||||
self.assertEqual(self.db.count_automations(), 2)
|
||||
self.db.delete_automations(originals)
|
||||
self.assertEqual(self.db.count_automations(), 0)
|
||||
Whitespace-only changes.
@@ -0,0 +1,50 @@
|
||||
from src.automations_v2.watcher import AutomationFileWatcher
|
||||
from tests.utils import create_copy_of_example_config
|
||||
from .utils import TestWithDB
|
||||
|
||||
|
||||
class watcher_tests(TestWithDB):
|
||||
def test_bad_file(self):
|
||||
example_folder = create_copy_of_example_config()
|
||||
watcher = AutomationFileWatcher(example_folder / "automations.yaml", self.db_file)
|
||||
|
||||
total = self.db.count_automations()
|
||||
self.assertEqual(total, 0)
|
||||
|
||||
watcher.start()
|
||||
watcher.wait_until_next_reload(True)
|
||||
self.assertEqual(self.db.count_automations(), 32)
|
||||
|
||||
(example_folder / "automations.yaml").write_text("haha!")
|
||||
watcher.wait_until_next_reload(True, timeout=60 * 10)
|
||||
self.assertEqual(self.db.count_automations(), 0)
|
||||
watcher.join()
|
||||
|
||||
def test_load_empty_file(self):
|
||||
example_folder = create_copy_of_example_config()
|
||||
(example_folder / "automations.yaml").write_text("")
|
||||
watcher = AutomationFileWatcher(example_folder / "automations.yaml", self.db_file)
|
||||
total = self.db.count_automations()
|
||||
self.assertEqual(total, 0)
|
||||
|
||||
watcher.start()
|
||||
watcher.wait_until_next_reload(True)
|
||||
self.assertEqual(self.db.count_automations(), 0)
|
||||
|
||||
# def test_valid_changes(self):
|
||||
# example_folder = create_copy_of_example_config()
|
||||
# watcher = AutomationFileWatcher(example_folder / "automations.yaml", self.db_file)
|
||||
|
||||
# total = self.db.count_automations()
|
||||
# self.assertEqual(total, 0)
|
||||
|
||||
# watcher.start()
|
||||
# watcher.wait_until_next_reload(True)
|
||||
# self.assertEqual(self.db.count_automations(), 32)
|
||||
|
||||
# autos = self.db.list_automations(0, 32)
|
||||
|
||||
# (example_folder / "automations.yaml").write_text("haha!")
|
||||
# watcher.wait_until_next_reload(True, timeout=60 * 10)
|
||||
# self.assertEqual(self.db.count_automations(), 0)
|
||||
# watcher.join()
|
||||
@@ -0,0 +1,15 @@
|
||||
from pathlib import Path
|
||||
from unittest import TestCase
|
||||
from tempfile import mktemp
|
||||
|
||||
from src.automations_v2.db import AutomationDBConnection
|
||||
|
||||
|
||||
class TestWithDB(TestCase):
|
||||
def setUp(self) -> None:
|
||||
self.db_file = Path(mktemp() + ".db")
|
||||
self.db = AutomationDBConnection(self.db_file)
|
||||
self.db.create_db()
|
||||
|
||||
def tearDown(self) -> None:
|
||||
self.db_file.unlink()
|
||||
@@ -7,7 +7,6 @@ from src.yaml_serializer.types import (
|
||||
IncludedYamlDir,
|
||||
SecretValue,
|
||||
)
|
||||
from tests.utils import SAMPLES_FOLDER
|
||||
|
||||
|
||||
class dumping_yamls_tests(TestCase):
|
||||
@@ -25,10 +24,39 @@ class dumping_yamls_tests(TestCase):
|
||||
yaml = dump_yaml({"google_password": SecretValue("gpass", "supersec")})
|
||||
self.assertEqual(yaml, "google_password: !secret 'gpass'\n")
|
||||
|
||||
def test_dumping_stub(self):
|
||||
def test_dumping_include_dir_list(self):
|
||||
yaml = dump_yaml({"sensor": IncludedYamlDir("include_dir_list", "sensors/*yaml")})
|
||||
self.assertEqual(yaml, "sensor: !include_dir_list 'sensors/*yaml'\n")
|
||||
|
||||
def test_dumping_include_dir_merge_list(self):
|
||||
yaml = dump_yaml({"sensor": IncludedYamlDir("include_dir_merge_list", "sensors/*yaml")})
|
||||
self.assertEqual(yaml, "sensor: !include_dir_merge_list 'sensors/*yaml'\n")
|
||||
|
||||
def test_load_complex_automation_setup(self):
|
||||
yaml_obj = load_yaml(
|
||||
io.StringIO(
|
||||
"""
|
||||
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
|
||||
"""
|
||||
)
|
||||
)
|
||||
self.assertDictEqual(
|
||||
dict(yaml_obj),
|
||||
{
|
||||
"automation manual": IncludedYamlDir(
|
||||
"include_dir_list", "./automations/include_dir_list"
|
||||
),
|
||||
"automation ui": IncludedYaml("automations/ui.yaml"),
|
||||
"automation cools": IncludedYamlDir(
|
||||
"include_dir_merge_list", "automations/include_dir_merge_list"
|
||||
),
|
||||
"automation": IncludedYaml("automations/base.yaml"),
|
||||
},
|
||||
)
|
||||
|
||||
def test_load_stub(self):
|
||||
yaml_obj = load_yaml(
|
||||
io.StringIO(
|
||||
|
||||
@@ -14,6 +14,7 @@ SAMPLES_FOLDER = THIS_FOLDER / "samples"
|
||||
HA_CONFIG_EXAMPLE = SAMPLES_FOLDER / "config"
|
||||
HA_CONFIG2_EXAMPLE = SAMPLES_FOLDER / "config-2"
|
||||
HA_CONFIG3_EXAMPLE = SAMPLES_FOLDER / "config-3"
|
||||
HA_CONFIG4_EXAMPLE = SAMPLES_FOLDER / "config-4"
|
||||
|
||||
|
||||
def get_example_automation_loader(
|
||||
|
||||
Reference in new issue
Block a user