Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f8f6d74d6a | ||
|
|
819a76f8e3 | ||
|
|
a391eae7c5 | ||
|
|
7cb1a5d907 | ||
|
|
8792ed6ed8 | ||
|
|
9bafbf4e8c | ||
|
|
c67d1bd32f | ||
|
|
55ea1e23a4 | ||
|
|
d96c1fb953 | ||
|
|
f8b59c6b17 | ||
|
|
02cbacabe0 | ||
|
|
b0d924f63a | ||
|
|
7aadfbc175 | ||
|
|
08af01dd11 | ||
|
|
586f52ba56 | ||
|
|
e11f4deab5 | ||
|
|
579017d9ec | ||
|
|
a746c4db3a | ||
|
|
3a89fe5efc | ||
|
|
2bc7e11bb1 | ||
|
|
e6a835a5f3 | ||
|
|
107def4fac | ||
|
|
6b21734041 | ||
|
|
754cc2ef98 | ||
|
|
1cb40288b1 | ||
|
|
129ba28ff5 | ||
|
|
44e246f79b | ||
|
|
8bcbcaa801 | ||
|
|
b479476833 | ||
|
|
baa31ab649 | ||
|
|
dc7c6273e4 | ||
|
|
2942b6173b | ||
|
|
bcfc648011 |
No files matched your search
@@ -1,5 +1,17 @@
|
||||
# Changelog 
|
||||
|
||||
## [0.5.3] - Bug Fixes
|
||||
|
||||
- Redirecting `/` to `/web` to resolve container install strangeness reported in https://github.com/asosnovsky/Shortumation/issues/125
|
||||
- Fixed missing flag that caused the automation to explode in https://github.com/asosnovsky/Shortumation/issues/124
|
||||
|
||||
## [0.5.2] - Better Controls
|
||||
|
||||
- Add automation trigger
|
||||
- Speed dial on the bottom
|
||||
<img src="https://user-images.githubusercontent.com/7451445/183231968-9891bbb4-5c7c-4e05-b804-36978c809a5c.png" width="200px"/>
|
||||
- Infinite undos <img src="https://user-images.githubusercontent.com/7451445/183231977-ed000017-2886-4a57-b5fb-c7e527bf3894.png" width="200px"/>
|
||||
|
||||
## [0.5.1] - Sidebar!
|
||||
|
||||
- completely redesigned the sidebar!
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Shortumation 
|
||||
# <img src="logo.png" height="40x"/> Shortumation 
|
||||
|
||||
[](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml) [](https://github.com/asosnovsky/Shortumation/actions/workflows/build.yml)
|
||||
|
||||
@@ -6,7 +6,9 @@
|
||||
| ------- | ------------------------------------------------------------------------------------------------------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------- |
|
||||
| Version |  |  |
|
||||
|
||||
A [home-assistant addon](https://www.home-assistant.io/addons/) for a better UI for managing and writing your automations. We provide a way to visualize your automation using a visual-programming language that draws inspirations from [Node-Red](https://nodered.org/).
|
||||
A [home-assistant addon](https://www.home-assistant.io/addons/) for a better UI for managing and writing your automations. We provide a way to visualize your automation using a visual-programming language that draws inspirations from [Node-Red](https://nodered.org/).
|
||||
|
||||
<img src="./assets/comparisons.png">
|
||||
|
||||
## Features
|
||||
|
||||
@@ -46,12 +48,14 @@ Add the repository URL under **Supervisor → Add-on store → ⋮ → Manage ad
|
||||
|
||||
It should now appear in your `Add-on Store` and you should be able to install it!
|
||||
|
||||
**Please note that you may need to enable advance mode in your settings first!**
|
||||
|
||||
### Containerized or HA Core
|
||||
|
||||
Please note that this way of using Shortumation is **not future proof**.
|
||||
|
||||
If this warning does not scare you or you still want to try things out, then take a look at the example [docker-compose.yaml](example/containerized/docker-compose.yaml), or read the [extended guide here](https://github.com/asosnovsky/Shortumation/wiki/Installation#containerized--ha-core).
|
||||
|
||||
In general, if you want to help provide this to more home-assistant fans please join on the conversation here https://github.com/asosnovsky/Shortumation/issues/102 or help contribute :)
|
||||
|
||||
## FAQ
|
||||
|
||||
**How is this different from Node-Red?**
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
LOG_LEVEL=DEBUG
|
||||
SUPERVISOR_TOKEN=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiI2ZjJiYzM2MjkyOWM0OGM1Yjg1NzgxNDEzNTRkNDk0NSIsImlhdCI6MTY1OTExMTExMCwiZXhwIjoxOTc0NDcxMTEwfQ.Q5Ei1a9BXyB4-whrPGoko6CKavOOloFC1fbP-jAYBpU
|
||||
HASSIO_WS=ws://homeassistant:8123/api/websocket
|
||||
Vendored
+5
-10
@@ -1,12 +1,7 @@
|
||||
{
|
||||
"python.formatting.provider": "black",
|
||||
"python.testing.unittestArgs": [
|
||||
"-v",
|
||||
"-s",
|
||||
"./tests",
|
||||
"-p",
|
||||
"*test_*.py"
|
||||
],
|
||||
"python.testing.pytestEnabled": false,
|
||||
"python.testing.unittestEnabled": true
|
||||
"python.formatting.provider": "black",
|
||||
"python.testing.unittestArgs": ["-v", "-s", "./tests", "-p", "*test_*.py"],
|
||||
"python.testing.pytestEnabled": false,
|
||||
"python.testing.unittestEnabled": true,
|
||||
"python.envFile": "${workspaceFolder}/development_config/.env"
|
||||
}
|
||||
+19
-14
@@ -1,14 +1,19 @@
|
||||
list_autos # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:17)
|
||||
upsert_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:28)
|
||||
delete_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:32)
|
||||
read_details # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/details.py:10)
|
||||
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/ping.py:10)
|
||||
websocket_endpoint # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/socket.py:9)
|
||||
params # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:18)
|
||||
total_items # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:19)
|
||||
id # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:8)
|
||||
alias # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:9)
|
||||
description # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:10)
|
||||
trigger_variables # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:11)
|
||||
mode # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:12)
|
||||
json_dumps # unused function (/home/ari/Projects/Shortumation/api/src/json_serializer.py:5)
|
||||
get_index # unused function (src/api/app.py:43)
|
||||
list_autos # unused function (src/api/routes/automations.py:12)
|
||||
upsert_auto # unused function (src/api/routes/automations.py:24)
|
||||
delete_auto # unused function (src/api/routes/automations.py:32)
|
||||
read_details # unused function (src/api/routes/details.py:10)
|
||||
read_ping # unused function (src/api/routes/ping.py:10)
|
||||
websocket_endpoint # unused function (src/api/routes/socket.py:13)
|
||||
params # unused variable (src/api/types.py:16)
|
||||
total_items # unused variable (src/api/types.py:17)
|
||||
data # unused variable (src/api/types.py:18)
|
||||
trigger_variables # unused variable (src/automations/types.py:13)
|
||||
trigger # unused variable (src/automations/types.py:15)
|
||||
condition # unused variable (src/automations/types.py:16)
|
||||
action # unused variable (src/automations/types.py:17)
|
||||
_.to_json # unused method (src/automations/types.py:38)
|
||||
_.automation_tags # unused property (src/hass_config/loader.py:18)
|
||||
_.save_automations # unused method (src/hass_config/loader.py:48)
|
||||
_.save_tags # unused method (src/hass_config/loader.py:56)
|
||||
json_dumps # unused function (src/json_serializer.py:5)
|
||||
+4
-1
@@ -45,4 +45,7 @@ start-docker:
|
||||
tar -xvf ../development_config.tar.gz -C ./
|
||||
cp ./development_config/.env .env.api
|
||||
docker-compose down
|
||||
docker-compose up
|
||||
docker-compose up
|
||||
|
||||
update-vulture-whitelist:
|
||||
$(VENV_BIN)/vulture --make-whitelist src > .vulture_whitelist
|
||||
+11
-1
@@ -1,5 +1,6 @@
|
||||
from fastapi import FastAPI
|
||||
from fastapi.middleware.cors import CORSMiddleware
|
||||
from fastapi.responses import RedirectResponse
|
||||
from fastapi.staticfiles import StaticFiles
|
||||
|
||||
from src.automations.manager import AutomationManager
|
||||
@@ -10,7 +11,8 @@ from .routes import automations, details, ping, socket
|
||||
|
||||
def make_app(automation_mgr: AutomationManager) -> FastAPI:
|
||||
app = FastAPI()
|
||||
if (ROOT_FOLDER / "web").exists():
|
||||
has_web_folder = (ROOT_FOLDER / "web").exists()
|
||||
if has_web_folder:
|
||||
app.mount(
|
||||
f"{API_PREFIX}/web",
|
||||
StaticFiles(
|
||||
@@ -19,6 +21,7 @@ def make_app(automation_mgr: AutomationManager) -> FastAPI:
|
||||
),
|
||||
name="web",
|
||||
)
|
||||
|
||||
else:
|
||||
print("WARN: could not find web folder")
|
||||
app.add_middleware(
|
||||
@@ -36,4 +39,11 @@ def make_app(automation_mgr: AutomationManager) -> FastAPI:
|
||||
details.make_details_router(automation_mgr.hass_config), prefix=f"{API_PREFIX}/details"
|
||||
)
|
||||
app.include_router(socket.router, prefix=f"{API_PREFIX}/socket")
|
||||
|
||||
@app.get("/")
|
||||
def get_index():
|
||||
if has_web_folder:
|
||||
return RedirectResponse("/web")
|
||||
return RedirectResponse("/details")
|
||||
|
||||
return app
|
||||
@@ -1,43 +1,43 @@
|
||||
from ctypes import Union
|
||||
from fastapi import APIRouter, HTTPException
|
||||
|
||||
from src.api.types import (
|
||||
DeleteAutoRequest,
|
||||
ListData,
|
||||
ListParams,
|
||||
UpdateAutoRequest,
|
||||
UpdateTags,
|
||||
)
|
||||
from src.api.types import ListData, ListParams, UpdateTags
|
||||
from src.automations.errors import FailedDeletion
|
||||
from src.automations.manager import AutomationManager
|
||||
from src.automations.types import AutomationData
|
||||
from src.automations.types import Automation, ExtenededAutomation
|
||||
|
||||
|
||||
def make_automation_router(automations: AutomationManager) -> APIRouter:
|
||||
router = APIRouter()
|
||||
|
||||
@router.post("/list")
|
||||
def list_autos(body: ListParams) -> ListData[AutomationData]:
|
||||
def list_autos(body: ListParams) -> ListData[ExtenededAutomation]:
|
||||
automations.reload()
|
||||
return ListData(
|
||||
params=body,
|
||||
totalItems=automations.get_total_items(),
|
||||
data=automations.find(
|
||||
totalItems=automations.count(),
|
||||
data=automations.list(
|
||||
offset=body.offset,
|
||||
limit=body.limit,
|
||||
),
|
||||
)
|
||||
|
||||
@router.post("/item")
|
||||
def upsert_auto(body: UpdateAutoRequest):
|
||||
automations.update(body.index, body.data)
|
||||
def insert_auto(body: Automation):
|
||||
automations.create(body)
|
||||
|
||||
@router.put("/item")
|
||||
def update_auto(body: ExtenededAutomation):
|
||||
automations.update(body)
|
||||
|
||||
@router.post("/item/tags")
|
||||
def update_tags(body: UpdateTags):
|
||||
automations.update_tags(body.automation_id, body.tags)
|
||||
|
||||
@router.delete("/item")
|
||||
def delete_auto(body: DeleteAutoRequest):
|
||||
def delete_auto(body: ExtenededAutomation):
|
||||
try:
|
||||
automations.delete(body.index)
|
||||
automations.delete(body)
|
||||
except FailedDeletion as err:
|
||||
return HTTPException(
|
||||
status_code=400,
|
||||
|
||||
@@ -2,6 +2,7 @@ from fastapi import APIRouter
|
||||
|
||||
from src.env import BUILD_VERSION, HASSIO_TOKEN, HASSIO_WS
|
||||
from src.hass_config import HassConfig
|
||||
from src.automations.loader import extract_automation_paths
|
||||
|
||||
|
||||
def make_details_router(hass_config: HassConfig) -> APIRouter:
|
||||
@@ -15,7 +16,10 @@ def make_details_router(hass_config: HassConfig) -> APIRouter:
|
||||
"hassio_url": HASSIO_WS,
|
||||
"config": hass_config.get_configuration_path(),
|
||||
"tags": hass_config.get_automation_tags_path(),
|
||||
"autos": hass_config.get_automation_path(),
|
||||
"autos": {
|
||||
config_key: auto_file
|
||||
for config_key, auto_file in extract_automation_paths(hass_config)
|
||||
},
|
||||
}
|
||||
|
||||
return router
|
||||
@@ -4,8 +4,6 @@ from pydantic import BaseModel
|
||||
from pydantic.fields import Field
|
||||
from pydantic.generics import GenericModel
|
||||
|
||||
from src.automations.types import ExtenededAutomationData
|
||||
|
||||
DataT = TypeVar("DataT")
|
||||
|
||||
|
||||
@@ -20,15 +18,6 @@ class ListData(GenericModel, Generic[DataT]):
|
||||
data: List[DataT]
|
||||
|
||||
|
||||
class UpdateAutoRequest(BaseModel):
|
||||
index: int = Field(description="Index of the automation to update")
|
||||
data: ExtenededAutomationData
|
||||
|
||||
|
||||
class UpdateTags(BaseModel):
|
||||
automation_id: str = Field(description="Automation Id to update")
|
||||
tags: Dict[str, str]
|
||||
|
||||
|
||||
class DeleteAutoRequest(BaseModel):
|
||||
index: int = Field(description="Index of the automation to update")
|
||||
@@ -0,0 +1,113 @@
|
||||
import base64
|
||||
import json
|
||||
import sqlite3
|
||||
from contextlib import contextmanager
|
||||
from pathlib import Path
|
||||
from typing import Iterable, Iterator, List, Optional
|
||||
|
||||
from src.logger import get_logger
|
||||
|
||||
from .errors import DBDataError, DBError, DBNoAutomationFound
|
||||
from .types import ExtenededAutomation
|
||||
|
||||
logger = get_logger(__file__)
|
||||
|
||||
automations_tbl = "autos"
|
||||
|
||||
|
||||
def encode_auto(auto: ExtenededAutomation) -> str:
|
||||
return base64.b64encode(
|
||||
json.dumps(auto.to_primitive(include_tags=True)).encode("utf-8")
|
||||
).decode("utf-8")
|
||||
|
||||
|
||||
def decode_auto(
|
||||
auto_str: str, source_file: str, source_file_type: str, configuration_key: str
|
||||
) -> ExtenededAutomation:
|
||||
return ExtenededAutomation(
|
||||
source_file=source_file,
|
||||
source_file_type=source_file_type,
|
||||
configuration_key=configuration_key,
|
||||
**json.loads(base64.b64decode(auto_str.encode("utf-8")).decode("utf-8")),
|
||||
)
|
||||
|
||||
|
||||
class AutomationDBConnection:
|
||||
def __init__(self, db_file: Path) -> None:
|
||||
self.db_file = db_file
|
||||
|
||||
def reset(self):
|
||||
self.db_file.unlink(missing_ok=True)
|
||||
self.create_db()
|
||||
|
||||
@contextmanager
|
||||
def get_cur(self) -> Iterator[sqlite3.Cursor]:
|
||||
conn = sqlite3.connect(self.db_file)
|
||||
cur = conn.cursor()
|
||||
try:
|
||||
yield cur
|
||||
conn.commit()
|
||||
except sqlite3.IntegrityError as err:
|
||||
raise DBDataError(*err.args) from err
|
||||
except sqlite3.DatabaseError as err:
|
||||
raise DBError(*err.args) from err
|
||||
finally:
|
||||
cur.close()
|
||||
conn.close()
|
||||
|
||||
def create_db(self):
|
||||
with self.get_cur() as cur:
|
||||
cur.execute(
|
||||
f"""
|
||||
CREATE TABLE IF NOT EXISTS {automations_tbl} (
|
||||
id TEXT NOT NULL PRIMARY KEY,
|
||||
alias TEXT,
|
||||
description TEXT,
|
||||
mode TEXT NOT NULL,
|
||||
source_file TEXT NOT NULL,
|
||||
source_file_type TEXT NOT NULL,
|
||||
configuration_key TEXT NOT NULL,
|
||||
rest BLOB NOT NULL
|
||||
);
|
||||
"""
|
||||
)
|
||||
|
||||
def insert_automations(self, automations: List[ExtenededAutomation]):
|
||||
with self.get_cur() as cur:
|
||||
for automation in automations:
|
||||
cur.execute(
|
||||
f"""
|
||||
INSERT INTO {automations_tbl} VALUES (
|
||||
"{automation.id}",
|
||||
"{automation.alias}",
|
||||
"{automation.description}",
|
||||
"{automation.mode}",
|
||||
"{automation.source_file}",
|
||||
"{automation.source_file_type}",
|
||||
"{automation.configuration_key}",
|
||||
"{encode_auto(automation)}"
|
||||
);
|
||||
""",
|
||||
)
|
||||
|
||||
def get_automation(self, automation_id: str) -> ExtenededAutomation:
|
||||
with self.get_cur() as cur:
|
||||
cur.execute(
|
||||
f'SELECT rest, source_file, source_file_type, configuration_key FROM {automations_tbl} WHERE id = "{automation_id}"'
|
||||
)
|
||||
objs = cur.fetchone()
|
||||
if objs is None:
|
||||
raise DBNoAutomationFound(automation_id)
|
||||
[rest, source_file, source_file_type, configuration_key] = objs
|
||||
return decode_auto(rest, source_file, source_file_type, configuration_key)
|
||||
|
||||
def list_automations(self, offset: int, limit: int) -> Iterable[ExtenededAutomation]:
|
||||
with self.get_cur() as cur:
|
||||
for [rest, source_file, source_file_type, configuration_key] in cur.execute(
|
||||
f"SELECT rest, source_file, source_file_type, configuration_key FROM {automations_tbl} LIMIT {limit} OFFSET {offset}"
|
||||
):
|
||||
yield decode_auto(rest, source_file, source_file_type, configuration_key)
|
||||
|
||||
def count_automations(self) -> int:
|
||||
with self.get_cur() as cur:
|
||||
return cur.execute(f"SELECT count(id) FROM {automations_tbl}").fetchone()[0]
|
||||
@@ -5,9 +5,25 @@ class AutomationLoaderException(Exception):
|
||||
)
|
||||
|
||||
|
||||
class AttemptingToOverwriteAnIncompatibleFileError(AutomationLoaderException):
|
||||
pass
|
||||
|
||||
|
||||
class InvalidAutomationFile(AutomationLoaderException):
|
||||
pass
|
||||
|
||||
|
||||
class FailedDeletion(AutomationLoaderException):
|
||||
pass
|
||||
|
||||
|
||||
class DBError(Exception):
|
||||
pass
|
||||
|
||||
|
||||
class DBDataError(DBError):
|
||||
pass
|
||||
|
||||
|
||||
class DBNoAutomationFound(DBError):
|
||||
pass
|
||||
+135
-23
@@ -1,38 +1,150 @@
|
||||
from typing import Any, Iterator, Union
|
||||
|
||||
from pydantic.error_wrappers import ValidationError
|
||||
from pathlib import Path
|
||||
from typing import Any, Iterator, Tuple, Union
|
||||
|
||||
from src.json_serializer import normalize_obj
|
||||
from src.logger import get_logger
|
||||
from src.utils import extract_files
|
||||
from src.yaml_serializer import dump_yaml, load_yaml
|
||||
from src.yaml_serializer.types import IncludedYaml, IncludedYamlDir
|
||||
|
||||
from ..hass_config.loader import HassConfig
|
||||
from .errors import InvalidAutomationFile
|
||||
from .types import AutomationMetdata, ExtenededAutomationData
|
||||
from .tags import TagManager
|
||||
from .types import ExtenededAutomation
|
||||
|
||||
logger = get_logger(__file__)
|
||||
|
||||
AUTOMATION_CONFIGURATION_KEY = "automation shortumation"
|
||||
|
||||
|
||||
# Single loader
|
||||
def load_automation(
|
||||
auto_raw: dict,
|
||||
tags: dict,
|
||||
) -> Iterator[ExtenededAutomationData]:
|
||||
"""Converts an automation dictionary loaded directly from the config into
|
||||
several python typed objects
|
||||
def extract_automation_paths(
|
||||
hass_config: HassConfig,
|
||||
) -> Iterator[Tuple[str, str]]:
|
||||
found = False
|
||||
for key, value in extract_automation_keys(hass_config):
|
||||
logger.info(f"Loading automations from '{key}'")
|
||||
found = True
|
||||
if isinstance(value, IncludedYaml):
|
||||
yield key, value.path_str
|
||||
elif isinstance(value, IncludedYamlDir):
|
||||
yield key, value.name
|
||||
else:
|
||||
logger.warning(f"found an invalid type in {key}!")
|
||||
if not found:
|
||||
yield "", "automations.yaml"
|
||||
|
||||
|
||||
def get_base_automation_key(hass_config: HassConfig):
|
||||
found_any = False
|
||||
for key, value in extract_automation_keys(hass_config):
|
||||
found_any = True
|
||||
if isinstance(value, IncludedYaml):
|
||||
return key, value.path_str
|
||||
configurations = hass_config.configurations
|
||||
if found_any:
|
||||
out_path = hass_config.get_backup_automation_file_path()
|
||||
else:
|
||||
out_path = hass_config.get_default_automation_path()
|
||||
out_file = str(out_path.relative_to(hass_config.root_path))
|
||||
configurations[AUTOMATION_CONFIGURATION_KEY] = IncludedYaml(out_file)
|
||||
out_path.touch(exist_ok=True)
|
||||
with hass_config.get_configuration_path().open("w") as fp:
|
||||
fp.write(dump_yaml(configurations))
|
||||
return AUTOMATION_CONFIGURATION_KEY, out_file
|
||||
|
||||
|
||||
def extract_automation_keys(
|
||||
hass_config: HassConfig,
|
||||
) -> Iterator[Tuple[str, Union[IncludedYaml, IncludedYamlDir]]]:
|
||||
for key, value in hass_config.configurations.items():
|
||||
if str(key).startswith("automation"):
|
||||
if isinstance(value, dict) or isinstance(value, list):
|
||||
raise NotImplementedError(
|
||||
"No support for automations baked into configuration.yaml! Please extract these into a seperate file"
|
||||
)
|
||||
elif isinstance(value, IncludedYaml) or isinstance(value, IncludedYamlDir):
|
||||
yield key, value
|
||||
else:
|
||||
logger.warning(f"found an invalid type in {key}!")
|
||||
|
||||
|
||||
def load_automation_path(
|
||||
root_path: Path,
|
||||
automation_path: Path,
|
||||
configuration_key: str,
|
||||
tag_manager: TagManager,
|
||||
) -> Iterator[ExtenededAutomation]:
|
||||
"""
|
||||
|
||||
Args:
|
||||
automations_raw_data (Iterable[dict])
|
||||
automation_path (Path)
|
||||
configuration_key (str)
|
||||
|
||||
Returns:
|
||||
Iterator[ExtenededAutomationData]
|
||||
Iterator[ExtenededAutomation]
|
||||
|
||||
"""
|
||||
try:
|
||||
yield ExtenededAutomationData(
|
||||
metadata=AutomationMetdata.parse_obj(auto_raw),
|
||||
condition=ifempty_or_null_then_list(load_conditions(auto_raw.get("condition", []))),
|
||||
sequence=ifempty_or_null_then_list(load_conditions(auto_raw.get("action", []))),
|
||||
trigger=ifempty_or_null_then_list(normalize_obj(auto_raw.get("trigger", []))),
|
||||
tags=tags,
|
||||
)
|
||||
except ValidationError as err:
|
||||
raise InvalidAutomationFile from err
|
||||
if not automation_path.exists():
|
||||
logger.warning(f"the file {automation_path} does not exists")
|
||||
return
|
||||
if automation_path.is_dir():
|
||||
for f in extract_files(automation_path):
|
||||
yield from load_automation_path(root_path, f, configuration_key, tag_manager)
|
||||
else:
|
||||
try:
|
||||
with automation_path.open("r") as fp:
|
||||
automations = load_yaml(fp)
|
||||
except Exception as err:
|
||||
raise InvalidAutomationFile(
|
||||
when="loading yaml",
|
||||
automation_path=automation_path,
|
||||
error=err,
|
||||
) from err
|
||||
|
||||
if isinstance(automations, dict):
|
||||
try:
|
||||
yield ExtenededAutomation(
|
||||
**clean_automation(automations),
|
||||
tags=tag_manager.get(automations["id"], {}),
|
||||
configuration_key=configuration_key,
|
||||
source_file=str(automation_path.relative_to(root_path)),
|
||||
source_file_type="obj",
|
||||
)
|
||||
except Exception as err:
|
||||
raise InvalidAutomationFile(
|
||||
when="reading file contents",
|
||||
automation_path=automation_path,
|
||||
error=err,
|
||||
) from err
|
||||
else:
|
||||
if automations is None:
|
||||
logger.warning(f"the file {automation_path} is empty")
|
||||
return
|
||||
for automation in automations:
|
||||
try:
|
||||
yield ExtenededAutomation(
|
||||
**clean_automation(automation),
|
||||
tags=tag_manager.get(automation["id"], {}),
|
||||
configuration_key=configuration_key,
|
||||
source_file=str(automation_path.relative_to(root_path)),
|
||||
source_file_type="list",
|
||||
)
|
||||
except Exception as err:
|
||||
raise InvalidAutomationFile(
|
||||
when="reading file contents",
|
||||
automation_path=automation_path,
|
||||
error=err,
|
||||
automation=automation,
|
||||
) from err
|
||||
|
||||
|
||||
def clean_automation(auto_raw: dict):
|
||||
return {
|
||||
**auto_raw,
|
||||
"condition": ifempty_or_null_then_list(load_conditions(auto_raw.get("condition", []))),
|
||||
"action": ifempty_or_null_then_list(load_conditions(auto_raw.get("action", []))),
|
||||
"trigger": ifempty_or_null_then_list(normalize_obj(auto_raw.get("trigger", []))),
|
||||
}
|
||||
|
||||
|
||||
def ifempty_or_null_then_list(obj: Any):
|
||||
|
||||
+146
-64
@@ -1,76 +1,158 @@
|
||||
from typing import Dict, Iterator, List, Optional
|
||||
from enum import auto
|
||||
from pathlib import Path
|
||||
from tempfile import mktemp
|
||||
from typing import Dict, Optional, Union
|
||||
|
||||
from src.automations.errors import FailedDeletion, InvalidAutomationFile
|
||||
from src.automations.types import AutomationData, ExtenededAutomationData
|
||||
from src.hass_config.loader import HassConfig
|
||||
from src.yaml_serializer import dump_yaml, load_yaml
|
||||
|
||||
from .loader import load_automation
|
||||
from ..errors import ErrorSet
|
||||
from ..logger import get_logger
|
||||
from .db import AutomationDBConnection
|
||||
from .errors import (
|
||||
AttemptingToOverwriteAnIncompatibleFileError,
|
||||
DBError,
|
||||
InvalidAutomationFile,
|
||||
)
|
||||
from .loader import extract_automation_paths, get_base_automation_key, load_automation_path
|
||||
from .tags import TagManager
|
||||
from .types import Automation, ExtenededAutomation
|
||||
|
||||
logger = get_logger(__file__)
|
||||
|
||||
|
||||
class AutomationManager:
|
||||
def __init__(self, hass_config: HassConfig) -> None:
|
||||
self.hass_config = hass_config
|
||||
|
||||
def find(
|
||||
def __init__(
|
||||
self,
|
||||
offset: int = 0,
|
||||
limit: int = 10,
|
||||
) -> Iterator[AutomationData]:
|
||||
tags = self.hass_config.automation_tags
|
||||
for i, auto in enumerate(self.hass_config.automations):
|
||||
if i < offset:
|
||||
continue
|
||||
if i >= offset + limit:
|
||||
break
|
||||
yield from load_automation(auto, tags.get(auto.get("id", ""), {}))
|
||||
hass_config: HassConfig,
|
||||
db_path: Optional[Path] = None,
|
||||
) -> None:
|
||||
if db_path is None:
|
||||
db_path = Path(mktemp())
|
||||
self.hass_config = hass_config
|
||||
self.db = AutomationDBConnection(db_path)
|
||||
self.tag_path = hass_config.get_automation_tags_path()
|
||||
self.tag_manager = TagManager()
|
||||
self.reload_tags()
|
||||
|
||||
def get(self, index: int) -> Optional[ExtenededAutomationData]:
|
||||
tags = self.hass_config.automation_tags
|
||||
if index >= 0:
|
||||
for i, auto in enumerate(self.hass_config.automations):
|
||||
if not isinstance(auto, dict):
|
||||
raise InvalidAutomationFile(automation_index=i)
|
||||
if i == index:
|
||||
return next(load_automation(auto, tags.get(auto.get("id", ""), {})))
|
||||
return None
|
||||
def reload_tags(self):
|
||||
if self.tag_path.exists():
|
||||
self.tag_manager = TagManager.load(self.tag_path)
|
||||
|
||||
def update(self, index: int, automation: ExtenededAutomationData):
|
||||
tags = self.hass_config.automation_tags
|
||||
automations: List[dict] = []
|
||||
updated_index: Optional[int] = None
|
||||
for i, orig_auto in enumerate(self.hass_config.automations):
|
||||
if i == index:
|
||||
automations.append(automation.to_primitive())
|
||||
updated_index = i
|
||||
else:
|
||||
automations.append(orig_auto)
|
||||
if updated_index is None:
|
||||
automations.append(automation.to_primitive())
|
||||
updated_index = len(automations) - 1
|
||||
tags[automation.metadata.id] = automation.tags
|
||||
self.hass_config.save_automations(automations)
|
||||
self.hass_config.save_tags(tags)
|
||||
def reload(self):
|
||||
self.db.reset()
|
||||
self.reload_tags()
|
||||
errors = []
|
||||
for config_key, p in extract_automation_paths(self.hass_config):
|
||||
try:
|
||||
automations = list(
|
||||
load_automation_path(
|
||||
self.hass_config.root_path,
|
||||
self.hass_config.root_path / p,
|
||||
config_key,
|
||||
self.tag_manager,
|
||||
)
|
||||
)
|
||||
self.db.insert_automations(automations)
|
||||
except InvalidAutomationFile as e:
|
||||
logger.warning(e)
|
||||
errors.append(e)
|
||||
except DBError as e:
|
||||
logger.warning(e)
|
||||
errors.append(e)
|
||||
if len(errors) > 0:
|
||||
raise ErrorSet(*errors)
|
||||
|
||||
def update_tags(self, auto_id: str, tags: Dict[str, str]):
|
||||
autos_tags = self.hass_config.automation_tags
|
||||
autos_tags[auto_id] = tags
|
||||
self.hass_config.save_tags(autos_tags)
|
||||
def list(self, offset: int, limit: int):
|
||||
return self.db.list_automations(offset=offset, limit=limit)
|
||||
|
||||
def delete(self, index: int):
|
||||
automations: List[dict] = []
|
||||
deleted = False
|
||||
for i, orig_auto in enumerate(self.hass_config.automations):
|
||||
if i == index:
|
||||
deleted = True
|
||||
else:
|
||||
automations.append(orig_auto)
|
||||
if not deleted:
|
||||
raise FailedDeletion("No such automation found")
|
||||
self.hass_config.save_automations(automations)
|
||||
def count(self):
|
||||
return self.db.count_automations()
|
||||
|
||||
# TODO: improve on this without keeping things in memory
|
||||
def get_total_items(self) -> int:
|
||||
count = 0
|
||||
for i, _ in enumerate(self.hass_config.automations):
|
||||
count = i
|
||||
return count + 1
|
||||
def get(self, auto_id: str):
|
||||
return self.db.get_automation(auto_id)
|
||||
|
||||
def create(self, automation: Automation):
|
||||
config_key, config_path = get_base_automation_key(self.hass_config)
|
||||
return self.update(
|
||||
ExtenededAutomation(
|
||||
**automation.dict(),
|
||||
configuration_key=config_key,
|
||||
source_file=config_path,
|
||||
source_file_type="list",
|
||||
),
|
||||
create_if_not_found=True,
|
||||
)
|
||||
|
||||
def update(self, automation: ExtenededAutomation, create_if_not_found: bool = False):
|
||||
automation_path = self.hass_config.root_path / automation.source_file
|
||||
if not automation_path.parent.exists():
|
||||
automation_path.parent.mkdir(parents=True)
|
||||
|
||||
objs: Optional[Union[list, dict]] = None
|
||||
if automation_path.exists():
|
||||
with automation_path.open("r") as fp:
|
||||
objs = load_yaml(fp)
|
||||
|
||||
if automation.source_file_type == "obj":
|
||||
if isinstance(objs, list):
|
||||
raise AttemptingToOverwriteAnIncompatibleFileError(
|
||||
f"{automation_path} is a list, but expected a obj for {automation}"
|
||||
)
|
||||
raw_auto = automation.to_primitive(include_tags=False)
|
||||
automation_path.write_text(dump_yaml(raw_auto))
|
||||
else:
|
||||
if isinstance(objs, dict):
|
||||
raise AttemptingToOverwriteAnIncompatibleFileError(
|
||||
f"{automation_path} is a list, but expected a obj for {automation}"
|
||||
)
|
||||
elif objs is None:
|
||||
objs = []
|
||||
if not isinstance(objs, list):
|
||||
raise AssertionError(
|
||||
f"Attemption to save automation to {automation_path} but encountering an invalid list yaml file. Did you modify this file prior to saving?\n{automation}"
|
||||
)
|
||||
found = False
|
||||
for i, obj in enumerate(objs):
|
||||
if obj["id"] == automation.id:
|
||||
objs[i] = automation.to_primitive(include_tags=False)
|
||||
found = True
|
||||
break
|
||||
if not found:
|
||||
if create_if_not_found:
|
||||
objs.append(automation.to_primitive(include_tags=False))
|
||||
else:
|
||||
raise InvalidAutomationFile(
|
||||
"Could not update automations, not found in source file."
|
||||
)
|
||||
automation_path.write_text(dump_yaml(objs))
|
||||
self.update_tags(automation.id, automation.tags)
|
||||
|
||||
def update_tags(self, automation_id: str, tags: Dict[str, str]):
|
||||
self.reload_tags()
|
||||
self.tag_manager[automation_id] = tags
|
||||
self.tag_manager.save(self.tag_path)
|
||||
|
||||
def delete_tags(self, automation_id: str):
|
||||
self.reload_tags()
|
||||
if automation_id in self.tag_manager:
|
||||
del self.tag_manager[automation_id]
|
||||
self.tag_manager.save(self.tag_path)
|
||||
|
||||
def delete(self, automation: ExtenededAutomation):
|
||||
automation_path = self.hass_config.root_path / automation.source_file
|
||||
if automation.source_file_type == "obj":
|
||||
automation_path.unlink(missing_ok=True)
|
||||
else:
|
||||
with automation_path.open("r") as fp:
|
||||
objs = load_yaml(fp)
|
||||
if not isinstance(objs, list):
|
||||
raise AssertionError(
|
||||
f"Attemption to save automation to {automation_path} but encountering an invalid list yaml file. Did you modify this file prior to saving?\n{automation}"
|
||||
)
|
||||
kept = []
|
||||
for i, obj in enumerate(objs):
|
||||
if obj["id"] != automation.id:
|
||||
kept.append(obj)
|
||||
automation_path.write_text(dump_yaml(kept))
|
||||
self.delete_tags(automation.id)
|
||||
@@ -6,6 +6,8 @@ from src.yaml_serializer import dump_yaml, load_yaml
|
||||
|
||||
class TagManager(Dict[str, Dict[str, str]]):
|
||||
def save(self, path: Path):
|
||||
if not path.parent.exists():
|
||||
path.parent.mkdir(parents=True)
|
||||
path.write_text(dump_yaml(dict(self)))
|
||||
|
||||
@classmethod
|
||||
|
||||
@@ -1,31 +1,46 @@
|
||||
from typing import Dict, List, Optional, Union
|
||||
import json
|
||||
from pathlib import Path
|
||||
from typing import Dict, List, Literal, Optional, Union
|
||||
|
||||
from pydantic import BaseModel
|
||||
from pydantic.fields import Field
|
||||
|
||||
|
||||
class AutomationMetdata(BaseModel):
|
||||
class BaseAutomation(BaseModel):
|
||||
id: str
|
||||
alias: Optional[str] = None
|
||||
description: Optional[str] = None
|
||||
trigger_variables: Optional[Dict[str, Union[str, int, bool, float]]] = None
|
||||
mode: str = "single"
|
||||
|
||||
|
||||
class AutomationData(BaseModel):
|
||||
metadata: AutomationMetdata
|
||||
trigger: List[dict] = []
|
||||
condition: List[dict] = []
|
||||
sequence: List[dict] = []
|
||||
action: List[dict] = []
|
||||
|
||||
def to_primitive(self):
|
||||
return {
|
||||
**self.metadata.dict(exclude_unset=True, exclude_none=True),
|
||||
"trigger": self.trigger,
|
||||
"condition": self.condition,
|
||||
"action": self.sequence,
|
||||
}
|
||||
return self.dict(exclude_unset=True, exclude_none=True)
|
||||
|
||||
|
||||
class ExtenededAutomationData(AutomationData):
|
||||
class Automation(BaseAutomation):
|
||||
tags: Dict[str, str] = Field(default_factory=dict)
|
||||
|
||||
def to_primitive(self, include_tags: bool = False):
|
||||
out = super().to_primitive()
|
||||
if not include_tags and out.get("tags", None) is not None:
|
||||
del out["tags"]
|
||||
return out
|
||||
|
||||
|
||||
class ExtenededAutomation(Automation):
|
||||
source_file: str
|
||||
source_file_type: Literal["list", "obj"]
|
||||
configuration_key: str
|
||||
|
||||
def to_primitive(self, include_tags: bool = False):
|
||||
out = super().to_primitive(include_tags=include_tags)
|
||||
del out["source_file"]
|
||||
del out["source_file_type"]
|
||||
del out["configuration_key"]
|
||||
return out
|
||||
|
||||
def to_json(self):
|
||||
return json.loads(self.json())
|
||||
@@ -0,0 +1,12 @@
|
||||
class ErrorSet(Exception):
|
||||
"""An exception collection exception"""
|
||||
|
||||
def __init__(self, *errors: Exception) -> None:
|
||||
self.errors = errors
|
||||
super().__init__(self.gen_message())
|
||||
|
||||
def gen_message(self):
|
||||
if len(self.errors) > 1:
|
||||
return "Encountered multiple errors:\n >" + "\n >".join(map(repr, self.errors))
|
||||
else:
|
||||
return str(self.errors[0].args)
|
||||
@@ -1,6 +0,0 @@
|
||||
class HassConfigError(Exception):
|
||||
pass
|
||||
|
||||
|
||||
class MissingFile(HassConfigError):
|
||||
pass
|
||||
@@ -5,8 +5,6 @@ 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
|
||||
|
||||
|
||||
class HassConfig:
|
||||
def __init__(self, root_path: Path) -> None:
|
||||
@@ -17,32 +15,18 @@ class HassConfig:
|
||||
with self.get_configuration_path().open("r") as f:
|
||||
return dict(load_yaml(f)) # type: ignore
|
||||
|
||||
@property
|
||||
def automations(self) -> List[dict]:
|
||||
if automation_path := self.get_automation_path():
|
||||
try:
|
||||
with automation_path.open("r") as f:
|
||||
return load_yaml(f) # type: ignore
|
||||
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()
|
||||
if not tag_path.exists():
|
||||
tag_path.parent.mkdir(parents=True, exist_ok=True)
|
||||
return TagManager()
|
||||
else:
|
||||
return TagManager.load(tag_path)
|
||||
|
||||
def get_automation_tags_path(self) -> Path:
|
||||
return self.root_path / ".shortumations" / "tags.yaml"
|
||||
def get_backup_automation_file_path(self) -> Path:
|
||||
return self.get_shortumations_path() / "automations.yaml"
|
||||
|
||||
def get_configuration_path(self) -> Path:
|
||||
return self.root_path / "configuration.yaml"
|
||||
|
||||
def get_automation_path(self) -> Optional[Path]:
|
||||
def get_default_automation_path(self) -> Optional[Path]:
|
||||
"""Get Automation Path (if not included in configuration.yaml, in this case the return value is None)
|
||||
|
||||
Returns:
|
||||
@@ -57,13 +41,17 @@ class HassConfig:
|
||||
return None
|
||||
return self.root_path / "automations.yaml"
|
||||
|
||||
def save_automations(self, automations: List[dict]):
|
||||
if automation_path := self.get_automation_path():
|
||||
automation_path.write_text(dump_yaml(automations))
|
||||
else:
|
||||
self.get_configuration_path().write_text(
|
||||
dump_yaml({**self.configurations, "automation": automations})
|
||||
)
|
||||
def get_shortumations_path(self) -> Path:
|
||||
shortumations_path = self.root_path / ".shortumations"
|
||||
if not shortumations_path.exists():
|
||||
shortumations_path.mkdir(parents=True, exist_ok=True)
|
||||
return shortumations_path
|
||||
|
||||
def get_automation_tags_path(self) -> Path:
|
||||
return self.get_shortumations_path() / "tags.yaml"
|
||||
|
||||
def get_configuration_path(self) -> Path:
|
||||
return self.root_path / "configuration.yaml"
|
||||
|
||||
def save_tags(self, tags: TagManager):
|
||||
tags.save(self.get_automation_tags_path())
|
||||
+5
-11
@@ -2,17 +2,11 @@ import logging
|
||||
|
||||
from src.env import LOG_LEVEL
|
||||
|
||||
if LOG_LEVEL == "DEBUG":
|
||||
logging.basicConfig(level=logging.DEBUG)
|
||||
elif LOG_LEVEL == "INFO":
|
||||
logging.basicConfig(level=logging.INFO)
|
||||
elif LOG_LEVEL == "WARN":
|
||||
logging.basicConfig(level=logging.WARN)
|
||||
elif LOG_LEVEL == "ERROR":
|
||||
logging.basicConfig(level=logging.ERROR)
|
||||
else:
|
||||
logging.basicConfig(level=logging.NOTSET)
|
||||
|
||||
logging.basicConfig(
|
||||
format="%(asctime)s|%(levelname)-4s[%(pathname)s:%(lineno)d@%(funcName)s] %(message)s",
|
||||
datefmt="%Y-%m-%d:%H:%M:%S",
|
||||
level=logging._nameToLevel.get(LOG_LEVEL, logging.INFO),
|
||||
)
|
||||
logger = logging.getLogger()
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
from pathlib import Path
|
||||
from typing import Iterator
|
||||
|
||||
|
||||
def extract_files(p: Path) -> Iterator[Path]:
|
||||
"""Extracts all files in folder and it's subfolders
|
||||
|
||||
Args:
|
||||
p (Path):
|
||||
|
||||
Yields:
|
||||
Iterator[Path]
|
||||
"""
|
||||
if not p.exists():
|
||||
return
|
||||
if p.is_dir():
|
||||
for c in p.iterdir():
|
||||
yield from extract_files(c)
|
||||
else:
|
||||
yield p
|
||||
@@ -6,7 +6,7 @@ from websockets.client import WebSocketClientProtocol, connect
|
||||
from websockets.exceptions import ConnectionClosedOK
|
||||
|
||||
from src.env import HASSIO_TOKEN, HASSIO_WS
|
||||
from src.logger import get_logger, logger
|
||||
from src.logger import get_logger
|
||||
|
||||
OnMessage = Callable[[str], Coroutine]
|
||||
logger = get_logger(__name__)
|
||||
|
||||
@@ -36,6 +36,6 @@ def load_yaml(yaml_stream: TextIO) -> Union[dict, list]:
|
||||
yaml_stream (io.StringIO)
|
||||
|
||||
Returns:
|
||||
List[dict, list]
|
||||
Union[dict, list]
|
||||
"""
|
||||
return yaml.load(yaml_stream, Loader=YamlSafeLoader) # nosec
|
||||
@@ -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,18 @@
|
||||
- id: "sublist3-mlist2"
|
||||
alias: Sublist 3 - Merged List 2
|
||||
description: "That was correct!"
|
||||
trigger: []
|
||||
condition: []
|
||||
action:
|
||||
- service: "switch.turn_off"
|
||||
target:
|
||||
entity_id: "switch.bathroom"
|
||||
data:
|
||||
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
|
||||
@@ -0,0 +1,13 @@
|
||||
# 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
|
||||
@@ -1,15 +1,12 @@
|
||||
from pathlib import Path
|
||||
from unittest import TestCase
|
||||
|
||||
import yaml
|
||||
from fastapi.testclient import TestClient
|
||||
|
||||
from src.api.app import make_app
|
||||
from src.automations.types import (
|
||||
AutomationData,
|
||||
AutomationMetdata,
|
||||
ExtenededAutomationData,
|
||||
)
|
||||
from tests.utils import HA_CONFIG2_EXAMPLE, get_example_automation_loader
|
||||
from src.automations.types import Automation, ExtenededAutomation
|
||||
from tests.utils import HA_CONFIG2_EXAMPLE, HA_CONFIG6_EXAMPLE, get_example_automation_loader
|
||||
|
||||
|
||||
class BaseTestCase(TestCase):
|
||||
@@ -22,7 +19,7 @@ class BaseTestCase(TestCase):
|
||||
self.client = TestClient(make_app(self.automation_loader))
|
||||
|
||||
|
||||
class automation_list_tests(BaseTestCase):
|
||||
class automation_pagination_tests(BaseTestCase):
|
||||
|
||||
test_params = {"total": 32, "subtest2_found_items": 7, "subtest1_found_items": 10}
|
||||
|
||||
@@ -87,7 +84,7 @@ class automation_list_tests(BaseTestCase):
|
||||
self.assertEqual(len(d["data"]), self.test_params["subtest2_found_items"])
|
||||
|
||||
|
||||
class automation2_lists_tests(automation_list_tests):
|
||||
class automation_pagination_tests_2(automation_pagination_tests):
|
||||
test_params = {
|
||||
"total": 1,
|
||||
"subtest2_found_items": 0,
|
||||
@@ -104,232 +101,295 @@ class automation2_lists_tests(automation_list_tests):
|
||||
|
||||
|
||||
class automation_update_tests(BaseTestCase):
|
||||
test_params = {
|
||||
"total": 32,
|
||||
"modify_item": 20,
|
||||
"consitency_tests": {
|
||||
1: {
|
||||
"offset": 15,
|
||||
"file_offset": 15,
|
||||
"expected_change": {
|
||||
"metadata": {
|
||||
"id": "1629422438707",
|
||||
"alias": "I CHANGED!",
|
||||
"description": "",
|
||||
"mode": "single",
|
||||
},
|
||||
"trigger": [{"platform": "time", "at": "input_datetime.vita_night_pump_time"}],
|
||||
"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",
|
||||
},
|
||||
],
|
||||
"action": [
|
||||
{
|
||||
"service": "light.turn_on",
|
||||
"target": {
|
||||
"entity_id": "light.bulb_staircase",
|
||||
"area_id": "living_room",
|
||||
},
|
||||
"data": {"brightness_pct": 40, "transition": 15},
|
||||
}
|
||||
],
|
||||
},
|
||||
},
|
||||
2: {
|
||||
"offset": 27,
|
||||
"file_offset": 27,
|
||||
"expected_change": {
|
||||
"metadata": {
|
||||
"id": "1649947692702",
|
||||
"alias": "I CHANGED!",
|
||||
"description": "",
|
||||
"mode": "single",
|
||||
},
|
||||
"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",
|
||||
},
|
||||
],
|
||||
"condition": [],
|
||||
"action": [
|
||||
{
|
||||
"choose": [
|
||||
{
|
||||
"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"},
|
||||
}
|
||||
],
|
||||
},
|
||||
],
|
||||
"default": [],
|
||||
}
|
||||
],
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
def test_insert_new(self):
|
||||
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0})
|
||||
self.assertEqual(resp.json()["totalItems"], 32)
|
||||
resp = self.client.post(
|
||||
"/automations/list", json={"limit": self.test_params["total"] + 1, "offset": 0}
|
||||
)
|
||||
autos = resp.json()["data"]
|
||||
self.assertEqual(resp.json()["totalItems"], self.test_params["total"])
|
||||
self.assertNotIn("i am new", set([a["id"] for a in autos]))
|
||||
resp = self.client.post(
|
||||
"/automations/item",
|
||||
json={
|
||||
"index": 33,
|
||||
"data": AutomationData(metadata=AutomationMetdata(id="testme")).dict(),
|
||||
},
|
||||
json=Automation(
|
||||
id="i am new",
|
||||
).dict(),
|
||||
)
|
||||
self.assertEqual(resp.status_code, 200)
|
||||
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 32})
|
||||
resp = self.client.post(
|
||||
"/automations/list", json={"limit": self.test_params["total"] + 1, "offset": 0}
|
||||
)
|
||||
data = resp.json()
|
||||
self.assertEqual(data["totalItems"], 33)
|
||||
self.assertEqual(data["data"][0]["metadata"]["id"], "testme")
|
||||
self.assertEqual(data["totalItems"], self.test_params["total"] + 1)
|
||||
self.assertIn("i am new", set([a["id"] for a in data["data"]]))
|
||||
|
||||
def test_update_some(self):
|
||||
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 20})
|
||||
original_auto = resp.json()["data"][0]
|
||||
resp = self.client.post(
|
||||
"/automations/list", json={"limit": 1, "offset": self.test_params["modify_item"]}
|
||||
)
|
||||
original_auto = resp.json()["data"][0]
|
||||
changed_to = ExtenededAutomation(
|
||||
id=original_auto["id"],
|
||||
alias="I have been modified",
|
||||
configuration_key=original_auto["configuration_key"],
|
||||
source_file_type=original_auto["source_file_type"],
|
||||
source_file=original_auto["source_file"],
|
||||
)
|
||||
resp = self.client.put(
|
||||
"/automations/item",
|
||||
json={
|
||||
"index": 20,
|
||||
"data": AutomationData(metadata=AutomationMetdata(id="testme")).dict(),
|
||||
},
|
||||
json=changed_to.to_json(),
|
||||
)
|
||||
self.assertEqual(resp.status_code, 200)
|
||||
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 20})
|
||||
resp = self.client.post(
|
||||
"/automations/list", json={"limit": 1, "offset": self.test_params["modify_item"]}
|
||||
)
|
||||
new_auto = resp.json()["data"][0]
|
||||
self.assertNotEqual(original_auto, new_auto)
|
||||
self.assertEqual(
|
||||
ExtenededAutomationData(metadata=AutomationMetdata(id="testme")).dict(), new_auto
|
||||
changed_to.to_json(),
|
||||
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!"
|
||||
resp = self.client.post(
|
||||
"/automations/item",
|
||||
json={
|
||||
"index": 15,
|
||||
"data": original_auto,
|
||||
},
|
||||
)
|
||||
self.assertEqual(resp.status_code, 200)
|
||||
with (self.config_folder / "automations.yaml").open("r") as fp:
|
||||
disk_data = dict(yaml.safe_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},
|
||||
}
|
||||
],
|
||||
)
|
||||
for test_id, test_params in self.test_params["consitency_tests"].items():
|
||||
with self.subTest(test_id=test_id):
|
||||
resp = self.client.post(
|
||||
"/automations/list",
|
||||
json={"limit": 1, "offset": test_params["offset"]},
|
||||
)
|
||||
original_auto = resp.json()["data"][0]
|
||||
original_auto["alias"] = "I CHANGED!"
|
||||
resp = self.client.post(
|
||||
"/automations/item",
|
||||
json=original_auto,
|
||||
)
|
||||
self.assertEqual(resp.status_code, 200)
|
||||
with (self.config_folder / original_auto["source_file"]).open("r") as fp:
|
||||
disk_data = dict(yaml.safe_load(fp)[test_params["file_offset"]])
|
||||
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,
|
||||
test_params["expected_change"]["metadata"],
|
||||
)
|
||||
self.assertListEqual(
|
||||
trigger,
|
||||
test_params["expected_change"]["trigger"],
|
||||
)
|
||||
self.assertListEqual(
|
||||
condition,
|
||||
test_params["expected_change"]["condition"],
|
||||
)
|
||||
self.assertListEqual(
|
||||
action,
|
||||
test_params["expected_change"]["action"],
|
||||
)
|
||||
|
||||
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!"
|
||||
resp = self.client.post(
|
||||
"/automations/item",
|
||||
json={
|
||||
"index": 27,
|
||||
"data": original_auto,
|
||||
},
|
||||
)
|
||||
self.assertEqual(resp.status_code, 200)
|
||||
with (self.config_folder / "automations.yaml").open("r") as fp:
|
||||
disk_data = dict(yaml.safe_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",
|
||||
},
|
||||
],
|
||||
)
|
||||
self.assertListEqual(condition, [])
|
||||
self.assertListEqual(
|
||||
action,
|
||||
[
|
||||
{
|
||||
"choose": [
|
||||
|
||||
class automation_update_split_config_tests(automation_update_tests):
|
||||
test_params = {
|
||||
"total": 12,
|
||||
"modify_item": 3,
|
||||
"consitency_tests": {
|
||||
1: {
|
||||
"offset": 3,
|
||||
"file_offset": 0,
|
||||
"expected_change": {
|
||||
"metadata": {
|
||||
"alias": "I CHANGED!",
|
||||
"description": "Example",
|
||||
"id": "ui1",
|
||||
"mode": "single",
|
||||
},
|
||||
"trigger": [{"platform": "homeassistant", "event": "start"}],
|
||||
"condition": [],
|
||||
"action": [
|
||||
{
|
||||
"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"},
|
||||
}
|
||||
],
|
||||
},
|
||||
"service": "counter.increment",
|
||||
"data": {},
|
||||
"target": {"entity_id": "counter.up_times"},
|
||||
}
|
||||
],
|
||||
"default": [],
|
||||
}
|
||||
],
|
||||
)
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
def setUp(self) -> None:
|
||||
(
|
||||
self.config_folder,
|
||||
self.hass_config,
|
||||
self.automation_loader,
|
||||
) = get_example_automation_loader(HA_CONFIG6_EXAMPLE)
|
||||
self.client = TestClient(make_app(self.automation_loader))
|
||||
|
||||
|
||||
class automation_delete_tests(BaseTestCase):
|
||||
def test_delete_some(self):
|
||||
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0})
|
||||
autos = resp.json()["data"]
|
||||
self.assertEqual(resp.json()["totalItems"], 32)
|
||||
resp = self.client.delete(
|
||||
"/automations/item",
|
||||
json={
|
||||
"index": 20,
|
||||
},
|
||||
json=autos[0],
|
||||
)
|
||||
self.assertEqual(resp.status_code, 200)
|
||||
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0})
|
||||
|
||||
@@ -0,0 +1,66 @@
|
||||
from pathlib import Path
|
||||
|
||||
from src.automations.types import ExtenededAutomation
|
||||
from src.automations.errors import DBDataError
|
||||
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 = [
|
||||
ExtenededAutomation(
|
||||
id="test",
|
||||
alias="test",
|
||||
source_file="automation.yaml",
|
||||
source_file_type="obj",
|
||||
configuration_key="automation",
|
||||
),
|
||||
ExtenededAutomation(
|
||||
id="test2",
|
||||
alias="test",
|
||||
source_file="automation.yaml",
|
||||
source_file_type="obj",
|
||||
action=[{"event": {"nice": "one"}, "event_type": "custom"}],
|
||||
configuration_key="automation",
|
||||
),
|
||||
]
|
||||
self.db.insert_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 = [
|
||||
ExtenededAutomation(
|
||||
id="test",
|
||||
alias="test",
|
||||
source_file="automation.yaml",
|
||||
source_file_type="obj",
|
||||
configuration_key="automation",
|
||||
),
|
||||
ExtenededAutomation(
|
||||
id="test",
|
||||
alias="test",
|
||||
source_file="automation.yaml",
|
||||
source_file_type="obj",
|
||||
action=[{"event": {"nice": "one"}, "event_type": "custom"}],
|
||||
configuration_key="automation",
|
||||
),
|
||||
]
|
||||
with self.assertRaises(DBDataError):
|
||||
self.db.insert_automations(originals)
|
||||
autos = list(self.db.list_automations(0, 10))
|
||||
self.assertEqual(len(autos), 0)
|
||||
@@ -1,59 +1,143 @@
|
||||
from pathlib import Path
|
||||
from tempfile import mktemp
|
||||
from unittest import TestCase
|
||||
|
||||
from src.automations.loader import load_automation
|
||||
from src.automations.types import AutomationMetdata, ExtenededAutomationData
|
||||
from src.yaml_serializer.types import NOT_IMPLEMENTED_SV_MSG, SecretValue
|
||||
from src.automations.loader import (
|
||||
extract_automation_paths,
|
||||
load_automation_path,
|
||||
)
|
||||
from src.automations.tags import TagManager
|
||||
from src.automations.types import ExtenededAutomation
|
||||
from src.hass_config.loader import HassConfig
|
||||
from tests.utils import (
|
||||
HA_CONFIG2_EXAMPLE,
|
||||
HA_CONFIG3_EXAMPLE,
|
||||
HA_CONFIG4_EXAMPLE,
|
||||
HA_CONFIG5_EXAMPLE,
|
||||
HA_CONFIG6_EXAMPLE,
|
||||
HA_CONFIG_EXAMPLE,
|
||||
)
|
||||
|
||||
|
||||
class loader_tests(TestCase):
|
||||
def test_load_automation_runs(self):
|
||||
auto = list(
|
||||
load_automation(
|
||||
{
|
||||
"id": "1616887975473",
|
||||
"alias": "Home Assistant Off",
|
||||
"description": "",
|
||||
"trigger": [{"platform": "homeassistant", "event": "shutdown"}],
|
||||
"condition": ["states(time.time) >= '10:00:00'"],
|
||||
"action": [
|
||||
{
|
||||
"device_id": SecretValue("my_mobile_phone", "..."),
|
||||
"domain": "mobile_app",
|
||||
"type": "notify",
|
||||
"title": "Hassio Status",
|
||||
"message": "Hassio Is turning off...",
|
||||
}
|
||||
],
|
||||
"mode": "single",
|
||||
},
|
||||
{},
|
||||
def test_load_automation_list_file(self):
|
||||
automations = list(
|
||||
load_automation_path(
|
||||
HA_CONFIG2_EXAMPLE,
|
||||
HA_CONFIG2_EXAMPLE / "automations.yaml",
|
||||
configuration_key="automation",
|
||||
tag_manager=TagManager({"1652069225859": {"type": "routine"}}),
|
||||
)
|
||||
)
|
||||
self.assertEqual(len(automations), 1)
|
||||
self.assertEqual(
|
||||
auto[0],
|
||||
ExtenededAutomationData(
|
||||
metadata=AutomationMetdata(
|
||||
id="1616887975473",
|
||||
alias="Home Assistant Off",
|
||||
description="",
|
||||
mode="single",
|
||||
),
|
||||
trigger=[{"platform": "homeassistant", "event": "shutdown"}],
|
||||
condition=[
|
||||
automations[0],
|
||||
ExtenededAutomation(
|
||||
id="1652069225859",
|
||||
source_file="automations.yaml",
|
||||
source_file_type="list",
|
||||
configuration_key="automation",
|
||||
alias="Climate - Pref temperature ",
|
||||
description="",
|
||||
mode="single",
|
||||
tags={"type": "routine"},
|
||||
trigger=[
|
||||
{
|
||||
"condition": "template",
|
||||
"value_template": "states(time.time) >= '10:00:00'",
|
||||
"platform": "state",
|
||||
"entity_id": "input_number.preferred_temperature",
|
||||
}
|
||||
],
|
||||
sequence=[
|
||||
condition=[],
|
||||
action=[
|
||||
{
|
||||
"device_id": NOT_IMPLEMENTED_SV_MSG,
|
||||
"domain": "mobile_app",
|
||||
"type": "notify",
|
||||
"title": "Hassio Status",
|
||||
"message": "Hassio Is turning off...",
|
||||
"service": "climate.set_temperature",
|
||||
"data": {
|
||||
"temperature": {
|
||||
"[object Object]": None,
|
||||
}
|
||||
},
|
||||
"target": {
|
||||
"entity_id": "climate.main_floor",
|
||||
},
|
||||
}
|
||||
],
|
||||
tags={},
|
||||
),
|
||||
)
|
||||
|
||||
def test_load_automation_obj_file(self):
|
||||
automations = list(
|
||||
load_automation_path(
|
||||
HA_CONFIG4_EXAMPLE,
|
||||
HA_CONFIG4_EXAMPLE / "automations" / "notify_washer.yaml",
|
||||
configuration_key="automation base",
|
||||
tag_manager=TagManager({"1659114647067": {"room": "laundry"}}),
|
||||
)
|
||||
)
|
||||
self.assertEqual(len(automations), 1)
|
||||
self.assertEqual(
|
||||
automations[0],
|
||||
ExtenededAutomation(
|
||||
id="1659114647067",
|
||||
source_file="automations/notify_washer.yaml",
|
||||
source_file_type="obj",
|
||||
configuration_key="automation base",
|
||||
alias="Notify Washer",
|
||||
description="Example",
|
||||
mode="single",
|
||||
tags={"room": "laundry"},
|
||||
trigger=[
|
||||
{
|
||||
"platform": "homeassistant",
|
||||
"event": "start",
|
||||
}
|
||||
],
|
||||
condition=[],
|
||||
action=[
|
||||
{
|
||||
"service": "counter.increment",
|
||||
"data": {},
|
||||
"target": {"entity_id": "counter.up_times"},
|
||||
}
|
||||
],
|
||||
),
|
||||
)
|
||||
|
||||
def test_load_automation_empty_file(self):
|
||||
file_path = Path(mktemp())
|
||||
file_path.touch()
|
||||
automations = list(
|
||||
load_automation_path(
|
||||
file_path.parent,
|
||||
file_path,
|
||||
configuration_key="automation ui",
|
||||
tag_manager=TagManager(),
|
||||
)
|
||||
)
|
||||
self.assertEqual(len(automations), 0)
|
||||
|
||||
def test_load_automation_none_existing_file(self):
|
||||
file_path = Path(mktemp())
|
||||
file_path.unlink(missing_ok=True)
|
||||
automations = list(
|
||||
load_automation_path(
|
||||
file_path.parent,
|
||||
file_path,
|
||||
configuration_key="automation manual",
|
||||
tag_manager=TagManager(),
|
||||
)
|
||||
)
|
||||
self.assertEqual(len(automations), 0)
|
||||
|
||||
def test_extract_all_automation_files(self):
|
||||
for ha_path, expected in [
|
||||
(HA_CONFIG_EXAMPLE, 1),
|
||||
(HA_CONFIG2_EXAMPLE, 1),
|
||||
(HA_CONFIG3_EXAMPLE, 1),
|
||||
(HA_CONFIG4_EXAMPLE, 1),
|
||||
(HA_CONFIG5_EXAMPLE, 3),
|
||||
(HA_CONFIG6_EXAMPLE, 4),
|
||||
]:
|
||||
with self.subTest(ha_path=ha_path, expected=expected):
|
||||
hass_config = HassConfig(ha_path)
|
||||
paths = list(extract_automation_paths(hass_config))
|
||||
self.assertEqual(len(paths), expected)
|
||||
@@ -1,115 +1,327 @@
|
||||
from unittest import TestCase
|
||||
from pathlib import Path
|
||||
|
||||
from src.automations.errors import FailedDeletion, InvalidAutomationFile
|
||||
from src.automations.types import AutomationMetdata, ExtenededAutomationData
|
||||
from src import yaml_serializer
|
||||
from src.automations.errors import (
|
||||
AttemptingToOverwriteAnIncompatibleFileError,
|
||||
DBNoAutomationFound,
|
||||
InvalidAutomationFile,
|
||||
)
|
||||
from src.automations.manager import AutomationManager
|
||||
from src.automations.types import ExtenededAutomation
|
||||
from src.errors import ErrorSet
|
||||
from src.hass_config.loader import HassConfig
|
||||
from tests.utils import (
|
||||
get_dummy_automation_loader,
|
||||
get_example_automation_loader,
|
||||
HA_CONFIG6_EXAMPLE,
|
||||
HA_CONFIG_EXAMPLE,
|
||||
create_copy_of_example_config,
|
||||
)
|
||||
|
||||
from .utils import TestWithDB
|
||||
|
||||
class manager_tests(TestCase):
|
||||
def test_find_limit_and_get(self):
|
||||
_, _, loader = get_example_automation_loader()
|
||||
first_auto_with_find = list(loader.find(limit=1))
|
||||
first_auto_with_get = loader.get(0)
|
||||
self.assertEqual(first_auto_with_find[0], first_auto_with_get)
|
||||
|
||||
def test_find_at_most_with_offset(self):
|
||||
_, _, loader = get_example_automation_loader()
|
||||
autos = list(loader.find(limit=10, offset=10))
|
||||
self.assertTrue(len(autos), 10)
|
||||
class manager_tests(TestWithDB):
|
||||
def get_manager(self, ha_config_example: Path):
|
||||
self.config_path = create_copy_of_example_config(ha_config_example)
|
||||
self.automation_manager = AutomationManager(
|
||||
HassConfig(self.config_path),
|
||||
self.db_file,
|
||||
)
|
||||
return self.config_path, self.automation_manager
|
||||
|
||||
def test_load_complex_read_modify_delete(self):
|
||||
_, automation_manager = self.get_manager(HA_CONFIG6_EXAMPLE)
|
||||
self.assertEqual(automation_manager.count(), 0)
|
||||
automation_manager.reload()
|
||||
self.assertEqual(automation_manager.count(), 12)
|
||||
automation = automation_manager.get("sublist3-mlist2")
|
||||
self.assertEqual(automation.description, "That was correct!")
|
||||
self.assertEqual(
|
||||
automation.action,
|
||||
[
|
||||
{
|
||||
"service": "switch.turn_off",
|
||||
"target": {"entity_id": "switch.bathroom"},
|
||||
"data": None,
|
||||
}
|
||||
],
|
||||
)
|
||||
self.assertEqual(automation.configuration_key, "automation cools")
|
||||
automation.trigger.append(
|
||||
{"platform": "zone", "entity_id": "person.thor", "zone": "zone.azguard"}
|
||||
)
|
||||
automation_manager.update(automation)
|
||||
self.assertEqual(
|
||||
automation_manager.get("sublist3-mlist2").trigger,
|
||||
[],
|
||||
)
|
||||
automation_manager.reload()
|
||||
self.assertEqual(
|
||||
automation_manager.get("sublist3-mlist2").trigger,
|
||||
[
|
||||
{
|
||||
"platform": "zone",
|
||||
"entity_id": "person.thor",
|
||||
"zone": "zone.azguard",
|
||||
}
|
||||
],
|
||||
)
|
||||
|
||||
def test_find_invalid(self):
|
||||
_, _, loader = get_example_automation_loader()
|
||||
self.assertIsNone(loader.get(-1))
|
||||
self.assertIsNone(loader.get(1_000))
|
||||
self.assertIsNone(loader.get(33))
|
||||
|
||||
def test_length(self):
|
||||
_, _, loader = get_example_automation_loader()
|
||||
self.assertEqual(loader.get_total_items(), 32)
|
||||
_, automation_manager = self.get_manager(HA_CONFIG6_EXAMPLE)
|
||||
automation_manager.reload()
|
||||
with self.assertRaises(DBNoAutomationFound):
|
||||
automation_manager.get("invalid")
|
||||
|
||||
def test_bad_automations_file(self):
|
||||
folder, _, manager = get_dummy_automation_loader(
|
||||
[],
|
||||
automation_in_conifguration_mode="none",
|
||||
)
|
||||
(folder / "automations.yaml").write_text("bob is an uncle")
|
||||
with self.assertRaises(InvalidAutomationFile):
|
||||
manager.get(0)
|
||||
config_path, automation_manager = self.get_manager(HA_CONFIG_EXAMPLE)
|
||||
(config_path / "automations.yaml").write_text("bob is an uncle")
|
||||
with self.assertRaises(ErrorSet) as err:
|
||||
automation_manager.reload()
|
||||
self.assertEqual(len(err.exception.errors), 1)
|
||||
self.assertIsInstance(err.exception.errors[0], InvalidAutomationFile)
|
||||
self.assertEqual(automation_manager.count(), 0)
|
||||
|
||||
def test_create_automation(self):
|
||||
_, _, manager = get_dummy_automation_loader(
|
||||
[],
|
||||
automation_in_conifguration_mode="none",
|
||||
)
|
||||
manager.update(1, ExtenededAutomationData(metadata=AutomationMetdata(id="test1")))
|
||||
auto = manager.get(0)
|
||||
self.assertIsNotNone(auto)
|
||||
self.assertEqual(auto.metadata.id, "test1") # type: ignore
|
||||
def test_one_bad_automations_file(self):
|
||||
config_path, automation_manager = self.get_manager(HA_CONFIG6_EXAMPLE)
|
||||
(config_path / "automations" / "ui.yaml").write_text("bob is an uncle")
|
||||
with self.assertRaises(ErrorSet) as err:
|
||||
automation_manager.reload()
|
||||
self.assertEqual(len(err.exception.errors), 1)
|
||||
self.assertIsInstance(err.exception.errors[0], InvalidAutomationFile)
|
||||
self.assertEqual(automation_manager.count(), 10)
|
||||
|
||||
def test_create_automation_with_example_folder(self):
|
||||
_, _, manager = get_example_automation_loader()
|
||||
self.assertEqual(manager.get_total_items(), 32)
|
||||
manager.update(40, ExtenededAutomationData(metadata=AutomationMetdata(id="test1")))
|
||||
auto = manager.get(32)
|
||||
self.assertIsNotNone(auto)
|
||||
self.assertEqual(manager.get_total_items(), 33)
|
||||
self.assertEqual(auto.metadata.id, "test1") # type: ignore
|
||||
def test_delete_automation_in_single_file(self):
|
||||
config_path, automation_manager = self.get_manager(HA_CONFIG6_EXAMPLE)
|
||||
self.assertTrue((config_path / "automations/include_dir_list/home/down.yaml").exists())
|
||||
automation_manager.reload()
|
||||
automation = automation_manager.get("1659114822642")
|
||||
self.assertEqual(automation.configuration_key, "automation manual")
|
||||
automation_manager.delete(automation)
|
||||
automation_manager.reload()
|
||||
with self.assertRaises(DBNoAutomationFound):
|
||||
automation_manager.get("1659114822642")
|
||||
self.assertFalse((config_path / "automations/include_dir_list/home/down.yaml").exists())
|
||||
|
||||
def test_update_automation(self):
|
||||
_, _, manager = get_dummy_automation_loader(
|
||||
[
|
||||
ExtenededAutomationData(metadata=AutomationMetdata(id="test1")),
|
||||
ExtenededAutomationData(metadata=AutomationMetdata(id="test2")),
|
||||
ExtenededAutomationData(metadata=AutomationMetdata(id="test3")),
|
||||
],
|
||||
automation_in_conifguration_mode="none",
|
||||
def test_delete_automation_in_list(self):
|
||||
config_path, automation_manager = self.get_manager(HA_CONFIG6_EXAMPLE)
|
||||
self.assertTrue(
|
||||
(config_path / "automations/include_dir_merge_list/sub/list2.yaml").exists()
|
||||
)
|
||||
automation_manager.reload()
|
||||
automation = automation_manager.get("mlist2")
|
||||
self.assertEqual(automation.configuration_key, "automation cools")
|
||||
automation_manager.delete(automation)
|
||||
automation_manager.reload()
|
||||
with self.assertRaises(DBNoAutomationFound):
|
||||
automation_manager.get("mlist2")
|
||||
self.assertTrue(
|
||||
(config_path / "automations/include_dir_merge_list/sub/list2.yaml").exists()
|
||||
)
|
||||
auto = manager.get(0)
|
||||
self.assertEqual(auto.metadata.id, "test1") # type: ignore
|
||||
manager.update(0, ExtenededAutomationData(metadata=AutomationMetdata(id="toaster-7")))
|
||||
auto = manager.get(0)
|
||||
self.assertEqual(auto.metadata.id, "toaster-7") # type: ignore
|
||||
|
||||
def test_delete_automation(self):
|
||||
_, _, manager = get_dummy_automation_loader(
|
||||
[
|
||||
ExtenededAutomationData(metadata=AutomationMetdata(id="test1")),
|
||||
ExtenededAutomationData(metadata=AutomationMetdata(id="test2")),
|
||||
ExtenededAutomationData(metadata=AutomationMetdata(id="test3")),
|
||||
],
|
||||
automation_in_conifguration_mode="none",
|
||||
def test_create_new_in_single_file(self):
|
||||
config_path, automation_manager = self.get_manager(HA_CONFIG6_EXAMPLE)
|
||||
automation_manager.reload()
|
||||
self.assertFalse((config_path / "automations/include_dir_list/home/left.yaml").exists())
|
||||
with self.assertRaises(DBNoAutomationFound):
|
||||
automation_manager.get("newlymade")
|
||||
automation_manager.update(
|
||||
ExtenededAutomation(
|
||||
id="newlymade",
|
||||
configuration_key="automation manual",
|
||||
source_file="automations/include_dir_list/home/left.yaml",
|
||||
source_file_type="obj",
|
||||
)
|
||||
)
|
||||
self.assertTrue((config_path / "automations/include_dir_list/home/left.yaml").exists())
|
||||
automation_manager.reload()
|
||||
self.assertEqual(
|
||||
automation_manager.get("newlymade"),
|
||||
ExtenededAutomation(
|
||||
id="newlymade",
|
||||
configuration_key="automation manual",
|
||||
source_file="automations/include_dir_list/home/left.yaml",
|
||||
source_file_type="obj",
|
||||
),
|
||||
)
|
||||
self.assertEqual(manager.get_total_items(), 3)
|
||||
manager.delete(1)
|
||||
self.assertEqual(manager.get_total_items(), 2)
|
||||
for auto in manager.find(0, 1000):
|
||||
self.assertNotEqual(auto.metadata.id, "test2")
|
||||
|
||||
def test_failed_deletion_automation(self):
|
||||
_, _, manager = get_dummy_automation_loader(
|
||||
[
|
||||
ExtenededAutomationData(metadata=AutomationMetdata(id="test1")),
|
||||
ExtenededAutomationData(metadata=AutomationMetdata(id="test2")),
|
||||
ExtenededAutomationData(metadata=AutomationMetdata(id="test3")),
|
||||
],
|
||||
automation_in_conifguration_mode="none",
|
||||
def test_create_new_in_existing_list_file(self):
|
||||
config_path, automation_manager = self.get_manager(HA_CONFIG6_EXAMPLE)
|
||||
automation_manager.reload()
|
||||
self.assertTrue(
|
||||
(config_path / "automations/include_dir_merge_list/sub/list2.yaml").exists()
|
||||
)
|
||||
with self.assertRaises(DBNoAutomationFound):
|
||||
automation_manager.get("newlymade")
|
||||
automation_manager.update(
|
||||
ExtenededAutomation(
|
||||
id="newlymade",
|
||||
configuration_key="automation cools",
|
||||
source_file="automations/include_dir_merge_list/sub/list2.yaml",
|
||||
source_file_type="list",
|
||||
),
|
||||
create_if_not_found=True,
|
||||
)
|
||||
self.assertTrue(
|
||||
(config_path / "automations/include_dir_merge_list/sub/list2.yaml").exists()
|
||||
)
|
||||
automation_manager.reload()
|
||||
self.assertEqual(
|
||||
automation_manager.get("newlymade"),
|
||||
ExtenededAutomation(
|
||||
id="newlymade",
|
||||
configuration_key="automation cools",
|
||||
source_file="automations/include_dir_merge_list/sub/list2.yaml",
|
||||
source_file_type="list",
|
||||
),
|
||||
)
|
||||
self.assertEqual(manager.get_total_items(), 3)
|
||||
with self.assertRaises(FailedDeletion):
|
||||
manager.delete(10)
|
||||
|
||||
def test_save_tags(self):
|
||||
_, _, manager = get_dummy_automation_loader(
|
||||
[
|
||||
ExtenededAutomationData(metadata=AutomationMetdata(id="test1")),
|
||||
ExtenededAutomationData(metadata=AutomationMetdata(id="test2")),
|
||||
ExtenededAutomationData(metadata=AutomationMetdata(id="test3")),
|
||||
],
|
||||
automation_in_conifguration_mode="none",
|
||||
def test_create_new_in_new_list_file(self):
|
||||
config_path, automation_manager = self.get_manager(HA_CONFIG6_EXAMPLE)
|
||||
automation_manager.reload()
|
||||
self.assertFalse(
|
||||
(config_path / "automations/include_dir_merge_list/sub/list4.yaml").exists()
|
||||
)
|
||||
with self.assertRaises(DBNoAutomationFound):
|
||||
automation_manager.get("newlymade")
|
||||
automation_manager.update(
|
||||
ExtenededAutomation(
|
||||
id="newlymade",
|
||||
configuration_key="automation cools",
|
||||
source_file="automations/include_dir_merge_list/sub/list4.yaml",
|
||||
source_file_type="list",
|
||||
),
|
||||
create_if_not_found=True,
|
||||
)
|
||||
self.assertTrue(
|
||||
(config_path / "automations/include_dir_merge_list/sub/list4.yaml").exists()
|
||||
)
|
||||
automation_manager.reload()
|
||||
self.assertEqual(
|
||||
automation_manager.get("newlymade"),
|
||||
ExtenededAutomation(
|
||||
id="newlymade",
|
||||
configuration_key="automation cools",
|
||||
source_file="automations/include_dir_merge_list/sub/list4.yaml",
|
||||
source_file_type="list",
|
||||
),
|
||||
)
|
||||
|
||||
def test_save_improper_types_list_to_obj(self):
|
||||
config_path, automation_manager = self.get_manager(HA_CONFIG6_EXAMPLE)
|
||||
automation_manager.reload()
|
||||
self.assertTrue(
|
||||
(config_path / "automations/include_dir_merge_list/sub/list2.yaml").exists()
|
||||
)
|
||||
with self.assertRaises(DBNoAutomationFound):
|
||||
automation_manager.get("newlymade")
|
||||
with self.assertRaises(AttemptingToOverwriteAnIncompatibleFileError):
|
||||
automation_manager.update(
|
||||
ExtenededAutomation(
|
||||
id="newlymade",
|
||||
configuration_key="automation cools",
|
||||
source_file="automations/include_dir_merge_list/sub/list2.yaml",
|
||||
source_file_type="obj",
|
||||
),
|
||||
create_if_not_found=True,
|
||||
)
|
||||
automation_manager.reload()
|
||||
with self.assertRaises(DBNoAutomationFound):
|
||||
automation_manager.get("newlymade")
|
||||
|
||||
data = yaml_serializer.load_yaml(
|
||||
(config_path / "automations/include_dir_merge_list/sub/list2.yaml").open("r")
|
||||
)
|
||||
self.assertIsInstance(data, list)
|
||||
|
||||
def test_save_improper_types_obj_to_list(self):
|
||||
config_path, automation_manager = self.get_manager(HA_CONFIG6_EXAMPLE)
|
||||
automation_manager.reload()
|
||||
self.assertTrue((config_path / "automations/include_dir_list/home/down.yaml").exists())
|
||||
with self.assertRaises(DBNoAutomationFound):
|
||||
automation_manager.get("newlymade")
|
||||
with self.assertRaises(AttemptingToOverwriteAnIncompatibleFileError):
|
||||
automation_manager.update(
|
||||
ExtenededAutomation(
|
||||
id="newlymade",
|
||||
configuration_key="automation cools",
|
||||
source_file="automations/include_dir_list/home/down.yaml",
|
||||
source_file_type="list",
|
||||
),
|
||||
create_if_not_found=True,
|
||||
)
|
||||
automation_manager.reload()
|
||||
with self.assertRaises(DBNoAutomationFound):
|
||||
automation_manager.get("newlymade")
|
||||
|
||||
data = yaml_serializer.load_yaml(
|
||||
(config_path / "automations/include_dir_list/home/down.yaml").open("r")
|
||||
)
|
||||
self.assertIsInstance(data, dict)
|
||||
|
||||
def test_update_tags_through_automation_update(self):
|
||||
_, automation_manager = self.get_manager(HA_CONFIG_EXAMPLE)
|
||||
automation_manager.reload()
|
||||
auto = automation_manager.get("1619371298367")
|
||||
self.assertDictEqual(
|
||||
auto.tags,
|
||||
{
|
||||
"Room": "Living",
|
||||
"Type": "Button",
|
||||
},
|
||||
)
|
||||
auto.tags["Room"] = "Bathroom"
|
||||
automation_manager.update(auto)
|
||||
del auto
|
||||
automation_manager.reload()
|
||||
auto = automation_manager.get("1619371298367")
|
||||
self.assertDictEqual(
|
||||
auto.tags,
|
||||
{
|
||||
"Room": "Bathroom",
|
||||
"Type": "Button",
|
||||
},
|
||||
)
|
||||
|
||||
def test_update_tags_through_tags(self):
|
||||
_, automation_manager = self.get_manager(HA_CONFIG_EXAMPLE)
|
||||
automation_manager.reload()
|
||||
auto = automation_manager.get("1619371298367")
|
||||
self.assertDictEqual(
|
||||
auto.tags,
|
||||
{
|
||||
"Room": "Living",
|
||||
"Type": "Button",
|
||||
},
|
||||
)
|
||||
auto.tags["Room"] = "Bathroom"
|
||||
automation_manager.update_tags(auto.id, auto.tags)
|
||||
del auto
|
||||
automation_manager.reload()
|
||||
auto = automation_manager.get("1619371298367")
|
||||
self.assertDictEqual(
|
||||
auto.tags,
|
||||
{
|
||||
"Room": "Bathroom",
|
||||
"Type": "Button",
|
||||
},
|
||||
)
|
||||
|
||||
def test_delete_tags(self):
|
||||
_, automation_manager = self.get_manager(HA_CONFIG_EXAMPLE)
|
||||
automation_manager.reload()
|
||||
auto = automation_manager.get("1619371298367")
|
||||
self.assertDictEqual(
|
||||
auto.tags,
|
||||
{
|
||||
"Room": "Living",
|
||||
"Type": "Button",
|
||||
},
|
||||
)
|
||||
automation_manager.delete_tags(auto.id)
|
||||
del auto
|
||||
automation_manager.reload()
|
||||
auto = automation_manager.get("1619371298367")
|
||||
self.assertDictEqual(
|
||||
auto.tags,
|
||||
{},
|
||||
)
|
||||
manager.update_tags("test1", {"room": "bathroom"})
|
||||
auto = manager.get(0)
|
||||
assert auto.tags == {"room": "bathroom"}
|
||||
@@ -0,0 +1,19 @@
|
||||
from pathlib import Path
|
||||
from tempfile import mktemp
|
||||
from unittest import TestCase
|
||||
|
||||
from src.automations.db import AutomationDBConnection
|
||||
|
||||
|
||||
def make_temp_db():
|
||||
return AutomationDBConnection(Path(mktemp() + ".db"))
|
||||
|
||||
|
||||
class TestWithDB(TestCase):
|
||||
def setUp(self) -> None:
|
||||
self.db = make_temp_db()
|
||||
self.db.create_db()
|
||||
self.db_file = self.db.db_file
|
||||
|
||||
def tearDown(self) -> None:
|
||||
self.db_file.unlink()
|
||||
@@ -1,7 +1,6 @@
|
||||
from unittest import TestCase
|
||||
|
||||
from src.automations.types import AutomationData, AutomationMetdata
|
||||
from src.hass_config.errors import MissingFile
|
||||
from src.automations.types import BaseAutomation
|
||||
from src.hass_config.loader import HassConfig
|
||||
from tests.utils import create_dummy_config_folder
|
||||
|
||||
@@ -9,41 +8,36 @@ from tests.utils import create_dummy_config_folder
|
||||
class loader_tests(TestCase):
|
||||
def test_load_automation_from_config_yaml(self):
|
||||
folder = create_dummy_config_folder(
|
||||
[AutomationData(metadata=AutomationMetdata(id="test"))],
|
||||
[BaseAutomation(id="test")],
|
||||
automation_in_conifguration_mode="inline",
|
||||
)
|
||||
hass_config = HassConfig(folder)
|
||||
self.assertIsInstance(hass_config.configurations, dict)
|
||||
self.assertTrue("automation" in hass_config.configurations)
|
||||
self.assertEqual(hass_config.automations[0]["id"], "test")
|
||||
|
||||
def test_load_automation_from_config_yaml_include(self):
|
||||
folder = create_dummy_config_folder(
|
||||
[AutomationData(metadata=AutomationMetdata(id="test"))],
|
||||
[BaseAutomation(id="test")],
|
||||
automation_in_conifguration_mode="include",
|
||||
)
|
||||
hass_config = HassConfig(folder)
|
||||
self.assertIsInstance(hass_config.configurations, dict)
|
||||
self.assertTrue("automation" in hass_config.configurations)
|
||||
self.assertEqual(hass_config.automations[0]["id"], "test")
|
||||
|
||||
def test_load_automation_from_infer(self):
|
||||
folder = create_dummy_config_folder(
|
||||
[AutomationData(metadata=AutomationMetdata(id="test"))],
|
||||
[BaseAutomation(id="test")],
|
||||
automation_in_conifguration_mode="none",
|
||||
)
|
||||
hass_config = HassConfig(folder)
|
||||
self.assertIsInstance(hass_config.configurations, dict)
|
||||
self.assertFalse("automation" in hass_config.configurations)
|
||||
self.assertEqual(hass_config.automations[0]["id"], "test")
|
||||
|
||||
def test_missing_automations(self):
|
||||
folder = create_dummy_config_folder(
|
||||
[AutomationData(metadata=AutomationMetdata(id="test"))],
|
||||
[BaseAutomation(id="test")],
|
||||
automation_in_conifguration_mode="none",
|
||||
)
|
||||
(folder / "automations.yaml").unlink()
|
||||
hass_config = HassConfig(folder)
|
||||
self.assertIsInstance(hass_config.configurations, dict)
|
||||
with self.assertRaises(MissingFile):
|
||||
list(hass_config.automations)
|
||||
@@ -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(
|
||||
|
||||
+8
-5
@@ -4,7 +4,7 @@ from tempfile import mkdtemp
|
||||
from typing import List, Literal, Optional, Tuple
|
||||
|
||||
from src.automations.manager import AutomationManager
|
||||
from src.automations.types import AutomationData
|
||||
from src.automations.types import BaseAutomation
|
||||
from src.hass_config.loader import HassConfig
|
||||
from src.yaml_serializer import dump_yaml
|
||||
from src.yaml_serializer.types import IncludedYaml
|
||||
@@ -14,6 +14,9 @@ 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"
|
||||
HA_CONFIG5_EXAMPLE = SAMPLES_FOLDER / "config-5"
|
||||
HA_CONFIG6_EXAMPLE = SAMPLES_FOLDER / "config-6"
|
||||
|
||||
|
||||
def get_example_automation_loader(
|
||||
@@ -43,7 +46,7 @@ def create_copy_of_example_config(config_to_copy: Path = HA_CONFIG_EXAMPLE) -> P
|
||||
|
||||
|
||||
def get_dummy_automation_loader(
|
||||
auto: List[AutomationData],
|
||||
auto: List[BaseAutomation],
|
||||
secrets: Optional[dict] = None,
|
||||
other_config: Optional[dict] = None,
|
||||
automation_in_conifguration_mode: Literal["include", "inline", "none"] = "include",
|
||||
@@ -51,7 +54,7 @@ def get_dummy_automation_loader(
|
||||
"""Creates a dummy /config structure for testing and return the loader and config
|
||||
|
||||
Args:
|
||||
auto (List[AutomationData]): automations
|
||||
auto (List[BaseAutomation]): automations
|
||||
secrets (Optional[dict], optional): dictionary of secrets
|
||||
other_config (Optional[dict], optional): some config stuff to place into configuration.yaml. Defaults to None.
|
||||
automation_in_conifguration_mode (Literal['include', 'inline', 'none'], optional): whether to !include automation as a separete file or in the configuration yaml. Defaults to inline.
|
||||
@@ -71,7 +74,7 @@ def get_dummy_automation_loader(
|
||||
|
||||
|
||||
def create_dummy_config_folder(
|
||||
auto: List[AutomationData],
|
||||
auto: List[BaseAutomation],
|
||||
secrets: Optional[dict] = None,
|
||||
other_config: Optional[dict] = None,
|
||||
automation_in_conifguration_mode: Literal["include", "inline", "none"] = "include",
|
||||
@@ -79,7 +82,7 @@ def create_dummy_config_folder(
|
||||
"""Creates a dummy /config structure for testing
|
||||
|
||||
Args:
|
||||
auto (List[AutomationData]): automations
|
||||
auto (List[BaseAutomation]): automations
|
||||
secrets (Optional[dict], optional): dictionary of secrets
|
||||
other_config (Optional[dict], optional): some config stuff to place into configuration.yaml. Defaults to None.
|
||||
automation_in_conifguration_mode (Literal['include', 'inline', 'none'], optional): whether to !include automation as a separete file or in the configuration yaml. Defaults to inline.
|
||||
|
||||
BIN
Binary file not shown.
Executable
BIN
Binary file not shown.
|
After Width: | Height: | Size: 2.9 MiB |
+1
-1
@@ -1,5 +1,5 @@
|
||||
name: Shortumation
|
||||
version: v0.5.1
|
||||
version: v0.5.3
|
||||
slug: shortumation
|
||||
image: asosnovsky/shortumation-{arch}
|
||||
url: "https://github.com/asosnovsky/Shortumation"
|
||||
|
||||
@@ -12,9 +12,12 @@ services:
|
||||
shortumation:
|
||||
# make sure to replace the ARCH with whatever system you are running!
|
||||
image: "asosnovsky/shortumation-${ARCH:-amd64}:${SHORTUMATION_VERSION:-latest}"
|
||||
network_mode: host
|
||||
ports:
|
||||
- 8000:8000
|
||||
extra_hosts:
|
||||
- "host.docker.internal:host-gateway"
|
||||
volumes:
|
||||
- ./config:/config
|
||||
environment:
|
||||
- SUPERVISOR_TOKEN=${SUPERVISOR_TOKEN}
|
||||
- HASSIO_WS=ws://0.0.0.0:8123/api/websocket
|
||||
- HASSIO_WS=ws://host.docker.internal:8123/api/websocket
|
||||
Vendored
+3
@@ -0,0 +1,3 @@
|
||||
{
|
||||
"task.allowAutomaticTasks": true
|
||||
}
|
||||
+18
-7
@@ -1,20 +1,31 @@
|
||||
import './App.css';
|
||||
import "./App.css";
|
||||
import { Routes, Route, BrowserRouter } from "react-router-dom";
|
||||
import { AutomationRoute } from 'routes/automation';
|
||||
import { useConnectedApiService } from 'apiService';
|
||||
import { ErrorBoundary } from 'components/ErrorBoundary';
|
||||
import { AutomationRoute } from "routes/automation";
|
||||
import { useConnectedApiService } from "apiService";
|
||||
import { ErrorBoundary } from "components/ErrorBoundary";
|
||||
import { CookiesProvider } from "react-cookie";
|
||||
import { Page } from "components/Page";
|
||||
|
||||
const ConnectedAutomationRoute = () => {
|
||||
const api = useConnectedApiService();
|
||||
return <AutomationRoute api={api} />;
|
||||
};
|
||||
|
||||
function App() {
|
||||
const api = useConnectedApiService();
|
||||
|
||||
return (
|
||||
<div className="app">
|
||||
<ErrorBoundary>
|
||||
<CookiesProvider>
|
||||
<BrowserRouter>
|
||||
<Routes>
|
||||
<Route path="*" element={<AutomationRoute api={api} />} />
|
||||
<Route
|
||||
path="*"
|
||||
element={
|
||||
<Page>
|
||||
<ConnectedAutomationRoute />
|
||||
</Page>
|
||||
}
|
||||
/>
|
||||
</Routes>
|
||||
</BrowserRouter>
|
||||
</CookiesProvider>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { AutomationData } from "types/automations";
|
||||
import { AutomationData, BareAutomationData } from "types/automations";
|
||||
import { API } from "./base";
|
||||
import { ListData, ListParams } from "./types";
|
||||
import {
|
||||
@@ -18,13 +18,18 @@ export const makeAutomationAPI = (api: API) => ({
|
||||
});
|
||||
return data;
|
||||
},
|
||||
async update({ index, auto }: { index: number; auto: AutomationData }) {
|
||||
async update(auto: AutomationData) {
|
||||
return await api.makeCall({
|
||||
method: "PUT",
|
||||
path: AUTOMTAION_ITEM,
|
||||
data: {
|
||||
index,
|
||||
data: auto,
|
||||
},
|
||||
data: auto,
|
||||
});
|
||||
},
|
||||
async create(auto: BareAutomationData) {
|
||||
return await api.makeCall({
|
||||
method: "POST",
|
||||
path: AUTOMTAION_ITEM,
|
||||
data: auto,
|
||||
});
|
||||
},
|
||||
async updateTags({
|
||||
@@ -42,13 +47,11 @@ export const makeAutomationAPI = (api: API) => ({
|
||||
},
|
||||
});
|
||||
},
|
||||
async remove({ index }: { index: number }) {
|
||||
async remove(auto: AutomationData) {
|
||||
return await api.makeCall({
|
||||
method: "DELETE",
|
||||
path: AUTOMTAION_ITEM,
|
||||
data: {
|
||||
index,
|
||||
},
|
||||
data: auto,
|
||||
});
|
||||
},
|
||||
});
|
||||
|
||||
@@ -1,22 +1,20 @@
|
||||
import { APIRequest, APIResponse } from './types';
|
||||
import { APIRequest, APIResponse } from "./types";
|
||||
|
||||
export interface API {
|
||||
makeCall: <Res = any, Req = any>(req: APIRequest<Req>) => Promise<APIResponse<Res>>;
|
||||
makeCall: <Res = any, Req = any>(
|
||||
req: APIRequest<Req>
|
||||
) => Promise<APIResponse<Res>>;
|
||||
}
|
||||
export const makeRemoteAPI = (baseURL: string): API => ({
|
||||
async makeCall({
|
||||
path,
|
||||
method = "POST",
|
||||
data = {}
|
||||
}) {
|
||||
async makeCall({ path, method = "POST", data = {} }) {
|
||||
try {
|
||||
const payload: RequestInit = {
|
||||
method,
|
||||
headers: {
|
||||
"Content-Type": "application/json"
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
};
|
||||
if (method !== 'GET') {
|
||||
if (method !== "GET") {
|
||||
payload["body"] = JSON.stringify(data);
|
||||
}
|
||||
const reply = await fetch(baseURL + path, payload);
|
||||
@@ -25,27 +23,27 @@ export const makeRemoteAPI = (baseURL: string): API => ({
|
||||
response = {
|
||||
ok: true,
|
||||
data: await reply.json(),
|
||||
}
|
||||
};
|
||||
} else {
|
||||
response = {
|
||||
ok: false,
|
||||
error: await reply.text(),
|
||||
}
|
||||
console.error(response)
|
||||
};
|
||||
console.error(response);
|
||||
}
|
||||
return response
|
||||
return response;
|
||||
} catch (err) {
|
||||
console.error(err)
|
||||
let error = String(err)
|
||||
console.error(err);
|
||||
let error = String(err);
|
||||
|
||||
if (err instanceof Error) {
|
||||
error += ` ${err.stack}`
|
||||
error += ` ${err.stack}`;
|
||||
}
|
||||
|
||||
return {
|
||||
ok: false,
|
||||
error,
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
});
|
||||
@@ -22,6 +22,7 @@ export const useAPIService = (automationAPI: AutomationAPI) => {
|
||||
state,
|
||||
removeAutomation: wrapCall(automationAPI.remove),
|
||||
updateAutomation: wrapCall(automationAPI.update),
|
||||
createAutomation: wrapCall(automationAPI.create),
|
||||
updateTags: wrapCall(automationAPI.updateTags),
|
||||
};
|
||||
};
|
||||
@@ -24,12 +24,12 @@ test("mock api uses initial autos for initial population -- some data", async ()
|
||||
|
||||
test("populate mock api with some data", async () => {
|
||||
const mockApi = makeAutomationAPI(useMockAPI([], fakeUseRef as any));
|
||||
await mockApi.update({ index: 0, auto: createMockAuto() });
|
||||
await mockApi.update(createMockAuto());
|
||||
let data = await mockApi.list({ limit: 10, offset: 0 });
|
||||
expect(data.ok).toBe(true);
|
||||
expect((data as any).data.data).toHaveLength(1);
|
||||
expect((data as any).data.totalItems).toBe(1);
|
||||
await mockApi.update({ index: 1, auto: createMockAuto() });
|
||||
await mockApi.update(createMockAuto());
|
||||
data = await mockApi.list({ limit: 10, offset: 0 });
|
||||
expect((data as any).data.data).toHaveLength(2);
|
||||
expect((data as any).data.totalItems).toBe(2);
|
||||
@@ -50,13 +50,13 @@ test("delete/update data from mock api", async () => {
|
||||
);
|
||||
let data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data.data;
|
||||
const toBeEdited = data[0];
|
||||
toBeEdited.metadata.alias = "Bob is my uncle";
|
||||
await mockApi.update({ index: 0, auto: toBeEdited });
|
||||
toBeEdited.alias = "Bob is my uncle";
|
||||
await mockApi.update(toBeEdited);
|
||||
data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data.data;
|
||||
expect(data[0].metadata.alias).toEqual("Bob is my uncle");
|
||||
await mockApi.remove({ index: 0 });
|
||||
expect(data[0].alias).toEqual("Bob is my uncle");
|
||||
await mockApi.remove(data[0]);
|
||||
data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data.data;
|
||||
expect(data[0].metadata.alias === "Bob is my uncle").toEqual(false);
|
||||
expect(data[0].alias === "Bob is my uncle").toEqual(false);
|
||||
});
|
||||
|
||||
test("update tags from mock api", async () => {
|
||||
@@ -74,7 +74,7 @@ test("update tags from mock api", async () => {
|
||||
);
|
||||
let data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data
|
||||
.data as AutomationData[];
|
||||
const autoId = data[0].metadata.id;
|
||||
const autoId = data[0].id;
|
||||
expect(data[0].tags).toStrictEqual({});
|
||||
mockApi.updateTags({
|
||||
automation_id: autoId,
|
||||
@@ -85,7 +85,7 @@ test("update tags from mock api", async () => {
|
||||
});
|
||||
data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data
|
||||
.data as AutomationData[];
|
||||
expect(data[0].metadata.id).toEqual(autoId);
|
||||
expect(data[0].id).toEqual(autoId);
|
||||
expect(data[0].tags).toStrictEqual({
|
||||
room: "bathroom",
|
||||
type: "popup",
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { useRef } from "react";
|
||||
import { AutomationData } from "types/automations";
|
||||
import { AutomationData, BareAutomationData } from "types/automations";
|
||||
import { API } from "./base";
|
||||
import {
|
||||
AUTOMTAION_LIST,
|
||||
@@ -35,10 +35,16 @@ export const useMockAPI = (
|
||||
} as any;
|
||||
}
|
||||
if (path === AUTOMTAION_ITEM) {
|
||||
if (method === "POST") {
|
||||
const { index, data: auto } = data as any;
|
||||
if (index >= automationsRef.current.length) {
|
||||
automationsRef.current = [...automationsRef.current, auto];
|
||||
if (method === "PUT") {
|
||||
const auto = data as AutomationData;
|
||||
const index = automationsRef.current.findIndex(
|
||||
({ id }) => auto.id === id
|
||||
);
|
||||
if (index < 0) {
|
||||
return {
|
||||
ok: false,
|
||||
error: "Not Found",
|
||||
};
|
||||
} else {
|
||||
automationsRef.current = [
|
||||
...automationsRef.current.slice(0, index),
|
||||
@@ -51,10 +57,24 @@ export const useMockAPI = (
|
||||
data: {},
|
||||
};
|
||||
} else if (method === "DELETE") {
|
||||
const { index } = data as any;
|
||||
const auto = data as AutomationData;
|
||||
automationsRef.current = automationsRef.current.filter(
|
||||
({ id }) => id !== auto.id
|
||||
);
|
||||
return {
|
||||
ok: true,
|
||||
data: {},
|
||||
};
|
||||
} else if (method === "POST") {
|
||||
const auto = data as BareAutomationData;
|
||||
automationsRef.current = [
|
||||
...automationsRef.current.slice(0, index),
|
||||
...automationsRef.current.slice(index + 1),
|
||||
...automationsRef.current,
|
||||
{
|
||||
...auto,
|
||||
source_file: "automation.yaml",
|
||||
source_file_type: "list",
|
||||
configuration_key: "automation",
|
||||
},
|
||||
];
|
||||
return {
|
||||
ok: true,
|
||||
@@ -67,7 +87,7 @@ export const useMockAPI = (
|
||||
const { automation_id, tags } = data as any;
|
||||
for (let i = 0; i < automationsRef.current.length; i++) {
|
||||
const auto = automationsRef.current[i];
|
||||
if (auto.metadata.id === automation_id) {
|
||||
if (auto.id === automation_id) {
|
||||
automationsRef.current[i].tags = JSON.parse(JSON.stringify(tags));
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -1,26 +1,29 @@
|
||||
import { AutomationData } from "types/automations";
|
||||
|
||||
|
||||
export interface ListParams {
|
||||
offset: number;
|
||||
limit: number;
|
||||
}
|
||||
export type APIRequest<D> = {
|
||||
path: string;
|
||||
method?: "POST" | "DELETE" | "GET",
|
||||
method?: "POST" | "DELETE" | "GET" | "PUT";
|
||||
data?: D;
|
||||
};
|
||||
|
||||
export type APIResponse<D> = {
|
||||
ok: true;
|
||||
data: D;
|
||||
} | {
|
||||
ok: false;
|
||||
error: string;
|
||||
}
|
||||
export type Errorable<D> = ({ ready: true } & APIResponse<D>) | {
|
||||
ready: false;
|
||||
}
|
||||
export type APIResponse<D> =
|
||||
| {
|
||||
ok: true;
|
||||
data: D;
|
||||
}
|
||||
| {
|
||||
ok: false;
|
||||
error: string;
|
||||
};
|
||||
export type Errorable<D> =
|
||||
| ({ ready: true } & APIResponse<D>)
|
||||
| {
|
||||
ready: false;
|
||||
};
|
||||
export interface ListData<D> {
|
||||
params: ListParams;
|
||||
totalItems: number;
|
||||
|
||||
@@ -27,10 +27,10 @@ export const makeReloadAutomations = (
|
||||
});
|
||||
};
|
||||
const wrapCall = <Call extends (a: any) => Promise<any>>(fcn: Call) => {
|
||||
return async (args: Parameters<Call>[0]): Promise<ReturnType<Call>> => {
|
||||
return async (args: Parameters<Call>[0]) => {
|
||||
const resp = await fcn(args);
|
||||
await reload();
|
||||
return resp;
|
||||
return resp as ReturnType<Call>;
|
||||
};
|
||||
};
|
||||
return {
|
||||
|
||||
@@ -44,6 +44,9 @@ export const NoTags = make({
|
||||
wowo: "!",
|
||||
},
|
||||
mode: "single",
|
||||
source_file: "automation.yaml",
|
||||
source_file_type: "list",
|
||||
configuration_key: "automation",
|
||||
},
|
||||
});
|
||||
|
||||
@@ -60,5 +63,8 @@ export const SomeTags = make({
|
||||
wowo: "!",
|
||||
},
|
||||
mode: "single",
|
||||
source_file: "automation.yaml",
|
||||
source_file_type: "list",
|
||||
configuration_key: "automation",
|
||||
},
|
||||
});
|
||||
@@ -1,5 +1,8 @@
|
||||
import "./AutoInfoBox.css";
|
||||
import { AutomationMetadata } from "types/automations";
|
||||
import {
|
||||
AutomationMetadata,
|
||||
AutomationShortumationMetadata,
|
||||
} from "types/automations";
|
||||
import { InputList } from "components/Inputs/InputList";
|
||||
import InputText from "components/Inputs/Base/InputText";
|
||||
import { FC, ReactNode, useRef, useState } from "react";
|
||||
@@ -9,7 +12,7 @@ import { TagDB } from "components/AutomationManager/TagDB";
|
||||
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
||||
|
||||
export interface AutoInfoBoxProps {
|
||||
metadata: AutomationMetadata;
|
||||
metadata: AutomationMetadata & Partial<AutomationShortumationMetadata>;
|
||||
tags: Array<[string, string]>;
|
||||
onUpdate: (m: AutomationMetadata, tags: Array<[string, string]>) => void;
|
||||
tagDB: TagDB;
|
||||
|
||||
@@ -21,7 +21,7 @@ const Template: ComponentStory<typeof AutomationEditor> = (args) => {
|
||||
<AutomationEditor
|
||||
{...args}
|
||||
tagDB={useTagDB(
|
||||
state ? [{ id: state.metadata.id, tags: state.tags }] : [],
|
||||
state ? [{ id: state.id, tags: state.tags }] : [],
|
||||
() => {}
|
||||
)}
|
||||
automation={state}
|
||||
@@ -46,16 +46,16 @@ Simple.args = {
|
||||
Type: "Smell",
|
||||
Use: "Flushing",
|
||||
},
|
||||
metadata: {
|
||||
id:
|
||||
"random" + String(Date.now()) + String(Date.now()) + String(Date.now()),
|
||||
alias: "Random",
|
||||
description: "Example Metadata",
|
||||
trigger_variables: {
|
||||
wowo: "!",
|
||||
},
|
||||
mode: "single",
|
||||
id: "random" + String(Date.now()) + String(Date.now()) + String(Date.now()),
|
||||
alias: "Random",
|
||||
description: "Example Metadata",
|
||||
trigger_variables: {
|
||||
wowo: "!",
|
||||
},
|
||||
mode: "single",
|
||||
source_file: "automation.yaml",
|
||||
source_file_type: "list",
|
||||
configuration_key: "automation",
|
||||
trigger: [
|
||||
{
|
||||
platform: "numeric_state",
|
||||
@@ -66,7 +66,7 @@ Simple.args = {
|
||||
event: "start",
|
||||
},
|
||||
],
|
||||
sequence: [
|
||||
action: [
|
||||
{
|
||||
condition: "and",
|
||||
conditions: [
|
||||
@@ -102,17 +102,18 @@ EmptyStart.args = {
|
||||
automation: {
|
||||
condition: [],
|
||||
tags: {},
|
||||
metadata: {
|
||||
id: "random",
|
||||
alias: "Random",
|
||||
description: "Example Metadata",
|
||||
trigger_variables: {
|
||||
wowo: "!",
|
||||
},
|
||||
mode: "single",
|
||||
id: "random",
|
||||
alias: "Random",
|
||||
description: "Example Metadata",
|
||||
source_file: "automation.yaml",
|
||||
source_file_type: "list",
|
||||
configuration_key: "automation",
|
||||
trigger_variables: {
|
||||
wowo: "!",
|
||||
},
|
||||
mode: "single",
|
||||
trigger: [],
|
||||
sequence: [],
|
||||
action: [],
|
||||
},
|
||||
};
|
||||
|
||||
@@ -122,10 +123,9 @@ BadAutomationInvalidMetadata.args = {
|
||||
automation: {
|
||||
condition: [],
|
||||
tags: {},
|
||||
metadata: {} as any,
|
||||
trigger: [],
|
||||
sequence: [],
|
||||
},
|
||||
action: [],
|
||||
} as any,
|
||||
};
|
||||
|
||||
export const BadAutomationInvalidTriggers = Template.bind({});
|
||||
@@ -134,17 +134,18 @@ BadAutomationInvalidTriggers.args = {
|
||||
automation: {
|
||||
condition: [],
|
||||
tags: {},
|
||||
metadata: {
|
||||
id: "random",
|
||||
alias: "Random",
|
||||
description: "Example Metadata",
|
||||
trigger_variables: {
|
||||
wowo: "!",
|
||||
},
|
||||
mode: "single",
|
||||
id: "random",
|
||||
alias: "Random",
|
||||
description: "Example Metadata",
|
||||
source_file: "automation.yaml",
|
||||
source_file_type: "list",
|
||||
configuration_key: "automation",
|
||||
trigger_variables: {
|
||||
wowo: "!",
|
||||
},
|
||||
mode: "single",
|
||||
trigger: ["haha I am a string"] as any,
|
||||
sequence: [],
|
||||
action: [],
|
||||
},
|
||||
};
|
||||
|
||||
@@ -154,34 +155,32 @@ BadAutomationInvalidSequence.args = {
|
||||
automation: {
|
||||
condition: [],
|
||||
tags: {},
|
||||
metadata: {
|
||||
id: "random",
|
||||
alias: "Bad Choose Sequence",
|
||||
description: "Example Metadata",
|
||||
trigger_variables: {
|
||||
wowo: "!",
|
||||
},
|
||||
mode: "single",
|
||||
alias: "Bad Choose Sequence",
|
||||
description: "Example Metadata",
|
||||
trigger_variables: {
|
||||
wowo: "!",
|
||||
},
|
||||
mode: "single",
|
||||
trigger: [],
|
||||
sequence: [
|
||||
action: [
|
||||
{
|
||||
choose: {},
|
||||
},
|
||||
] as any,
|
||||
},
|
||||
],
|
||||
} as any,
|
||||
};
|
||||
|
||||
export const RepeatExample = Template.bind({});
|
||||
RepeatExample.args = {
|
||||
...RepeatExample.args,
|
||||
automation: {
|
||||
metadata: {
|
||||
id: "1654976151462",
|
||||
alias: "Get out of baby room",
|
||||
description: "",
|
||||
mode: "single",
|
||||
},
|
||||
id: "1654976151462",
|
||||
alias: "Get out of baby room",
|
||||
description: "",
|
||||
mode: "single",
|
||||
source_file: "automation.yaml",
|
||||
source_file_type: "list",
|
||||
configuration_key: "automation",
|
||||
trigger: [
|
||||
{
|
||||
type: "opened",
|
||||
@@ -192,7 +191,7 @@ RepeatExample.args = {
|
||||
},
|
||||
],
|
||||
condition: [],
|
||||
sequence: [
|
||||
action: [
|
||||
{
|
||||
service: "notify.mobile_app_levas_phone",
|
||||
data: {
|
||||
|
||||
@@ -26,16 +26,16 @@ import { DAGAutomationGraph } from "components/DAGGraph";
|
||||
import { InputList } from "components/Inputs/InputList";
|
||||
import { InputTextView } from "components/Inputs/InputTextView";
|
||||
|
||||
import { AutomationData } from "types/automations";
|
||||
import { AutomationData, BareAutomationData } from "types/automations";
|
||||
import { MiniFailure } from "types/validators/helper";
|
||||
|
||||
import { AutoInfoBox } from "./AutoInfoBox";
|
||||
import { useAutomatioEditorState, EditorData } from "./state";
|
||||
|
||||
interface Props {
|
||||
automation?: AutomationData;
|
||||
automation?: AutomationData | BareAutomationData;
|
||||
dims: DAGDims;
|
||||
onUpdate: (auto: AutomationData) => void;
|
||||
onUpdate: (auto: AutomationData | BareAutomationData) => void;
|
||||
onTrigger: () => void;
|
||||
onDelete: () => void;
|
||||
tagDB: TagDB;
|
||||
@@ -99,7 +99,7 @@ export const AutomationEditor: FC<Props> = ({
|
||||
)}
|
||||
<Modal open={infoBoxOpen}>
|
||||
<AutoInfoBox
|
||||
metadata={state.data.metadata}
|
||||
metadata={state.data}
|
||||
tags={state.data.tags}
|
||||
onUpdate={updateMetadata}
|
||||
tagDB={tagDB}
|
||||
@@ -128,14 +128,14 @@ export const AutomationEditor: FC<Props> = ({
|
||||
<div className="automation-editor--flow-wrapper--toolbar">
|
||||
<div className="automation-editor--flow-wrapper--toolbar--title">
|
||||
<span className="automation-editor--flow-wrapper--toolbar--title--text">
|
||||
<div className="id">{state.data.metadata.id}</div>
|
||||
<div className="id">{state.data.id}</div>
|
||||
<InputTextView
|
||||
value={state.data.metadata.alias ?? ""}
|
||||
value={state.data.alias ?? ""}
|
||||
placeholder="Name"
|
||||
onChange={(alias) =>
|
||||
updateMetadata(
|
||||
{
|
||||
...state.data.metadata,
|
||||
...state.data,
|
||||
alias,
|
||||
},
|
||||
state.data.tags
|
||||
@@ -148,13 +148,13 @@ export const AutomationEditor: FC<Props> = ({
|
||||
label="Mode"
|
||||
className="automation-editor--flow-wrapper--toolbar--modes"
|
||||
current={{
|
||||
id: state.data.metadata.mode,
|
||||
id: state.data.mode,
|
||||
label: "",
|
||||
}}
|
||||
onChange={({ id }) =>
|
||||
updateMetadata(
|
||||
{
|
||||
...state.data.metadata,
|
||||
...state.data,
|
||||
mode: id,
|
||||
},
|
||||
state.data.tags
|
||||
@@ -185,12 +185,12 @@ export const AutomationEditor: FC<Props> = ({
|
||||
/>
|
||||
<InputTextView
|
||||
className="description"
|
||||
value={state.data.metadata.description ?? ""}
|
||||
value={state.data.description ?? ""}
|
||||
placeholder="Description"
|
||||
onChange={(description) =>
|
||||
updateMetadata(
|
||||
{
|
||||
...state.data.metadata,
|
||||
...state.data,
|
||||
description,
|
||||
},
|
||||
state.data.tags
|
||||
@@ -215,46 +215,51 @@ export const AutomationEditor: FC<Props> = ({
|
||||
<Button
|
||||
className={"automation-editor--flow-wrapper--toolbar--save-btn"}
|
||||
onClick={save}
|
||||
disabled={state.status !== "changed" && !isNew}
|
||||
disabled={state.status !== "changed"}
|
||||
>
|
||||
Save <CheckMarkIcon color="#bf4" />
|
||||
</Button>
|
||||
</div>
|
||||
<DAGAutomationGraph
|
||||
sequence={state.data.sequence}
|
||||
action={state.data.action}
|
||||
trigger={state.data.trigger}
|
||||
condition={state.data.condition}
|
||||
onSequenceUpdate={updateSequence}
|
||||
onActionUpdate={updateSequence}
|
||||
onTriggerUpdate={updateTrigger}
|
||||
onConditionUpdate={updateCondition}
|
||||
isFlipped={flipped}
|
||||
/>
|
||||
<SpeedDial
|
||||
ariaLabel="options label"
|
||||
sx={{ position: "absolute", bottom: 16, right: 16 }}
|
||||
sx={{
|
||||
position: "absolute",
|
||||
bottom: 16,
|
||||
right: 16,
|
||||
}}
|
||||
icon={<SpeedDialIcon />}
|
||||
>
|
||||
<SpeedDialAction
|
||||
tooltipOpen
|
||||
// tooltipOpen
|
||||
sx={{ pointerEvents: "auto" }}
|
||||
icon={<RunIcon />}
|
||||
tooltipTitle={"Trigger"}
|
||||
onClick={onTrigger}
|
||||
/>
|
||||
<SpeedDialAction
|
||||
tooltipOpen
|
||||
// tooltipOpen
|
||||
icon={<DeleteIcon />}
|
||||
tooltipTitle={"Delete"}
|
||||
onClick={onDelete}
|
||||
/>
|
||||
<SpeedDialAction
|
||||
tooltipOpen
|
||||
// tooltipOpen
|
||||
icon={<EditIcon />}
|
||||
tooltipTitle={"Metadata"}
|
||||
onClick={() => setInfoBox(!infoBoxOpen)}
|
||||
/>
|
||||
{state.status === "changed" && (
|
||||
<SpeedDialAction
|
||||
tooltipOpen
|
||||
// tooltipOpen
|
||||
icon={<UndoIcon />}
|
||||
tooltipTitle={"Undo"}
|
||||
onClick={undo}
|
||||
@@ -277,26 +282,24 @@ export const ValidationBox: FC<{
|
||||
data: props.data,
|
||||
});
|
||||
|
||||
const makeSave =
|
||||
<K extends keyof EditorData>(k: K) =>
|
||||
(d: EditorData[K]) => {
|
||||
const newData = {
|
||||
...data,
|
||||
[k]: d,
|
||||
};
|
||||
const newFails = props.validate(newData);
|
||||
if (newFails) {
|
||||
setState({
|
||||
failures: newFails,
|
||||
data: newData,
|
||||
});
|
||||
} else {
|
||||
setState({
|
||||
failures: [],
|
||||
data: newData,
|
||||
});
|
||||
}
|
||||
const onSave = (d: EditorData) => {
|
||||
const newData = {
|
||||
...data,
|
||||
...d,
|
||||
};
|
||||
const newFails = props.validate(newData);
|
||||
if (newFails) {
|
||||
setState({
|
||||
failures: newFails,
|
||||
data: newData,
|
||||
});
|
||||
} else {
|
||||
setState({
|
||||
failures: [],
|
||||
data: newData,
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="automation-editor-failures">
|
||||
@@ -317,27 +320,7 @@ export const ValidationBox: FC<{
|
||||
<span>
|
||||
Please correct the automation file manually and then continue!
|
||||
</span>
|
||||
<InputYaml
|
||||
label="Metadata"
|
||||
value={data.metadata}
|
||||
onChange={makeSave("metadata")}
|
||||
/>
|
||||
<InputYaml label="Tags" value={data.tags} onChange={makeSave("tags")} />
|
||||
<InputYaml
|
||||
label="Trigger"
|
||||
value={data.trigger}
|
||||
onChange={makeSave("trigger")}
|
||||
/>
|
||||
<InputYaml
|
||||
label="Condition"
|
||||
value={data.condition}
|
||||
onChange={makeSave("condition")}
|
||||
/>
|
||||
<InputYaml
|
||||
label="Actions"
|
||||
value={data.sequence}
|
||||
onChange={makeSave("sequence")}
|
||||
/>
|
||||
<InputYaml label="Raw" value={data} onChange={onSave} />
|
||||
<Button disabled={failures.length > 0} onClick={() => props.onSave(data)}>
|
||||
Save
|
||||
</Button>
|
||||
|
||||
@@ -1,8 +1,11 @@
|
||||
import { useState, useEffect } from "react";
|
||||
import { AutomationData, AutomationMetadata } from "types/automations";
|
||||
import {
|
||||
AutomationData,
|
||||
AutomationMetadata,
|
||||
BareAutomationData,
|
||||
} from "types/automations";
|
||||
import * as v from "types/validators/autmation";
|
||||
import { getFailures } from "types/validators/helper";
|
||||
import { MiniFailure } from "../../types/validators/helper";
|
||||
import { getFailures, MiniFailure } from "types/validators/helper";
|
||||
|
||||
export type EditorData = ReturnType<typeof genEditorData>;
|
||||
export type EditorState =
|
||||
@@ -26,12 +29,18 @@ export type EditorState =
|
||||
export type EditorStatus = EditorState["status"];
|
||||
|
||||
export const useAutomatioEditorState = (
|
||||
automation: AutomationData | undefined,
|
||||
onSave: (a: AutomationData) => void
|
||||
automation: AutomationData | BareAutomationData | undefined,
|
||||
onSave: (a: AutomationData | BareAutomationData) => void
|
||||
) => {
|
||||
// state
|
||||
const [state, update] = useState<EditorState>({
|
||||
status: "loading",
|
||||
});
|
||||
|
||||
// helpers
|
||||
const validate = (data: any) => {
|
||||
return getFailures(data, v.AutomationData);
|
||||
};
|
||||
const makeUpdate =
|
||||
<K extends keyof EditorData, D extends EditorData[K]>(name: K) =>
|
||||
(data: D) =>
|
||||
@@ -69,28 +78,11 @@ export const useAutomatioEditorState = (
|
||||
}
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
if (automation) {
|
||||
const failures = getFailures(automation, v.AutomationData);
|
||||
if (failures) {
|
||||
update({
|
||||
status: "invalid",
|
||||
failures,
|
||||
data: genEditorData(automation),
|
||||
});
|
||||
} else {
|
||||
update({
|
||||
status: "unchanged",
|
||||
data: genEditorData(automation),
|
||||
});
|
||||
}
|
||||
}
|
||||
}, [automation]);
|
||||
|
||||
return {
|
||||
validate: (data: any) => getFailures(data, v.AutomationData),
|
||||
// pub methods
|
||||
const methods = {
|
||||
validate,
|
||||
updateTrigger: makeUpdate("trigger"),
|
||||
updateSequence: makeUpdate("sequence"),
|
||||
updateSequence: makeUpdate("action"),
|
||||
updateCondition: makeUpdate("condition"),
|
||||
saveAndUpdate,
|
||||
updateMetadata: (
|
||||
@@ -107,7 +99,7 @@ export const useAutomatioEditorState = (
|
||||
data: {
|
||||
...state.data,
|
||||
tags,
|
||||
metadata,
|
||||
...metadata,
|
||||
},
|
||||
});
|
||||
}
|
||||
@@ -137,19 +129,41 @@ export const useAutomatioEditorState = (
|
||||
return state;
|
||||
},
|
||||
};
|
||||
|
||||
// effects
|
||||
useEffect(() => {
|
||||
if (automation) {
|
||||
const failures = validate(automation);
|
||||
if (failures) {
|
||||
update({
|
||||
status: "invalid",
|
||||
failures,
|
||||
data: genEditorData(automation),
|
||||
});
|
||||
} else {
|
||||
update({
|
||||
status: "unchanged",
|
||||
data: genEditorData(automation),
|
||||
});
|
||||
}
|
||||
}
|
||||
}, [automation]);
|
||||
|
||||
return methods;
|
||||
};
|
||||
|
||||
const genEditorData = (automation: AutomationData) => {
|
||||
const { metadata, trigger, sequence, condition } = automation;
|
||||
const genEditorData = (automation: AutomationData | BareAutomationData) => {
|
||||
const { tags: rawTags, trigger, action, condition, ...metadata } = automation;
|
||||
|
||||
const tags: [string, string][] = Object.keys(automation.tags).map(
|
||||
(tagName) => [tagName, automation.tags[tagName]]
|
||||
);
|
||||
const tags: [string, string][] = Object.keys(rawTags).map((tagName) => [
|
||||
tagName,
|
||||
rawTags[tagName],
|
||||
]);
|
||||
|
||||
return {
|
||||
metadata,
|
||||
...metadata,
|
||||
trigger,
|
||||
sequence,
|
||||
action,
|
||||
condition,
|
||||
tags,
|
||||
};
|
||||
|
||||
@@ -26,6 +26,9 @@ const { make, componentMeta } = makeStory({
|
||||
description: "Amazing automation!",
|
||||
tags: {},
|
||||
state: "on",
|
||||
source_file: "automation.yaml",
|
||||
source_file_type: "list",
|
||||
configuration_key: "automation",
|
||||
flags: {
|
||||
isSelected: false,
|
||||
isModified: false,
|
||||
@@ -37,6 +40,9 @@ const { make, componentMeta } = makeStory({
|
||||
entityId: "automation.2",
|
||||
description: "Cool!",
|
||||
state: "on",
|
||||
source_file: "automation.yaml",
|
||||
source_file_type: "list",
|
||||
configuration_key: "automation",
|
||||
flags: {
|
||||
isSelected: false,
|
||||
isModified: false,
|
||||
@@ -84,6 +90,9 @@ export const Nested = make({
|
||||
description: "",
|
||||
title: "Automation #1",
|
||||
state: "on",
|
||||
source_file: "automation.yaml",
|
||||
source_file_type: "list",
|
||||
configuration_key: "automation",
|
||||
flags: {
|
||||
isSelected: true,
|
||||
isModified: false,
|
||||
@@ -96,6 +105,9 @@ export const Nested = make({
|
||||
description: "another one",
|
||||
title: "Automation #2",
|
||||
state: "off",
|
||||
source_file: "automation.yaml",
|
||||
source_file_type: "list",
|
||||
configuration_key: "automation",
|
||||
flags: {
|
||||
isSelected: false,
|
||||
isModified: false,
|
||||
@@ -108,6 +120,9 @@ export const Nested = make({
|
||||
description: "bad one",
|
||||
title: "Automation #3",
|
||||
state: "offing",
|
||||
source_file: "automation.yaml",
|
||||
source_file_type: "list",
|
||||
configuration_key: "automation",
|
||||
flags: {
|
||||
isSelected: false,
|
||||
isModified: false,
|
||||
@@ -146,6 +161,9 @@ export const Nested = make({
|
||||
isSelected: false,
|
||||
isModified: false,
|
||||
},
|
||||
source_file: "automation.yaml",
|
||||
source_file_type: "list",
|
||||
configuration_key: "automation",
|
||||
state: "on",
|
||||
tags: {
|
||||
type: "good",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { HassEntities } from "home-assistant-js-websocket";
|
||||
import { useEffect, useState } from "react";
|
||||
import { AutomationData } from "types/automations";
|
||||
import { AutomationData, BareAutomationData } from "types/automations";
|
||||
import { defaultAutomation } from "utils/defaults";
|
||||
import { TagDB } from "../TagDB";
|
||||
import { AutomationManagerAuto } from "../types";
|
||||
@@ -12,7 +12,9 @@ export const useAutomationDB = (
|
||||
) => {
|
||||
const autoMap = genMapping(haEntities, configAutomations, tagsDB);
|
||||
const [newAuto, setNewAuto] =
|
||||
useState<null | [AutomationManagerAuto, AutomationData]>(null);
|
||||
useState<
|
||||
null | [AutomationManagerAuto, AutomationData | BareAutomationData]
|
||||
>(null);
|
||||
|
||||
useEffect(() => {
|
||||
if (newAuto && autoMap[newAuto[0].id]) {
|
||||
@@ -30,7 +32,9 @@ export const useAutomationDB = (
|
||||
},
|
||||
getAutomationData(
|
||||
autoId: string
|
||||
): null | [AutomationManagerAuto, AutomationData | null] {
|
||||
):
|
||||
| null
|
||||
| [AutomationManagerAuto, AutomationData | BareAutomationData | null] {
|
||||
if (newAuto && newAuto[0].id === autoId) {
|
||||
return newAuto;
|
||||
}
|
||||
@@ -46,14 +50,17 @@ export const useAutomationDB = (
|
||||
const auto = defaultAutomation(String(Date.now()));
|
||||
setNewAuto([
|
||||
{
|
||||
id: auto.metadata.id,
|
||||
id: auto.id,
|
||||
entityId: "",
|
||||
title: auto.metadata.alias ?? "",
|
||||
description: auto.metadata.description ?? "",
|
||||
title: auto.alias ?? "",
|
||||
description: auto.description ?? "",
|
||||
state: "unregistered",
|
||||
tags: {},
|
||||
issue: "New Automation",
|
||||
isNew: true,
|
||||
source_file: "n/a",
|
||||
source_file_type: "n/a",
|
||||
configuration_key: "n/a",
|
||||
},
|
||||
auto,
|
||||
]);
|
||||
@@ -70,7 +77,7 @@ const genMapping = (
|
||||
const configData: Record<string, AutomationData> = configAutomations.reduce(
|
||||
(all, n) => ({
|
||||
...all,
|
||||
[n.metadata.id]: n,
|
||||
[n.id]: n,
|
||||
}),
|
||||
{}
|
||||
);
|
||||
@@ -88,11 +95,16 @@ const genMapping = (
|
||||
? undefined
|
||||
: `recived invalid state "${entityData.state}, this could be because you have a lingering automation that was not cleared by homeassistant, try to reboot HA or manually clear this automation from HA Database."`;
|
||||
let found: AutomationData | null = null;
|
||||
|
||||
let source_file = "n/a";
|
||||
let source_file_type = "n/a";
|
||||
let configuration_key = "n/a";
|
||||
if (configData[autoId]) {
|
||||
found = configData[entityData.attributes.id];
|
||||
title = found.metadata.alias ?? title;
|
||||
description = found.metadata.description ?? description;
|
||||
title = found.alias ?? title;
|
||||
description = found.description ?? description;
|
||||
source_file = found.source_file ?? source_file;
|
||||
source_file_type = found.source_file_type ?? source_file_type;
|
||||
configuration_key = found.configuration_key ?? configuration_key;
|
||||
delete configData[autoId];
|
||||
} else {
|
||||
issue = "failed to find this automation in '/config' folder";
|
||||
@@ -106,6 +118,9 @@ const genMapping = (
|
||||
description,
|
||||
state: entityData.state,
|
||||
tags: tagsDB.getTags(autoId),
|
||||
source_file,
|
||||
source_file_type,
|
||||
configuration_key,
|
||||
issue,
|
||||
},
|
||||
found,
|
||||
@@ -113,14 +128,17 @@ const genMapping = (
|
||||
});
|
||||
|
||||
Object.values(configData).forEach((auto) => {
|
||||
automatioinMap[auto.metadata.id] = [
|
||||
automatioinMap[auto.id] = [
|
||||
{
|
||||
id: auto.metadata.id,
|
||||
id: auto.id,
|
||||
entityId: "",
|
||||
title: auto.metadata.alias ?? "",
|
||||
description: auto.metadata.description ?? "",
|
||||
title: auto.alias ?? "",
|
||||
description: auto.description ?? "",
|
||||
state: "unregistered",
|
||||
tags: tagsDB.getTags(auto.metadata.id),
|
||||
tags: tagsDB.getTags(auto.id),
|
||||
source_file: auto.source_file,
|
||||
source_file_type: auto.source_file_type,
|
||||
configuration_key: auto.configuration_key,
|
||||
issue:
|
||||
"homeassistant did not load this automation, try to manually reload automations or restart homeassistant.",
|
||||
},
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { HassEntities } from "home-assistant-js-websocket";
|
||||
import { useState } from "react";
|
||||
import { useCookies } from "react-cookie";
|
||||
import { AutomationData } from "types/automations";
|
||||
import { AutomationData, BareAutomationData } from "types/automations";
|
||||
import { useTagDB } from "../TagDB";
|
||||
import { useAutomationDB } from "./automationDB";
|
||||
import { useConfirm } from "material-ui-confirm";
|
||||
@@ -12,8 +12,8 @@ export type UseAutomationManagerStateArgs = {
|
||||
configAutomations: AutomationData[];
|
||||
hassEntities: HassEntities;
|
||||
onUpdateTags: (aid: string, tags: Record<string, string>) => void;
|
||||
onAutomationAdd: (auto: AutomationData) => void;
|
||||
onAutomationUpdate: (aid: string, auto: AutomationData) => void;
|
||||
onAutomationAdd: (auto: BareAutomationData) => void;
|
||||
onAutomationUpdate: (auto: AutomationData) => void;
|
||||
onAutomationStateChange: (eid: string, on: boolean) => void;
|
||||
onAutomationRun: (eid: string) => void;
|
||||
};
|
||||
@@ -30,10 +30,12 @@ export const useAutomationManagerState = ({
|
||||
const snackbr = useSnackbar();
|
||||
const cookies = useAMSCookies();
|
||||
const tagsDB = useTagDB(
|
||||
configAutomations.map(({ metadata: { id }, tags }) => ({
|
||||
id,
|
||||
tags,
|
||||
})),
|
||||
configAutomations
|
||||
.filter((a) => typeof a === "object")
|
||||
.map(({ id, tags = {} }) => ({
|
||||
id,
|
||||
tags,
|
||||
})),
|
||||
onUpdateTags
|
||||
);
|
||||
const automationDB = useAutomationDB(hassEntities, configAutomations, tagsDB);
|
||||
@@ -66,7 +68,7 @@ export const useAutomationManagerState = ({
|
||||
get tagsDB() {
|
||||
return tagsDB;
|
||||
},
|
||||
get currentAutomation(): AutomationData | null {
|
||||
get currentAutomation(): AutomationData | BareAutomationData | null {
|
||||
return currentAutomation === null ? null : currentAutomation[1];
|
||||
},
|
||||
get currentAutomationIsNew() {
|
||||
@@ -91,13 +93,13 @@ export const useAutomationManagerState = ({
|
||||
}
|
||||
}
|
||||
const auto = automationDB.addNew();
|
||||
methods.setSelectedAutomationId(auto.metadata.id, true);
|
||||
methods.setSelectedAutomationId(auto.id, true);
|
||||
},
|
||||
editorUpdateAutomation(auto: AutomationData) {
|
||||
editorUpdateAutomation(auto: AutomationData | BareAutomationData) {
|
||||
if (methods.currentAutomationIsNew) {
|
||||
onAutomationAdd(auto);
|
||||
} else if (methods.currentAutomationId) {
|
||||
onAutomationUpdate(methods.currentAutomationId, auto);
|
||||
onAutomationUpdate(auto as AutomationData);
|
||||
}
|
||||
},
|
||||
sideBarUpdateAutomation(
|
||||
@@ -106,19 +108,22 @@ export const useAutomationManagerState = ({
|
||||
eid: string
|
||||
) {
|
||||
const previousAuto = automationDB.getAutomationData(aid);
|
||||
if (previousAuto && previousAuto[1]) {
|
||||
if (
|
||||
previousAuto &&
|
||||
previousAuto[1] &&
|
||||
"configuration_key" in previousAuto[1] &&
|
||||
"source_file" in previousAuto[1] &&
|
||||
"source_file_type" in previousAuto[1]
|
||||
) {
|
||||
const previousAutoState = previousAuto[1];
|
||||
if (
|
||||
previousAutoState.metadata.alias !== a.title ||
|
||||
previousAutoState.metadata.description !== a.description
|
||||
previousAutoState.alias !== a.title ||
|
||||
previousAutoState.description !== a.description
|
||||
) {
|
||||
onAutomationUpdate(aid, {
|
||||
onAutomationUpdate({
|
||||
...previousAutoState,
|
||||
metadata: {
|
||||
...previousAutoState.metadata,
|
||||
alias: a.title,
|
||||
description: a.description,
|
||||
},
|
||||
alias: a.title,
|
||||
description: a.description,
|
||||
});
|
||||
}
|
||||
} else {
|
||||
|
||||
@@ -84,4 +84,14 @@
|
||||
font-size: 0.75em;
|
||||
user-select: none;
|
||||
max-width: 5em;
|
||||
}
|
||||
|
||||
.automation-manager--metadatabox .metadatabox--title--source {
|
||||
margin-bottom: -0.5em;
|
||||
}
|
||||
|
||||
|
||||
.automation-manager--metadatabox .metadatabox--title--source .MuiChip-root {
|
||||
font-size: 0.85em;
|
||||
height: 2em;
|
||||
}
|
||||
@@ -39,6 +39,10 @@ const { make, componentMeta } = makeStory({
|
||||
export default componentMeta;
|
||||
|
||||
export const Basic = make({});
|
||||
export const LongDescription = make({
|
||||
description:
|
||||
"Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.",
|
||||
});
|
||||
export const IsSelected = make({ isSelected: true });
|
||||
export const InvalidState = make({ state: "unavailable" });
|
||||
export const WithIssue = make({ issue: "look at me" });
|
||||
|
||||
@@ -14,6 +14,7 @@ import { ButtonIcon } from "components/Icons/ButtonIcons";
|
||||
import { AutomationManagerAuto } from "../types";
|
||||
import { Tags } from "./Tags";
|
||||
import { TagDB } from "../TagDB";
|
||||
import { Chip } from "@mui/material";
|
||||
|
||||
export type MetadataBoxProps = AutomationManagerAuto & {
|
||||
onDelete: () => void;
|
||||
@@ -53,6 +54,9 @@ export const MetadataBox: FC<MetadataBoxProps> = (props) => {
|
||||
className="metadatabox--title"
|
||||
title={`ID=${props.id}, EntityID=${props.entityId}`}
|
||||
>
|
||||
<span className="metadatabox--title--source">
|
||||
<Chip label={`@${props.source_file} (${props.source_file_type})`} />
|
||||
</span>
|
||||
<InputTextView
|
||||
className="title"
|
||||
placeholder="Title"
|
||||
@@ -81,12 +85,19 @@ export const MetadataBox: FC<MetadataBoxProps> = (props) => {
|
||||
className="select"
|
||||
icon={<SelectIcon />}
|
||||
onClick={props.onSelect}
|
||||
title="Select automation"
|
||||
/>
|
||||
<ButtonIcon
|
||||
className="run"
|
||||
icon={<RunIcon />}
|
||||
onClick={props.onRun}
|
||||
title="Trigger automation"
|
||||
/>
|
||||
<ButtonIcon className="run" icon={<RunIcon />} onClick={props.onRun} />
|
||||
<ButtonIcon
|
||||
className="delete"
|
||||
icon={<DeleteForeverIcon />}
|
||||
onClick={props.onDelete}
|
||||
title="Delete automation"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -68,6 +68,9 @@ const story = makeStory({
|
||||
tags: {},
|
||||
entityId: "automation." + id,
|
||||
state: "on",
|
||||
source_file: "automation.yaml",
|
||||
source_file_type: "list",
|
||||
configuration_key: "automation",
|
||||
},
|
||||
]);
|
||||
setSelAutoId(id);
|
||||
@@ -94,6 +97,9 @@ const makeAuto = (
|
||||
description: "",
|
||||
state: "on",
|
||||
tags: {},
|
||||
source_file: "automation.yaml",
|
||||
source_file_type: "list",
|
||||
configuration_key: "automation",
|
||||
...data,
|
||||
};
|
||||
};
|
||||
|
||||
@@ -4,42 +4,58 @@ import { AutomationManagerAuto } from "./types";
|
||||
|
||||
const automations: AutomationManagerAuto[] = [
|
||||
createMockAuto({
|
||||
Room: "Living Room",
|
||||
Type: "Lights",
|
||||
tags: {
|
||||
Room: "Living Room",
|
||||
Type: "Lights",
|
||||
},
|
||||
}),
|
||||
createMockAuto({
|
||||
Room: "Living Room",
|
||||
Type: "Climate",
|
||||
tags: {
|
||||
Room: "Living Room",
|
||||
Type: "Climate",
|
||||
},
|
||||
}),
|
||||
createMockAuto({
|
||||
Room: "Kitchen",
|
||||
Type: "Climate",
|
||||
tags: {
|
||||
Room: "Kitchen",
|
||||
Type: "Climate",
|
||||
},
|
||||
}),
|
||||
createMockAuto({
|
||||
Type: "Climate",
|
||||
tags: {
|
||||
Type: "Climate",
|
||||
},
|
||||
}),
|
||||
createMockAuto({
|
||||
Room: "Living Room",
|
||||
tags: {
|
||||
Room: "Living Room",
|
||||
},
|
||||
}),
|
||||
createMockAuto({}),
|
||||
].map<AutomationManagerAuto>((a) => ({
|
||||
title: a.metadata.alias ?? "",
|
||||
entityId: "automation." + a.metadata.id,
|
||||
description: a.metadata.description ?? "",
|
||||
title: a.alias ?? "",
|
||||
entityId: "automation." + a.id,
|
||||
description: a.description ?? "",
|
||||
state: "on",
|
||||
tags: a.tags,
|
||||
id: a.metadata.id,
|
||||
id: a.id,
|
||||
isSelected: false,
|
||||
source_file: "automation.yaml",
|
||||
source_file_type: "list",
|
||||
configuration_key: "automation",
|
||||
}));
|
||||
|
||||
const bigList = bigMockAutoList.map<AutomationManagerAuto>((a) => ({
|
||||
entityId: "automation." + a.metadata.id,
|
||||
title: a.metadata.alias ?? "",
|
||||
description: a.metadata.description ?? "",
|
||||
entityId: "automation." + a.id,
|
||||
title: a.alias ?? "",
|
||||
description: a.description ?? "",
|
||||
state: "on",
|
||||
tags: a.tags,
|
||||
id: a.metadata.id,
|
||||
id: a.id,
|
||||
isSelected: false,
|
||||
source_file: "automation.yaml",
|
||||
source_file_type: "list",
|
||||
configuration_key: "automation",
|
||||
}));
|
||||
|
||||
test("no grouping", () => {
|
||||
|
||||
@@ -23,4 +23,22 @@
|
||||
.automation-manager.loading .automation-manager--editor.loading {
|
||||
flex: 1;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
|
||||
.invalid-automation-modal-list {
|
||||
display: flex;
|
||||
max-height: 50vh;
|
||||
overflow: auto;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.invalid-automation-modal-list li {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.invalid-automation-modal-list--errors ul {
|
||||
max-height: 10vh;
|
||||
overflow: auto;
|
||||
}
|
||||
@@ -19,10 +19,10 @@ const { make, componentMeta } = makeStory({
|
||||
<AutomationManager
|
||||
api={useMockApiService(args.automations ?? [], !args.automations)}
|
||||
haEntities={useMockHAEntities(haEntities)}
|
||||
refreshAutomations={() => {}}
|
||||
triggerAutomation={() => {}}
|
||||
forceDeleteAutomation={() => {}}
|
||||
onAutomationStateChange={(eid, on) => {
|
||||
refreshAutomations={async () => {}}
|
||||
triggerAutomation={async () => {}}
|
||||
forceDeleteAutomation={async () => {}}
|
||||
onAutomationStateChange={async (eid, on) => {
|
||||
if (!haEntities.loading && !haEntities.error) {
|
||||
setHAE({
|
||||
...haEntities,
|
||||
@@ -79,17 +79,17 @@ export const Empty = make({
|
||||
},
|
||||
});
|
||||
const auto1 = createMockAuto({
|
||||
type: "button",
|
||||
tags: { type: "button" },
|
||||
});
|
||||
export const One = make({
|
||||
automations: [auto1],
|
||||
haProps: {
|
||||
loading: false,
|
||||
entities: {
|
||||
[`automation.${auto1.metadata.id}`]: {
|
||||
entity_id: `automation.${auto1.metadata.id}`,
|
||||
[`automation.${auto1.id}`]: {
|
||||
entity_id: `automation.${auto1.id}`,
|
||||
attributes: {
|
||||
id: auto1.metadata.id,
|
||||
id: auto1.id,
|
||||
},
|
||||
context: { id: "", parent_id: null, user_id: null },
|
||||
last_changed: "",
|
||||
@@ -105,11 +105,11 @@ export const MissingAutoInConfig = make({
|
||||
haProps: {
|
||||
loading: false,
|
||||
entities: {
|
||||
[`automation.${auto1.metadata.id}`]: {
|
||||
entity_id: `automation.${auto1.metadata.id}`,
|
||||
[`automation.${auto1.id}`]: {
|
||||
entity_id: `automation.${auto1.id}`,
|
||||
attributes: {
|
||||
id: auto1.metadata.id,
|
||||
friendly_name: auto1.metadata.alias,
|
||||
id: auto1.id,
|
||||
friendly_name: auto1.alias,
|
||||
},
|
||||
context: { id: "", parent_id: null, user_id: null },
|
||||
last_changed: "",
|
||||
@@ -120,3 +120,102 @@ export const MissingAutoInConfig = make({
|
||||
entitySource: {},
|
||||
},
|
||||
});
|
||||
|
||||
export const CrashingAutomations = make({
|
||||
haProps: {
|
||||
loading: false,
|
||||
entities: {},
|
||||
entitySource: {},
|
||||
},
|
||||
automations: [""] as any,
|
||||
});
|
||||
|
||||
export const BadAutomation = make({
|
||||
haProps: {
|
||||
loading: false,
|
||||
entities: {
|
||||
[`automation.${auto1.id}`]: {
|
||||
entity_id: `automation.${auto1.id}`,
|
||||
attributes: {
|
||||
id: "test",
|
||||
},
|
||||
context: { id: "", parent_id: null, user_id: null },
|
||||
last_changed: "",
|
||||
last_updated: "",
|
||||
state: "on",
|
||||
},
|
||||
},
|
||||
entitySource: {},
|
||||
},
|
||||
automations: [
|
||||
{
|
||||
tags: {},
|
||||
id: "test",
|
||||
mode: "single",
|
||||
alias: "Light.Tank_Day",
|
||||
description: "",
|
||||
source_file: "automation.yaml",
|
||||
source_file_type: "list",
|
||||
configuration_key: "automation",
|
||||
trigger: [
|
||||
{
|
||||
platform: "sun",
|
||||
event: "sunrise",
|
||||
offset: "30",
|
||||
} as any,
|
||||
{ whoAmI: "bad node is who" } as any,
|
||||
],
|
||||
condition: [{ whoAmI: "bad node is who" } as any],
|
||||
action: [
|
||||
{ scene: "scene.light_day" } as any,
|
||||
{ whoAmI: "bad node is who" } as any,
|
||||
{
|
||||
service: "input_select.set_options",
|
||||
target: {
|
||||
entity_id: "input_select.tank_light_mode",
|
||||
},
|
||||
data: {
|
||||
options: "day",
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
export const OneCrashingOneGoodAutomations = make({
|
||||
haProps: {
|
||||
loading: false,
|
||||
entities: {
|
||||
[`automation.${auto1.id}`]: {
|
||||
entity_id: `automation.${auto1.id}`,
|
||||
attributes: {
|
||||
id: auto1.id,
|
||||
},
|
||||
context: { id: "", parent_id: null, user_id: null },
|
||||
last_changed: "",
|
||||
last_updated: "",
|
||||
state: "on",
|
||||
},
|
||||
"1235": {
|
||||
entity_id: `automation.1235`,
|
||||
attributes: {
|
||||
id: "1235",
|
||||
},
|
||||
context: { id: "", parent_id: null, user_id: null },
|
||||
last_changed: "",
|
||||
last_updated: "",
|
||||
state: "on",
|
||||
},
|
||||
},
|
||||
entitySource: {},
|
||||
},
|
||||
automations: [
|
||||
auto1,
|
||||
{
|
||||
id: "1235",
|
||||
tags: {},
|
||||
} as any,
|
||||
"" as any,
|
||||
],
|
||||
});
|
||||
@@ -1,6 +1,6 @@
|
||||
import "./index.css";
|
||||
|
||||
import { FC, useEffect, useState } from "react";
|
||||
import { FC, useEffect, useRef, useState } from "react";
|
||||
import LinearProgress from "@mui/material/LinearProgress";
|
||||
import Skeleton from "@mui/material/Skeleton";
|
||||
|
||||
@@ -9,12 +9,18 @@ import { HAEntitiesState } from "haService/HAEntities";
|
||||
import { AutomationManagerLoaded } from "./Loaded";
|
||||
import { Alert } from "@mui/material";
|
||||
import { useSnackbar } from "notistack";
|
||||
import { ErrorBoundary } from "components/ErrorBoundary";
|
||||
import { getFailures } from "types/validators/helper";
|
||||
import * as av from "types/validators/autmation";
|
||||
import { useConfirm } from "material-ui-confirm";
|
||||
import InputYaml from "components/Inputs/Base/InputYaml";
|
||||
import { APIResponse } from "apiService/types";
|
||||
|
||||
export type AutomationManagerProps = {
|
||||
onAutomationStateChange: (eid: string, on: boolean) => void;
|
||||
refreshAutomations: () => void;
|
||||
forceDeleteAutomation: (eid: string) => void;
|
||||
triggerAutomation: (eid: string) => void;
|
||||
onAutomationStateChange: (eid: string, on: boolean) => Promise<any>;
|
||||
refreshAutomations: () => Promise<any>;
|
||||
forceDeleteAutomation: (eid: string) => Promise<any>;
|
||||
triggerAutomation: (eid: string) => Promise<any>;
|
||||
haEntities: HAEntitiesState;
|
||||
api: ApiService;
|
||||
};
|
||||
@@ -22,19 +28,145 @@ export type AutomationManagerProps = {
|
||||
export const AutomationManager: FC<AutomationManagerProps> = ({
|
||||
api,
|
||||
haEntities,
|
||||
onAutomationStateChange,
|
||||
refreshAutomations,
|
||||
forceDeleteAutomation,
|
||||
triggerAutomation,
|
||||
onAutomationStateChange: _onAutomationStateChange,
|
||||
refreshAutomations: _refreshAutomations,
|
||||
forceDeleteAutomation: _forceDeleteAutomation,
|
||||
triggerAutomation: _triggerAutomation,
|
||||
}) => {
|
||||
const snackbr = useSnackbar();
|
||||
const [isSaving, setIsSaving] = useState(false);
|
||||
const confirm = useConfirm();
|
||||
const validationsShown = useRef(false);
|
||||
const [isSaving, setIsSaving] = useState<string[]>([]);
|
||||
|
||||
// helpers
|
||||
function wrapPromise<T>(
|
||||
name: string,
|
||||
errorMessage: string,
|
||||
makePromise: () => Promise<T>
|
||||
) {
|
||||
setIsSaving(isSaving.concat([name]));
|
||||
return makePromise()
|
||||
.then((resp) => {
|
||||
setIsSaving(isSaving.filter((k) => k !== name));
|
||||
return resp;
|
||||
})
|
||||
.catch((err) => {
|
||||
console.error(err);
|
||||
snackbr.enqueueSnackbar(errorMessage.replace("{{err}}", String(err)), {
|
||||
variant: "error",
|
||||
});
|
||||
setIsSaving(isSaving.filter((k) => k !== name));
|
||||
});
|
||||
}
|
||||
const wrapApiPromise = (
|
||||
name: string,
|
||||
errorMessage: string,
|
||||
makePromise: () => Promise<APIResponse<any>>
|
||||
) => {
|
||||
wrapPromise(name, errorMessage, makePromise).then((resp) => {
|
||||
if (resp) {
|
||||
if (resp.ok) {
|
||||
refreshAutomations();
|
||||
} else {
|
||||
snackbr.enqueueSnackbar(errorMessage.replace("{{err}}", resp.error), {
|
||||
variant: "error",
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
const onAutomationStateChange = (eid: string, on: boolean) =>
|
||||
wrapPromise(
|
||||
"changing automation state",
|
||||
'failed to toggle autonation due to "{{err}}"',
|
||||
() => _onAutomationStateChange(eid, on)
|
||||
);
|
||||
const refreshAutomations = () =>
|
||||
wrapPromise(
|
||||
"refreshing automations",
|
||||
'failed refreshing automations due to "{{err}}"',
|
||||
() => _refreshAutomations()
|
||||
);
|
||||
const forceDeleteAutomation = (eid: string) =>
|
||||
wrapPromise("deleting automations", 'failed delete due to "{{err}}"', () =>
|
||||
_forceDeleteAutomation(eid)
|
||||
);
|
||||
const triggerAutomation = (eid: string) =>
|
||||
wrapPromise(
|
||||
"triggering automations",
|
||||
'failed trigger due to "{{err}}"',
|
||||
() => _triggerAutomation(eid)
|
||||
);
|
||||
|
||||
// effects
|
||||
useEffect(() => {
|
||||
refreshAutomations();
|
||||
// eslint-disable-next-line
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
if (
|
||||
api.state.automations.ready &&
|
||||
api.state.automations.ok &&
|
||||
!validationsShown.current
|
||||
) {
|
||||
const configAutomationsValidated = api.state.automations.data.data.map(
|
||||
(a) => {
|
||||
const failures = getFailures(a, av.AutomationData);
|
||||
return {
|
||||
automation: a,
|
||||
failures,
|
||||
};
|
||||
}
|
||||
);
|
||||
const invalidAutomations = configAutomationsValidated.filter(
|
||||
({ failures }) => failures !== null
|
||||
);
|
||||
if (invalidAutomations.length > 0 && !validationsShown.current) {
|
||||
validationsShown.current = true;
|
||||
confirm({
|
||||
cancellationButtonProps: {
|
||||
style: { display: "none" },
|
||||
},
|
||||
title: "Invalid Automations detected!",
|
||||
content: (
|
||||
<>
|
||||
<ol className="invalid-automation-modal-list">
|
||||
{invalidAutomations.map(({ automation, failures }, i) => (
|
||||
<li key={i}>
|
||||
<b>Automation</b>
|
||||
<InputYaml
|
||||
label=""
|
||||
value={automation}
|
||||
onChange={() => {}}
|
||||
/>
|
||||
<b>Errors</b>
|
||||
<Alert
|
||||
color="error"
|
||||
className="invalid-automation-modal-list--errors"
|
||||
>
|
||||
<ul>
|
||||
{failures &&
|
||||
failures.map((f, fi) => (
|
||||
<li key={fi}>
|
||||
<b>{f.path}</b>: {f.message.join(", ")}
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
</Alert>
|
||||
</li>
|
||||
))}
|
||||
</ol>
|
||||
</>
|
||||
),
|
||||
})
|
||||
.then(console.info)
|
||||
.catch(console.error);
|
||||
}
|
||||
}
|
||||
}, [api.state.automations, confirm]);
|
||||
|
||||
// handle bad states
|
||||
if (!haEntities.ready && haEntities.error) {
|
||||
return (
|
||||
@@ -75,78 +207,77 @@ export const AutomationManager: FC<AutomationManagerProps> = ({
|
||||
}
|
||||
|
||||
// alias
|
||||
const configAutomations = api.state.automations.data;
|
||||
const hassEntities = haEntities.collection;
|
||||
const configAutomations = api.state.automations.data;
|
||||
|
||||
return (
|
||||
<AutomationManagerLoaded
|
||||
configAutomations={configAutomations.data}
|
||||
hassEntities={hassEntities}
|
||||
onAutomationRun={triggerAutomation}
|
||||
onAutomationStateChange={onAutomationStateChange}
|
||||
onAutomationAdd={async (auto) => {
|
||||
await api.updateAutomation({
|
||||
index: configAutomations.totalItems + 1,
|
||||
auto,
|
||||
});
|
||||
refreshAutomations();
|
||||
}}
|
||||
onAutomationDelete={(aid, eid) => {
|
||||
const index = configAutomations.data.findIndex(
|
||||
({ metadata }) => metadata.id === aid
|
||||
);
|
||||
let deleteSent = false;
|
||||
if (index >= 0) {
|
||||
api.removeAutomation({
|
||||
index,
|
||||
});
|
||||
deleteSent = true;
|
||||
}
|
||||
const hassAuto = hassEntities[eid];
|
||||
if (hassAuto) {
|
||||
forceDeleteAutomation(eid);
|
||||
deleteSent = true;
|
||||
}
|
||||
if (!deleteSent) {
|
||||
snackbr.enqueueSnackbar(
|
||||
"Failed to delete automation, this may be resolved by a refresh or reboot of Home Assistant",
|
||||
{
|
||||
variant: "error",
|
||||
}
|
||||
);
|
||||
}
|
||||
// refreshAutomations();
|
||||
}}
|
||||
onAutomationUpdate={(aid, auto) => {
|
||||
const index = configAutomations.data.findIndex(
|
||||
({ metadata }) => metadata.id === aid
|
||||
);
|
||||
if (index >= 0) {
|
||||
api.updateAutomation({
|
||||
index: configAutomations.data.findIndex(
|
||||
({ metadata }) => metadata.id === aid
|
||||
),
|
||||
auto,
|
||||
});
|
||||
refreshAutomations();
|
||||
} else {
|
||||
snackbr.enqueueSnackbar(
|
||||
"Failed to update automation, this may be resolved by a refresh or reboot of Home Assistant.",
|
||||
{
|
||||
variant: "error",
|
||||
}
|
||||
);
|
||||
}
|
||||
}}
|
||||
onUpdateTags={async (aid, t) => {
|
||||
setIsSaving(true);
|
||||
await api.updateTags({
|
||||
automation_id: aid,
|
||||
tags: t,
|
||||
});
|
||||
setIsSaving(false);
|
||||
<ErrorBoundary
|
||||
additionalContext={{
|
||||
configAutomations,
|
||||
hassEntities,
|
||||
}}
|
||||
>
|
||||
{isSaving && <LinearProgress />}
|
||||
</AutomationManagerLoaded>
|
||||
{isSaving.length > 0 && (
|
||||
<>
|
||||
<span>{isSaving.join(" and ")}...</span>
|
||||
<LinearProgress />
|
||||
</>
|
||||
)}
|
||||
<AutomationManagerLoaded
|
||||
configAutomations={configAutomations.data}
|
||||
hassEntities={hassEntities}
|
||||
onAutomationRun={triggerAutomation}
|
||||
onAutomationStateChange={onAutomationStateChange}
|
||||
onAutomationAdd={(auto) =>
|
||||
wrapApiPromise(
|
||||
"adding automation",
|
||||
"Failed to create automation, recieved error: {{err}}!",
|
||||
() => api.createAutomation(auto) as any
|
||||
)
|
||||
}
|
||||
onAutomationDelete={(aid, eid) => {
|
||||
const autoToDelete = configAutomations.data.find(
|
||||
({ id }) => id === aid
|
||||
);
|
||||
let deleteSent = false;
|
||||
if (autoToDelete) {
|
||||
api.removeAutomation(autoToDelete);
|
||||
deleteSent = true;
|
||||
}
|
||||
const hassAuto = hassEntities[eid];
|
||||
if (hassAuto) {
|
||||
forceDeleteAutomation(eid);
|
||||
deleteSent = true;
|
||||
}
|
||||
if (!deleteSent) {
|
||||
snackbr.enqueueSnackbar(
|
||||
"Failed to delete automation, this may be resolved by a refresh or reboot of Home Assistant",
|
||||
{
|
||||
variant: "error",
|
||||
}
|
||||
);
|
||||
}
|
||||
// refreshAutomations();
|
||||
}}
|
||||
onAutomationUpdate={(auto) =>
|
||||
wrapApiPromise(
|
||||
"updating automation",
|
||||
"Failed to update automation, recieved error: {{err}}!",
|
||||
() => api.updateAutomation(auto) as any
|
||||
)
|
||||
}
|
||||
onUpdateTags={async (aid, t) => {
|
||||
wrapApiPromise(
|
||||
"updating tags",
|
||||
"Failed to update tags, recieved error: {{err}}!",
|
||||
() =>
|
||||
api.updateTags({
|
||||
automation_id: aid,
|
||||
tags: t,
|
||||
}) as any
|
||||
);
|
||||
}}
|
||||
/>
|
||||
</ErrorBoundary>
|
||||
);
|
||||
};
|
||||
@@ -9,6 +9,9 @@ export type AutomationManagerAuto = AutomationManagerAutoUpdatable & {
|
||||
tags: Record<string, string>;
|
||||
issue?: string;
|
||||
isNew?: boolean;
|
||||
source_file: string;
|
||||
source_file_type: string;
|
||||
configuration_key: string;
|
||||
};
|
||||
export type AutomationManagerAutoItem = AutomationManagerAuto & {
|
||||
flags: AutomationManagerItemFlags;
|
||||
|
||||
@@ -6,7 +6,7 @@ export const NODE_HEIGHT = 80 as const;
|
||||
export const DEFAULT_DIMS: DAGDims = {
|
||||
collection: {
|
||||
height: NODE_HEIGHT * 3,
|
||||
width: NODE_WIDTH * 1.5,
|
||||
width: NODE_WIDTH * 2.5,
|
||||
},
|
||||
node: {
|
||||
height: NODE_HEIGHT,
|
||||
|
||||
@@ -53,7 +53,7 @@ const { make, componentMeta } = makeStory({
|
||||
automation: {
|
||||
trigger: [],
|
||||
condition: [],
|
||||
sequence: [],
|
||||
action: [],
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -74,7 +74,7 @@ export const Trigger = make({
|
||||
},
|
||||
],
|
||||
condition: [],
|
||||
sequence: [],
|
||||
action: [],
|
||||
},
|
||||
});
|
||||
|
||||
@@ -110,7 +110,7 @@ export const Conditions = make({
|
||||
below: "15",
|
||||
},
|
||||
],
|
||||
sequence: [],
|
||||
action: [],
|
||||
},
|
||||
});
|
||||
|
||||
@@ -151,7 +151,7 @@ export const FullAuto = make({
|
||||
bad: "node",
|
||||
} as any,
|
||||
],
|
||||
sequence: [
|
||||
action: [
|
||||
{
|
||||
condition: "and",
|
||||
conditions: [
|
||||
@@ -269,7 +269,7 @@ export const ChooseAuto = make({
|
||||
automation: {
|
||||
condition: [],
|
||||
trigger: [],
|
||||
sequence: [
|
||||
action: [
|
||||
{
|
||||
choose: [
|
||||
{
|
||||
@@ -365,7 +365,7 @@ export const EmptyChooseAuto = make({
|
||||
automation: {
|
||||
condition: [],
|
||||
trigger: [],
|
||||
sequence: [
|
||||
action: [
|
||||
{
|
||||
choose: [],
|
||||
default: [],
|
||||
@@ -378,7 +378,7 @@ export const RepeatAuto = make({
|
||||
automation: {
|
||||
condition: [],
|
||||
trigger: [],
|
||||
sequence: [
|
||||
action: [
|
||||
{
|
||||
repeat: {
|
||||
while: 'states(lights.switch) == "on"',
|
||||
@@ -427,7 +427,7 @@ export const ParallelAuto = make({
|
||||
automation: {
|
||||
condition: [],
|
||||
trigger: [],
|
||||
sequence: [
|
||||
action: [
|
||||
{
|
||||
parallel: [
|
||||
{
|
||||
@@ -469,7 +469,7 @@ export const BadNodes = make({
|
||||
{ condition: "and" },
|
||||
"text?",
|
||||
] as any,
|
||||
sequence: [
|
||||
action: [
|
||||
{
|
||||
parallel: {
|
||||
bad: "me",
|
||||
@@ -486,7 +486,7 @@ export const IfElseNode = make({
|
||||
automation: {
|
||||
condition: [],
|
||||
trigger: [],
|
||||
sequence: [
|
||||
action: [
|
||||
{
|
||||
if: [],
|
||||
else: [],
|
||||
@@ -508,7 +508,7 @@ export const TimeNodes = make({
|
||||
platform: "time_pattern",
|
||||
},
|
||||
],
|
||||
sequence: [
|
||||
action: [
|
||||
{
|
||||
condition: "time",
|
||||
},
|
||||
|
||||
@@ -63,7 +63,7 @@ export const useAutomationNodes = (
|
||||
);
|
||||
|
||||
outputState.extend(
|
||||
makeSequenceNodes(automation.sequence, {
|
||||
makeSequenceNodes(automation.action, {
|
||||
...args,
|
||||
state,
|
||||
dims,
|
||||
@@ -74,7 +74,7 @@ export const useAutomationNodes = (
|
||||
dims,
|
||||
true
|
||||
),
|
||||
nodeId: `${dims.flipped}-sequence`,
|
||||
nodeId: `${dims.flipped}-action`,
|
||||
nodeIndex: 2,
|
||||
lastNodeId: outputState.lastNodeId,
|
||||
})
|
||||
@@ -98,7 +98,7 @@ export const makeSequenceNodes: ElementMaker<AutomationSequenceNode> = (
|
||||
enabled: node.enabled ?? true,
|
||||
label: getDescriptionFromAutomationNode(node, namer, true),
|
||||
...state.getIsClosedActions(nodeId, node),
|
||||
...stateUpdater.createNodeActions("sequence", nodeIndex, {
|
||||
...stateUpdater.createNodeActions("action", nodeIndex, {
|
||||
includeAdd: true,
|
||||
flipped: dims.flipped,
|
||||
}),
|
||||
@@ -153,7 +153,7 @@ export const makeSequenceNodes: ElementMaker<AutomationSequenceNode> = (
|
||||
dims,
|
||||
{
|
||||
icon: <AddIcon />,
|
||||
onClick: () => stateUpdater.basic.sequence.addNode(null),
|
||||
onClick: () => stateUpdater.basic.action.addNode(null),
|
||||
}
|
||||
),
|
||||
true
|
||||
@@ -261,7 +261,7 @@ export const makeChooseeNodes = makeSpecialNodeMaker(
|
||||
nodeId: args.nodeId,
|
||||
position: pos,
|
||||
onClick: () =>
|
||||
args.stateUpdater.basic.sequence.updateNode(
|
||||
args.stateUpdater.basic.action.updateNode(
|
||||
{
|
||||
...node,
|
||||
choose: [
|
||||
@@ -464,10 +464,10 @@ export const makeParallelNodes = makeSpecialNodeMaker(
|
||||
onClick: () =>
|
||||
args.openModal({
|
||||
allowedTypes: ["condition", "action"],
|
||||
node: args.stateUpdater.basic.sequence.defaultNode,
|
||||
node: args.stateUpdater.basic.action.defaultNode,
|
||||
saveBtnCreateText: true,
|
||||
update: (n) =>
|
||||
args.stateUpdater.basic.sequence.updateNode(
|
||||
args.stateUpdater.basic.action.updateNode(
|
||||
{
|
||||
...node,
|
||||
parallel: [...node.parallel, n],
|
||||
|
||||
@@ -29,7 +29,7 @@ export const useDAGElementsState = () => {
|
||||
},
|
||||
|
||||
getIsClosedActions(nodeId: string, node: AutomationNode) {
|
||||
if (isSpecialNode(getNodeSubType(node))) {
|
||||
if (isSpecialNode(getNodeSubType(node, true))) {
|
||||
return {
|
||||
isClosed: this.get(nodeId).isClosed ?? false,
|
||||
setIsClosed: (v: boolean) => this.set(nodeId, "isClosed", v),
|
||||
|
||||
@@ -10,10 +10,10 @@ import { AutomationTrigger } from "types/automations/triggers";
|
||||
import { AutomationCondition } from "types/automations/conditions";
|
||||
|
||||
export const DAGAutomationGraph: FC<{
|
||||
sequence: AutomationSequenceNode[];
|
||||
action: AutomationSequenceNode[];
|
||||
trigger: AutomationTrigger[];
|
||||
condition: AutomationCondition[];
|
||||
onSequenceUpdate: (s: AutomationSequenceNode[]) => void;
|
||||
onActionUpdate: (s: AutomationSequenceNode[]) => void;
|
||||
onTriggerUpdate: (t: AutomationTrigger[]) => void;
|
||||
onConditionUpdate: (c: AutomationCondition[]) => void;
|
||||
isFlipped: boolean;
|
||||
@@ -24,9 +24,9 @@ export const DAGAutomationGraph: FC<{
|
||||
useState<ModalState | undefined>(undefined);
|
||||
const updater = createUpdater({
|
||||
openModal: setModalState,
|
||||
sequence: {
|
||||
data: props.sequence,
|
||||
onUpdate: props.onSequenceUpdate,
|
||||
action: {
|
||||
data: props.action,
|
||||
onUpdate: props.onActionUpdate,
|
||||
},
|
||||
condition: {
|
||||
data: props.condition,
|
||||
@@ -39,7 +39,7 @@ export const DAGAutomationGraph: FC<{
|
||||
});
|
||||
const elementData = useAutomationNodes(
|
||||
{
|
||||
sequence: props.sequence,
|
||||
action: props.action,
|
||||
condition: props.condition,
|
||||
trigger: props.trigger,
|
||||
},
|
||||
|
||||
@@ -10,7 +10,7 @@ export const CollectionNodeMaker = NodeManager.register(
|
||||
...pre,
|
||||
color: (pre.collectionType === "condition"
|
||||
? "blue"
|
||||
: pre.collectionType === "sequence"
|
||||
: pre.collectionType === "action"
|
||||
? "green"
|
||||
: "red") as SequenceNodeColor,
|
||||
sequenceNode: node,
|
||||
|
||||
@@ -93,13 +93,13 @@ export type DAGGraphChooseUpdater = ReturnType<
|
||||
DAGGraphUpdater["createChoosNodeUpdater"]
|
||||
>;
|
||||
export const createUpdater = (
|
||||
args: DAGUpdaterArgs<"sequence" | "condition" | "trigger">
|
||||
args: DAGUpdaterArgs<"action" | "condition" | "trigger">
|
||||
) => {
|
||||
const basic = {
|
||||
sequence: createBasicUpdater("sequence", {
|
||||
action: createBasicUpdater("action", {
|
||||
device_id: "",
|
||||
})({
|
||||
sequence: args.sequence,
|
||||
action: args.action,
|
||||
openModal: args.openModal,
|
||||
}),
|
||||
trigger: createBasicUpdater("trigger", {
|
||||
@@ -179,7 +179,7 @@ export const createUpdater = (
|
||||
},
|
||||
createChoosNodeUpdater(i: number, j: number | "else") {
|
||||
const node = convertChooseActionToOrignal(
|
||||
args.sequence.data[i] as ChooseAction
|
||||
args.action.data[i] as ChooseAction
|
||||
);
|
||||
if (j === "else") {
|
||||
return {
|
||||
@@ -189,10 +189,10 @@ export const createUpdater = (
|
||||
data: [],
|
||||
onUpdate: console.warn,
|
||||
},
|
||||
sequence: {
|
||||
action: {
|
||||
data: node.default ?? [],
|
||||
onUpdate: (upd) =>
|
||||
basic.sequence.updateNode(
|
||||
basic.action.updateNode(
|
||||
{
|
||||
...node,
|
||||
default: upd,
|
||||
@@ -210,7 +210,7 @@ export const createUpdater = (
|
||||
} else {
|
||||
return {
|
||||
onRemove: () =>
|
||||
basic.sequence.updateNode(
|
||||
basic.action.updateNode(
|
||||
{
|
||||
...node,
|
||||
choose: [
|
||||
@@ -225,7 +225,7 @@ export const createUpdater = (
|
||||
condition: {
|
||||
data: node.choose[j].conditions,
|
||||
onUpdate: (upd: any) =>
|
||||
basic.sequence.updateNode(
|
||||
basic.action.updateNode(
|
||||
{
|
||||
...node,
|
||||
choose: [
|
||||
@@ -240,10 +240,10 @@ export const createUpdater = (
|
||||
i
|
||||
),
|
||||
},
|
||||
sequence: {
|
||||
action: {
|
||||
data: node.choose[j].sequence,
|
||||
onUpdate: (upd) =>
|
||||
basic.sequence.updateNode(
|
||||
basic.action.updateNode(
|
||||
{
|
||||
...node,
|
||||
choose: [
|
||||
@@ -267,11 +267,11 @@ export const createUpdater = (
|
||||
}
|
||||
},
|
||||
createRepeatNodeUpdater(i: number) {
|
||||
const { repeat, ...rest } = args.sequence.data[i] as RepeatAction;
|
||||
const sequence = {
|
||||
const { repeat, ...rest } = args.action.data[i] as RepeatAction;
|
||||
const action = {
|
||||
data: repeat.sequence,
|
||||
onUpdate: (upd: AutomationNode[]) =>
|
||||
basic.sequence.updateNode(
|
||||
basic.action.updateNode(
|
||||
{
|
||||
...rest,
|
||||
repeat: {
|
||||
@@ -291,7 +291,7 @@ export const createUpdater = (
|
||||
repeat.while
|
||||
),
|
||||
onUpdate: (upd: any) =>
|
||||
basic.sequence.updateNode(
|
||||
basic.action.updateNode(
|
||||
{
|
||||
...rest,
|
||||
repeat: {
|
||||
@@ -303,7 +303,7 @@ export const createUpdater = (
|
||||
),
|
||||
},
|
||||
trigger: createDummyUpdater(),
|
||||
sequence,
|
||||
action,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -315,7 +315,7 @@ export const createUpdater = (
|
||||
repeat.until
|
||||
),
|
||||
onUpdate: (upd: any) =>
|
||||
basic.sequence.updateNode(
|
||||
basic.action.updateNode(
|
||||
{
|
||||
...rest,
|
||||
repeat: {
|
||||
@@ -327,7 +327,7 @@ export const createUpdater = (
|
||||
),
|
||||
},
|
||||
trigger: createDummyUpdater(),
|
||||
sequence,
|
||||
action,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -335,16 +335,16 @@ export const createUpdater = (
|
||||
openModal: args.openModal,
|
||||
condition: createDummyUpdater(),
|
||||
trigger: createDummyUpdater(),
|
||||
sequence,
|
||||
action,
|
||||
});
|
||||
},
|
||||
createParallelNodeUpdater(i: number, j: number) {
|
||||
const { parallel, ...rest } = args.sequence.data[i] as ParallelAction;
|
||||
const { parallel, ...rest } = args.action.data[i] as ParallelAction;
|
||||
const child = parallel[j];
|
||||
|
||||
return {
|
||||
onRemove: () =>
|
||||
basic.sequence.updateNode(
|
||||
basic.action.updateNode(
|
||||
{
|
||||
...rest,
|
||||
parallel: [...parallel.slice(0, j), ...parallel.slice(j + 1)],
|
||||
@@ -355,10 +355,10 @@ export const createUpdater = (
|
||||
openModal: args.openModal,
|
||||
condition: createDummyUpdater(),
|
||||
trigger: createDummyUpdater(),
|
||||
sequence: {
|
||||
action: {
|
||||
data: "sequence" in child ? child.sequence : [child],
|
||||
onUpdate(d) {
|
||||
basic.sequence.updateNode(
|
||||
basic.action.updateNode(
|
||||
{
|
||||
...rest,
|
||||
parallel: [
|
||||
@@ -383,12 +383,12 @@ export const createUpdaterFromAutomationData = (
|
||||
onUpdate: (a: AutomationActionData) => void
|
||||
): DAGGraphUpdater =>
|
||||
createUpdater({
|
||||
sequence: {
|
||||
data: auto.sequence,
|
||||
action: {
|
||||
data: auto.action,
|
||||
onUpdate: (s: AutomationSequenceNode[]) =>
|
||||
onUpdate({
|
||||
...auto,
|
||||
sequence: s,
|
||||
action: s,
|
||||
}),
|
||||
},
|
||||
condition: {
|
||||
|
||||
@@ -1,7 +1,26 @@
|
||||
.error-boundary {
|
||||
padding: 2em 5%;
|
||||
height: calc(100vh - 4em);
|
||||
width: calc(100vw-5%);
|
||||
max-height: calc(100vh - 4em);
|
||||
max-width: calc(100vw-5%);
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
h1, h2 {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.error-boundary .error-boundary--stack, .error-boundary .error-boundary--context {
|
||||
max-height: 25vh;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
.error-boundary--buttons {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
margin-top: 1em;
|
||||
flex-direction: row;
|
||||
justify-content: space-evenly;
|
||||
align-items: center;
|
||||
}
|
||||
@@ -1,48 +1,87 @@
|
||||
import "./index.css";
|
||||
import { Component, ErrorInfo, ReactNode } from "react";
|
||||
import Alert from "@mui/material/Alert";
|
||||
import { Button } from "components/Inputs/Buttons/Button";
|
||||
|
||||
type State = {
|
||||
hasError: false;
|
||||
} | {
|
||||
hasError: true,
|
||||
error: any,
|
||||
errorInfo?: ErrorInfo,
|
||||
type State =
|
||||
| {
|
||||
hasError: false;
|
||||
}
|
||||
| {
|
||||
hasError: true;
|
||||
error: any;
|
||||
errorInfo?: ErrorInfo;
|
||||
};
|
||||
export class ErrorBoundary extends Component<
|
||||
{
|
||||
children: ReactNode;
|
||||
additionalContext?: any;
|
||||
},
|
||||
State
|
||||
> {
|
||||
state: State = {
|
||||
hasError: false,
|
||||
};
|
||||
|
||||
static getDerivedStateFromError(error: any): State {
|
||||
return { error, hasError: true };
|
||||
}
|
||||
|
||||
componentDidCatch(error: Error, errorInfo: ErrorInfo) {
|
||||
this.setState({
|
||||
hasError: true,
|
||||
error,
|
||||
errorInfo,
|
||||
});
|
||||
}
|
||||
|
||||
render() {
|
||||
if (this.state.hasError) {
|
||||
return (
|
||||
<div className="error-boundary">
|
||||
<h1>An Error has occured.</h1>
|
||||
<Alert color="error">{String(this.state.error)}</Alert>
|
||||
{!!this.props.additionalContext && (
|
||||
<>
|
||||
<h4>Error Context</h4>
|
||||
<Alert color="warning" className="error-boundary--context">
|
||||
{JSON.stringify(this.props.additionalContext, null, 4)}
|
||||
</Alert>
|
||||
</>
|
||||
)}
|
||||
<h4>Error Stack</h4>
|
||||
<Alert color="error" className="error-boundary--stack">
|
||||
{JSON.stringify(this.state.error, null, 4)}
|
||||
<br />
|
||||
{this.state.errorInfo &&
|
||||
this.state.errorInfo.componentStack.split("\n").map((s, i) => (
|
||||
<>
|
||||
<span key={i}>{s}</span>
|
||||
<br key={`br-${i}`} />
|
||||
</>
|
||||
))}
|
||||
</Alert>
|
||||
<div className="error-boundary--buttons">
|
||||
<Button onClick={() => (document.cookie = "")}>
|
||||
Clear cookies
|
||||
</Button>
|
||||
<Button
|
||||
color="warning"
|
||||
onClick={() =>
|
||||
window.open(
|
||||
"https://github.com/asosnovsky/Shortumation/issues/new?labels=bug%2C+triage&template=bug_report.md",
|
||||
"_blank",
|
||||
"top=0,left=0,width=600px,height=800px"
|
||||
)
|
||||
}
|
||||
>
|
||||
Report This Bug
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
return <>{this.props.children}</>;
|
||||
}
|
||||
}
|
||||
export class ErrorBoundary extends Component<{
|
||||
children: ReactNode
|
||||
}, State> {
|
||||
|
||||
state: State = {
|
||||
hasError: false
|
||||
}
|
||||
|
||||
static getDerivedStateFromError(error: any): State {
|
||||
return { error, hasError: true, };
|
||||
}
|
||||
|
||||
componentDidCatch(error: Error, errorInfo: ErrorInfo) {
|
||||
this.setState({
|
||||
hasError: true,
|
||||
error,
|
||||
errorInfo,
|
||||
})
|
||||
}
|
||||
|
||||
render() {
|
||||
if (this.state.hasError) {
|
||||
return <div className="error-boundary">
|
||||
<h1>An Error has occured.</h1>
|
||||
<h2>{String(this.state.error)}</h2>
|
||||
{JSON.stringify(this.state.error, null, 4)}
|
||||
<br />
|
||||
{this.state.errorInfo && this.state.errorInfo.componentStack.split('\n').map((s, i) => <>
|
||||
<span key={i}>{s}</span><br key={`br-${i}`} />
|
||||
</>)}
|
||||
</div>
|
||||
}
|
||||
|
||||
return <>
|
||||
{this.props.children}
|
||||
</>;
|
||||
}
|
||||
}
|
||||
@@ -2,16 +2,6 @@
|
||||
max-height: 2em;
|
||||
}
|
||||
|
||||
.input-text-view.view span {
|
||||
height: 100%;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
word-break: break-all;
|
||||
word-wrap: break-word;
|
||||
line-break: loose;
|
||||
overflow-wrap: break-word;
|
||||
}
|
||||
|
||||
.input-text-view.edit .MuiFilledInput-input {
|
||||
padding-top: 0.5em;
|
||||
padding-bottom: 0.5em;
|
||||
|
||||
@@ -32,11 +32,13 @@ export const InputTextView: FC<PropsWithChildren<InputTextViewProps>> = (
|
||||
onClick={() => !props.disabled && setViewMode(false)}
|
||||
>
|
||||
{!!props.value ? (
|
||||
<span>{props.value}</span>
|
||||
<div className="input-text-view--text text-ellipsis">
|
||||
<span>{props.value}</span>
|
||||
</div>
|
||||
) : (
|
||||
<span className="input-text-view--placeholder">
|
||||
{props.placeholder}
|
||||
</span>
|
||||
<div className="input-text-view--text input-text-view--placeholder text-ellipsis">
|
||||
<span>{props.placeholder}</span>
|
||||
</div>
|
||||
)}
|
||||
{!props.disabled && (
|
||||
<ModeEditOutlineOutlinedIcon className="input-text-view--edit" />
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
import { InputEntity } from "components/Inputs/AutoComplete/InputEntities";
|
||||
import { SceneAction } from "types/automations/actions";
|
||||
import { OptionManager } from "./OptionManager";
|
||||
|
||||
export const ActionSceneState: OptionManager<SceneAction> = {
|
||||
defaultState: () => ({
|
||||
scene: "",
|
||||
}),
|
||||
isReady: () => true,
|
||||
Component: ({ state, setState }) => {
|
||||
return (
|
||||
<>
|
||||
<InputEntity
|
||||
label="Scene"
|
||||
restrictToDomain={["scene"]}
|
||||
value={state.scene ?? ""}
|
||||
onChange={(d) => setState({ ...state, scene: d ?? "" })}
|
||||
/>
|
||||
</>
|
||||
);
|
||||
},
|
||||
};
|
||||
@@ -0,0 +1,46 @@
|
||||
import { OptionManager } from "./OptionManager";
|
||||
import { AutomationTriggerCalendar } from "types/automations/triggers";
|
||||
import { InputList } from "components/Inputs/InputList";
|
||||
import InputText from "components/Inputs/Base/InputText";
|
||||
import { InputEntity } from "components/Inputs/AutoComplete/InputEntities";
|
||||
|
||||
export const TriggerCalendarState: OptionManager<AutomationTriggerCalendar> = {
|
||||
defaultState: (): AutomationTriggerCalendar => ({
|
||||
platform: "calendar",
|
||||
event: "sunset",
|
||||
}),
|
||||
isReady: () => true,
|
||||
Component: ({ state, setState }) => {
|
||||
return (
|
||||
<>
|
||||
<InputEntity
|
||||
label="Calendar"
|
||||
restrictToDomain={["calendar"]}
|
||||
value={state.entity_id ?? ""}
|
||||
onChange={(v) => setState({ ...state, entity_id: v ?? "" })}
|
||||
/>
|
||||
<InputList
|
||||
label="Event Type"
|
||||
current={state.event}
|
||||
options={["start", "end"]}
|
||||
onChange={(event) =>
|
||||
setState({
|
||||
...state,
|
||||
event,
|
||||
})
|
||||
}
|
||||
/>
|
||||
<InputText
|
||||
label="Offset"
|
||||
value={state.offset ?? ""}
|
||||
onChange={(s) =>
|
||||
setState({
|
||||
...state,
|
||||
offset: !s ? undefined : s,
|
||||
})
|
||||
}
|
||||
/>
|
||||
</>
|
||||
);
|
||||
},
|
||||
};
|
||||
@@ -0,0 +1,39 @@
|
||||
import { OptionManager } from "./OptionManager";
|
||||
import { AutomationTriggerSun } from "types/automations/triggers";
|
||||
import { InputList } from "components/Inputs/InputList";
|
||||
import InputText from "components/Inputs/Base/InputText";
|
||||
|
||||
export const TriggerSunState: OptionManager<AutomationTriggerSun> = {
|
||||
defaultState: (): AutomationTriggerSun => ({
|
||||
platform: "sun",
|
||||
event: "sunset",
|
||||
}),
|
||||
isReady: () => true,
|
||||
Component: ({ state, setState }) => {
|
||||
return (
|
||||
<>
|
||||
<InputList
|
||||
label="Event Type"
|
||||
current={state.event}
|
||||
options={["sunset", "sunrise"]}
|
||||
onChange={(event) =>
|
||||
setState({
|
||||
...state,
|
||||
event,
|
||||
})
|
||||
}
|
||||
/>
|
||||
<InputText
|
||||
label="Offset"
|
||||
value={state.offset ?? ""}
|
||||
onChange={(s) =>
|
||||
setState({
|
||||
...state,
|
||||
offset: !s ? undefined : s,
|
||||
})
|
||||
}
|
||||
/>
|
||||
</>
|
||||
);
|
||||
},
|
||||
};
|
||||
@@ -8,7 +8,7 @@ export const TriggerWebhook: OptionManager<AutomationTriggerWebhook> = {
|
||||
webhook_id: "",
|
||||
}),
|
||||
isReady: () => true,
|
||||
renderOptionList: (state, setState) => {
|
||||
Component: ({ state, setState }) => {
|
||||
return (
|
||||
<>
|
||||
<InputText
|
||||
@@ -21,6 +21,10 @@ export const TriggerWebhook: OptionManager<AutomationTriggerWebhook> = {
|
||||
})
|
||||
}
|
||||
/>
|
||||
<span>
|
||||
You can run this automation by sending an HTTP POST request to
|
||||
http://your-home-assistant-ip/api/webhook/{state.webhook_id}.
|
||||
</span>
|
||||
</>
|
||||
);
|
||||
},
|
||||
|
||||
@@ -20,6 +20,9 @@ import { TriggerZone } from "./TriggerZone";
|
||||
import { TriggerDevice } from "./TriggerDevice";
|
||||
import { ActionStopState } from "./ActionStop";
|
||||
import { ActionParallelState } from "./ActionParallel";
|
||||
import { TriggerSunState } from "./TriggerSun";
|
||||
import { TriggerCalendarState } from "./TriggerCalendar";
|
||||
import { ActionSceneState } from "./ActionScene";
|
||||
|
||||
export const getOptionManager = <T extends AutomationNodeTypes>(
|
||||
nodeType: T,
|
||||
@@ -39,6 +42,8 @@ export const getOptionManager = <T extends AutomationNodeTypes>(
|
||||
return ActionCallServiceState;
|
||||
case "wait":
|
||||
return ActionWaitState;
|
||||
case "scene":
|
||||
return ActionSceneState;
|
||||
case "stop":
|
||||
return ActionStopState;
|
||||
case "delay":
|
||||
@@ -58,6 +63,10 @@ export const getOptionManager = <T extends AutomationNodeTypes>(
|
||||
return TriggerHAState;
|
||||
case "mqtt":
|
||||
return TriggerMQTTState;
|
||||
case "sun":
|
||||
return TriggerSunState;
|
||||
case "calendar":
|
||||
return TriggerCalendarState;
|
||||
case "numeric_state":
|
||||
return TriggerNumericState;
|
||||
case "state":
|
||||
|
||||
Loaded 100 of 116 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user