Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
07d5a4d4db | ||
|
|
1b81962c03 | ||
|
|
86d4117773 | ||
|
|
5ad653ffcb | ||
|
|
4c59f9cbc1 | ||
|
|
9d232246e8 | ||
|
|
61a64e0040 | ||
|
|
2f709b499a | ||
|
|
f4fe036480 | ||
|
|
97521097dc | ||
|
|
0cf3f2706a | ||
|
|
924eea0c0a | ||
|
|
616c8c3b4b | ||
|
|
b68962ccbb | ||
|
|
6bac5f184f | ||
|
|
38a645918f | ||
|
|
ba13c281d2 | ||
|
|
9184d1f7bd | ||
|
|
f8f6d74d6a | ||
|
|
819a76f8e3 | ||
|
|
a391eae7c5 | ||
|
|
7cb1a5d907 | ||
|
|
8792ed6ed8 | ||
|
|
9bafbf4e8c | ||
|
|
c67d1bd32f | ||
|
|
55ea1e23a4 | ||
|
|
d96c1fb953 | ||
|
|
f8b59c6b17 | ||
|
|
02cbacabe0 | ||
|
|
b0d924f63a | ||
|
|
7aadfbc175 | ||
|
|
08af01dd11 | ||
|
|
586f52ba56 | ||
|
|
e11f4deab5 | ||
|
|
579017d9ec | ||
|
|
a746c4db3a | ||
|
|
3a89fe5efc | ||
|
|
2bc7e11bb1 | ||
|
|
e6a835a5f3 | ||
|
|
107def4fac | ||
|
|
6b21734041 | ||
|
|
754cc2ef98 | ||
|
|
1cb40288b1 | ||
|
|
129ba28ff5 | ||
|
|
44e246f79b | ||
|
|
8bcbcaa801 | ||
|
|
b479476833 | ||
|
|
baa31ab649 | ||
|
|
dc7c6273e4 | ||
|
|
2942b6173b | ||
|
|
bcfc648011 | ||
|
|
084d86ad7a | ||
|
|
ea6be4a8f3 | ||
|
|
14649ac1fd | ||
|
|
f1b99cad1c | ||
|
|
ab7f50d4aa | ||
|
|
d22bba8c4d | ||
|
|
549f52655b | ||
|
|
2c5d64ab86 | ||
|
|
7c50c345ec | ||
|
|
f4261f9701 | ||
|
|
34826acb97 | ||
|
|
cd1b4e8e2b | ||
|
|
2b4c64c94b | ||
|
|
067f5fa642 | ||
|
|
957b6a66fe | ||
|
|
e4af85cdfa | ||
|
|
f99cb84658 | ||
|
|
644edb2ef6 | ||
|
|
b4a9763ead | ||
|
|
4551daedd3 | ||
|
|
fa4048e28c | ||
|
|
ea86f7f763 | ||
|
|
9a26fc46d5 | ||
|
|
35244bb107 | ||
|
|
883955e523 | ||
|
|
57c86093a4 | ||
|
|
2a827c24f6 | ||
|
|
473684efa6 | ||
|
|
3f0430ab37 | ||
|
|
96617e7b0c | ||
|
|
a9c3e9c890 | ||
|
|
02ec81c16a | ||
|
|
05d09830bb | ||
|
|
f16d25d41e | ||
|
|
104882cb25 | ||
|
|
5d9c04072b | ||
|
|
27314be9a8 | ||
|
|
f20eb271d9 | ||
|
|
dfcbe9e76a | ||
|
|
fca97b84ac | ||
|
|
8f59f0284c | ||
|
|
2eb5b65fd9 | ||
|
|
a7ef2706e9 | ||
|
|
bd2f10fbfc | ||
|
|
8f53ec0130 | ||
|
|
fb980dc8fb | ||
|
|
6eacb355b7 | ||
|
|
4168799329 | ||
|
|
8ee2b905b8 | ||
|
|
381d9295b7 | ||
|
|
80bb8c909c | ||
|
|
88c9b7d6b8 | ||
|
|
badf9a7038 | ||
|
|
957d962ecb | ||
|
|
a366928f7f | ||
|
|
9a00fc9bbf | ||
|
|
1ad7b19c0a | ||
|
|
22e50a9fd7 | ||
|
|
c0faa41104 | ||
|
|
52d4c10a8c | ||
|
|
4b120cf8ea | ||
|
|
3a172f310e | ||
|
|
2a6163219e | ||
|
|
c4ba65bd8e | ||
|
|
f2bea3c33c | ||
|
|
d0077a8d83 | ||
|
|
28f2e0f31f | ||
|
|
8c8d26c1e1 | ||
|
|
0ac2991ad8 | ||
|
|
6ca2ee105a | ||
|
|
06e5e3f847 | ||
|
|
4ad5c08769 | ||
|
|
b0bf8fefe7 | ||
|
|
bfda0b58ae | ||
|
|
b7e79b5fa7 | ||
|
|
4f0f72190f | ||
|
|
74cd85b0e8 | ||
|
|
c699d298bf | ||
|
|
ea45662ed9 | ||
|
|
67f5358f45 | ||
|
|
c40e441f33 | ||
|
|
a3ee13e8e3 | ||
|
|
a3fa409eda | ||
|
|
7ac7d60468 | ||
|
|
cb34db3c86 | ||
|
|
ea8697137a | ||
|
|
e9246a5b6c | ||
|
|
d121082d4f | ||
|
|
2605978b43 | ||
|
|
f5b21be26d | ||
|
|
582859b35b | ||
|
|
184734ee70 | ||
|
|
3a44057a40 | ||
|
|
ef02abe0cb | ||
|
|
1d52993253 | ||
|
|
50031c4868 | ||
|
|
b3dae6fea7 | ||
|
|
fd35938fcb | ||
|
|
649ee0f31e | ||
|
|
e7110dc97b | ||
|
|
dcf577f84c | ||
|
|
fabb5612d5 | ||
|
|
2958fa49f8 | ||
|
|
211f5d8be7 | ||
|
|
3dac905fda | ||
|
|
75d70b1133 | ||
|
|
47b0c89589 | ||
|
|
212349b4c0 | ||
|
|
a4789cf43e | ||
|
|
395a9d955e | ||
|
|
937a3f97c4 | ||
|
|
6bb18563b4 | ||
|
|
2a9ba678d3 | ||
|
|
38e362a469 | ||
|
|
b56b5fc184 | ||
|
|
1cce2d20f4 | ||
|
|
717fada35e | ||
|
|
ca4be32d63 | ||
|
|
ad4c1f66f2 | ||
|
|
4af6b1688a | ||
|
|
045ce75362 | ||
|
|
442a49da8b | ||
|
|
8e859ff191 | ||
|
|
3b1b88b404 | ||
|
|
8306686e4c | ||
|
|
6d67dd129c | ||
|
|
5086ecd993 | ||
|
|
bbb87ebf9e | ||
|
|
a1ca9d62b7 | ||
|
|
0e4e4783fa | ||
|
|
1719148c58 | ||
|
|
2ea96973ad | ||
|
|
a35e8e127f | ||
|
|
46a67b1395 | ||
|
|
6b465219a9 | ||
|
|
e769a8e798 | ||
|
|
d8a2dd53d5 | ||
|
|
4aedd9323b | ||
|
|
2fc984a3ae | ||
|
|
bbfc87a334 | ||
|
|
bbe6a5abf3 | ||
|
|
9dd23fd8e7 | ||
|
|
24b3beaf0a | ||
|
|
d55d86b177 | ||
|
|
32fc5bce07 | ||
|
|
45ace08cbe | ||
|
|
d4e2e2f1e5 | ||
|
|
50f1d2a42d | ||
|
|
58f18232b7 | ||
|
|
8bf25547eb | ||
|
|
07ab4b9089 | ||
|
|
89c7007612 | ||
|
|
de2307901b | ||
|
|
f392cf17fd | ||
|
|
595aa2dfa1 | ||
|
|
2d78319683 | ||
|
|
befe293f1c | ||
|
|
0b381a6e50 | ||
|
|
b4f46bec92 | ||
|
|
1661df888a | ||
|
|
0c5ef76f4b | ||
|
|
084a3585d0 | ||
|
|
2cb2e779d7 | ||
|
|
730c804c22 | ||
|
|
649c1fbdeb | ||
|
|
edb3dafe12 | ||
|
|
1d7b6e96c1 | ||
|
|
7483f2b65d | ||
|
|
e7dec306df | ||
|
|
f549993d3e | ||
|
|
d62c484f33 | ||
|
|
3cb6070aca | ||
|
|
e94151cf94 | ||
|
|
518563fddd | ||
|
|
34394feb9d | ||
|
|
e8b76039a9 | ||
|
|
8c1f29226b | ||
|
|
550795bf7f | ||
|
|
905a5ac4d7 | ||
|
|
d50674c8fe | ||
|
|
81f22ccd2a | ||
|
|
2b1b7526c3 | ||
|
|
6e534f446d | ||
|
|
b3b1126a12 | ||
|
|
cf9f24f41e | ||
|
|
897953b0db | ||
|
|
3fadcd94b6 | ||
|
|
a8229eb7bd | ||
|
|
72afaee719 | ||
|
|
9a171c880e | ||
|
|
7488ecc3ae | ||
|
|
d99512d6e5 | ||
|
|
e6e57be3ed | ||
|
|
47f57c313e | ||
|
|
dc3470fdf5 | ||
|
|
5bd5c5e445 | ||
|
|
869c23212b | ||
|
|
08f7ee2393 | ||
|
|
0088dd8448 | ||
|
|
4d9afbe26b | ||
|
|
9a43330501 | ||
|
|
6c78af45f6 | ||
|
|
1da9f44232 | ||
|
|
7b958f6c3b | ||
|
|
d08d091723 | ||
|
|
3371d6b95f | ||
|
|
c07e1aca49 | ||
|
|
cc2597c408 | ||
|
|
6da5a7592e | ||
|
|
fe4f0e9881 | ||
|
|
ff195796d8 | ||
|
|
fe2fd19be8 | ||
|
|
3b6b34f6e5 | ||
|
|
a39755d599 | ||
|
|
bb1d8c6492 | ||
|
|
8780d206c9 | ||
|
|
1d1d52480a | ||
|
|
ec7c28adba | ||
|
|
f120fcfd65 | ||
|
|
5e3e499c9d | ||
|
|
361bc9b7d6 | ||
|
|
4eccd75058 | ||
|
|
dc99d57964 | ||
|
|
7233c50492 | ||
|
|
e1fbb8103b | ||
|
|
7d28ffd761 | ||
|
|
a9905956d8 | ||
|
|
7836a5281a | ||
|
|
213dc1517d | ||
|
|
983753afe1 | ||
|
|
2da4d4b929 | ||
|
|
610a7c77b9 | ||
|
|
cd9bf9d8b7 | ||
|
|
3cb2725907 | ||
|
|
94ae295c9f | ||
|
|
f274f6281f | ||
|
|
d62835ba80 | ||
|
|
f7762b823b | ||
|
|
aa1fb2f499 | ||
|
|
ed07e35830 | ||
|
|
52ac28ffd2 | ||
|
|
ed9a5a9aa1 | ||
|
|
d6d47168e3 | ||
|
|
2f0f8f7dfe | ||
|
|
24093eb0b0 | ||
|
|
5a48007154 | ||
|
|
9a93b30f4b | ||
|
|
cdb12bfdcb | ||
|
|
f2e4b6802d | ||
|
|
b092d12dca | ||
|
|
dce5d0b260 | ||
|
|
e1c222aeb0 | ||
|
|
bd29cf6576 | ||
|
|
54f9b9c2f4 | ||
|
|
6722854700 | ||
|
|
939ec2dc99 | ||
|
|
4f05e64652 | ||
|
|
13ea3632e3 | ||
|
|
465e5a4268 | ||
|
|
eeaa64a8e7 | ||
|
|
3a1cee61b8 | ||
|
|
21dd880e37 | ||
|
|
218972ed5d | ||
|
|
451b3638bf | ||
|
|
3acbaf576d | ||
|
|
eaec599109 | ||
|
|
c6c1efddae | ||
|
|
ae352ff244 | ||
|
|
dde8d76772 | ||
|
|
34a4bd93bd | ||
|
|
7154f206b4 | ||
|
|
19a2d10a2f | ||
|
|
da699403df | ||
|
|
1496bc66ad | ||
|
|
debe48f2b4 | ||
|
|
4bada614b9 | ||
|
|
537bfe824b | ||
|
|
a25ec99cb1 | ||
|
|
8ac5bfdfed | ||
|
|
618a62affe | ||
|
|
1ce934fd54 | ||
|
|
ab8ecfeefb | ||
|
|
a32e365d86 | ||
|
|
04f3e6194f | ||
|
|
0b183353d3 | ||
|
|
0c9b0ec6e6 | ||
|
|
5bef962977 | ||
|
|
029df7932e | ||
|
|
6be6005531 | ||
|
|
326775848b | ||
|
|
736a6053ef | ||
|
|
f4a41331b1 | ||
|
|
15c97b81b4 | ||
|
|
0fc3ea6146 | ||
|
|
596c3363e7 | ||
|
|
529b5599e4 | ||
|
|
184d8a8584 | ||
|
|
f6ca454999 | ||
|
|
cdc5aa16b0 | ||
|
|
7b816c3fbf | ||
|
|
0cecae5faa | ||
|
|
c17783064c | ||
|
|
d824a93695 | ||
|
|
5207c48f8d | ||
|
|
b30f4ed59a | ||
|
|
e3a816f2c8 | ||
|
|
240f8faef7 | ||
|
|
651ba865b1 | ||
|
|
a3e9d19c45 | ||
|
|
942867d646 | ||
|
|
041c2f02d5 | ||
|
|
fb30d577aa | ||
|
|
c4a90fcd1c | ||
|
|
4c3b34195a | ||
|
|
78494ee74d | ||
|
|
d3fff074e5 | ||
|
|
0ee0a06737 | ||
|
|
61000f2ff1 | ||
|
|
ac1ee86cc7 | ||
|
|
c934a4afcb | ||
|
|
359958aada | ||
|
|
7a73af4434 | ||
|
|
55bb941399 | ||
|
|
afb765024d | ||
|
|
911f867518 | ||
|
|
25bb19dbe5 | ||
|
|
9960ce2909 | ||
|
|
c2fde70954 | ||
|
|
5ca9c4a361 | ||
|
|
c27f2d13f0 | ||
|
|
26c81effd6 | ||
|
|
e72c83b980 | ||
|
|
e222c42150 | ||
|
|
e7b88fc6f6 | ||
|
|
079f353dbf | ||
|
|
e6e51be5a5 | ||
|
|
3a6b21a117 | ||
|
|
f42df5a70f | ||
|
|
0c3e9b5ace | ||
|
|
bc773154c6 | ||
|
|
a530e5e6e0 | ||
|
|
1ad87c205d | ||
|
|
d45f72b168 | ||
|
|
0c7db09c32 | ||
|
|
2b1648eff2 | ||
|
|
06356b46e9 | ||
|
|
21fe64f4bf | ||
|
|
e22f64dd51 | ||
|
|
f1b24ec783 | ||
|
|
8a90b56ac3 | ||
|
|
7d111c853b | ||
|
|
0c72481729 | ||
|
|
996626f9af | ||
|
|
878035e748 | ||
|
|
cc930ee4ac | ||
|
|
169a2e9059 | ||
|
|
6275123071 | ||
|
|
0001c93792 | ||
|
|
90d3fa0587 | ||
|
|
938040e519 | ||
|
|
14b3132c64 | ||
|
|
17c79d7aab | ||
|
|
67cc57f068 | ||
|
|
a4743b0353 | ||
|
|
5efda5f3b2 | ||
|
|
7d7a788723 | ||
|
|
cdf67aa1a9 | ||
|
|
98133607ca | ||
|
|
5729b74c89 | ||
|
|
fb8eb4f38c | ||
|
|
21adcb6973 | ||
|
|
8a33d05ced | ||
|
|
334268b5ee | ||
|
|
3b7b17021f | ||
|
|
44c4ac12dd | ||
|
|
f8233dd6ab | ||
|
|
54f528deb4 |
No files matched your search
+9
-1
@@ -1,4 +1,12 @@
|
||||
webapp/node_modules
|
||||
webapp/build
|
||||
webapp/.storybook
|
||||
webapp/.vscode
|
||||
webapp/.env.local
|
||||
webapp/tmux.sh
|
||||
api/.env
|
||||
api/.coverage
|
||||
api/venv
|
||||
api/build
|
||||
api/.mypy_cache
|
||||
api/.vscode
|
||||
api/.coverage
|
||||
@@ -0,0 +1,39 @@
|
||||
---
|
||||
name: Bug report
|
||||
about: Create a report to help us improve
|
||||
title: ''
|
||||
labels: bug, triage
|
||||
assignees: ''
|
||||
|
||||
---
|
||||
|
||||
**Describe the bug**
|
||||
A clear and concise description of what the bug is.
|
||||
|
||||
**To Reproduce**
|
||||
Steps to reproduce the behavior:
|
||||
1. Go to '...'
|
||||
2. Click on '....'
|
||||
3. Scroll down to '....'
|
||||
4. See error
|
||||
|
||||
Or even paste your automation file here
|
||||
**Expected behavior**
|
||||
A clear and concise description of what you expected to happen.
|
||||
|
||||
**Screenshots**
|
||||
If applicable, add screenshots to help explain your problem.
|
||||
|
||||
**Desktop (please complete the following information):**
|
||||
- OS: [e.g. iOS]
|
||||
- Browser [e.g. chrome, safari]
|
||||
- Version [e.g. 22]
|
||||
|
||||
**Smartphone (please complete the following information):**
|
||||
- Device: [e.g. iPhone6]
|
||||
- OS: [e.g. iOS8.1]
|
||||
- Browser [e.g. stock browser, safari]
|
||||
- Version [e.g. 22]
|
||||
|
||||
**Additional context**
|
||||
Add any other context about the problem here.
|
||||
@@ -0,0 +1,10 @@
|
||||
---
|
||||
name: Feature request
|
||||
about: Suggest an idea for this project
|
||||
title: ''
|
||||
labels: triage
|
||||
assignees: ''
|
||||
|
||||
---
|
||||
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
---
|
||||
name: Other
|
||||
about: ''
|
||||
title: ''
|
||||
labels: triage
|
||||
assignees: ''
|
||||
|
||||
---
|
||||
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
---
|
||||
name: Security Issue
|
||||
about: 'Use this to report vulnerabilities '
|
||||
title: ''
|
||||
labels: triage, Vulnerability
|
||||
assignees: ''
|
||||
|
||||
---
|
||||
|
||||
|
||||
+111
-9
@@ -1,18 +1,89 @@
|
||||
name: "Manual Build"
|
||||
name: Build
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
version:
|
||||
type: string
|
||||
description: "Version Number"
|
||||
required: true
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
jobs:
|
||||
build:
|
||||
metadata:
|
||||
runs-on: ubuntu-latest
|
||||
name: "${{ github.event.inputs.version }} / ${{ matrix.arch }}"
|
||||
name: Metadata
|
||||
outputs:
|
||||
version: ${{ steps.version.outputs.VERSION }}
|
||||
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
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- name: Get Version
|
||||
id: version
|
||||
shell: bash
|
||||
run: |
|
||||
if [ -z "${INPUT_VERSION}" ]; then
|
||||
echo ::set-output name=VERSION::$(git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')
|
||||
else
|
||||
echo ::set-output name=VERSION::${INPUT_VERSION}
|
||||
fi
|
||||
env:
|
||||
INPUT_VERSION: ${{ github.event.inputs.version }}
|
||||
- name: ${{ steps.version.outputs.VERSION }}
|
||||
shell: bash
|
||||
run: |
|
||||
echo ${{ steps.version.outputs.VERSION }}
|
||||
|
||||
build-web:
|
||||
runs-on: ubuntu-latest
|
||||
name: "Build Web"
|
||||
needs:
|
||||
- metadata
|
||||
steps:
|
||||
- name: Check out repository
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Setup node
|
||||
uses: actions/setup-node@v3
|
||||
with:
|
||||
node-version: 16
|
||||
cache: "yarn"
|
||||
cache-dependency-path: webapp/yarn.lock
|
||||
|
||||
- name: "Save version number"
|
||||
run: echo "REACT_APP_BUILD_VERSION=${{ needs.metadata.outputs.version }}" > ./webapp/.env.production
|
||||
|
||||
- name: "Build Web"
|
||||
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"]
|
||||
arch:
|
||||
- "aarch64"
|
||||
- "amd64"
|
||||
# - "armhf"
|
||||
- "armv7"
|
||||
- "i386"
|
||||
|
||||
steps:
|
||||
- name: Check out repository
|
||||
@@ -24,11 +95,42 @@ jobs:
|
||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
|
||||
- name: Build & Push to Dockerhub
|
||||
uses: home-assistant/builder@2022.03.1
|
||||
- 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 }}
|
||||
uses: home-assistant/builder@master
|
||||
with:
|
||||
args: |
|
||||
--${{ matrix.arch }} \
|
||||
--version ${{ github.event.inputs.version }} \
|
||||
--additional-tag edge \
|
||||
--no-latest \
|
||||
--version ${{ needs.metadata.outputs.version }} \
|
||||
--target .
|
||||
|
||||
publish:
|
||||
runs-on: ubuntu-latest
|
||||
if: "${{ github.event.inputs.version != '' }}"
|
||||
needs:
|
||||
- metadata
|
||||
- deploy
|
||||
name: Create Github Pre-Release
|
||||
permissions:
|
||||
contents: write
|
||||
steps:
|
||||
- name: Pre-Release ${{ needs.metadata.outputs.version }}
|
||||
uses: actions/github-script@v6
|
||||
env:
|
||||
VERSION: ${{ needs.metadata.outputs.version }}
|
||||
CHANGELOG: ${{ needs.metadata.outputs.changlelog }}
|
||||
with:
|
||||
github-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
script: |
|
||||
github.rest.repos.createRelease({
|
||||
owner: context.repo.owner,
|
||||
repo: context.repo.repo,
|
||||
tag_name: process.env.VERSION,
|
||||
prerelease: true,
|
||||
});
|
||||
@@ -13,12 +13,12 @@ name: "CodeQL"
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ main ]
|
||||
branches: [ "main" ]
|
||||
pull_request:
|
||||
# The branches below must be a subset of the branches above
|
||||
branches: [ main ]
|
||||
branches: [ "main" ]
|
||||
schedule:
|
||||
- cron: '29 23 * * 0'
|
||||
- cron: '26 21 * * 2'
|
||||
|
||||
jobs:
|
||||
analyze:
|
||||
@@ -34,14 +34,9 @@ jobs:
|
||||
matrix:
|
||||
language: [ 'javascript', 'python' ]
|
||||
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
|
||||
# Learn more about CodeQL language support at https://git.io/codeql-language-support
|
||||
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
|
||||
|
||||
steps:
|
||||
- name: Cancel Previous Runs
|
||||
uses: styfle/cancel-workflow-action@0.9.1
|
||||
with:
|
||||
access_token: ${{ github.token }}
|
||||
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v3
|
||||
|
||||
@@ -53,23 +48,25 @@ jobs:
|
||||
# If you wish to specify custom queries, you can do so here or in a config file.
|
||||
# By default, queries listed here will override any specified in a config file.
|
||||
# Prefix the list here with "+" to use these queries and those in the config file.
|
||||
# queries: ./path/to/local/query, your-org/your-repo/queries@main
|
||||
|
||||
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
|
||||
# queries: security-extended,security-and-quality
|
||||
|
||||
|
||||
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
|
||||
# If this step fails, then you should remove it and run the build manually (see below)
|
||||
- name: Autobuild
|
||||
uses: github/codeql-action/autobuild@v2
|
||||
|
||||
# ℹ️ Command-line programs to run using the OS shell.
|
||||
# 📚 https://git.io/JvXDl
|
||||
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
|
||||
|
||||
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
|
||||
# and modify them (or add more) to build your code if your project
|
||||
# uses a compiled language
|
||||
# If the Autobuild fails above, remove it and uncomment the following three lines.
|
||||
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
|
||||
|
||||
#- run: |
|
||||
# make bootstrap
|
||||
# make release
|
||||
# - run: |
|
||||
# echo "Run, Build Application using script"
|
||||
# ./location_of_script_within_repo/buildscript.sh
|
||||
|
||||
- name: Perform CodeQL Analysis
|
||||
uses: github/codeql-action/analyze@v2
|
||||
@@ -0,0 +1,20 @@
|
||||
# Dependency Review Action
|
||||
#
|
||||
# This Action will scan dependency manifest files that change as part of a Pull Request, surfacing known-vulnerable versions of the packages declared or updated in the PR. Once installed, if the workflow run is marked as required, PRs introducing known-vulnerable packages will be blocked from merging.
|
||||
#
|
||||
# Source repository: https://github.com/actions/dependency-review-action
|
||||
# Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
|
||||
name: 'Dependency Review'
|
||||
on: [pull_request]
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
dependency-review:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: 'Checkout Repository'
|
||||
uses: actions/checkout@v3
|
||||
- name: 'Dependency Review'
|
||||
uses: actions/dependency-review-action@v2
|
||||
@@ -1,48 +0,0 @@
|
||||
name: Deploy
|
||||
env:
|
||||
MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs"
|
||||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branch: [main]
|
||||
paths:
|
||||
- "config.yaml"
|
||||
jobs:
|
||||
metadata:
|
||||
runs-on: ubuntu-latest
|
||||
name: Metadata
|
||||
outputs:
|
||||
version: ${{ steps.version.outputs.VERSION }}
|
||||
changlelog: ${{ steps.changlelog.outputs.CHANGELOG }}
|
||||
steps:
|
||||
- name: Check out repository
|
||||
uses: actions/checkout@v3
|
||||
- name: Get Version
|
||||
id: version
|
||||
shell: bash
|
||||
run: |
|
||||
echo ::set-output name=VERSION::$(cat config.yaml | sed -nr 's/version: (.*)/\1/p')
|
||||
- name: Get Changelog
|
||||
id: changlelog
|
||||
shell: bash
|
||||
run: |
|
||||
echo ::set-output name=CHANGELOG::$(cat CHANGELOG.md)
|
||||
|
||||
publish:
|
||||
runs-on: ubuntu-latest
|
||||
needs:
|
||||
- metadata
|
||||
name: Publish Github Release
|
||||
steps:
|
||||
- name: Publish Release ${{ needs.metadata.outputs.version }}
|
||||
uses: actions/github-script@v6
|
||||
env:
|
||||
VERSION: ${{ needs.metadata.outputs.version }}
|
||||
CHANGELOG: ${{ needs.metadata.outputs.changlelog }}
|
||||
with:
|
||||
script: |
|
||||
github.rest.repos.createRelease({
|
||||
owner: context.repo.owner,
|
||||
repo: context.repo.repo,
|
||||
tag_name: process.env.VERSION,
|
||||
});
|
||||
+11
-40
@@ -1,12 +1,11 @@
|
||||
name: Test
|
||||
env:
|
||||
MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs"
|
||||
name: Commit Tests
|
||||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branch: [main]
|
||||
branches:
|
||||
- main
|
||||
pull_request:
|
||||
branches: [main]
|
||||
branches:
|
||||
- main
|
||||
jobs:
|
||||
metadata:
|
||||
runs-on: ubuntu-latest
|
||||
@@ -35,13 +34,16 @@ jobs:
|
||||
- metadata
|
||||
strategy:
|
||||
matrix:
|
||||
action: [lint, coverage, security-checks]
|
||||
action:
|
||||
- lint
|
||||
- coverage
|
||||
- security-checks
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- name: Set up Python
|
||||
uses: actions/setup-python@v3
|
||||
uses: actions/setup-python@v4
|
||||
with:
|
||||
python-version: 3.9
|
||||
python-version: "3.10"
|
||||
- name: Install Dependencies
|
||||
run: cd api && make setup
|
||||
- name: Echo dependencies
|
||||
@@ -59,7 +61,6 @@ jobs:
|
||||
action:
|
||||
- "test:ci"
|
||||
- "tsc:ci"
|
||||
- "build"
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/setup-node@v3
|
||||
@@ -71,33 +72,3 @@ jobs:
|
||||
run: cd webapp && yarn install
|
||||
- name: ${{ needs.metadata.outputs.version }} / ${{ matrix.action }}
|
||||
run: cd webapp && yarn ${{ matrix.action }}
|
||||
|
||||
deploy:
|
||||
runs-on: ubuntu-latest
|
||||
name: Build & Publish ${{ matrix.arch }}
|
||||
needs:
|
||||
- metadata
|
||||
- nodejs
|
||||
- python
|
||||
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: Build & Push to Dockerhub - ${{ matrix.arch }} / ${{ needs.metadata.outputs.version }}
|
||||
uses: home-assistant/builder@2022.03.1
|
||||
with:
|
||||
args: |
|
||||
--${{ matrix.arch }} \
|
||||
--version ${{ needs.metadata.outputs.version }} \
|
||||
--additional-tag edge \
|
||||
--target .
|
||||
@@ -1 +1,4 @@
|
||||
.vscode/*.log
|
||||
webapp/src/types/validators/index.test.ts
|
||||
example/containerized/config/
|
||||
example/containerized/.env
|
||||
+135
-4
@@ -1,4 +1,137 @@
|
||||
# Changelog
|
||||
# Changelog 
|
||||
|
||||
## [0.6.1] - v0.6.0 Split Config Support & Better Error handling!
|
||||
|
||||
- Added visual support for split config (this was a heavy refactor!)
|
||||
|
||||
<img width="400px" src="https://user-images.githubusercontent.com/7451445/185440594-f988c136-dd35-4a44-99d9-6d54d2a27882.png" />
|
||||
|
||||
- Capturing invalid files before they happen
|
||||
<img width="400px" src="https://user-images.githubusercontent.com/7451445/185440785-ad48f4b3-b6c5-4362-9222-426c07c95776.png"/>
|
||||
|
||||
- Trying to provide better information on common pitfals
|
||||

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

|
||||
|
||||
## [0.5.3] - Bug Fixes
|
||||
|
||||
- Redirecting `/` to `/web` to resolve container install strangeness reported in https://github.com/asosnovsky/Shortumation/issues/125
|
||||
- Fixed missing flag that caused the automation to explode in https://github.com/asosnovsky/Shortumation/issues/124
|
||||
|
||||
## [0.5.2] - Better Controls
|
||||
|
||||
- Add automation trigger
|
||||
- Speed dial on the bottom
|
||||
<img src="https://user-images.githubusercontent.com/7451445/183231968-9891bbb4-5c7c-4e05-b804-36978c809a5c.png" width="200px"/>
|
||||
- Infinite undos <img src="https://user-images.githubusercontent.com/7451445/183231977-ed000017-2886-4a57-b5fb-c7e527bf3894.png" width="200px"/>
|
||||
|
||||
## [0.5.1] - Sidebar!
|
||||
|
||||
- completely redesigned the sidebar!
|
||||
|
||||
- Disable/enable automatons
|
||||
- See 'bad state' automatons
|
||||
- Delete automatons from registry (in cases where references are stale)
|
||||
- Refactored sidebar UX to match MUI standards
|
||||
- Cleaned up editing tags in sidebar
|
||||
<img src="https://user-images.githubusercontent.com/7451445/182066721-07a93651-2f83-44d5-8420-15093caa52df.png" width="400px"/>
|
||||
|
||||
- Websockets now live-refresh when updates occur
|
||||
|
||||
## [0.4.0] - Depedency update
|
||||
|
||||
- Core dependency updates
|
||||
- Python port is now dynamically set
|
||||
|
||||
## [0.3.4] - Condition/Trigger Editor Upgrades!
|
||||
|
||||
- Many condition editor fixes
|
||||
- Many trigger editor fixes
|
||||
- Refactor time triggers & condition triggers (time + time pattern are now in a single node selection --- trying to keep list selection small)
|
||||
- Support for condition: time weekdays
|
||||
- Support for time inputs (using both timestamp device classes and input_datetime)
|
||||
- Fixed up condition editor nesting error (though still a better experience on pc, it is mostly usable on mobile)
|
||||
- Description generation for time+time pattern condition and triggers
|
||||
|
||||

|
||||
|
||||

|
||||
|
||||

|
||||
|
||||
## [0.3.2] - Fixed Addon Image for arm-based devices
|
||||
|
||||
- Using hypercon instead of uvicorn (this losses the rust dependency which makes it easier to install on arm)
|
||||
- Pre-building web assets outside of docker (this takes the image size down and speeds up instaltion of addon)
|
||||
- Updated build scripts to actually fail installation when build/prep steps fail
|
||||
- Ensured that builds for all architecture run successfully
|
||||
- Re-worked github actions (quicker test phases)
|
||||
|
||||
## [0.3.1] - Increased Pagination + Restricted Repeat Node
|
||||
|
||||
- Increased pagination to display up to 10,000 autos for now
|
||||
- Repeat node now has types
|
||||
|
||||
## [0.3.0] - Complete Refactor of Graphs
|
||||
|
||||
- Added visual support for
|
||||
|
||||
- Repeat Nodes
|
||||
- Parallel Nodes
|
||||
|
||||
- Using collections for conditions & triggers
|
||||
- Fixed several bugs with improper alerts
|
||||
- Fixed graph breakage during zoom
|
||||
- Support for enable/disable nodes in UI
|
||||
|
||||

|
||||
|
||||

|
||||
|
||||

|
||||
|
||||
## [0.1.22] - Many Visual improvements
|
||||
|
||||
- Deprecated several custom components in favor of mui.com
|
||||
- Device Editor now has support for 99% of diplay types
|
||||
- Condition Device is implemented
|
||||
- Improved naming autogen for trigger & choose
|
||||
|
||||
## [0.1.21] - Service Editor
|
||||
|
||||
- first version of service editor
|
||||
- reloading automations on save
|
||||
|
||||
## [0.1.20] - UI Bugfixes
|
||||
|
||||
- Using MUI elements for input time
|
||||
- Added delay action / wait_on_triggers action
|
||||
- Added enabled/disabled flag in node editor
|
||||
- Optional flip vertical during desktop mode
|
||||
- Fixed up modal clipping
|
||||
|
||||
## [0.1.19] - Vertical mobile mode
|
||||
|
||||
- in mobile mode we draw the graphs vertically now
|
||||
|
||||
## [0.1.17] - Websockets
|
||||
|
||||
- Connected to HA main websocket -- now we retrieve real-time information about
|
||||
|
||||
- Device names
|
||||
- Entity names/ids
|
||||
|
||||
- Autocomplete for devices and entities
|
||||
|
||||
## [0.1.14] - Material UI + Autocomplete
|
||||
|
||||
- Brought some Material UI elements for input and text
|
||||
- Autocomplete for tags
|
||||
- Using 'id' as alias for trigger (as it seems to break HA otherwise)
|
||||
- Not using 'alias' for conditions, always auto-generating it (again, this used to break HA)
|
||||
- Added missing `data` object to service-actions
|
||||
|
||||
## [0.1.13] - YAML
|
||||
|
||||
@@ -12,7 +145,6 @@
|
||||
- Made the validators less strict in order to capture more edge cases that HA supports
|
||||
- Nicer auto-generated descriptions for some trigger nodes
|
||||
|
||||
|
||||
## [0.1.10] - More Bug Fixes
|
||||
|
||||
- Allowing null or undefined values for metadata fields
|
||||
@@ -66,8 +198,7 @@
|
||||
## [0.0.9] - First Working Version
|
||||
|
||||
- Instalable verion via github
|
||||
- Initial POC done
|
||||
|
||||
- Initial POC done
|
||||
|
||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||
+25
-27
@@ -1,41 +1,37 @@
|
||||
# <--- Build Args -->
|
||||
# <--- Pre-Build Args -->
|
||||
ARG BUILD_ARCH
|
||||
|
||||
# <--- Main Image -->
|
||||
FROM python:3.10-slim-buster
|
||||
WORKDIR /app
|
||||
|
||||
# <--- Post-Build Args -->
|
||||
ARG BUILD_VERSION
|
||||
|
||||
# <--- Image Setup -->
|
||||
FROM homeassistant/${BUILD_ARCH}-base-python:3.9-alpine3.14
|
||||
WORKDIR /app
|
||||
# <--- Environment Variables -->
|
||||
ENV BUILD_VERSION $BUILD_VERSION
|
||||
|
||||
# <--- System Wide Dependencies -->
|
||||
ENV LANG C.UTF-8
|
||||
RUN apk add --no-cache \
|
||||
nodejs \
|
||||
npm \
|
||||
build-base \
|
||||
python3-dev
|
||||
RUN pip install -U wheel setuptools pip && \
|
||||
npm i -g yarn
|
||||
RUN apt-get update -y && \
|
||||
apt-get install -y gcc git build-essential libtool automake curl
|
||||
|
||||
# <--- Scripts -->
|
||||
COPY docker/bin /app/bin
|
||||
COPY docker/hypercorn.toml /app/hypercorn.toml
|
||||
|
||||
# <--- PREP -->
|
||||
RUN /app/bin/prep.sh
|
||||
|
||||
# <--- Python Dependencies -->
|
||||
COPY api/setup.py /app/setup.py
|
||||
RUN pip install . /app
|
||||
|
||||
# <--- Webapp Build -->
|
||||
COPY webapp/ /app/web-builder
|
||||
RUN cd /app/web-builder && \
|
||||
yarn && \
|
||||
yarn build && \
|
||||
cp -r /app/web-builder/build /app/web && \
|
||||
rm -rf /app/web-builder
|
||||
# <--- BUILD -->
|
||||
RUN /app/bin/build.sh /app
|
||||
|
||||
# <--- Api Code -->
|
||||
COPY api/src /app/src
|
||||
COPY run.sh /app/run.sh
|
||||
RUN chmod +x /app/run.sh
|
||||
|
||||
# <--- Environment Variables -->
|
||||
ENV HASSIO_TOKEN ""
|
||||
ENV BUILD_VERSION $BUILD_VERSION
|
||||
COPY webapp/build /app/web
|
||||
|
||||
# <--- Ports -->
|
||||
EXPOSE 8000
|
||||
@@ -43,7 +39,9 @@ EXPOSE 8000
|
||||
# <--- Final -->
|
||||
LABEL \
|
||||
io.hass.type="addon" \
|
||||
io.hass.arch="armhf|aarch64|i386|amd64"
|
||||
io.hass.arch="armhf|aarch64|i386|amd64|armv7"
|
||||
|
||||
CMD [ "/app/run.sh" ]
|
||||
ENTRYPOINT [ "/app/bin/run.sh" ]
|
||||
CMD [ "/app" ]
|
||||
|
||||
LABEL org.opencontainers.image.source https://github.com/asosnovsky/Shortumation
|
||||
@@ -0,0 +1,21 @@
|
||||
MIT License
|
||||
|
||||
Copyright (c) 2022 Ari Sosnovsky
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
@@ -1,24 +0,0 @@
|
||||
DC=docker-compose -f docker-compose.build.yaml -f docker-compose.test.yaml
|
||||
|
||||
build:
|
||||
$(DC) build
|
||||
|
||||
push:
|
||||
$(DC) push
|
||||
|
||||
local_run:
|
||||
$(MAKE) build
|
||||
$(DC) up -d
|
||||
sleep 1
|
||||
$(DC) ps
|
||||
|
||||
local_logs:
|
||||
$(DC) logs -f
|
||||
|
||||
local_ps:
|
||||
$(DC) ps
|
||||
|
||||
|
||||
local_stop:
|
||||
$(DC) stop
|
||||
|
||||
@@ -1,29 +1,42 @@
|
||||
# Shortumation
|
||||
# <img src="logo.png" height="40x"/> Shortumation 
|
||||
|
||||
[](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml)
|
||||
[](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml) [](https://github.com/asosnovsky/Shortumation/actions/workflows/build.yml)
|
||||
|
||||
A better way to write automations in home-assistant without having to install and run a seperate automation engine!
|
||||
| | Stable | Edge |
|
||||
| ------- | ------------------------------------------------------------------------------------------------------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------- |
|
||||
| Version |  |  |
|
||||
|
||||

|
||||
A [home-assistant addon](https://www.home-assistant.io/addons/) for a better UI for managing and writing your automations. We provide a way to visualize your automation using a visual-programming language that draws inspirations from [Node-Red](https://nodered.org/).
|
||||
|
||||

|
||||
|
||||
|
||||
A [home-assistant addon](https://www.home-assistant.io/addons/) for a better UI for managing your automations & scripts. We provide a way to visualize and develop your automation using a visual-programming language that draws inspirations from [Node-Red](https://nodered.org/).
|
||||
<img src="./assets/comparisons.png">
|
||||
|
||||
## Features
|
||||
|
||||
- [X] View your automations & scripts in a visual graph
|
||||
- [X] See all automations in one common view
|
||||
- [X] Automation Manager
|
||||
- [X] Tags for automation organization
|
||||
- [ ] Script Manager
|
||||
- [ ] Use secrets and global parameters
|
||||
- [ ] Autocomplete fields for entities/devices
|
||||
- [ ] Autocomplete fields for template editor
|
||||
- [ ] Autocomplete fields for referencing scripts
|
||||
- Sort and organize your home-assistant automations using tags!
|
||||
|
||||
See roadmap in [Version 1 Github Project](https://github.com/asosnovsky/Shortumation/projects/1).
|
||||
<img src="https://user-images.githubusercontent.com/7451445/179136346-cf04a8c0-ac4e-44b2-b9fe-806824864660.png" width="500px"/>
|
||||
|
||||
- Utilize the auto-generated node descriptions to understand what your automation is doing! No more reading YAML to just understand what 1 node does!
|
||||
|
||||
<img src="https://user-images.githubusercontent.com/7451445/179137357-455260f3-2cdd-44ca-ae62-084ed7c59ebd.png" width="500px"/>
|
||||
|
||||
- More condense UI for service calls!
|
||||
|
||||
<img src="https://user-images.githubusercontent.com/7451445/179137126-93601ea9-435f-4c4f-8f21-0d09cd61c7a2.png" width="500px"/>
|
||||
|
||||
- Visualize complex 'choose' or 'if/else' nodes
|
||||
|
||||
<img src="https://user-images.githubusercontent.com/7451445/179135734-8d7ca46d-7e6f-4975-abc3-de86a48de0c0.png" width="500px"/>
|
||||
|
||||
- Visualize parallel nodes!
|
||||
|
||||
<img src="https://user-images.githubusercontent.com/7451445/179136706-695912d7-e223-42d9-a27b-f330b021a56a.png" width="500px"/>
|
||||
|
||||
- Visualize repeat nodes!
|
||||
|
||||
<img src="https://user-images.githubusercontent.com/7451445/179135790-a5e77e2b-6d42-4810-a27b-ff4d165e99ec.png" width="500px"/>
|
||||
|
||||
See roadmap in [Version 1 Github Project](https://github.com/users/asosnovsky/projects/3/views/4).
|
||||
|
||||
## Installation
|
||||
|
||||
@@ -35,23 +48,38 @@ 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!
|
||||
|
||||
### Containerized
|
||||
**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**, currently we use the `/config/automation.yaml` file as our source of truth for the automations. Which means that we do not need access to the HA API or Websockets. In future release you may need to configure some additional compomenents to enable this.
|
||||
### 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).
|
||||
If this warning does not scare you or you still want to try things out, then take a look at the example [docker-compose.yaml](example/containerized/docker-compose.yaml), or read the [extended guide here](https://github.com/asosnovsky/Shortumation/wiki/Installation#containerized--ha-core).
|
||||
|
||||
In general, if you want to help provide this to more home-assistant fans please join on the conversation here https://github.com/asosnovsky/Shortumation/issues/102 or help contribute :)
|
||||
|
||||
## FAQ
|
||||
|
||||
**How 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?**
|
||||
|
||||
> Node-Red is both an execution engine and an automation editor, which means that in order for you 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)
|
||||
|
||||
**Which HA Installation does this support?**
|
||||
|
||||
> Currently this is only tested on HA OS. However, you should be able to get it working supervised installations as well (as they support addons). If you want to make it work for Container or Core, you will need to do some additional leg-work and I welcome a PR to get this working (it should be just a matter of mounting the `/config` path to the container running the images in this repo).
|
||||
> Currently this is only tested on HA OS. However, you should be able to get it working supervised installations as well (as they support addons). If you want to make it work for Container or Core, you will need to do some additional leg-work and I welcome a PR to get this working (it should be just a matter of mounting the `/config` path to the container running the images in this repo).
|
||||
|
||||
**Which version of HA does this require?**
|
||||
|
||||
> Since I am working on this project on my own, I can only test it against my own HA installations at home, and I tend to keep things as up to date as possible. The lowest version of HA this was tested on is `core-2022.5.4`
|
||||
> Since I am working on this project on my own, I can only test it against my own HA installations at home, and I tend to keep things as up to date as possible. The lowest version of HA this was tested on is `core-2022.5.4`
|
||||
|
||||
**This is awesome and all, how can I help?**
|
||||
|
||||
> Take a look at our Roadmap in [Version 1 Github Project](https://github.com/users/asosnovsky/projects/3/views/4), the [Development Guide](https://github.com/asosnovsky/Shortumation/wiki/Development) and send me some PRs to review!
|
||||
|
||||
> Please also note that I did went ahead and marked some [good first issues](https://github.com/asosnovsky/Shortumation/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) if you want to pick them up just leave a comment and I will give you more context (I haven't had time to add more details).
|
||||
|
||||
**HACS Support? I don't like docker.**
|
||||
|
||||
> Currently this is beyond v1, but if this is something you really want please +1 this issue https://github.com/asosnovsky/Shortumation/issues/102 or perhaps help us get there yourself by contributing! :)
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
# Security Policy
|
||||
|
||||
## Supported Versions
|
||||
|
||||
| Version | Supported |
|
||||
| ------- | ------------------ |
|
||||
| 0.x.x | :white_check_mark: |
|
||||
|
||||
|
||||
## Reporting a Vulnerability
|
||||
|
||||
Please open an issue with the tag 'Vulnerability', and include your reasoning in it.
|
||||
@@ -143,3 +143,4 @@ dmypy.json
|
||||
cython_debug/
|
||||
|
||||
# End of https://www.toptal.com/developers/gitignore/api/python
|
||||
development_config
|
||||
Vendored
+14
@@ -0,0 +1,14 @@
|
||||
{
|
||||
"recommendations": [
|
||||
"njpwerner.autodocstring",
|
||||
"bungcip.better-toml",
|
||||
"ms-azuretools.vscode-docker",
|
||||
"editorconfig.editorconfig",
|
||||
"eamodio.gitlens",
|
||||
"esbenp.prettier-vscode",
|
||||
"ms-python.vscode-pylance",
|
||||
"ms-python.python",
|
||||
"redhat.vscode-yaml",
|
||||
"ninoseki.vscode-pylens"
|
||||
]
|
||||
}
|
||||
Vendored
+5
-10
@@ -1,12 +1,7 @@
|
||||
{
|
||||
"python.formatting.provider": "black",
|
||||
"python.testing.unittestArgs": [
|
||||
"-v",
|
||||
"-s",
|
||||
"./tests",
|
||||
"-p",
|
||||
"*test_*.py"
|
||||
],
|
||||
"python.testing.pytestEnabled": false,
|
||||
"python.testing.unittestEnabled": true
|
||||
"python.formatting.provider": "black",
|
||||
"python.testing.unittestArgs": ["-v", "-s", "./tests", "-p", "*test_*.py"],
|
||||
"python.testing.pytestEnabled": false,
|
||||
"python.testing.unittestEnabled": true,
|
||||
"python.envFile": "${workspaceFolder}/development_config/.env"
|
||||
}
|
||||
Vendored
+12
@@ -0,0 +1,12 @@
|
||||
{
|
||||
"version": "2.0.0",
|
||||
"tasks": [
|
||||
{
|
||||
"type": "shell",
|
||||
"label": "Docker: Server",
|
||||
"group": "none",
|
||||
"command": ["make start-docker"],
|
||||
"problemMatcher": []
|
||||
}
|
||||
]
|
||||
}
|
||||
+20
-17
@@ -1,17 +1,20 @@
|
||||
list_autos # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:16)
|
||||
upsert_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:27)
|
||||
delete_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:31)
|
||||
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/details.py:12)
|
||||
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/ping.py:9)
|
||||
params # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:16)
|
||||
total_items # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:17)
|
||||
id # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:6)
|
||||
alias # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:7)
|
||||
description # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:8)
|
||||
trigger_variables # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:9)
|
||||
mode # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:10)
|
||||
json_dumps # unused function (/home/ari/Projects/Shortumation/api/src/json_serializer.py:5)
|
||||
logger # unused variable (/home/ari/Projects/Shortumation/api/src/logger.py:16)
|
||||
_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:13)
|
||||
_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:30)
|
||||
_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:54)
|
||||
get_index # unused function (src/api/app.py:43)
|
||||
list_autos # unused function (src/api/routes/automations.py:13)
|
||||
insert_auto # unused function (src/api/routes/automations.py:28)
|
||||
update_auto # unused function (src/api/routes/automations.py:32)
|
||||
delete_auto # unused function (src/api/routes/automations.py:40)
|
||||
read_details # unused function (src/api/routes/details.py:11)
|
||||
read_ping # unused function (src/api/routes/ping.py:10)
|
||||
websocket_endpoint # unused function (src/api/routes/socket.py:13)
|
||||
params # unused variable (src/api/types.py:16)
|
||||
total_items # unused variable (src/api/types.py:17)
|
||||
data # unused variable (src/api/types.py:18)
|
||||
trigger_variables # unused variable (src/automations/types.py:13)
|
||||
trigger # unused variable (src/automations/types.py:15)
|
||||
condition # unused variable (src/automations/types.py:16)
|
||||
action # unused variable (src/automations/types.py:17)
|
||||
_.to_json # unused method (src/automations/types.py: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)
|
||||
+10
-6
@@ -33,15 +33,19 @@ test:
|
||||
|
||||
coverage:
|
||||
$(VENV_BIN)/coverage run -m unittest discover tests
|
||||
$(VENV_BIN)/coverage report -m --fail-under=90
|
||||
$(VENV_BIN)/coverage report -m --fail-under=80
|
||||
|
||||
clean:
|
||||
rm -rf dist *.sqlite *.egg-info build .mypy_cache .coverage
|
||||
find . -type d -name "__pycache__" -exec rm -r {} +
|
||||
find . -type d -name "*tmp" -exec rm -r {} +
|
||||
|
||||
run-local:
|
||||
rm -f web
|
||||
ln -s ../webapp/build web
|
||||
cd ../webapp && yarn build
|
||||
USE_EXAMPLE_REPO=1 $(VENV_BIN)/uvicorn src.app:app --reload
|
||||
start-docker:
|
||||
rm -rf ./development_config
|
||||
tar -xvf ../development_config.tar.gz -C ./
|
||||
cp ./development_config/.env .env.api
|
||||
docker-compose down
|
||||
docker-compose up
|
||||
|
||||
update-vulture-whitelist:
|
||||
$(VENV_BIN)/vulture --make-whitelist src > .vulture_whitelist
|
||||
@@ -0,0 +1,11 @@
|
||||
# Make commands summary
|
||||
|
||||
`make setup`: configure python venv for development
|
||||
|
||||
`make test`: run all unittests
|
||||
|
||||
`make coverage`: run all unittests and report coverage stats
|
||||
|
||||
`make lint`: run all linter and code formatting
|
||||
|
||||
`make start-docker`: starts the api locally
|
||||
@@ -0,0 +1,34 @@
|
||||
version: '3'
|
||||
services:
|
||||
homeassistant:
|
||||
image: "ghcr.io/home-assistant/home-assistant:stable"
|
||||
volumes:
|
||||
- ./development_config/config:/config
|
||||
restart: unless-stopped
|
||||
networks:
|
||||
- main
|
||||
ports:
|
||||
- 8124:8123
|
||||
addon:
|
||||
image: "asosnovsky/shortumation-${ARCH:-amd64}:${BUILD_TAG:-edge}"
|
||||
build:
|
||||
context: "../"
|
||||
dockerfile: "../Dockerfile"
|
||||
args:
|
||||
BUILD_ARCH: ${ARCH:-amd64}
|
||||
BUILD_VERSION: ${BUILD_TAG:-edge}
|
||||
volumes:
|
||||
- "./development_config/config:/config"
|
||||
- "./:/app"
|
||||
- "../docker/bin:/app/bin"
|
||||
- "../webapp/build:/app/web"
|
||||
networks:
|
||||
- main
|
||||
ports:
|
||||
- "8001:8000"
|
||||
env_file:
|
||||
- ./development_config/.env
|
||||
entrypoint: hypercorn src.app:app --reload -b 0.0.0.0:8000
|
||||
|
||||
networks:
|
||||
main:
|
||||
+16
-15
@@ -2,27 +2,28 @@
|
||||
import setuptools # type: ignore
|
||||
|
||||
setuptools.setup(
|
||||
python_requires=">=3.9",
|
||||
python_requires=">=3.10",
|
||||
install_requires=[
|
||||
"PyYAML==6.0",
|
||||
"fastapi==0.70.0",
|
||||
"pydantic==1.8.2",
|
||||
"uvicorn[standard]==0.15.0",
|
||||
"python-decouple==3.5",
|
||||
"fastapi==0.78.0",
|
||||
"pydantic==1.9.1",
|
||||
"hypercorn==0.13.2",
|
||||
"python-decouple==3.6",
|
||||
"websockets==10.3",
|
||||
],
|
||||
extras_require={
|
||||
"dev": [
|
||||
"mypy==0.910",
|
||||
"mypy==0.971",
|
||||
"mypy-extensions==0.4.3",
|
||||
"black==22.3.0",
|
||||
"bandit==1.7.0",
|
||||
"isort==5.9.3",
|
||||
"coverage==5.5",
|
||||
"pre-commit==2.13.0",
|
||||
"vulture==2.3",
|
||||
"types-requests==2.25.6",
|
||||
"types-PyYAML==6.0.7",
|
||||
"requests==2.27.0",
|
||||
"black==22.6.0",
|
||||
"bandit==1.7.4",
|
||||
"isort==5.10.1",
|
||||
"coverage==6.4.2",
|
||||
"pre-commit==2.20.0",
|
||||
"vulture==2.5",
|
||||
"types-requests==2.28.4",
|
||||
"types-PyYAML==6.0.11",
|
||||
"requests==2.28.1",
|
||||
],
|
||||
},
|
||||
)
|
||||
+21
-6
@@ -1,24 +1,27 @@
|
||||
from fastapi import FastAPI
|
||||
from fastapi.middleware.cors import CORSMiddleware
|
||||
from fastapi.responses import RedirectResponse
|
||||
from fastapi.staticfiles import StaticFiles
|
||||
|
||||
from src.automations.manager import AutomationManager
|
||||
from src.env import ORIGIN, ROOT_FOLDER
|
||||
from src.env import API_PREFIX, ORIGIN, ROOT_FOLDER
|
||||
|
||||
from .routes import automations, details, ping
|
||||
from .routes import automations, details, ping, socket
|
||||
|
||||
|
||||
def make_app(automation_mgr: AutomationManager) -> FastAPI:
|
||||
app = FastAPI()
|
||||
if (ROOT_FOLDER / "web").exists():
|
||||
has_web_folder = (ROOT_FOLDER / "web").exists()
|
||||
if has_web_folder:
|
||||
app.mount(
|
||||
"/web",
|
||||
f"{API_PREFIX}/web",
|
||||
StaticFiles(
|
||||
directory=ROOT_FOLDER / "web",
|
||||
html=True,
|
||||
),
|
||||
name="web",
|
||||
)
|
||||
|
||||
else:
|
||||
print("WARN: could not find web folder")
|
||||
app.add_middleware(
|
||||
@@ -29,6 +32,18 @@ def make_app(automation_mgr: AutomationManager) -> FastAPI:
|
||||
allow_headers=["*"],
|
||||
)
|
||||
app.include_router(ping.router, prefix="/ping")
|
||||
app.include_router(automations.make_automation_router(automation_mgr), prefix="/automations")
|
||||
app.include_router(details.make_details_router(automation_mgr.hass_config), prefix="/details")
|
||||
app.include_router(
|
||||
automations.make_automation_router(automation_mgr), prefix=f"{API_PREFIX}/automations"
|
||||
)
|
||||
app.include_router(
|
||||
details.make_details_router(automation_mgr.hass_config), prefix=f"{API_PREFIX}/details"
|
||||
)
|
||||
app.include_router(socket.router, prefix=f"{API_PREFIX}/socket")
|
||||
|
||||
@app.get("/")
|
||||
def get_index():
|
||||
if has_web_folder:
|
||||
return RedirectResponse("/web")
|
||||
return RedirectResponse("/details")
|
||||
|
||||
return app
|
||||
@@ -1,38 +1,46 @@
|
||||
from fastapi import APIRouter, HTTPException
|
||||
|
||||
from src.api.types import (
|
||||
DeleteAutoRequest,
|
||||
ListData,
|
||||
ListParams,
|
||||
UpdateAutoRequest,
|
||||
)
|
||||
from src.api.types import ListData, ListParams, UpdateTags
|
||||
from src.automations.errors import FailedDeletion
|
||||
from src.automations.manager import AutomationManager
|
||||
from src.automations.types import AutomationData
|
||||
from src.automations.types import Automation, ExtenededAutomation
|
||||
from src.errors import ErrorSet
|
||||
|
||||
|
||||
def make_automation_router(automations: AutomationManager) -> APIRouter:
|
||||
router = APIRouter()
|
||||
|
||||
@router.post("/list")
|
||||
def list_autos(body: ListParams) -> ListData[AutomationData]:
|
||||
return ListData(
|
||||
params=body,
|
||||
totalItems=automations.get_total_items(),
|
||||
data=automations.find(
|
||||
offset=body.offset,
|
||||
limit=body.limit,
|
||||
),
|
||||
)
|
||||
def list_autos(body: ListParams) -> ListData[ExtenededAutomation]:
|
||||
try:
|
||||
automations.reload()
|
||||
return ListData(
|
||||
params=body,
|
||||
totalItems=automations.count(),
|
||||
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")
|
||||
def upsert_auto(body: UpdateAutoRequest):
|
||||
automations.update(body.index, body.data)
|
||||
def insert_auto(body: Automation):
|
||||
automations.create(body)
|
||||
|
||||
@router.put("/item")
|
||||
def update_auto(body: ExtenededAutomation):
|
||||
automations.update(body)
|
||||
|
||||
@router.post("/item/tags")
|
||||
def update_tags(body: UpdateTags):
|
||||
automations.update_tags(body.automation_id, body.tags)
|
||||
|
||||
@router.delete("/item")
|
||||
def delete_auto(body: DeleteAutoRequest):
|
||||
def delete_auto(body: ExtenededAutomation):
|
||||
try:
|
||||
automations.delete(body.index)
|
||||
automations.delete(body)
|
||||
except FailedDeletion as err:
|
||||
return HTTPException(
|
||||
status_code=400,
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
from datetime import datetime
|
||||
|
||||
from fastapi import APIRouter
|
||||
|
||||
from src.env import BUILD_VERSION
|
||||
from src.automations.loader import extract_automation_paths
|
||||
from src.env import BUILD_VERSION, HASSIO_TOKEN, HASSIO_WS
|
||||
from src.hass_config import HassConfig
|
||||
|
||||
|
||||
@@ -10,12 +9,17 @@ def make_details_router(hass_config: HassConfig) -> APIRouter:
|
||||
router = APIRouter()
|
||||
|
||||
@router.get("/")
|
||||
def read_ping():
|
||||
def read_details():
|
||||
return {
|
||||
"version": BUILD_VERSION,
|
||||
"hassio_token": HASSIO_TOKEN,
|
||||
"hassio_url": HASSIO_WS,
|
||||
"config": hass_config.get_configuration_path(),
|
||||
"tags": hass_config.get_automation_tags_path(),
|
||||
"autos": hass_config.get_automation_path(),
|
||||
"autos": {
|
||||
config_key: auto_file
|
||||
for config_key, auto_file in extract_automation_paths(hass_config)
|
||||
},
|
||||
}
|
||||
|
||||
return router
|
||||
@@ -0,0 +1,39 @@
|
||||
import asyncio
|
||||
import json
|
||||
|
||||
from fastapi import APIRouter, WebSocket, WebSocketDisconnect
|
||||
|
||||
from src.logger import get_logger
|
||||
from src.ws_redirect import WSRedirector
|
||||
|
||||
router = APIRouter()
|
||||
logger = get_logger(__name__)
|
||||
|
||||
|
||||
@router.websocket("/api/websocket")
|
||||
async def websocket_endpoint(websocket: WebSocket):
|
||||
async def on_message(msg: str):
|
||||
await websocket.send_text(msg)
|
||||
|
||||
conn = WSRedirector(
|
||||
on_message=on_message,
|
||||
)
|
||||
|
||||
async def wait_for_data():
|
||||
while True:
|
||||
try:
|
||||
msg_str = await websocket.receive_text()
|
||||
msg_d = json.loads(msg_str)
|
||||
if msg_d.get("type") != "auth":
|
||||
await conn.send(msg_str)
|
||||
except WebSocketDisconnect:
|
||||
logger.info("Websocket closed.")
|
||||
await conn.close()
|
||||
break
|
||||
|
||||
await websocket.accept()
|
||||
|
||||
await asyncio.gather(
|
||||
conn.start(),
|
||||
wait_for_data(),
|
||||
)
|
||||
+4
-10
@@ -1,11 +1,9 @@
|
||||
from typing import Generic, List, TypeVar
|
||||
from typing import Dict, Generic, List, TypeVar
|
||||
|
||||
from pydantic import BaseModel
|
||||
from pydantic.fields import Field
|
||||
from pydantic.generics import GenericModel
|
||||
|
||||
from src.automations.types import ExtenededAutomationData
|
||||
|
||||
DataT = TypeVar("DataT")
|
||||
|
||||
|
||||
@@ -20,10 +18,6 @@ class ListData(GenericModel, Generic[DataT]):
|
||||
data: List[DataT]
|
||||
|
||||
|
||||
class UpdateAutoRequest(BaseModel):
|
||||
index: int = Field(description="Index of the automation to update")
|
||||
data: ExtenededAutomationData
|
||||
|
||||
|
||||
class DeleteAutoRequest(BaseModel):
|
||||
index: int = Field(description="Index of the automation to update")
|
||||
class UpdateTags(BaseModel):
|
||||
automation_id: str = Field(description="Automation Id to update")
|
||||
tags: Dict[str, str]
|
||||
@@ -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
|
||||
@@ -1,4 +1,11 @@
|
||||
class AutomationLoaderException(Exception):
|
||||
def __init__(self, *args: object, **kwargs) -> None:
|
||||
super().__init__(
|
||||
"".join(map(str, args)) + ",".join((f"{k}={v}" for k, v in kwargs.items())),
|
||||
)
|
||||
|
||||
|
||||
class AttemptingToOverwriteAnIncompatibleFileError(AutomationLoaderException):
|
||||
pass
|
||||
|
||||
|
||||
@@ -8,3 +15,19 @@ class InvalidAutomationFile(AutomationLoaderException):
|
||||
|
||||
class FailedDeletion(AutomationLoaderException):
|
||||
pass
|
||||
|
||||
|
||||
class DBError(Exception):
|
||||
pass
|
||||
|
||||
|
||||
class DBDataError(DBError):
|
||||
pass
|
||||
|
||||
|
||||
class RepeatedAutomationId(DBDataError):
|
||||
pass
|
||||
|
||||
|
||||
class DBNoAutomationFound(DBError):
|
||||
pass
|
||||
+138
-23
@@ -1,38 +1,153 @@
|
||||
from typing import Any, Iterator, Union
|
||||
|
||||
from pydantic.error_wrappers import ValidationError
|
||||
from pathlib import Path
|
||||
from typing import Any, Iterator, Tuple, Union
|
||||
|
||||
from src.json_serializer import normalize_obj
|
||||
from src.logger import get_logger
|
||||
from src.utils import extract_files
|
||||
from src.yaml_serializer import (
|
||||
IncludedYaml,
|
||||
IncludedYamlDir,
|
||||
dump_yaml,
|
||||
load_yaml,
|
||||
)
|
||||
|
||||
from ..hass_config.loader import HassConfig
|
||||
from .errors import InvalidAutomationFile
|
||||
from .types import AutomationMetdata, ExtenededAutomationData
|
||||
from .tags import TagManager
|
||||
from .types import ExtenededAutomation
|
||||
|
||||
logger = get_logger(__file__)
|
||||
|
||||
AUTOMATION_CONFIGURATION_KEY = "automation shortumation"
|
||||
|
||||
|
||||
# Single loader
|
||||
def load_automation(
|
||||
auto_raw: dict,
|
||||
tags: dict,
|
||||
) -> Iterator[ExtenededAutomationData]:
|
||||
"""Converts an automation dictionary loaded directly from the config into
|
||||
several python typed objects
|
||||
def extract_automation_paths(
|
||||
hass_config: HassConfig,
|
||||
) -> Iterator[Tuple[str, str]]:
|
||||
found = False
|
||||
for key, value in extract_automation_keys(hass_config):
|
||||
logger.info(f"Loading automations from '{key}'")
|
||||
found = True
|
||||
if isinstance(value, 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:
|
||||
automations_raw_data (Iterable[dict])
|
||||
automation_path (Path)
|
||||
configuration_key (str)
|
||||
|
||||
Returns:
|
||||
Iterator[ExtenededAutomationData]
|
||||
Iterator[ExtenededAutomation]
|
||||
|
||||
"""
|
||||
try:
|
||||
yield ExtenededAutomationData(
|
||||
metadata=AutomationMetdata.parse_obj(auto_raw),
|
||||
condition=ifempty_or_null_then_list(load_conditions(auto_raw.get("condition", []))),
|
||||
sequence=ifempty_or_null_then_list(load_conditions(auto_raw.get("action", []))),
|
||||
trigger=ifempty_or_null_then_list(normalize_obj(auto_raw.get("trigger", []))),
|
||||
tags=tags,
|
||||
)
|
||||
except ValidationError as err:
|
||||
raise InvalidAutomationFile from err
|
||||
if not automation_path.exists():
|
||||
logger.warning(f"the file {automation_path} does not exists")
|
||||
return
|
||||
if automation_path.is_dir():
|
||||
for f in extract_files(automation_path):
|
||||
yield from load_automation_path(root_path, f, configuration_key, tag_manager)
|
||||
else:
|
||||
try:
|
||||
with automation_path.open("r") as fp:
|
||||
automations = load_yaml(fp, 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):
|
||||
|
||||
+150
-57
@@ -1,68 +1,161 @@
|
||||
from typing import Iterator, List, Optional
|
||||
from pathlib import Path
|
||||
from tempfile import mktemp
|
||||
from typing import Dict, Optional, Union
|
||||
|
||||
from src.automations.errors import FailedDeletion
|
||||
from src.automations.types import AutomationData, ExtenededAutomationData
|
||||
from src.hass_config.loader import HassConfig
|
||||
from src.yaml_serializer import dump_yaml, load_yaml
|
||||
|
||||
from .loader import load_automation
|
||||
from ..errors import ErrorSet
|
||||
from ..logger import get_logger
|
||||
from .db import AutomationDBConnection
|
||||
from .errors import (
|
||||
AttemptingToOverwriteAnIncompatibleFileError,
|
||||
DBError,
|
||||
InvalidAutomationFile,
|
||||
)
|
||||
from .loader import (
|
||||
extract_automation_paths,
|
||||
get_base_automation_key,
|
||||
load_automation_path,
|
||||
)
|
||||
from .tags import TagManager
|
||||
from .types import Automation, ExtenededAutomation
|
||||
|
||||
logger = get_logger(__file__)
|
||||
|
||||
|
||||
class AutomationManager:
|
||||
def __init__(self, hass_config: HassConfig) -> None:
|
||||
self.hass_config = hass_config
|
||||
|
||||
def find(
|
||||
def __init__(
|
||||
self,
|
||||
offset: int = 0,
|
||||
limit: int = 10,
|
||||
) -> Iterator[AutomationData]:
|
||||
tags = self.hass_config.automation_tags
|
||||
for i, auto in enumerate(self.hass_config.automations):
|
||||
if i < offset:
|
||||
continue
|
||||
if i >= offset + limit:
|
||||
break
|
||||
yield from load_automation(auto, tags.get(i, {}))
|
||||
hass_config: HassConfig,
|
||||
db_path: Optional[Path] = None,
|
||||
) -> None:
|
||||
if db_path is None:
|
||||
db_path = Path(mktemp()) # nosec
|
||||
self.hass_config = hass_config
|
||||
self.db = AutomationDBConnection(db_path)
|
||||
self.tag_path = hass_config.get_automation_tags_path()
|
||||
self.tag_manager = TagManager()
|
||||
self.reload_tags()
|
||||
|
||||
def get(self, index: int) -> Optional[AutomationData]:
|
||||
tags = self.hass_config.automation_tags
|
||||
if index >= 0:
|
||||
for i, auto in enumerate(self.hass_config.automations):
|
||||
if i == index:
|
||||
return next(load_automation(auto, tags.get(i, {})))
|
||||
return None
|
||||
def reload_tags(self):
|
||||
if self.tag_path.exists():
|
||||
self.tag_manager = TagManager.load(self.tag_path)
|
||||
|
||||
def update(self, index: int, automation: ExtenededAutomationData):
|
||||
tags = self.hass_config.automation_tags
|
||||
automations: List[dict] = []
|
||||
updated = False
|
||||
for i, orig_auto in enumerate(self.hass_config.automations):
|
||||
if i == index:
|
||||
automations.append(automation.to_primitive())
|
||||
updated = True
|
||||
else:
|
||||
automations.append(orig_auto)
|
||||
if not updated:
|
||||
automations.append(automation.to_primitive())
|
||||
tags[index] = automation.tags
|
||||
self.hass_config.save_automations(automations)
|
||||
self.hass_config.save_tags(tags)
|
||||
def reload(self):
|
||||
self.db.reset()
|
||||
self.reload_tags()
|
||||
errors = []
|
||||
for config_key, p in extract_automation_paths(self.hass_config):
|
||||
try:
|
||||
automations = list(
|
||||
load_automation_path(
|
||||
self.hass_config.root_path,
|
||||
self.hass_config.root_path / p,
|
||||
config_key,
|
||||
self.tag_manager,
|
||||
)
|
||||
)
|
||||
self.db.insert_automations(automations)
|
||||
except InvalidAutomationFile as e:
|
||||
logger.warning(e)
|
||||
errors.append(e)
|
||||
except DBError as e:
|
||||
logger.warning(e)
|
||||
errors.append(e)
|
||||
if len(errors) > 0:
|
||||
raise ErrorSet(*errors)
|
||||
|
||||
def delete(self, index: int):
|
||||
automations: List[dict] = []
|
||||
deleted = False
|
||||
for i, orig_auto in enumerate(self.hass_config.automations):
|
||||
if i == index:
|
||||
deleted = True
|
||||
else:
|
||||
automations.append(orig_auto)
|
||||
if not deleted:
|
||||
raise FailedDeletion("No such automation found")
|
||||
self.hass_config.save_automations(automations)
|
||||
def list(self, offset: int, limit: int):
|
||||
return self.db.list_automations(offset=offset, limit=limit)
|
||||
|
||||
# TODO: improve on this without keeping things in memory
|
||||
def get_total_items(self) -> int:
|
||||
count = 0
|
||||
for i, _ in enumerate(self.hass_config.automations):
|
||||
count = i
|
||||
return count + 1
|
||||
def count(self):
|
||||
return self.db.count_automations()
|
||||
|
||||
def get(self, auto_id: str):
|
||||
return self.db.get_automation(auto_id)
|
||||
|
||||
def create(self, automation: Automation):
|
||||
config_key, config_path = get_base_automation_key(self.hass_config)
|
||||
return self.update(
|
||||
ExtenededAutomation(
|
||||
**automation.dict(),
|
||||
configuration_key=config_key,
|
||||
source_file=config_path,
|
||||
source_file_type="list",
|
||||
),
|
||||
create_if_not_found=True,
|
||||
)
|
||||
|
||||
def update(self, automation: ExtenededAutomation, create_if_not_found: bool = False):
|
||||
automation_path = self.hass_config.root_path / automation.source_file
|
||||
if not automation_path.parent.exists():
|
||||
automation_path.parent.mkdir(parents=True)
|
||||
|
||||
objs: Optional[Union[list, dict]] = None
|
||||
if automation_path.exists():
|
||||
with automation_path.open("r") as fp:
|
||||
objs = load_yaml(fp, 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,11 +4,13 @@ from typing import Dict
|
||||
from src.yaml_serializer import dump_yaml, load_yaml
|
||||
|
||||
|
||||
class TagManager(Dict[int, Dict[str, str]]):
|
||||
class TagManager(Dict[str, Dict[str, str]]):
|
||||
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
|
||||
def load(cls, path: Path):
|
||||
with path.open("r") as fp:
|
||||
return cls(load_yaml(fp))
|
||||
return cls(load_yaml(fp, root_path=path.parent))
|
||||
@@ -1,31 +1,46 @@
|
||||
from typing import Dict, List, Optional, Union
|
||||
import json
|
||||
from pathlib import Path
|
||||
from typing import Dict, List, Literal, Optional, Union
|
||||
|
||||
from pydantic import BaseModel
|
||||
from pydantic.fields import Field
|
||||
|
||||
|
||||
class AutomationMetdata(BaseModel):
|
||||
class BaseAutomation(BaseModel):
|
||||
id: str
|
||||
alias: Optional[str] = None
|
||||
description: Optional[str] = None
|
||||
trigger_variables: Optional[Dict[str, Union[str, int, bool, float]]] = None
|
||||
mode: str = "single"
|
||||
|
||||
|
||||
class AutomationData(BaseModel):
|
||||
metadata: AutomationMetdata
|
||||
trigger: List[dict] = []
|
||||
condition: List[dict] = []
|
||||
sequence: List[dict] = []
|
||||
action: List[dict] = []
|
||||
|
||||
def to_primitive(self):
|
||||
return {
|
||||
**self.metadata.dict(exclude_unset=True, exclude_none=True),
|
||||
"trigger": self.trigger,
|
||||
"condition": self.condition,
|
||||
"action": self.sequence,
|
||||
}
|
||||
return self.dict(exclude_unset=True, exclude_none=True)
|
||||
|
||||
|
||||
class ExtenededAutomationData(AutomationData):
|
||||
class Automation(BaseAutomation):
|
||||
tags: Dict[str, str] = Field(default_factory=dict)
|
||||
|
||||
def to_primitive(self, include_tags: bool = False):
|
||||
out = super().to_primitive()
|
||||
if not include_tags and out.get("tags", None) is not None:
|
||||
del out["tags"]
|
||||
return out
|
||||
|
||||
|
||||
class ExtenededAutomation(Automation):
|
||||
source_file: str
|
||||
source_file_type: Literal["list", "obj"]
|
||||
configuration_key: str
|
||||
|
||||
def to_primitive(self, include_tags: bool = False):
|
||||
out = super().to_primitive(include_tags=include_tags)
|
||||
del out["source_file"]
|
||||
del out["source_file_type"]
|
||||
del out["configuration_key"]
|
||||
return out
|
||||
|
||||
def to_json(self):
|
||||
return json.loads(self.json())
|
||||
@@ -0,0 +1,28 @@
|
||||
import argparse
|
||||
from pathlib import Path
|
||||
from typing import Dict, List
|
||||
|
||||
import yaml
|
||||
|
||||
|
||||
def convert_tags(automations: List[dict], tags: Dict[int, dict]) -> Dict[str, dict]:
|
||||
converted = {}
|
||||
for tagsIdx, tagValues in tags.items():
|
||||
if tagsIdx < len(automations):
|
||||
auto = automations[tagsIdx]
|
||||
converted[auto["id"]] = tagValues
|
||||
else:
|
||||
print(f"WARN: tags index = {tagsIdx} is out of bounds")
|
||||
return converted
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument("-i", dest="input", required=True, type=Path)
|
||||
args = parser.parse_args()
|
||||
auto_path: Path = args.input / "automations.yaml"
|
||||
tags_path: Path = args.input / ".shortumations" / "tags.yaml"
|
||||
automations = yaml.safe_load(auto_path.read_text())
|
||||
tags = yaml.safe_load(tags_path.read_text())
|
||||
converted = convert_tags(automations, tags)
|
||||
tags_path.write_text(yaml.dump(converted))
|
||||
@@ -4,5 +4,8 @@ from decouple import Csv, config
|
||||
|
||||
ROOT_FOLDER = Path(__file__).parent.parent.absolute()
|
||||
BUILD_VERSION = config("BUILD_VERSION", "0.0.0")
|
||||
HASSIO_TOKEN = config("SUPERVISOR_TOKEN", "")
|
||||
HASSIO_WS = config("HASSIO_WS", "ws://supervisor/core/websocket")
|
||||
LOG_LEVEL = config("LOG_LEVEL", "INFO")
|
||||
API_PREFIX = config("API_PREFIX", "")
|
||||
ORIGIN = config("ORIGIN", cast=Csv(), default="*")
|
||||
@@ -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)
|
||||
@@ -10,9 +10,12 @@ def find_hass_config() -> HassConfig:
|
||||
"""Try to find HASS config."""
|
||||
if config("USE_EXAMPLE_REPO", False, cast=bool):
|
||||
print("using USE_EXAMPLE_REPO")
|
||||
from tests.utils import create_copy_of_example_config
|
||||
from tests.utils import (
|
||||
HA_CONFIG2_EXAMPLE,
|
||||
create_copy_of_example_config,
|
||||
)
|
||||
|
||||
path = create_copy_of_example_config()
|
||||
path = create_copy_of_example_config(HA_CONFIG2_EXAMPLE)
|
||||
print("|-> ", path)
|
||||
return HassConfig(path)
|
||||
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
class HassConfigError(Exception):
|
||||
pass
|
||||
|
||||
|
||||
class MissingFile(HassConfigError):
|
||||
pass
|
||||
@@ -1,11 +1,8 @@
|
||||
from pathlib import Path
|
||||
from typing import List, Optional
|
||||
from typing import Optional
|
||||
|
||||
from src.automations.tags import TagManager
|
||||
from src.yaml_serializer import dump_yaml, load_yaml
|
||||
from src.yaml_serializer.types import IncludedYaml
|
||||
|
||||
from .errors import MissingFile
|
||||
from src.yaml_serializer import IncludedYaml, load_yaml
|
||||
|
||||
|
||||
class HassConfig:
|
||||
@@ -15,34 +12,20 @@ class HassConfig:
|
||||
@property
|
||||
def configurations(self) -> dict:
|
||||
with self.get_configuration_path().open("r") as f:
|
||||
return dict(load_yaml(f)) # type: ignore
|
||||
|
||||
@property
|
||||
def automations(self) -> List[dict]:
|
||||
if automation_path := self.get_automation_path():
|
||||
try:
|
||||
with automation_path.open("r") as f:
|
||||
return load_yaml(f) # type: ignore
|
||||
except FileNotFoundError as err:
|
||||
raise MissingFile("automations.yaml") from err
|
||||
return self.configurations["automation"]
|
||||
return dict(load_yaml(f, root_path=self.root_path)) # type: ignore
|
||||
|
||||
@property
|
||||
def automation_tags(self) -> TagManager:
|
||||
tag_path = self.get_automation_tags_path()
|
||||
if not tag_path.exists():
|
||||
tag_path.parent.mkdir(parents=True, exist_ok=True)
|
||||
return TagManager()
|
||||
else:
|
||||
return TagManager.load(tag_path)
|
||||
|
||||
def get_automation_tags_path(self) -> Path:
|
||||
return self.root_path / ".shortumations" / "tags.yaml"
|
||||
def get_backup_automation_file_path(self) -> Path:
|
||||
return self.get_shortumations_path() / "automations.yaml"
|
||||
|
||||
def get_configuration_path(self) -> Path:
|
||||
return self.root_path / "configuration.yaml"
|
||||
|
||||
def get_automation_path(self) -> Optional[Path]:
|
||||
def get_default_automation_path(self) -> Optional[Path]:
|
||||
"""Get Automation Path (if not included in configuration.yaml, in this case the return value is None)
|
||||
|
||||
Returns:
|
||||
@@ -52,18 +35,19 @@ class HassConfig:
|
||||
if "automation" in config:
|
||||
automation_ref = config["automation"]
|
||||
if isinstance(automation_ref, IncludedYaml):
|
||||
return self.root_path / automation_ref.path_str
|
||||
return automation_ref.path
|
||||
else:
|
||||
return None
|
||||
return self.root_path / "automations.yaml"
|
||||
|
||||
def save_automations(self, automations: List[dict]):
|
||||
if automation_path := self.get_automation_path():
|
||||
automation_path.write_text(dump_yaml(automations))
|
||||
else:
|
||||
self.get_configuration_path().write_text(
|
||||
dump_yaml({**self.configurations, "automation": automations})
|
||||
)
|
||||
def get_shortumations_path(self) -> Path:
|
||||
shortumations_path = self.root_path / ".shortumations"
|
||||
if not shortumations_path.exists():
|
||||
shortumations_path.mkdir(parents=True, exist_ok=True)
|
||||
return shortumations_path
|
||||
|
||||
def save_tags(self, tags: TagManager):
|
||||
tags.save(self.get_automation_tags_path())
|
||||
def get_automation_tags_path(self) -> Path:
|
||||
return self.get_shortumations_path() / "tags.yaml"
|
||||
|
||||
def get_configuration_path(self) -> Path:
|
||||
return self.root_path / "configuration.yaml"
|
||||
+9
-11
@@ -2,15 +2,13 @@ import logging
|
||||
|
||||
from src.env import LOG_LEVEL
|
||||
|
||||
if LOG_LEVEL == "DEBUG":
|
||||
logging.basicConfig(level=logging.DEBUG)
|
||||
elif LOG_LEVEL == "INFO":
|
||||
logging.basicConfig(level=logging.INFO)
|
||||
elif LOG_LEVEL == "WARN":
|
||||
logging.basicConfig(level=logging.WARN)
|
||||
elif LOG_LEVEL == "ERROR":
|
||||
logging.basicConfig(level=logging.ERROR)
|
||||
else:
|
||||
logging.basicConfig(level=logging.NOTSET)
|
||||
|
||||
logging.basicConfig(
|
||||
format="%(asctime)s|%(levelname)-4s[%(pathname)s:%(lineno)d@%(funcName)s] %(message)s",
|
||||
datefmt="%Y-%m-%d:%H:%M:%S",
|
||||
level=logging._nameToLevel.get(LOG_LEVEL, logging.INFO),
|
||||
)
|
||||
logger = logging.getLogger()
|
||||
|
||||
|
||||
def get_logger(name: str):
|
||||
return logging.getLogger(name)
|
||||
@@ -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
|
||||
@@ -0,0 +1,64 @@
|
||||
import asyncio
|
||||
import json
|
||||
from typing import Callable, Coroutine, Optional
|
||||
|
||||
from websockets.client import WebSocketClientProtocol, connect
|
||||
from websockets.exceptions import ConnectionClosedOK
|
||||
|
||||
from src.env import HASSIO_TOKEN, HASSIO_WS
|
||||
from src.logger import get_logger
|
||||
|
||||
OnMessage = Callable[[str], Coroutine]
|
||||
logger = get_logger(__name__)
|
||||
|
||||
|
||||
class WSRedirector:
|
||||
def __init__(
|
||||
self,
|
||||
on_message: OnMessage,
|
||||
token: str = HASSIO_TOKEN,
|
||||
host: str = HASSIO_WS,
|
||||
) -> None:
|
||||
self._host = host
|
||||
self._token = token
|
||||
self._on_message = on_message
|
||||
self._client: Optional[WebSocketClientProtocol] = None
|
||||
self._close: bool = False
|
||||
|
||||
@property
|
||||
def is_closed(self):
|
||||
return self._close
|
||||
|
||||
async def send(self, msg: str):
|
||||
if self._client:
|
||||
return await self._client.send(msg)
|
||||
|
||||
async def start(self):
|
||||
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
|
||||
await websocket.send(json.dumps({"type": "auth", "access_token": self._token}))
|
||||
while not self.is_closed:
|
||||
try:
|
||||
msg = await websocket.recv()
|
||||
# logger.debug(f"HA MSG :--> {msg} {self.is_closed}")
|
||||
await self.process_message(msg)
|
||||
except ConnectionClosedOK:
|
||||
pass
|
||||
logger.info("Closing socket...")
|
||||
await websocket.close()
|
||||
logger.info("Closed socket")
|
||||
|
||||
async def process_message(self, msg: str):
|
||||
await self._on_message(msg)
|
||||
|
||||
async def close(self):
|
||||
self._close = True
|
||||
await self._client.close()
|
||||
|
||||
def __del__(self):
|
||||
asyncio.create_task(self.close())
|
||||
@@ -1,41 +1,195 @@
|
||||
import io
|
||||
from typing import Any, TextIO, Union
|
||||
from pathlib import Path
|
||||
from typing import Iterator, NamedTuple, Tuple, Union
|
||||
|
||||
import yaml
|
||||
from yaml.nodes import Node
|
||||
|
||||
from src.yaml_serializer.dumper import YamlSafeDumper
|
||||
from src.yaml_serializer.loader import YamlSafeLoader
|
||||
from .manager import YamlManager
|
||||
|
||||
dump_yaml = YamlManager.dump_yaml
|
||||
load_yaml = YamlManager.load_yaml
|
||||
|
||||
|
||||
def dump_yaml(obj: Any) -> str:
|
||||
"""Convert a python object to a hass-compliant yaml string
|
||||
def load_dir_yaml(folder_or_file: Path) -> Iterator[Tuple[Path, dict | list]]:
|
||||
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:
|
||||
str
|
||||
@YamlManager.as_constructor("!include")
|
||||
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
|
||||
obj,
|
||||
stream,
|
||||
default_flow_style=False,
|
||||
allow_unicode=True,
|
||||
sort_keys=False,
|
||||
Dumper=YamlSafeDumper,
|
||||
)
|
||||
stream.seek(0)
|
||||
return stream.read()
|
||||
|
||||
path: Path # original node path
|
||||
|
||||
@classmethod
|
||||
def to_yaml(cls, representer, node: "IncludedYaml"):
|
||||
return representer.represent_scalar(
|
||||
"!include", 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):
|
||||
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]:
|
||||
"""Load yaml from string using some hass-compliant yaml strings
|
||||
# TODO: add support for these
|
||||
NOT_IMPLEMENTED_SV_MSG = "SECRET VALUE NOT IMPLEMENTED"
|
||||
|
||||
Args:
|
||||
yaml_stream (io.StringIO)
|
||||
|
||||
Returns:
|
||||
List[dict, list]
|
||||
"""
|
||||
return yaml.load(yaml_stream, Loader=YamlSafeLoader) # nosec
|
||||
@YamlManager.as_constructor("!secret")
|
||||
class SecretValue(NamedTuple):
|
||||
name: str
|
||||
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)
|
||||
@@ -1,16 +1,19 @@
|
||||
import yaml
|
||||
from pathlib import Path
|
||||
from typing import Optional, TextIO
|
||||
|
||||
from src.yaml_serializer.types import (
|
||||
IncludedYaml,
|
||||
IncludedYamlDir,
|
||||
SecretValue,
|
||||
)
|
||||
import yaml
|
||||
|
||||
|
||||
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
|
||||
|
||||
|
||||
YamlSafeDumper.add_representer(IncludedYaml, IncludedYaml.to_yaml) # type: ignore
|
||||
YamlSafeDumper.add_representer(SecretValue, SecretValue.to_yaml) # type: ignore
|
||||
YamlSafeDumper.add_representer(IncludedYamlDir, IncludedYamlDir.to_yaml) # type: ignore
|
||||
super().__init__(
|
||||
stream,
|
||||
default_flow_style=False,
|
||||
allow_unicode=True,
|
||||
sort_keys=False,
|
||||
)
|
||||
@@ -1,26 +1,13 @@
|
||||
import yaml
|
||||
from pathlib import Path
|
||||
from typing import Optional, TextIO
|
||||
|
||||
from src.yaml_serializer.types import (
|
||||
IncludedYaml,
|
||||
IncludedYamlDir,
|
||||
SecretValue,
|
||||
)
|
||||
import yaml
|
||||
|
||||
|
||||
class YamlSafeLoader(yaml.SafeLoader):
|
||||
pass
|
||||
# def compose_node(self, parent: yaml.nodes.Node, index: int) -> yaml.nodes.Node: # type: ignore[override]
|
||||
# """Annotate a node with the first line it was seen."""
|
||||
# last_line: int = self.line
|
||||
# node: yaml.nodes.Node = super().compose_node(parent, index) # type: ignore[assignment]
|
||||
# node.__line__ = last_line + 1 # type: ignore[attr-defined]
|
||||
# return node
|
||||
|
||||
|
||||
YamlSafeLoader.add_constructor("!include", IncludedYaml.from_yaml)
|
||||
YamlSafeLoader.add_constructor("!secret", SecretValue.from_yaml)
|
||||
YamlSafeLoader.add_constructor("!env_var", IncludedYamlDir.from_yaml)
|
||||
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)
|
||||
def __init__(self, stream: TextIO, root_path: Optional[Path] = None) -> None:
|
||||
super().__init__(stream)
|
||||
if root_path is None:
|
||||
self.root_path = Path.cwd()
|
||||
else:
|
||||
self.root_path = root_path
|
||||
@@ -0,0 +1,61 @@
|
||||
import io
|
||||
from pathlib import Path
|
||||
from typing import Any, TextIO, Type, TypeVar, Union
|
||||
|
||||
from .dumper import YamlSafeDumper
|
||||
from .loader import YamlSafeLoader
|
||||
from .types import Constructor
|
||||
|
||||
ConstructorT = TypeVar("ConstructorT", bound=Type[Constructor])
|
||||
|
||||
|
||||
class YamlManager:
|
||||
Loader = YamlSafeLoader
|
||||
Dumper = YamlSafeDumper
|
||||
|
||||
@classmethod
|
||||
def as_constructor(cls, *tags: str):
|
||||
def wrapper(constructor: ConstructorT) -> ConstructorT:
|
||||
for tag in tags:
|
||||
cls.Loader.add_constructor(tag, constructor.from_yaml)
|
||||
cls.Dumper.add_representer(constructor, constructor.to_yaml)
|
||||
return constructor
|
||||
|
||||
return wrapper
|
||||
|
||||
@classmethod
|
||||
def load_yaml(cls, yaml_stream: TextIO, root_path: Path) -> Union[dict, list]:
|
||||
"""Load yaml from string using some hass-compliant yaml strings
|
||||
|
||||
Args:
|
||||
yaml_stream (io.StringIO)
|
||||
|
||||
Returns:
|
||||
Union[dict, list]
|
||||
"""
|
||||
loader = cls.Loader(yaml_stream, root_path=root_path)
|
||||
try:
|
||||
return loader.get_single_data()
|
||||
finally:
|
||||
loader.dispose()
|
||||
|
||||
@classmethod
|
||||
def dump_yaml(cls, obj: Any, root_path: Path) -> str:
|
||||
"""Convert a python object to a hass-compliant yaml string
|
||||
|
||||
Args:
|
||||
obj (Any)
|
||||
|
||||
Returns:
|
||||
str
|
||||
"""
|
||||
stream = io.StringIO()
|
||||
dumper = cls.Dumper(stream, root_path=root_path)
|
||||
try:
|
||||
dumper.open()
|
||||
dumper.represent(obj)
|
||||
dumper.close()
|
||||
finally:
|
||||
dumper.dispose()
|
||||
stream.seek(0)
|
||||
return stream.read()
|
||||
@@ -1,61 +1,16 @@
|
||||
from typing import NamedTuple
|
||||
from typing import Protocol
|
||||
|
||||
from yaml.nodes import Node
|
||||
from yaml.representer import BaseRepresenter
|
||||
|
||||
from .dumper import YamlSafeDumper
|
||||
from .loader import YamlSafeLoader
|
||||
|
||||
|
||||
class IncludedYaml(NamedTuple):
|
||||
"""Any time something in the yaml is specified as `include !filepath`
|
||||
this data type will represent it.
|
||||
"""
|
||||
|
||||
path_str: str # original node path
|
||||
class Constructor(Protocol):
|
||||
@classmethod
|
||||
def to_yaml(cls, representer: YamlSafeDumper, node: "Constructor"):
|
||||
...
|
||||
|
||||
@classmethod
|
||||
def to_yaml(cls, representer: BaseRepresenter, node: "IncludedYaml"):
|
||||
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)
|
||||
def from_yaml(cls, constructor: YamlSafeLoader, node: Node):
|
||||
...
|
||||
@@ -0,0 +1,77 @@
|
||||
'1616887975473':
|
||||
Type: HA
|
||||
'1616888026264':
|
||||
Type: HA
|
||||
'1619371298367':
|
||||
Room: Living
|
||||
Type: Button
|
||||
'1620239986670':
|
||||
Room: Kitchen
|
||||
Type: Button
|
||||
'1620324780561':
|
||||
Room: Kitchen
|
||||
Type: Button
|
||||
'1621352850204':
|
||||
Room: Kitchen
|
||||
Type: Button
|
||||
'1622210698281':
|
||||
Room: Kitchen
|
||||
Type: Button
|
||||
'1622769811245':
|
||||
Room: Living
|
||||
Type: Button
|
||||
'1623430479201':
|
||||
Room: Baby
|
||||
Type: Button
|
||||
'1623642118976':
|
||||
Room: Baby
|
||||
Type: Button
|
||||
'1624640900951':
|
||||
Room: Baby
|
||||
Type: Button
|
||||
'1628024070687':
|
||||
Room: Baby
|
||||
Type: Routine
|
||||
'1628024123214':
|
||||
Room: Baby
|
||||
Type: Routine
|
||||
'1628444671951':
|
||||
Room: Office
|
||||
Type: Window
|
||||
'1629309267204':
|
||||
Room: Balcony
|
||||
Type: Door
|
||||
'1629422438707':
|
||||
Type: Routine
|
||||
'1634497376234':
|
||||
Room: Baby
|
||||
Type: Button
|
||||
'1635539262562':
|
||||
Type: Routine
|
||||
'1636428429596':
|
||||
Type: Routine
|
||||
'1639500650865':
|
||||
Room: Bedroom
|
||||
Type: Door
|
||||
'1641617168123':
|
||||
Type: Ensure Power
|
||||
'1648071019802':
|
||||
Type: Ensure Power
|
||||
'1649426399020':
|
||||
Room: Office
|
||||
Type: Motion
|
||||
'1649432254675':
|
||||
Room: Baby
|
||||
Type: Routine
|
||||
'1649726828269':
|
||||
Climate: Heat
|
||||
Type: Climate
|
||||
'1649727810678':
|
||||
Climate: Time
|
||||
Type: Climate
|
||||
'1649820885714':
|
||||
Type: Routine
|
||||
'1649947692702':
|
||||
BadOne: true
|
||||
Room: Bedroom
|
||||
Type: Button
|
||||
File diff suppressed because it is too large.
Load diff
File renamed without changes.
@@ -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
|
||||
+14
@@ -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
|
||||
+14
@@ -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: {}
|
||||
+13
@@ -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
|
||||
+13
@@ -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
|
||||
+7
@@ -0,0 +1,7 @@
|
||||
- id: "mlist1"
|
||||
alias: Merged List 1
|
||||
description: ""
|
||||
trigger: []
|
||||
condition: []
|
||||
action: []
|
||||
mode: single
|
||||
+14
@@ -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
|
||||
Loaded 100 of 453 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user