ran linters
This commit is contained in:
1 parent
ef5e66a8f1
commit
b17e4c75b3
27 files changed
+290
-266
No files matched your search
@@ -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)
|
||||||
+1
-1
@@ -10,7 +10,7 @@ setup:
|
|||||||
$(PIP) install .[dev]
|
$(PIP) install .[dev]
|
||||||
|
|
||||||
lint:
|
lint:
|
||||||
$(VENV_BIN)/vulture --exclude src
|
$(VENV_BIN)/vulture src .vulture_whitelist
|
||||||
$(MAKE) lint-project
|
$(MAKE) lint-project
|
||||||
$(MAKE) lint-tests
|
$(MAKE) lint-tests
|
||||||
|
|
||||||
|
|||||||
@@ -29,3 +29,15 @@ exclude = '''
|
|||||||
|
|
||||||
[tool.coverage.run]
|
[tool.coverage.run]
|
||||||
omit = ["./venv/*", "tests/*"]
|
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
|
||||||
+5
-4
@@ -1,10 +1,11 @@
|
|||||||
from sys import prefix
|
|
||||||
from fastapi import FastAPI
|
from fastapi import FastAPI
|
||||||
from fastapi.staticfiles import StaticFiles
|
|
||||||
from fastapi.middleware.cors import CORSMiddleware
|
from fastapi.middleware.cors import CORSMiddleware
|
||||||
|
from fastapi.staticfiles import StaticFiles
|
||||||
|
|
||||||
from src.automations.manager import AutomationManager
|
from src.automations.manager import AutomationManager
|
||||||
from src.env import ROOT_FOLDER, ORIGIN
|
from src.env import ORIGIN, ROOT_FOLDER
|
||||||
from .routes import ping, automations, details
|
|
||||||
|
from .routes import automations, details, ping
|
||||||
|
|
||||||
|
|
||||||
def make_app(automation_mgr: AutomationManager) -> FastAPI:
|
def make_app(automation_mgr: AutomationManager) -> FastAPI:
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
from fastapi import APIRouter, HTTPException
|
from fastapi import APIRouter, HTTPException
|
||||||
from src.automations.manager import AutomationManager
|
|
||||||
from src.api.types import (
|
from src.api.types import (
|
||||||
DeleteAutoRequest,
|
DeleteAutoRequest,
|
||||||
ListData,
|
ListData,
|
||||||
@@ -7,6 +7,7 @@ from src.api.types import (
|
|||||||
UpdateAutoRequest,
|
UpdateAutoRequest,
|
||||||
)
|
)
|
||||||
from src.automations.errors import FailedDeletion
|
from src.automations.errors import FailedDeletion
|
||||||
|
from src.automations.manager import AutomationManager
|
||||||
from src.automations.types import AutomationData
|
from src.automations.types import AutomationData
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
from fastapi import APIRouter
|
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
from src.hass_config import HassConfig
|
from fastapi import APIRouter
|
||||||
from src.env import BUILD_VERSION
|
|
||||||
|
|
||||||
|
from src.env import BUILD_VERSION
|
||||||
|
from src.hass_config import HassConfig
|
||||||
|
|
||||||
|
|
||||||
def make_details_router(hass_config: HassConfig) -> APIRouter:
|
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(),
|
"autos": hass_config.get_automation_path(),
|
||||||
}
|
}
|
||||||
|
|
||||||
return router
|
return router
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
from fastapi import APIRouter
|
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
|
from fastapi import APIRouter
|
||||||
|
|
||||||
from src.env import BUILD_VERSION
|
from src.env import BUILD_VERSION
|
||||||
|
|
||||||
router = APIRouter()
|
router = APIRouter()
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
from typing import Generic, List, TypeVar
|
from typing import Generic, List, TypeVar
|
||||||
|
|
||||||
from pydantic import BaseModel
|
from pydantic import BaseModel
|
||||||
from pydantic.fields import Field
|
from pydantic.fields import Field
|
||||||
from pydantic.generics import GenericModel
|
from pydantic.generics import GenericModel
|
||||||
|
|
||||||
from src.automations.types import ExtenededAutomationData
|
from src.automations.types import ExtenededAutomationData
|
||||||
|
|
||||||
DataT = TypeVar("DataT")
|
DataT = TypeVar("DataT")
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
|
from src.api.app import make_app
|
||||||
from src.automations.manager import AutomationManager
|
from src.automations.manager import AutomationManager
|
||||||
from src.hass_config import find_hass_config
|
from src.hass_config import find_hass_config
|
||||||
from src.api.app import make_app
|
|
||||||
|
|
||||||
hass_config = find_hass_config()
|
hass_config = find_hass_config()
|
||||||
app = make_app(AutomationManager(hass_config))
|
app = make_app(AutomationManager(hass_config))
|
||||||
@@ -1,8 +1,12 @@
|
|||||||
from typing import Iterator, Union
|
from typing import Iterator, Union
|
||||||
|
|
||||||
from pydantic.error_wrappers import ValidationError
|
from pydantic.error_wrappers import ValidationError
|
||||||
|
|
||||||
from src.json_serializer import normalize_obj
|
from src.json_serializer import normalize_obj
|
||||||
from .types import AutomationMetdata, ExtenededAutomationData
|
|
||||||
from .errors import InvalidAutomationFile
|
from .errors import InvalidAutomationFile
|
||||||
|
from .types import AutomationMetdata, ExtenededAutomationData
|
||||||
|
|
||||||
|
|
||||||
# Single loader
|
# Single loader
|
||||||
def load_automation(
|
def load_automation(
|
||||||
@@ -35,17 +39,13 @@ def load_conditions(conditions: Union[dict, list, str]):
|
|||||||
if isinstance(conditions, list):
|
if isinstance(conditions, list):
|
||||||
return list(map(ensure_condition_dictionary, conditions))
|
return list(map(ensure_condition_dictionary, conditions))
|
||||||
else:
|
else:
|
||||||
return [
|
return [ensure_condition_dictionary(conditions)]
|
||||||
ensure_condition_dictionary(conditions)
|
|
||||||
]
|
|
||||||
|
|
||||||
def ensure_condition_dictionary(c: Union[str, dict]):
|
def ensure_condition_dictionary(c: Union[str, dict]):
|
||||||
c = normalize_obj(c)
|
c = normalize_obj(c)
|
||||||
if isinstance(c, str):
|
if isinstance(c, str):
|
||||||
return {
|
return {"condition": "template", "value_template": c}
|
||||||
"condition": "template",
|
|
||||||
"value_template": c
|
|
||||||
}
|
|
||||||
elif isinstance(c, dict):
|
elif isinstance(c, dict):
|
||||||
return c
|
return c
|
||||||
raise InvalidAutomationFile(f"Invalid type for condition object {c}")
|
raise InvalidAutomationFile(f"Invalid type for condition object {c}")
|
||||||
@@ -1,7 +1,9 @@
|
|||||||
from typing import Iterator, List, Optional
|
from typing import Iterator, List, Optional
|
||||||
|
|
||||||
from src.automations.errors import FailedDeletion
|
from src.automations.errors import FailedDeletion
|
||||||
from src.automations.types import AutomationData, ExtenededAutomationData
|
from src.automations.types import AutomationData, ExtenededAutomationData
|
||||||
from src.hass_config.loader import HassConfig
|
from src.hass_config.loader import HassConfig
|
||||||
|
|
||||||
from .loader import load_automation
|
from .loader import load_automation
|
||||||
|
|
||||||
|
|
||||||
@@ -45,7 +47,7 @@ class AutomationManager:
|
|||||||
tags[index] = automation.tags
|
tags[index] = automation.tags
|
||||||
self.hass_config.save_automations(automations)
|
self.hass_config.save_automations(automations)
|
||||||
self.hass_config.save_tags(tags)
|
self.hass_config.save_tags(tags)
|
||||||
|
|
||||||
def delete(self, index: int):
|
def delete(self, index: int):
|
||||||
automations: List[dict] = []
|
automations: List[dict] = []
|
||||||
deleted = False
|
deleted = False
|
||||||
|
|||||||
@@ -1,15 +1,14 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Dict
|
from typing import Dict
|
||||||
|
|
||||||
from src.yaml_serializer import dump_yaml, load_yaml
|
from src.yaml_serializer import dump_yaml, load_yaml
|
||||||
|
|
||||||
|
|
||||||
class TagManager(Dict[int, Dict[str, str]]):
|
class TagManager(Dict[int, Dict[str, str]]):
|
||||||
def save(self, path: Path):
|
def save(self, path: Path):
|
||||||
path.write_text(dump_yaml(dict(self)))
|
path.write_text(dump_yaml(dict(self)))
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def load(cls, path: Path):
|
def load(cls, path: Path):
|
||||||
with path.open('r') as fp:
|
with path.open("r") as fp:
|
||||||
return cls(load_yaml(fp))
|
return cls(load_yaml(fp))
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
from typing import Dict, List, Literal, Optional, Union
|
from typing import Dict, List, Literal, Optional, Union
|
||||||
from pydantic.fields import Field
|
|
||||||
from pydantic import BaseModel
|
from pydantic import BaseModel
|
||||||
|
from pydantic.fields import Field
|
||||||
|
|
||||||
|
|
||||||
class AutomationMetdata(BaseModel):
|
class AutomationMetdata(BaseModel):
|
||||||
id: str
|
id: str
|
||||||
@@ -14,7 +16,7 @@ class AutomationData(BaseModel):
|
|||||||
metadata: AutomationMetdata
|
metadata: AutomationMetdata
|
||||||
trigger: List[dict] = []
|
trigger: List[dict] = []
|
||||||
condition: List[dict] = []
|
condition: List[dict] = []
|
||||||
sequence: List[dict] = []
|
sequence: List[dict] = []
|
||||||
|
|
||||||
def to_primitive(self):
|
def to_primitive(self):
|
||||||
return {
|
return {
|
||||||
@@ -24,5 +26,6 @@ class AutomationData(BaseModel):
|
|||||||
"action": self.sequence,
|
"action": self.sequence,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
class ExtenededAutomationData(AutomationData):
|
class ExtenededAutomationData(AutomationData):
|
||||||
tags: Dict[str, str] = Field(default_factory=dict)
|
tags: Dict[str, str] = Field(default_factory=dict)
|
||||||
+2
-3
@@ -1,9 +1,8 @@
|
|||||||
from email.policy import default
|
|
||||||
from decouple import config, Csv
|
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
|
from decouple import Csv, config
|
||||||
|
|
||||||
ROOT_FOLDER = Path(__file__).parent.parent.absolute()
|
ROOT_FOLDER = Path(__file__).parent.parent.absolute()
|
||||||
BUILD_VERSION = config("BUILD_VERSION", "0.0.0")
|
BUILD_VERSION = config("BUILD_VERSION", "0.0.0")
|
||||||
LOG_LEVEL = config("LOG_LEVEL", "INFO")
|
LOG_LEVEL = config("LOG_LEVEL", "INFO")
|
||||||
ORIGIN = config("ORIGIN", cast=Csv(), default="*")
|
ORIGIN = config("ORIGIN", cast=Csv(), default="*")
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
import os
|
import os
|
||||||
from decouple import config
|
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
|
from decouple import config
|
||||||
|
|
||||||
from .loader import HassConfig
|
from .loader import HassConfig
|
||||||
|
|
||||||
|
|
||||||
@@ -9,7 +11,7 @@ def find_hass_config() -> HassConfig:
|
|||||||
if config("USE_EXAMPLE_REPO", False, cast=bool):
|
if config("USE_EXAMPLE_REPO", False, cast=bool):
|
||||||
print("using USE_EXAMPLE_REPO")
|
print("using USE_EXAMPLE_REPO")
|
||||||
from tests.utils import create_copy_of_example_config
|
from tests.utils import create_copy_of_example_config
|
||||||
|
|
||||||
path = create_copy_of_example_config()
|
path = create_copy_of_example_config()
|
||||||
print("|-> ", path)
|
print("|-> ", path)
|
||||||
return HassConfig(path)
|
return HassConfig(path)
|
||||||
|
|||||||
@@ -1,9 +1,10 @@
|
|||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import List, Optional
|
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 src.yaml_serializer.types import IncludedYaml
|
||||||
|
|
||||||
from .errors import MissingFile
|
from .errors import MissingFile
|
||||||
|
|
||||||
|
|
||||||
@@ -25,7 +26,7 @@ class HassConfig:
|
|||||||
except FileNotFoundError as err:
|
except FileNotFoundError as err:
|
||||||
raise MissingFile("automations.yaml") from err
|
raise MissingFile("automations.yaml") from err
|
||||||
return self.configurations["automation"]
|
return self.configurations["automation"]
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def automation_tags(self) -> TagManager:
|
def automation_tags(self) -> TagManager:
|
||||||
tag_path = self.get_automation_tags_path()
|
tag_path = self.get_automation_tags_path()
|
||||||
@@ -35,7 +36,6 @@ class HassConfig:
|
|||||||
else:
|
else:
|
||||||
return TagManager.load(tag_path)
|
return TagManager.load(tag_path)
|
||||||
|
|
||||||
|
|
||||||
def get_automation_tags_path(self) -> Path:
|
def get_automation_tags_path(self) -> Path:
|
||||||
return self.root_path / ".shortumations" / "tags.yaml"
|
return self.root_path / ".shortumations" / "tags.yaml"
|
||||||
|
|
||||||
@@ -66,4 +66,4 @@ class HassConfig:
|
|||||||
)
|
)
|
||||||
|
|
||||||
def save_tags(self, tags: TagManager):
|
def save_tags(self, tags: TagManager):
|
||||||
tags.save(self.get_automation_tags_path())
|
tags.save(self.get_automation_tags_path())
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
import io
|
import io
|
||||||
from typing import Any, Union, TextIO
|
from typing import Any, TextIO, Union
|
||||||
|
|
||||||
from src.yaml_serializer.base_yaml import yaml
|
from src.yaml_serializer.base_yaml import yaml
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,10 @@
|
|||||||
from ruamel.yaml import YAML
|
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 = YAML()
|
||||||
yaml.register_class(IncludedYaml)
|
yaml.register_class(IncludedYaml)
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
from typing import NamedTuple
|
from typing import NamedTuple
|
||||||
|
|
||||||
from ruamel.yaml.nodes import Node
|
from ruamel.yaml.nodes import Node
|
||||||
from ruamel.yaml.representer import BaseRepresenter
|
from ruamel.yaml.representer import BaseRepresenter
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,14 @@
|
|||||||
from ruamel.yaml import YAML
|
|
||||||
from unittest import TestCase
|
from unittest import TestCase
|
||||||
|
|
||||||
from fastapi.testclient import TestClient
|
from fastapi.testclient import TestClient
|
||||||
|
from ruamel.yaml import YAML
|
||||||
|
|
||||||
from src.api.app import make_app
|
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
|
from tests.utils import HA_CONFIG2_EXAMPLE, get_example_automation_loader
|
||||||
|
|
||||||
|
|
||||||
@@ -17,12 +23,8 @@ class BaseTestCase(TestCase):
|
|||||||
|
|
||||||
|
|
||||||
class automation_list_tests(BaseTestCase):
|
class automation_list_tests(BaseTestCase):
|
||||||
|
|
||||||
test_params = {
|
test_params = {"total": 28, "subtest2_found_items": 3, "subtest1_found_items": 10}
|
||||||
"total": 28,
|
|
||||||
"subtest2_found_items": 3,
|
|
||||||
"subtest1_found_items": 10
|
|
||||||
}
|
|
||||||
|
|
||||||
def test_get_list_of_everything(self):
|
def test_get_list_of_everything(self):
|
||||||
data = self.client.post(
|
data = self.client.post(
|
||||||
@@ -41,8 +43,8 @@ class automation_list_tests(BaseTestCase):
|
|||||||
"limit": 50,
|
"limit": 50,
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
self.assertEqual(d["totalItems"], self.test_params['total'])
|
self.assertEqual(d["totalItems"], self.test_params["total"])
|
||||||
self.assertEqual(len(d["data"]), self.test_params['total'])
|
self.assertEqual(len(d["data"]), self.test_params["total"])
|
||||||
|
|
||||||
def test_subset1(self):
|
def test_subset1(self):
|
||||||
data = self.client.post(
|
data = self.client.post(
|
||||||
@@ -61,7 +63,7 @@ class automation_list_tests(BaseTestCase):
|
|||||||
"limit": 10,
|
"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"])
|
self.assertEqual(len(d["data"]), self.test_params["subtest1_found_items"])
|
||||||
|
|
||||||
def test_subset2(self):
|
def test_subset2(self):
|
||||||
@@ -81,15 +83,17 @@ class automation_list_tests(BaseTestCase):
|
|||||||
"limit": 10,
|
"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"])
|
self.assertEqual(len(d["data"]), self.test_params["subtest2_found_items"])
|
||||||
|
|
||||||
|
|
||||||
class automation2_lists_tests(automation_list_tests):
|
class automation2_lists_tests(automation_list_tests):
|
||||||
test_params = {
|
test_params = {
|
||||||
"total": 1,
|
"total": 1,
|
||||||
"subtest2_found_items": 0,
|
"subtest2_found_items": 0,
|
||||||
"subtest1_found_items": 1,
|
"subtest1_found_items": 1,
|
||||||
}
|
}
|
||||||
|
|
||||||
def setUp(self) -> None:
|
def setUp(self) -> None:
|
||||||
(
|
(
|
||||||
self.config_folder,
|
self.config_folder,
|
||||||
@@ -99,7 +103,6 @@ class automation2_lists_tests(automation_list_tests):
|
|||||||
self.client = TestClient(make_app(self.automation_loader))
|
self.client = TestClient(make_app(self.automation_loader))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class automation_update_tests(BaseTestCase):
|
class automation_update_tests(BaseTestCase):
|
||||||
def test_insert_new(self):
|
def test_insert_new(self):
|
||||||
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0})
|
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})
|
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 20})
|
||||||
new_auto = resp.json()["data"][0]
|
new_auto = resp.json()["data"][0]
|
||||||
self.assertNotEqual(original_auto, new_auto)
|
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):
|
def test_consistent_standard_1(self):
|
||||||
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 15})
|
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 15})
|
||||||
original_auto = resp.json()["data"][0]
|
original_auto = resp.json()["data"][0]
|
||||||
original_auto['metadata']['alias'] = "I CHANGED!"
|
original_auto["metadata"]["alias"] = "I CHANGED!"
|
||||||
resp = self.client.post(
|
resp = self.client.post(
|
||||||
"/automations",
|
"/automations",
|
||||||
json={
|
json={
|
||||||
@@ -145,46 +150,49 @@ class automation_update_tests(BaseTestCase):
|
|||||||
},
|
},
|
||||||
)
|
)
|
||||||
self.assertEqual(resp.status_code, 200)
|
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])
|
disk_data = dict(YAML().load(fp)[15])
|
||||||
trigger = list(map(dict, disk_data.pop('trigger')))
|
trigger = list(map(dict, disk_data.pop("trigger")))
|
||||||
condition = disk_data.pop('condition')
|
condition = disk_data.pop("condition")
|
||||||
action = list(map(dict, disk_data.pop('action')))
|
action = list(map(dict, disk_data.pop("action")))
|
||||||
self.assertDictEqual(disk_data, {
|
self.assertDictEqual(
|
||||||
"id": "1629422438707",
|
disk_data,
|
||||||
"alias": "I CHANGED!",
|
{"id": "1629422438707", "alias": "I CHANGED!", "description": "", "mode": "single"},
|
||||||
"description": "",
|
)
|
||||||
"mode": "single"
|
self.assertListEqual(
|
||||||
})
|
trigger, [{"platform": "time", "at": "input_datetime.vita_night_pump_time"}]
|
||||||
self.assertListEqual(trigger, [
|
)
|
||||||
{"platform": "time", "at": "input_datetime.vita_night_pump_time"}
|
self.assertListEqual(
|
||||||
])
|
condition,
|
||||||
self.assertListEqual(condition, [{
|
[
|
||||||
"conditions": [
|
{
|
||||||
{"condition": "time", "after": "input_datetime.vita_night_pump_time", "before": "00:00:00"},
|
"conditions": [
|
||||||
{"condition": "time", "after": "00:00:00", "before": "06:00:00"}
|
{
|
||||||
],
|
"condition": "time",
|
||||||
"condition": "and"
|
"after": "input_datetime.vita_night_pump_time",
|
||||||
}, ])
|
"before": "00:00:00",
|
||||||
self.assertListEqual(action, [
|
},
|
||||||
|
{"condition": "time", "after": "00:00:00", "before": "06:00:00"},
|
||||||
{
|
],
|
||||||
"service": "light.turn_on",
|
"condition": "and",
|
||||||
"target": {
|
},
|
||||||
"entity_id": "light.bulb_staircase",
|
],
|
||||||
"area_id": "living_room"
|
)
|
||||||
},
|
self.assertListEqual(
|
||||||
"data": {
|
action,
|
||||||
"brightness_pct": 40,
|
[
|
||||||
"transition": 15
|
{
|
||||||
|
"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):
|
def test_consistent_standard_2(self):
|
||||||
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 27})
|
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 27})
|
||||||
original_auto = resp.json()["data"][0]
|
original_auto = resp.json()["data"][0]
|
||||||
original_auto['metadata']['alias'] = "I CHANGED!"
|
original_auto["metadata"]["alias"] = "I CHANGED!"
|
||||||
resp = self.client.post(
|
resp = self.client.post(
|
||||||
"/automations",
|
"/automations",
|
||||||
json={
|
json={
|
||||||
@@ -193,155 +201,125 @@ class automation_update_tests(BaseTestCase):
|
|||||||
},
|
},
|
||||||
)
|
)
|
||||||
self.assertEqual(resp.status_code, 200)
|
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])
|
disk_data = dict(YAML().load(fp)[27])
|
||||||
trigger = list(map(dict, disk_data.pop('trigger')))
|
trigger = list(map(dict, disk_data.pop("trigger")))
|
||||||
condition = disk_data.pop('condition')
|
condition = disk_data.pop("condition")
|
||||||
action = list(map(dict, disk_data.pop('action')))
|
action = list(map(dict, disk_data.pop("action")))
|
||||||
self.assertDictEqual(disk_data, {
|
self.assertDictEqual(
|
||||||
"id": "1649947692702",
|
disk_data,
|
||||||
"alias": "I CHANGED!",
|
{"id": "1649947692702", "alias": "I CHANGED!", "description": "", "mode": "single"},
|
||||||
"description": "",
|
)
|
||||||
"mode": "single"
|
self.assertListEqual(
|
||||||
})
|
trigger,
|
||||||
self.assertListEqual(trigger, [
|
[
|
||||||
{
|
{
|
||||||
"device_id": "das2qdasdasdasadaasd",
|
"device_id": "das2qdasdasdasadaasd",
|
||||||
"domain": "zha",
|
"domain": "zha",
|
||||||
"platform": "device",
|
"platform": "device",
|
||||||
"type": "remote_button_short_press",
|
"type": "remote_button_short_press",
|
||||||
"subtype": "turn_on",
|
"subtype": "turn_on",
|
||||||
"id": "turn_on"
|
"id": "turn_on",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"device_id": "das2qdasdasdasadaasd",
|
"device_id": "das2qdasdasdasadaasd",
|
||||||
"domain": "zha",
|
"domain": "zha",
|
||||||
"platform": "device",
|
"platform": "device",
|
||||||
"type": "remote_button_short_press",
|
"type": "remote_button_short_press",
|
||||||
"subtype": "turn_off",
|
"subtype": "turn_off",
|
||||||
"id": "turn_off"
|
"id": "turn_off",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"device_id": "das2qdasdasdasadaasd",
|
"device_id": "das2qdasdasdasadaasd",
|
||||||
"domain": "zha",
|
"domain": "zha",
|
||||||
"platform": "device",
|
"platform": "device",
|
||||||
"type": "remote_button_short_press",
|
"type": "remote_button_short_press",
|
||||||
"subtype": "dim_up",
|
"subtype": "dim_up",
|
||||||
"id": "dim_up"
|
"id": "dim_up",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"device_id": "das2qdasdasdasadaasd",
|
"device_id": "das2qdasdasdasadaasd",
|
||||||
"domain": "zha",
|
"domain": "zha",
|
||||||
"platform": "device",
|
"platform": "device",
|
||||||
"type": "remote_button_short_press",
|
"type": "remote_button_short_press",
|
||||||
"subtype": "dim_down",
|
"subtype": "dim_down",
|
||||||
"id": "dim_down"
|
"id": "dim_down",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"device_id": "das2qdasdasdasadaasd",
|
"device_id": "das2qdasdasdasadaasd",
|
||||||
"domain": "zha",
|
"domain": "zha",
|
||||||
"platform": "device",
|
"platform": "device",
|
||||||
"type": "remote_button_double_press",
|
"type": "remote_button_double_press",
|
||||||
"subtype": "turn_on",
|
"subtype": "turn_on",
|
||||||
"id": "up_dbclk"
|
"id": "up_dbclk",
|
||||||
}
|
},
|
||||||
])
|
],
|
||||||
|
)
|
||||||
self.assertListEqual(condition, [])
|
self.assertListEqual(condition, [])
|
||||||
self.assertListEqual(action, [
|
self.assertListEqual(
|
||||||
{
|
action,
|
||||||
"choose": [
|
[
|
||||||
{
|
{
|
||||||
"conditions": [
|
"choose": [
|
||||||
{
|
{
|
||||||
"condition": "trigger",
|
"conditions": [{"condition": "trigger", "id": "turn_off"}],
|
||||||
"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": [
|
"default": [],
|
||||||
{
|
|
||||||
"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": []
|
)
|
||||||
}
|
|
||||||
])
|
|
||||||
|
|
||||||
class automation_delete_tests(BaseTestCase):
|
class automation_delete_tests(BaseTestCase):
|
||||||
def test_delete_some(self):
|
def test_delete_some(self):
|
||||||
|
|||||||
@@ -1,13 +1,8 @@
|
|||||||
from unittest import TestCase
|
from unittest import TestCase
|
||||||
from src.automations.types import (
|
|
||||||
AutomationMetdata,
|
|
||||||
ExtenededAutomationData,
|
|
||||||
)
|
|
||||||
from src.automations.loader import load_automation
|
from src.automations.loader import load_automation
|
||||||
from src.yaml_serializer.types import (
|
from src.automations.types import AutomationMetdata, ExtenededAutomationData
|
||||||
SecretValue,
|
from src.yaml_serializer.types import NOT_IMPLEMENTED_SV_MSG, SecretValue
|
||||||
NOT_IMPLEMENTED_SV_MSG,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class loader_tests(TestCase):
|
class loader_tests(TestCase):
|
||||||
@@ -31,7 +26,7 @@ class loader_tests(TestCase):
|
|||||||
],
|
],
|
||||||
"mode": "single",
|
"mode": "single",
|
||||||
},
|
},
|
||||||
{}
|
{},
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
@@ -44,10 +39,12 @@ class loader_tests(TestCase):
|
|||||||
mode="single",
|
mode="single",
|
||||||
),
|
),
|
||||||
trigger=[{"platform": "homeassistant", "event": "shutdown"}],
|
trigger=[{"platform": "homeassistant", "event": "shutdown"}],
|
||||||
condition=[{
|
condition=[
|
||||||
"condition": "template",
|
{
|
||||||
"value_template": "states(time.time) >= '10:00:00'",
|
"condition": "template",
|
||||||
}],
|
"value_template": "states(time.time) >= '10:00:00'",
|
||||||
|
}
|
||||||
|
],
|
||||||
sequence=[
|
sequence=[
|
||||||
{
|
{
|
||||||
"device_id": NOT_IMPLEMENTED_SV_MSG,
|
"device_id": NOT_IMPLEMENTED_SV_MSG,
|
||||||
@@ -57,6 +54,6 @@ class loader_tests(TestCase):
|
|||||||
"message": "Hassio Is turning off...",
|
"message": "Hassio Is turning off...",
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
tags={}
|
tags={},
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
from unittest import TestCase
|
from unittest import TestCase
|
||||||
|
|
||||||
from src.automations.errors import FailedDeletion, InvalidAutomationFile
|
from src.automations.errors import FailedDeletion, InvalidAutomationFile
|
||||||
from src.automations.types import AutomationMetdata, ExtenededAutomationData
|
from src.automations.types import AutomationMetdata, ExtenededAutomationData
|
||||||
from tests.utils import (
|
from tests.utils import (
|
||||||
|
|||||||
@@ -1,18 +1,17 @@
|
|||||||
|
|
||||||
|
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from tempfile import mktemp
|
from tempfile import mktemp
|
||||||
from unittest import TestCase
|
from unittest import TestCase
|
||||||
|
|
||||||
from src.automations.tags import TagManager
|
from src.automations.tags import TagManager
|
||||||
|
|
||||||
class tag_tests(TestCase):
|
|
||||||
|
|
||||||
|
class tag_tests(TestCase):
|
||||||
def test_load_and_save(self):
|
def test_load_and_save(self):
|
||||||
tmp_file = Path(mktemp()).with_suffix('.yml')
|
tmp_file = Path(mktemp()).with_suffix(".yml")
|
||||||
tags = TagManager()
|
tags = TagManager()
|
||||||
tags[0] = {'Room': "Kitchen", "Type": 'Lights'}
|
tags[0] = {"Room": "Kitchen", "Type": "Lights"}
|
||||||
tags[1] = {}
|
tags[1] = {}
|
||||||
|
|
||||||
tags.save(tmp_file)
|
tags.save(tmp_file)
|
||||||
loaded_tags = TagManager.load(tmp_file)
|
loaded_tags = TagManager.load(tmp_file)
|
||||||
assert loaded_tags.keys() == tags.keys()
|
assert loaded_tags.keys() == tags.keys()
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
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.errors import MissingFile
|
from src.hass_config.errors import MissingFile
|
||||||
from src.hass_config.loader import HassConfig
|
from src.hass_config.loader import HassConfig
|
||||||
|
|||||||
@@ -1,11 +1,13 @@
|
|||||||
import json
|
import json
|
||||||
from unittest import TestCase
|
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.scalarbool import ScalarBoolean
|
||||||
from ruamel.yaml.scalarfloat import ScalarFloat
|
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.json_serializer import json_dumps
|
||||||
|
from src.yaml_serializer.types import NOT_IMPLEMENTED_SV_MSG, SecretValue
|
||||||
|
|
||||||
|
|
||||||
class json_serializer_tests(TestCase):
|
class json_serializer_tests(TestCase):
|
||||||
|
|||||||
@@ -1,18 +1,16 @@
|
|||||||
import io
|
import io
|
||||||
from unittest import TestCase
|
from unittest import TestCase
|
||||||
from src.yaml_serializer import (
|
|
||||||
dump_yaml,
|
from src.yaml_serializer import dump_yaml, load_yaml
|
||||||
load_yaml,
|
|
||||||
)
|
|
||||||
from src.yaml_serializer.types import (
|
from src.yaml_serializer.types import (
|
||||||
IncludedYaml,
|
IncludedYaml,
|
||||||
SecretValue,
|
|
||||||
IncludedYamlDir,
|
IncludedYamlDir,
|
||||||
|
SecretValue,
|
||||||
)
|
)
|
||||||
from tests.utils import SAMPLES_FOLDER
|
from tests.utils import SAMPLES_FOLDER
|
||||||
|
|
||||||
class dumping_yamls_tests(TestCase):
|
|
||||||
|
|
||||||
|
class dumping_yamls_tests(TestCase):
|
||||||
def test_dumping_includes(self):
|
def test_dumping_includes(self):
|
||||||
yaml = dump_yaml(
|
yaml = dump_yaml(
|
||||||
{
|
{
|
||||||
|
|||||||
+5
-3
@@ -1,11 +1,11 @@
|
|||||||
|
from pathlib import Path
|
||||||
from shutil import copytree
|
from shutil import copytree
|
||||||
from tempfile import mkdtemp
|
from tempfile import mkdtemp
|
||||||
from pathlib import Path
|
|
||||||
from typing import List, Literal, Optional, Tuple
|
from typing import List, Literal, Optional, Tuple
|
||||||
|
|
||||||
from src.automations.manager import AutomationManager
|
from src.automations.manager import AutomationManager
|
||||||
from src.automations.types import AutomationData
|
from src.automations.types import AutomationData
|
||||||
from src.hass_config.loader import HassConfig
|
from src.hass_config.loader import HassConfig
|
||||||
|
|
||||||
from src.yaml_serializer import dump_yaml
|
from src.yaml_serializer import dump_yaml
|
||||||
from src.yaml_serializer.types import IncludedYaml
|
from src.yaml_serializer.types import IncludedYaml
|
||||||
|
|
||||||
@@ -15,7 +15,9 @@ HA_CONFIG_EXAMPLE = SAMPLES_FOLDER / "config"
|
|||||||
HA_CONFIG2_EXAMPLE = SAMPLES_FOLDER / "config-2"
|
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
|
"""Creates an example automation loader from the samples folder
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
|
|||||||
Reference in new issue
Block a user