diff --git a/api/.vulture_whitelist b/api/.vulture_whitelist new file mode 100644 index 0000000..7ece49f --- /dev/null +++ b/api/.vulture_whitelist @@ -0,0 +1,17 @@ +list_autos # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:16) +upsert_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:27) +delete_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:31) +read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/details.py:12) +read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/ping.py:9) +params # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:16) +total_items # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:17) +id # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:6) +alias # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:7) +description # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:8) +trigger_variables # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:9) +mode # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:10) +json_dumps # unused function (/home/ari/Projects/Shortumation/api/src/json_serializer.py:5) +logger # unused variable (/home/ari/Projects/Shortumation/api/src/logger.py:16) +_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:13) +_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:30) +_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:54) diff --git a/api/Makefile b/api/Makefile index 24f1bcd..00c297c 100644 --- a/api/Makefile +++ b/api/Makefile @@ -10,7 +10,7 @@ setup: $(PIP) install .[dev] lint: - $(VENV_BIN)/vulture --exclude src + $(VENV_BIN)/vulture src .vulture_whitelist $(MAKE) lint-project $(MAKE) lint-tests diff --git a/api/pyproject.toml b/api/pyproject.toml index 85495f0..5101582 100644 --- a/api/pyproject.toml +++ b/api/pyproject.toml @@ -29,3 +29,15 @@ exclude = ''' [tool.coverage.run] omit = ["./venv/*", "tests/*"] + +[[tool.mypy.overrides]] +module = "decouple.*" +ignore_missing_imports = true + +[[tool.mypy.overrides]] +module = "ruamel.*" +ignore_missing_imports = true + +[[tool.mypy.overrides]] +module = "tests.*" +ignore_missing_imports = true \ No newline at end of file diff --git a/api/src/api/app.py b/api/src/api/app.py index 67721be..e81a7f0 100644 --- a/api/src/api/app.py +++ b/api/src/api/app.py @@ -1,10 +1,11 @@ -from sys import prefix from fastapi import FastAPI -from fastapi.staticfiles import StaticFiles from fastapi.middleware.cors import CORSMiddleware +from fastapi.staticfiles import StaticFiles + from src.automations.manager import AutomationManager -from src.env import ROOT_FOLDER, ORIGIN -from .routes import ping, automations, details +from src.env import ORIGIN, ROOT_FOLDER + +from .routes import automations, details, ping def make_app(automation_mgr: AutomationManager) -> FastAPI: diff --git a/api/src/api/routes/automations.py b/api/src/api/routes/automations.py index 89d971b..6b3d5db 100644 --- a/api/src/api/routes/automations.py +++ b/api/src/api/routes/automations.py @@ -1,5 +1,5 @@ from fastapi import APIRouter, HTTPException -from src.automations.manager import AutomationManager + from src.api.types import ( DeleteAutoRequest, ListData, @@ -7,6 +7,7 @@ from src.api.types import ( UpdateAutoRequest, ) from src.automations.errors import FailedDeletion +from src.automations.manager import AutomationManager from src.automations.types import AutomationData diff --git a/api/src/api/routes/details.py b/api/src/api/routes/details.py index f7196a8..c0ce390 100644 --- a/api/src/api/routes/details.py +++ b/api/src/api/routes/details.py @@ -1,9 +1,9 @@ -from fastapi import APIRouter from datetime import datetime -from src.hass_config import HassConfig -from src.env import BUILD_VERSION +from fastapi import APIRouter +from src.env import BUILD_VERSION +from src.hass_config import HassConfig def make_details_router(hass_config: HassConfig) -> APIRouter: @@ -18,4 +18,4 @@ def make_details_router(hass_config: HassConfig) -> APIRouter: "autos": hass_config.get_automation_path(), } - return router \ No newline at end of file + return router diff --git a/api/src/api/routes/ping.py b/api/src/api/routes/ping.py index 700bcd2..d260657 100644 --- a/api/src/api/routes/ping.py +++ b/api/src/api/routes/ping.py @@ -1,6 +1,7 @@ -from fastapi import APIRouter from datetime import datetime +from fastapi import APIRouter + from src.env import BUILD_VERSION router = APIRouter() diff --git a/api/src/api/types.py b/api/src/api/types.py index 48ccca2..42c6c45 100644 --- a/api/src/api/types.py +++ b/api/src/api/types.py @@ -1,7 +1,9 @@ from typing import Generic, List, TypeVar + from pydantic import BaseModel from pydantic.fields import Field from pydantic.generics import GenericModel + from src.automations.types import ExtenededAutomationData DataT = TypeVar("DataT") diff --git a/api/src/app.py b/api/src/app.py index 1420899..259a8eb 100644 --- a/api/src/app.py +++ b/api/src/app.py @@ -1,6 +1,6 @@ +from src.api.app import make_app from src.automations.manager import AutomationManager from src.hass_config import find_hass_config -from src.api.app import make_app hass_config = find_hass_config() app = make_app(AutomationManager(hass_config)) diff --git a/api/src/automations/loader.py b/api/src/automations/loader.py index 8b0ddcc..d2a3353 100644 --- a/api/src/automations/loader.py +++ b/api/src/automations/loader.py @@ -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}") \ No newline at end of file + raise InvalidAutomationFile(f"Invalid type for condition object {c}") diff --git a/api/src/automations/manager.py b/api/src/automations/manager.py index 5aaa0c4..707da9d 100644 --- a/api/src/automations/manager.py +++ b/api/src/automations/manager.py @@ -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 diff --git a/api/src/automations/tags.py b/api/src/automations/tags.py index 723022e..5bc33a1 100644 --- a/api/src/automations/tags.py +++ b/api/src/automations/tags.py @@ -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)) \ No newline at end of file + with path.open("r") as fp: + return cls(load_yaml(fp)) diff --git a/api/src/automations/types.py b/api/src/automations/types.py index e7d7b9b..8b96fb6 100644 --- a/api/src/automations/types.py +++ b/api/src/automations/types.py @@ -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) \ No newline at end of file + tags: Dict[str, str] = Field(default_factory=dict) diff --git a/api/src/env.py b/api/src/env.py index 1444de0..458f76d 100644 --- a/api/src/env.py +++ b/api/src/env.py @@ -1,9 +1,8 @@ -from email.policy import default -from decouple import config, Csv from pathlib import Path +from decouple import Csv, config ROOT_FOLDER = Path(__file__).parent.parent.absolute() BUILD_VERSION = config("BUILD_VERSION", "0.0.0") LOG_LEVEL = config("LOG_LEVEL", "INFO") -ORIGIN = config("ORIGIN", cast=Csv(), default="*") \ No newline at end of file +ORIGIN = config("ORIGIN", cast=Csv(), default="*") diff --git a/api/src/hass_config/__init__.py b/api/src/hass_config/__init__.py index 0c73c15..aeafa26 100644 --- a/api/src/hass_config/__init__.py +++ b/api/src/hass_config/__init__.py @@ -1,6 +1,8 @@ import os -from decouple import config from pathlib import Path + +from decouple import config + from .loader import HassConfig @@ -9,7 +11,7 @@ def find_hass_config() -> HassConfig: if config("USE_EXAMPLE_REPO", False, cast=bool): print("using USE_EXAMPLE_REPO") from tests.utils import create_copy_of_example_config - + path = create_copy_of_example_config() print("|-> ", path) return HassConfig(path) diff --git a/api/src/hass_config/loader.py b/api/src/hass_config/loader.py index de9ce13..33173ca 100644 --- a/api/src/hass_config/loader.py +++ b/api/src/hass_config/loader.py @@ -1,9 +1,10 @@ from pathlib import Path from typing import List, Optional -from src.automations.tags import TagManager -from src.yaml_serializer import load_yaml, dump_yaml +from src.automations.tags import TagManager +from src.yaml_serializer import dump_yaml, load_yaml from src.yaml_serializer.types import IncludedYaml + from .errors import MissingFile @@ -25,7 +26,7 @@ class HassConfig: except FileNotFoundError as err: raise MissingFile("automations.yaml") from err return self.configurations["automation"] - + @property def automation_tags(self) -> TagManager: tag_path = self.get_automation_tags_path() @@ -35,7 +36,6 @@ class HassConfig: else: return TagManager.load(tag_path) - def get_automation_tags_path(self) -> Path: return self.root_path / ".shortumations" / "tags.yaml" @@ -66,4 +66,4 @@ class HassConfig: ) def save_tags(self, tags: TagManager): - tags.save(self.get_automation_tags_path()) \ No newline at end of file + tags.save(self.get_automation_tags_path()) diff --git a/api/src/yaml_serializer/__init__.py b/api/src/yaml_serializer/__init__.py index bb700c8..e0eb247 100644 --- a/api/src/yaml_serializer/__init__.py +++ b/api/src/yaml_serializer/__init__.py @@ -1,5 +1,6 @@ import io -from typing import Any, Union, TextIO +from typing import Any, TextIO, Union + from src.yaml_serializer.base_yaml import yaml diff --git a/api/src/yaml_serializer/base_yaml.py b/api/src/yaml_serializer/base_yaml.py index 1ecfe1f..db8d052 100644 --- a/api/src/yaml_serializer/base_yaml.py +++ b/api/src/yaml_serializer/base_yaml.py @@ -1,5 +1,10 @@ from ruamel.yaml import YAML -from src.yaml_serializer.types import IncludedYaml, IncludedYamlDir, SecretValue + +from src.yaml_serializer.types import ( + IncludedYaml, + IncludedYamlDir, + SecretValue, +) yaml = YAML() yaml.register_class(IncludedYaml) diff --git a/api/src/yaml_serializer/types.py b/api/src/yaml_serializer/types.py index 6059a51..d80cfc0 100644 --- a/api/src/yaml_serializer/types.py +++ b/api/src/yaml_serializer/types.py @@ -1,4 +1,5 @@ from typing import NamedTuple + from ruamel.yaml.nodes import Node from ruamel.yaml.representer import BaseRepresenter diff --git a/api/tests/unittests/api/test_automations.py b/api/tests/unittests/api/test_automations.py index ad423a1..c40e241 100644 --- a/api/tests/unittests/api/test_automations.py +++ b/api/tests/unittests/api/test_automations.py @@ -1,8 +1,14 @@ -from ruamel.yaml import YAML from unittest import TestCase + from fastapi.testclient import TestClient +from ruamel.yaml import YAML + from src.api.app import make_app -from src.automations.types import AutomationData, AutomationMetdata, ExtenededAutomationData +from src.automations.types import ( + AutomationData, + AutomationMetdata, + ExtenededAutomationData, +) from tests.utils import HA_CONFIG2_EXAMPLE, get_example_automation_loader @@ -17,12 +23,8 @@ class BaseTestCase(TestCase): class automation_list_tests(BaseTestCase): - - test_params = { - "total": 28, - "subtest2_found_items": 3, - "subtest1_found_items": 10 - } + + test_params = {"total": 28, "subtest2_found_items": 3, "subtest1_found_items": 10} def test_get_list_of_everything(self): data = self.client.post( @@ -41,8 +43,8 @@ class automation_list_tests(BaseTestCase): "limit": 50, }, ) - self.assertEqual(d["totalItems"], self.test_params['total']) - self.assertEqual(len(d["data"]), self.test_params['total']) + self.assertEqual(d["totalItems"], self.test_params["total"]) + self.assertEqual(len(d["data"]), self.test_params["total"]) def test_subset1(self): data = self.client.post( @@ -61,7 +63,7 @@ class automation_list_tests(BaseTestCase): "limit": 10, }, ) - self.assertEqual(d["totalItems"], self.test_params['total']) + self.assertEqual(d["totalItems"], self.test_params["total"]) self.assertEqual(len(d["data"]), self.test_params["subtest1_found_items"]) def test_subset2(self): @@ -81,15 +83,17 @@ class automation_list_tests(BaseTestCase): "limit": 10, }, ) - self.assertEqual(d["totalItems"], self.test_params['total']) + self.assertEqual(d["totalItems"], self.test_params["total"]) self.assertEqual(len(d["data"]), self.test_params["subtest2_found_items"]) + class automation2_lists_tests(automation_list_tests): test_params = { "total": 1, "subtest2_found_items": 0, "subtest1_found_items": 1, } + def setUp(self) -> None: ( self.config_folder, @@ -99,7 +103,6 @@ class automation2_lists_tests(automation_list_tests): self.client = TestClient(make_app(self.automation_loader)) - class automation_update_tests(BaseTestCase): def test_insert_new(self): resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0}) @@ -131,12 +134,14 @@ class automation_update_tests(BaseTestCase): resp = self.client.post("/automations/list", json={"limit": 1, "offset": 20}) new_auto = resp.json()["data"][0] self.assertNotEqual(original_auto, new_auto) - self.assertEqual(ExtenededAutomationData(metadata=AutomationMetdata(id="testme")).dict(), new_auto) + self.assertEqual( + ExtenededAutomationData(metadata=AutomationMetdata(id="testme")).dict(), new_auto + ) def test_consistent_standard_1(self): resp = self.client.post("/automations/list", json={"limit": 1, "offset": 15}) original_auto = resp.json()["data"][0] - original_auto['metadata']['alias'] = "I CHANGED!" + original_auto["metadata"]["alias"] = "I CHANGED!" resp = self.client.post( "/automations", json={ @@ -145,46 +150,49 @@ class automation_update_tests(BaseTestCase): }, ) self.assertEqual(resp.status_code, 200) - with (self.config_folder / "automations.yaml").open('r') as fp: + with (self.config_folder / "automations.yaml").open("r") as fp: disk_data = dict(YAML().load(fp)[15]) - trigger = list(map(dict, disk_data.pop('trigger'))) - condition = disk_data.pop('condition') - action = list(map(dict, disk_data.pop('action'))) - self.assertDictEqual(disk_data, { - "id": "1629422438707", - "alias": "I CHANGED!", - "description": "", - "mode": "single" - }) - self.assertListEqual(trigger, [ - {"platform": "time", "at": "input_datetime.vita_night_pump_time"} - ]) - self.assertListEqual(condition, [{ - "conditions": [ - {"condition": "time", "after": "input_datetime.vita_night_pump_time", "before": "00:00:00"}, - {"condition": "time", "after": "00:00:00", "before": "06:00:00"} - ], - "condition": "and" - }, ]) - self.assertListEqual(action, [ - - { - "service": "light.turn_on", - "target": { - "entity_id": "light.bulb_staircase", - "area_id": "living_room" - }, - "data": { - "brightness_pct": 40, - "transition": 15 + trigger = list(map(dict, disk_data.pop("trigger"))) + condition = disk_data.pop("condition") + action = list(map(dict, disk_data.pop("action"))) + self.assertDictEqual( + disk_data, + {"id": "1629422438707", "alias": "I CHANGED!", "description": "", "mode": "single"}, + ) + self.assertListEqual( + trigger, [{"platform": "time", "at": "input_datetime.vita_night_pump_time"}] + ) + self.assertListEqual( + condition, + [ + { + "conditions": [ + { + "condition": "time", + "after": "input_datetime.vita_night_pump_time", + "before": "00:00:00", + }, + {"condition": "time", "after": "00:00:00", "before": "06:00:00"}, + ], + "condition": "and", + }, + ], + ) + self.assertListEqual( + action, + [ + { + "service": "light.turn_on", + "target": {"entity_id": "light.bulb_staircase", "area_id": "living_room"}, + "data": {"brightness_pct": 40, "transition": 15}, } - } - ]) + ], + ) def test_consistent_standard_2(self): resp = self.client.post("/automations/list", json={"limit": 1, "offset": 27}) original_auto = resp.json()["data"][0] - original_auto['metadata']['alias'] = "I CHANGED!" + original_auto["metadata"]["alias"] = "I CHANGED!" resp = self.client.post( "/automations", json={ @@ -193,155 +201,125 @@ class automation_update_tests(BaseTestCase): }, ) self.assertEqual(resp.status_code, 200) - with (self.config_folder / "automations.yaml").open('r') as fp: + with (self.config_folder / "automations.yaml").open("r") as fp: disk_data = dict(YAML().load(fp)[27]) - trigger = list(map(dict, disk_data.pop('trigger'))) - condition = disk_data.pop('condition') - action = list(map(dict, disk_data.pop('action'))) - self.assertDictEqual(disk_data, { - "id": "1649947692702", - "alias": "I CHANGED!", - "description": "", - "mode": "single" - }) - self.assertListEqual(trigger, [ - { - "device_id": "das2qdasdasdasadaasd", - "domain": "zha", - "platform": "device", - "type": "remote_button_short_press", - "subtype": "turn_on", - "id": "turn_on" - }, - { - "device_id": "das2qdasdasdasadaasd", - "domain": "zha", - "platform": "device", - "type": "remote_button_short_press", - "subtype": "turn_off", - "id": "turn_off" - }, - { - "device_id": "das2qdasdasdasadaasd", - "domain": "zha", - "platform": "device", - "type": "remote_button_short_press", - "subtype": "dim_up", - "id": "dim_up" - }, - { - "device_id": "das2qdasdasdasadaasd", - "domain": "zha", - "platform": "device", - "type": "remote_button_short_press", - "subtype": "dim_down", - "id": "dim_down" - }, - { - "device_id": "das2qdasdasdasadaasd", - "domain": "zha", - "platform": "device", - "type": "remote_button_double_press", - "subtype": "turn_on", - "id": "up_dbclk" - } - ]) + trigger = list(map(dict, disk_data.pop("trigger"))) + condition = disk_data.pop("condition") + action = list(map(dict, disk_data.pop("action"))) + self.assertDictEqual( + disk_data, + {"id": "1649947692702", "alias": "I CHANGED!", "description": "", "mode": "single"}, + ) + self.assertListEqual( + trigger, + [ + { + "device_id": "das2qdasdasdasadaasd", + "domain": "zha", + "platform": "device", + "type": "remote_button_short_press", + "subtype": "turn_on", + "id": "turn_on", + }, + { + "device_id": "das2qdasdasdasadaasd", + "domain": "zha", + "platform": "device", + "type": "remote_button_short_press", + "subtype": "turn_off", + "id": "turn_off", + }, + { + "device_id": "das2qdasdasdasadaasd", + "domain": "zha", + "platform": "device", + "type": "remote_button_short_press", + "subtype": "dim_up", + "id": "dim_up", + }, + { + "device_id": "das2qdasdasdasadaasd", + "domain": "zha", + "platform": "device", + "type": "remote_button_short_press", + "subtype": "dim_down", + "id": "dim_down", + }, + { + "device_id": "das2qdasdasdasadaasd", + "domain": "zha", + "platform": "device", + "type": "remote_button_double_press", + "subtype": "turn_on", + "id": "up_dbclk", + }, + ], + ) self.assertListEqual(condition, []) - self.assertListEqual(action, [ - { - "choose": [ + self.assertListEqual( + action, + [ { - "conditions": [ + "choose": [ { - "condition": "trigger", - "id": "turn_off" - } + "conditions": [{"condition": "trigger", "id": "turn_off"}], + "sequence": [ + { + "type": "turn_off", + "device_id": "das2qdasdasdasadaasd", + "entity_id": "light.bulb_ari_lamp", + "domain": "light", + } + ], + }, + { + "conditions": [{"condition": "trigger", "id": "turn_on"}], + "sequence": [ + { + "service": "light.turn_on", + "data": {"color_temp": 153, "brightness_pct": 100}, + "target": {"device_id": "das2qdasdasdasadaasd"}, + } + ], + }, + { + "conditions": [{"condition": "trigger", "id": "dim_up"}], + "sequence": [ + { + "device_id": "das2qdasdasdasadaasd", + "domain": "light", + "entity_id": "light.bulb_ari_lamp", + "type": "brightness_increase", + } + ], + }, + { + "conditions": [{"condition": "trigger", "id": "dim_down"}], + "sequence": [ + { + "device_id": "das2qdasdasdasadaasd", + "domain": "light", + "entity_id": "light.bulb_ari_lamp", + "type": "brightness_decrease", + } + ], + }, + { + "conditions": [{"condition": "trigger", "id": "up_dbclk"}], + "sequence": [ + { + "service": "light.turn_on", + "data": {"color_temp": 500, "brightness_pct": 100}, + "target": {"device_id": "das2qdasdasdasadaasd"}, + } + ], + }, ], - "sequence": [ - { - "type": "turn_off", - "device_id": "das2qdasdasdasadaasd", - "entity_id": "light.bulb_ari_lamp", - "domain": "light" - } - ] - }, - { - "conditions": [ - { - "condition": "trigger", - "id": "turn_on" - } - ], - "sequence": [ - { - "service": "light.turn_on", - "data": { - "color_temp": 153, - "brightness_pct": 100 - }, - "target": { - "device_id": "das2qdasdasdasadaasd" - } - } - ] - }, - { - "conditions": [ - { - "condition": "trigger", - "id": "dim_up" - } - ], - "sequence": [ - { - "device_id": "das2qdasdasdasadaasd", - "domain": "light", - "entity_id": "light.bulb_ari_lamp", - "type": "brightness_increase" - } - ] - }, - { - "conditions": [ - { - "condition": "trigger", - "id": "dim_down" - } - ], - "sequence": [ - { - "device_id": "das2qdasdasdasadaasd", - "domain": "light", - "entity_id": "light.bulb_ari_lamp", - "type": "brightness_decrease" - } - ] - }, - { - "conditions": [ - { - "condition": "trigger", - "id": "up_dbclk" - } - ], - "sequence": [ - { - "service": "light.turn_on", - "data": { - "color_temp": 500, - "brightness_pct": 100 - }, - "target": { - "device_id": "das2qdasdasdasadaasd" - } - } - ] + "default": [], } ], - "default": [] - } - ]) + ) + class automation_delete_tests(BaseTestCase): def test_delete_some(self): diff --git a/api/tests/unittests/automations/test_loader.py b/api/tests/unittests/automations/test_loader.py index c6738ce..5dad2fc 100644 --- a/api/tests/unittests/automations/test_loader.py +++ b/api/tests/unittests/automations/test_loader.py @@ -1,13 +1,8 @@ from unittest import TestCase -from src.automations.types import ( - AutomationMetdata, - ExtenededAutomationData, -) + from src.automations.loader import load_automation -from src.yaml_serializer.types import ( - SecretValue, - NOT_IMPLEMENTED_SV_MSG, -) +from src.automations.types import AutomationMetdata, ExtenededAutomationData +from src.yaml_serializer.types import NOT_IMPLEMENTED_SV_MSG, SecretValue class loader_tests(TestCase): @@ -31,7 +26,7 @@ class loader_tests(TestCase): ], "mode": "single", }, - {} + {}, ) ) self.assertEqual( @@ -44,10 +39,12 @@ class loader_tests(TestCase): mode="single", ), trigger=[{"platform": "homeassistant", "event": "shutdown"}], - condition=[{ - "condition": "template", - "value_template": "states(time.time) >= '10:00:00'", - }], + condition=[ + { + "condition": "template", + "value_template": "states(time.time) >= '10:00:00'", + } + ], sequence=[ { "device_id": NOT_IMPLEMENTED_SV_MSG, @@ -57,6 +54,6 @@ class loader_tests(TestCase): "message": "Hassio Is turning off...", } ], - tags={} + tags={}, ), ) diff --git a/api/tests/unittests/automations/test_manager.py b/api/tests/unittests/automations/test_manager.py index 4097503..a0e9816 100644 --- a/api/tests/unittests/automations/test_manager.py +++ b/api/tests/unittests/automations/test_manager.py @@ -1,4 +1,5 @@ from unittest import TestCase + from src.automations.errors import FailedDeletion, InvalidAutomationFile from src.automations.types import AutomationMetdata, ExtenededAutomationData from tests.utils import ( diff --git a/api/tests/unittests/automations/test_tags.py b/api/tests/unittests/automations/test_tags.py index 7f8b0bc..69698fd 100644 --- a/api/tests/unittests/automations/test_tags.py +++ b/api/tests/unittests/automations/test_tags.py @@ -1,18 +1,17 @@ - - from pathlib import Path from tempfile import mktemp from unittest import TestCase + from src.automations.tags import TagManager -class tag_tests(TestCase): +class tag_tests(TestCase): def test_load_and_save(self): - tmp_file = Path(mktemp()).with_suffix('.yml') + tmp_file = Path(mktemp()).with_suffix(".yml") tags = TagManager() - tags[0] = {'Room': "Kitchen", "Type": 'Lights'} + tags[0] = {"Room": "Kitchen", "Type": "Lights"} tags[1] = {} tags.save(tmp_file) loaded_tags = TagManager.load(tmp_file) - assert loaded_tags.keys() == tags.keys() \ No newline at end of file + assert loaded_tags.keys() == tags.keys() diff --git a/api/tests/unittests/hass_config/test_loader.py b/api/tests/unittests/hass_config/test_loader.py index 8e7eb2e..3cf12b6 100644 --- a/api/tests/unittests/hass_config/test_loader.py +++ b/api/tests/unittests/hass_config/test_loader.py @@ -1,4 +1,5 @@ from unittest import TestCase + from src.automations.types import AutomationData, AutomationMetdata from src.hass_config.errors import MissingFile from src.hass_config.loader import HassConfig diff --git a/api/tests/unittests/test_json_serializer.py b/api/tests/unittests/test_json_serializer.py index da51ff8..1e122b7 100644 --- a/api/tests/unittests/test_json_serializer.py +++ b/api/tests/unittests/test_json_serializer.py @@ -1,11 +1,13 @@ import json from unittest import TestCase -from ruamel.yaml.scalarstring import ScalarString -from ruamel.yaml.scalarint import ScalarInt + from ruamel.yaml.scalarbool import ScalarBoolean from ruamel.yaml.scalarfloat import ScalarFloat -from src.yaml_serializer.types import SecretValue, NOT_IMPLEMENTED_SV_MSG +from ruamel.yaml.scalarint import ScalarInt +from ruamel.yaml.scalarstring import ScalarString + from src.json_serializer import json_dumps +from src.yaml_serializer.types import NOT_IMPLEMENTED_SV_MSG, SecretValue class json_serializer_tests(TestCase): diff --git a/api/tests/unittests/test_yaml_serializer.py b/api/tests/unittests/test_yaml_serializer.py index 7ed48ec..e87a954 100644 --- a/api/tests/unittests/test_yaml_serializer.py +++ b/api/tests/unittests/test_yaml_serializer.py @@ -1,18 +1,16 @@ import io from unittest import TestCase -from src.yaml_serializer import ( - dump_yaml, - load_yaml, -) + +from src.yaml_serializer import dump_yaml, load_yaml from src.yaml_serializer.types import ( IncludedYaml, - SecretValue, IncludedYamlDir, + SecretValue, ) from tests.utils import SAMPLES_FOLDER -class dumping_yamls_tests(TestCase): +class dumping_yamls_tests(TestCase): def test_dumping_includes(self): yaml = dump_yaml( { diff --git a/api/tests/utils.py b/api/tests/utils.py index efb01bc..9713dc4 100644 --- a/api/tests/utils.py +++ b/api/tests/utils.py @@ -1,11 +1,11 @@ +from pathlib import Path from shutil import copytree from tempfile import mkdtemp -from pathlib import Path from typing import List, Literal, Optional, Tuple + from src.automations.manager import AutomationManager from src.automations.types import AutomationData from src.hass_config.loader import HassConfig - from src.yaml_serializer import dump_yaml from src.yaml_serializer.types import IncludedYaml @@ -15,7 +15,9 @@ HA_CONFIG_EXAMPLE = SAMPLES_FOLDER / "config" HA_CONFIG2_EXAMPLE = SAMPLES_FOLDER / "config-2" -def get_example_automation_loader(config_to_copy: Path = HA_CONFIG_EXAMPLE) -> Tuple[Path, HassConfig, AutomationManager]: +def get_example_automation_loader( + config_to_copy: Path = HA_CONFIG_EXAMPLE, +) -> Tuple[Path, HassConfig, AutomationManager]: """Creates an example automation loader from the samples folder Returns: