Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
99688f0c92 | ||
|
|
e3c34eeae5 | ||
|
|
ce142f9d84 | ||
|
|
f95dd75198 | ||
|
|
ac82a4c96c | ||
|
|
fbbc5af12d | ||
|
|
80bfbdab80 | ||
|
|
30a6f2ca6e | ||
|
|
ddbd780560 | ||
|
|
bee584d85c | ||
|
|
5115dd9490 | ||
|
|
e2d4022bde | ||
|
|
15dfa25e34 | ||
|
|
277acc14cb | ||
|
|
07d5a4d4db | ||
|
|
1b81962c03 | ||
|
|
86d4117773 | ||
|
|
5ad653ffcb | ||
|
|
4c59f9cbc1 | ||
|
|
9d232246e8 | ||
|
|
61a64e0040 | ||
|
|
2f709b499a | ||
|
|
f4fe036480 | ||
|
|
97521097dc | ||
|
|
0cf3f2706a | ||
|
|
924eea0c0a | ||
|
|
616c8c3b4b | ||
|
|
b68962ccbb | ||
|
|
6bac5f184f | ||
|
|
38a645918f | ||
|
|
ba13c281d2 | ||
|
|
9184d1f7bd |
No files matched your search
+50
-27
@@ -6,8 +6,8 @@ on:
|
|||||||
type: string
|
type: string
|
||||||
description: "Version Number"
|
description: "Version Number"
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
jobs:
|
jobs:
|
||||||
metadata:
|
metadata:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
@@ -15,6 +15,12 @@ jobs:
|
|||||||
outputs:
|
outputs:
|
||||||
version: ${{ steps.version.outputs.VERSION }}
|
version: ${{ steps.version.outputs.VERSION }}
|
||||||
steps:
|
steps:
|
||||||
|
- name: Cancel Previous Runs
|
||||||
|
uses: styfle/cancel-workflow-action@0.10.0
|
||||||
|
with:
|
||||||
|
all_but_latest: true
|
||||||
|
access_token: ${{ github.token }}
|
||||||
|
|
||||||
- name: Check out repository
|
- name: Check out repository
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
@@ -35,28 +41,12 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
echo ${{ steps.version.outputs.VERSION }}
|
echo ${{ steps.version.outputs.VERSION }}
|
||||||
|
|
||||||
deploy:
|
build-web:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
name: Build & Publish ${{ matrix.arch }} / ${{ needs.metadata.outputs.version }}
|
name: "Build Web"
|
||||||
if: github.event_name != 'pull_request'
|
|
||||||
needs:
|
needs:
|
||||||
- metadata
|
- metadata
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
arch:
|
|
||||||
- "aarch64"
|
|
||||||
- "amd64"
|
|
||||||
- "armhf"
|
|
||||||
- "armv7"
|
|
||||||
- "i386"
|
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Cancel Previous Runs
|
|
||||||
uses: styfle/cancel-workflow-action@0.10.0
|
|
||||||
with:
|
|
||||||
all_but_latest: true
|
|
||||||
access_token: ${{ github.token }}
|
|
||||||
|
|
||||||
- name: Check out repository
|
- name: Check out repository
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
|
|
||||||
@@ -67,20 +57,53 @@ jobs:
|
|||||||
cache: "yarn"
|
cache: "yarn"
|
||||||
cache-dependency-path: webapp/yarn.lock
|
cache-dependency-path: webapp/yarn.lock
|
||||||
|
|
||||||
- name: Login to DockerHub
|
|
||||||
uses: docker/login-action@v2.0.0
|
|
||||||
with:
|
|
||||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
|
||||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
|
||||||
|
|
||||||
- name: "Save version number"
|
- name: "Save version number"
|
||||||
run: echo "REACT_APP_BUILD_VERSION=${{ needs.metadata.outputs.version }}" > ./webapp/.env.production
|
run: echo "REACT_APP_BUILD_VERSION=${{ needs.metadata.outputs.version }}" > ./webapp/.env.production
|
||||||
|
|
||||||
- name: "Build Web"
|
- name: "Build Web"
|
||||||
run: cd webapp && yarn install && yarn build
|
run: cd webapp && yarn install && yarn build
|
||||||
|
|
||||||
|
- name: "Save artifact"
|
||||||
|
uses: actions/upload-artifact@v1
|
||||||
|
with:
|
||||||
|
name: "web-${{ needs.metadata.outputs.version }}"
|
||||||
|
path: webapp/build
|
||||||
|
|
||||||
|
deploy:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
name: Build & Publish ${{ matrix.arch }} / ${{ needs.metadata.outputs.version }}
|
||||||
|
if: github.event_name != 'pull_request'
|
||||||
|
needs:
|
||||||
|
- metadata
|
||||||
|
- build-web
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
arch:
|
||||||
|
- "aarch64"
|
||||||
|
- "amd64"
|
||||||
|
- "armhf" # see https://github.com/asosnovsky/Shortumation/issues/147
|
||||||
|
- "armv7"
|
||||||
|
- "i386"
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Check out repository
|
||||||
|
uses: actions/checkout@v3
|
||||||
|
|
||||||
|
- name: Login to DockerHub
|
||||||
|
uses: docker/login-action@v2.0.0
|
||||||
|
with:
|
||||||
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
|
|
||||||
|
- name: "Get Web build"
|
||||||
|
uses: actions/download-artifact@v1
|
||||||
|
with:
|
||||||
|
name: "web-${{ needs.metadata.outputs.version }}"
|
||||||
|
path: webapp/build
|
||||||
|
|
||||||
- name: ${{ matrix.arch }} / ${{ needs.metadata.outputs.version }}
|
- name: ${{ matrix.arch }} / ${{ needs.metadata.outputs.version }}
|
||||||
uses: home-assistant/builder@2022.07.0
|
uses: home-assistant/builder@master
|
||||||
|
continue-on-error: true
|
||||||
with:
|
with:
|
||||||
args: |
|
args: |
|
||||||
--${{ matrix.arch }} \
|
--${{ matrix.arch }} \
|
||||||
|
|||||||
@@ -3,9 +3,6 @@ on:
|
|||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
paths:
|
|
||||||
- "webapp"
|
|
||||||
- "api"
|
|
||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
@@ -46,7 +43,7 @@ jobs:
|
|||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v4
|
uses: actions/setup-python@v4
|
||||||
with:
|
with:
|
||||||
python-version: 3.9
|
python-version: "3.10"
|
||||||
- name: Install Dependencies
|
- name: Install Dependencies
|
||||||
run: cd api && make setup
|
run: cd api && make setup
|
||||||
- name: Echo dependencies
|
- name: Echo dependencies
|
||||||
|
|||||||
@@ -1,5 +1,25 @@
|
|||||||
# Changelog 
|
# Changelog 
|
||||||
|
|
||||||
|
## [0.6.2] - Patches
|
||||||
|
|
||||||
|
- Attempting to increasing websocket file limit
|
||||||
|
- Support for all !include directives
|
||||||
|
|
||||||
|
## [0.6.1] - v0.6.0 Split Config Support & Better Error handling!
|
||||||
|
|
||||||
|
- Added visual support for split config (this was a heavy refactor!)
|
||||||
|
|
||||||
|
<img width="400px" src="https://user-images.githubusercontent.com/7451445/185440594-f988c136-dd35-4a44-99d9-6d54d2a27882.png" />
|
||||||
|
|
||||||
|
- Capturing invalid files before they happen
|
||||||
|
<img width="400px" src="https://user-images.githubusercontent.com/7451445/185440785-ad48f4b3-b6c5-4362-9222-426c07c95776.png"/>
|
||||||
|
|
||||||
|
- Trying to provide better information on common pitfals
|
||||||
|

|
||||||
|
|
||||||
|
- Better global error capture
|
||||||
|

|
||||||
|
|
||||||
## [0.5.3] - Bug Fixes
|
## [0.5.3] - Bug Fixes
|
||||||
|
|
||||||
- Redirecting `/` to `/web` to resolve container install strangeness reported in https://github.com/asosnovsky/Shortumation/issues/125
|
- Redirecting `/` to `/web` to resolve container install strangeness reported in https://github.com/asosnovsky/Shortumation/issues/125
|
||||||
|
|||||||
+2
-1
@@ -2,7 +2,7 @@
|
|||||||
ARG BUILD_ARCH
|
ARG BUILD_ARCH
|
||||||
|
|
||||||
# <--- Main Image -->
|
# <--- Main Image -->
|
||||||
FROM python:3.9.13-slim-buster
|
FROM python:3.10-slim-buster
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
# <--- Post-Build Args -->
|
# <--- Post-Build Args -->
|
||||||
@@ -18,6 +18,7 @@ RUN apt-get update -y && \
|
|||||||
|
|
||||||
# <--- Scripts -->
|
# <--- Scripts -->
|
||||||
COPY docker/bin /app/bin
|
COPY docker/bin /app/bin
|
||||||
|
COPY docker/hypercorn.toml /app/hypercorn.toml
|
||||||
|
|
||||||
# <--- PREP -->
|
# <--- PREP -->
|
||||||
RUN /app/bin/prep.sh
|
RUN /app/bin/prep.sh
|
||||||
|
|||||||
@@ -58,6 +58,10 @@ In general, if you want to help provide this to more home-assistant fans please
|
|||||||
|
|
||||||
## FAQ
|
## FAQ
|
||||||
|
|
||||||
|
**How can I buy you a coffee?**
|
||||||
|
|
||||||
|
> <a href='https://ko-fi.com/J3J8C4RB7' target='_blank'><img height='36' style='border:0px;height:36px;' src='https://cdn.ko-fi.com/cdn/kofi1.png?v=3' border='0' alt='Buy Me a Coffee at ko-fi.com' /></a>
|
||||||
|
|
||||||
**How is this different from Node-Red?**
|
**How is this different from Node-Red?**
|
||||||
|
|
||||||
> Node-Red is both an execution engine and an automation editor, which means that in order for your automations to run you have to have an additional component running and executing the automations. Shortumation simply provides a different editor and manager for writing Homeassistant automations, while relying on Homeassistant to execute the automations (this uses the `automations.yaml` file as the backend database)
|
> Node-Red is both an execution engine and an automation editor, which means that in order for your automations to run you have to have an additional component running and executing the automations. Shortumation simply provides a different editor and manager for writing Homeassistant automations, while relying on Homeassistant to execute the automations (this uses the `automations.yaml` file as the backend database)
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
get_index # unused function (src/api/app.py:43)
|
get_index # unused function (src/api/app.py:43)
|
||||||
list_autos # unused function (src/api/routes/automations.py:12)
|
list_autos # unused function (src/api/routes/automations.py:13)
|
||||||
upsert_auto # unused function (src/api/routes/automations.py:24)
|
insert_auto # unused function (src/api/routes/automations.py:28)
|
||||||
delete_auto # unused function (src/api/routes/automations.py:32)
|
update_auto # unused function (src/api/routes/automations.py:32)
|
||||||
read_details # unused function (src/api/routes/details.py:10)
|
delete_auto # unused function (src/api/routes/automations.py:40)
|
||||||
|
read_details # unused function (src/api/routes/details.py:11)
|
||||||
read_ping # unused function (src/api/routes/ping.py:10)
|
read_ping # unused function (src/api/routes/ping.py:10)
|
||||||
websocket_endpoint # unused function (src/api/routes/socket.py:13)
|
websocket_endpoint # unused function (src/api/routes/socket.py:13)
|
||||||
params # unused variable (src/api/types.py:16)
|
params # unused variable (src/api/types.py:16)
|
||||||
@@ -12,8 +13,8 @@ trigger_variables # unused variable (src/automations/types.py:13)
|
|||||||
trigger # unused variable (src/automations/types.py:15)
|
trigger # unused variable (src/automations/types.py:15)
|
||||||
condition # unused variable (src/automations/types.py:16)
|
condition # unused variable (src/automations/types.py:16)
|
||||||
action # unused variable (src/automations/types.py:17)
|
action # unused variable (src/automations/types.py:17)
|
||||||
_.to_json # unused method (src/automations/types.py:38)
|
_.to_json # unused method (src/automations/types.py:45)
|
||||||
_.automation_tags # unused property (src/hass_config/loader.py:18)
|
_.automation_tags # unused property (src/hass_config/loader.py:17)
|
||||||
_.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)
|
json_dumps # unused function (src/json_serializer.py:5)
|
||||||
|
SecretValue # unused class (src/yaml_serializer/__init__.py:40)
|
||||||
|
EnvVar # unused class (src/yaml_serializer/__init__.py:78)
|
||||||
+2
-2
@@ -2,14 +2,14 @@
|
|||||||
import setuptools # type: ignore
|
import setuptools # type: ignore
|
||||||
|
|
||||||
setuptools.setup(
|
setuptools.setup(
|
||||||
python_requires=">=3.9",
|
python_requires=">=3.10",
|
||||||
install_requires=[
|
install_requires=[
|
||||||
"PyYAML==6.0",
|
"PyYAML==6.0",
|
||||||
"fastapi==0.78.0",
|
"fastapi==0.78.0",
|
||||||
"pydantic==1.9.1",
|
"pydantic==1.9.1",
|
||||||
"hypercorn==0.13.2",
|
"hypercorn==0.13.2",
|
||||||
"python-decouple==3.6",
|
"python-decouple==3.6",
|
||||||
"websockets==10.3"
|
"websockets==10.3",
|
||||||
],
|
],
|
||||||
extras_require={
|
extras_require={
|
||||||
"dev": [
|
"dev": [
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
from ctypes import Union
|
|
||||||
from fastapi import APIRouter, HTTPException
|
from fastapi import APIRouter, HTTPException
|
||||||
|
|
||||||
from src.api.types import ListData, ListParams, UpdateTags
|
from src.api.types import ListData, ListParams, UpdateTags
|
||||||
from src.automations.errors import FailedDeletion
|
from src.automations.errors import FailedDeletion
|
||||||
from src.automations.manager import AutomationManager
|
from src.automations.manager import AutomationManager
|
||||||
from src.automations.types import Automation, ExtenededAutomation
|
from src.automations.types import Automation, ExtenededAutomation
|
||||||
|
from src.errors import ErrorSet
|
||||||
|
|
||||||
|
|
||||||
def make_automation_router(automations: AutomationManager) -> APIRouter:
|
def make_automation_router(automations: AutomationManager) -> APIRouter:
|
||||||
@@ -12,15 +12,18 @@ def make_automation_router(automations: AutomationManager) -> APIRouter:
|
|||||||
|
|
||||||
@router.post("/list")
|
@router.post("/list")
|
||||||
def list_autos(body: ListParams) -> ListData[ExtenededAutomation]:
|
def list_autos(body: ListParams) -> ListData[ExtenededAutomation]:
|
||||||
automations.reload()
|
try:
|
||||||
return ListData(
|
automations.reload()
|
||||||
params=body,
|
return ListData(
|
||||||
totalItems=automations.count(),
|
params=body,
|
||||||
data=automations.list(
|
totalItems=automations.count(),
|
||||||
offset=body.offset,
|
data=automations.list(
|
||||||
limit=body.limit,
|
offset=body.offset,
|
||||||
),
|
limit=body.limit,
|
||||||
)
|
),
|
||||||
|
)
|
||||||
|
except ErrorSet as err:
|
||||||
|
raise HTTPException(status_code=400, detail=err.gen_message())
|
||||||
|
|
||||||
@router.post("/item")
|
@router.post("/item")
|
||||||
def insert_auto(body: Automation):
|
def insert_auto(body: Automation):
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
from fastapi import APIRouter
|
from fastapi import APIRouter
|
||||||
|
|
||||||
|
from src.automations.loader import extract_automation_refs
|
||||||
from src.env import BUILD_VERSION, HASSIO_TOKEN, HASSIO_WS
|
from src.env import BUILD_VERSION, HASSIO_TOKEN, HASSIO_WS
|
||||||
from src.hass_config import HassConfig
|
from src.hass_config import HassConfig
|
||||||
from src.automations.loader import extract_automation_paths
|
|
||||||
|
|
||||||
|
|
||||||
def make_details_router(hass_config: HassConfig) -> APIRouter:
|
def make_details_router(hass_config: HassConfig) -> APIRouter:
|
||||||
@@ -18,7 +18,7 @@ def make_details_router(hass_config: HassConfig) -> APIRouter:
|
|||||||
"tags": hass_config.get_automation_tags_path(),
|
"tags": hass_config.get_automation_tags_path(),
|
||||||
"autos": {
|
"autos": {
|
||||||
config_key: auto_file
|
config_key: auto_file
|
||||||
for config_key, auto_file in extract_automation_paths(hass_config)
|
for config_key, auto_file in extract_automation_refs(hass_config)
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
from typing import Dict, Generic, List, TypeVar
|
from typing import Generic, TypeVar
|
||||||
|
|
||||||
from pydantic import BaseModel
|
from pydantic import BaseModel
|
||||||
from pydantic.fields import Field
|
from pydantic.fields import Field
|
||||||
@@ -15,9 +15,9 @@ class ListParams(BaseModel):
|
|||||||
class ListData(GenericModel, Generic[DataT]):
|
class ListData(GenericModel, Generic[DataT]):
|
||||||
params: ListParams
|
params: ListParams
|
||||||
total_items: int = Field(alias="totalItems")
|
total_items: int = Field(alias="totalItems")
|
||||||
data: List[DataT]
|
data: list[DataT]
|
||||||
|
|
||||||
|
|
||||||
class UpdateTags(BaseModel):
|
class UpdateTags(BaseModel):
|
||||||
automation_id: str = Field(description="Automation Id to update")
|
automation_id: str = Field(description="Automation Id to update")
|
||||||
tags: Dict[str, str]
|
tags: dict[str, str]
|
||||||
+41
-25
@@ -3,11 +3,16 @@ import json
|
|||||||
import sqlite3
|
import sqlite3
|
||||||
from contextlib import contextmanager
|
from contextlib import contextmanager
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Iterable, Iterator, List, Optional
|
from typing import Iterable, Iterator
|
||||||
|
|
||||||
from src.logger import get_logger
|
from src.logger import get_logger
|
||||||
|
|
||||||
from .errors import DBDataError, DBError, DBNoAutomationFound
|
from .errors import (
|
||||||
|
DBDataError,
|
||||||
|
DBError,
|
||||||
|
DBNoAutomationFound,
|
||||||
|
RepeatedAutomationId,
|
||||||
|
)
|
||||||
from .types import ExtenededAutomation
|
from .types import ExtenededAutomation
|
||||||
|
|
||||||
logger = get_logger(__file__)
|
logger = get_logger(__file__)
|
||||||
@@ -21,17 +26,25 @@ def encode_auto(auto: ExtenededAutomation) -> str:
|
|||||||
).decode("utf-8")
|
).decode("utf-8")
|
||||||
|
|
||||||
|
|
||||||
|
def encode_obj(auto: dict | list) -> str:
|
||||||
|
return base64.b64encode(json.dumps(auto).encode("utf-8")).decode("utf-8")
|
||||||
|
|
||||||
|
|
||||||
def decode_auto(
|
def decode_auto(
|
||||||
auto_str: str, source_file: str, source_file_type: str, configuration_key: str
|
auto_str: str, source_file: str, source_file_type: str, configuration_key: str
|
||||||
) -> ExtenededAutomation:
|
) -> ExtenededAutomation:
|
||||||
return ExtenededAutomation(
|
return ExtenededAutomation(
|
||||||
source_file=source_file,
|
source_file=source_file,
|
||||||
source_file_type=source_file_type,
|
source_file_type=source_file_type,
|
||||||
configuration_key=configuration_key,
|
configuration_key=decode_obj(configuration_key), # type: ignore
|
||||||
**json.loads(base64.b64decode(auto_str.encode("utf-8")).decode("utf-8")),
|
**decode_obj(auto_str),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def decode_obj(obj_str: str) -> dict | list:
|
||||||
|
return json.loads(base64.b64decode(obj_str.encode("utf-8")).decode("utf-8"))
|
||||||
|
|
||||||
|
|
||||||
class AutomationDBConnection:
|
class AutomationDBConnection:
|
||||||
def __init__(self, db_file: Path) -> None:
|
def __init__(self, db_file: Path) -> None:
|
||||||
self.db_file = db_file
|
self.db_file = db_file
|
||||||
@@ -47,8 +60,6 @@ class AutomationDBConnection:
|
|||||||
try:
|
try:
|
||||||
yield cur
|
yield cur
|
||||||
conn.commit()
|
conn.commit()
|
||||||
except sqlite3.IntegrityError as err:
|
|
||||||
raise DBDataError(*err.args) from err
|
|
||||||
except sqlite3.DatabaseError as err:
|
except sqlite3.DatabaseError as err:
|
||||||
raise DBError(*err.args) from err
|
raise DBError(*err.args) from err
|
||||||
finally:
|
finally:
|
||||||
@@ -66,34 +77,39 @@ class AutomationDBConnection:
|
|||||||
mode TEXT NOT NULL,
|
mode TEXT NOT NULL,
|
||||||
source_file TEXT NOT NULL,
|
source_file TEXT NOT NULL,
|
||||||
source_file_type TEXT NOT NULL,
|
source_file_type TEXT NOT NULL,
|
||||||
configuration_key TEXT NOT NULL,
|
configuration_key BLOB NOT NULL,
|
||||||
rest BLOB NOT NULL
|
rest BLOB NOT NULL
|
||||||
);
|
);
|
||||||
"""
|
"""
|
||||||
)
|
)
|
||||||
|
|
||||||
def insert_automations(self, automations: List[ExtenededAutomation]):
|
def insert_automations(self, automations: list[ExtenededAutomation]):
|
||||||
with self.get_cur() as cur:
|
with self.get_cur() as cur:
|
||||||
for automation in automations:
|
for automation in automations:
|
||||||
cur.execute(
|
try:
|
||||||
f"""
|
cur.execute(
|
||||||
INSERT INTO {automations_tbl} VALUES (
|
f"""
|
||||||
"{automation.id}",
|
INSERT INTO {automations_tbl} VALUES (
|
||||||
"{automation.alias}",
|
"{automation.id}",
|
||||||
"{automation.description}",
|
"{automation.alias}",
|
||||||
"{automation.mode}",
|
"{automation.description}",
|
||||||
"{automation.source_file}",
|
"{automation.mode}",
|
||||||
"{automation.source_file_type}",
|
"{automation.source_file}",
|
||||||
"{automation.configuration_key}",
|
"{automation.source_file_type}",
|
||||||
"{encode_auto(automation)}"
|
"{encode_obj(automation.configuration_key)}",
|
||||||
);
|
"{encode_auto(automation)}"
|
||||||
""",
|
);
|
||||||
)
|
""",
|
||||||
|
)
|
||||||
|
except sqlite3.IntegrityError as err:
|
||||||
|
raise RepeatedAutomationId(
|
||||||
|
f"automation id '{automation.id}' in '{automation.source_file}' was already seen before. Please check for duplicate automation ids in your files."
|
||||||
|
) from err
|
||||||
|
|
||||||
def get_automation(self, automation_id: str) -> ExtenededAutomation:
|
def get_automation(self, automation_id: str) -> ExtenededAutomation:
|
||||||
with self.get_cur() as cur:
|
with self.get_cur() as cur:
|
||||||
cur.execute(
|
cur.execute(
|
||||||
f'SELECT rest, source_file, source_file_type, configuration_key FROM {automations_tbl} WHERE id = "{automation_id}"'
|
f'SELECT rest, source_file, source_file_type, configuration_key FROM {automations_tbl} WHERE id = "{automation_id}"' # nosec
|
||||||
)
|
)
|
||||||
objs = cur.fetchone()
|
objs = cur.fetchone()
|
||||||
if objs is None:
|
if objs is None:
|
||||||
@@ -104,10 +120,10 @@ class AutomationDBConnection:
|
|||||||
def list_automations(self, offset: int, limit: int) -> Iterable[ExtenededAutomation]:
|
def list_automations(self, offset: int, limit: int) -> Iterable[ExtenededAutomation]:
|
||||||
with self.get_cur() as cur:
|
with self.get_cur() as cur:
|
||||||
for [rest, source_file, source_file_type, configuration_key] in cur.execute(
|
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}"
|
f"SELECT rest, source_file, source_file_type, configuration_key FROM {automations_tbl} LIMIT {limit} OFFSET {offset}" # nosec
|
||||||
):
|
):
|
||||||
yield decode_auto(rest, source_file, source_file_type, configuration_key)
|
yield decode_auto(rest, source_file, source_file_type, configuration_key)
|
||||||
|
|
||||||
def count_automations(self) -> int:
|
def count_automations(self) -> int:
|
||||||
with self.get_cur() as cur:
|
with self.get_cur() as cur:
|
||||||
return cur.execute(f"SELECT count(id) FROM {automations_tbl}").fetchone()[0]
|
return cur.execute(f"SELECT count(id) FROM {automations_tbl}").fetchone()[0] # nosec
|
||||||
@@ -25,5 +25,9 @@ class DBDataError(DBError):
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
class RepeatedAutomationId(DBDataError):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
class DBNoAutomationFound(DBError):
|
class DBNoAutomationFound(DBError):
|
||||||
pass
|
pass
|
||||||
+212
-29
@@ -1,84 +1,267 @@
|
|||||||
|
from itertools import chain
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Any, Iterator, Tuple, Union
|
from typing import Any, Iterator, Tuple, Union
|
||||||
|
|
||||||
from src.json_serializer import normalize_obj
|
from src.json_serializer import normalize_obj
|
||||||
from src.logger import get_logger
|
from src.logger import get_logger
|
||||||
from src.utils import extract_files
|
from src.utils import extract_files
|
||||||
from src.yaml_serializer import dump_yaml, load_yaml
|
from src.yaml_serializer import (
|
||||||
from src.yaml_serializer.types import IncludedYaml, IncludedYamlDir
|
IncludedYaml,
|
||||||
|
IncludedYamlDir,
|
||||||
|
IncludedYamlDirList,
|
||||||
|
IncludedYamlDirMergedNamed,
|
||||||
|
IncludedYamlDirNamed,
|
||||||
|
dump_yaml,
|
||||||
|
load_yaml,
|
||||||
|
)
|
||||||
|
|
||||||
from ..hass_config.loader import HassConfig
|
from ..hass_config.loader import HassConfig
|
||||||
from .errors import InvalidAutomationFile
|
from .errors import InvalidAutomationFile
|
||||||
from .tags import TagManager
|
from .tags import TagManager
|
||||||
from .types import ExtenededAutomation
|
from .types import (
|
||||||
|
AutomationExtractedIter,
|
||||||
|
ConfigurationKey,
|
||||||
|
ExtenededAutomation,
|
||||||
|
IncludedAutoamtion,
|
||||||
|
InlineAutomation,
|
||||||
|
)
|
||||||
|
|
||||||
logger = get_logger(__file__)
|
logger = get_logger(__file__)
|
||||||
|
|
||||||
AUTOMATION_CONFIGURATION_KEY = "automation shortumation"
|
AUTOMATION_CONFIGURATION_KEY = "automation shortumation"
|
||||||
|
|
||||||
|
|
||||||
def extract_automation_paths(
|
def load_and_iter_automations(
|
||||||
|
hass_config: HassConfig, tag_manager: TagManager
|
||||||
|
) -> Iterator[ExtenededAutomation]:
|
||||||
|
for ref in extract_automation_refs(hass_config):
|
||||||
|
try:
|
||||||
|
if isinstance(ref, IncludedAutoamtion):
|
||||||
|
yield from load_automation_path(
|
||||||
|
hass_config.root_path,
|
||||||
|
hass_config.root_path / ref.ref.path,
|
||||||
|
ref.configuration_key,
|
||||||
|
tag_manager,
|
||||||
|
)
|
||||||
|
elif isinstance(ref, InlineAutomation):
|
||||||
|
yield from load_automation_inline_ref(hass_config.root_path, tag_manager, ref)
|
||||||
|
else:
|
||||||
|
raise AssertionError(f"ref has an invalid type of {type(ref)} = {ref}")
|
||||||
|
except InvalidAutomationFile as e:
|
||||||
|
logger.error(e)
|
||||||
|
|
||||||
|
|
||||||
|
def extract_automation_refs(
|
||||||
hass_config: HassConfig,
|
hass_config: HassConfig,
|
||||||
) -> Iterator[Tuple[str, str]]:
|
) -> AutomationExtractedIter:
|
||||||
found = False
|
found = False
|
||||||
|
|
||||||
|
for ref in chain(
|
||||||
|
extract_automation_root_refs(hass_config), extract_automation_package_refs(hass_config)
|
||||||
|
):
|
||||||
|
found = True
|
||||||
|
yield ref
|
||||||
|
|
||||||
|
if not found:
|
||||||
|
yield IncludedAutoamtion([""], IncludedYaml(hass_config.root_path / "automations.yaml"))
|
||||||
|
|
||||||
|
|
||||||
|
def extract_automation_root_refs(
|
||||||
|
hass_config: HassConfig,
|
||||||
|
) -> AutomationExtractedIter:
|
||||||
for key, value in extract_automation_keys(hass_config):
|
for key, value in extract_automation_keys(hass_config):
|
||||||
logger.info(f"Loading automations from '{key}'")
|
logger.info(f"Loading automations from '{key}'")
|
||||||
found = True
|
if isinstance(value, IncludedYamlDir): # type: ignore
|
||||||
if isinstance(value, IncludedYaml):
|
yield IncludedAutoamtion([key], value) # type: ignore
|
||||||
yield key, value.path_str
|
elif isinstance(value, list):
|
||||||
elif isinstance(value, IncludedYamlDir):
|
yield InlineAutomation(
|
||||||
yield key, value.name
|
configuration_key=[key],
|
||||||
|
automations=value,
|
||||||
|
source_file=hass_config.get_configuration_path(),
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
logger.warning(f"found an invalid type in {key}!")
|
logger.warning(f"found an invalid type in {key}!")
|
||||||
if not found:
|
|
||||||
yield "", "automations.yaml"
|
|
||||||
|
|
||||||
|
|
||||||
def get_base_automation_key(hass_config: HassConfig):
|
def extract_automation_package_refs(hass_config: HassConfig) -> AutomationExtractedIter:
|
||||||
|
if packages_config := hass_config.homeassistant.get("packages", None):
|
||||||
|
if isinstance(packages_config, IncludedYaml):
|
||||||
|
packages = packages_config.to_normalized_json()
|
||||||
|
yield from extract_automation_inline_package_refs(
|
||||||
|
packages_config.path,
|
||||||
|
["homeassistant", "packages"],
|
||||||
|
packages,
|
||||||
|
)
|
||||||
|
elif isinstance(packages_config, IncludedYamlDirList):
|
||||||
|
raise AssertionError("cannot configure packages with 'included_dir_list' directive")
|
||||||
|
elif isinstance(packages_config, IncludedYamlDirNamed):
|
||||||
|
packages = packages_config.to_normalized_json(use_path_as_keys=True)
|
||||||
|
for package_path, package in packages.items():
|
||||||
|
yield from extract_automation_inline_package_refs(
|
||||||
|
package_path,
|
||||||
|
[],
|
||||||
|
{package_path.stem: package},
|
||||||
|
ignore_package_name=True,
|
||||||
|
)
|
||||||
|
elif isinstance(packages_config, IncludedYamlDirMergedNamed):
|
||||||
|
for (
|
||||||
|
pacakge_set_path,
|
||||||
|
package_set,
|
||||||
|
) in iter(packages_config):
|
||||||
|
if not isinstance(package_set, dict):
|
||||||
|
raise AssertionError(
|
||||||
|
f"expected {pacakge_set_path} to be a dictionary but got {type(package_set)}"
|
||||||
|
)
|
||||||
|
yield from extract_automation_inline_package_refs(
|
||||||
|
source_file=pacakge_set_path,
|
||||||
|
prefix_config_keys=[],
|
||||||
|
packages_config=package_set,
|
||||||
|
)
|
||||||
|
elif isinstance(packages_config, dict):
|
||||||
|
yield from extract_automation_inline_package_refs(
|
||||||
|
hass_config.root_path,
|
||||||
|
["homeassistant", "packages"],
|
||||||
|
packages_config,
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
raise AssertionError("configurations.homeassistant.packages must be a dictionary!")
|
||||||
|
|
||||||
|
|
||||||
|
def extract_automation_inline_package_refs(
|
||||||
|
source_file: Path,
|
||||||
|
prefix_config_keys: ConfigurationKey,
|
||||||
|
packages_config: dict,
|
||||||
|
ignore_package_name=False,
|
||||||
|
) -> AutomationExtractedIter:
|
||||||
|
for package_name, package_data in packages_config.items():
|
||||||
|
if isinstance(package_data, IncludedYaml):
|
||||||
|
package_mapping = package_data.to_normalized_json()
|
||||||
|
yield from extract_automation_from_package(
|
||||||
|
package_data=package_mapping,
|
||||||
|
package_name=package_name,
|
||||||
|
source_file=source_file,
|
||||||
|
prefix_config_keys=prefix_config_keys,
|
||||||
|
ignore_package_name=ignore_package_name,
|
||||||
|
)
|
||||||
|
elif isinstance(package_data, IncludedYamlDirList):
|
||||||
|
raise NotImplementedError(package_data)
|
||||||
|
elif isinstance(package_data, IncludedYamlDirNamed):
|
||||||
|
for package_key_path in package_data.to_normalized_json(True).keys():
|
||||||
|
if package_key_path.stem == "automation":
|
||||||
|
yield IncludedAutoamtion(
|
||||||
|
configuration_key=[package_name], ref=IncludedYaml(package_key_path)
|
||||||
|
)
|
||||||
|
elif isinstance(package_data, IncludedYamlDirMergedNamed):
|
||||||
|
for data_path, data_set in iter(package_data):
|
||||||
|
yield from extract_automation_from_package(
|
||||||
|
package_name=package_name,
|
||||||
|
package_data=data_set,
|
||||||
|
source_file=data_path,
|
||||||
|
prefix_config_keys=[],
|
||||||
|
ignore_package_name=True,
|
||||||
|
)
|
||||||
|
elif isinstance(package_data, dict):
|
||||||
|
yield from extract_automation_from_package(
|
||||||
|
package_data=package_data,
|
||||||
|
package_name=package_name,
|
||||||
|
source_file=source_file,
|
||||||
|
prefix_config_keys=prefix_config_keys,
|
||||||
|
ignore_package_name=ignore_package_name,
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
raise AssertionError(
|
||||||
|
f"configurations.homeassistant.packages[{package_name}] must be a dictionary!"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def extract_automation_from_package(
|
||||||
|
package_name: str,
|
||||||
|
package_data: dict,
|
||||||
|
source_file: Path,
|
||||||
|
prefix_config_keys: ConfigurationKey,
|
||||||
|
ignore_package_name=False,
|
||||||
|
) -> AutomationExtractedIter:
|
||||||
|
if automations := package_data.get("automation", None):
|
||||||
|
logger.info(f"Loading automations from package '{package_name}'")
|
||||||
|
suffix_keys = [package_name] if not ignore_package_name else []
|
||||||
|
if isinstance(automations, IncludedYamlDir): # type: ignore
|
||||||
|
yield IncludedAutoamtion(suffix_keys, automations)
|
||||||
|
elif isinstance(automations, list):
|
||||||
|
yield InlineAutomation(
|
||||||
|
source_file=source_file,
|
||||||
|
configuration_key=[*prefix_config_keys, *suffix_keys, "automation"],
|
||||||
|
automations=automations,
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
logger.warning(
|
||||||
|
f"found an invalid type in {package_name}! automations must be included or inlined as a list"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def get_base_automation_key(hass_config: HassConfig) -> Tuple[ConfigurationKey, str]:
|
||||||
found_any = False
|
found_any = False
|
||||||
for key, value in extract_automation_keys(hass_config):
|
for key, value in extract_automation_keys(hass_config):
|
||||||
found_any = True
|
found_any = True
|
||||||
if isinstance(value, IncludedYaml):
|
if isinstance(value, IncludedYaml):
|
||||||
return key, value.path_str
|
return [key], str(value.path.relative_to(hass_config.root_path))
|
||||||
configurations = hass_config.configurations
|
configurations = hass_config.configurations
|
||||||
if found_any:
|
if found_any:
|
||||||
out_path = hass_config.get_backup_automation_file_path()
|
out_path = hass_config.get_backup_automation_file_path()
|
||||||
else:
|
else:
|
||||||
out_path = hass_config.get_default_automation_path()
|
if not (out_path := hass_config.get_default_automation_path()): # type: ignore
|
||||||
|
raise AssertionError("Failed to find automation files...")
|
||||||
out_file = str(out_path.relative_to(hass_config.root_path))
|
out_file = str(out_path.relative_to(hass_config.root_path))
|
||||||
configurations[AUTOMATION_CONFIGURATION_KEY] = IncludedYaml(out_file)
|
configurations[AUTOMATION_CONFIGURATION_KEY] = IncludedYaml(out_path)
|
||||||
out_path.touch(exist_ok=True)
|
out_path.touch(exist_ok=True)
|
||||||
with hass_config.get_configuration_path().open("w") as fp:
|
with hass_config.get_configuration_path().open("w") as fp:
|
||||||
fp.write(dump_yaml(configurations))
|
fp.write(dump_yaml(configurations, root_path=hass_config.root_path))
|
||||||
return AUTOMATION_CONFIGURATION_KEY, out_file
|
return [AUTOMATION_CONFIGURATION_KEY], out_file
|
||||||
|
|
||||||
|
|
||||||
def extract_automation_keys(
|
def extract_automation_keys(
|
||||||
hass_config: HassConfig,
|
hass_config: HassConfig,
|
||||||
) -> Iterator[Tuple[str, Union[IncludedYaml, IncludedYamlDir]]]:
|
) -> Iterator[Tuple[str, IncludedYamlDir | list]]:
|
||||||
for key, value in hass_config.configurations.items():
|
for key, value in hass_config.configurations.items():
|
||||||
if str(key).startswith("automation"):
|
if str(key).startswith("automation"):
|
||||||
if isinstance(value, dict) or isinstance(value, list):
|
if isinstance(value, list):
|
||||||
raise NotImplementedError(
|
yield key, value
|
||||||
"No support for automations baked into configuration.yaml! Please extract these into a seperate file"
|
elif isinstance(value, IncludedYamlDir): # type: ignore
|
||||||
)
|
|
||||||
elif isinstance(value, IncludedYaml) or isinstance(value, IncludedYamlDir):
|
|
||||||
yield key, value
|
yield key, value
|
||||||
else:
|
else:
|
||||||
logger.warning(f"found an invalid type in {key}!")
|
logger.warning(f"found an invalid type in {key}!")
|
||||||
|
|
||||||
|
|
||||||
|
def load_automation_inline_ref(
|
||||||
|
root_path: Path, tag_manager: TagManager, inline_automation: InlineAutomation
|
||||||
|
) -> Iterator[ExtenededAutomation]:
|
||||||
|
for auto in inline_automation.automations:
|
||||||
|
try:
|
||||||
|
yield ExtenededAutomation(
|
||||||
|
**clean_automation(auto),
|
||||||
|
tags=tag_manager.get(auto["id"], {}),
|
||||||
|
configuration_key=inline_automation.configuration_key,
|
||||||
|
source_file=str(inline_automation.source_file.resolve().relative_to(root_path)),
|
||||||
|
source_file_type="inline",
|
||||||
|
)
|
||||||
|
except Exception as err:
|
||||||
|
raise InvalidAutomationFile(
|
||||||
|
when="reading file contents",
|
||||||
|
automation_path=inline_automation.source_file,
|
||||||
|
error=err,
|
||||||
|
) from err
|
||||||
|
|
||||||
|
|
||||||
def load_automation_path(
|
def load_automation_path(
|
||||||
root_path: Path,
|
root_path: Path,
|
||||||
automation_path: Path,
|
automation_path: Path,
|
||||||
configuration_key: str,
|
configuration_key: ConfigurationKey,
|
||||||
tag_manager: TagManager,
|
tag_manager: TagManager,
|
||||||
) -> Iterator[ExtenededAutomation]:
|
) -> Iterator[ExtenededAutomation]:
|
||||||
"""
|
"""
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
automation_path (Path)
|
automation_path (Path)
|
||||||
configuration_key (str)
|
configuration_key (list[str])
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
Iterator[ExtenededAutomation]
|
Iterator[ExtenededAutomation]
|
||||||
@@ -93,7 +276,7 @@ def load_automation_path(
|
|||||||
else:
|
else:
|
||||||
try:
|
try:
|
||||||
with automation_path.open("r") as fp:
|
with automation_path.open("r") as fp:
|
||||||
automations = load_yaml(fp)
|
automations = load_yaml(fp, root_path=root_path)
|
||||||
except Exception as err:
|
except Exception as err:
|
||||||
raise InvalidAutomationFile(
|
raise InvalidAutomationFile(
|
||||||
when="loading yaml",
|
when="loading yaml",
|
||||||
@@ -107,7 +290,7 @@ def load_automation_path(
|
|||||||
**clean_automation(automations),
|
**clean_automation(automations),
|
||||||
tags=tag_manager.get(automations["id"], {}),
|
tags=tag_manager.get(automations["id"], {}),
|
||||||
configuration_key=configuration_key,
|
configuration_key=configuration_key,
|
||||||
source_file=str(automation_path.relative_to(root_path)),
|
source_file=str(automation_path.resolve().relative_to(root_path)),
|
||||||
source_file_type="obj",
|
source_file_type="obj",
|
||||||
)
|
)
|
||||||
except Exception as err:
|
except Exception as err:
|
||||||
@@ -126,7 +309,7 @@ def load_automation_path(
|
|||||||
**clean_automation(automation),
|
**clean_automation(automation),
|
||||||
tags=tag_manager.get(automation["id"], {}),
|
tags=tag_manager.get(automation["id"], {}),
|
||||||
configuration_key=configuration_key,
|
configuration_key=configuration_key,
|
||||||
source_file=str(automation_path.relative_to(root_path)),
|
source_file=str(automation_path.resolve().relative_to(root_path)),
|
||||||
source_file_type="list",
|
source_file_type="list",
|
||||||
)
|
)
|
||||||
except Exception as err:
|
except Exception as err:
|
||||||
|
|||||||
@@ -1,20 +1,23 @@
|
|||||||
from enum import auto
|
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from tempfile import mktemp
|
from tempfile import mktemp
|
||||||
from typing import Dict, Optional, Union
|
from typing import Optional, Union
|
||||||
|
|
||||||
|
from src.errors import ErrorSet
|
||||||
from src.hass_config.loader import HassConfig
|
from src.hass_config.loader import HassConfig
|
||||||
|
from src.logger import get_logger
|
||||||
from src.yaml_serializer import dump_yaml, load_yaml
|
from src.yaml_serializer import dump_yaml, load_yaml
|
||||||
|
|
||||||
from ..errors import ErrorSet
|
|
||||||
from ..logger import get_logger
|
|
||||||
from .db import AutomationDBConnection
|
from .db import AutomationDBConnection
|
||||||
from .errors import (
|
from .errors import (
|
||||||
AttemptingToOverwriteAnIncompatibleFileError,
|
AttemptingToOverwriteAnIncompatibleFileError,
|
||||||
DBError,
|
DBError,
|
||||||
InvalidAutomationFile,
|
InvalidAutomationFile,
|
||||||
)
|
)
|
||||||
from .loader import extract_automation_paths, get_base_automation_key, load_automation_path
|
from .loader import (
|
||||||
|
get_base_automation_key,
|
||||||
|
load_and_iter_automations,
|
||||||
|
load_automation_path,
|
||||||
|
)
|
||||||
from .tags import TagManager
|
from .tags import TagManager
|
||||||
from .types import Automation, ExtenededAutomation
|
from .types import Automation, ExtenededAutomation
|
||||||
|
|
||||||
@@ -28,7 +31,7 @@ class AutomationManager:
|
|||||||
db_path: Optional[Path] = None,
|
db_path: Optional[Path] = None,
|
||||||
) -> None:
|
) -> None:
|
||||||
if db_path is None:
|
if db_path is None:
|
||||||
db_path = Path(mktemp())
|
db_path = Path(mktemp()) # nosec
|
||||||
self.hass_config = hass_config
|
self.hass_config = hass_config
|
||||||
self.db = AutomationDBConnection(db_path)
|
self.db = AutomationDBConnection(db_path)
|
||||||
self.tag_path = hass_config.get_automation_tags_path()
|
self.tag_path = hass_config.get_automation_tags_path()
|
||||||
@@ -39,27 +42,32 @@ class AutomationManager:
|
|||||||
if self.tag_path.exists():
|
if self.tag_path.exists():
|
||||||
self.tag_manager = TagManager.load(self.tag_path)
|
self.tag_manager = TagManager.load(self.tag_path)
|
||||||
|
|
||||||
def reload(self):
|
def reload(self, batch_size: int = 100):
|
||||||
self.db.reset()
|
self.db.reset()
|
||||||
self.reload_tags()
|
self.reload_tags()
|
||||||
errors = []
|
errors = []
|
||||||
for config_key, p in extract_automation_paths(self.hass_config):
|
auto_it = load_and_iter_automations(self.hass_config, self.tag_manager)
|
||||||
|
batch: list[ExtenededAutomation] = []
|
||||||
|
stop = False
|
||||||
|
while not stop:
|
||||||
try:
|
try:
|
||||||
automations = list(
|
batch.append(next(auto_it))
|
||||||
load_automation_path(
|
if len(batch) >= batch_size:
|
||||||
self.hass_config.root_path,
|
self.db.insert_automations(batch)
|
||||||
self.hass_config.root_path / p,
|
batch = []
|
||||||
config_key,
|
except StopIteration:
|
||||||
self.tag_manager,
|
if stop:
|
||||||
)
|
break
|
||||||
)
|
stop = True
|
||||||
self.db.insert_automations(automations)
|
|
||||||
except InvalidAutomationFile as e:
|
|
||||||
logger.warning(e)
|
|
||||||
errors.append(e)
|
|
||||||
except DBError as e:
|
except DBError as e:
|
||||||
logger.warning(e)
|
logger.warning(e)
|
||||||
errors.append(e)
|
errors.append(e)
|
||||||
|
try:
|
||||||
|
if len(batch) >= 0:
|
||||||
|
self.db.insert_automations(batch)
|
||||||
|
except DBError as e:
|
||||||
|
logger.warning(e)
|
||||||
|
errors.append(e)
|
||||||
if len(errors) > 0:
|
if len(errors) > 0:
|
||||||
raise ErrorSet(*errors)
|
raise ErrorSet(*errors)
|
||||||
|
|
||||||
@@ -92,7 +100,7 @@ class AutomationManager:
|
|||||||
objs: Optional[Union[list, dict]] = None
|
objs: Optional[Union[list, dict]] = None
|
||||||
if automation_path.exists():
|
if automation_path.exists():
|
||||||
with automation_path.open("r") as fp:
|
with automation_path.open("r") as fp:
|
||||||
objs = load_yaml(fp)
|
objs = load_yaml(fp, self.hass_config.root_path)
|
||||||
|
|
||||||
if automation.source_file_type == "obj":
|
if automation.source_file_type == "obj":
|
||||||
if isinstance(objs, list):
|
if isinstance(objs, list):
|
||||||
@@ -100,8 +108,8 @@ class AutomationManager:
|
|||||||
f"{automation_path} is a list, but expected a obj for {automation}"
|
f"{automation_path} is a list, but expected a obj for {automation}"
|
||||||
)
|
)
|
||||||
raw_auto = automation.to_primitive(include_tags=False)
|
raw_auto = automation.to_primitive(include_tags=False)
|
||||||
automation_path.write_text(dump_yaml(raw_auto))
|
automation_path.write_text(dump_yaml(raw_auto, self.hass_config.root_path))
|
||||||
else:
|
elif automation.source_file_type == "list":
|
||||||
if isinstance(objs, dict):
|
if isinstance(objs, dict):
|
||||||
raise AttemptingToOverwriteAnIncompatibleFileError(
|
raise AttemptingToOverwriteAnIncompatibleFileError(
|
||||||
f"{automation_path} is a list, but expected a obj for {automation}"
|
f"{automation_path} is a list, but expected a obj for {automation}"
|
||||||
@@ -112,23 +120,34 @@ class AutomationManager:
|
|||||||
raise AssertionError(
|
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}"
|
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
|
update_or_append_to_automation_list(
|
||||||
for i, obj in enumerate(objs):
|
objs=objs,
|
||||||
if obj["id"] == automation.id:
|
automation=automation,
|
||||||
objs[i] = automation.to_primitive(include_tags=False)
|
create_if_not_found=create_if_not_found,
|
||||||
found = True
|
)
|
||||||
break
|
automation_path.write_text(dump_yaml(objs, self.hass_config.root_path))
|
||||||
if not found:
|
elif automation.source_file_type == "inline":
|
||||||
if create_if_not_found:
|
if not isinstance(objs, dict):
|
||||||
objs.append(automation.to_primitive(include_tags=False))
|
raise AssertionError(
|
||||||
else:
|
f"expected {automation.source_file} to be a dict instead found {type(objs)}"
|
||||||
raise InvalidAutomationFile(
|
)
|
||||||
"Could not update automations, not found in source file."
|
update_obj = objs
|
||||||
)
|
for key in automation.configuration_key:
|
||||||
automation_path.write_text(dump_yaml(objs))
|
update_obj = update_obj[key]
|
||||||
|
if not isinstance(update_obj, list):
|
||||||
|
raise AssertionError(
|
||||||
|
f"expected {automation.source_file}@{automation.configuration_key} to be a list instead found {type(update_obj)}"
|
||||||
|
)
|
||||||
|
update_or_append_to_automation_list(
|
||||||
|
objs=update_obj,
|
||||||
|
automation=automation,
|
||||||
|
create_if_not_found=create_if_not_found,
|
||||||
|
)
|
||||||
|
automation_path.write_text(dump_yaml(objs, self.hass_config.root_path))
|
||||||
|
|
||||||
self.update_tags(automation.id, automation.tags)
|
self.update_tags(automation.id, automation.tags)
|
||||||
|
|
||||||
def update_tags(self, automation_id: str, tags: Dict[str, str]):
|
def update_tags(self, automation_id: str, tags: dict[str, str]):
|
||||||
self.reload_tags()
|
self.reload_tags()
|
||||||
self.tag_manager[automation_id] = tags
|
self.tag_manager[automation_id] = tags
|
||||||
self.tag_manager.save(self.tag_path)
|
self.tag_manager.save(self.tag_path)
|
||||||
@@ -145,7 +164,7 @@ class AutomationManager:
|
|||||||
automation_path.unlink(missing_ok=True)
|
automation_path.unlink(missing_ok=True)
|
||||||
else:
|
else:
|
||||||
with automation_path.open("r") as fp:
|
with automation_path.open("r") as fp:
|
||||||
objs = load_yaml(fp)
|
objs = load_yaml(fp, self.hass_config.root_path)
|
||||||
if not isinstance(objs, list):
|
if not isinstance(objs, list):
|
||||||
raise AssertionError(
|
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}"
|
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}"
|
||||||
@@ -154,5 +173,21 @@ class AutomationManager:
|
|||||||
for i, obj in enumerate(objs):
|
for i, obj in enumerate(objs):
|
||||||
if obj["id"] != automation.id:
|
if obj["id"] != automation.id:
|
||||||
kept.append(obj)
|
kept.append(obj)
|
||||||
automation_path.write_text(dump_yaml(kept))
|
automation_path.write_text(dump_yaml(kept, self.hass_config.root_path))
|
||||||
self.delete_tags(automation.id)
|
self.delete_tags(automation.id)
|
||||||
|
|
||||||
|
|
||||||
|
def update_or_append_to_automation_list(
|
||||||
|
objs: list[dict],
|
||||||
|
automation: ExtenededAutomation,
|
||||||
|
create_if_not_found: bool = False,
|
||||||
|
):
|
||||||
|
for i, obj in enumerate(objs):
|
||||||
|
if obj["id"] == automation.id:
|
||||||
|
objs[i] = automation.to_primitive(include_tags=False)
|
||||||
|
return True
|
||||||
|
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.")
|
||||||
|
return False
|
||||||
@@ -1,16 +1,15 @@
|
|||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Dict
|
|
||||||
|
|
||||||
from src.yaml_serializer import dump_yaml, load_yaml
|
from src.yaml_serializer import dump_yaml, load_yaml
|
||||||
|
|
||||||
|
|
||||||
class TagManager(Dict[str, Dict[str, str]]):
|
class TagManager(dict[str, dict[str, str]]):
|
||||||
def save(self, path: Path):
|
def save(self, path: Path):
|
||||||
if not path.parent.exists():
|
if not path.parent.exists():
|
||||||
path.parent.mkdir(parents=True)
|
path.parent.mkdir(parents=True)
|
||||||
path.write_text(dump_yaml(dict(self)))
|
path.write_text(dump_yaml(dict(self), root_path=path.parent))
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def load(cls, path: Path):
|
def load(cls, path: Path):
|
||||||
with path.open("r") as fp:
|
with path.open("r") as fp:
|
||||||
return cls(load_yaml(fp))
|
return cls(load_yaml(fp, root_path=path.parent))
|
||||||
@@ -1,27 +1,46 @@
|
|||||||
import json
|
import json
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Dict, List, Literal, Optional, Union
|
from typing import Iterator, Literal, NamedTuple, Optional, Union
|
||||||
|
|
||||||
from pydantic import BaseModel
|
from pydantic import BaseModel
|
||||||
from pydantic.fields import Field
|
from pydantic.fields import Field
|
||||||
|
|
||||||
|
from src.yaml_serializer import IncludedYamlDir
|
||||||
|
|
||||||
|
ConfigurationKey = list[str]
|
||||||
|
|
||||||
|
|
||||||
|
class InlineAutomation(NamedTuple):
|
||||||
|
configuration_key: ConfigurationKey
|
||||||
|
source_file: Path
|
||||||
|
automations: list[dict]
|
||||||
|
|
||||||
|
|
||||||
|
class IncludedAutoamtion(NamedTuple):
|
||||||
|
configuration_key: ConfigurationKey
|
||||||
|
ref: IncludedYamlDir
|
||||||
|
|
||||||
|
|
||||||
|
ExtractedAutomation = InlineAutomation | IncludedAutoamtion
|
||||||
|
AutomationExtractedIter = Iterator[ExtractedAutomation]
|
||||||
|
|
||||||
|
|
||||||
class BaseAutomation(BaseModel):
|
class BaseAutomation(BaseModel):
|
||||||
id: str
|
id: str
|
||||||
alias: Optional[str] = None
|
alias: Optional[str] = None
|
||||||
description: Optional[str] = None
|
description: Optional[str] = None
|
||||||
trigger_variables: Optional[Dict[str, Union[str, int, bool, float]]] = None
|
trigger_variables: Optional[dict[str, Union[str, int, bool, float]]] = None
|
||||||
mode: str = "single"
|
mode: str = "single"
|
||||||
trigger: List[dict] = []
|
trigger: list[dict] = []
|
||||||
condition: List[dict] = []
|
condition: list[dict] = []
|
||||||
action: List[dict] = []
|
action: list[dict] = []
|
||||||
|
|
||||||
def to_primitive(self):
|
def to_primitive(self):
|
||||||
return self.dict(exclude_unset=True, exclude_none=True)
|
return self.dict(exclude_unset=True, exclude_none=True)
|
||||||
|
|
||||||
|
|
||||||
class Automation(BaseAutomation):
|
class Automation(BaseAutomation):
|
||||||
tags: Dict[str, str] = Field(default_factory=dict)
|
tags: dict[str, str] = Field(default_factory=dict)
|
||||||
|
|
||||||
def to_primitive(self, include_tags: bool = False):
|
def to_primitive(self, include_tags: bool = False):
|
||||||
out = super().to_primitive()
|
out = super().to_primitive()
|
||||||
@@ -32,8 +51,8 @@ class Automation(BaseAutomation):
|
|||||||
|
|
||||||
class ExtenededAutomation(Automation):
|
class ExtenededAutomation(Automation):
|
||||||
source_file: str
|
source_file: str
|
||||||
source_file_type: Literal["list", "obj"]
|
source_file_type: Literal["list", "obj", "inline"]
|
||||||
configuration_key: str
|
configuration_key: ConfigurationKey
|
||||||
|
|
||||||
def to_primitive(self, include_tags: bool = False):
|
def to_primitive(self, include_tags: bool = False):
|
||||||
out = super().to_primitive(include_tags=include_tags)
|
out = super().to_primitive(include_tags=include_tags)
|
||||||
|
|||||||
@@ -1,11 +1,10 @@
|
|||||||
import argparse
|
import argparse
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Dict, List
|
|
||||||
|
|
||||||
import yaml
|
import yaml
|
||||||
|
|
||||||
|
|
||||||
def convert_tags(automations: List[dict], tags: Dict[int, dict]) -> Dict[str, dict]:
|
def convert_tags(automations: list[dict], tags: dict[int, dict]) -> dict[str, dict]:
|
||||||
converted = {}
|
converted = {}
|
||||||
for tagsIdx, tagValues in tags.items():
|
for tagsIdx, tagValues in tags.items():
|
||||||
if tagsIdx < len(automations):
|
if tagsIdx < len(automations):
|
||||||
|
|||||||
@@ -1,9 +1,8 @@
|
|||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import List, Optional
|
from typing import Optional
|
||||||
|
|
||||||
from src.automations.tags import TagManager
|
from src.automations.tags import TagManager
|
||||||
from src.yaml_serializer import dump_yaml, load_yaml
|
from src.yaml_serializer import IncludedYaml, IncludedYamlDir, load_yaml
|
||||||
from src.yaml_serializer.types import IncludedYaml
|
|
||||||
|
|
||||||
|
|
||||||
class HassConfig:
|
class HassConfig:
|
||||||
@@ -13,7 +12,18 @@ class HassConfig:
|
|||||||
@property
|
@property
|
||||||
def configurations(self) -> dict:
|
def configurations(self) -> dict:
|
||||||
with self.get_configuration_path().open("r") as f:
|
with self.get_configuration_path().open("r") as f:
|
||||||
return dict(load_yaml(f)) # type: ignore
|
return dict(load_yaml(f, root_path=self.root_path)) # type: ignore
|
||||||
|
|
||||||
|
@property
|
||||||
|
def homeassistant(self) -> dict:
|
||||||
|
if homeassistant_config := self.configurations.get("homeassistant", None):
|
||||||
|
if isinstance(homeassistant_config, IncludedYamlDir): # type: ignore
|
||||||
|
homeassistant_config = homeassistant_config.to_normalized_json()
|
||||||
|
if isinstance(homeassistant_config, dict):
|
||||||
|
return homeassistant_config
|
||||||
|
else:
|
||||||
|
raise AssertionError("configurations.homeassistant must be a dictionary!")
|
||||||
|
return {}
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def automation_tags(self) -> TagManager:
|
def automation_tags(self) -> TagManager:
|
||||||
@@ -36,7 +46,7 @@ class HassConfig:
|
|||||||
if "automation" in config:
|
if "automation" in config:
|
||||||
automation_ref = config["automation"]
|
automation_ref = config["automation"]
|
||||||
if isinstance(automation_ref, IncludedYaml):
|
if isinstance(automation_ref, IncludedYaml):
|
||||||
return self.root_path / automation_ref.path_str
|
return automation_ref.path
|
||||||
else:
|
else:
|
||||||
return None
|
return None
|
||||||
return self.root_path / "automations.yaml"
|
return self.root_path / "automations.yaml"
|
||||||
@@ -52,6 +62,3 @@ class HassConfig:
|
|||||||
|
|
||||||
def get_configuration_path(self) -> Path:
|
def get_configuration_path(self) -> Path:
|
||||||
return self.root_path / "configuration.yaml"
|
return self.root_path / "configuration.yaml"
|
||||||
|
|
||||||
def save_tags(self, tags: TagManager):
|
|
||||||
tags.save(self.get_automation_tags_path())
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
import json
|
import json
|
||||||
from typing import Any, List
|
from typing import Any
|
||||||
|
|
||||||
|
|
||||||
def json_dumps(obj: Any) -> str:
|
def json_dumps(obj: Any) -> str:
|
||||||
|
|||||||
+14
-1
@@ -1,5 +1,5 @@
|
|||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Iterator
|
from typing import Iterator, TypeVar
|
||||||
|
|
||||||
|
|
||||||
def extract_files(p: Path) -> Iterator[Path]:
|
def extract_files(p: Path) -> Iterator[Path]:
|
||||||
@@ -18,3 +18,16 @@ def extract_files(p: Path) -> Iterator[Path]:
|
|||||||
yield from extract_files(c)
|
yield from extract_files(c)
|
||||||
else:
|
else:
|
||||||
yield p
|
yield p
|
||||||
|
|
||||||
|
|
||||||
|
T = TypeVar("T")
|
||||||
|
|
||||||
|
|
||||||
|
def batch(it: Iterator[T], batch_size: int) -> Iterator[list[T]]:
|
||||||
|
b = []
|
||||||
|
for n in it:
|
||||||
|
b.append(n)
|
||||||
|
if len(b) >= batch_size:
|
||||||
|
yield b
|
||||||
|
if len(b) > 0:
|
||||||
|
yield b
|
||||||
@@ -34,7 +34,12 @@ class WSRedirector:
|
|||||||
return await self._client.send(msg)
|
return await self._client.send(msg)
|
||||||
|
|
||||||
async def start(self):
|
async def start(self):
|
||||||
async with connect(self._host) as websocket:
|
async with connect(
|
||||||
|
self._host,
|
||||||
|
max_size=16 * 2**20,
|
||||||
|
read_limit=16 * 2**20,
|
||||||
|
write_limit=16 * 2**20,
|
||||||
|
) as websocket:
|
||||||
self._client = websocket
|
self._client = websocket
|
||||||
await websocket.send(json.dumps({"type": "auth", "access_token": self._token}))
|
await websocket.send(json.dumps({"type": "auth", "access_token": self._token}))
|
||||||
while not self.is_closed:
|
while not self.is_closed:
|
||||||
|
|||||||
@@ -1,41 +1,198 @@
|
|||||||
import io
|
from pathlib import Path
|
||||||
from typing import Any, TextIO, Union
|
from typing import Iterator, NamedTuple, Tuple, Union
|
||||||
|
|
||||||
import yaml
|
from yaml.nodes import Node
|
||||||
|
|
||||||
from src.yaml_serializer.dumper import YamlSafeDumper
|
from .manager import YamlManager
|
||||||
from src.yaml_serializer.loader import YamlSafeLoader
|
|
||||||
|
dump_yaml = YamlManager.dump_yaml
|
||||||
|
load_yaml = YamlManager.load_yaml
|
||||||
|
|
||||||
|
|
||||||
def dump_yaml(obj: Any) -> str:
|
def load_dir_yaml(folder_or_file: Path) -> Iterator[Tuple[Path, dict | list]]:
|
||||||
"""Convert a python object to a hass-compliant yaml string
|
if folder_or_file.is_dir():
|
||||||
|
for file in folder_or_file.iterdir():
|
||||||
|
yield from load_dir_yaml(file)
|
||||||
|
else:
|
||||||
|
with folder_or_file.open("r") as fp:
|
||||||
|
yield folder_or_file, load_yaml(fp, root_path=folder_or_file.parent)
|
||||||
|
|
||||||
Args:
|
|
||||||
obj (Any)
|
|
||||||
|
|
||||||
Returns:
|
@YamlManager.as_constructor("!include")
|
||||||
str
|
class IncludedYaml(NamedTuple):
|
||||||
|
"""Any time something in the yaml is specified as `include !filepath`
|
||||||
|
this data type will represent it.
|
||||||
"""
|
"""
|
||||||
stream = io.StringIO()
|
|
||||||
yaml.dump( # nosec
|
path: Path # original node path
|
||||||
obj,
|
|
||||||
stream,
|
@classmethod
|
||||||
default_flow_style=False,
|
def to_yaml(cls, representer, node: "IncludedYaml"):
|
||||||
allow_unicode=True,
|
return representer.represent_scalar(
|
||||||
sort_keys=False,
|
"!include", str(node.path.relative_to(representer.root_path))
|
||||||
Dumper=YamlSafeDumper,
|
)
|
||||||
)
|
|
||||||
stream.seek(0)
|
@classmethod
|
||||||
return stream.read()
|
def from_yaml(cls, constructor, node: Node):
|
||||||
|
return cls(constructor.root_path / node.value)
|
||||||
|
|
||||||
|
def to_normalized_json(self):
|
||||||
|
with self.path.open("r") as fp:
|
||||||
|
return load_yaml(fp, root_path=self.path.parent)
|
||||||
|
|
||||||
|
|
||||||
def load_yaml(yaml_stream: TextIO) -> Union[dict, list]:
|
# TODO: add support for these
|
||||||
"""Load yaml from string using some hass-compliant yaml strings
|
NOT_IMPLEMENTED_SV_MSG = "SECRET VALUE NOT IMPLEMENTED"
|
||||||
|
|
||||||
Args:
|
|
||||||
yaml_stream (io.StringIO)
|
|
||||||
|
|
||||||
Returns:
|
@YamlManager.as_constructor("!secret")
|
||||||
Union[dict, list]
|
class SecretValue(NamedTuple):
|
||||||
"""
|
name: str
|
||||||
return yaml.load(yaml_stream, Loader=YamlSafeLoader) # nosec
|
value: str
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def to_yaml(cls, representer, node: "SecretValue"):
|
||||||
|
return representer.represent_scalar("!secret", node.name)
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def from_yaml(cls, constructor, node: Node):
|
||||||
|
return cls(node.value, "n/a")
|
||||||
|
|
||||||
|
def to_normalized_json(self):
|
||||||
|
return NOT_IMPLEMENTED_SV_MSG
|
||||||
|
|
||||||
|
|
||||||
|
@YamlManager.as_constructor(
|
||||||
|
"!include_dir_merge_named",
|
||||||
|
)
|
||||||
|
class IncludedYamlDirMergedNamed(NamedTuple):
|
||||||
|
path: Path
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def to_yaml(cls, representer, node: "IncludedYamlDirMergedNamed"):
|
||||||
|
return representer.represent_scalar(
|
||||||
|
f"!include_dir_merge_named", str(node.path.relative_to(representer.root_path))
|
||||||
|
)
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def from_yaml(cls, constructor, node: Node):
|
||||||
|
return cls(constructor.root_path / node.value)
|
||||||
|
|
||||||
|
def __iter__(self):
|
||||||
|
return load_dir_yaml(self.path)
|
||||||
|
|
||||||
|
def to_normalized_json(self):
|
||||||
|
out = {}
|
||||||
|
for path, data in self:
|
||||||
|
overlap = set(data.keys()).intersection(set(out.keys()))
|
||||||
|
if len(overlap) > 0:
|
||||||
|
raise AssertionError(
|
||||||
|
f"The keys {overlap} were found in more than 1 file, cannot handle overlapping keys due to undefined behavior expectation. See {path}"
|
||||||
|
)
|
||||||
|
|
||||||
|
out = {
|
||||||
|
**out,
|
||||||
|
**data,
|
||||||
|
}
|
||||||
|
|
||||||
|
return out
|
||||||
|
|
||||||
|
|
||||||
|
@YamlManager.as_constructor(
|
||||||
|
"!include_dir_named",
|
||||||
|
)
|
||||||
|
class IncludedYamlDirNamed(NamedTuple):
|
||||||
|
path: Path
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def to_yaml(cls, representer, node: "IncludedYamlDirNamed"):
|
||||||
|
return representer.represent_scalar(
|
||||||
|
f"!include_dir_named", str(node.path.relative_to(representer.root_path))
|
||||||
|
)
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def from_yaml(cls, constructor, node: Node):
|
||||||
|
return cls(constructor.root_path / node.value)
|
||||||
|
|
||||||
|
def to_normalized_json(self, use_path_as_keys=False):
|
||||||
|
out = {}
|
||||||
|
for path, data in load_dir_yaml(self.path):
|
||||||
|
if out.get(path.name, None) is None:
|
||||||
|
out[path.stem if not use_path_as_keys else path] = data
|
||||||
|
else:
|
||||||
|
raise AssertionError(
|
||||||
|
f"expected {path.name} to be a unique file name but found a second file name in {path}"
|
||||||
|
)
|
||||||
|
|
||||||
|
return out
|
||||||
|
|
||||||
|
|
||||||
|
@YamlManager.as_constructor(
|
||||||
|
"!include_dir_merge_list",
|
||||||
|
)
|
||||||
|
class IncludedYamlMergeListDir(NamedTuple):
|
||||||
|
path: Path
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def to_yaml(cls, representer, node: "IncludedYamlMergeListDir"):
|
||||||
|
return representer.represent_scalar(
|
||||||
|
f"!include_dir_merge_list", str(node.path.relative_to(representer.root_path))
|
||||||
|
)
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def from_yaml(cls, constructor, node: Node):
|
||||||
|
return cls(constructor.root_path / node.value)
|
||||||
|
|
||||||
|
def to_normalized_json(self):
|
||||||
|
out = []
|
||||||
|
for path, data in load_dir_yaml(self.path):
|
||||||
|
if isinstance(data, list):
|
||||||
|
out.extend(data)
|
||||||
|
else:
|
||||||
|
raise AssertionError(f"expected {path} to be a list but got an object")
|
||||||
|
|
||||||
|
return out
|
||||||
|
|
||||||
|
|
||||||
|
@YamlManager.as_constructor(
|
||||||
|
"!include_dir_list",
|
||||||
|
)
|
||||||
|
class IncludedYamlDirList(NamedTuple):
|
||||||
|
path: Path
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def to_yaml(cls, representer, node: "IncludedYamlDirList"):
|
||||||
|
return representer.represent_scalar(
|
||||||
|
f"!include_dir_list", str(node.path.relative_to(representer.root_path))
|
||||||
|
)
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def from_yaml(cls, constructor, node: Node):
|
||||||
|
return cls(constructor.root_path / node.value)
|
||||||
|
|
||||||
|
def to_normalized_json(self):
|
||||||
|
return [data for _, data in load_dir_yaml(self.path)]
|
||||||
|
|
||||||
|
|
||||||
|
IncludedYamlDir = (
|
||||||
|
IncludedYamlDirMergedNamed
|
||||||
|
| IncludedYamlDirNamed
|
||||||
|
| IncludedYamlMergeListDir
|
||||||
|
| IncludedYamlDirList
|
||||||
|
| IncludedYaml
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@YamlManager.as_constructor(
|
||||||
|
"!env_var",
|
||||||
|
)
|
||||||
|
class EnvVar(NamedTuple):
|
||||||
|
value: str # original node name
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def to_yaml(cls, representer, node: "EnvVar"):
|
||||||
|
return representer.represent_scalar("!env_var", node.value)
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def from_yaml(cls, constructor, node: Node):
|
||||||
|
return cls(node.value)
|
||||||
@@ -1,16 +1,19 @@
|
|||||||
import yaml
|
from pathlib import Path
|
||||||
|
from typing import Optional, TextIO
|
||||||
|
|
||||||
from src.yaml_serializer.types import (
|
import yaml
|
||||||
IncludedYaml,
|
|
||||||
IncludedYamlDir,
|
|
||||||
SecretValue,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class YamlSafeDumper(yaml.SafeDumper):
|
class YamlSafeDumper(yaml.SafeDumper):
|
||||||
pass
|
def __init__(self, stream: TextIO, root_path: Optional[Path] = None) -> None:
|
||||||
|
if root_path is None:
|
||||||
|
self.root_path = Path.cwd()
|
||||||
|
else:
|
||||||
|
self.root_path = root_path
|
||||||
|
|
||||||
|
super().__init__(
|
||||||
YamlSafeDumper.add_representer(IncludedYaml, IncludedYaml.to_yaml) # type: ignore
|
stream,
|
||||||
YamlSafeDumper.add_representer(SecretValue, SecretValue.to_yaml) # type: ignore
|
default_flow_style=False,
|
||||||
YamlSafeDumper.add_representer(IncludedYamlDir, IncludedYamlDir.to_yaml) # type: ignore
|
allow_unicode=True,
|
||||||
|
sort_keys=False,
|
||||||
|
)
|
||||||
@@ -1,20 +1,13 @@
|
|||||||
import yaml
|
from pathlib import Path
|
||||||
|
from typing import Optional, TextIO
|
||||||
|
|
||||||
from src.yaml_serializer.types import (
|
import yaml
|
||||||
IncludedYaml,
|
|
||||||
IncludedYamlDir,
|
|
||||||
SecretValue,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class YamlSafeLoader(yaml.SafeLoader):
|
class YamlSafeLoader(yaml.SafeLoader):
|
||||||
pass
|
def __init__(self, stream: TextIO, root_path: Optional[Path] = None) -> None:
|
||||||
|
super().__init__(stream)
|
||||||
|
if root_path is None:
|
||||||
YamlSafeLoader.add_constructor("!include", IncludedYaml.from_yaml)
|
self.root_path = Path.cwd()
|
||||||
YamlSafeLoader.add_constructor("!secret", SecretValue.from_yaml)
|
else:
|
||||||
YamlSafeLoader.add_constructor("!env_var", IncludedYamlDir.from_yaml)
|
self.root_path = root_path
|
||||||
YamlSafeLoader.add_constructor("!include_dir_list", IncludedYamlDir.from_yaml)
|
|
||||||
YamlSafeLoader.add_constructor("!include_dir_merge_list", IncludedYamlDir.from_yaml)
|
|
||||||
YamlSafeLoader.add_constructor("!include_dir_named", IncludedYamlDir.from_yaml)
|
|
||||||
YamlSafeLoader.add_constructor("!include_dir_merge_named", IncludedYamlDir.from_yaml)
|
|
||||||
@@ -0,0 +1,61 @@
|
|||||||
|
import io
|
||||||
|
from pathlib import Path
|
||||||
|
from typing import Any, TextIO, Type, TypeVar, Union
|
||||||
|
|
||||||
|
from .dumper import YamlSafeDumper
|
||||||
|
from .loader import YamlSafeLoader
|
||||||
|
from .types import Constructor
|
||||||
|
|
||||||
|
ConstructorT = TypeVar("ConstructorT", bound=Type[Constructor])
|
||||||
|
|
||||||
|
|
||||||
|
class YamlManager:
|
||||||
|
Loader = YamlSafeLoader
|
||||||
|
Dumper = YamlSafeDumper
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def as_constructor(cls, *tags: str):
|
||||||
|
def wrapper(constructor: ConstructorT) -> ConstructorT:
|
||||||
|
for tag in tags:
|
||||||
|
cls.Loader.add_constructor(tag, constructor.from_yaml)
|
||||||
|
cls.Dumper.add_representer(constructor, constructor.to_yaml)
|
||||||
|
return constructor
|
||||||
|
|
||||||
|
return wrapper
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def load_yaml(cls, yaml_stream: TextIO, root_path: Path) -> Union[dict, list]:
|
||||||
|
"""Load yaml from string using some hass-compliant yaml strings
|
||||||
|
|
||||||
|
Args:
|
||||||
|
yaml_stream (io.StringIO)
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Union[dict, list]
|
||||||
|
"""
|
||||||
|
loader = cls.Loader(yaml_stream, root_path=root_path)
|
||||||
|
try:
|
||||||
|
return loader.get_single_data()
|
||||||
|
finally:
|
||||||
|
loader.dispose()
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def dump_yaml(cls, obj: Any, root_path: Path) -> str:
|
||||||
|
"""Convert a python object to a hass-compliant yaml string
|
||||||
|
|
||||||
|
Args:
|
||||||
|
obj (Any)
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
str
|
||||||
|
"""
|
||||||
|
stream = io.StringIO()
|
||||||
|
dumper = cls.Dumper(stream, root_path=root_path)
|
||||||
|
try:
|
||||||
|
dumper.open()
|
||||||
|
dumper.represent(obj)
|
||||||
|
dumper.close()
|
||||||
|
finally:
|
||||||
|
dumper.dispose()
|
||||||
|
stream.seek(0)
|
||||||
|
return stream.read()
|
||||||
@@ -1,61 +1,16 @@
|
|||||||
from typing import NamedTuple
|
from typing import Protocol
|
||||||
|
|
||||||
from yaml.nodes import Node
|
from yaml.nodes import Node
|
||||||
from yaml.representer import BaseRepresenter
|
|
||||||
|
from .dumper import YamlSafeDumper
|
||||||
|
from .loader import YamlSafeLoader
|
||||||
|
|
||||||
|
|
||||||
class IncludedYaml(NamedTuple):
|
class Constructor(Protocol):
|
||||||
"""Any time something in the yaml is specified as `include !filepath`
|
@classmethod
|
||||||
this data type will represent it.
|
def to_yaml(cls, representer: YamlSafeDumper, node: "Constructor"):
|
||||||
"""
|
...
|
||||||
|
|
||||||
path_str: str # original node path
|
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def to_yaml(cls, representer: BaseRepresenter, node: "IncludedYaml"):
|
def from_yaml(cls, constructor: YamlSafeLoader, node: Node):
|
||||||
return representer.represent_scalar("!include", node.path_str)
|
...
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def from_yaml(cls, _constructor, node: Node):
|
|
||||||
return cls(node.value)
|
|
||||||
|
|
||||||
|
|
||||||
# TODO: add support for these
|
|
||||||
NOT_IMPLEMENTED_SV_MSG = "SECRET VALUE NOT IMPLEMENTED"
|
|
||||||
|
|
||||||
|
|
||||||
class SecretValue(NamedTuple):
|
|
||||||
name: str
|
|
||||||
value: str
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def to_yaml(cls, representer: BaseRepresenter, node: "SecretValue"):
|
|
||||||
return representer.represent_scalar("!secret", node.name)
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def from_yaml(cls, _constructor, node: Node):
|
|
||||||
return cls(node.value, "n/a")
|
|
||||||
|
|
||||||
def to_normalized_json(self):
|
|
||||||
return NOT_IMPLEMENTED_SV_MSG
|
|
||||||
|
|
||||||
|
|
||||||
class IncludedYamlDir(NamedTuple):
|
|
||||||
"""
|
|
||||||
This is a stub for when we see, still need to add support!
|
|
||||||
- !include_dir_list
|
|
||||||
- !include_dir_merge_list
|
|
||||||
- !include_dir_named
|
|
||||||
- !include_dir_merge_named
|
|
||||||
"""
|
|
||||||
|
|
||||||
original_tag: str # original node name
|
|
||||||
name: str # original node name
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def to_yaml(cls, representer: BaseRepresenter, node: "IncludedYamlDir"):
|
|
||||||
return representer.represent_scalar(f"!{node.original_tag}", node.name)
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def from_yaml(cls, _constructor, node: Node):
|
|
||||||
return cls(node.tag[1:], node.value)
|
|
||||||
@@ -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,31 @@
|
|||||||
|
# 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
|
||||||
|
|
||||||
|
automation:
|
||||||
|
- id: "inline-auto"
|
||||||
|
alias: inline-auto
|
||||||
|
description: Example package auto
|
||||||
|
mode: single
|
||||||
|
trigger:
|
||||||
|
- platform: homeassistant
|
||||||
|
event: start
|
||||||
|
condition: []
|
||||||
|
action:
|
||||||
|
- service: counter.increment
|
||||||
|
data: {}
|
||||||
|
target:
|
||||||
|
entity_id: counter.up_times
|
||||||
|
|
||||||
|
homeassistant:
|
||||||
|
packages: !include_dir_merge_named packages
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
ha:
|
||||||
|
automation: !include ../automations/ui.yaml
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
package2:
|
||||||
|
automation:
|
||||||
|
- id: "package2"
|
||||||
|
alias: package ha
|
||||||
|
description: Example package auto
|
||||||
|
mode: single
|
||||||
|
trigger:
|
||||||
|
- platform: homeassistant
|
||||||
|
event: start
|
||||||
|
condition: []
|
||||||
|
action:
|
||||||
|
- service: counter.increment
|
||||||
|
data: {}
|
||||||
|
target:
|
||||||
|
entity_id: counter.up_times
|
||||||
@@ -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,31 @@
|
|||||||
|
# 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
|
||||||
|
|
||||||
|
automation:
|
||||||
|
- id: "inline-auto"
|
||||||
|
alias: inline-auto
|
||||||
|
description: Example package auto
|
||||||
|
mode: single
|
||||||
|
trigger:
|
||||||
|
- platform: homeassistant
|
||||||
|
event: start
|
||||||
|
condition: []
|
||||||
|
action:
|
||||||
|
- service: counter.increment
|
||||||
|
data: {}
|
||||||
|
target:
|
||||||
|
entity_id: counter.up_times
|
||||||
|
|
||||||
|
homeassistant:
|
||||||
|
packages: !include packages.yaml
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
ha: !include packages/ha.yaml
|
||||||
|
sub: !include_dir_named packages/sub
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
automation: !include ../automations/ui.yaml
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
- id: "package2"
|
||||||
|
alias: package ha
|
||||||
|
description: Example package auto
|
||||||
|
mode: single
|
||||||
|
trigger:
|
||||||
|
- platform: homeassistant
|
||||||
|
event: start
|
||||||
|
condition: []
|
||||||
|
action:
|
||||||
|
- service: counter.increment
|
||||||
|
data: {}
|
||||||
|
target:
|
||||||
|
entity_id: counter.up_times
|
||||||
@@ -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,31 @@
|
|||||||
|
# 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
|
||||||
|
|
||||||
|
automation:
|
||||||
|
- id: "inline-auto"
|
||||||
|
alias: inline-auto
|
||||||
|
description: Example package auto
|
||||||
|
mode: single
|
||||||
|
trigger:
|
||||||
|
- platform: homeassistant
|
||||||
|
event: start
|
||||||
|
condition: []
|
||||||
|
action:
|
||||||
|
- service: counter.increment
|
||||||
|
data: {}
|
||||||
|
target:
|
||||||
|
entity_id: counter.up_times
|
||||||
|
|
||||||
|
homeassistant:
|
||||||
|
packages: !include packages.yaml
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
ha: !include packages/ha.yaml
|
||||||
|
sub: !include_dir_merge_named packages/sub
|
||||||
|
secret_ones:
|
||||||
|
automation:
|
||||||
|
- id: "inline-package-auto"
|
||||||
|
alias: package ha
|
||||||
|
description: Example package auto
|
||||||
|
mode: single
|
||||||
|
trigger:
|
||||||
|
- platform: homeassistant
|
||||||
|
event: start
|
||||||
|
condition: []
|
||||||
|
action:
|
||||||
|
- service: counter.increment
|
||||||
|
data: {}
|
||||||
|
target:
|
||||||
|
entity_id: counter.up_times
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
automation: !include ../automations/ui.yaml
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
automation:
|
||||||
|
- id: "package2"
|
||||||
|
alias: package ha
|
||||||
|
description: Example package auto
|
||||||
|
mode: single
|
||||||
|
trigger:
|
||||||
|
- platform: homeassistant
|
||||||
|
event: start
|
||||||
|
condition: []
|
||||||
|
action:
|
||||||
|
- service: counter.increment
|
||||||
|
data: {}
|
||||||
|
target:
|
||||||
|
entity_id: counter.up_times
|
||||||
@@ -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,18 @@
|
|||||||
|
# Loads default set of integrations. Do not remove.
|
||||||
|
default_config:
|
||||||
|
|
||||||
|
# Text to speech
|
||||||
|
tts:
|
||||||
|
- platform: google_translate
|
||||||
|
|
||||||
|
# automation manual: !include_dir_list ./automations/include_dir_list
|
||||||
|
# automation ui: !include automations/ui.yaml
|
||||||
|
# automation: !include automations/base.yaml
|
||||||
|
# automation cools: !include_dir_merge_list automations/include_dir_merge_list
|
||||||
|
script: !include scripts.yaml
|
||||||
|
scene: !include scenes.yaml
|
||||||
|
|
||||||
|
homeassistant:
|
||||||
|
packages:
|
||||||
|
ha:
|
||||||
|
automation: !include automations/ui.yaml
|
||||||
@@ -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,16 @@
|
|||||||
|
# Loads default set of integrations. Do not remove.
|
||||||
|
default_config:
|
||||||
|
|
||||||
|
# Text to speech
|
||||||
|
tts:
|
||||||
|
- platform: google_translate
|
||||||
|
|
||||||
|
# automation manual: !include_dir_list ./automations/include_dir_list
|
||||||
|
# automation ui: !include automations/ui.yaml
|
||||||
|
# automation: !include automations/base.yaml
|
||||||
|
# automation cools: !include_dir_merge_list automations/include_dir_merge_list
|
||||||
|
script: !include scripts.yaml
|
||||||
|
scene: !include scenes.yaml
|
||||||
|
|
||||||
|
homeassistant:
|
||||||
|
packages: !include_dir_named packages
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
automation: !include ../automations/ui.yaml
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
automation:
|
||||||
|
- id: "package-sub"
|
||||||
|
alias: package ha
|
||||||
|
description: Example package auto
|
||||||
|
mode: single
|
||||||
|
trigger:
|
||||||
|
- platform: homeassistant
|
||||||
|
event: start
|
||||||
|
condition: []
|
||||||
|
action:
|
||||||
|
- service: counter.increment
|
||||||
|
data: {}
|
||||||
|
target:
|
||||||
|
entity_id: counter.up_times
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
- id: "1616887975473"
|
||||||
|
alias: Home Assistant Off
|
||||||
|
description: ""
|
||||||
|
trigger:
|
||||||
|
- platform: homeassistant
|
||||||
|
event: shutdown
|
||||||
|
condition: []
|
||||||
|
action:
|
||||||
|
- !include parts.yaml
|
||||||
|
mode: single
|
||||||
|
- id: "1616888026264"
|
||||||
|
alias: Home Assistant On
|
||||||
|
description: ""
|
||||||
|
trigger:
|
||||||
|
- platform: homeassistant
|
||||||
|
event: start
|
||||||
|
condition: []
|
||||||
|
action:
|
||||||
|
- !include parts.yaml
|
||||||
|
mode: single
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
# empty configuration file
|
||||||
|
cloud:
|
||||||
|
|
||||||
|
automation base: !include automations.yaml
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
device_id: das2qdasdasdasadaasd
|
||||||
|
domain: mobile_app
|
||||||
|
type: notify
|
||||||
|
title: Hassio Status
|
||||||
|
message: Hassio Is turning off...
|
||||||
@@ -1,2 +1,4 @@
|
|||||||
# empty configuration file
|
# empty configuration file
|
||||||
cloud:
|
cloud:
|
||||||
|
|
||||||
|
homeassistant:
|
||||||
@@ -6,7 +6,12 @@ from fastapi.testclient import TestClient
|
|||||||
|
|
||||||
from src.api.app import make_app
|
from src.api.app import make_app
|
||||||
from src.automations.types import Automation, ExtenededAutomation
|
from src.automations.types import Automation, ExtenededAutomation
|
||||||
from tests.utils import HA_CONFIG2_EXAMPLE, HA_CONFIG6_EXAMPLE, get_example_automation_loader
|
from tests.utils import (
|
||||||
|
HA_CONFIG2_EXAMPLE,
|
||||||
|
HA_CONFIG6_EXAMPLE,
|
||||||
|
HA_CONFIG10_EXAMPLE,
|
||||||
|
get_example_automation_loader,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class BaseTestCase(TestCase):
|
class BaseTestCase(TestCase):
|
||||||
@@ -382,6 +387,22 @@ class automation_update_split_config_tests(automation_update_tests):
|
|||||||
self.client = TestClient(make_app(self.automation_loader))
|
self.client = TestClient(make_app(self.automation_loader))
|
||||||
|
|
||||||
|
|
||||||
|
class automation_update_split_config_and_inline_config_tests(automation_update_tests):
|
||||||
|
test_params = {
|
||||||
|
"total": 4,
|
||||||
|
"modify_item": 0,
|
||||||
|
"consitency_tests": {},
|
||||||
|
}
|
||||||
|
|
||||||
|
def setUp(self) -> None:
|
||||||
|
(
|
||||||
|
self.config_folder,
|
||||||
|
self.hass_config,
|
||||||
|
self.automation_loader,
|
||||||
|
) = get_example_automation_loader(HA_CONFIG10_EXAMPLE)
|
||||||
|
self.client = TestClient(make_app(self.automation_loader))
|
||||||
|
|
||||||
|
|
||||||
class automation_delete_tests(BaseTestCase):
|
class automation_delete_tests(BaseTestCase):
|
||||||
def test_delete_some(self):
|
def test_delete_some(self):
|
||||||
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0})
|
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0})
|
||||||
|
|||||||
@@ -1,19 +1,20 @@
|
|||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
from src.automations.types import ExtenededAutomation
|
|
||||||
from src.automations.errors import DBDataError
|
from src.automations.errors import DBDataError
|
||||||
|
from src.automations.types import ExtenededAutomation
|
||||||
|
|
||||||
from .utils import TestWithDB
|
from .utils import TestWithDB
|
||||||
|
|
||||||
|
|
||||||
class db_tests(TestWithDB):
|
class db_tests(TestWithDB):
|
||||||
def test_db_creation(self):
|
def test_db_creation(self):
|
||||||
with self.db.get_cur() as cur:
|
with self.db.get_cur() as cur:
|
||||||
cur.execute("SELECT name FROM sqlite_schema WHERE type ='table'")
|
cur.execute("SELECT name FROM sqlite_master WHERE type ='table'")
|
||||||
tables = cur.fetchall()
|
tables = cur.fetchall()
|
||||||
self.assertListEqual(tables, [("autos",)])
|
self.assertListEqual(tables, [("autos",)])
|
||||||
self.db.create_db()
|
self.db.create_db()
|
||||||
with self.db.get_cur() as cur:
|
with self.db.get_cur() as cur:
|
||||||
cur.execute("SELECT name FROM sqlite_schema WHERE type ='table'")
|
cur.execute("SELECT name FROM sqlite_master WHERE type ='table'")
|
||||||
tables = cur.fetchall()
|
tables = cur.fetchall()
|
||||||
self.assertListEqual(tables, [("autos",)])
|
self.assertListEqual(tables, [("autos",)])
|
||||||
|
|
||||||
@@ -24,7 +25,7 @@ class db_tests(TestWithDB):
|
|||||||
alias="test",
|
alias="test",
|
||||||
source_file="automation.yaml",
|
source_file="automation.yaml",
|
||||||
source_file_type="obj",
|
source_file_type="obj",
|
||||||
configuration_key="automation",
|
configuration_key=["automation"],
|
||||||
),
|
),
|
||||||
ExtenededAutomation(
|
ExtenededAutomation(
|
||||||
id="test2",
|
id="test2",
|
||||||
@@ -32,7 +33,7 @@ class db_tests(TestWithDB):
|
|||||||
source_file="automation.yaml",
|
source_file="automation.yaml",
|
||||||
source_file_type="obj",
|
source_file_type="obj",
|
||||||
action=[{"event": {"nice": "one"}, "event_type": "custom"}],
|
action=[{"event": {"nice": "one"}, "event_type": "custom"}],
|
||||||
configuration_key="automation",
|
configuration_key=["automation"],
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
self.db.insert_automations(originals)
|
self.db.insert_automations(originals)
|
||||||
@@ -49,7 +50,7 @@ class db_tests(TestWithDB):
|
|||||||
alias="test",
|
alias="test",
|
||||||
source_file="automation.yaml",
|
source_file="automation.yaml",
|
||||||
source_file_type="obj",
|
source_file_type="obj",
|
||||||
configuration_key="automation",
|
configuration_key=["automation"],
|
||||||
),
|
),
|
||||||
ExtenededAutomation(
|
ExtenededAutomation(
|
||||||
id="test",
|
id="test",
|
||||||
@@ -57,10 +58,10 @@ class db_tests(TestWithDB):
|
|||||||
source_file="automation.yaml",
|
source_file="automation.yaml",
|
||||||
source_file_type="obj",
|
source_file_type="obj",
|
||||||
action=[{"event": {"nice": "one"}, "event_type": "custom"}],
|
action=[{"event": {"nice": "one"}, "event_type": "custom"}],
|
||||||
configuration_key="automation",
|
configuration_key=["automation"],
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
with self.assertRaises(DBDataError):
|
with self.assertRaises(DBDataError) as err:
|
||||||
self.db.insert_automations(originals)
|
self.db.insert_automations(originals)
|
||||||
autos = list(self.db.list_automations(0, 10))
|
autos = list(self.db.list_automations(0, 10))
|
||||||
self.assertEqual(len(autos), 0)
|
self.assertEqual(len(autos), 0)
|
||||||
@@ -3,7 +3,7 @@ from tempfile import mktemp
|
|||||||
from unittest import TestCase
|
from unittest import TestCase
|
||||||
|
|
||||||
from src.automations.loader import (
|
from src.automations.loader import (
|
||||||
extract_automation_paths,
|
extract_automation_refs,
|
||||||
load_automation_path,
|
load_automation_path,
|
||||||
)
|
)
|
||||||
from src.automations.tags import TagManager
|
from src.automations.tags import TagManager
|
||||||
@@ -15,6 +15,12 @@ from tests.utils import (
|
|||||||
HA_CONFIG4_EXAMPLE,
|
HA_CONFIG4_EXAMPLE,
|
||||||
HA_CONFIG5_EXAMPLE,
|
HA_CONFIG5_EXAMPLE,
|
||||||
HA_CONFIG6_EXAMPLE,
|
HA_CONFIG6_EXAMPLE,
|
||||||
|
HA_CONFIG7_EXAMPLE,
|
||||||
|
HA_CONFIG8_EXAMPLE,
|
||||||
|
HA_CONFIG9_EXAMPLE,
|
||||||
|
HA_CONFIG10_EXAMPLE,
|
||||||
|
HA_CONFIG11_EXAMPLE,
|
||||||
|
HA_CONFIG12_EXAMPLE,
|
||||||
HA_CONFIG_EXAMPLE,
|
HA_CONFIG_EXAMPLE,
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -25,7 +31,7 @@ class loader_tests(TestCase):
|
|||||||
load_automation_path(
|
load_automation_path(
|
||||||
HA_CONFIG2_EXAMPLE,
|
HA_CONFIG2_EXAMPLE,
|
||||||
HA_CONFIG2_EXAMPLE / "automations.yaml",
|
HA_CONFIG2_EXAMPLE / "automations.yaml",
|
||||||
configuration_key="automation",
|
configuration_key=["automation"],
|
||||||
tag_manager=TagManager({"1652069225859": {"type": "routine"}}),
|
tag_manager=TagManager({"1652069225859": {"type": "routine"}}),
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
@@ -36,7 +42,7 @@ class loader_tests(TestCase):
|
|||||||
id="1652069225859",
|
id="1652069225859",
|
||||||
source_file="automations.yaml",
|
source_file="automations.yaml",
|
||||||
source_file_type="list",
|
source_file_type="list",
|
||||||
configuration_key="automation",
|
configuration_key=["automation"],
|
||||||
alias="Climate - Pref temperature ",
|
alias="Climate - Pref temperature ",
|
||||||
description="",
|
description="",
|
||||||
mode="single",
|
mode="single",
|
||||||
@@ -69,7 +75,7 @@ class loader_tests(TestCase):
|
|||||||
load_automation_path(
|
load_automation_path(
|
||||||
HA_CONFIG4_EXAMPLE,
|
HA_CONFIG4_EXAMPLE,
|
||||||
HA_CONFIG4_EXAMPLE / "automations" / "notify_washer.yaml",
|
HA_CONFIG4_EXAMPLE / "automations" / "notify_washer.yaml",
|
||||||
configuration_key="automation base",
|
configuration_key=["automation base"],
|
||||||
tag_manager=TagManager({"1659114647067": {"room": "laundry"}}),
|
tag_manager=TagManager({"1659114647067": {"room": "laundry"}}),
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
@@ -80,7 +86,7 @@ class loader_tests(TestCase):
|
|||||||
id="1659114647067",
|
id="1659114647067",
|
||||||
source_file="automations/notify_washer.yaml",
|
source_file="automations/notify_washer.yaml",
|
||||||
source_file_type="obj",
|
source_file_type="obj",
|
||||||
configuration_key="automation base",
|
configuration_key=["automation base"],
|
||||||
alias="Notify Washer",
|
alias="Notify Washer",
|
||||||
description="Example",
|
description="Example",
|
||||||
mode="single",
|
mode="single",
|
||||||
@@ -102,6 +108,18 @@ class loader_tests(TestCase):
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def test_include_in_automation(self):
|
||||||
|
automations = list(
|
||||||
|
load_automation_path(
|
||||||
|
HA_CONFIG9_EXAMPLE,
|
||||||
|
HA_CONFIG9_EXAMPLE / "automations.yaml",
|
||||||
|
configuration_key=["automation base"],
|
||||||
|
tag_manager=TagManager({}),
|
||||||
|
)
|
||||||
|
)
|
||||||
|
self.assertEqual(len(automations), 2)
|
||||||
|
self.assertEqual(automations[1].action, automations[0].action)
|
||||||
|
|
||||||
def test_load_automation_empty_file(self):
|
def test_load_automation_empty_file(self):
|
||||||
file_path = Path(mktemp())
|
file_path = Path(mktemp())
|
||||||
file_path.touch()
|
file_path.touch()
|
||||||
@@ -109,7 +127,7 @@ class loader_tests(TestCase):
|
|||||||
load_automation_path(
|
load_automation_path(
|
||||||
file_path.parent,
|
file_path.parent,
|
||||||
file_path,
|
file_path,
|
||||||
configuration_key="automation ui",
|
configuration_key=["automation ui"],
|
||||||
tag_manager=TagManager(),
|
tag_manager=TagManager(),
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
@@ -122,7 +140,7 @@ class loader_tests(TestCase):
|
|||||||
load_automation_path(
|
load_automation_path(
|
||||||
file_path.parent,
|
file_path.parent,
|
||||||
file_path,
|
file_path,
|
||||||
configuration_key="automation manual",
|
configuration_key=["automation manual"],
|
||||||
tag_manager=TagManager(),
|
tag_manager=TagManager(),
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
@@ -136,8 +154,14 @@ class loader_tests(TestCase):
|
|||||||
(HA_CONFIG4_EXAMPLE, 1),
|
(HA_CONFIG4_EXAMPLE, 1),
|
||||||
(HA_CONFIG5_EXAMPLE, 3),
|
(HA_CONFIG5_EXAMPLE, 3),
|
||||||
(HA_CONFIG6_EXAMPLE, 4),
|
(HA_CONFIG6_EXAMPLE, 4),
|
||||||
|
(HA_CONFIG7_EXAMPLE, 1),
|
||||||
|
(HA_CONFIG8_EXAMPLE, 2),
|
||||||
|
(HA_CONFIG9_EXAMPLE, 1),
|
||||||
|
(HA_CONFIG10_EXAMPLE, 3),
|
||||||
|
(HA_CONFIG11_EXAMPLE, 3),
|
||||||
|
(HA_CONFIG12_EXAMPLE, 4),
|
||||||
]:
|
]:
|
||||||
with self.subTest(ha_path=ha_path, expected=expected):
|
with self.subTest(config_name=ha_path.name, expected=expected):
|
||||||
hass_config = HassConfig(ha_path)
|
hass_config = HassConfig(ha_path)
|
||||||
paths = list(extract_automation_paths(hass_config))
|
refs = list(extract_automation_refs(hass_config))
|
||||||
self.assertEqual(len(paths), expected)
|
self.assertEqual(len(refs), expected)
|
||||||
@@ -12,6 +12,10 @@ from src.errors import ErrorSet
|
|||||||
from src.hass_config.loader import HassConfig
|
from src.hass_config.loader import HassConfig
|
||||||
from tests.utils import (
|
from tests.utils import (
|
||||||
HA_CONFIG6_EXAMPLE,
|
HA_CONFIG6_EXAMPLE,
|
||||||
|
HA_CONFIG8_EXAMPLE,
|
||||||
|
HA_CONFIG10_EXAMPLE,
|
||||||
|
HA_CONFIG11_EXAMPLE,
|
||||||
|
HA_CONFIG12_EXAMPLE,
|
||||||
HA_CONFIG_EXAMPLE,
|
HA_CONFIG_EXAMPLE,
|
||||||
create_copy_of_example_config,
|
create_copy_of_example_config,
|
||||||
)
|
)
|
||||||
@@ -45,7 +49,7 @@ class manager_tests(TestWithDB):
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
self.assertEqual(automation.configuration_key, "automation cools")
|
self.assertEqual(automation.configuration_key, ["automation cools"])
|
||||||
automation.trigger.append(
|
automation.trigger.append(
|
||||||
{"platform": "zone", "entity_id": "person.thor", "zone": "zone.azguard"}
|
{"platform": "zone", "entity_id": "person.thor", "zone": "zone.azguard"}
|
||||||
)
|
)
|
||||||
@@ -75,19 +79,13 @@ class manager_tests(TestWithDB):
|
|||||||
def test_bad_automations_file(self):
|
def test_bad_automations_file(self):
|
||||||
config_path, automation_manager = self.get_manager(HA_CONFIG_EXAMPLE)
|
config_path, automation_manager = self.get_manager(HA_CONFIG_EXAMPLE)
|
||||||
(config_path / "automations.yaml").write_text("bob is an uncle")
|
(config_path / "automations.yaml").write_text("bob is an uncle")
|
||||||
with self.assertRaises(ErrorSet) as err:
|
automation_manager.reload()
|
||||||
automation_manager.reload()
|
|
||||||
self.assertEqual(len(err.exception.errors), 1)
|
|
||||||
self.assertIsInstance(err.exception.errors[0], InvalidAutomationFile)
|
|
||||||
self.assertEqual(automation_manager.count(), 0)
|
self.assertEqual(automation_manager.count(), 0)
|
||||||
|
|
||||||
def test_one_bad_automations_file(self):
|
def test_one_bad_automations_file(self):
|
||||||
config_path, automation_manager = self.get_manager(HA_CONFIG6_EXAMPLE)
|
config_path, automation_manager = self.get_manager(HA_CONFIG6_EXAMPLE)
|
||||||
(config_path / "automations" / "ui.yaml").write_text("bob is an uncle")
|
(config_path / "automations" / "ui.yaml").write_text("bob is an uncle")
|
||||||
with self.assertRaises(ErrorSet) as err:
|
automation_manager.reload()
|
||||||
automation_manager.reload()
|
|
||||||
self.assertEqual(len(err.exception.errors), 1)
|
|
||||||
self.assertIsInstance(err.exception.errors[0], InvalidAutomationFile)
|
|
||||||
self.assertEqual(automation_manager.count(), 10)
|
self.assertEqual(automation_manager.count(), 10)
|
||||||
|
|
||||||
def test_delete_automation_in_single_file(self):
|
def test_delete_automation_in_single_file(self):
|
||||||
@@ -95,7 +93,7 @@ class manager_tests(TestWithDB):
|
|||||||
self.assertTrue((config_path / "automations/include_dir_list/home/down.yaml").exists())
|
self.assertTrue((config_path / "automations/include_dir_list/home/down.yaml").exists())
|
||||||
automation_manager.reload()
|
automation_manager.reload()
|
||||||
automation = automation_manager.get("1659114822642")
|
automation = automation_manager.get("1659114822642")
|
||||||
self.assertEqual(automation.configuration_key, "automation manual")
|
self.assertEqual(automation.configuration_key, ["automation manual"])
|
||||||
automation_manager.delete(automation)
|
automation_manager.delete(automation)
|
||||||
automation_manager.reload()
|
automation_manager.reload()
|
||||||
with self.assertRaises(DBNoAutomationFound):
|
with self.assertRaises(DBNoAutomationFound):
|
||||||
@@ -109,7 +107,7 @@ class manager_tests(TestWithDB):
|
|||||||
)
|
)
|
||||||
automation_manager.reload()
|
automation_manager.reload()
|
||||||
automation = automation_manager.get("mlist2")
|
automation = automation_manager.get("mlist2")
|
||||||
self.assertEqual(automation.configuration_key, "automation cools")
|
self.assertEqual(automation.configuration_key, ["automation cools"])
|
||||||
automation_manager.delete(automation)
|
automation_manager.delete(automation)
|
||||||
automation_manager.reload()
|
automation_manager.reload()
|
||||||
with self.assertRaises(DBNoAutomationFound):
|
with self.assertRaises(DBNoAutomationFound):
|
||||||
@@ -127,7 +125,7 @@ class manager_tests(TestWithDB):
|
|||||||
automation_manager.update(
|
automation_manager.update(
|
||||||
ExtenededAutomation(
|
ExtenededAutomation(
|
||||||
id="newlymade",
|
id="newlymade",
|
||||||
configuration_key="automation manual",
|
configuration_key=["automation manual"],
|
||||||
source_file="automations/include_dir_list/home/left.yaml",
|
source_file="automations/include_dir_list/home/left.yaml",
|
||||||
source_file_type="obj",
|
source_file_type="obj",
|
||||||
)
|
)
|
||||||
@@ -138,7 +136,7 @@ class manager_tests(TestWithDB):
|
|||||||
automation_manager.get("newlymade"),
|
automation_manager.get("newlymade"),
|
||||||
ExtenededAutomation(
|
ExtenededAutomation(
|
||||||
id="newlymade",
|
id="newlymade",
|
||||||
configuration_key="automation manual",
|
configuration_key=["automation manual"],
|
||||||
source_file="automations/include_dir_list/home/left.yaml",
|
source_file="automations/include_dir_list/home/left.yaml",
|
||||||
source_file_type="obj",
|
source_file_type="obj",
|
||||||
),
|
),
|
||||||
@@ -155,7 +153,7 @@ class manager_tests(TestWithDB):
|
|||||||
automation_manager.update(
|
automation_manager.update(
|
||||||
ExtenededAutomation(
|
ExtenededAutomation(
|
||||||
id="newlymade",
|
id="newlymade",
|
||||||
configuration_key="automation cools",
|
configuration_key=["automation cools"],
|
||||||
source_file="automations/include_dir_merge_list/sub/list2.yaml",
|
source_file="automations/include_dir_merge_list/sub/list2.yaml",
|
||||||
source_file_type="list",
|
source_file_type="list",
|
||||||
),
|
),
|
||||||
@@ -169,7 +167,7 @@ class manager_tests(TestWithDB):
|
|||||||
automation_manager.get("newlymade"),
|
automation_manager.get("newlymade"),
|
||||||
ExtenededAutomation(
|
ExtenededAutomation(
|
||||||
id="newlymade",
|
id="newlymade",
|
||||||
configuration_key="automation cools",
|
configuration_key=["automation cools"],
|
||||||
source_file="automations/include_dir_merge_list/sub/list2.yaml",
|
source_file="automations/include_dir_merge_list/sub/list2.yaml",
|
||||||
source_file_type="list",
|
source_file_type="list",
|
||||||
),
|
),
|
||||||
@@ -186,7 +184,7 @@ class manager_tests(TestWithDB):
|
|||||||
automation_manager.update(
|
automation_manager.update(
|
||||||
ExtenededAutomation(
|
ExtenededAutomation(
|
||||||
id="newlymade",
|
id="newlymade",
|
||||||
configuration_key="automation cools",
|
configuration_key=["automation cools"],
|
||||||
source_file="automations/include_dir_merge_list/sub/list4.yaml",
|
source_file="automations/include_dir_merge_list/sub/list4.yaml",
|
||||||
source_file_type="list",
|
source_file_type="list",
|
||||||
),
|
),
|
||||||
@@ -200,7 +198,7 @@ class manager_tests(TestWithDB):
|
|||||||
automation_manager.get("newlymade"),
|
automation_manager.get("newlymade"),
|
||||||
ExtenededAutomation(
|
ExtenededAutomation(
|
||||||
id="newlymade",
|
id="newlymade",
|
||||||
configuration_key="automation cools",
|
configuration_key=["automation cools"],
|
||||||
source_file="automations/include_dir_merge_list/sub/list4.yaml",
|
source_file="automations/include_dir_merge_list/sub/list4.yaml",
|
||||||
source_file_type="list",
|
source_file_type="list",
|
||||||
),
|
),
|
||||||
@@ -218,7 +216,7 @@ class manager_tests(TestWithDB):
|
|||||||
automation_manager.update(
|
automation_manager.update(
|
||||||
ExtenededAutomation(
|
ExtenededAutomation(
|
||||||
id="newlymade",
|
id="newlymade",
|
||||||
configuration_key="automation cools",
|
configuration_key=["automation cools"],
|
||||||
source_file="automations/include_dir_merge_list/sub/list2.yaml",
|
source_file="automations/include_dir_merge_list/sub/list2.yaml",
|
||||||
source_file_type="obj",
|
source_file_type="obj",
|
||||||
),
|
),
|
||||||
@@ -229,7 +227,8 @@ class manager_tests(TestWithDB):
|
|||||||
automation_manager.get("newlymade")
|
automation_manager.get("newlymade")
|
||||||
|
|
||||||
data = yaml_serializer.load_yaml(
|
data = yaml_serializer.load_yaml(
|
||||||
(config_path / "automations/include_dir_merge_list/sub/list2.yaml").open("r")
|
(config_path / "automations/include_dir_merge_list/sub/list2.yaml").open("r"),
|
||||||
|
root_path=config_path,
|
||||||
)
|
)
|
||||||
self.assertIsInstance(data, list)
|
self.assertIsInstance(data, list)
|
||||||
|
|
||||||
@@ -243,7 +242,7 @@ class manager_tests(TestWithDB):
|
|||||||
automation_manager.update(
|
automation_manager.update(
|
||||||
ExtenededAutomation(
|
ExtenededAutomation(
|
||||||
id="newlymade",
|
id="newlymade",
|
||||||
configuration_key="automation cools",
|
configuration_key=["automation cools"],
|
||||||
source_file="automations/include_dir_list/home/down.yaml",
|
source_file="automations/include_dir_list/home/down.yaml",
|
||||||
source_file_type="list",
|
source_file_type="list",
|
||||||
),
|
),
|
||||||
@@ -254,7 +253,8 @@ class manager_tests(TestWithDB):
|
|||||||
automation_manager.get("newlymade")
|
automation_manager.get("newlymade")
|
||||||
|
|
||||||
data = yaml_serializer.load_yaml(
|
data = yaml_serializer.load_yaml(
|
||||||
(config_path / "automations/include_dir_list/home/down.yaml").open("r")
|
(config_path / "automations/include_dir_list/home/down.yaml").open("r"),
|
||||||
|
config_path,
|
||||||
)
|
)
|
||||||
self.assertIsInstance(data, dict)
|
self.assertIsInstance(data, dict)
|
||||||
|
|
||||||
@@ -325,3 +325,74 @@ class manager_tests(TestWithDB):
|
|||||||
auto.tags,
|
auto.tags,
|
||||||
{},
|
{},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def test_load_pacakges_include_dir_named(self):
|
||||||
|
_, automation_manager = self.get_manager(HA_CONFIG8_EXAMPLE)
|
||||||
|
automation_manager.reload()
|
||||||
|
|
||||||
|
with self.subTest(name="inline"):
|
||||||
|
auto = automation_manager.get("package-sub")
|
||||||
|
self.assertEqual(auto.source_file_type, "inline")
|
||||||
|
self.assertEqual(auto.source_file, "packages/sub/package2.yaml")
|
||||||
|
self.assertEqual(auto.configuration_key, ["automation"])
|
||||||
|
|
||||||
|
with self.subTest(name="sub !inlcude"):
|
||||||
|
auto = automation_manager.get("ui1")
|
||||||
|
self.assertEqual(auto.source_file, "automations/ui.yaml")
|
||||||
|
self.assertEqual(auto.source_file_type, "list")
|
||||||
|
self.assertEqual(auto.configuration_key, [])
|
||||||
|
|
||||||
|
def test_load_pacakges_include_dir_merge_named(self):
|
||||||
|
_, automation_manager = self.get_manager(HA_CONFIG10_EXAMPLE)
|
||||||
|
automation_manager.reload()
|
||||||
|
|
||||||
|
with self.subTest(name="inline"):
|
||||||
|
auto = automation_manager.get("package2")
|
||||||
|
self.assertEqual(auto.source_file_type, "inline")
|
||||||
|
self.assertEqual(auto.source_file, "packages/sub/package2.yaml")
|
||||||
|
self.assertEqual(auto.configuration_key, ["package2", "automation"])
|
||||||
|
|
||||||
|
with self.subTest(name="sub !inlcude"):
|
||||||
|
auto = automation_manager.get("ui1")
|
||||||
|
self.assertEqual(auto.source_file, "automations/ui.yaml")
|
||||||
|
self.assertEqual(auto.source_file_type, "list")
|
||||||
|
self.assertEqual(auto.configuration_key, ["ha"])
|
||||||
|
|
||||||
|
def test_load_pacakges_include(self):
|
||||||
|
_, automation_manager = self.get_manager(HA_CONFIG11_EXAMPLE)
|
||||||
|
automation_manager.reload()
|
||||||
|
|
||||||
|
with self.subTest(name="inline"):
|
||||||
|
auto = automation_manager.get("package2")
|
||||||
|
self.assertEqual(auto.source_file_type, "list")
|
||||||
|
self.assertEqual(auto.source_file, "packages/sub/automation.yaml")
|
||||||
|
self.assertEqual(auto.configuration_key, ["sub"])
|
||||||
|
|
||||||
|
with self.subTest(name="sub !inlcude"):
|
||||||
|
auto = automation_manager.get("ui1")
|
||||||
|
self.assertEqual(auto.source_file, "automations/ui.yaml")
|
||||||
|
self.assertEqual(auto.source_file_type, "list")
|
||||||
|
self.assertEqual(auto.configuration_key, ["ha"])
|
||||||
|
|
||||||
|
def test_load_inline_auto(self):
|
||||||
|
_, automation_manager = self.get_manager(HA_CONFIG10_EXAMPLE)
|
||||||
|
automation_manager.reload()
|
||||||
|
auto = automation_manager.get("inline-auto")
|
||||||
|
self.assertEqual(auto.source_file_type, "inline")
|
||||||
|
self.assertEqual(auto.configuration_key, ["automation"])
|
||||||
|
|
||||||
|
def test_load_pacakges_nested_include_dir_merge_named(self):
|
||||||
|
_, automation_manager = self.get_manager(HA_CONFIG12_EXAMPLE)
|
||||||
|
automation_manager.reload()
|
||||||
|
|
||||||
|
with self.subTest(name="inline"):
|
||||||
|
auto = automation_manager.get("package2")
|
||||||
|
self.assertEqual(auto.source_file_type, "inline")
|
||||||
|
self.assertEqual(auto.source_file, "packages/sub/automation.yaml")
|
||||||
|
self.assertEqual(auto.configuration_key, ["automation"])
|
||||||
|
|
||||||
|
with self.subTest(name="sub !inlcude"):
|
||||||
|
auto = automation_manager.get("ui1")
|
||||||
|
self.assertEqual(auto.source_file, "automations/ui.yaml")
|
||||||
|
self.assertEqual(auto.source_file_type, "list")
|
||||||
|
self.assertEqual(auto.configuration_key, ["ha"])
|
||||||
@@ -2,7 +2,11 @@ from unittest import TestCase
|
|||||||
|
|
||||||
from src.automations.types import BaseAutomation
|
from src.automations.types import BaseAutomation
|
||||||
from src.hass_config.loader import HassConfig
|
from src.hass_config.loader import HassConfig
|
||||||
from tests.utils import create_dummy_config_folder
|
from tests.utils import (
|
||||||
|
HA_CONFIG8_EXAMPLE,
|
||||||
|
SAMPLES_FOLDER,
|
||||||
|
create_dummy_config_folder,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class loader_tests(TestCase):
|
class loader_tests(TestCase):
|
||||||
@@ -41,3 +45,9 @@ class loader_tests(TestCase):
|
|||||||
(folder / "automations.yaml").unlink()
|
(folder / "automations.yaml").unlink()
|
||||||
hass_config = HassConfig(folder)
|
hass_config = HassConfig(folder)
|
||||||
self.assertIsInstance(hass_config.configurations, dict)
|
self.assertIsInstance(hass_config.configurations, dict)
|
||||||
|
|
||||||
|
def test_load_homeassitant(self):
|
||||||
|
for folder in SAMPLES_FOLDER.iterdir():
|
||||||
|
with self.subTest(name=folder.name):
|
||||||
|
hass_config = HassConfig(folder)
|
||||||
|
assert isinstance(hass_config.homeassistant, dict)
|
||||||
@@ -2,7 +2,7 @@ import json
|
|||||||
from unittest import TestCase
|
from unittest import TestCase
|
||||||
|
|
||||||
from src.json_serializer import json_dumps
|
from src.json_serializer import json_dumps
|
||||||
from src.yaml_serializer.types import NOT_IMPLEMENTED_SV_MSG, SecretValue
|
from src.yaml_serializer import NOT_IMPLEMENTED_SV_MSG, SecretValue
|
||||||
|
|
||||||
|
|
||||||
class json_serializer_tests(TestCase):
|
class json_serializer_tests(TestCase):
|
||||||
|
|||||||
@@ -1,11 +1,14 @@
|
|||||||
import io
|
import io
|
||||||
|
from pathlib import Path
|
||||||
from unittest import TestCase
|
from unittest import TestCase
|
||||||
|
|
||||||
from src.yaml_serializer import dump_yaml, load_yaml
|
from src.yaml_serializer import (
|
||||||
from src.yaml_serializer.types import (
|
|
||||||
IncludedYaml,
|
IncludedYaml,
|
||||||
IncludedYamlDir,
|
IncludedYamlDirList,
|
||||||
|
IncludedYamlMergeListDir,
|
||||||
SecretValue,
|
SecretValue,
|
||||||
|
dump_yaml,
|
||||||
|
load_yaml,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@@ -14,23 +17,27 @@ class dumping_yamls_tests(TestCase):
|
|||||||
yaml = dump_yaml(
|
yaml = dump_yaml(
|
||||||
{
|
{
|
||||||
"automations": IncludedYaml(
|
"automations": IncludedYaml(
|
||||||
"automations.yaml",
|
Path.cwd() / "automations.yaml",
|
||||||
)
|
)
|
||||||
}
|
},
|
||||||
|
Path.cwd(),
|
||||||
)
|
)
|
||||||
self.assertEqual(yaml, "automations: !include 'automations.yaml'\n")
|
self.assertEqual(yaml, "automations: !include 'automations.yaml'\n")
|
||||||
|
|
||||||
def test_dumping_secrets(self):
|
def test_dumping_secrets(self):
|
||||||
yaml = dump_yaml({"google_password": SecretValue("gpass", "supersec")})
|
yaml = dump_yaml({"google_password": SecretValue("gpass", "supersec")}, Path.cwd())
|
||||||
self.assertEqual(yaml, "google_password: !secret 'gpass'\n")
|
self.assertEqual(yaml, "google_password: !secret 'gpass'\n")
|
||||||
|
|
||||||
def test_dumping_include_dir_list(self):
|
def test_dumping_include_dir_list(self):
|
||||||
yaml = dump_yaml({"sensor": IncludedYamlDir("include_dir_list", "sensors/*yaml")})
|
yaml = dump_yaml({"sensor": IncludedYamlDirList(Path.cwd() / "sensors")}, Path.cwd())
|
||||||
self.assertEqual(yaml, "sensor: !include_dir_list 'sensors/*yaml'\n")
|
self.assertEqual(yaml, "sensor: !include_dir_list 'sensors'\n")
|
||||||
|
|
||||||
def test_dumping_include_dir_merge_list(self):
|
def test_dumping_include_dir_merge_list(self):
|
||||||
yaml = dump_yaml({"sensor": IncludedYamlDir("include_dir_merge_list", "sensors/*yaml")})
|
yaml = dump_yaml(
|
||||||
self.assertEqual(yaml, "sensor: !include_dir_merge_list 'sensors/*yaml'\n")
|
{"sensor": IncludedYamlMergeListDir(Path.cwd() / "sensors")},
|
||||||
|
Path.cwd(),
|
||||||
|
)
|
||||||
|
self.assertEqual(yaml, "sensor: !include_dir_merge_list 'sensors'\n")
|
||||||
|
|
||||||
def test_load_complex_automation_setup(self):
|
def test_load_complex_automation_setup(self):
|
||||||
yaml_obj = load_yaml(
|
yaml_obj = load_yaml(
|
||||||
@@ -41,19 +48,20 @@ class dumping_yamls_tests(TestCase):
|
|||||||
automation: !include automations/base.yaml
|
automation: !include automations/base.yaml
|
||||||
automation cools: !include_dir_merge_list automations/include_dir_merge_list
|
automation cools: !include_dir_merge_list automations/include_dir_merge_list
|
||||||
"""
|
"""
|
||||||
)
|
),
|
||||||
|
Path.cwd(),
|
||||||
)
|
)
|
||||||
self.assertDictEqual(
|
self.assertDictEqual(
|
||||||
dict(yaml_obj),
|
dict(yaml_obj),
|
||||||
{
|
{
|
||||||
"automation manual": IncludedYamlDir(
|
"automation manual": IncludedYamlDirList(
|
||||||
"include_dir_list", "./automations/include_dir_list"
|
Path.cwd() / "automations/include_dir_list"
|
||||||
),
|
),
|
||||||
"automation ui": IncludedYaml("automations/ui.yaml"),
|
"automation ui": IncludedYaml(Path.cwd() / "automations/ui.yaml"),
|
||||||
"automation cools": IncludedYamlDir(
|
"automation cools": IncludedYamlMergeListDir(
|
||||||
"include_dir_merge_list", "automations/include_dir_merge_list"
|
Path.cwd() / "automations/include_dir_merge_list"
|
||||||
),
|
),
|
||||||
"automation": IncludedYaml("automations/base.yaml"),
|
"automation": IncludedYaml(Path.cwd() / "automations/base.yaml"),
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -71,10 +79,11 @@ class dumping_yamls_tests(TestCase):
|
|||||||
bobIsNull:
|
bobIsNull:
|
||||||
bobIsNull2: null
|
bobIsNull2: null
|
||||||
google_password: !secret gpass
|
google_password: !secret gpass
|
||||||
sensor: !include_dir_list sensors/*yaml
|
sensor: !include_dir_list sensors
|
||||||
automations: !include automations.yaml
|
automations: !include automations.yaml
|
||||||
"""
|
"""
|
||||||
)
|
),
|
||||||
|
Path.cwd(),
|
||||||
)
|
)
|
||||||
self.assertDictEqual(
|
self.assertDictEqual(
|
||||||
dict(yaml_obj),
|
dict(yaml_obj),
|
||||||
@@ -85,12 +94,12 @@ class dumping_yamls_tests(TestCase):
|
|||||||
"bobIsNull": None,
|
"bobIsNull": None,
|
||||||
"bobIsNull2": None,
|
"bobIsNull2": None,
|
||||||
"google_password": SecretValue("gpass", "n/a"),
|
"google_password": SecretValue("gpass", "n/a"),
|
||||||
"sensor": IncludedYamlDir("include_dir_list", "sensors/*yaml"),
|
"sensor": IncludedYamlDirList(Path.cwd() / "sensors"),
|
||||||
"automations": IncludedYaml("automations.yaml"),
|
"automations": IncludedYaml(Path.cwd() / "automations.yaml"),
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
dump_yaml(yaml_obj),
|
dump_yaml(yaml_obj, Path.cwd()),
|
||||||
"""name: cool
|
"""name: cool
|
||||||
date: '10:00'
|
date: '10:00'
|
||||||
bools:
|
bools:
|
||||||
@@ -101,7 +110,7 @@ bools:
|
|||||||
bobIsNull: null
|
bobIsNull: null
|
||||||
bobIsNull2: null
|
bobIsNull2: null
|
||||||
google_password: !secret 'gpass'
|
google_password: !secret 'gpass'
|
||||||
sensor: !include_dir_list 'sensors/*yaml'
|
sensor: !include_dir_list 'sensors'
|
||||||
automations: !include 'automations.yaml'
|
automations: !include 'automations.yaml'
|
||||||
""",
|
""",
|
||||||
)
|
)
|
||||||
+18
-11
@@ -1,13 +1,12 @@
|
|||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from shutil import copytree
|
from shutil import copytree
|
||||||
from tempfile import mkdtemp
|
from tempfile import mkdtemp
|
||||||
from typing import List, Literal, Optional, Tuple
|
from typing import Literal, Optional, Tuple
|
||||||
|
|
||||||
from src.automations.manager import AutomationManager
|
from src.automations.manager import AutomationManager
|
||||||
from src.automations.types import BaseAutomation
|
from src.automations.types import BaseAutomation
|
||||||
from src.hass_config.loader import HassConfig
|
from src.hass_config.loader import HassConfig
|
||||||
from src.yaml_serializer import dump_yaml
|
from src.yaml_serializer import IncludedYaml, dump_yaml
|
||||||
from src.yaml_serializer.types import IncludedYaml
|
|
||||||
|
|
||||||
THIS_FOLDER = Path(__file__).parent
|
THIS_FOLDER = Path(__file__).parent
|
||||||
SAMPLES_FOLDER = THIS_FOLDER / "samples"
|
SAMPLES_FOLDER = THIS_FOLDER / "samples"
|
||||||
@@ -17,6 +16,12 @@ HA_CONFIG3_EXAMPLE = SAMPLES_FOLDER / "config-3"
|
|||||||
HA_CONFIG4_EXAMPLE = SAMPLES_FOLDER / "config-4"
|
HA_CONFIG4_EXAMPLE = SAMPLES_FOLDER / "config-4"
|
||||||
HA_CONFIG5_EXAMPLE = SAMPLES_FOLDER / "config-5"
|
HA_CONFIG5_EXAMPLE = SAMPLES_FOLDER / "config-5"
|
||||||
HA_CONFIG6_EXAMPLE = SAMPLES_FOLDER / "config-6"
|
HA_CONFIG6_EXAMPLE = SAMPLES_FOLDER / "config-6"
|
||||||
|
HA_CONFIG7_EXAMPLE = SAMPLES_FOLDER / "config-7"
|
||||||
|
HA_CONFIG8_EXAMPLE = SAMPLES_FOLDER / "config-8"
|
||||||
|
HA_CONFIG9_EXAMPLE = SAMPLES_FOLDER / "config-9"
|
||||||
|
HA_CONFIG10_EXAMPLE = SAMPLES_FOLDER / "config-10"
|
||||||
|
HA_CONFIG11_EXAMPLE = SAMPLES_FOLDER / "config-11"
|
||||||
|
HA_CONFIG12_EXAMPLE = SAMPLES_FOLDER / "config-12"
|
||||||
|
|
||||||
|
|
||||||
def get_example_automation_loader(
|
def get_example_automation_loader(
|
||||||
@@ -46,7 +51,7 @@ def create_copy_of_example_config(config_to_copy: Path = HA_CONFIG_EXAMPLE) -> P
|
|||||||
|
|
||||||
|
|
||||||
def get_dummy_automation_loader(
|
def get_dummy_automation_loader(
|
||||||
auto: List[BaseAutomation],
|
auto: list[BaseAutomation],
|
||||||
secrets: Optional[dict] = None,
|
secrets: Optional[dict] = None,
|
||||||
other_config: Optional[dict] = None,
|
other_config: Optional[dict] = None,
|
||||||
automation_in_conifguration_mode: Literal["include", "inline", "none"] = "include",
|
automation_in_conifguration_mode: Literal["include", "inline", "none"] = "include",
|
||||||
@@ -54,7 +59,7 @@ def get_dummy_automation_loader(
|
|||||||
"""Creates a dummy /config structure for testing and return the loader and config
|
"""Creates a dummy /config structure for testing and return the loader and config
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
auto (List[BaseAutomation]): automations
|
auto (list[BaseAutomation]): automations
|
||||||
secrets (Optional[dict], optional): dictionary of secrets
|
secrets (Optional[dict], optional): dictionary of secrets
|
||||||
other_config (Optional[dict], optional): some config stuff to place into configuration.yaml. Defaults to None.
|
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.
|
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.
|
||||||
@@ -74,7 +79,7 @@ def get_dummy_automation_loader(
|
|||||||
|
|
||||||
|
|
||||||
def create_dummy_config_folder(
|
def create_dummy_config_folder(
|
||||||
auto: List[BaseAutomation],
|
auto: list[BaseAutomation],
|
||||||
secrets: Optional[dict] = None,
|
secrets: Optional[dict] = None,
|
||||||
other_config: Optional[dict] = None,
|
other_config: Optional[dict] = None,
|
||||||
automation_in_conifguration_mode: Literal["include", "inline", "none"] = "include",
|
automation_in_conifguration_mode: Literal["include", "inline", "none"] = "include",
|
||||||
@@ -82,7 +87,7 @@ def create_dummy_config_folder(
|
|||||||
"""Creates a dummy /config structure for testing
|
"""Creates a dummy /config structure for testing
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
auto (List[BaseAutomation]): automations
|
auto (list[BaseAutomation]): automations
|
||||||
secrets (Optional[dict], optional): dictionary of secrets
|
secrets (Optional[dict], optional): dictionary of secrets
|
||||||
other_config (Optional[dict], optional): some config stuff to place into configuration.yaml. Defaults to None.
|
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.
|
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.
|
||||||
@@ -97,11 +102,13 @@ def create_dummy_config_folder(
|
|||||||
configuration_yaml["automation"] = auto_prims
|
configuration_yaml["automation"] = auto_prims
|
||||||
elif automation_in_conifguration_mode == "include":
|
elif automation_in_conifguration_mode == "include":
|
||||||
configuration_yaml["automation"] = IncludedYaml(
|
configuration_yaml["automation"] = IncludedYaml(
|
||||||
"automations.yaml",
|
root_folder / "automations.yaml",
|
||||||
)
|
)
|
||||||
if automation_in_conifguration_mode != "inline":
|
if automation_in_conifguration_mode != "inline":
|
||||||
(root_folder / "automations.yaml").write_text(dump_yaml(auto_prims))
|
(root_folder / "automations.yaml").write_text(dump_yaml(auto_prims, root_path=root_folder))
|
||||||
if secrets is not None:
|
if secrets is not None:
|
||||||
(root_folder / "secrets.yaml").write_text(dump_yaml(secrets))
|
(root_folder / "secrets.yaml").write_text(dump_yaml(secrets, root_path=root_folder))
|
||||||
(root_folder / "configuration.yaml").write_text(dump_yaml(configuration_yaml))
|
(root_folder / "configuration.yaml").write_text(
|
||||||
|
dump_yaml(configuration_yaml, root_path=root_folder)
|
||||||
|
)
|
||||||
return root_folder
|
return root_folder
|
||||||
BIN
Binary file not shown.
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
name: Shortumation
|
name: Shortumation
|
||||||
version: v0.5.3
|
version: v0.6.2
|
||||||
slug: shortumation
|
slug: shortumation
|
||||||
image: asosnovsky/shortumation-{arch}
|
image: asosnovsky/shortumation-{arch}
|
||||||
url: "https://github.com/asosnovsky/Shortumation"
|
url: "https://github.com/asosnovsky/Shortumation"
|
||||||
|
|||||||
Binary file not shown.
+1
-1
@@ -12,4 +12,4 @@ echo "HOST = $host_port"
|
|||||||
echo "HASSIO_WS = $HASSIO_WS"
|
echo "HASSIO_WS = $HASSIO_WS"
|
||||||
echo $(python --version)
|
echo $(python --version)
|
||||||
echo "--------------------"
|
echo "--------------------"
|
||||||
python -m hypercorn src.app:app -b $host_port
|
python -m hypercorn src.app:app -b $host_port --config /app/hypercorn.toml
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
websocket_max_message_size = 16777216
|
||||||
@@ -13,7 +13,7 @@ services:
|
|||||||
image: "asosnovsky/shortumation-${ARCH:-amd64}:${BUILD_TAG:-edge}"
|
image: "asosnovsky/shortumation-${ARCH:-amd64}:${BUILD_TAG:-edge}"
|
||||||
build:
|
build:
|
||||||
context: "../"
|
context: "../"
|
||||||
dockerfile: "../Dockerfile"
|
dockerfile: "./Dockerfile"
|
||||||
args:
|
args:
|
||||||
BUILD_ARCH: ${ARCH:-amd64}
|
BUILD_ARCH: ${ARCH:-amd64}
|
||||||
BUILD_VERSION: ${BUILD_TAG:-edge}
|
BUILD_VERSION: ${BUILD_TAG:-edge}
|
||||||
|
|||||||
@@ -24,12 +24,12 @@ test("mock api uses initial autos for initial population -- some data", async ()
|
|||||||
|
|
||||||
test("populate mock api with some data", async () => {
|
test("populate mock api with some data", async () => {
|
||||||
const mockApi = makeAutomationAPI(useMockAPI([], fakeUseRef as any));
|
const mockApi = makeAutomationAPI(useMockAPI([], fakeUseRef as any));
|
||||||
await mockApi.update(createMockAuto());
|
await mockApi.create(createMockAuto());
|
||||||
let data = await mockApi.list({ limit: 10, offset: 0 });
|
let data = await mockApi.list({ limit: 10, offset: 0 });
|
||||||
expect(data.ok).toBe(true);
|
expect(data.ok).toBe(true);
|
||||||
expect((data as any).data.data).toHaveLength(1);
|
expect((data as any).data.data).toHaveLength(1);
|
||||||
expect((data as any).data.totalItems).toBe(1);
|
expect((data as any).data.totalItems).toBe(1);
|
||||||
await mockApi.update(createMockAuto());
|
await mockApi.create(createMockAuto());
|
||||||
data = await mockApi.list({ limit: 10, offset: 0 });
|
data = await mockApi.list({ limit: 10, offset: 0 });
|
||||||
expect((data as any).data.data).toHaveLength(2);
|
expect((data as any).data.data).toHaveLength(2);
|
||||||
expect((data as any).data.totalItems).toBe(2);
|
expect((data as any).data.totalItems).toBe(2);
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ export const useMockAPI = (
|
|||||||
...auto,
|
...auto,
|
||||||
source_file: "automation.yaml",
|
source_file: "automation.yaml",
|
||||||
source_file_type: "list",
|
source_file_type: "list",
|
||||||
configuration_key: "automation",
|
configuration_key: ["automation"],
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ export const NoTags = make({
|
|||||||
mode: "single",
|
mode: "single",
|
||||||
source_file: "automation.yaml",
|
source_file: "automation.yaml",
|
||||||
source_file_type: "list",
|
source_file_type: "list",
|
||||||
configuration_key: "automation",
|
configuration_key: ["automation"],
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -65,6 +65,6 @@ export const SomeTags = make({
|
|||||||
mode: "single",
|
mode: "single",
|
||||||
source_file: "automation.yaml",
|
source_file: "automation.yaml",
|
||||||
source_file_type: "list",
|
source_file_type: "list",
|
||||||
configuration_key: "automation",
|
configuration_key: ["automation"],
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
.automation-editor--nodes-row .collection-nodes--wrap {
|
||||||
|
--node-height: 12em !important;
|
||||||
|
--node-width: 100% !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-editor--nodes-row .collection-nodes--wrap .collection-nodes {
|
||||||
|
min-width: 90%;
|
||||||
|
min-height: 10em;
|
||||||
|
}
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
import { DEFAULT_DIMS } from "components/DAGGraph/elements/constants";
|
||||||
|
import { makeStory } from "devUtils";
|
||||||
|
import { useState } from "react";
|
||||||
|
import { NodesRow } from ".";
|
||||||
|
|
||||||
|
const { make, componentMeta } = makeStory({
|
||||||
|
Component: NodesRow,
|
||||||
|
BaseTemplate: (props) => {
|
||||||
|
const [data, setData] = useState(props.data);
|
||||||
|
return (
|
||||||
|
<NodesRow
|
||||||
|
{...props}
|
||||||
|
data={data}
|
||||||
|
onUpdate={(up) => {
|
||||||
|
setData(up);
|
||||||
|
props.onUpdate(up);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
},
|
||||||
|
meta: {
|
||||||
|
title: "App/AutomationEditor/NodesRow",
|
||||||
|
args: {
|
||||||
|
data: [],
|
||||||
|
sequenceNodeDims: DEFAULT_DIMS.node,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
export default componentMeta;
|
||||||
|
export const Empty = make({});
|
||||||
|
export const One = make({
|
||||||
|
type: "trigger",
|
||||||
|
data: [
|
||||||
|
{
|
||||||
|
platform: "calendar",
|
||||||
|
event: "test",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
});
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
import "./index.css";
|
||||||
|
|
||||||
|
import { AutomationNode, AutomationNodeMapping } from "types/automations";
|
||||||
|
import { useHA } from "haService";
|
||||||
|
import { CollectionNodeElement } from "components/DAGGraph/nodes/CollectionNode/CollectionNodeElement";
|
||||||
|
import { getDescriptionFromAutomationNode } from "utils/formatting";
|
||||||
|
import { Size } from "components/DAGGraph/elements/types";
|
||||||
|
|
||||||
|
export type NodesRowProps<
|
||||||
|
K extends keyof AutomationNodeMapping,
|
||||||
|
T extends AutomationNode<K>
|
||||||
|
> = {
|
||||||
|
type: K;
|
||||||
|
data: T[];
|
||||||
|
onUpdate: (d: T[]) => void;
|
||||||
|
sequenceNodeDims: Size;
|
||||||
|
};
|
||||||
|
|
||||||
|
export function NodesRow<
|
||||||
|
K extends keyof AutomationNodeMapping,
|
||||||
|
T extends AutomationNode<K>
|
||||||
|
>({ type: collectionType, data, sequenceNodeDims }: NodesRowProps<K, T>) {
|
||||||
|
const { namer } = useHA();
|
||||||
|
return (
|
||||||
|
<div className="automation-editor--nodes-row">
|
||||||
|
<CollectionNodeElement
|
||||||
|
width={0}
|
||||||
|
height={0}
|
||||||
|
nodes={data.map((node) => ({
|
||||||
|
enabled: node.enabled ?? true,
|
||||||
|
label: getDescriptionFromAutomationNode(node, namer, true),
|
||||||
|
onXClick: () => {},
|
||||||
|
}))}
|
||||||
|
onAddNode={() => {}}
|
||||||
|
collectionType={collectionType}
|
||||||
|
title="if"
|
||||||
|
sequenceNode={sequenceNodeDims}
|
||||||
|
flipped
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -55,7 +55,7 @@ Simple.args = {
|
|||||||
mode: "single",
|
mode: "single",
|
||||||
source_file: "automation.yaml",
|
source_file: "automation.yaml",
|
||||||
source_file_type: "list",
|
source_file_type: "list",
|
||||||
configuration_key: "automation",
|
configuration_key: ["automation"],
|
||||||
trigger: [
|
trigger: [
|
||||||
{
|
{
|
||||||
platform: "numeric_state",
|
platform: "numeric_state",
|
||||||
@@ -107,7 +107,7 @@ EmptyStart.args = {
|
|||||||
description: "Example Metadata",
|
description: "Example Metadata",
|
||||||
source_file: "automation.yaml",
|
source_file: "automation.yaml",
|
||||||
source_file_type: "list",
|
source_file_type: "list",
|
||||||
configuration_key: "automation",
|
configuration_key: ["automation"],
|
||||||
trigger_variables: {
|
trigger_variables: {
|
||||||
wowo: "!",
|
wowo: "!",
|
||||||
},
|
},
|
||||||
@@ -139,7 +139,7 @@ BadAutomationInvalidTriggers.args = {
|
|||||||
description: "Example Metadata",
|
description: "Example Metadata",
|
||||||
source_file: "automation.yaml",
|
source_file: "automation.yaml",
|
||||||
source_file_type: "list",
|
source_file_type: "list",
|
||||||
configuration_key: "automation",
|
configuration_key: ["automation"],
|
||||||
trigger_variables: {
|
trigger_variables: {
|
||||||
wowo: "!",
|
wowo: "!",
|
||||||
},
|
},
|
||||||
@@ -180,7 +180,7 @@ RepeatExample.args = {
|
|||||||
mode: "single",
|
mode: "single",
|
||||||
source_file: "automation.yaml",
|
source_file: "automation.yaml",
|
||||||
source_file_type: "list",
|
source_file_type: "list",
|
||||||
configuration_key: "automation",
|
configuration_key: ["automation"],
|
||||||
trigger: [
|
trigger: [
|
||||||
{
|
{
|
||||||
type: "opened",
|
type: "opened",
|
||||||
|
|||||||
@@ -43,19 +43,20 @@ export const useAutomatioEditorState = (
|
|||||||
};
|
};
|
||||||
const makeUpdate =
|
const makeUpdate =
|
||||||
<K extends keyof EditorData, D extends EditorData[K]>(name: K) =>
|
<K extends keyof EditorData, D extends EditorData[K]>(name: K) =>
|
||||||
(data: D) =>
|
(data: D) => {
|
||||||
(state.status === "changed" || state.status === "unchanged") &&
|
(state.status === "changed" || state.status === "unchanged") &&
|
||||||
update({
|
update({
|
||||||
status: "changed",
|
status: "changed",
|
||||||
previous:
|
previous:
|
||||||
state.status === "unchanged"
|
state.status === "unchanged"
|
||||||
? [state.data]
|
? [state.data]
|
||||||
: state.previous.concat([state.data]),
|
: state.previous.concat([state.data]),
|
||||||
data: {
|
data: {
|
||||||
...state.data,
|
...state.data,
|
||||||
[name]: data,
|
[name]: data,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
};
|
||||||
|
|
||||||
const saveAndUpdate = (data: EditorData) => {
|
const saveAndUpdate = (data: EditorData) => {
|
||||||
if (state.status === "changed") {
|
if (state.status === "changed") {
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ const { make, componentMeta } = makeStory({
|
|||||||
state: "on",
|
state: "on",
|
||||||
source_file: "automation.yaml",
|
source_file: "automation.yaml",
|
||||||
source_file_type: "list",
|
source_file_type: "list",
|
||||||
configuration_key: "automation",
|
configuration_key: ["automation"],
|
||||||
flags: {
|
flags: {
|
||||||
isSelected: false,
|
isSelected: false,
|
||||||
isModified: false,
|
isModified: false,
|
||||||
@@ -42,7 +42,7 @@ const { make, componentMeta } = makeStory({
|
|||||||
state: "on",
|
state: "on",
|
||||||
source_file: "automation.yaml",
|
source_file: "automation.yaml",
|
||||||
source_file_type: "list",
|
source_file_type: "list",
|
||||||
configuration_key: "automation",
|
configuration_key: ["automation"],
|
||||||
flags: {
|
flags: {
|
||||||
isSelected: false,
|
isSelected: false,
|
||||||
isModified: false,
|
isModified: false,
|
||||||
@@ -92,7 +92,7 @@ export const Nested = make({
|
|||||||
state: "on",
|
state: "on",
|
||||||
source_file: "automation.yaml",
|
source_file: "automation.yaml",
|
||||||
source_file_type: "list",
|
source_file_type: "list",
|
||||||
configuration_key: "automation",
|
configuration_key: ["automation"],
|
||||||
flags: {
|
flags: {
|
||||||
isSelected: true,
|
isSelected: true,
|
||||||
isModified: false,
|
isModified: false,
|
||||||
@@ -107,7 +107,7 @@ export const Nested = make({
|
|||||||
state: "off",
|
state: "off",
|
||||||
source_file: "automation.yaml",
|
source_file: "automation.yaml",
|
||||||
source_file_type: "list",
|
source_file_type: "list",
|
||||||
configuration_key: "automation",
|
configuration_key: ["automation"],
|
||||||
flags: {
|
flags: {
|
||||||
isSelected: false,
|
isSelected: false,
|
||||||
isModified: false,
|
isModified: false,
|
||||||
@@ -122,7 +122,7 @@ export const Nested = make({
|
|||||||
state: "offing",
|
state: "offing",
|
||||||
source_file: "automation.yaml",
|
source_file: "automation.yaml",
|
||||||
source_file_type: "list",
|
source_file_type: "list",
|
||||||
configuration_key: "automation",
|
configuration_key: ["automation"],
|
||||||
flags: {
|
flags: {
|
||||||
isSelected: false,
|
isSelected: false,
|
||||||
isModified: false,
|
isModified: false,
|
||||||
@@ -163,7 +163,7 @@ export const Nested = make({
|
|||||||
},
|
},
|
||||||
source_file: "automation.yaml",
|
source_file: "automation.yaml",
|
||||||
source_file_type: "list",
|
source_file_type: "list",
|
||||||
configuration_key: "automation",
|
configuration_key: ["automation"],
|
||||||
state: "on",
|
state: "on",
|
||||||
tags: {
|
tags: {
|
||||||
type: "good",
|
type: "good",
|
||||||
|
|||||||
@@ -60,7 +60,7 @@ export const useAutomationDB = (
|
|||||||
isNew: true,
|
isNew: true,
|
||||||
source_file: "n/a",
|
source_file: "n/a",
|
||||||
source_file_type: "n/a",
|
source_file_type: "n/a",
|
||||||
configuration_key: "n/a",
|
configuration_key: ["n/a"],
|
||||||
},
|
},
|
||||||
auto,
|
auto,
|
||||||
]);
|
]);
|
||||||
@@ -87,8 +87,8 @@ const genMapping = (
|
|||||||
> = {};
|
> = {};
|
||||||
Object.entries(haEntities)
|
Object.entries(haEntities)
|
||||||
.filter(([entityId, _]) => entityId.toLowerCase().startsWith("automation."))
|
.filter(([entityId, _]) => entityId.toLowerCase().startsWith("automation."))
|
||||||
.forEach(([entityId, entityData]) => {
|
.forEach(([entityId, entityData], i) => {
|
||||||
const autoId = entityData.attributes.id;
|
const autoId = entityData.attributes.id ?? `${entityData.state}-${i}`;
|
||||||
let title = entityData.attributes.friendly_name ?? "";
|
let title = entityData.attributes.friendly_name ?? "";
|
||||||
let description = "";
|
let description = "";
|
||||||
let issue: string | undefined = ["on", "off"].includes(entityData.state)
|
let issue: string | undefined = ["on", "off"].includes(entityData.state)
|
||||||
@@ -97,7 +97,7 @@ const genMapping = (
|
|||||||
let found: AutomationData | null = null;
|
let found: AutomationData | null = null;
|
||||||
let source_file = "n/a";
|
let source_file = "n/a";
|
||||||
let source_file_type = "n/a";
|
let source_file_type = "n/a";
|
||||||
let configuration_key = "n/a";
|
let configuration_key = ["n/a"];
|
||||||
if (configData[autoId]) {
|
if (configData[autoId]) {
|
||||||
found = configData[entityData.attributes.id];
|
found = configData[entityData.attributes.id];
|
||||||
title = found.alias ?? title;
|
title = found.alias ?? title;
|
||||||
|
|||||||
@@ -25,6 +25,7 @@
|
|||||||
|
|
||||||
.automation-manager--metadatabox .metadatabox--title {
|
.automation-manager--metadatabox .metadatabox--title {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
|
max-width: calc(80% - 5em);
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-manager--metadatabox .metadatabox--title .title {
|
.automation-manager--metadatabox .metadatabox--title .title {
|
||||||
@@ -74,6 +75,11 @@
|
|||||||
cursor: default;
|
cursor: default;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.automation-manager--metadatabox {
|
||||||
|
--metadatabox--switch-width: 5em;
|
||||||
|
--metadatabox--title--source-height: 1.5em;
|
||||||
|
}
|
||||||
|
|
||||||
.automation-manager--metadatabox .metadatabox--switch {
|
.automation-manager--metadatabox .metadatabox--switch {
|
||||||
display: flex;
|
display: flex;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
@@ -81,17 +87,31 @@
|
|||||||
justify-content: center;
|
justify-content: center;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
font-size: 0.75em;
|
font-size: 0.5em;
|
||||||
|
width: 5em;
|
||||||
user-select: none;
|
user-select: none;
|
||||||
max-width: 5em;
|
max-width: var(--metadatabox--switch-width);
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-manager--metadatabox .metadatabox--title {
|
||||||
|
position: relative;
|
||||||
|
padding-top: var(--metadatabox--title--source-height);
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-manager--metadatabox .metadatabox--title--source {
|
.automation-manager--metadatabox .metadatabox--title--source {
|
||||||
|
position: absolute;
|
||||||
margin-bottom: -0.5em;
|
margin-bottom: -0.5em;
|
||||||
|
left: calc(0.75em - var(--metadatabox--switch-width));
|
||||||
|
top: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
.automation-manager--metadatabox .metadatabox--title--source .MuiChip-root {
|
.automation-manager--metadatabox .metadatabox--title--source .MuiChip-root {
|
||||||
font-size: 0.85em;
|
font-size: 0.6em;
|
||||||
height: 2em;
|
max-height: calc(var(--metadatabox--title--source-height));
|
||||||
|
padding-top: 0.5em;
|
||||||
|
padding-bottom: 0.5em;
|
||||||
|
height: fit-content;
|
||||||
|
max-width: 60%;
|
||||||
|
min-width: fit-content;
|
||||||
}
|
}
|
||||||
@@ -14,7 +14,7 @@ import { ButtonIcon } from "components/Icons/ButtonIcons";
|
|||||||
import { AutomationManagerAuto } from "../types";
|
import { AutomationManagerAuto } from "../types";
|
||||||
import { Tags } from "./Tags";
|
import { Tags } from "./Tags";
|
||||||
import { TagDB } from "../TagDB";
|
import { TagDB } from "../TagDB";
|
||||||
import { Chip } from "@mui/material";
|
import { Chip, Tooltip } from "@mui/material";
|
||||||
|
|
||||||
export type MetadataBoxProps = AutomationManagerAuto & {
|
export type MetadataBoxProps = AutomationManagerAuto & {
|
||||||
onDelete: () => void;
|
onDelete: () => void;
|
||||||
@@ -48,22 +48,30 @@ export const MetadataBox: FC<MetadataBoxProps> = (props) => {
|
|||||||
disabled={!isValidState}
|
disabled={!isValidState}
|
||||||
color={!isValidState ? "error" : "info"}
|
color={!isValidState ? "error" : "info"}
|
||||||
/>
|
/>
|
||||||
{!isValidState && `Invalid state: '${props.state}'`}
|
{!isValidState && props.state}
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div className="metadatabox--title">
|
||||||
className="metadatabox--title"
|
|
||||||
title={`ID=${props.id}, EntityID=${props.entityId}`}
|
|
||||||
>
|
|
||||||
<span className="metadatabox--title--source">
|
<span className="metadatabox--title--source">
|
||||||
<Chip label={`@${props.source_file} (${props.source_file_type})`} />
|
<Tooltip
|
||||||
|
title={`This automation is located in the file ${props.source_file}. It's currently '${props.state}', it's entity id is '${props.entityId}' and it's automation id is '${props.id}'`}
|
||||||
|
>
|
||||||
|
<Chip
|
||||||
|
label={`@${props.source_file} (${props.source_file_type}) - ${
|
||||||
|
props.entityId ?? "n/a"
|
||||||
|
}`}
|
||||||
|
className="text-ellipsis"
|
||||||
|
/>
|
||||||
|
</Tooltip>
|
||||||
</span>
|
</span>
|
||||||
<InputTextView
|
<Tooltip title={`ID=${props.id}, EntityID=${props.entityId}`}>
|
||||||
className="title"
|
<InputTextView
|
||||||
placeholder="Title"
|
className="title"
|
||||||
value={props.title}
|
placeholder="Title"
|
||||||
onChange={props.onTitleUpdate}
|
value={props.title}
|
||||||
disabled={props.isNew}
|
onChange={props.onTitleUpdate}
|
||||||
/>
|
disabled={props.isNew}
|
||||||
|
/>
|
||||||
|
</Tooltip>
|
||||||
<InputTextView
|
<InputTextView
|
||||||
className="description"
|
className="description"
|
||||||
placeholder="Description"
|
placeholder="Description"
|
||||||
|
|||||||
@@ -70,7 +70,7 @@ const story = makeStory({
|
|||||||
state: "on",
|
state: "on",
|
||||||
source_file: "automation.yaml",
|
source_file: "automation.yaml",
|
||||||
source_file_type: "list",
|
source_file_type: "list",
|
||||||
configuration_key: "automation",
|
configuration_key: ["automation"],
|
||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
setSelAutoId(id);
|
setSelAutoId(id);
|
||||||
@@ -99,7 +99,7 @@ const makeAuto = (
|
|||||||
tags: {},
|
tags: {},
|
||||||
source_file: "automation.yaml",
|
source_file: "automation.yaml",
|
||||||
source_file_type: "list",
|
source_file_type: "list",
|
||||||
configuration_key: "automation",
|
configuration_key: ["automation"],
|
||||||
...data,
|
...data,
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ const automations: AutomationManagerAuto[] = [
|
|||||||
isSelected: false,
|
isSelected: false,
|
||||||
source_file: "automation.yaml",
|
source_file: "automation.yaml",
|
||||||
source_file_type: "list",
|
source_file_type: "list",
|
||||||
configuration_key: "automation",
|
configuration_key: ["automation"],
|
||||||
}));
|
}));
|
||||||
|
|
||||||
const bigList = bigMockAutoList.map<AutomationManagerAuto>((a) => ({
|
const bigList = bigMockAutoList.map<AutomationManagerAuto>((a) => ({
|
||||||
@@ -55,7 +55,7 @@ const bigList = bigMockAutoList.map<AutomationManagerAuto>((a) => ({
|
|||||||
isSelected: false,
|
isSelected: false,
|
||||||
source_file: "automation.yaml",
|
source_file: "automation.yaml",
|
||||||
source_file_type: "list",
|
source_file_type: "list",
|
||||||
configuration_key: "automation",
|
configuration_key: ["automation"],
|
||||||
}));
|
}));
|
||||||
|
|
||||||
test("no grouping", () => {
|
test("no grouping", () => {
|
||||||
|
|||||||
@@ -10,6 +10,10 @@
|
|||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.automation-manager.error>code {
|
||||||
|
padding: 1.5em;
|
||||||
|
}
|
||||||
|
|
||||||
.automation-manager.loading .automation-manager--sidebar.loading {
|
.automation-manager.loading .automation-manager--sidebar.loading {
|
||||||
width: 25vh;
|
width: 25vh;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
@@ -31,6 +35,8 @@
|
|||||||
max-height: 50vh;
|
max-height: 50vh;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
|
padding: 0.5em;
|
||||||
|
margin: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.invalid-automation-modal-list li {
|
.invalid-automation-modal-list li {
|
||||||
|
|||||||
@@ -156,7 +156,7 @@ export const BadAutomation = make({
|
|||||||
description: "",
|
description: "",
|
||||||
source_file: "automation.yaml",
|
source_file: "automation.yaml",
|
||||||
source_file_type: "list",
|
source_file_type: "list",
|
||||||
configuration_key: "automation",
|
configuration_key: ["automation"],
|
||||||
trigger: [
|
trigger: [
|
||||||
{
|
{
|
||||||
platform: "sun",
|
platform: "sun",
|
||||||
|
|||||||
@@ -195,13 +195,20 @@ export const AutomationManager: FC<AutomationManagerProps> = ({
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!api.state.automations.ok) {
|
if (!api.state.automations.ok) {
|
||||||
|
let error = api.state.automations.error;
|
||||||
|
try {
|
||||||
|
const errorObj = JSON.parse(api.state.automations.error);
|
||||||
|
if ("detail" in errorObj) {
|
||||||
|
error = errorObj["detail"];
|
||||||
|
}
|
||||||
|
} catch (_: any) {}
|
||||||
return (
|
return (
|
||||||
<div className="automation-manager error">
|
<div className="automation-manager error">
|
||||||
<Alert color="error">
|
<Alert color="error">
|
||||||
Failed to load automations from <code>/config</code>
|
Failed to load automations from <code>/config</code>
|
||||||
</Alert>{" "}
|
</Alert>{" "}
|
||||||
<br />
|
<br />
|
||||||
<code>{api.state.automations.error}</code>
|
<code>{error}</code>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -257,7 +264,7 @@ export const AutomationManager: FC<AutomationManagerProps> = ({
|
|||||||
}
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
// refreshAutomations();
|
refreshAutomations();
|
||||||
}}
|
}}
|
||||||
onAutomationUpdate={(auto) =>
|
onAutomationUpdate={(auto) =>
|
||||||
wrapApiPromise(
|
wrapApiPromise(
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ export type AutomationManagerAuto = AutomationManagerAutoUpdatable & {
|
|||||||
isNew?: boolean;
|
isNew?: boolean;
|
||||||
source_file: string;
|
source_file: string;
|
||||||
source_file_type: string;
|
source_file_type: string;
|
||||||
configuration_key: string;
|
configuration_key: string[];
|
||||||
};
|
};
|
||||||
export type AutomationManagerAutoItem = AutomationManagerAuto & {
|
export type AutomationManagerAutoItem = AutomationManagerAuto & {
|
||||||
flags: AutomationManagerItemFlags;
|
flags: AutomationManagerItemFlags;
|
||||||
|
|||||||
@@ -1,123 +1,45 @@
|
|||||||
import "./CollectionNode.css";
|
|
||||||
|
|
||||||
import Add from "@mui/icons-material/Add";
|
|
||||||
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
|
||||||
import { FC } from "react";
|
import { FC } from "react";
|
||||||
import { SequenceNodeElement } from "../SequenceNode/SequenceNodeElement";
|
|
||||||
import { CollectionNodeProps } from "./types";
|
import { CollectionNodeProps } from "./types";
|
||||||
import { Handle, Position } from "react-flow-renderer";
|
import { Handle, Position } from "react-flow-renderer";
|
||||||
import { useSequenceNodeColor } from "../SequenceNode/util";
|
import { CollectionNodeElement } from "./CollectionNodeElement";
|
||||||
import { prettyName } from "utils/formatting";
|
|
||||||
import DeleteForeverIcon from "@mui/icons-material/DeleteForever";
|
|
||||||
import { useConfirm } from "material-ui-confirm";
|
|
||||||
import { useSnackbar } from "notistack";
|
|
||||||
|
|
||||||
export const CollectionNode: FC<CollectionNodeProps> = ({
|
|
||||||
onAddNode,
|
|
||||||
nodes,
|
|
||||||
sequenceNode,
|
|
||||||
height,
|
|
||||||
width,
|
|
||||||
flipped,
|
|
||||||
color,
|
|
||||||
collectionType,
|
|
||||||
onDelete,
|
|
||||||
title,
|
|
||||||
}) => {
|
|
||||||
const nodeColor = useSequenceNodeColor(color);
|
|
||||||
const confirm = useConfirm();
|
|
||||||
const snackbr = useSnackbar();
|
|
||||||
const trueTile = title ?? collectionType;
|
|
||||||
|
|
||||||
|
export const CollectionNode: FC<CollectionNodeProps> = (props) => {
|
||||||
return (
|
return (
|
||||||
<div
|
<CollectionNodeElement {...props}>
|
||||||
className="collection-nodes--wrap"
|
<>
|
||||||
style={
|
<Handle
|
||||||
{
|
id="default"
|
||||||
"--node-color": nodeColor,
|
key="source-def"
|
||||||
"--node-height": `${height}px`,
|
type="source"
|
||||||
"--node-width": `${width}px`,
|
position={props.flipped ? Position.Bottom : Position.Right}
|
||||||
} as any
|
/>
|
||||||
}
|
<Handle
|
||||||
>
|
id="head"
|
||||||
<div className="collection-nodes">
|
key="source-head"
|
||||||
{!!onDelete && (
|
type="source"
|
||||||
<ButtonIcon
|
position={props.flipped ? Position.Top : Position.Left}
|
||||||
className="delete-icon"
|
/>
|
||||||
icon={<DeleteForeverIcon />}
|
</>
|
||||||
onClick={() => {
|
<>
|
||||||
confirm({
|
<Handle
|
||||||
description: `Are you sure you want to delete ${trueTile}?`,
|
id="default"
|
||||||
})
|
key="target-def"
|
||||||
.then(() => {
|
type="target"
|
||||||
onDelete();
|
position={props.flipped ? Position.Top : Position.Left}
|
||||||
snackbr.enqueueSnackbar("Deleted.", {
|
/>
|
||||||
variant: "info",
|
<Handle
|
||||||
});
|
id="side"
|
||||||
})
|
key="target-side"
|
||||||
.catch(() =>
|
type="target"
|
||||||
snackbr.enqueueSnackbar(`Did not delete ${trueTile}.`, {
|
position={!props.flipped ? Position.Right : Position.Left}
|
||||||
variant: "info",
|
/>
|
||||||
})
|
<Handle
|
||||||
);
|
id="return"
|
||||||
}}
|
key="target-return"
|
||||||
borderless
|
type="target"
|
||||||
color="secondary"
|
position={!props.flipped ? Position.Bottom : Position.Right}
|
||||||
/>
|
/>
|
||||||
)}
|
</>
|
||||||
<span className="collection-nodes--title">
|
</CollectionNodeElement>
|
||||||
{prettyName(collectionType)}s
|
|
||||||
</span>
|
|
||||||
<div className="collection-nodes--inner">
|
|
||||||
{nodes.map((n, i) => (
|
|
||||||
<SequenceNodeElement
|
|
||||||
key={i}
|
|
||||||
color={color}
|
|
||||||
flipped={flipped}
|
|
||||||
{...n}
|
|
||||||
{...sequenceNode}
|
|
||||||
/>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
<ButtonIcon className="add" icon={<Add />} onClick={onAddNode} />
|
|
||||||
<>
|
|
||||||
<Handle
|
|
||||||
id="default"
|
|
||||||
key="source-def"
|
|
||||||
type="source"
|
|
||||||
position={flipped ? Position.Bottom : Position.Right}
|
|
||||||
/>
|
|
||||||
<Handle
|
|
||||||
id="head"
|
|
||||||
key="source-head"
|
|
||||||
type="source"
|
|
||||||
position={flipped ? Position.Top : Position.Left}
|
|
||||||
/>
|
|
||||||
</>
|
|
||||||
<>
|
|
||||||
<Handle
|
|
||||||
id="default"
|
|
||||||
key="target-def"
|
|
||||||
type="target"
|
|
||||||
position={flipped ? Position.Top : Position.Left}
|
|
||||||
/>
|
|
||||||
<Handle
|
|
||||||
id="side"
|
|
||||||
key="target-side"
|
|
||||||
type="target"
|
|
||||||
position={!flipped ? Position.Right : Position.Left}
|
|
||||||
/>
|
|
||||||
<Handle
|
|
||||||
id="return"
|
|
||||||
key="target-return"
|
|
||||||
type="target"
|
|
||||||
position={!flipped ? Position.Bottom : Position.Right}
|
|
||||||
/>
|
|
||||||
</>
|
|
||||||
<span className="collection-nodes--total">
|
|
||||||
{nodes.length} node{nodes.length !== 1 ? "s" : ""}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
@@ -0,0 +1,94 @@
|
|||||||
|
import "./CollectionNode.css";
|
||||||
|
|
||||||
|
import Add from "@mui/icons-material/Add";
|
||||||
|
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
||||||
|
import { FC, PropsWithChildren } from "react";
|
||||||
|
import { SequenceNodeElement } from "../SequenceNode/SequenceNodeElement";
|
||||||
|
import { CollectionNodeProps } from "./types";
|
||||||
|
import {
|
||||||
|
convertNodeTypeToSequenceNodeColor,
|
||||||
|
useSequenceNodeColor,
|
||||||
|
} from "../SequenceNode/util";
|
||||||
|
import { prettyName } from "utils/formatting";
|
||||||
|
import DeleteForeverIcon from "@mui/icons-material/DeleteForever";
|
||||||
|
import { useConfirm } from "material-ui-confirm";
|
||||||
|
import { useSnackbar } from "notistack";
|
||||||
|
|
||||||
|
export const CollectionNodeElement: FC<PropsWithChildren<CollectionNodeProps>> =
|
||||||
|
({
|
||||||
|
onAddNode,
|
||||||
|
nodes,
|
||||||
|
sequenceNode,
|
||||||
|
height,
|
||||||
|
width,
|
||||||
|
flipped,
|
||||||
|
collectionType,
|
||||||
|
onDelete,
|
||||||
|
title,
|
||||||
|
children,
|
||||||
|
}) => {
|
||||||
|
const color = convertNodeTypeToSequenceNodeColor(collectionType);
|
||||||
|
const nodeColor = useSequenceNodeColor(color);
|
||||||
|
const confirm = useConfirm();
|
||||||
|
const snackbr = useSnackbar();
|
||||||
|
const trueTile = title ?? collectionType;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
className="collection-nodes--wrap"
|
||||||
|
style={
|
||||||
|
{
|
||||||
|
"--node-color": nodeColor,
|
||||||
|
"--node-height": `${height}px`,
|
||||||
|
"--node-width": `${width}px`,
|
||||||
|
} as any
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<div className="collection-nodes">
|
||||||
|
{!!onDelete && (
|
||||||
|
<ButtonIcon
|
||||||
|
className="delete-icon"
|
||||||
|
icon={<DeleteForeverIcon />}
|
||||||
|
onClick={() => {
|
||||||
|
confirm({
|
||||||
|
description: `Are you sure you want to delete ${trueTile}?`,
|
||||||
|
})
|
||||||
|
.then(() => {
|
||||||
|
onDelete();
|
||||||
|
snackbr.enqueueSnackbar("Deleted.", {
|
||||||
|
variant: "info",
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.catch(() =>
|
||||||
|
snackbr.enqueueSnackbar(`Did not delete ${trueTile}.`, {
|
||||||
|
variant: "info",
|
||||||
|
})
|
||||||
|
);
|
||||||
|
}}
|
||||||
|
borderless
|
||||||
|
color="secondary"
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
<span className="collection-nodes--title">
|
||||||
|
{prettyName(collectionType)}s
|
||||||
|
</span>
|
||||||
|
<div className="collection-nodes--inner">
|
||||||
|
{nodes.map((n, i) => (
|
||||||
|
<SequenceNodeElement
|
||||||
|
key={i}
|
||||||
|
color={color}
|
||||||
|
flipped={flipped}
|
||||||
|
{...n}
|
||||||
|
{...sequenceNode}
|
||||||
|
/>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
<ButtonIcon className="add" icon={<Add />} onClick={onAddNode} />
|
||||||
|
{children}
|
||||||
|
<span className="collection-nodes--total">
|
||||||
|
{nodes.length} node{nodes.length !== 1 ? "s" : ""}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -1,18 +1,12 @@
|
|||||||
import { NodeManager } from "components/DAGGraph/nodes/NodeManager";
|
import { NodeManager } from "components/DAGGraph/nodes/NodeManager";
|
||||||
import { CollectionNode } from "./CollectionNode";
|
import { CollectionNode } from "./CollectionNode";
|
||||||
import { CollectionNodeDataProps } from "./types";
|
import { CollectionNodeDataProps } from "./types";
|
||||||
import { SequenceNodeColor } from "../SequenceNode/types";
|
|
||||||
|
|
||||||
export const CollectionNodeMaker = NodeManager.register(
|
export const CollectionNodeMaker = NodeManager.register(
|
||||||
"CollectionNode",
|
"CollectionNode",
|
||||||
CollectionNode,
|
CollectionNode,
|
||||||
(pre: CollectionNodeDataProps, { node, flipped }) => ({
|
(pre: CollectionNodeDataProps, { node, flipped }) => ({
|
||||||
...pre,
|
...pre,
|
||||||
color: (pre.collectionType === "condition"
|
|
||||||
? "blue"
|
|
||||||
: pre.collectionType === "action"
|
|
||||||
? "green"
|
|
||||||
: "red") as SequenceNodeColor,
|
|
||||||
sequenceNode: node,
|
sequenceNode: node,
|
||||||
flipped,
|
flipped,
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -20,5 +20,4 @@ export type CollectionNodeDataProps = Size & {
|
|||||||
export type CollectionNodeProps = CollectionNodeDataProps & {
|
export type CollectionNodeProps = CollectionNodeDataProps & {
|
||||||
sequenceNode: Size;
|
sequenceNode: Size;
|
||||||
flipped: boolean;
|
flipped: boolean;
|
||||||
color: SequenceNodeColor;
|
|
||||||
};
|
};
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
import { SequenceNodeColor } from "./types";
|
import { SequenceNodeColor } from "./types";
|
||||||
import { useTheme } from "@mui/material/styles";
|
import { useTheme } from "@mui/material/styles";
|
||||||
|
import { AutomationNodeMapping } from "types/automations";
|
||||||
|
|
||||||
export const useSequenceNodeColor = (color: SequenceNodeColor): string => {
|
export const useSequenceNodeColor = (color: SequenceNodeColor): string => {
|
||||||
const theme = useTheme();
|
const theme = useTheme();
|
||||||
@@ -16,3 +17,8 @@ export const useSequenceNodeColor = (color: SequenceNodeColor): string => {
|
|||||||
? theme.palette.error.dark
|
? theme.palette.error.dark
|
||||||
: "none";
|
: "none";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const convertNodeTypeToSequenceNodeColor = (
|
||||||
|
type: keyof AutomationNodeMapping
|
||||||
|
): SequenceNodeColor =>
|
||||||
|
type === "condition" ? "blue" : type === "action" ? "green" : "red";
|
||||||
@@ -58,12 +58,6 @@ export const InternalPage: FC<{
|
|||||||
if (snackbarKeyHAConKey.current) {
|
if (snackbarKeyHAConKey.current) {
|
||||||
snackbar.closeSnackbar(snackbarKeyHAConKey.current);
|
snackbar.closeSnackbar(snackbarKeyHAConKey.current);
|
||||||
}
|
}
|
||||||
snackbarKeyHAConKey.current = snackbar.enqueueSnackbar(
|
|
||||||
`Connected to HA!`,
|
|
||||||
{
|
|
||||||
variant: "success",
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}, [conn, snackbar]);
|
}, [conn, snackbar]);
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,21 @@
|
|||||||
.version-box {
|
.version-box {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
bottom: 0;
|
bottom: -0.5em;
|
||||||
right: 0;
|
right: 0;
|
||||||
font-size: 0.5em;
|
font-size: 0.5em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.version-box #circle {
|
||||||
|
color: var(--mui-primary-main);
|
||||||
|
height: 1em;
|
||||||
|
width: 1em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.version-box #circle.error {
|
||||||
|
color: var(--mui-error-main);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.version-box #circle.loaded {
|
||||||
|
color: var(--mui-success-light);
|
||||||
}
|
}
|
||||||
@@ -1,9 +1,17 @@
|
|||||||
import "./index.css";
|
import "./index.css";
|
||||||
import { FC } from "react";
|
import { FC } from "react";
|
||||||
|
import { useHAConnection } from "haService/connection";
|
||||||
|
|
||||||
export const VersionBox: FC = () => {
|
export const VersionBox: FC = () => {
|
||||||
const version = process.env.REACT_APP_BUILD_VERSION ?? "n/a";
|
const ha = useHAConnection();
|
||||||
return <div className="version-box">
|
const version = process.env.REACT_APP_BUILD_VERSION ?? "n/a";
|
||||||
version: {version}
|
|
||||||
|
return (
|
||||||
|
<div className="version-box">
|
||||||
|
version: {version} / HA Connection{" "}
|
||||||
|
<span id="circle" className={ha.status}>
|
||||||
|
🟢
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
||||||
}
|
);
|
||||||
|
};
|
||||||
@@ -229,6 +229,9 @@ export const useHA = () => {
|
|||||||
callService,
|
callService,
|
||||||
callHA,
|
callHA,
|
||||||
deviceExtras: getDeviceExtraWsCalls(callHA),
|
deviceExtras: getDeviceExtraWsCalls(callHA),
|
||||||
reloadAutomations: () => callService("automation", "reload"),
|
reloadAutomations: () =>
|
||||||
|
conn.status === "loaded"
|
||||||
|
? callService("automation", "reload")
|
||||||
|
: Promise.resolve(),
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -8,7 +8,7 @@ export const AutomationRoute: FC<{ api: ApiService }> = ({ api }) => {
|
|||||||
return (
|
return (
|
||||||
<AutomationManager
|
<AutomationManager
|
||||||
api={api}
|
api={api}
|
||||||
refreshAutomations={() => ha.callService("automation", "reload")}
|
refreshAutomations={() => ha.reloadAutomations()}
|
||||||
triggerAutomation={(entity_id) =>
|
triggerAutomation={(entity_id) =>
|
||||||
ha.callService(
|
ha.callService(
|
||||||
"automation",
|
"automation",
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ export const AutomationData = st.object({
|
|||||||
|
|
||||||
source_file: st.optional(st.string()),
|
source_file: st.optional(st.string()),
|
||||||
source_file_type: st.optional(st.string()),
|
source_file_type: st.optional(st.string()),
|
||||||
configuration_key: st.optional(st.string()),
|
configuration_key: st.optional(st.array(st.string())),
|
||||||
|
|
||||||
trigger: st.array(st.object()),
|
trigger: st.array(st.object()),
|
||||||
condition: st.array(st.object()),
|
condition: st.array(st.object()),
|
||||||
|
|||||||
@@ -13,5 +13,5 @@ export const AutomationMetadata = st.object({
|
|||||||
export const AutomationShortumationMetadata = st.object({
|
export const AutomationShortumationMetadata = st.object({
|
||||||
source_file: st.string(),
|
source_file: st.string(),
|
||||||
source_file_type: st.string(),
|
source_file_type: st.string(),
|
||||||
configuration_key: st.string(),
|
configuration_key: st.array(st.string()),
|
||||||
});
|
});
|
||||||
@@ -18,7 +18,7 @@ export const createMockAuto = ({
|
|||||||
condition: [],
|
condition: [],
|
||||||
source_file: "automation.yaml",
|
source_file: "automation.yaml",
|
||||||
source_file_type: "list",
|
source_file_type: "list",
|
||||||
configuration_key: "automation",
|
configuration_key: ["automation"],
|
||||||
trigger: [
|
trigger: [
|
||||||
{
|
{
|
||||||
platform: "numeric_state",
|
platform: "numeric_state",
|
||||||
@@ -87,7 +87,7 @@ export const bigMockAutoList: AutomationData[] = [
|
|||||||
mode: "single",
|
mode: "single",
|
||||||
source_file: "automation.yaml",
|
source_file: "automation.yaml",
|
||||||
source_file_type: "list",
|
source_file_type: "list",
|
||||||
configuration_key: "automation",
|
configuration_key: ["automation"],
|
||||||
trigger: [
|
trigger: [
|
||||||
{
|
{
|
||||||
device_id: "asdasdasdas",
|
device_id: "asdasdasdas",
|
||||||
@@ -239,7 +239,7 @@ export const bigMockAutoList: AutomationData[] = [
|
|||||||
mode: "single",
|
mode: "single",
|
||||||
source_file: "automation.yaml",
|
source_file: "automation.yaml",
|
||||||
source_file_type: "list",
|
source_file_type: "list",
|
||||||
configuration_key: "automation",
|
configuration_key: ["automation"],
|
||||||
trigger: [
|
trigger: [
|
||||||
{
|
{
|
||||||
platform: "device",
|
platform: "device",
|
||||||
@@ -282,7 +282,7 @@ export const bigMockAutoList: AutomationData[] = [
|
|||||||
mode: "single",
|
mode: "single",
|
||||||
source_file: "automation.yaml",
|
source_file: "automation.yaml",
|
||||||
source_file_type: "list",
|
source_file_type: "list",
|
||||||
configuration_key: "automation",
|
configuration_key: ["automation"],
|
||||||
trigger: [
|
trigger: [
|
||||||
{
|
{
|
||||||
platform: "state",
|
platform: "state",
|
||||||
@@ -417,7 +417,7 @@ export const bigMockAutoList: AutomationData[] = [
|
|||||||
mode: "single",
|
mode: "single",
|
||||||
source_file: "automation.yaml",
|
source_file: "automation.yaml",
|
||||||
source_file_type: "list",
|
source_file_type: "list",
|
||||||
configuration_key: "automation",
|
configuration_key: ["automation"],
|
||||||
trigger: [
|
trigger: [
|
||||||
{
|
{
|
||||||
platform: "time",
|
platform: "time",
|
||||||
@@ -480,7 +480,7 @@ export const bigMockAutoList: AutomationData[] = [
|
|||||||
mode: "single",
|
mode: "single",
|
||||||
source_file: "automation.yaml",
|
source_file: "automation.yaml",
|
||||||
source_file_type: "list",
|
source_file_type: "list",
|
||||||
configuration_key: "automation",
|
configuration_key: ["automation"],
|
||||||
tags: {},
|
tags: {},
|
||||||
trigger: [
|
trigger: [
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in new issue
Block a user