Compare commits

...
51 Commits
Author SHA1 Message Date
ari 07d5a4d4db fixed db tests 2022-08-25 11:35:43 -04:00
ari 1b81962c03 fixed sec 2022-08-25 11:30:40 -04:00
ari 86d4117773 correcct py version 2022-08-25 11:25:54 -04:00
ari 5ad653ffcb removing armhf & enabling build caches 2022-08-25 11:11:46 -04:00
ari 4c59f9cbc1 fixing build 2022-08-25 11:01:55 -04:00
ari 9d232246e8 upgrading python 2022-08-25 10:50:44 -04:00
Ari Sosnovsky 61a64e0040 Update README.md 2022-08-25 10:34:04 -04:00
ari 2f709b499a fixed linter 2022-08-25 10:17:39 -04:00
ari f4fe036480 noop yamlsupport for all directives 2022-08-25 10:15:26 -04:00
ari 97521097dc noop yaml loader refactor 2022-08-24 10:57:41 -04:00
ari 0cf3f2706a test fix 2022-08-24 10:23:58 -04:00
ari 924eea0c0a refactor of yaml serializor 2022-08-24 10:23:42 -04:00
ari 616c8c3b4b - fixed test case
- attempting to up the websocket
2022-08-22 15:19:41 -04:00
ari b68962ccbb removed tmpdb 2022-08-22 14:46:41 -04:00
ari 6bac5f184f always run test 2022-08-18 12:26:31 -04:00
ari 38a645918f config.yaml update 2022-08-18 12:10:37 -04:00
ari ba13c281d2 stylinh 2022-08-18 11:54:36 -04:00
ari 9184d1f7bd better repeat error parsing 2022-08-18 11:49:42 -04:00
ari f8f6d74d6a elipses 2022-08-18 11:21:51 -04:00
ari 819a76f8e3 minor ui tweaks 2022-08-18 11:01:45 -04:00
ari a391eae7c5 sync'd up 2022-08-18 10:50:11 -04:00
ari 7cb1a5d907 additional api refactor 2022-08-18 10:19:17 -04:00
ari 8792ed6ed8 displaying source file 2022-08-16 21:14:10 -04:00
ari 9bafbf4e8c removed upsert 2022-08-16 20:48:13 -04:00
ari c67d1bd32f - refactor for multi-config suport done
- added better errror captures
2022-08-16 11:40:30 -04:00
ari 55ea1e23a4 backend modified 2022-08-15 21:56:48 -04:00
ari d96c1fb953 tags 2022-08-15 21:23:51 -04:00
ari f8b59c6b17 tags 2022-08-15 19:50:24 -04:00
ari 02cbacabe0 clean up 2022-08-15 15:46:58 -04:00
ari b0d924f63a using sync process 2022-08-15 15:43:18 -04:00
ari 7aadfbc175 initial manager work 2022-08-14 16:50:58 -04:00
ari 08af01dd11 config watcher 2022-08-14 15:31:42 -04:00
ari 586f52ba56 rapid changes 2022-08-14 01:26:11 -04:00
ari e11f4deab5 watching folders 2022-08-14 01:07:19 -04:00
ari 579017d9ec automation path loader 2022-08-14 01:00:19 -04:00
ari a746c4db3a testing loader 2022-08-14 00:41:05 -04:00
ari 3a89fe5efc v2 initial work 2022-08-14 00:24:44 -04:00
ari 2bc7e11bb1 clean up 2022-08-08 21:24:24 -04:00
ari e6a835a5f3 minor clean up 2022-08-08 20:53:31 -04:00
ari 107def4fac fixed up calednar 2022-08-07 21:45:11 -04:00
ari 6b21734041 added scene support 2022-08-06 22:43:56 -04:00
ari 754cc2ef98 added more support for trigger types 2022-08-06 22:37:26 -04:00
ari 1cb40288b1 remove state for zone 2022-08-06 20:41:02 -04:00
ari 129ba28ff5 v0.5.3 2022-08-06 20:28:09 -04:00
Ari Sosnovsky 44e246f79b Update README.md 2022-08-06 20:22:34 -04:00
ari 8bcbcaa801 added a redirect 2022-08-06 20:03:10 -04:00
ari b479476833 fixed up invalid node issue 2022-08-06 15:29:41 -04:00
Przemysław Adam Sowa baa31ab649 Don't use network host mode in the example docker-compose.yaml (#128) 2022-08-06 14:20:27 -04:00
Ari Sosnovsky dc7c6273e4 Update README.md 2022-08-06 13:16:34 -04:00
Ari Sosnovsky 2942b6173b Update README.md 2022-08-05 23:41:46 -04:00
ari bcfc648011 controls 2022-08-05 23:35:47 -04:00
158 changed files with 4410 additions and 1819 deletions

No files matched your search

+49 -27
View File
@@ -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,52 @@ 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"
- "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
with: with:
args: | args: |
--${{ matrix.arch }} \ --${{ matrix.arch }} \
+1 -4
View File
@@ -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
+27
View File
@@ -1,5 +1,32 @@
# Changelog ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=for-the-badge) # Changelog ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=for-the-badge)
## [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
![image](https://user-images.githubusercontent.com/7451445/185440955-c7f15f95-c9cf-4368-bc4a-b84140b97b00.png)
- Better global error capture
![image](https://user-images.githubusercontent.com/7451445/185441268-9dbde36e-b28b-4a13-bd7f-45ae23834e78.png)
## [0.5.3] - Bug Fixes
- Redirecting `/` to `/web` to resolve container install strangeness reported in https://github.com/asosnovsky/Shortumation/issues/125
- Fixed missing flag that caused the automation to explode in https://github.com/asosnovsky/Shortumation/issues/124
## [0.5.2] - Better Controls
- Add automation trigger
- Speed dial on the bottom
<img src="https://user-images.githubusercontent.com/7451445/183231968-9891bbb4-5c7c-4e05-b804-36978c809a5c.png" width="200px"/>
- Infinite undos <img src="https://user-images.githubusercontent.com/7451445/183231977-ed000017-2886-4a57-b5fb-c7e527bf3894.png" width="200px"/>
## [0.5.1] - Sidebar! ## [0.5.1] - Sidebar!
- completely redesigned the sidebar! - completely redesigned the sidebar!
+2 -1
View File
@@ -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
+12 -4
View File
@@ -1,4 +1,4 @@
# Shortumation ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=platsic) # <img src="logo.png" height="40x"/> Shortumation ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=platsic)
[![Test](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml/badge.svg)](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml) [![Build](https://github.com/asosnovsky/Shortumation/actions/workflows/build.yml/badge.svg)](https://github.com/asosnovsky/Shortumation/actions/workflows/build.yml) [![Test](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml/badge.svg)](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml) [![Build](https://github.com/asosnovsky/Shortumation/actions/workflows/build.yml/badge.svg)](https://github.com/asosnovsky/Shortumation/actions/workflows/build.yml)
@@ -6,7 +6,9 @@
| ------- | ------------------------------------------------------------------------------------------------------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------- | | ------- | ------------------------------------------------------------------------------------------------------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------- |
| Version | ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=for-the-badge) | ![Docker Image Version (latest semver)](https://img.shields.io/docker/v/asosnovsky/shortumation-amd64?&sort=date&label=&style=for-the-badge) | | Version | ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=for-the-badge) | ![Docker Image Version (latest semver)](https://img.shields.io/docker/v/asosnovsky/shortumation-amd64?&sort=date&label=&style=for-the-badge) |
A [home-assistant addon](https://www.home-assistant.io/addons/) for a better UI for managing and writing your automations. We provide a way to visualize your automation using a visual-programming language that draws inspirations from [Node-Red](https://nodered.org/). A [home-assistant addon](https://www.home-assistant.io/addons/) for a better UI for managing and writing your automations. We provide a way to visualize your automation using a visual-programming language that draws inspirations from [Node-Red](https://nodered.org/).
<img src="./assets/comparisons.png">
## Features ## Features
@@ -46,14 +48,20 @@ Add the repository URL under **Supervisor → Add-on store → ⋮ → Manage ad
It should now appear in your `Add-on Store` and you should be able to install it! It should now appear in your `Add-on Store` and you should be able to install it!
### Containerized or HA Core **Please note that you may need to enable advance mode in your settings first!**
Please note that this way of using Shortumation is **not future proof**. ### Containerized or HA Core
If this warning does not scare you or you still want to try things out, then take a look at the example [docker-compose.yaml](example/containerized/docker-compose.yaml), or read the [extended guide here](https://github.com/asosnovsky/Shortumation/wiki/Installation#containerized--ha-core). If this warning does not scare you or you still want to try things out, then take a look at the example [docker-compose.yaml](example/containerized/docker-compose.yaml), or read the [extended guide here](https://github.com/asosnovsky/Shortumation/wiki/Installation#containerized--ha-core).
In general, if you want to help provide this to more home-assistant fans please join on the conversation here https://github.com/asosnovsky/Shortumation/issues/102 or help contribute :)
## FAQ ## 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)
-3
View File
@@ -1,3 +0,0 @@
LOG_LEVEL=DEBUG
SUPERVISOR_TOKEN=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiI2ZjJiYzM2MjkyOWM0OGM1Yjg1NzgxNDEzNTRkNDk0NSIsImlhdCI6MTY1OTExMTExMCwiZXhwIjoxOTc0NDcxMTEwfQ.Q5Ei1a9BXyB4-whrPGoko6CKavOOloFC1fbP-jAYBpU
HASSIO_WS=ws://homeassistant:8123/api/websocket
+5 -10
View File
@@ -1,12 +1,7 @@
{ {
"python.formatting.provider": "black", "python.formatting.provider": "black",
"python.testing.unittestArgs": [ "python.testing.unittestArgs": ["-v", "-s", "./tests", "-p", "*test_*.py"],
"-v", "python.testing.pytestEnabled": false,
"-s", "python.testing.unittestEnabled": true,
"./tests", "python.envFile": "${workspaceFolder}/development_config/.env"
"-p",
"*test_*.py"
],
"python.testing.pytestEnabled": false,
"python.testing.unittestEnabled": true
} }
+20 -14
View File
@@ -1,14 +1,20 @@
list_autos # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:17) get_index # unused function (src/api/app.py:43)
upsert_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:28) list_autos # unused function (src/api/routes/automations.py:13)
delete_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:32) insert_auto # unused function (src/api/routes/automations.py:28)
read_details # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/details.py:10) update_auto # unused function (src/api/routes/automations.py:32)
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/ping.py:10) delete_auto # unused function (src/api/routes/automations.py:40)
websocket_endpoint # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/socket.py:9) read_details # unused function (src/api/routes/details.py:11)
params # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:18) read_ping # unused function (src/api/routes/ping.py:10)
total_items # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:19) websocket_endpoint # unused function (src/api/routes/socket.py:13)
id # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:8) params # unused variable (src/api/types.py:16)
alias # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:9) total_items # unused variable (src/api/types.py:17)
description # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:10) data # unused variable (src/api/types.py:18)
trigger_variables # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:11) trigger_variables # unused variable (src/automations/types.py:13)
mode # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:12) trigger # unused variable (src/automations/types.py:15)
json_dumps # unused function (/home/ari/Projects/Shortumation/api/src/json_serializer.py:5) condition # unused variable (src/automations/types.py:16)
action # unused variable (src/automations/types.py:17)
_.to_json # unused method (src/automations/types.py:45)
_.automation_tags # unused property (src/hass_config/loader.py:17)
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)
+4 -1
View File
@@ -45,4 +45,7 @@ start-docker:
tar -xvf ../development_config.tar.gz -C ./ tar -xvf ../development_config.tar.gz -C ./
cp ./development_config/.env .env.api cp ./development_config/.env .env.api
docker-compose down docker-compose down
docker-compose up docker-compose up
update-vulture-whitelist:
$(VENV_BIN)/vulture --make-whitelist src > .vulture_whitelist
+2 -2
View File
@@ -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": [
+11 -1
View File
@@ -1,5 +1,6 @@
from fastapi import FastAPI from fastapi import FastAPI
from fastapi.middleware.cors import CORSMiddleware from fastapi.middleware.cors import CORSMiddleware
from fastapi.responses import RedirectResponse
from fastapi.staticfiles import StaticFiles from fastapi.staticfiles import StaticFiles
from src.automations.manager import AutomationManager from src.automations.manager import AutomationManager
@@ -10,7 +11,8 @@ from .routes import automations, details, ping, socket
def make_app(automation_mgr: AutomationManager) -> FastAPI: def make_app(automation_mgr: AutomationManager) -> FastAPI:
app = FastAPI() app = FastAPI()
if (ROOT_FOLDER / "web").exists(): has_web_folder = (ROOT_FOLDER / "web").exists()
if has_web_folder:
app.mount( app.mount(
f"{API_PREFIX}/web", f"{API_PREFIX}/web",
StaticFiles( StaticFiles(
@@ -19,6 +21,7 @@ def make_app(automation_mgr: AutomationManager) -> FastAPI:
), ),
name="web", name="web",
) )
else: else:
print("WARN: could not find web folder") print("WARN: could not find web folder")
app.add_middleware( app.add_middleware(
@@ -36,4 +39,11 @@ def make_app(automation_mgr: AutomationManager) -> FastAPI:
details.make_details_router(automation_mgr.hass_config), prefix=f"{API_PREFIX}/details" details.make_details_router(automation_mgr.hass_config), prefix=f"{API_PREFIX}/details"
) )
app.include_router(socket.router, prefix=f"{API_PREFIX}/socket") app.include_router(socket.router, prefix=f"{API_PREFIX}/socket")
@app.get("/")
def get_index():
if has_web_folder:
return RedirectResponse("/web")
return RedirectResponse("/details")
return app return app
+24 -21
View File
@@ -1,43 +1,46 @@
from fastapi import APIRouter, HTTPException from fastapi import APIRouter, HTTPException
from src.api.types import ( from src.api.types import ListData, ListParams, UpdateTags
DeleteAutoRequest,
ListData,
ListParams,
UpdateAutoRequest,
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 AutomationData 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:
router = APIRouter() router = APIRouter()
@router.post("/list") @router.post("/list")
def list_autos(body: ListParams) -> ListData[AutomationData]: def list_autos(body: ListParams) -> ListData[ExtenededAutomation]:
return ListData( try:
params=body, automations.reload()
totalItems=automations.get_total_items(), return ListData(
data=automations.find( params=body,
offset=body.offset, totalItems=automations.count(),
limit=body.limit, data=automations.list(
), 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 upsert_auto(body: UpdateAutoRequest): def insert_auto(body: Automation):
automations.update(body.index, body.data) automations.create(body)
@router.put("/item")
def update_auto(body: ExtenededAutomation):
automations.update(body)
@router.post("/item/tags") @router.post("/item/tags")
def update_tags(body: UpdateTags): def update_tags(body: UpdateTags):
automations.update_tags(body.automation_id, body.tags) automations.update_tags(body.automation_id, body.tags)
@router.delete("/item") @router.delete("/item")
def delete_auto(body: DeleteAutoRequest): def delete_auto(body: ExtenededAutomation):
try: try:
automations.delete(body.index) automations.delete(body)
except FailedDeletion as err: except FailedDeletion as err:
return HTTPException( return HTTPException(
status_code=400, status_code=400,
+5 -1
View File
@@ -1,5 +1,6 @@
from fastapi import APIRouter from fastapi import APIRouter
from src.automations.loader import extract_automation_paths
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
@@ -15,7 +16,10 @@ def make_details_router(hass_config: HassConfig) -> APIRouter:
"hassio_url": HASSIO_WS, "hassio_url": HASSIO_WS,
"config": hass_config.get_configuration_path(), "config": hass_config.get_configuration_path(),
"tags": hass_config.get_automation_tags_path(), "tags": hass_config.get_automation_tags_path(),
"autos": hass_config.get_automation_path(), "autos": {
config_key: auto_file
for config_key, auto_file in extract_automation_paths(hass_config)
},
} }
return router return router
-11
View File
@@ -4,8 +4,6 @@ from pydantic import BaseModel
from pydantic.fields import Field from pydantic.fields import Field
from pydantic.generics import GenericModel from pydantic.generics import GenericModel
from src.automations.types import ExtenededAutomationData
DataT = TypeVar("DataT") DataT = TypeVar("DataT")
@@ -20,15 +18,6 @@ class ListData(GenericModel, Generic[DataT]):
data: List[DataT] data: List[DataT]
class UpdateAutoRequest(BaseModel):
index: int = Field(description="Index of the automation to update")
data: ExtenededAutomationData
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]
class DeleteAutoRequest(BaseModel):
index: int = Field(description="Index of the automation to update")
+121
View File
@@ -0,0 +1,121 @@
import base64
import json
import sqlite3
from contextlib import contextmanager
from pathlib import Path
from typing import Iterable, Iterator, List, Optional
from src.logger import get_logger
from .errors import (
DBDataError,
DBError,
DBNoAutomationFound,
RepeatedAutomationId,
)
from .types import ExtenededAutomation
logger = get_logger(__file__)
automations_tbl = "autos"
def encode_auto(auto: ExtenededAutomation) -> str:
return base64.b64encode(
json.dumps(auto.to_primitive(include_tags=True)).encode("utf-8")
).decode("utf-8")
def decode_auto(
auto_str: str, source_file: str, source_file_type: str, configuration_key: str
) -> ExtenededAutomation:
return ExtenededAutomation(
source_file=source_file,
source_file_type=source_file_type,
configuration_key=configuration_key,
**json.loads(base64.b64decode(auto_str.encode("utf-8")).decode("utf-8")),
)
class AutomationDBConnection:
def __init__(self, db_file: Path) -> None:
self.db_file = db_file
def reset(self):
self.db_file.unlink(missing_ok=True)
self.create_db()
@contextmanager
def get_cur(self) -> Iterator[sqlite3.Cursor]:
conn = sqlite3.connect(self.db_file)
cur = conn.cursor()
try:
yield cur
conn.commit()
except sqlite3.DatabaseError as err:
raise DBError(*err.args) from err
finally:
cur.close()
conn.close()
def create_db(self):
with self.get_cur() as cur:
cur.execute(
f"""
CREATE TABLE IF NOT EXISTS {automations_tbl} (
id TEXT NOT NULL PRIMARY KEY,
alias TEXT,
description TEXT,
mode TEXT NOT NULL,
source_file TEXT NOT NULL,
source_file_type TEXT NOT NULL,
configuration_key TEXT NOT NULL,
rest BLOB NOT NULL
);
"""
)
def insert_automations(self, automations: List[ExtenededAutomation]):
with self.get_cur() as cur:
for automation in automations:
try:
cur.execute(
f"""
INSERT INTO {automations_tbl} VALUES (
"{automation.id}",
"{automation.alias}",
"{automation.description}",
"{automation.mode}",
"{automation.source_file}",
"{automation.source_file_type}",
"{automation.configuration_key}",
"{encode_auto(automation)}"
);
""",
)
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:
with self.get_cur() as cur:
cur.execute(
f'SELECT rest, source_file, source_file_type, configuration_key FROM {automations_tbl} WHERE id = "{automation_id}"' # nosec
)
objs = cur.fetchone()
if objs is None:
raise DBNoAutomationFound(automation_id)
[rest, source_file, source_file_type, configuration_key] = objs
return decode_auto(rest, source_file, source_file_type, configuration_key)
def list_automations(self, offset: int, limit: int) -> Iterable[ExtenededAutomation]:
with self.get_cur() as cur:
for [rest, source_file, source_file_type, configuration_key] in cur.execute(
f"SELECT rest, source_file, source_file_type, configuration_key FROM {automations_tbl} LIMIT {limit} OFFSET {offset}" # nosec
):
yield decode_auto(rest, source_file, source_file_type, configuration_key)
def count_automations(self) -> int:
with self.get_cur() as cur:
return cur.execute(f"SELECT count(id) FROM {automations_tbl}").fetchone()[0] # nosec
+20
View File
@@ -5,9 +5,29 @@ class AutomationLoaderException(Exception):
) )
class AttemptingToOverwriteAnIncompatibleFileError(AutomationLoaderException):
pass
class InvalidAutomationFile(AutomationLoaderException): class InvalidAutomationFile(AutomationLoaderException):
pass pass
class FailedDeletion(AutomationLoaderException): class FailedDeletion(AutomationLoaderException):
pass pass
class DBError(Exception):
pass
class DBDataError(DBError):
pass
class RepeatedAutomationId(DBDataError):
pass
class DBNoAutomationFound(DBError):
pass
+138 -23
View File
@@ -1,38 +1,153 @@
from typing import Any, Iterator, Union from pathlib import Path
from typing import Any, Iterator, Tuple, Union
from pydantic.error_wrappers import ValidationError
from src.json_serializer import normalize_obj from src.json_serializer import normalize_obj
from src.logger import get_logger
from src.utils import extract_files
from src.yaml_serializer import (
IncludedYaml,
IncludedYamlDir,
dump_yaml,
load_yaml,
)
from ..hass_config.loader import HassConfig
from .errors import InvalidAutomationFile from .errors import InvalidAutomationFile
from .types import AutomationMetdata, ExtenededAutomationData from .tags import TagManager
from .types import ExtenededAutomation
logger = get_logger(__file__)
AUTOMATION_CONFIGURATION_KEY = "automation shortumation"
# Single loader def extract_automation_paths(
def load_automation( hass_config: HassConfig,
auto_raw: dict, ) -> Iterator[Tuple[str, str]]:
tags: dict, found = False
) -> Iterator[ExtenededAutomationData]: for key, value in extract_automation_keys(hass_config):
"""Converts an automation dictionary loaded directly from the config into logger.info(f"Loading automations from '{key}'")
several python typed objects found = True
if isinstance(value, IncludedYamlDir): # type: ignore
yield key, str(value.path.relative_to(hass_config.root_path))
else:
logger.warning(f"found an invalid type in {key}!")
if not found:
yield "", "automations.yaml"
def get_base_automation_key(hass_config: HassConfig):
found_any = False
for key, value in extract_automation_keys(hass_config):
found_any = True
if isinstance(value, IncludedYaml):
return key, str(value.path.relative_to(hass_config.root_path))
configurations = hass_config.configurations
if found_any:
out_path = hass_config.get_backup_automation_file_path()
else:
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))
configurations[AUTOMATION_CONFIGURATION_KEY] = IncludedYaml(out_path)
out_path.touch(exist_ok=True)
with hass_config.get_configuration_path().open("w") as fp:
fp.write(dump_yaml(configurations, root_path=hass_config.root_path))
return AUTOMATION_CONFIGURATION_KEY, out_file
def extract_automation_keys(
hass_config: HassConfig,
) -> Iterator[Tuple[str, IncludedYamlDir]]:
for key, value in hass_config.configurations.items():
if str(key).startswith("automation"):
if isinstance(value, dict) or isinstance(value, list):
raise NotImplementedError(
"No support for automations baked into configuration.yaml! Please extract these into a seperate file"
)
elif isinstance(value, IncludedYamlDir): # type: ignore
yield key, value
else:
logger.warning(f"found an invalid type in {key}!")
def load_automation_path(
root_path: Path,
automation_path: Path,
configuration_key: str,
tag_manager: TagManager,
) -> Iterator[ExtenededAutomation]:
"""
Args: Args:
automations_raw_data (Iterable[dict]) automation_path (Path)
configuration_key (str)
Returns: Returns:
Iterator[ExtenededAutomationData] Iterator[ExtenededAutomation]
""" """
try: if not automation_path.exists():
yield ExtenededAutomationData( logger.warning(f"the file {automation_path} does not exists")
metadata=AutomationMetdata.parse_obj(auto_raw), return
condition=ifempty_or_null_then_list(load_conditions(auto_raw.get("condition", []))), if automation_path.is_dir():
sequence=ifempty_or_null_then_list(load_conditions(auto_raw.get("action", []))), for f in extract_files(automation_path):
trigger=ifempty_or_null_then_list(normalize_obj(auto_raw.get("trigger", []))), yield from load_automation_path(root_path, f, configuration_key, tag_manager)
tags=tags, else:
) try:
except ValidationError as err: with automation_path.open("r") as fp:
raise InvalidAutomationFile from err automations = load_yaml(fp, root_path=root_path)
except Exception as err:
raise InvalidAutomationFile(
when="loading yaml",
automation_path=automation_path,
error=err,
) from err
if isinstance(automations, dict):
try:
yield ExtenededAutomation(
**clean_automation(automations),
tags=tag_manager.get(automations["id"], {}),
configuration_key=configuration_key,
source_file=str(automation_path.relative_to(root_path)),
source_file_type="obj",
)
except Exception as err:
raise InvalidAutomationFile(
when="reading file contents",
automation_path=automation_path,
error=err,
) from err
else:
if automations is None:
logger.warning(f"the file {automation_path} is empty")
return
for automation in automations:
try:
yield ExtenededAutomation(
**clean_automation(automation),
tags=tag_manager.get(automation["id"], {}),
configuration_key=configuration_key,
source_file=str(automation_path.relative_to(root_path)),
source_file_type="list",
)
except Exception as err:
raise InvalidAutomationFile(
when="reading file contents",
automation_path=automation_path,
error=err,
automation=automation,
) from err
def clean_automation(auto_raw: dict):
return {
**auto_raw,
"condition": ifempty_or_null_then_list(load_conditions(auto_raw.get("condition", []))),
"action": ifempty_or_null_then_list(load_conditions(auto_raw.get("action", []))),
"trigger": ifempty_or_null_then_list(normalize_obj(auto_raw.get("trigger", []))),
}
def ifempty_or_null_then_list(obj: Any): def ifempty_or_null_then_list(obj: Any):
+149 -64
View File
@@ -1,76 +1,161 @@
from typing import Dict, Iterator, List, Optional from pathlib import Path
from tempfile import mktemp
from typing import Dict, Optional, Union
from src.automations.errors import FailedDeletion, InvalidAutomationFile
from src.automations.types import AutomationData, ExtenededAutomationData
from src.hass_config.loader import HassConfig from src.hass_config.loader import HassConfig
from src.yaml_serializer import dump_yaml, load_yaml
from .loader import load_automation from ..errors import ErrorSet
from ..logger import get_logger
from .db import AutomationDBConnection
from .errors import (
AttemptingToOverwriteAnIncompatibleFileError,
DBError,
InvalidAutomationFile,
)
from .loader import (
extract_automation_paths,
get_base_automation_key,
load_automation_path,
)
from .tags import TagManager
from .types import Automation, ExtenededAutomation
logger = get_logger(__file__)
class AutomationManager: class AutomationManager:
def __init__(self, hass_config: HassConfig) -> None: def __init__(
self.hass_config = hass_config
def find(
self, self,
offset: int = 0, hass_config: HassConfig,
limit: int = 10, db_path: Optional[Path] = None,
) -> Iterator[AutomationData]: ) -> None:
tags = self.hass_config.automation_tags if db_path is None:
for i, auto in enumerate(self.hass_config.automations): db_path = Path(mktemp()) # nosec
if i < offset: self.hass_config = hass_config
continue self.db = AutomationDBConnection(db_path)
if i >= offset + limit: self.tag_path = hass_config.get_automation_tags_path()
break self.tag_manager = TagManager()
yield from load_automation(auto, tags.get(auto.get("id", ""), {})) self.reload_tags()
def get(self, index: int) -> Optional[ExtenededAutomationData]: def reload_tags(self):
tags = self.hass_config.automation_tags if self.tag_path.exists():
if index >= 0: self.tag_manager = TagManager.load(self.tag_path)
for i, auto in enumerate(self.hass_config.automations):
if not isinstance(auto, dict):
raise InvalidAutomationFile(automation_index=i)
if i == index:
return next(load_automation(auto, tags.get(auto.get("id", ""), {})))
return None
def update(self, index: int, automation: ExtenededAutomationData): def reload(self):
tags = self.hass_config.automation_tags self.db.reset()
automations: List[dict] = [] self.reload_tags()
updated_index: Optional[int] = None errors = []
for i, orig_auto in enumerate(self.hass_config.automations): for config_key, p in extract_automation_paths(self.hass_config):
if i == index: try:
automations.append(automation.to_primitive()) automations = list(
updated_index = i load_automation_path(
else: self.hass_config.root_path,
automations.append(orig_auto) self.hass_config.root_path / p,
if updated_index is None: config_key,
automations.append(automation.to_primitive()) self.tag_manager,
updated_index = len(automations) - 1 )
tags[automation.metadata.id] = automation.tags )
self.hass_config.save_automations(automations) self.db.insert_automations(automations)
self.hass_config.save_tags(tags) except InvalidAutomationFile as e:
logger.warning(e)
errors.append(e)
except DBError as e:
logger.warning(e)
errors.append(e)
if len(errors) > 0:
raise ErrorSet(*errors)
def update_tags(self, auto_id: str, tags: Dict[str, str]): def list(self, offset: int, limit: int):
autos_tags = self.hass_config.automation_tags return self.db.list_automations(offset=offset, limit=limit)
autos_tags[auto_id] = tags
self.hass_config.save_tags(autos_tags)
def delete(self, index: int): def count(self):
automations: List[dict] = [] return self.db.count_automations()
deleted = False
for i, orig_auto in enumerate(self.hass_config.automations):
if i == index:
deleted = True
else:
automations.append(orig_auto)
if not deleted:
raise FailedDeletion("No such automation found")
self.hass_config.save_automations(automations)
# TODO: improve on this without keeping things in memory def get(self, auto_id: str):
def get_total_items(self) -> int: return self.db.get_automation(auto_id)
count = 0
for i, _ in enumerate(self.hass_config.automations): def create(self, automation: Automation):
count = i config_key, config_path = get_base_automation_key(self.hass_config)
return count + 1 return self.update(
ExtenededAutomation(
**automation.dict(),
configuration_key=config_key,
source_file=config_path,
source_file_type="list",
),
create_if_not_found=True,
)
def update(self, automation: ExtenededAutomation, create_if_not_found: bool = False):
automation_path = self.hass_config.root_path / automation.source_file
if not automation_path.parent.exists():
automation_path.parent.mkdir(parents=True)
objs: Optional[Union[list, dict]] = None
if automation_path.exists():
with automation_path.open("r") as fp:
objs = load_yaml(fp, self.hass_config.root_path)
if automation.source_file_type == "obj":
if isinstance(objs, list):
raise AttemptingToOverwriteAnIncompatibleFileError(
f"{automation_path} is a list, but expected a obj for {automation}"
)
raw_auto = automation.to_primitive(include_tags=False)
automation_path.write_text(dump_yaml(raw_auto, self.hass_config.root_path))
else:
if isinstance(objs, dict):
raise AttemptingToOverwriteAnIncompatibleFileError(
f"{automation_path} is a list, but expected a obj for {automation}"
)
elif objs is None:
objs = []
if not isinstance(objs, list):
raise AssertionError(
f"Attemption to save automation to {automation_path} but encountering an invalid list yaml file. Did you modify this file prior to saving?\n{automation}"
)
found = False
for i, obj in enumerate(objs):
if obj["id"] == automation.id:
objs[i] = automation.to_primitive(include_tags=False)
found = True
break
if not found:
if create_if_not_found:
objs.append(automation.to_primitive(include_tags=False))
else:
raise InvalidAutomationFile(
"Could not update automations, not found in source file."
)
automation_path.write_text(dump_yaml(objs, self.hass_config.root_path))
self.update_tags(automation.id, automation.tags)
def update_tags(self, automation_id: str, tags: Dict[str, str]):
self.reload_tags()
self.tag_manager[automation_id] = tags
self.tag_manager.save(self.tag_path)
def delete_tags(self, automation_id: str):
self.reload_tags()
if automation_id in self.tag_manager:
del self.tag_manager[automation_id]
self.tag_manager.save(self.tag_path)
def delete(self, automation: ExtenededAutomation):
automation_path = self.hass_config.root_path / automation.source_file
if automation.source_file_type == "obj":
automation_path.unlink(missing_ok=True)
else:
with automation_path.open("r") as fp:
objs = load_yaml(fp, self.hass_config.root_path)
if not isinstance(objs, list):
raise AssertionError(
f"Attemption to save automation to {automation_path} but encountering an invalid list yaml file. Did you modify this file prior to saving?\n{automation}"
)
kept = []
for i, obj in enumerate(objs):
if obj["id"] != automation.id:
kept.append(obj)
automation_path.write_text(dump_yaml(kept, self.hass_config.root_path))
self.delete_tags(automation.id)
+4 -2
View File
@@ -6,9 +6,11 @@ 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):
path.write_text(dump_yaml(dict(self))) if not path.parent.exists():
path.parent.mkdir(parents=True)
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))
+29 -14
View File
@@ -1,31 +1,46 @@
from typing import Dict, List, Optional, Union import json
from pathlib import Path
from typing import Dict, List, Literal, Optional, Union
from pydantic import BaseModel from pydantic import BaseModel
from pydantic.fields import Field from pydantic.fields import Field
class AutomationMetdata(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"
class AutomationData(BaseModel):
metadata: AutomationMetdata
trigger: List[dict] = [] trigger: List[dict] = []
condition: List[dict] = [] condition: List[dict] = []
sequence: List[dict] = [] action: List[dict] = []
def to_primitive(self): def to_primitive(self):
return { return self.dict(exclude_unset=True, exclude_none=True)
**self.metadata.dict(exclude_unset=True, exclude_none=True),
"trigger": self.trigger,
"condition": self.condition,
"action": self.sequence,
}
class ExtenededAutomationData(AutomationData): 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):
out = super().to_primitive()
if not include_tags and out.get("tags", None) is not None:
del out["tags"]
return out
class ExtenededAutomation(Automation):
source_file: str
source_file_type: Literal["list", "obj"]
configuration_key: str
def to_primitive(self, include_tags: bool = False):
out = super().to_primitive(include_tags=include_tags)
del out["source_file"]
del out["source_file_type"]
del out["configuration_key"]
return out
def to_json(self):
return json.loads(self.json())
+12
View File
@@ -0,0 +1,12 @@
class ErrorSet(Exception):
"""An exception collection exception"""
def __init__(self, *errors: Exception) -> None:
self.errors = errors
super().__init__(self.gen_message())
def gen_message(self):
if len(self.errors) > 1:
return "Encountered multiple errors:\n >" + "\n >".join(map(repr, self.errors))
else:
return str(self.errors[0].args)
-6
View File
@@ -1,6 +0,0 @@
class HassConfigError(Exception):
pass
class MissingFile(HassConfigError):
pass
+17 -33
View File
@@ -1,11 +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, load_yaml
from src.yaml_serializer.types import IncludedYaml
from .errors import MissingFile
class HassConfig: class HassConfig:
@@ -15,34 +12,20 @@ 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 automations(self) -> List[dict]:
if automation_path := self.get_automation_path():
try:
with automation_path.open("r") as f:
return load_yaml(f) # type: ignore
except FileNotFoundError as err:
raise MissingFile("automations.yaml") from err
return self.configurations["automation"]
@property @property
def automation_tags(self) -> TagManager: def automation_tags(self) -> TagManager:
tag_path = self.get_automation_tags_path() tag_path = self.get_automation_tags_path()
if not tag_path.exists(): if not tag_path.exists():
tag_path.parent.mkdir(parents=True, exist_ok=True)
return TagManager() return TagManager()
else: else:
return TagManager.load(tag_path) return TagManager.load(tag_path)
def get_automation_tags_path(self) -> Path: def get_backup_automation_file_path(self) -> Path:
return self.root_path / ".shortumations" / "tags.yaml" return self.get_shortumations_path() / "automations.yaml"
def get_configuration_path(self) -> Path: def get_default_automation_path(self) -> Optional[Path]:
return self.root_path / "configuration.yaml"
def get_automation_path(self) -> Optional[Path]:
"""Get Automation Path (if not included in configuration.yaml, in this case the return value is None) """Get Automation Path (if not included in configuration.yaml, in this case the return value is None)
Returns: Returns:
@@ -52,18 +35,19 @@ 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"
def save_automations(self, automations: List[dict]): def get_shortumations_path(self) -> Path:
if automation_path := self.get_automation_path(): shortumations_path = self.root_path / ".shortumations"
automation_path.write_text(dump_yaml(automations)) if not shortumations_path.exists():
else: shortumations_path.mkdir(parents=True, exist_ok=True)
self.get_configuration_path().write_text( return shortumations_path
dump_yaml({**self.configurations, "automation": automations})
)
def save_tags(self, tags: TagManager): def get_automation_tags_path(self) -> Path:
tags.save(self.get_automation_tags_path()) return self.get_shortumations_path() / "tags.yaml"
def get_configuration_path(self) -> Path:
return self.root_path / "configuration.yaml"
+5 -11
View File
@@ -2,17 +2,11 @@ import logging
from src.env import LOG_LEVEL from src.env import LOG_LEVEL
if LOG_LEVEL == "DEBUG": logging.basicConfig(
logging.basicConfig(level=logging.DEBUG) format="%(asctime)s|%(levelname)-4s[%(pathname)s:%(lineno)d@%(funcName)s] %(message)s",
elif LOG_LEVEL == "INFO": datefmt="%Y-%m-%d:%H:%M:%S",
logging.basicConfig(level=logging.INFO) level=logging._nameToLevel.get(LOG_LEVEL, logging.INFO),
elif LOG_LEVEL == "WARN": )
logging.basicConfig(level=logging.WARN)
elif LOG_LEVEL == "ERROR":
logging.basicConfig(level=logging.ERROR)
else:
logging.basicConfig(level=logging.NOTSET)
logger = logging.getLogger() logger = logging.getLogger()
+20
View File
@@ -0,0 +1,20 @@
from pathlib import Path
from typing import Iterator
def extract_files(p: Path) -> Iterator[Path]:
"""Extracts all files in folder and it's subfolders
Args:
p (Path):
Yields:
Iterator[Path]
"""
if not p.exists():
return
if p.is_dir():
for c in p.iterdir():
yield from extract_files(c)
else:
yield p
+7 -2
View File
@@ -6,7 +6,7 @@ from websockets.client import WebSocketClientProtocol, connect
from websockets.exceptions import ConnectionClosedOK from websockets.exceptions import ConnectionClosedOK
from src.env import HASSIO_TOKEN, HASSIO_WS from src.env import HASSIO_TOKEN, HASSIO_WS
from src.logger import get_logger, logger from src.logger import get_logger
OnMessage = Callable[[str], Coroutine] OnMessage = Callable[[str], Coroutine]
logger = get_logger(__name__) logger = get_logger(__name__)
@@ -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:
+184 -30
View File
@@ -1,41 +1,195 @@
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")
List[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 to_normalized_json(self):
out = {}
for path, data in load_dir_yaml(self.path):
overlap = set(data.key()).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):
out = {}
for path, data in load_dir_yaml(self.path):
if out.get(path.name, None):
out[path.name] = 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)
+14 -11
View File
@@ -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,
)
+9 -16
View File
@@ -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)
+61
View File
@@ -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()
+10 -55
View File
@@ -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,14 @@
id: "1659114822642"
alias: On Home Down
description: Example
mode: single
trigger:
- platform: homeassistant
event: shutdown
condition: []
action:
- service: counter.increment
target:
entity_id:
- counter.up_times
data: {}
@@ -0,0 +1,13 @@
id: "1659114647066"
alias: On Home Up
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
@@ -0,0 +1,13 @@
id: "1659114647067"
alias: Notify Washer
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
@@ -0,0 +1,4 @@
# Loads default set of integrations. Do not remove.
default_config:
automation: !include_dir_list ./automations
@@ -0,0 +1,14 @@
id: "1659114822642"
alias: On Home Down
description: Example
mode: single
trigger:
- platform: homeassistant
event: shutdown
condition: []
action:
- service: counter.increment
target:
entity_id:
- counter.up_times
data: {}
@@ -0,0 +1,13 @@
id: "1659114647066"
alias: HA Up
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
@@ -0,0 +1,13 @@
id: "1659114647067"
alias: Notify Washer
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
@@ -0,0 +1,7 @@
- id: "mlist1"
alias: Merged List 1
description: ""
trigger: []
condition: []
action: []
mode: single
@@ -0,0 +1,14 @@
- id: "mlist2"
alias: Merged List 2
description: ""
trigger: []
condition: []
action: []
mode: single
- id: "mlist3"
alias: Merged List 3
description: ""
trigger: []
condition: []
action: []
mode: single
@@ -0,0 +1,14 @@
- id: "sublist3-mlist2"
alias: Sublist 3 - Merged List 2
description: ""
trigger: []
condition: []
action: []
mode: single
- id: "sublist3-mlist3"
alias: Sublist 3 - Merged List 3
description: ""
trigger: []
condition: []
action: []
mode: single
@@ -0,0 +1,23 @@
- id: '165911464702444'
alias: In File
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
- id: '1660439437914'
alias: NEW
description: ''
trigger:
- platform: sun
event: sunrise
offset: 0
condition: []
action: []
mode: single
@@ -0,0 +1,12 @@
# Loads default set of integrations. Do not remove.
default_config:
# Text to speech
tts:
- platform: google_translate
automation manual: !include_dir_list ./automations/include_dir_list
automation ui: !include automations/ui.yaml
automation cools: !include_dir_merge_list automations/include_dir_merge_list
script: !include scripts.yaml
scene: !include scenes.yaml
@@ -0,0 +1,7 @@
- id: "1660439557193"
alias: SHOULD NOT BE LOADED!
description: ""
trigger: []
condition: []
action: []
mode: single
@@ -0,0 +1,23 @@
- id: "base1"
alias: BASE
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
- id: "base2"
alias: base 2
description: ""
trigger:
- platform: sun
event: sunrise
offset: 0
condition: []
action: []
mode: single
@@ -0,0 +1,14 @@
id: "1659114822642"
alias: On Home Down
description: Example
mode: single
trigger:
- platform: homeassistant
event: shutdown
condition: []
action:
- service: counter.increment
target:
entity_id:
- counter.up_times
data: {}
@@ -0,0 +1,13 @@
id: "1659114647066"
alias: HA Up
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
@@ -0,0 +1,13 @@
id: "1659114647067"
alias: Notify Washer
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
@@ -0,0 +1,7 @@
- id: "mlist1"
alias: Merged List 1
description: ""
trigger: []
condition: []
action: []
mode: single
@@ -0,0 +1,14 @@
- id: "mlist2"
alias: Merged List 2
description: ""
trigger: []
condition: []
action: []
mode: single
- id: "mlist3"
alias: Merged List 3
description: ""
trigger: []
condition: []
action: []
mode: single
@@ -0,0 +1,18 @@
- id: "sublist3-mlist2"
alias: Sublist 3 - Merged List 2
description: "That was correct!"
trigger: []
condition: []
action:
- service: "switch.turn_off"
target:
entity_id: "switch.bathroom"
data:
mode: single
- id: "sublist3-mlist3"
alias: Sublist 3 - Merged List 3
description: ""
trigger: []
condition: []
action: []
mode: single
@@ -0,0 +1,23 @@
- id: "ui1"
alias: UI 1
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
- id: "ui2"
alias: UI 2
description: ""
trigger:
- platform: sun
event: sunrise
offset: 0
condition: []
action: []
mode: single
@@ -0,0 +1,13 @@
# Loads default set of integrations. Do not remove.
default_config:
# Text to speech
tts:
- platform: google_translate
automation manual: !include_dir_list ./automations/include_dir_list
automation ui: !include automations/ui.yaml
automation: !include automations/base.yaml
automation cools: !include_dir_merge_list automations/include_dir_merge_list
script: !include scripts.yaml
scene: !include scenes.yaml
@@ -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: "base1"
alias: BASE
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
- id: "base2"
alias: base 2
description: ""
trigger:
- platform: sun
event: sunrise
offset: 0
condition: []
action: []
mode: single
@@ -0,0 +1,14 @@
id: "1659114822642"
alias: On Home Down
description: Example
mode: single
trigger:
- platform: homeassistant
event: shutdown
condition: []
action:
- service: counter.increment
target:
entity_id:
- counter.up_times
data: {}
@@ -0,0 +1,13 @@
id: "1659114647066"
alias: HA Up
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
@@ -0,0 +1,13 @@
id: "1659114647067"
alias: Notify Washer
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
@@ -0,0 +1,7 @@
- id: "mlist1"
alias: Merged List 1
description: ""
trigger: []
condition: []
action: []
mode: single
@@ -0,0 +1,14 @@
- id: "mlist2"
alias: Merged List 2
description: ""
trigger: []
condition: []
action: []
mode: single
- id: "mlist3"
alias: Merged List 3
description: ""
trigger: []
condition: []
action: []
mode: single
@@ -0,0 +1,14 @@
- id: "sublist3-mlist2"
alias: Sublist 3 - Merged List 2
description: ""
trigger: []
condition: []
action: []
mode: single
- id: "sublist3-mlist3"
alias: Sublist 3 - Merged List 3
description: ""
trigger: []
condition: []
action: []
mode: single
@@ -0,0 +1,23 @@
- id: "ui1"
alias: UI 1
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
- id: "ui2"
alias: UI 2
description: ""
trigger:
- platform: sun
event: sunrise
offset: 0
condition: []
action: []
mode: single
@@ -0,0 +1,23 @@
- id: "base1"
alias: BASE
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
- id: "base2"
alias: base 2
description: ""
trigger:
- platform: sun
event: sunrise
offset: 0
condition: []
action: []
mode: single
@@ -0,0 +1,14 @@
id: "1659114822642"
alias: On Home Down
description: Example
mode: single
trigger:
- platform: homeassistant
event: shutdown
condition: []
action:
- service: counter.increment
target:
entity_id:
- counter.up_times
data: {}
@@ -0,0 +1,13 @@
id: "1659114647066"
alias: HA Up
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
@@ -0,0 +1,13 @@
id: "1659114647067"
alias: Notify Washer
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
@@ -0,0 +1,7 @@
- id: "mlist1"
alias: Merged List 1
description: ""
trigger: []
condition: []
action: []
mode: single
@@ -0,0 +1,14 @@
- id: "mlist2"
alias: Merged List 2
description: ""
trigger: []
condition: []
action: []
mode: single
- id: "mlist3"
alias: Merged List 3
description: ""
trigger: []
condition: []
action: []
mode: single
@@ -0,0 +1,14 @@
- id: "sublist3-mlist2"
alias: Sublist 3 - Merged List 2
description: ""
trigger: []
condition: []
action: []
mode: single
- id: "sublist3-mlist3"
alias: Sublist 3 - Merged List 3
description: ""
trigger: []
condition: []
action: []
mode: single
@@ -0,0 +1,23 @@
- id: "ui1"
alias: UI 1
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
- id: "ui2"
alias: UI 2
description: ""
trigger:
- platform: sun
event: sunrise
offset: 0
condition: []
action: []
mode: single
@@ -0,0 +1,23 @@
- id: "base1"
alias: BASE
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
- id: "base2"
alias: base 2
description: ""
trigger:
- platform: sun
event: sunrise
offset: 0
condition: []
action: []
mode: single
@@ -0,0 +1,14 @@
id: "1659114822642"
alias: On Home Down
description: Example
mode: single
trigger:
- platform: homeassistant
event: shutdown
condition: []
action:
- service: counter.increment
target:
entity_id:
- counter.up_times
data: {}
@@ -0,0 +1,13 @@
id: "1659114647066"
alias: HA Up
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
@@ -0,0 +1,13 @@
id: "1659114647067"
alias: Notify Washer
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
@@ -0,0 +1,7 @@
- id: "mlist1"
alias: Merged List 1
description: ""
trigger: []
condition: []
action: []
mode: single
@@ -0,0 +1,14 @@
- id: "mlist2"
alias: Merged List 2
description: ""
trigger: []
condition: []
action: []
mode: single
- id: "mlist3"
alias: Merged List 3
description: ""
trigger: []
condition: []
action: []
mode: single
@@ -0,0 +1,14 @@
- id: "sublist3-mlist2"
alias: Sublist 3 - Merged List 2
description: ""
trigger: []
condition: []
action: []
mode: single
- id: "sublist3-mlist3"
alias: Sublist 3 - Merged List 3
description: ""
trigger: []
condition: []
action: []
mode: single
@@ -0,0 +1,23 @@
- id: "ui1"
alias: UI 1
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
- id: "ui2"
alias: UI 2
description: ""
trigger:
- platform: sun
event: sunrise
offset: 0
condition: []
action: []
mode: single
@@ -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,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,19 @@
# 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_merge_named packages
packages base:
ha:
automation: !include automations/ui.yaml
@@ -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
+5
View File
@@ -0,0 +1,5 @@
device_id: das2qdasdasdasadaasd
domain: mobile_app
type: notify
title: Hassio Status
message: Hassio Is turning off...
+268 -204
View File
@@ -1,15 +1,16 @@
from pathlib import Path
from unittest import TestCase from unittest import TestCase
import yaml import yaml
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from src.api.app import make_app from src.api.app import make_app
from src.automations.types import ( from src.automations.types import Automation, ExtenededAutomation
AutomationData, from tests.utils import (
AutomationMetdata, HA_CONFIG2_EXAMPLE,
ExtenededAutomationData, HA_CONFIG6_EXAMPLE,
get_example_automation_loader,
) )
from tests.utils import HA_CONFIG2_EXAMPLE, get_example_automation_loader
class BaseTestCase(TestCase): class BaseTestCase(TestCase):
@@ -22,7 +23,7 @@ class BaseTestCase(TestCase):
self.client = TestClient(make_app(self.automation_loader)) self.client = TestClient(make_app(self.automation_loader))
class automation_list_tests(BaseTestCase): class automation_pagination_tests(BaseTestCase):
test_params = {"total": 32, "subtest2_found_items": 7, "subtest1_found_items": 10} test_params = {"total": 32, "subtest2_found_items": 7, "subtest1_found_items": 10}
@@ -87,7 +88,7 @@ class automation_list_tests(BaseTestCase):
self.assertEqual(len(d["data"]), self.test_params["subtest2_found_items"]) self.assertEqual(len(d["data"]), self.test_params["subtest2_found_items"])
class automation2_lists_tests(automation_list_tests): class automation_pagination_tests_2(automation_pagination_tests):
test_params = { test_params = {
"total": 1, "total": 1,
"subtest2_found_items": 0, "subtest2_found_items": 0,
@@ -104,232 +105,295 @@ class automation2_lists_tests(automation_list_tests):
class automation_update_tests(BaseTestCase): class automation_update_tests(BaseTestCase):
test_params = {
"total": 32,
"modify_item": 20,
"consitency_tests": {
1: {
"offset": 15,
"file_offset": 15,
"expected_change": {
"metadata": {
"id": "1629422438707",
"alias": "I CHANGED!",
"description": "",
"mode": "single",
},
"trigger": [{"platform": "time", "at": "input_datetime.vita_night_pump_time"}],
"condition": [
{
"conditions": [
{
"condition": "time",
"after": "input_datetime.vita_night_pump_time",
"before": "00:00:00",
},
{"condition": "time", "after": "00:00:00", "before": "06:00:00"},
],
"condition": "and",
},
],
"action": [
{
"service": "light.turn_on",
"target": {
"entity_id": "light.bulb_staircase",
"area_id": "living_room",
},
"data": {"brightness_pct": 40, "transition": 15},
}
],
},
},
2: {
"offset": 27,
"file_offset": 27,
"expected_change": {
"metadata": {
"id": "1649947692702",
"alias": "I CHANGED!",
"description": "",
"mode": "single",
},
"trigger": [
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "turn_on",
"id": "turn_on",
},
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "turn_off",
"id": "turn_off",
},
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "dim_up",
"id": "dim_up",
},
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "dim_down",
"id": "dim_down",
},
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_double_press",
"subtype": "turn_on",
"id": "up_dbclk",
},
],
"condition": [],
"action": [
{
"choose": [
{
"conditions": [{"condition": "trigger", "id": "turn_off"}],
"sequence": [
{
"type": "turn_off",
"device_id": "das2qdasdasdasadaasd",
"entity_id": "light.bulb_ari_lamp",
"domain": "light",
}
],
},
{
"conditions": [{"condition": "trigger", "id": "turn_on"}],
"sequence": [
{
"service": "light.turn_on",
"data": {"color_temp": 153, "brightness_pct": 100},
"target": {"device_id": "das2qdasdasdasadaasd"},
}
],
},
{
"conditions": [{"condition": "trigger", "id": "dim_up"}],
"sequence": [
{
"device_id": "das2qdasdasdasadaasd",
"domain": "light",
"entity_id": "light.bulb_ari_lamp",
"type": "brightness_increase",
}
],
},
{
"conditions": [{"condition": "trigger", "id": "dim_down"}],
"sequence": [
{
"device_id": "das2qdasdasdasadaasd",
"domain": "light",
"entity_id": "light.bulb_ari_lamp",
"type": "brightness_decrease",
}
],
},
{
"conditions": [{"condition": "trigger", "id": "up_dbclk"}],
"sequence": [
{
"service": "light.turn_on",
"data": {"color_temp": 500, "brightness_pct": 100},
"target": {"device_id": "das2qdasdasdasadaasd"},
}
],
},
],
"default": [],
}
],
},
},
},
}
def test_insert_new(self): def test_insert_new(self):
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0}) resp = self.client.post(
self.assertEqual(resp.json()["totalItems"], 32) "/automations/list", json={"limit": self.test_params["total"] + 1, "offset": 0}
)
autos = resp.json()["data"]
self.assertEqual(resp.json()["totalItems"], self.test_params["total"])
self.assertNotIn("i am new", set([a["id"] for a in autos]))
resp = self.client.post( resp = self.client.post(
"/automations/item", "/automations/item",
json={ json=Automation(
"index": 33, id="i am new",
"data": AutomationData(metadata=AutomationMetdata(id="testme")).dict(), ).dict(),
},
) )
self.assertEqual(resp.status_code, 200) self.assertEqual(resp.status_code, 200)
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 32}) resp = self.client.post(
"/automations/list", json={"limit": self.test_params["total"] + 1, "offset": 0}
)
data = resp.json() data = resp.json()
self.assertEqual(data["totalItems"], 33) self.assertEqual(data["totalItems"], self.test_params["total"] + 1)
self.assertEqual(data["data"][0]["metadata"]["id"], "testme") self.assertIn("i am new", set([a["id"] for a in data["data"]]))
def test_update_some(self): def test_update_some(self):
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 20})
original_auto = resp.json()["data"][0]
resp = self.client.post( resp = self.client.post(
"/automations/list", json={"limit": 1, "offset": self.test_params["modify_item"]}
)
original_auto = resp.json()["data"][0]
changed_to = ExtenededAutomation(
id=original_auto["id"],
alias="I have been modified",
configuration_key=original_auto["configuration_key"],
source_file_type=original_auto["source_file_type"],
source_file=original_auto["source_file"],
)
resp = self.client.put(
"/automations/item", "/automations/item",
json={ json=changed_to.to_json(),
"index": 20,
"data": AutomationData(metadata=AutomationMetdata(id="testme")).dict(),
},
) )
self.assertEqual(resp.status_code, 200) self.assertEqual(resp.status_code, 200)
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 20}) resp = self.client.post(
"/automations/list", json={"limit": 1, "offset": self.test_params["modify_item"]}
)
new_auto = resp.json()["data"][0] new_auto = resp.json()["data"][0]
self.assertNotEqual(original_auto, new_auto) self.assertNotEqual(original_auto, new_auto)
self.assertEqual( self.assertEqual(
ExtenededAutomationData(metadata=AutomationMetdata(id="testme")).dict(), new_auto changed_to.to_json(),
new_auto,
) )
def test_consistent_standard_1(self): def test_consistent_standard_1(self):
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 15}) for test_id, test_params in self.test_params["consitency_tests"].items():
original_auto = resp.json()["data"][0] with self.subTest(test_id=test_id):
original_auto["metadata"]["alias"] = "I CHANGED!" resp = self.client.post(
resp = self.client.post( "/automations/list",
"/automations/item", json={"limit": 1, "offset": test_params["offset"]},
json={ )
"index": 15, original_auto = resp.json()["data"][0]
"data": original_auto, original_auto["alias"] = "I CHANGED!"
}, resp = self.client.post(
) "/automations/item",
self.assertEqual(resp.status_code, 200) json=original_auto,
with (self.config_folder / "automations.yaml").open("r") as fp: )
disk_data = dict(yaml.safe_load(fp)[15]) self.assertEqual(resp.status_code, 200)
trigger = list(map(dict, disk_data.pop("trigger"))) with (self.config_folder / original_auto["source_file"]).open("r") as fp:
condition = disk_data.pop("condition") disk_data = dict(yaml.safe_load(fp)[test_params["file_offset"]])
action = list(map(dict, disk_data.pop("action"))) trigger = list(map(dict, disk_data.pop("trigger")))
self.assertDictEqual( condition = disk_data.pop("condition")
disk_data, action = list(map(dict, disk_data.pop("action")))
{"id": "1629422438707", "alias": "I CHANGED!", "description": "", "mode": "single"}, self.assertDictEqual(
) disk_data,
self.assertListEqual( test_params["expected_change"]["metadata"],
trigger, [{"platform": "time", "at": "input_datetime.vita_night_pump_time"}] )
) self.assertListEqual(
self.assertListEqual( trigger,
condition, test_params["expected_change"]["trigger"],
[ )
{ self.assertListEqual(
"conditions": [ condition,
{ test_params["expected_change"]["condition"],
"condition": "time", )
"after": "input_datetime.vita_night_pump_time", self.assertListEqual(
"before": "00:00:00", action,
}, test_params["expected_change"]["action"],
{"condition": "time", "after": "00:00:00", "before": "06:00:00"}, )
],
"condition": "and",
},
],
)
self.assertListEqual(
action,
[
{
"service": "light.turn_on",
"target": {"entity_id": "light.bulb_staircase", "area_id": "living_room"},
"data": {"brightness_pct": 40, "transition": 15},
}
],
)
def test_consistent_standard_2(self):
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 27}) class automation_update_split_config_tests(automation_update_tests):
original_auto = resp.json()["data"][0] test_params = {
original_auto["metadata"]["alias"] = "I CHANGED!" "total": 12,
resp = self.client.post( "modify_item": 3,
"/automations/item", "consitency_tests": {
json={ 1: {
"index": 27, "offset": 3,
"data": original_auto, "file_offset": 0,
}, "expected_change": {
) "metadata": {
self.assertEqual(resp.status_code, 200) "alias": "I CHANGED!",
with (self.config_folder / "automations.yaml").open("r") as fp: "description": "Example",
disk_data = dict(yaml.safe_load(fp)[27]) "id": "ui1",
trigger = list(map(dict, disk_data.pop("trigger"))) "mode": "single",
condition = disk_data.pop("condition") },
action = list(map(dict, disk_data.pop("action"))) "trigger": [{"platform": "homeassistant", "event": "start"}],
self.assertDictEqual( "condition": [],
disk_data, "action": [
{"id": "1649947692702", "alias": "I CHANGED!", "description": "", "mode": "single"},
)
self.assertListEqual(
trigger,
[
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "turn_on",
"id": "turn_on",
},
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "turn_off",
"id": "turn_off",
},
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "dim_up",
"id": "dim_up",
},
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "dim_down",
"id": "dim_down",
},
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_double_press",
"subtype": "turn_on",
"id": "up_dbclk",
},
],
)
self.assertListEqual(condition, [])
self.assertListEqual(
action,
[
{
"choose": [
{ {
"conditions": [{"condition": "trigger", "id": "turn_off"}], "service": "counter.increment",
"sequence": [ "data": {},
{ "target": {"entity_id": "counter.up_times"},
"type": "turn_off", }
"device_id": "das2qdasdasdasadaasd",
"entity_id": "light.bulb_ari_lamp",
"domain": "light",
}
],
},
{
"conditions": [{"condition": "trigger", "id": "turn_on"}],
"sequence": [
{
"service": "light.turn_on",
"data": {"color_temp": 153, "brightness_pct": 100},
"target": {"device_id": "das2qdasdasdasadaasd"},
}
],
},
{
"conditions": [{"condition": "trigger", "id": "dim_up"}],
"sequence": [
{
"device_id": "das2qdasdasdasadaasd",
"domain": "light",
"entity_id": "light.bulb_ari_lamp",
"type": "brightness_increase",
}
],
},
{
"conditions": [{"condition": "trigger", "id": "dim_down"}],
"sequence": [
{
"device_id": "das2qdasdasdasadaasd",
"domain": "light",
"entity_id": "light.bulb_ari_lamp",
"type": "brightness_decrease",
}
],
},
{
"conditions": [{"condition": "trigger", "id": "up_dbclk"}],
"sequence": [
{
"service": "light.turn_on",
"data": {"color_temp": 500, "brightness_pct": 100},
"target": {"device_id": "das2qdasdasdasadaasd"},
}
],
},
], ],
"default": [], },
} },
], },
) }
def setUp(self) -> None:
(
self.config_folder,
self.hass_config,
self.automation_loader,
) = get_example_automation_loader(HA_CONFIG6_EXAMPLE)
self.client = TestClient(make_app(self.automation_loader))
class automation_delete_tests(BaseTestCase): 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})
autos = resp.json()["data"]
self.assertEqual(resp.json()["totalItems"], 32) self.assertEqual(resp.json()["totalItems"], 32)
resp = self.client.delete( resp = self.client.delete(
"/automations/item", "/automations/item",
json={ json=autos[0],
"index": 20,
},
) )
self.assertEqual(resp.status_code, 200) self.assertEqual(resp.status_code, 200)
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0}) resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0})
@@ -0,0 +1,67 @@
from pathlib import Path
from src.automations.errors import DBDataError
from src.automations.types import ExtenededAutomation
from .utils import TestWithDB
class db_tests(TestWithDB):
def test_db_creation(self):
with self.db.get_cur() as cur:
cur.execute("SELECT name FROM sqlite_master WHERE type ='table'")
tables = cur.fetchall()
self.assertListEqual(tables, [("autos",)])
self.db.create_db()
with self.db.get_cur() as cur:
cur.execute("SELECT name FROM sqlite_master WHERE type ='table'")
tables = cur.fetchall()
self.assertListEqual(tables, [("autos",)])
def test_insert_automations(self):
originals = [
ExtenededAutomation(
id="test",
alias="test",
source_file="automation.yaml",
source_file_type="obj",
configuration_key="automation",
),
ExtenededAutomation(
id="test2",
alias="test",
source_file="automation.yaml",
source_file_type="obj",
action=[{"event": {"nice": "one"}, "event_type": "custom"}],
configuration_key="automation",
),
]
self.db.insert_automations(originals)
for original in originals:
with self.subTest(original=original):
self.assertEqual(self.db.get_automation(original.id), original)
autos = list(self.db.list_automations(0, 10))
self.assertEqual(len(autos), 2)
def test_insert_repeat_automations(self):
originals = [
ExtenededAutomation(
id="test",
alias="test",
source_file="automation.yaml",
source_file_type="obj",
configuration_key="automation",
),
ExtenededAutomation(
id="test",
alias="test",
source_file="automation.yaml",
source_file_type="obj",
action=[{"event": {"nice": "one"}, "event_type": "custom"}],
configuration_key="automation",
),
]
with self.assertRaises(DBDataError) as err:
self.db.insert_automations(originals)
autos = list(self.db.list_automations(0, 10))
self.assertEqual(len(autos), 0)
+141 -43
View File
@@ -1,59 +1,157 @@
from pathlib import Path
from tempfile import mktemp
from unittest import TestCase from unittest import TestCase
from src.automations.loader import load_automation from src.automations.loader import (
from src.automations.types import AutomationMetdata, ExtenededAutomationData extract_automation_paths,
from src.yaml_serializer.types import NOT_IMPLEMENTED_SV_MSG, SecretValue load_automation_path,
)
from src.automations.tags import TagManager
from src.automations.types import ExtenededAutomation
from src.hass_config.loader import HassConfig
from tests.utils import (
HA_CONFIG2_EXAMPLE,
HA_CONFIG3_EXAMPLE,
HA_CONFIG4_EXAMPLE,
HA_CONFIG5_EXAMPLE,
HA_CONFIG6_EXAMPLE,
HA_CONFIG9_EXAMPLE,
HA_CONFIG_EXAMPLE,
)
class loader_tests(TestCase): class loader_tests(TestCase):
def test_load_automation_runs(self): def test_load_automation_list_file(self):
auto = list( automations = list(
load_automation( load_automation_path(
{ HA_CONFIG2_EXAMPLE,
"id": "1616887975473", HA_CONFIG2_EXAMPLE / "automations.yaml",
"alias": "Home Assistant Off", configuration_key="automation",
"description": "", tag_manager=TagManager({"1652069225859": {"type": "routine"}}),
"trigger": [{"platform": "homeassistant", "event": "shutdown"}],
"condition": ["states(time.time) >= '10:00:00'"],
"action": [
{
"device_id": SecretValue("my_mobile_phone", "..."),
"domain": "mobile_app",
"type": "notify",
"title": "Hassio Status",
"message": "Hassio Is turning off...",
}
],
"mode": "single",
},
{},
) )
) )
self.assertEqual(len(automations), 1)
self.assertEqual( self.assertEqual(
auto[0], automations[0],
ExtenededAutomationData( ExtenededAutomation(
metadata=AutomationMetdata( id="1652069225859",
id="1616887975473", source_file="automations.yaml",
alias="Home Assistant Off", source_file_type="list",
description="", configuration_key="automation",
mode="single", alias="Climate - Pref temperature ",
), description="",
trigger=[{"platform": "homeassistant", "event": "shutdown"}], mode="single",
condition=[ tags={"type": "routine"},
trigger=[
{ {
"condition": "template", "platform": "state",
"value_template": "states(time.time) >= '10:00:00'", "entity_id": "input_number.preferred_temperature",
} }
], ],
sequence=[ condition=[],
action=[
{ {
"device_id": NOT_IMPLEMENTED_SV_MSG, "service": "climate.set_temperature",
"domain": "mobile_app", "data": {
"type": "notify", "temperature": {
"title": "Hassio Status", "[object Object]": None,
"message": "Hassio Is turning off...", }
},
"target": {
"entity_id": "climate.main_floor",
},
} }
], ],
tags={},
), ),
) )
def test_load_automation_obj_file(self):
automations = list(
load_automation_path(
HA_CONFIG4_EXAMPLE,
HA_CONFIG4_EXAMPLE / "automations" / "notify_washer.yaml",
configuration_key="automation base",
tag_manager=TagManager({"1659114647067": {"room": "laundry"}}),
)
)
self.assertEqual(len(automations), 1)
self.assertEqual(
automations[0],
ExtenededAutomation(
id="1659114647067",
source_file="automations/notify_washer.yaml",
source_file_type="obj",
configuration_key="automation base",
alias="Notify Washer",
description="Example",
mode="single",
tags={"room": "laundry"},
trigger=[
{
"platform": "homeassistant",
"event": "start",
}
],
condition=[],
action=[
{
"service": "counter.increment",
"data": {},
"target": {"entity_id": "counter.up_times"},
}
],
),
)
def test_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):
file_path = Path(mktemp())
file_path.touch()
automations = list(
load_automation_path(
file_path.parent,
file_path,
configuration_key="automation ui",
tag_manager=TagManager(),
)
)
self.assertEqual(len(automations), 0)
def test_load_automation_none_existing_file(self):
file_path = Path(mktemp())
file_path.unlink(missing_ok=True)
automations = list(
load_automation_path(
file_path.parent,
file_path,
configuration_key="automation manual",
tag_manager=TagManager(),
)
)
self.assertEqual(len(automations), 0)
def test_extract_all_automation_files(self):
for ha_path, expected in [
(HA_CONFIG_EXAMPLE, 1),
(HA_CONFIG2_EXAMPLE, 1),
(HA_CONFIG3_EXAMPLE, 1),
(HA_CONFIG4_EXAMPLE, 1),
(HA_CONFIG5_EXAMPLE, 3),
(HA_CONFIG6_EXAMPLE, 4),
(HA_CONFIG9_EXAMPLE, 1),
]:
with self.subTest(ha_path=ha_path, expected=expected):
hass_config = HassConfig(ha_path)
paths = list(extract_automation_paths(hass_config))
self.assertEqual(len(paths), expected)
+309 -95
View File
@@ -1,115 +1,329 @@
from unittest import TestCase from pathlib import Path
from src.automations.errors import FailedDeletion, InvalidAutomationFile from src import yaml_serializer
from src.automations.types import AutomationMetdata, ExtenededAutomationData from src.automations.errors import (
AttemptingToOverwriteAnIncompatibleFileError,
DBNoAutomationFound,
InvalidAutomationFile,
)
from src.automations.manager import AutomationManager
from src.automations.types import ExtenededAutomation
from src.errors import ErrorSet
from src.hass_config.loader import HassConfig
from tests.utils import ( from tests.utils import (
get_dummy_automation_loader, HA_CONFIG6_EXAMPLE,
get_example_automation_loader, HA_CONFIG_EXAMPLE,
create_copy_of_example_config,
) )
from .utils import TestWithDB
class manager_tests(TestCase):
def test_find_limit_and_get(self):
_, _, loader = get_example_automation_loader()
first_auto_with_find = list(loader.find(limit=1))
first_auto_with_get = loader.get(0)
self.assertEqual(first_auto_with_find[0], first_auto_with_get)
def test_find_at_most_with_offset(self): class manager_tests(TestWithDB):
_, _, loader = get_example_automation_loader() def get_manager(self, ha_config_example: Path):
autos = list(loader.find(limit=10, offset=10)) self.config_path = create_copy_of_example_config(ha_config_example)
self.assertTrue(len(autos), 10) self.automation_manager = AutomationManager(
HassConfig(self.config_path),
self.db_file,
)
return self.config_path, self.automation_manager
def test_load_complex_read_modify_delete(self):
_, automation_manager = self.get_manager(HA_CONFIG6_EXAMPLE)
self.assertEqual(automation_manager.count(), 0)
automation_manager.reload()
self.assertEqual(automation_manager.count(), 12)
automation = automation_manager.get("sublist3-mlist2")
self.assertEqual(automation.description, "That was correct!")
self.assertEqual(
automation.action,
[
{
"service": "switch.turn_off",
"target": {"entity_id": "switch.bathroom"},
"data": None,
}
],
)
self.assertEqual(automation.configuration_key, "automation cools")
automation.trigger.append(
{"platform": "zone", "entity_id": "person.thor", "zone": "zone.azguard"}
)
automation_manager.update(automation)
self.assertEqual(
automation_manager.get("sublist3-mlist2").trigger,
[],
)
automation_manager.reload()
self.assertEqual(
automation_manager.get("sublist3-mlist2").trigger,
[
{
"platform": "zone",
"entity_id": "person.thor",
"zone": "zone.azguard",
}
],
)
def test_find_invalid(self): def test_find_invalid(self):
_, _, loader = get_example_automation_loader() _, automation_manager = self.get_manager(HA_CONFIG6_EXAMPLE)
self.assertIsNone(loader.get(-1)) automation_manager.reload()
self.assertIsNone(loader.get(1_000)) with self.assertRaises(DBNoAutomationFound):
self.assertIsNone(loader.get(33)) automation_manager.get("invalid")
def test_length(self):
_, _, loader = get_example_automation_loader()
self.assertEqual(loader.get_total_items(), 32)
def test_bad_automations_file(self): def test_bad_automations_file(self):
folder, _, manager = get_dummy_automation_loader( config_path, automation_manager = self.get_manager(HA_CONFIG_EXAMPLE)
[], (config_path / "automations.yaml").write_text("bob is an uncle")
automation_in_conifguration_mode="none", with self.assertRaises(ErrorSet) as err:
) automation_manager.reload()
(folder / "automations.yaml").write_text("bob is an uncle") self.assertEqual(len(err.exception.errors), 1)
with self.assertRaises(InvalidAutomationFile): self.assertIsInstance(err.exception.errors[0], InvalidAutomationFile)
manager.get(0) self.assertEqual(automation_manager.count(), 0)
def test_create_automation(self): def test_one_bad_automations_file(self):
_, _, manager = get_dummy_automation_loader( config_path, automation_manager = self.get_manager(HA_CONFIG6_EXAMPLE)
[], (config_path / "automations" / "ui.yaml").write_text("bob is an uncle")
automation_in_conifguration_mode="none", with self.assertRaises(ErrorSet) as err:
) automation_manager.reload()
manager.update(1, ExtenededAutomationData(metadata=AutomationMetdata(id="test1"))) self.assertEqual(len(err.exception.errors), 1)
auto = manager.get(0) self.assertIsInstance(err.exception.errors[0], InvalidAutomationFile)
self.assertIsNotNone(auto) self.assertEqual(automation_manager.count(), 10)
self.assertEqual(auto.metadata.id, "test1") # type: ignore
def test_create_automation_with_example_folder(self): def test_delete_automation_in_single_file(self):
_, _, manager = get_example_automation_loader() config_path, automation_manager = self.get_manager(HA_CONFIG6_EXAMPLE)
self.assertEqual(manager.get_total_items(), 32) self.assertTrue((config_path / "automations/include_dir_list/home/down.yaml").exists())
manager.update(40, ExtenededAutomationData(metadata=AutomationMetdata(id="test1"))) automation_manager.reload()
auto = manager.get(32) automation = automation_manager.get("1659114822642")
self.assertIsNotNone(auto) self.assertEqual(automation.configuration_key, "automation manual")
self.assertEqual(manager.get_total_items(), 33) automation_manager.delete(automation)
self.assertEqual(auto.metadata.id, "test1") # type: ignore automation_manager.reload()
with self.assertRaises(DBNoAutomationFound):
automation_manager.get("1659114822642")
self.assertFalse((config_path / "automations/include_dir_list/home/down.yaml").exists())
def test_update_automation(self): def test_delete_automation_in_list(self):
_, _, manager = get_dummy_automation_loader( config_path, automation_manager = self.get_manager(HA_CONFIG6_EXAMPLE)
[ self.assertTrue(
ExtenededAutomationData(metadata=AutomationMetdata(id="test1")), (config_path / "automations/include_dir_merge_list/sub/list2.yaml").exists()
ExtenededAutomationData(metadata=AutomationMetdata(id="test2")), )
ExtenededAutomationData(metadata=AutomationMetdata(id="test3")), automation_manager.reload()
], automation = automation_manager.get("mlist2")
automation_in_conifguration_mode="none", self.assertEqual(automation.configuration_key, "automation cools")
automation_manager.delete(automation)
automation_manager.reload()
with self.assertRaises(DBNoAutomationFound):
automation_manager.get("mlist2")
self.assertTrue(
(config_path / "automations/include_dir_merge_list/sub/list2.yaml").exists()
) )
auto = manager.get(0)
self.assertEqual(auto.metadata.id, "test1") # type: ignore
manager.update(0, ExtenededAutomationData(metadata=AutomationMetdata(id="toaster-7")))
auto = manager.get(0)
self.assertEqual(auto.metadata.id, "toaster-7") # type: ignore
def test_delete_automation(self): def test_create_new_in_single_file(self):
_, _, manager = get_dummy_automation_loader( config_path, automation_manager = self.get_manager(HA_CONFIG6_EXAMPLE)
[ automation_manager.reload()
ExtenededAutomationData(metadata=AutomationMetdata(id="test1")), self.assertFalse((config_path / "automations/include_dir_list/home/left.yaml").exists())
ExtenededAutomationData(metadata=AutomationMetdata(id="test2")), with self.assertRaises(DBNoAutomationFound):
ExtenededAutomationData(metadata=AutomationMetdata(id="test3")), automation_manager.get("newlymade")
], automation_manager.update(
automation_in_conifguration_mode="none", ExtenededAutomation(
id="newlymade",
configuration_key="automation manual",
source_file="automations/include_dir_list/home/left.yaml",
source_file_type="obj",
)
)
self.assertTrue((config_path / "automations/include_dir_list/home/left.yaml").exists())
automation_manager.reload()
self.assertEqual(
automation_manager.get("newlymade"),
ExtenededAutomation(
id="newlymade",
configuration_key="automation manual",
source_file="automations/include_dir_list/home/left.yaml",
source_file_type="obj",
),
) )
self.assertEqual(manager.get_total_items(), 3)
manager.delete(1)
self.assertEqual(manager.get_total_items(), 2)
for auto in manager.find(0, 1000):
self.assertNotEqual(auto.metadata.id, "test2")
def test_failed_deletion_automation(self): def test_create_new_in_existing_list_file(self):
_, _, manager = get_dummy_automation_loader( config_path, automation_manager = self.get_manager(HA_CONFIG6_EXAMPLE)
[ automation_manager.reload()
ExtenededAutomationData(metadata=AutomationMetdata(id="test1")), self.assertTrue(
ExtenededAutomationData(metadata=AutomationMetdata(id="test2")), (config_path / "automations/include_dir_merge_list/sub/list2.yaml").exists()
ExtenededAutomationData(metadata=AutomationMetdata(id="test3")), )
], with self.assertRaises(DBNoAutomationFound):
automation_in_conifguration_mode="none", automation_manager.get("newlymade")
automation_manager.update(
ExtenededAutomation(
id="newlymade",
configuration_key="automation cools",
source_file="automations/include_dir_merge_list/sub/list2.yaml",
source_file_type="list",
),
create_if_not_found=True,
)
self.assertTrue(
(config_path / "automations/include_dir_merge_list/sub/list2.yaml").exists()
)
automation_manager.reload()
self.assertEqual(
automation_manager.get("newlymade"),
ExtenededAutomation(
id="newlymade",
configuration_key="automation cools",
source_file="automations/include_dir_merge_list/sub/list2.yaml",
source_file_type="list",
),
) )
self.assertEqual(manager.get_total_items(), 3)
with self.assertRaises(FailedDeletion):
manager.delete(10)
def test_save_tags(self): def test_create_new_in_new_list_file(self):
_, _, manager = get_dummy_automation_loader( config_path, automation_manager = self.get_manager(HA_CONFIG6_EXAMPLE)
[ automation_manager.reload()
ExtenededAutomationData(metadata=AutomationMetdata(id="test1")), self.assertFalse(
ExtenededAutomationData(metadata=AutomationMetdata(id="test2")), (config_path / "automations/include_dir_merge_list/sub/list4.yaml").exists()
ExtenededAutomationData(metadata=AutomationMetdata(id="test3")), )
], with self.assertRaises(DBNoAutomationFound):
automation_in_conifguration_mode="none", automation_manager.get("newlymade")
automation_manager.update(
ExtenededAutomation(
id="newlymade",
configuration_key="automation cools",
source_file="automations/include_dir_merge_list/sub/list4.yaml",
source_file_type="list",
),
create_if_not_found=True,
)
self.assertTrue(
(config_path / "automations/include_dir_merge_list/sub/list4.yaml").exists()
)
automation_manager.reload()
self.assertEqual(
automation_manager.get("newlymade"),
ExtenededAutomation(
id="newlymade",
configuration_key="automation cools",
source_file="automations/include_dir_merge_list/sub/list4.yaml",
source_file_type="list",
),
)
def test_save_improper_types_list_to_obj(self):
config_path, automation_manager = self.get_manager(HA_CONFIG6_EXAMPLE)
automation_manager.reload()
self.assertTrue(
(config_path / "automations/include_dir_merge_list/sub/list2.yaml").exists()
)
with self.assertRaises(DBNoAutomationFound):
automation_manager.get("newlymade")
with self.assertRaises(AttemptingToOverwriteAnIncompatibleFileError):
automation_manager.update(
ExtenededAutomation(
id="newlymade",
configuration_key="automation cools",
source_file="automations/include_dir_merge_list/sub/list2.yaml",
source_file_type="obj",
),
create_if_not_found=True,
)
automation_manager.reload()
with self.assertRaises(DBNoAutomationFound):
automation_manager.get("newlymade")
data = yaml_serializer.load_yaml(
(config_path / "automations/include_dir_merge_list/sub/list2.yaml").open("r"),
root_path=config_path,
)
self.assertIsInstance(data, list)
def test_save_improper_types_obj_to_list(self):
config_path, automation_manager = self.get_manager(HA_CONFIG6_EXAMPLE)
automation_manager.reload()
self.assertTrue((config_path / "automations/include_dir_list/home/down.yaml").exists())
with self.assertRaises(DBNoAutomationFound):
automation_manager.get("newlymade")
with self.assertRaises(AttemptingToOverwriteAnIncompatibleFileError):
automation_manager.update(
ExtenededAutomation(
id="newlymade",
configuration_key="automation cools",
source_file="automations/include_dir_list/home/down.yaml",
source_file_type="list",
),
create_if_not_found=True,
)
automation_manager.reload()
with self.assertRaises(DBNoAutomationFound):
automation_manager.get("newlymade")
data = yaml_serializer.load_yaml(
(config_path / "automations/include_dir_list/home/down.yaml").open("r"),
config_path,
)
self.assertIsInstance(data, dict)
def test_update_tags_through_automation_update(self):
_, automation_manager = self.get_manager(HA_CONFIG_EXAMPLE)
automation_manager.reload()
auto = automation_manager.get("1619371298367")
self.assertDictEqual(
auto.tags,
{
"Room": "Living",
"Type": "Button",
},
)
auto.tags["Room"] = "Bathroom"
automation_manager.update(auto)
del auto
automation_manager.reload()
auto = automation_manager.get("1619371298367")
self.assertDictEqual(
auto.tags,
{
"Room": "Bathroom",
"Type": "Button",
},
)
def test_update_tags_through_tags(self):
_, automation_manager = self.get_manager(HA_CONFIG_EXAMPLE)
automation_manager.reload()
auto = automation_manager.get("1619371298367")
self.assertDictEqual(
auto.tags,
{
"Room": "Living",
"Type": "Button",
},
)
auto.tags["Room"] = "Bathroom"
automation_manager.update_tags(auto.id, auto.tags)
del auto
automation_manager.reload()
auto = automation_manager.get("1619371298367")
self.assertDictEqual(
auto.tags,
{
"Room": "Bathroom",
"Type": "Button",
},
)
def test_delete_tags(self):
_, automation_manager = self.get_manager(HA_CONFIG_EXAMPLE)
automation_manager.reload()
auto = automation_manager.get("1619371298367")
self.assertDictEqual(
auto.tags,
{
"Room": "Living",
"Type": "Button",
},
)
automation_manager.delete_tags(auto.id)
del auto
automation_manager.reload()
auto = automation_manager.get("1619371298367")
self.assertDictEqual(
auto.tags,
{},
) )
manager.update_tags("test1", {"room": "bathroom"})
auto = manager.get(0)
assert auto.tags == {"room": "bathroom"}
+19
View File
@@ -0,0 +1,19 @@
from pathlib import Path
from tempfile import mktemp
from unittest import TestCase
from src.automations.db import AutomationDBConnection
def make_temp_db():
return AutomationDBConnection(Path(mktemp() + ".db"))
class TestWithDB(TestCase):
def setUp(self) -> None:
self.db = make_temp_db()
self.db.create_db()
self.db_file = self.db.db_file
def tearDown(self) -> None:
self.db_file.unlink()
+5 -11
View File
@@ -1,7 +1,6 @@
from unittest import TestCase from unittest import TestCase
from src.automations.types import AutomationData, AutomationMetdata from src.automations.types import BaseAutomation
from src.hass_config.errors import MissingFile
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 create_dummy_config_folder
@@ -9,41 +8,36 @@ from tests.utils import create_dummy_config_folder
class loader_tests(TestCase): class loader_tests(TestCase):
def test_load_automation_from_config_yaml(self): def test_load_automation_from_config_yaml(self):
folder = create_dummy_config_folder( folder = create_dummy_config_folder(
[AutomationData(metadata=AutomationMetdata(id="test"))], [BaseAutomation(id="test")],
automation_in_conifguration_mode="inline", automation_in_conifguration_mode="inline",
) )
hass_config = HassConfig(folder) hass_config = HassConfig(folder)
self.assertIsInstance(hass_config.configurations, dict) self.assertIsInstance(hass_config.configurations, dict)
self.assertTrue("automation" in hass_config.configurations) self.assertTrue("automation" in hass_config.configurations)
self.assertEqual(hass_config.automations[0]["id"], "test")
def test_load_automation_from_config_yaml_include(self): def test_load_automation_from_config_yaml_include(self):
folder = create_dummy_config_folder( folder = create_dummy_config_folder(
[AutomationData(metadata=AutomationMetdata(id="test"))], [BaseAutomation(id="test")],
automation_in_conifguration_mode="include", automation_in_conifguration_mode="include",
) )
hass_config = HassConfig(folder) hass_config = HassConfig(folder)
self.assertIsInstance(hass_config.configurations, dict) self.assertIsInstance(hass_config.configurations, dict)
self.assertTrue("automation" in hass_config.configurations) self.assertTrue("automation" in hass_config.configurations)
self.assertEqual(hass_config.automations[0]["id"], "test")
def test_load_automation_from_infer(self): def test_load_automation_from_infer(self):
folder = create_dummy_config_folder( folder = create_dummy_config_folder(
[AutomationData(metadata=AutomationMetdata(id="test"))], [BaseAutomation(id="test")],
automation_in_conifguration_mode="none", automation_in_conifguration_mode="none",
) )
hass_config = HassConfig(folder) hass_config = HassConfig(folder)
self.assertIsInstance(hass_config.configurations, dict) self.assertIsInstance(hass_config.configurations, dict)
self.assertFalse("automation" in hass_config.configurations) self.assertFalse("automation" in hass_config.configurations)
self.assertEqual(hass_config.automations[0]["id"], "test")
def test_missing_automations(self): def test_missing_automations(self):
folder = create_dummy_config_folder( folder = create_dummy_config_folder(
[AutomationData(metadata=AutomationMetdata(id="test"))], [BaseAutomation(id="test")],
automation_in_conifguration_mode="none", automation_in_conifguration_mode="none",
) )
(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)
with self.assertRaises(MissingFile):
list(hass_config.automations)
+1 -1
View File
@@ -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):
+53 -16
View File
@@ -1,13 +1,15 @@
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,
) )
from tests.utils import SAMPLES_FOLDER
class dumping_yamls_tests(TestCase): class dumping_yamls_tests(TestCase):
@@ -15,19 +17,53 @@ 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_stub(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):
yaml = dump_yaml(
{"sensor": IncludedYamlMergeListDir(Path.cwd() / "sensors")},
Path.cwd(),
)
self.assertEqual(yaml, "sensor: !include_dir_merge_list 'sensors'\n")
def test_load_complex_automation_setup(self):
yaml_obj = load_yaml(
io.StringIO(
"""
automation manual: !include_dir_list ./automations/include_dir_list
automation ui: !include automations/ui.yaml
automation: !include automations/base.yaml
automation cools: !include_dir_merge_list automations/include_dir_merge_list
"""
),
Path.cwd(),
)
self.assertDictEqual(
dict(yaml_obj),
{
"automation manual": IncludedYamlDirList(
Path.cwd() / "automations/include_dir_list"
),
"automation ui": IncludedYaml(Path.cwd() / "automations/ui.yaml"),
"automation cools": IncludedYamlMergeListDir(
Path.cwd() / "automations/include_dir_merge_list"
),
"automation": IncludedYaml(Path.cwd() / "automations/base.yaml"),
},
)
def test_load_stub(self): def test_load_stub(self):
yaml_obj = load_yaml( yaml_obj = load_yaml(
@@ -43,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),
@@ -57,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:
@@ -73,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
View File
@@ -4,16 +4,21 @@ from tempfile import mkdtemp
from typing import List, Literal, Optional, Tuple from typing import List, Literal, Optional, Tuple
from src.automations.manager import AutomationManager from src.automations.manager import AutomationManager
from src.automations.types import AutomationData from src.automations.types import 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"
HA_CONFIG_EXAMPLE = SAMPLES_FOLDER / "config" HA_CONFIG_EXAMPLE = SAMPLES_FOLDER / "config"
HA_CONFIG2_EXAMPLE = SAMPLES_FOLDER / "config-2" HA_CONFIG2_EXAMPLE = SAMPLES_FOLDER / "config-2"
HA_CONFIG3_EXAMPLE = SAMPLES_FOLDER / "config-3" HA_CONFIG3_EXAMPLE = SAMPLES_FOLDER / "config-3"
HA_CONFIG4_EXAMPLE = SAMPLES_FOLDER / "config-4"
HA_CONFIG5_EXAMPLE = SAMPLES_FOLDER / "config-5"
HA_CONFIG6_EXAMPLE = SAMPLES_FOLDER / "config-6"
HA_CONFIG7_EXAMPLE = SAMPLES_FOLDER / "config-7"
HA_CONFIG8_EXAMPLE = SAMPLES_FOLDER / "config-8"
HA_CONFIG9_EXAMPLE = SAMPLES_FOLDER / "config-9"
def get_example_automation_loader( def get_example_automation_loader(
@@ -43,7 +48,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[AutomationData], 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",
@@ -51,7 +56,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[AutomationData]): 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.
@@ -71,7 +76,7 @@ def get_dummy_automation_loader(
def create_dummy_config_folder( def create_dummy_config_folder(
auto: List[AutomationData], 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",
@@ -79,7 +84,7 @@ def create_dummy_config_folder(
"""Creates a dummy /config structure for testing """Creates a dummy /config structure for testing
Args: Args:
auto (List[AutomationData]): 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.
@@ -94,11 +99,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
-1
View File
@@ -1 +0,0 @@
../webapp/build
BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 MiB

+1 -1
View File
@@ -1,5 +1,5 @@
name: Shortumation name: Shortumation
version: v0.5.1 version: v0.6.1
slug: shortumation slug: shortumation
image: asosnovsky/shortumation-{arch} image: asosnovsky/shortumation-{arch}
url: "https://github.com/asosnovsky/Shortumation" url: "https://github.com/asosnovsky/Shortumation"
+1 -1
View File
@@ -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
+1
View File
@@ -0,0 +1 @@
websocket_max_message_size = 16777216
+5 -2
View File
@@ -12,9 +12,12 @@ services:
shortumation: shortumation:
# make sure to replace the ARCH with whatever system you are running! # make sure to replace the ARCH with whatever system you are running!
image: "asosnovsky/shortumation-${ARCH:-amd64}:${SHORTUMATION_VERSION:-latest}" image: "asosnovsky/shortumation-${ARCH:-amd64}:${SHORTUMATION_VERSION:-latest}"
network_mode: host ports:
- 8000:8000
extra_hosts:
- "host.docker.internal:host-gateway"
volumes: volumes:
- ./config:/config - ./config:/config
environment: environment:
- SUPERVISOR_TOKEN=${SUPERVISOR_TOKEN} - SUPERVISOR_TOKEN=${SUPERVISOR_TOKEN}
- HASSIO_WS=ws://0.0.0.0:8123/api/websocket - HASSIO_WS=ws://host.docker.internal:8123/api/websocket
Loaded 100 of 158 files, more files were not shown because too many files have changed in this diff. Show more