Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
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 | ||
|
|
eb363acf81 | ||
|
|
415acf06cc | ||
|
|
0325b8eec3 | ||
|
|
d184871217 | ||
|
|
0499feb61d | ||
|
|
0030920558 | ||
|
|
f62f139f55 | ||
|
|
2d80798ccb | ||
|
|
3da5e1c88c | ||
|
|
7df34bdf7f | ||
|
|
554528ace0 | ||
|
|
298a233a5f | ||
|
|
cbbc099384 | ||
|
|
48decb2e16 | ||
|
|
7afda7eb1c | ||
|
|
f6270c94f3 | ||
|
|
952dcba3ac | ||
|
|
25770e1c1d | ||
|
|
029a2dac9f | ||
|
|
8732ab8dda | ||
|
|
42ab6e5913 | ||
|
|
c28796872f | ||
|
|
40690293a8 | ||
|
|
621f43e5c8 | ||
|
|
f3496f9d32 | ||
|
|
409cf2b21a | ||
|
|
ef92261666 | ||
|
|
83edaf9bf8 | ||
|
|
f8efd895a9 | ||
|
|
da0d153b81 | ||
|
|
bcd262dd46 | ||
|
|
ea47b3e1eb | ||
|
|
5192c09681 |
No files matched your search
+9
-1
@@ -1,4 +1,12 @@
|
|||||||
webapp/node_modules
|
webapp/node_modules
|
||||||
webapp/build
|
|
||||||
webapp/.storybook
|
webapp/.storybook
|
||||||
webapp/.vscode
|
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: ''
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
|
||||||
+93
-13
@@ -1,22 +1,71 @@
|
|||||||
name: Manual Build
|
name: Build
|
||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
inputs:
|
inputs:
|
||||||
version:
|
version:
|
||||||
type: string
|
type: string
|
||||||
required: true
|
description: "Version Number"
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
jobs:
|
jobs:
|
||||||
|
metadata:
|
||||||
build:
|
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
name: Build & Publish ${{ github.event.inputs.version }} / ${{ matrix.arch }}
|
name: Metadata
|
||||||
strategy:
|
outputs:
|
||||||
matrix:
|
version: ${{ steps.version.outputs.VERSION }}
|
||||||
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
|
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Check out repository
|
- name: Check out repository
|
||||||
uses: actions/checkout@v3
|
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 }}
|
||||||
|
|
||||||
|
deploy:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
name: Build & Publish ${{ matrix.arch }} / ${{ needs.metadata.outputs.version }}
|
||||||
|
if: github.event_name != 'pull_request'
|
||||||
|
needs:
|
||||||
|
- metadata
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
arch:
|
||||||
|
- "aarch64"
|
||||||
|
- "amd64"
|
||||||
|
- "armhf"
|
||||||
|
- "armv7"
|
||||||
|
- "i386"
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
- name: Setup node
|
||||||
|
uses: actions/setup-node@v3
|
||||||
|
with:
|
||||||
|
node-version: 16
|
||||||
|
cache: "yarn"
|
||||||
|
cache-dependency-path: webapp/yarn.lock
|
||||||
|
|
||||||
- name: Login to DockerHub
|
- name: Login to DockerHub
|
||||||
uses: docker/login-action@v2.0.0
|
uses: docker/login-action@v2.0.0
|
||||||
@@ -24,11 +73,42 @@ jobs:
|
|||||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
|
|
||||||
- name: Build & Push to Dockerhub
|
- name: "Save version number"
|
||||||
uses: home-assistant/builder@2022.03.1
|
run: echo "REACT_APP_BUILD_VERSION=${{ needs.metadata.outputs.version }}" > ./webapp/.env.production
|
||||||
|
|
||||||
|
- name: "Build Web"
|
||||||
|
run: cd webapp && yarn install && yarn build
|
||||||
|
|
||||||
|
- name: ${{ matrix.arch }} / ${{ needs.metadata.outputs.version }}
|
||||||
|
uses: home-assistant/builder@2022.07.0
|
||||||
with:
|
with:
|
||||||
args: |
|
args: |
|
||||||
--${{ matrix.arch }} \
|
--${{ matrix.arch }} \
|
||||||
--version ${{ github.event.inputs.version }} \
|
--no-latest \
|
||||||
--additional-tag edge \
|
--version ${{ needs.metadata.outputs.version }} \
|
||||||
--target .
|
--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:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [ main ]
|
branches: [ "main" ]
|
||||||
pull_request:
|
pull_request:
|
||||||
# The branches below must be a subset of the branches above
|
# The branches below must be a subset of the branches above
|
||||||
branches: [ main ]
|
branches: [ "main" ]
|
||||||
schedule:
|
schedule:
|
||||||
- cron: '29 23 * * 0'
|
- cron: '26 21 * * 2'
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
analyze:
|
analyze:
|
||||||
@@ -34,14 +34,9 @@ jobs:
|
|||||||
matrix:
|
matrix:
|
||||||
language: [ 'javascript', 'python' ]
|
language: [ 'javascript', 'python' ]
|
||||||
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
|
# 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:
|
steps:
|
||||||
- name: Cancel Previous Runs
|
|
||||||
uses: styfle/cancel-workflow-action@0.9.1
|
|
||||||
with:
|
|
||||||
access_token: ${{ github.token }}
|
|
||||||
|
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
|
|
||||||
@@ -53,7 +48,10 @@ jobs:
|
|||||||
# If you wish to specify custom queries, you can do so here or in a config file.
|
# 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.
|
# 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.
|
# 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).
|
# 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)
|
# If this step fails, then you should remove it and run the build manually (see below)
|
||||||
@@ -61,15 +59,14 @@ jobs:
|
|||||||
uses: github/codeql-action/autobuild@v2
|
uses: github/codeql-action/autobuild@v2
|
||||||
|
|
||||||
# ℹ️ Command-line programs to run using the OS shell.
|
# ℹ️ 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
|
# 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
|
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
|
||||||
# uses a compiled language
|
|
||||||
|
|
||||||
#- run: |
|
# - run: |
|
||||||
# make bootstrap
|
# echo "Run, Build Application using script"
|
||||||
# make release
|
# ./location_of_script_within_repo/buildscript.sh
|
||||||
|
|
||||||
- name: Perform CodeQL Analysis
|
- name: Perform CodeQL Analysis
|
||||||
uses: github/codeql-action/analyze@v2
|
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,77 +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)
|
|
||||||
|
|
||||||
build:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
name: Build & Publish ${{ matrix.arch }}
|
|
||||||
needs:
|
|
||||||
- metadata
|
|
||||||
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 }} \
|
|
||||||
--target .
|
|
||||||
|
|
||||||
publish:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
needs:
|
|
||||||
- metadata
|
|
||||||
- build
|
|
||||||
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,
|
|
||||||
body: process.env.CHANGELOG,
|
|
||||||
});
|
|
||||||
+37
-40
@@ -1,80 +1,77 @@
|
|||||||
name: Test
|
name: Commit Tests
|
||||||
env:
|
|
||||||
MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs"
|
|
||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
|
||||||
push:
|
push:
|
||||||
branch: [main]
|
branches:
|
||||||
|
- main
|
||||||
|
paths:
|
||||||
|
- "webapp"
|
||||||
|
- "api"
|
||||||
pull_request:
|
pull_request:
|
||||||
branches: [main]
|
branches:
|
||||||
|
- main
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
metadata:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
name: Build Test for ${{ matrix.arch }}
|
name: Metadata
|
||||||
strategy:
|
outputs:
|
||||||
matrix:
|
version: ${{ steps.version.outputs.VERSION }}
|
||||||
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
|
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Cancel Previous Runs
|
|
||||||
uses: styfle/cancel-workflow-action@0.9.1
|
|
||||||
with:
|
|
||||||
all_but_latest: true
|
|
||||||
access_token: ${{ github.token }}
|
|
||||||
|
|
||||||
- name: Check out repository
|
- name: Check out repository
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
|
|
||||||
- name: Login to DockerHub
|
|
||||||
uses: docker/login-action@v2.0.0
|
|
||||||
with:
|
with:
|
||||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
fetch-depth: 0
|
||||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
- name: Get Version
|
||||||
|
id: version
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
echo ::set-output name=VERSION::$(git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')
|
||||||
|
- name: ${{ steps.version.outputs.VERSION }}
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
echo ${{ steps.version.outputs.VERSION }}
|
||||||
|
|
||||||
|
|
||||||
- name: ${{ matrix.arch }}
|
|
||||||
uses: home-assistant/builder@2022.03.1
|
|
||||||
with:
|
|
||||||
args: |
|
|
||||||
--test \
|
|
||||||
--${{ matrix.arch }} \
|
|
||||||
--target .
|
|
||||||
python:
|
python:
|
||||||
name: "Python Tests"
|
name: "Python Tests"
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
needs:
|
||||||
|
- metadata
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
action: [lint, coverage, security-checks]
|
action:
|
||||||
|
- lint
|
||||||
|
- coverage
|
||||||
|
- security-checks
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v3
|
uses: actions/setup-python@v4
|
||||||
with:
|
with:
|
||||||
python-version: 3.9
|
python-version: 3.9
|
||||||
- name: Install Dependencies
|
- name: Install Dependencies
|
||||||
run: cd api && make setup
|
run: cd api && make setup
|
||||||
- name: Echo dependencies
|
- name: Echo dependencies
|
||||||
run: cd api && ./venv/bin/pip freeze
|
run: cd api && ./venv/bin/pip freeze
|
||||||
- name: Running ${{ matrix.action }}
|
- name: ${{ needs.metadata.outputs.version }} / ${{ matrix.action }}
|
||||||
run: cd api && make ${{ matrix.action }}
|
run: cd api && make ${{ matrix.action }}
|
||||||
|
|
||||||
nodejs:
|
nodejs:
|
||||||
name: "NodeJs Tests"
|
name: "NodeJs Tests"
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
needs:
|
||||||
|
- metadata
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
action: [test:ci, tsc:ci, build]
|
action:
|
||||||
|
- "test:ci"
|
||||||
|
- "tsc:ci"
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- uses: actions/setup-node@v3
|
- uses: actions/setup-node@v3
|
||||||
with:
|
with:
|
||||||
node-version: 16
|
node-version: 16
|
||||||
cache: 'yarn'
|
cache: "yarn"
|
||||||
cache-dependency-path: webapp/yarn.lock
|
cache-dependency-path: webapp/yarn.lock
|
||||||
- name: Install Dependencies
|
- name: Install Dependencies
|
||||||
run: cd webapp && yarn install
|
run: cd webapp && yarn install
|
||||||
- name: Run Tests
|
- name: ${{ needs.metadata.outputs.version }} / ${{ matrix.action }}
|
||||||
run: cd webapp && yarn ${{ matrix.action }}
|
run: cd webapp && yarn ${{ matrix.action }}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1 +1,4 @@
|
|||||||
.vscode/*.log
|
.vscode/*.log
|
||||||
|
webapp/src/types/validators/index.test.ts
|
||||||
|
example/containerized/config/
|
||||||
|
example/containerized/.env
|
||||||
Vendored
+4
-1
@@ -8,5 +8,8 @@
|
|||||||
"*test_*.py"
|
"*test_*.py"
|
||||||
],
|
],
|
||||||
"python.testing.pytestEnabled": false,
|
"python.testing.pytestEnabled": false,
|
||||||
"python.testing.unittestEnabled": true
|
"python.testing.unittestEnabled": true,
|
||||||
|
"yaml.schemas": {
|
||||||
|
"https://json.schemastore.org/github-action.json": ".github/workflows/*.yml"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+111
-2
@@ -1,4 +1,114 @@
|
|||||||
# Changelog
|
# Changelog 
|
||||||
|
|
||||||
|
## [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
|
||||||
|
|
||||||
|
- Better YAML
|
||||||
|
- Rewrote yaml parser/loader to use pyyaml and safe mode
|
||||||
|
- Cleaned up description vs alias
|
||||||
|
|
||||||
|
## [0.1.12] - Less Intense Error Messages
|
||||||
|
|
||||||
|
- Added more node-based errors (this way it's easier to see where validations failed)
|
||||||
|
- 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
|
||||||
|
- Trigger.platform==time will now have the .at property better supported
|
||||||
|
|
||||||
## [0.1.9] - Fixed up invalid types for various triggers
|
## [0.1.9] - Fixed up invalid types for various triggers
|
||||||
|
|
||||||
@@ -50,6 +160,5 @@
|
|||||||
- Instalable verion via github
|
- 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/),
|
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).
|
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||||
+24
-27
@@ -1,41 +1,36 @@
|
|||||||
# <--- Build Args -->
|
# <--- Pre-Build Args -->
|
||||||
ARG BUILD_ARCH
|
ARG BUILD_ARCH
|
||||||
|
|
||||||
|
# <--- Main Image -->
|
||||||
|
FROM python:3.9.13-slim-buster
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
# <--- Post-Build Args -->
|
||||||
ARG BUILD_VERSION
|
ARG BUILD_VERSION
|
||||||
|
|
||||||
# <--- Image Setup -->
|
# <--- Environment Variables -->
|
||||||
FROM homeassistant/${BUILD_ARCH}-base-python:3.9-alpine3.14
|
ENV BUILD_VERSION $BUILD_VERSION
|
||||||
WORKDIR /app
|
|
||||||
|
|
||||||
# <--- System Wide Dependencies -->
|
# <--- System Wide Dependencies -->
|
||||||
ENV LANG C.UTF-8
|
ENV LANG C.UTF-8
|
||||||
RUN apk add --no-cache \
|
RUN apt-get update -y && \
|
||||||
nodejs \
|
apt-get install -y gcc git build-essential libtool automake curl
|
||||||
npm \
|
|
||||||
build-base \
|
# <--- Scripts -->
|
||||||
python3-dev
|
COPY docker/bin /app/bin
|
||||||
RUN pip install -U wheel setuptools pip && \
|
|
||||||
npm i -g yarn
|
# <--- PREP -->
|
||||||
|
RUN /app/bin/prep.sh
|
||||||
|
|
||||||
# <--- Python Dependencies -->
|
# <--- Python Dependencies -->
|
||||||
COPY api/setup.py /app/setup.py
|
COPY api/setup.py /app/setup.py
|
||||||
RUN pip install . /app
|
|
||||||
|
|
||||||
# <--- Webapp Build -->
|
# <--- BUILD -->
|
||||||
COPY webapp/ /app/web-builder
|
RUN /app/bin/build.sh /app
|
||||||
RUN cd /app/web-builder && \
|
|
||||||
yarn && \
|
|
||||||
yarn build && \
|
|
||||||
cp -r /app/web-builder/build /app/web && \
|
|
||||||
rm -rf /app/web-builder
|
|
||||||
|
|
||||||
# <--- Api Code -->
|
# <--- Api Code -->
|
||||||
COPY api/src /app/src
|
COPY api/src /app/src
|
||||||
COPY run.sh /app/run.sh
|
COPY webapp/build /app/web
|
||||||
RUN chmod +x /app/run.sh
|
|
||||||
|
|
||||||
# <--- Environment Variables -->
|
|
||||||
ENV HASSIO_TOKEN ""
|
|
||||||
ENV BUILD_VERSION $BUILD_VERSION
|
|
||||||
|
|
||||||
# <--- Ports -->
|
# <--- Ports -->
|
||||||
EXPOSE 8000
|
EXPOSE 8000
|
||||||
@@ -43,7 +38,9 @@ EXPOSE 8000
|
|||||||
# <--- Final -->
|
# <--- Final -->
|
||||||
LABEL \
|
LABEL \
|
||||||
io.hass.type="addon" \
|
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,27 +1,40 @@
|
|||||||
# Shortumation
|
# Shortumation 
|
||||||
|
|
||||||
A better way to write automations in home-assistant without having to install and run a seperate automation engine!
|
[](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml) [](https://github.com/asosnovsky/Shortumation/actions/workflows/build.yml)
|
||||||
|
|
||||||

|
| | 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/).
|
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
|
||||||
- [X] View your automations & scripts in a visual graph
|
- Sort and organize your home-assistant automations using tags!
|
||||||
- [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
|
|
||||||
|
|
||||||
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
|
## Installation
|
||||||
|
|
||||||
@@ -33,23 +46,32 @@ Add the repository URL under **Supervisor → Add-on store → ⋮ → Manage ad
|
|||||||
|
|
||||||
It should now appear in your `Add-on Store` and you should be able to install it!
|
It should now appear in your `Add-on Store` and you should be able to install it!
|
||||||
|
|
||||||
### Containerized
|
### Containerized or HA Core
|
||||||
|
|
||||||
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.
|
Please note that this way of using Shortumation is **not future proof**.
|
||||||
|
|
||||||
If this warning does not scare you or you still want to try things out, then take a look at the example [docker-compose.yaml](example/containerized/docker-compose.yaml).
|
|
||||||
|
|
||||||
|
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).
|
||||||
|
|
||||||
## FAQ
|
## FAQ
|
||||||
|
|
||||||
**How is this different from Node-Red?**
|
**How is this different from Node-Red?**
|
||||||
|
|
||||||
> Node-Red is both an execution engine and an automation editor, which means that in order for 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?**
|
**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?**
|
**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.
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
LOG_LEVEL=DEBUG
|
||||||
|
SUPERVISOR_TOKEN=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiI2ZjJiYzM2MjkyOWM0OGM1Yjg1NzgxNDEzNTRkNDk0NSIsImlhdCI6MTY1OTExMTExMCwiZXhwIjoxOTc0NDcxMTEwfQ.Q5Ei1a9BXyB4-whrPGoko6CKavOOloFC1fbP-jAYBpU
|
||||||
|
HASSIO_WS=ws://homeassistant:8123/api/websocket
|
||||||
@@ -143,3 +143,4 @@ dmypy.json
|
|||||||
cython_debug/
|
cython_debug/
|
||||||
|
|
||||||
# End of https://www.toptal.com/developers/gitignore/api/python
|
# 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
+12
@@ -0,0 +1,12 @@
|
|||||||
|
{
|
||||||
|
"version": "2.0.0",
|
||||||
|
"tasks": [
|
||||||
|
{
|
||||||
|
"type": "shell",
|
||||||
|
"label": "Docker: Server",
|
||||||
|
"group": "none",
|
||||||
|
"command": ["make start-docker"],
|
||||||
|
"problemMatcher": []
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
+13
-16
@@ -1,17 +1,14 @@
|
|||||||
list_autos # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:16)
|
list_autos # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:17)
|
||||||
upsert_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:27)
|
upsert_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:28)
|
||||||
delete_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:31)
|
delete_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:32)
|
||||||
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/details.py:12)
|
read_details # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/details.py:10)
|
||||||
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/ping.py:9)
|
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/ping.py:10)
|
||||||
params # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:16)
|
websocket_endpoint # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/socket.py:9)
|
||||||
total_items # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:17)
|
params # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:18)
|
||||||
id # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:6)
|
total_items # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:19)
|
||||||
alias # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:7)
|
id # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:8)
|
||||||
description # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:8)
|
alias # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:9)
|
||||||
trigger_variables # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:9)
|
description # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:10)
|
||||||
mode # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:10)
|
trigger_variables # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:11)
|
||||||
|
mode # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:12)
|
||||||
json_dumps # unused function (/home/ari/Projects/Shortumation/api/src/json_serializer.py:5)
|
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)
|
|
||||||
+7
-5
@@ -33,14 +33,16 @@ test:
|
|||||||
|
|
||||||
coverage:
|
coverage:
|
||||||
$(VENV_BIN)/coverage run -m unittest discover tests
|
$(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:
|
clean:
|
||||||
rm -rf dist *.sqlite *.egg-info build .mypy_cache .coverage
|
rm -rf dist *.sqlite *.egg-info build .mypy_cache .coverage
|
||||||
find . -type d -name "__pycache__" -exec rm -r {} +
|
find . -type d -name "__pycache__" -exec rm -r {} +
|
||||||
find . -type d -name "*tmp" -exec rm -r {} +
|
find . -type d -name "*tmp" -exec rm -r {} +
|
||||||
|
|
||||||
run-local:
|
start-docker:
|
||||||
rm -f web
|
rm -rf ./development_config
|
||||||
ln -s ../webapp/build web
|
tar -xvf ../development_config.tar.gz -C ./
|
||||||
USE_EXAMPLE_REPO=1 $(VENV_BIN)/uvicorn src.app:app --reload
|
cp ./development_config/.env .env.api
|
||||||
|
docker-compose down
|
||||||
|
docker-compose up
|
||||||
@@ -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
-14
@@ -4,24 +4,26 @@ import setuptools # type: ignore
|
|||||||
setuptools.setup(
|
setuptools.setup(
|
||||||
python_requires=">=3.9",
|
python_requires=">=3.9",
|
||||||
install_requires=[
|
install_requires=[
|
||||||
"ruamel.yaml==0.17.17",
|
"PyYAML==6.0",
|
||||||
"fastapi==0.70.0",
|
"fastapi==0.78.0",
|
||||||
"pydantic==1.8.2",
|
"pydantic==1.9.1",
|
||||||
"uvicorn[standard]==0.15.0",
|
"hypercorn==0.13.2",
|
||||||
"python-decouple==3.5",
|
"python-decouple==3.6",
|
||||||
|
"websockets==10.3"
|
||||||
],
|
],
|
||||||
extras_require={
|
extras_require={
|
||||||
"dev": [
|
"dev": [
|
||||||
"mypy==0.910",
|
"mypy==0.971",
|
||||||
"mypy-extensions==0.4.3",
|
"mypy-extensions==0.4.3",
|
||||||
"black==22.3.0",
|
"black==22.6.0",
|
||||||
"bandit==1.7.0",
|
"bandit==1.7.4",
|
||||||
"isort==5.9.3",
|
"isort==5.10.1",
|
||||||
"coverage==5.5",
|
"coverage==6.4.2",
|
||||||
"pre-commit==2.13.0",
|
"pre-commit==2.20.0",
|
||||||
"vulture==2.3",
|
"vulture==2.5",
|
||||||
"types-requests==2.25.6",
|
"types-requests==2.28.4",
|
||||||
"requests==2.27.0",
|
"types-PyYAML==6.0.11",
|
||||||
|
"requests==2.28.1",
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
+10
-5
@@ -3,16 +3,16 @@ from fastapi.middleware.cors import CORSMiddleware
|
|||||||
from fastapi.staticfiles import StaticFiles
|
from fastapi.staticfiles import StaticFiles
|
||||||
|
|
||||||
from src.automations.manager import AutomationManager
|
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:
|
def make_app(automation_mgr: AutomationManager) -> FastAPI:
|
||||||
app = FastAPI()
|
app = FastAPI()
|
||||||
if (ROOT_FOLDER / "web").exists():
|
if (ROOT_FOLDER / "web").exists():
|
||||||
app.mount(
|
app.mount(
|
||||||
"/web",
|
f"{API_PREFIX}/web",
|
||||||
StaticFiles(
|
StaticFiles(
|
||||||
directory=ROOT_FOLDER / "web",
|
directory=ROOT_FOLDER / "web",
|
||||||
html=True,
|
html=True,
|
||||||
@@ -29,6 +29,11 @@ def make_app(automation_mgr: AutomationManager) -> FastAPI:
|
|||||||
allow_headers=["*"],
|
allow_headers=["*"],
|
||||||
)
|
)
|
||||||
app.include_router(ping.router, prefix="/ping")
|
app.include_router(ping.router, prefix="/ping")
|
||||||
app.include_router(automations.make_automation_router(automation_mgr), prefix="/automations")
|
app.include_router(
|
||||||
app.include_router(details.make_details_router(automation_mgr.hass_config), prefix="/details")
|
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")
|
||||||
return app
|
return app
|
||||||
@@ -5,6 +5,7 @@ from src.api.types import (
|
|||||||
ListData,
|
ListData,
|
||||||
ListParams,
|
ListParams,
|
||||||
UpdateAutoRequest,
|
UpdateAutoRequest,
|
||||||
|
UpdateTags,
|
||||||
)
|
)
|
||||||
from src.automations.errors import FailedDeletion
|
from src.automations.errors import FailedDeletion
|
||||||
from src.automations.manager import AutomationManager
|
from src.automations.manager import AutomationManager
|
||||||
@@ -29,6 +30,10 @@ def make_automation_router(automations: AutomationManager) -> APIRouter:
|
|||||||
def upsert_auto(body: UpdateAutoRequest):
|
def upsert_auto(body: UpdateAutoRequest):
|
||||||
automations.update(body.index, body.data)
|
automations.update(body.index, body.data)
|
||||||
|
|
||||||
|
@router.post("/item/tags")
|
||||||
|
def update_tags(body: UpdateTags):
|
||||||
|
automations.update_tags(body.automation_id, body.tags)
|
||||||
|
|
||||||
@router.delete("/item")
|
@router.delete("/item")
|
||||||
def delete_auto(body: DeleteAutoRequest):
|
def delete_auto(body: DeleteAutoRequest):
|
||||||
try:
|
try:
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
from datetime import datetime
|
|
||||||
|
|
||||||
from fastapi import APIRouter
|
from fastapi import APIRouter
|
||||||
|
|
||||||
from src.env import BUILD_VERSION
|
from src.env import BUILD_VERSION, HASSIO_TOKEN, HASSIO_WS
|
||||||
from src.hass_config import HassConfig
|
from src.hass_config import HassConfig
|
||||||
|
|
||||||
|
|
||||||
@@ -10,9 +8,11 @@ def make_details_router(hass_config: HassConfig) -> APIRouter:
|
|||||||
router = APIRouter()
|
router = APIRouter()
|
||||||
|
|
||||||
@router.get("/")
|
@router.get("/")
|
||||||
def read_ping():
|
def read_details():
|
||||||
return {
|
return {
|
||||||
"version": BUILD_VERSION,
|
"version": BUILD_VERSION,
|
||||||
|
"hassio_token": HASSIO_TOKEN,
|
||||||
|
"hassio_url": HASSIO_WS,
|
||||||
"config": hass_config.get_configuration_path(),
|
"config": hass_config.get_configuration_path(),
|
||||||
"tags": hass_config.get_automation_tags_path(),
|
"tags": hass_config.get_automation_tags_path(),
|
||||||
"autos": hass_config.get_automation_path(),
|
"autos": hass_config.get_automation_path(),
|
||||||
|
|||||||
@@ -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(),
|
||||||
|
)
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
from typing import Generic, List, TypeVar
|
from typing import Dict, Generic, List, TypeVar
|
||||||
|
|
||||||
from pydantic import BaseModel
|
from pydantic import BaseModel
|
||||||
from pydantic.fields import Field
|
from pydantic.fields import Field
|
||||||
@@ -25,5 +25,10 @@ class UpdateAutoRequest(BaseModel):
|
|||||||
data: ExtenededAutomationData
|
data: ExtenededAutomationData
|
||||||
|
|
||||||
|
|
||||||
|
class UpdateTags(BaseModel):
|
||||||
|
automation_id: str = Field(description="Automation Id to update")
|
||||||
|
tags: Dict[str, str]
|
||||||
|
|
||||||
|
|
||||||
class DeleteAutoRequest(BaseModel):
|
class DeleteAutoRequest(BaseModel):
|
||||||
index: int = Field(description="Index of the automation to update")
|
index: int = Field(description="Index of the automation to update")
|
||||||
@@ -1,5 +1,8 @@
|
|||||||
class AutomationLoaderException(Exception):
|
class AutomationLoaderException(Exception):
|
||||||
pass
|
def __init__(self, *args: object, **kwargs) -> None:
|
||||||
|
super().__init__(
|
||||||
|
"".join(map(str, args)) + ",".join((f"{k}={v}" for k, v in kwargs.items())),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class InvalidAutomationFile(AutomationLoaderException):
|
class InvalidAutomationFile(AutomationLoaderException):
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
from typing import Iterator, List, Optional
|
from typing import Dict, Iterator, List, Optional
|
||||||
|
|
||||||
from src.automations.errors import FailedDeletion
|
from src.automations.errors import FailedDeletion, InvalidAutomationFile
|
||||||
from src.automations.types import AutomationData, ExtenededAutomationData
|
from src.automations.types import AutomationData, ExtenededAutomationData
|
||||||
from src.hass_config.loader import HassConfig
|
from src.hass_config.loader import HassConfig
|
||||||
|
|
||||||
@@ -22,32 +22,40 @@ class AutomationManager:
|
|||||||
continue
|
continue
|
||||||
if i >= offset + limit:
|
if i >= offset + limit:
|
||||||
break
|
break
|
||||||
yield from load_automation(auto, tags.get(i, {}))
|
yield from load_automation(auto, tags.get(auto.get("id", ""), {}))
|
||||||
|
|
||||||
def get(self, index: int) -> Optional[AutomationData]:
|
def get(self, index: int) -> Optional[ExtenededAutomationData]:
|
||||||
tags = self.hass_config.automation_tags
|
tags = self.hass_config.automation_tags
|
||||||
if index >= 0:
|
if index >= 0:
|
||||||
for i, auto in enumerate(self.hass_config.automations):
|
for i, auto in enumerate(self.hass_config.automations):
|
||||||
|
if not isinstance(auto, dict):
|
||||||
|
raise InvalidAutomationFile(automation_index=i)
|
||||||
if i == index:
|
if i == index:
|
||||||
return next(load_automation(auto, tags.get(i, {})))
|
return next(load_automation(auto, tags.get(auto.get("id", ""), {})))
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def update(self, index: int, automation: ExtenededAutomationData):
|
def update(self, index: int, automation: ExtenededAutomationData):
|
||||||
tags = self.hass_config.automation_tags
|
tags = self.hass_config.automation_tags
|
||||||
automations: List[dict] = []
|
automations: List[dict] = []
|
||||||
updated = False
|
updated_index: Optional[int] = None
|
||||||
for i, orig_auto in enumerate(self.hass_config.automations):
|
for i, orig_auto in enumerate(self.hass_config.automations):
|
||||||
if i == index:
|
if i == index:
|
||||||
automations.append(automation.to_primitive())
|
automations.append(automation.to_primitive())
|
||||||
updated = True
|
updated_index = i
|
||||||
else:
|
else:
|
||||||
automations.append(orig_auto)
|
automations.append(orig_auto)
|
||||||
if not updated:
|
if updated_index is None:
|
||||||
automations.append(automation.to_primitive())
|
automations.append(automation.to_primitive())
|
||||||
tags[index] = automation.tags
|
updated_index = len(automations) - 1
|
||||||
|
tags[automation.metadata.id] = automation.tags
|
||||||
self.hass_config.save_automations(automations)
|
self.hass_config.save_automations(automations)
|
||||||
self.hass_config.save_tags(tags)
|
self.hass_config.save_tags(tags)
|
||||||
|
|
||||||
|
def update_tags(self, auto_id: str, tags: Dict[str, str]):
|
||||||
|
autos_tags = self.hass_config.automation_tags
|
||||||
|
autos_tags[auto_id] = tags
|
||||||
|
self.hass_config.save_tags(autos_tags)
|
||||||
|
|
||||||
def delete(self, index: int):
|
def delete(self, index: int):
|
||||||
automations: List[dict] = []
|
automations: List[dict] = []
|
||||||
deleted = False
|
deleted = False
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ from typing import Dict
|
|||||||
from src.yaml_serializer import dump_yaml, load_yaml
|
from src.yaml_serializer import dump_yaml, load_yaml
|
||||||
|
|
||||||
|
|
||||||
class TagManager(Dict[int, Dict[str, str]]):
|
class TagManager(Dict[str, Dict[str, str]]):
|
||||||
def save(self, path: Path):
|
def save(self, path: Path):
|
||||||
path.write_text(dump_yaml(dict(self)))
|
path.write_text(dump_yaml(dict(self)))
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
from typing import Dict, List, Literal, Optional, Union
|
from typing import Dict, List, Optional, Union
|
||||||
|
|
||||||
from pydantic import BaseModel
|
from pydantic import BaseModel
|
||||||
from pydantic.fields import Field
|
from pydantic.fields import Field
|
||||||
|
|||||||
@@ -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()
|
ROOT_FOLDER = Path(__file__).parent.parent.absolute()
|
||||||
BUILD_VERSION = config("BUILD_VERSION", "0.0.0")
|
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")
|
LOG_LEVEL = config("LOG_LEVEL", "INFO")
|
||||||
|
API_PREFIX = config("API_PREFIX", "")
|
||||||
ORIGIN = config("ORIGIN", cast=Csv(), default="*")
|
ORIGIN = config("ORIGIN", cast=Csv(), default="*")
|
||||||
@@ -10,9 +10,12 @@ def find_hass_config() -> HassConfig:
|
|||||||
"""Try to find HASS config."""
|
"""Try to find HASS config."""
|
||||||
if config("USE_EXAMPLE_REPO", False, cast=bool):
|
if config("USE_EXAMPLE_REPO", False, cast=bool):
|
||||||
print("using USE_EXAMPLE_REPO")
|
print("using USE_EXAMPLE_REPO")
|
||||||
from tests.utils import create_copy_of_example_config
|
from tests.utils import (
|
||||||
|
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)
|
print("|-> ", path)
|
||||||
return HassConfig(path)
|
return HassConfig(path)
|
||||||
|
|
||||||
|
|||||||
@@ -14,3 +14,7 @@ else:
|
|||||||
logging.basicConfig(level=logging.NOTSET)
|
logging.basicConfig(level=logging.NOTSET)
|
||||||
|
|
||||||
logger = logging.getLogger()
|
logger = logging.getLogger()
|
||||||
|
|
||||||
|
|
||||||
|
def get_logger(name: str):
|
||||||
|
return logging.getLogger(name)
|
||||||
@@ -0,0 +1,59 @@
|
|||||||
|
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, 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) 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,7 +1,10 @@
|
|||||||
import io
|
import io
|
||||||
from typing import Any, TextIO, Union
|
from typing import Any, TextIO, Union
|
||||||
|
|
||||||
from src.yaml_serializer.base_yaml import yaml
|
import yaml
|
||||||
|
|
||||||
|
from src.yaml_serializer.dumper import YamlSafeDumper
|
||||||
|
from src.yaml_serializer.loader import YamlSafeLoader
|
||||||
|
|
||||||
|
|
||||||
def dump_yaml(obj: Any) -> str:
|
def dump_yaml(obj: Any) -> str:
|
||||||
@@ -14,7 +17,14 @@ def dump_yaml(obj: Any) -> str:
|
|||||||
str
|
str
|
||||||
"""
|
"""
|
||||||
stream = io.StringIO()
|
stream = io.StringIO()
|
||||||
yaml.dump(obj, stream)
|
yaml.dump( # nosec
|
||||||
|
obj,
|
||||||
|
stream,
|
||||||
|
default_flow_style=False,
|
||||||
|
allow_unicode=True,
|
||||||
|
sort_keys=False,
|
||||||
|
Dumper=YamlSafeDumper,
|
||||||
|
)
|
||||||
stream.seek(0)
|
stream.seek(0)
|
||||||
return stream.read()
|
return stream.read()
|
||||||
|
|
||||||
@@ -28,4 +38,4 @@ def load_yaml(yaml_stream: TextIO) -> Union[dict, list]:
|
|||||||
Returns:
|
Returns:
|
||||||
List[dict, list]
|
List[dict, list]
|
||||||
"""
|
"""
|
||||||
return yaml.load(yaml_stream)
|
return yaml.load(yaml_stream, Loader=YamlSafeLoader) # nosec
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
from ruamel.yaml import YAML
|
|
||||||
|
|
||||||
from src.yaml_serializer.types import (
|
|
||||||
IncludedYaml,
|
|
||||||
IncludedYamlDir,
|
|
||||||
SecretValue,
|
|
||||||
)
|
|
||||||
|
|
||||||
yaml = YAML()
|
|
||||||
yaml.register_class(IncludedYaml)
|
|
||||||
yaml.register_class(SecretValue)
|
|
||||||
yaml.register_class(IncludedYamlDir)
|
|
||||||
yaml.constructor.add_constructor("!include", IncludedYaml.from_yaml)
|
|
||||||
yaml.constructor.add_constructor("!secret", SecretValue.from_yaml)
|
|
||||||
yaml.constructor.add_constructor("!env_var", IncludedYamlDir.from_yaml)
|
|
||||||
yaml.constructor.add_constructor("!include_dir_list", IncludedYamlDir.from_yaml)
|
|
||||||
yaml.constructor.add_constructor("!include_dir_merge_list", IncludedYamlDir.from_yaml)
|
|
||||||
yaml.constructor.add_constructor("!include_dir_named", IncludedYamlDir.from_yaml)
|
|
||||||
yaml.constructor.add_constructor("!include_dir_merge_named", IncludedYamlDir.from_yaml)
|
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
import yaml
|
||||||
|
|
||||||
|
from src.yaml_serializer.types import (
|
||||||
|
IncludedYaml,
|
||||||
|
IncludedYamlDir,
|
||||||
|
SecretValue,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class YamlSafeDumper(yaml.SafeDumper):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
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
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
import yaml
|
||||||
|
|
||||||
|
from src.yaml_serializer.types import (
|
||||||
|
IncludedYaml,
|
||||||
|
IncludedYamlDir,
|
||||||
|
SecretValue,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class YamlSafeLoader(yaml.SafeLoader):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
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)
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
from typing import NamedTuple
|
from typing import NamedTuple
|
||||||
|
|
||||||
from ruamel.yaml.nodes import Node
|
from yaml.nodes import Node
|
||||||
from ruamel.yaml.representer import BaseRepresenter
|
from yaml.representer import BaseRepresenter
|
||||||
|
|
||||||
|
|
||||||
class IncludedYaml(NamedTuple):
|
class IncludedYaml(NamedTuple):
|
||||||
|
|||||||
@@ -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.
@@ -1,77 +1,77 @@
|
|||||||
0:
|
'1616887975473':
|
||||||
Type: HA
|
Type: HA
|
||||||
1:
|
'1616888026264':
|
||||||
Type: HA
|
Type: HA
|
||||||
2:
|
'1619371298367':
|
||||||
Type: Button
|
|
||||||
Room: Living
|
Room: Living
|
||||||
3:
|
|
||||||
Type: Button
|
Type: Button
|
||||||
|
'1620239986670':
|
||||||
Room: Kitchen
|
Room: Kitchen
|
||||||
4:
|
|
||||||
Type: Button
|
Type: Button
|
||||||
|
'1620324780561':
|
||||||
Room: Kitchen
|
Room: Kitchen
|
||||||
5:
|
|
||||||
Type: Button
|
Type: Button
|
||||||
|
'1621352850204':
|
||||||
Room: Kitchen
|
Room: Kitchen
|
||||||
6:
|
|
||||||
Type: Button
|
Type: Button
|
||||||
|
'1622210698281':
|
||||||
Room: Kitchen
|
Room: Kitchen
|
||||||
7:
|
|
||||||
Type: Button
|
Type: Button
|
||||||
|
'1622769811245':
|
||||||
Room: Living
|
Room: Living
|
||||||
8:
|
|
||||||
Type: Button
|
Type: Button
|
||||||
|
'1623430479201':
|
||||||
Room: Baby
|
Room: Baby
|
||||||
9:
|
|
||||||
Type: Button
|
Type: Button
|
||||||
|
'1623642118976':
|
||||||
Room: Baby
|
Room: Baby
|
||||||
10:
|
|
||||||
Type: Button
|
Type: Button
|
||||||
|
'1624640900951':
|
||||||
|
Room: Baby
|
||||||
|
Type: Button
|
||||||
|
'1628024070687':
|
||||||
Room: Baby
|
Room: Baby
|
||||||
11:
|
|
||||||
Type: Routine
|
Type: Routine
|
||||||
|
'1628024123214':
|
||||||
Room: Baby
|
Room: Baby
|
||||||
12:
|
|
||||||
Type: Routine
|
Type: Routine
|
||||||
Room: Baby
|
'1628444671951':
|
||||||
13:
|
Room: Office
|
||||||
Type: Window
|
Type: Window
|
||||||
Room: Office
|
'1629309267204':
|
||||||
14:
|
|
||||||
Type: Door
|
|
||||||
Room: Balcony
|
Room: Balcony
|
||||||
15:
|
|
||||||
Type: Routine
|
|
||||||
16:
|
|
||||||
Type: Button
|
|
||||||
Room: Baby
|
|
||||||
17:
|
|
||||||
Type: Routine
|
|
||||||
18:
|
|
||||||
Type: Routine
|
|
||||||
19:
|
|
||||||
Type: Door
|
Type: Door
|
||||||
Room: Bedroom
|
'1629422438707':
|
||||||
20:
|
|
||||||
Type: Ensure Power
|
|
||||||
21:
|
|
||||||
Type: Ensure Power
|
|
||||||
22:
|
|
||||||
Type: Motion
|
|
||||||
Room: Office
|
|
||||||
23:
|
|
||||||
Type: Routine
|
Type: Routine
|
||||||
|
'1634497376234':
|
||||||
Room: Baby
|
Room: Baby
|
||||||
24:
|
|
||||||
Type: Climate
|
|
||||||
Climate: Heat
|
|
||||||
25:
|
|
||||||
Type: Climate
|
|
||||||
Climate: Time
|
|
||||||
26:
|
|
||||||
Type: Routine
|
|
||||||
27:
|
|
||||||
Type: Button
|
Type: Button
|
||||||
|
'1635539262562':
|
||||||
|
Type: Routine
|
||||||
|
'1636428429596':
|
||||||
|
Type: Routine
|
||||||
|
'1639500650865':
|
||||||
Room: Bedroom
|
Room: Bedroom
|
||||||
BadOne: yes
|
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
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
from unittest import TestCase
|
from unittest import TestCase
|
||||||
|
|
||||||
|
import yaml
|
||||||
from fastapi.testclient import TestClient
|
from fastapi.testclient import TestClient
|
||||||
from ruamel.yaml import YAML
|
|
||||||
|
|
||||||
from src.api.app import make_app
|
from src.api.app import make_app
|
||||||
from src.automations.types import (
|
from src.automations.types import (
|
||||||
@@ -151,7 +151,7 @@ class automation_update_tests(BaseTestCase):
|
|||||||
)
|
)
|
||||||
self.assertEqual(resp.status_code, 200)
|
self.assertEqual(resp.status_code, 200)
|
||||||
with (self.config_folder / "automations.yaml").open("r") as fp:
|
with (self.config_folder / "automations.yaml").open("r") as fp:
|
||||||
disk_data = dict(YAML().load(fp)[15])
|
disk_data = dict(yaml.safe_load(fp)[15])
|
||||||
trigger = list(map(dict, disk_data.pop("trigger")))
|
trigger = list(map(dict, disk_data.pop("trigger")))
|
||||||
condition = disk_data.pop("condition")
|
condition = disk_data.pop("condition")
|
||||||
action = list(map(dict, disk_data.pop("action")))
|
action = list(map(dict, disk_data.pop("action")))
|
||||||
@@ -202,7 +202,7 @@ class automation_update_tests(BaseTestCase):
|
|||||||
)
|
)
|
||||||
self.assertEqual(resp.status_code, 200)
|
self.assertEqual(resp.status_code, 200)
|
||||||
with (self.config_folder / "automations.yaml").open("r") as fp:
|
with (self.config_folder / "automations.yaml").open("r") as fp:
|
||||||
disk_data = dict(YAML().load(fp)[27])
|
disk_data = dict(yaml.safe_load(fp)[27])
|
||||||
trigger = list(map(dict, disk_data.pop("trigger")))
|
trigger = list(map(dict, disk_data.pop("trigger")))
|
||||||
condition = disk_data.pop("condition")
|
condition = disk_data.pop("condition")
|
||||||
action = list(map(dict, disk_data.pop("action")))
|
action = list(map(dict, disk_data.pop("action")))
|
||||||
|
|||||||
@@ -100,3 +100,16 @@ class manager_tests(TestCase):
|
|||||||
self.assertEqual(manager.get_total_items(), 3)
|
self.assertEqual(manager.get_total_items(), 3)
|
||||||
with self.assertRaises(FailedDeletion):
|
with self.assertRaises(FailedDeletion):
|
||||||
manager.delete(10)
|
manager.delete(10)
|
||||||
|
|
||||||
|
def test_save_tags(self):
|
||||||
|
_, _, manager = get_dummy_automation_loader(
|
||||||
|
[
|
||||||
|
ExtenededAutomationData(metadata=AutomationMetdata(id="test1")),
|
||||||
|
ExtenededAutomationData(metadata=AutomationMetdata(id="test2")),
|
||||||
|
ExtenededAutomationData(metadata=AutomationMetdata(id="test3")),
|
||||||
|
],
|
||||||
|
automation_in_conifguration_mode="none",
|
||||||
|
)
|
||||||
|
manager.update_tags("test1", {"room": "bathroom"})
|
||||||
|
auto = manager.get(0)
|
||||||
|
assert auto.tags == {"room": "bathroom"}
|
||||||
@@ -1,11 +1,6 @@
|
|||||||
import json
|
import json
|
||||||
from unittest import TestCase
|
from unittest import TestCase
|
||||||
|
|
||||||
from ruamel.yaml.scalarbool import ScalarBoolean
|
|
||||||
from ruamel.yaml.scalarfloat import ScalarFloat
|
|
||||||
from ruamel.yaml.scalarint import ScalarInt
|
|
||||||
from ruamel.yaml.scalarstring import ScalarString
|
|
||||||
|
|
||||||
from src.json_serializer import json_dumps
|
from src.json_serializer import json_dumps
|
||||||
from src.yaml_serializer.types import NOT_IMPLEMENTED_SV_MSG, SecretValue
|
from src.yaml_serializer.types import NOT_IMPLEMENTED_SV_MSG, SecretValue
|
||||||
|
|
||||||
@@ -34,25 +29,3 @@ class json_serializer_tests(TestCase):
|
|||||||
},
|
},
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
def test_convert_ruamel_types(self):
|
|
||||||
self.assertEqual(
|
|
||||||
json_dumps(
|
|
||||||
{
|
|
||||||
"int": ScalarInt(1),
|
|
||||||
"float": ScalarFloat(1.3),
|
|
||||||
"bool": ScalarBoolean(False),
|
|
||||||
"list": [1, ScalarString("w")],
|
|
||||||
"tup": (1, ScalarString("w")),
|
|
||||||
}
|
|
||||||
),
|
|
||||||
json.dumps(
|
|
||||||
{
|
|
||||||
"int": 1,
|
|
||||||
"float": 1.3,
|
|
||||||
"bool": 0,
|
|
||||||
"list": [1, "w"],
|
|
||||||
"tup": (1, "w"),
|
|
||||||
},
|
|
||||||
),
|
|
||||||
)
|
|
||||||
@@ -19,21 +19,29 @@ class dumping_yamls_tests(TestCase):
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
self.assertEqual(yaml, "automations: !include automations.yaml\n")
|
self.assertEqual(yaml, "automations: !include 'automations.yaml'\n")
|
||||||
|
|
||||||
def test_dumping_secrets(self):
|
def test_dumping_secrets(self):
|
||||||
yaml = dump_yaml({"google_password": SecretValue("gpass", "supersec")})
|
yaml = dump_yaml({"google_password": SecretValue("gpass", "supersec")})
|
||||||
self.assertEqual(yaml, "google_password: !secret gpass\n")
|
self.assertEqual(yaml, "google_password: !secret 'gpass'\n")
|
||||||
|
|
||||||
def test_dumping_stub(self):
|
def test_dumping_stub(self):
|
||||||
yaml = dump_yaml({"sensor": IncludedYamlDir("include_dir_list", "sensors/*yaml")})
|
yaml = dump_yaml({"sensor": IncludedYamlDir("include_dir_list", "sensors/*yaml")})
|
||||||
self.assertEqual(yaml, "sensor: !include_dir_list sensors/*yaml\n")
|
self.assertEqual(yaml, "sensor: !include_dir_list 'sensors/*yaml'\n")
|
||||||
|
|
||||||
def test_load_stub(self):
|
def test_load_stub(self):
|
||||||
yaml_obj = load_yaml(
|
yaml_obj = load_yaml(
|
||||||
io.StringIO(
|
io.StringIO(
|
||||||
"""
|
"""
|
||||||
name: cool
|
name: cool
|
||||||
|
date: "10:00"
|
||||||
|
bools:
|
||||||
|
- "yes"
|
||||||
|
- "no"
|
||||||
|
- true
|
||||||
|
- false
|
||||||
|
bobIsNull:
|
||||||
|
bobIsNull2: null
|
||||||
google_password: !secret gpass
|
google_password: !secret gpass
|
||||||
sensor: !include_dir_list sensors/*yaml
|
sensor: !include_dir_list sensors/*yaml
|
||||||
automations: !include automations.yaml
|
automations: !include automations.yaml
|
||||||
@@ -44,6 +52,10 @@ class dumping_yamls_tests(TestCase):
|
|||||||
dict(yaml_obj),
|
dict(yaml_obj),
|
||||||
{
|
{
|
||||||
"name": "cool",
|
"name": "cool",
|
||||||
|
"date": "10:00",
|
||||||
|
"bools": ["yes", "no", True, False],
|
||||||
|
"bobIsNull": None,
|
||||||
|
"bobIsNull2": None,
|
||||||
"google_password": SecretValue("gpass", "n/a"),
|
"google_password": SecretValue("gpass", "n/a"),
|
||||||
"sensor": IncludedYamlDir("include_dir_list", "sensors/*yaml"),
|
"sensor": IncludedYamlDir("include_dir_list", "sensors/*yaml"),
|
||||||
"automations": IncludedYaml("automations.yaml"),
|
"automations": IncludedYaml("automations.yaml"),
|
||||||
@@ -51,8 +63,17 @@ class dumping_yamls_tests(TestCase):
|
|||||||
)
|
)
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
dump_yaml(yaml_obj),
|
dump_yaml(yaml_obj),
|
||||||
"name: cool\n"
|
"""name: cool
|
||||||
"google_password: !secret gpass\n"
|
date: '10:00'
|
||||||
"sensor: !include_dir_list sensors/*yaml\n"
|
bools:
|
||||||
f"automations: !include automations.yaml\n",
|
- 'yes'
|
||||||
|
- 'no'
|
||||||
|
- true
|
||||||
|
- false
|
||||||
|
bobIsNull: null
|
||||||
|
bobIsNull2: null
|
||||||
|
google_password: !secret 'gpass'
|
||||||
|
sensor: !include_dir_list 'sensors/*yaml'
|
||||||
|
automations: !include 'automations.yaml'
|
||||||
|
""",
|
||||||
)
|
)
|
||||||
@@ -13,6 +13,7 @@ THIS_FOLDER = Path(__file__).parent
|
|||||||
SAMPLES_FOLDER = THIS_FOLDER / "samples"
|
SAMPLES_FOLDER = THIS_FOLDER / "samples"
|
||||||
HA_CONFIG_EXAMPLE = SAMPLES_FOLDER / "config"
|
HA_CONFIG_EXAMPLE = SAMPLES_FOLDER / "config"
|
||||||
HA_CONFIG2_EXAMPLE = SAMPLES_FOLDER / "config-2"
|
HA_CONFIG2_EXAMPLE = SAMPLES_FOLDER / "config-2"
|
||||||
|
HA_CONFIG3_EXAMPLE = SAMPLES_FOLDER / "config-3"
|
||||||
|
|
||||||
|
|
||||||
def get_example_automation_loader(
|
def get_example_automation_loader(
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
import os
|
||||||
|
import yaml
|
||||||
|
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
print(Path().absolute())
|
||||||
|
|
||||||
|
CONFIG_YAML = Path("config.yaml").absolute()
|
||||||
|
CHANGELOG_MD = Path("CHANGELOG.md").absolute()
|
||||||
|
|
||||||
|
print(CONFIG_YAML)
|
||||||
|
print(CHANGELOG_MD)
|
||||||
|
|
||||||
|
version = os.environ["VERSION"]
|
||||||
|
version_name = os.environ["NAME"]
|
||||||
|
change = os.environ["CHANGELOG"].splitlines()
|
||||||
|
|
||||||
|
config = yaml.load(CONFIG_YAML.read_text(), yaml.Loader)
|
||||||
|
changelog = CHANGELOG_MD.read_text().splitlines()
|
||||||
|
|
||||||
|
with CHANGELOG_MD.open("w") as fp:
|
||||||
|
for i, log in enumerate(changelog):
|
||||||
|
if i == 2:
|
||||||
|
fp.write(f"## [{version}] - {version_name}\n\n")
|
||||||
|
for clog in change:
|
||||||
|
fp.write(f"- {clog.strip()}\n")
|
||||||
|
fp.write(log.strip() + "\n")
|
||||||
|
|
||||||
|
CONFIG_YAML.write_text(yaml.dump(config))
|
||||||
+6
-7
@@ -1,5 +1,5 @@
|
|||||||
name: Shortumation
|
name: Shortumation
|
||||||
version: 0.1.9
|
version: v0.4.0
|
||||||
slug: shortumation
|
slug: shortumation
|
||||||
image: asosnovsky/shortumation-{arch}
|
image: asosnovsky/shortumation-{arch}
|
||||||
url: "https://github.com/asosnovsky/Shortumation"
|
url: "https://github.com/asosnovsky/Shortumation"
|
||||||
@@ -16,16 +16,15 @@ init: false
|
|||||||
ingress: true
|
ingress: true
|
||||||
ingress_port: 8000
|
ingress_port: 8000
|
||||||
ingress_entry: "web/"
|
ingress_entry: "web/"
|
||||||
panel_icon: mdi:home-automation
|
homeassistant_api: true
|
||||||
hassio_role: manager
|
|
||||||
privileged:
|
|
||||||
- SYS_RAWIO
|
|
||||||
host_network: false
|
|
||||||
auth_api: true
|
auth_api: true
|
||||||
|
panel_icon: mdi:home-automation
|
||||||
|
hassio_role: homeassistant
|
||||||
|
host_network: false
|
||||||
map:
|
map:
|
||||||
- config:rw
|
- config:rw
|
||||||
options: {}
|
options: {}
|
||||||
ports:
|
ports:
|
||||||
8000/tcp: 8000
|
8000/tcp:
|
||||||
ports_description:
|
ports_description:
|
||||||
8000/tcp: Main port for the API & Web.
|
8000/tcp: Main port for the API & Web.
|
||||||
Binary file not shown.
@@ -1,9 +0,0 @@
|
|||||||
version: '3'
|
|
||||||
services:
|
|
||||||
addon:
|
|
||||||
image: "asosnovsky/shortumation-${ARCH:-amd64}:${BUILD_TAG:-latest}"
|
|
||||||
build:
|
|
||||||
context: "./"
|
|
||||||
dockerfile: "./Dockerfile"
|
|
||||||
args:
|
|
||||||
- BUILD_ARCH=${ARCH:-amd64}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
version: '3'
|
|
||||||
services:
|
|
||||||
addon:
|
|
||||||
volumes:
|
|
||||||
- "./sample_config:/config"
|
|
||||||
ports:
|
|
||||||
- "8000:8000"
|
|
||||||
Executable
+24
@@ -0,0 +1,24 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
set -e
|
||||||
|
|
||||||
|
api_location=${1}
|
||||||
|
# web_location=${2}
|
||||||
|
|
||||||
|
function install_yarn() {
|
||||||
|
pushd $web_location
|
||||||
|
yarn
|
||||||
|
yarn build
|
||||||
|
cp -r $web_location/build $api_location/web
|
||||||
|
popd
|
||||||
|
}
|
||||||
|
|
||||||
|
function install_py() {
|
||||||
|
pushd $api_location
|
||||||
|
pip install . $api_location
|
||||||
|
popd
|
||||||
|
}
|
||||||
|
|
||||||
|
install_py
|
||||||
|
# install_yarn
|
||||||
|
|
||||||
|
echo "DONE BUILD"
|
||||||
Executable
+18
@@ -0,0 +1,18 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
set -e
|
||||||
|
|
||||||
|
function prep_yarn() {
|
||||||
|
curl -L https://raw.githubusercontent.com/tj/n/master/bin/n -o n
|
||||||
|
ln -s /usr/bin/nodejs /usr/bin/node
|
||||||
|
bash n lts
|
||||||
|
npm i -g yarn
|
||||||
|
}
|
||||||
|
|
||||||
|
function prep_py() {
|
||||||
|
pip install -U wheel setuptools pip Cython
|
||||||
|
}
|
||||||
|
|
||||||
|
prep_py
|
||||||
|
# prep_yarn
|
||||||
|
|
||||||
|
echo "DONE PREP"
|
||||||
Executable
+15
@@ -0,0 +1,15 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
api_location=${1}
|
||||||
|
port=${PORT:-8000}
|
||||||
|
host=${HOST:-0.0.0.0}
|
||||||
|
host_port="$host:$port"
|
||||||
|
|
||||||
|
pushd $api_location
|
||||||
|
echo "--------------------"
|
||||||
|
echo "BUILD_VERSION = "$BUILD_VERSION
|
||||||
|
echo "HOST = $host_port"
|
||||||
|
echo "HASSIO_WS = $HASSIO_WS"
|
||||||
|
echo $(python --version)
|
||||||
|
echo "--------------------"
|
||||||
|
python -m hypercorn src.app:app -b $host_port
|
||||||
@@ -4,18 +4,17 @@ services:
|
|||||||
container_name: homeassistant
|
container_name: homeassistant
|
||||||
image: "ghcr.io/home-assistant/home-assistant:stable"
|
image: "ghcr.io/home-assistant/home-assistant:stable"
|
||||||
volumes:
|
volumes:
|
||||||
- config:/config
|
- ./config:/config
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
privileged: true
|
privileged: true
|
||||||
network_mode: host
|
network_mode: host
|
||||||
|
|
||||||
shortumation:
|
shortumation:
|
||||||
# make sure to replace the ARCH with whatever system you are running!
|
# make sure to replace the ARCH with whatever system you are running!
|
||||||
image: "asosnovsky/shortumation-${ARCH:-amd64}:latest"
|
image: "asosnovsky/shortumation-${ARCH:-amd64}:${SHORTUMATION_VERSION:-latest}"
|
||||||
|
network_mode: host
|
||||||
volumes:
|
volumes:
|
||||||
- config:/config
|
- ./config:/config
|
||||||
ports:
|
environment:
|
||||||
- 8081:8000
|
- SUPERVISOR_TOKEN=${SUPERVISOR_TOKEN}
|
||||||
|
- HASSIO_WS=ws://0.0.0.0:8123/api/websocket
|
||||||
volumes:
|
|
||||||
config:
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
<mxfile host="Electron" modified="2021-12-22T03:59:52.849Z" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/13.7.3 Chrome/85.0.4183.98 Electron/10.1.2 Safari/537.36" etag="tLc5i3WharxOLc8-v9Jg" version="13.7.3" type="device" pages="2"><diagram id="jPQkoFvJ-TX3pFbO5KUV" name="autos">7V1bk5s4Fv41rtp5aBfizmM6l9mZ7exkJpNN5qkLg2yzwcgFuNvOrx9oI2wktQ22JATj9EOMwBi+c3TuOpoYb1fbn1N/vfyIQhhPdC3cTox3E10HuuMW/5Uju/2IrVUDizQKq4sOA5+jH7Aa1KrRTRTCrHFhjlCcR+vmYICSBAZ5Y8xPU/TcvGyO4uavrv0FpAY+B35Mj36Nwny5H3Ut7TD+bxgtlviXgVadWfn44mogW/ohej4aMt5PjLcpQvn+02r7FsYleBiX/fc+vHK2frAUJnmbL3x9cr+iHx/m/m/hl49go2lf7t7c2fr+Nk9+vKneuHrafIchSNEmCWF5FzAx7p+XUQ4/r/2gPPtcEL0YW+aruDpNP1X1oE8wzeH2aKh6yp8hWsE83RWXVGdtp0KsYhlgVsfPBwKYXjW2PAK/YK6K8BXRF/W9D7gUHypoOsAEXI2CBYYFo1SHKM2XaIESP35/GL0PNulTjdsBRa04OnzhAaF1dcn/YZ7vqingb3LURLYANN19q77/cvBXeTC18OG77fHJd7vq6FWK5H66gPmpt3as/ZXlq56kXApjP4+emnOGRYXqq59QVDxMTXEPWFPt6J/VoL/lmM0bZmiTBrC6B0HZ+qEuJ7ah3pQwdGJKGBY1JQzAmhKGqCnhKogSITh0jUaplhHHKAFxgoNCyU/C64CaR3H8FsUoffmuEfrQnQfFeJan6Ds8OmMHLpzNizN+HC2SYiwooIWpPI60GFAL40eTQjqHq3UhliBfuC3ohiYLblefGbYthpNrSdwXuhaFbpYX0Gb/issfn36P8mAJk58muu2vSgCTWbZ+gUKbTqe9CwaTZFYGnMCQiadN4ZmgXLZckCRypTIqoOXARL/niux8PtcDJrKhPbMtXiLAbVpBOsMK1lkaXxiyDoXsli+ubgDZuM5cy7RO2rIdcLUIWeAyjASWjSDOtxglrjroGVdskA4cVxMQuJo942oACsXzrnBv3i+MZy9BlxLwKPBj0i1/lUJ7J/MUf1Xy8KwbrXsTzl70dfOCluN5tLrSSvbToCKdyctmI8S0Tqs/wOJ7Ya4cNln+8XzvDpPvbeMC+nEO4W2j/NvR5yNSFkcHSpYHu2Oy8gz7nSew15LAhlL0xY99KiJV3CZaZ7CFPMvW+2zCPNqWFO/Hu6KEYN8+gEH7rd8okIuXywk0yQAUlkpvqhOrKAz38hJm0Q9/9nKrkovXZZD35S2s+4n1rrxXMauy/QQDFP4JSiBBrGqIh0ZyCGLoPRODVuQULbLvMA+Wx2DC9P0T3GP6gh/OSpUXhH62rOXbEf3Ogjwpzf/yrxiP/RmMPxU0yiPEJPoDccEM5TlaMbgiL8XqPdrkcZQUv44TfBqLo4r3WJfvvNouykTkFM3nUQCnAUoCuM6z6XNa/FyyeFzDJIhiPgxRh4xOcAT2ghqmuSWII7B4OMURi0KLrdu/fJ1ZrSbl5Dh52cJu07W+7Tad9q9D+FQwBwUNX4v3NIXOM1l/hm6L1M5NrrSXK9cyAk6SEhOLEcKWKWsM2twarCnAiUJN+4DhsEo1D6wWeWzRysAjmNbo3Yu36PxA9lxmr6b5Jk0eJ7odlxw7S4tPi/ITSq7OYF2mKmr6KawqLDoveFMVvFVFB0ZQU1VYI/IaOVFIMVXRwpMUrSqApjW5ti7K6U+60YbwCoaR/7iO/R1Mp7SyKE889qQunFcooZK6aBGiu6mLa9VFe0ZQU11g9huvuuhMIbXUhU1XNQ4xs26QCse0W+EqLLNu09Z0NOcLrJTSJYcE1jEoYE0GsOKq7VwKxcFX759N49kVN59N42EzR5E8nk17CxlMMpTiKtPH5WalQFGp45Fcrk97LyulDflks4JpFNC26ksBL1fpIqc22iGTogzpIrXk1KatWhiPQnDrmsdgaami29EpcClgZUcxddNkzXSprpRDR3cVjWPWFFTYMXVYVeM3x5SvY9qBEdR0TB3aPh+XY9qdQmo5pmNcpXvWznfa1iHj1Jcidr5D26owzvhapP2YTQZrwbpMo8llGU1DXATlXLj4QZyEoc2uIYa+bJfwofpeBOXSTv8gcXW8Jr/ixV294arA4rKD28ANZnINn9XO8BAHMx0CCJYIcdZmPS31t+0mU7Oq0B0gUb15ClQ2mUTtr87of1DXvjZ4UFwHBJtCYbjW70nCn7WJq+vOmsS4/ZHoBjc6sUz+zqtjxfgm+2cV1tSmReb9ygD66anaKfgjeeLQjkgPTVqEAirV+8BadkBJiGuhxpqS8ANpPSm3Fwadp29m0vhn0TgBCcBZJFkN4MQhSTvUo+ZcRumdXM59NbtRc+5QWJcBpVTW1VnGsgKxIF5wE4Ki5/iQTieSFIhjcMKaSLy3XIwsrsELnY4ZLdZO31jT8bkxSRGn2WvLa4e2MCnitUhHiw5wkGU27FoQyZ6aZ1E4jC3EwT1Jp2xEgiVSZJh0eHKpHJLwBhWTuAhRqTEJj86DDDMm0R5qNWMSHh2I7Ccm0RlI5WISWCINJShxLev2HpTQGPG0fqISVzNv31EJoNERNYUdiu54qxWWAJqSdSucwFYsLgG0AQWBrgW778AE0FgtKMYjSBSLTABtTEUGbUtsvbZL6Ry1WmICjdXYQYHJ0b3VHtVrz+19JrDapI0CW5Z1KBlbVrnKKLBl1YbLxRbv4/BP72MNQNtG1vVaNFXEOmPLCBVbuBNVumbvDX0A8G68v+doc6i8byjQxl26AVpT4Ty9DMXohZ98TG3ZScHWuy2q05HJwa5M7a5mHIIaet/UYMU2CWLcVpOLbMxORgQZLCF15ThgVuERLCG6ooOQWhbDE5FsjjGq5fprzX6gkcKNKgCj6O0mW3h3qujCCmq2qgCMgr3BWgS8aKRWswrQZsMi0TqB3MbZtFhVfpJlnEG7DFcXP12qE7xXkFZJJxi09X/TCfx1QntWUFQnGLRfMjad0JlGiukE45IA5eCjW1jgt4huVZNDlejWgDvLXrIZ5TU0ttrSGLeXFl0Cb5NRAtz+DN9i/1LCCuCBPdzJLox5rPmd8eT9iX6/M+/e/Io+peHu4Q60Zh3u4uEV1iFKUy2H0AivrJ04z4OebB5sEZ4XvvUH8BT0Qhhd7tXd/eNAR5UdFdxu5eaoiHRUOrCCoo6KTUfLR+aodKeRYo6KrcISVatZHGuZdCd42RKODs8r2pb7QEGlNUaLRaI3jXG1xuhclq6cxqALncemMbovHVBLYzisKPUga3oNLITqwAG7NYJUdFmm9RDRdd0muBbeNLA/aBXtoNS9mzZhL9mgd5mggBUJNECakSatzeSaPYydJhSOPThDsCSdmyUpwZLswAqKWpKMbSlGZkl2p5FqluR4Vt6ZhOqx5Rk7+h/G/d0vyS+/z379r2s/fPnffx7+umPZ6JL1sUXspqJEMsCgFTKPBv9nFe5JIqmsbo2buuWqbq9khFeULXPHUrk1SSNSt3xo1FS2wJEYWjiVfB/R+i1y9yMLryA6ghjXVDa6IXEoI2JCPNwljZfUgcAkfJOmL3K9mkrFyIeohExEkdEpphZdJ+KQa26wfde5ToSs03Y9sl0nv0oRJmKX9H3hwJY1qwSxn2VR0OAW4eWKTCRaL53m3w2mHZfZpC7g18n1FCDnNnIcmpYg9nKzNVoRi9rcnQnzcHsfD1VLSOrFfLlw5yYKCqj93dFllZUsQFiwOlLd/EJ5a6NtvCVkbZLY4pzA4jBFKD/moPJFP6IQllf8DQ==</diagram><diagram id="7X2k5OJ-jCNTzSic57L4" name="Page-2">5Zlbc9o8EIZ/DZdhZMnGcJlAekyaTunXdnrTUWxhayJbrixO/fXfCsuAEU1IG4cwhQvs1cl63vVqJTpkmC1eK1qk1zJmooNRvOiQUQdjD5E+/BjLsrL0kDUkise20sYw5r9Y3dJapzxmZaOillJoXjSNkcxzFumGjSol581qEymaoxY0YY5hHFHhWr/yWKeVtY/Djf0N40laj+z1BlVJRuvKdiZlSmM53zKRyw4ZKil1dZUthkwYeDWXvr794NPPfoh+RFdfxvLbMsJnVWevHtNkPQXFcv3HXY9wcF32hmefv7+ek7dSq7dfRmeexTCjYmqB2cnqZU1QyWkeM9ML6pCLeco1Gxc0MqVz8BmwpToTcOfB5YQLMZRCqlVbMgnMF+ylVvKObZX0Vh/TQuZ6y159wG4fjCnNFjtSPsDBW4sDXs1kxrRaQjvbi2/ltP5MQns/33gHRtaWbnnG2kitRybrrjfU4cKCf4QI/r+uweBQCfpPIMHexyWOBFd8xvMEbJ+kzODnYqq1zO8RxntYmLZw9ps4vT08PbyHp98WTtejbyYTDlQwupaaG47o5oXCDJswfXxsmMEhMCeT06C5J9o+L83eATSvmaYngTN4Tufcu3a5gdMBlwC54rdAbN5Hb+vqqJWQ6B/b77AD6j3XUcry51xbfi+hC/JoLuWSasGlHkPC+lDYDVwf8gKXDH4CMuLupxz9t/hYTNOrAH8IZrPRO5vg30umvGPgVTZPLCTPNVOXM5h2af1kvYsxFWJapuuscsuZmpliLnPmppUBMl+wC3rLxEdZ8lX0JKOImUGhwEjDYSd2tVPhVoK7Z1sVzgVPTIGWxqnlVAuew+j1htAMQm2Vdecwj8LMOVskZuPalaso3gXLine truncated
|
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
{
|
||||||
|
"extends": ["config:base"],
|
||||||
|
"schedule": ["every month"],
|
||||||
|
"packageRules": [
|
||||||
|
{
|
||||||
|
"matchDepTypes": ["devDependencies"],
|
||||||
|
"matchUpdateTypes": ["patch", "minor"],
|
||||||
|
"groupName": "devDependencies (non-major)"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
echo $(python --version)
|
|
||||||
python -m uvicorn src.app:app --host "0.0.0.0" --port 8000
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
0:
|
|
||||||
Type: Generic
|
|
||||||
1:
|
|
||||||
Type: Generic
|
|
||||||
2:
|
|
||||||
Type: Climate
|
|
||||||
Room: House
|
|
||||||
4: {}
|
|
||||||
3:
|
|
||||||
Type: Vent
|
|
||||||
Room: Bathroom
|
|
||||||
Floor: First
|
|
||||||
5: {}
|
|
||||||
@@ -1,66 +0,0 @@
|
|||||||
- id: '1616887975473'
|
|
||||||
alias: Home Assistant Off
|
|
||||||
description: ''
|
|
||||||
trigger_variables:
|
|
||||||
mode: single
|
|
||||||
trigger:
|
|
||||||
- platform: homeassistant
|
|
||||||
event: shutdown
|
|
||||||
- $smType: trigger
|
|
||||||
platform: device
|
|
||||||
device_id: ''
|
|
||||||
domain: ''
|
|
||||||
type: ''
|
|
||||||
subtype: ''
|
|
||||||
condition: []
|
|
||||||
action:
|
|
||||||
- device_id: 2a98db84af7526c7ec3cc7aebd1a9e1c
|
|
||||||
domain: mobile_app
|
|
||||||
type: notify
|
|
||||||
title: Hassio Status
|
|
||||||
message: Hassio Is turning off...
|
|
||||||
- choose: []
|
|
||||||
default: []
|
|
||||||
alias: choose better days
|
|
||||||
- id: '1616888026264'
|
|
||||||
alias: Home Assistant On
|
|
||||||
description: ''
|
|
||||||
trigger_variables:
|
|
||||||
mode: single
|
|
||||||
trigger:
|
|
||||||
- platform: homeassistant
|
|
||||||
event: start
|
|
||||||
condition: []
|
|
||||||
action:
|
|
||||||
- device_id: 2a98db84af7526c7ec3cc7aebd1a9e1c
|
|
||||||
domain: mobile_app
|
|
||||||
type: notify
|
|
||||||
title: Hassio Status
|
|
||||||
message: Home assistant is up!
|
|
||||||
- id: shortu-2
|
|
||||||
alias: Neat trick
|
|
||||||
description: ''
|
|
||||||
mode: queued
|
|
||||||
trigger: []
|
|
||||||
condition: []
|
|
||||||
action:
|
|
||||||
- alias: Choose
|
|
||||||
default:
|
|
||||||
- condition: and
|
|
||||||
alias: ''
|
|
||||||
conditions:
|
|
||||||
- condition: or
|
|
||||||
conditions: []
|
|
||||||
choose: []
|
|
||||||
- service: lights.turn_on
|
|
||||||
target:
|
|
||||||
entity: bear
|
|
||||||
data: {}
|
|
||||||
- id: shortu-3
|
|
||||||
alias: Bathroom Vent
|
|
||||||
description: Turn the vent on when the humidity is high or it's smelly
|
|
||||||
trigger_variables:
|
|
||||||
mode: single
|
|
||||||
trigger: []
|
|
||||||
condition: []
|
|
||||||
action: []
|
|
||||||
+1
-1
@@ -21,4 +21,4 @@
|
|||||||
npm-debug.log*
|
npm-debug.log*
|
||||||
yarn-debug.log*
|
yarn-debug.log*
|
||||||
yarn-error.log*
|
yarn-error.log*
|
||||||
|
development_config
|
||||||
@@ -1,4 +1,7 @@
|
|||||||
module.exports = {
|
module.exports = {
|
||||||
|
'core': {
|
||||||
|
builder: 'webpack5'
|
||||||
|
},
|
||||||
"stories": [
|
"stories": [
|
||||||
"../src/**/*.stories.mdx",
|
"../src/**/*.stories.mdx",
|
||||||
"../src/**/*.stories.@(js|jsx|ts|tsx)"
|
"../src/**/*.stories.@(js|jsx|ts|tsx)"
|
||||||
@@ -8,5 +11,8 @@ module.exports = {
|
|||||||
"@storybook/addon-essentials",
|
"@storybook/addon-essentials",
|
||||||
"@storybook/preset-create-react-app",
|
"@storybook/preset-create-react-app",
|
||||||
"@storybook/addon-queryparams",
|
"@storybook/addon-queryparams",
|
||||||
]
|
],
|
||||||
|
"features": {
|
||||||
|
"emotionAlias": false,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
<link rel="icon" type="image/png" href="/icon.png" sizes="192x192">
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
import { addons } from '@storybook/addons';
|
||||||
|
import theme from './shortumationTheme';
|
||||||
|
|
||||||
|
addons.setConfig({
|
||||||
|
theme,
|
||||||
|
});
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import theme from './shortumationTheme';
|
||||||
|
|
||||||
export const parameters = {
|
export const parameters = {
|
||||||
actions: { argTypesRegex: "^on[A-Z].*" },
|
actions: { argTypesRegex: "^on[A-Z].*" },
|
||||||
@@ -7,4 +8,7 @@ export const parameters = {
|
|||||||
date: /Date$/,
|
date: /Date$/,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
docs: {
|
||||||
|
theme,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
import { create } from '@storybook/theming';
|
||||||
|
|
||||||
|
export default create({
|
||||||
|
base: 'dark',
|
||||||
|
brandTitle: 'Shrotumation Storybook',
|
||||||
|
brandUrl: 'https://github.com/asosnovsky/Shortumation',
|
||||||
|
// brandImage: 'https://raw.githubusercontent.com/asosnovsky/Shortumation/main/icon.png',
|
||||||
|
brandTarget: '_blank',
|
||||||
|
});
|
||||||
+14
@@ -0,0 +1,14 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
BIN_DIR="$( realpath $( dirname -- "${BASH_SOURCE[0]}" ) )"
|
||||||
|
VSCODE_DIR="$( dirname ${BIN_DIR} )"
|
||||||
|
WEBAPP_DIR="$( dirname ${VSCODE_DIR} )"
|
||||||
|
ROOT_DIR="$( dirname ${WEBAPP_DIR} )"
|
||||||
|
|
||||||
|
pushd $WEBAPP_DIR
|
||||||
|
rm -rf $WEBAPP_DIR/development_config
|
||||||
|
tar -xvf ../development_config.tar.gz -C $WEBAPP_DIR/
|
||||||
|
docker-compose down
|
||||||
|
docker-compose up
|
||||||
Vendored
+13
@@ -0,0 +1,13 @@
|
|||||||
|
{
|
||||||
|
"recommendations": [
|
||||||
|
"njpwerner.autodocstring",
|
||||||
|
"aeschli.vscode-css-formatter",
|
||||||
|
"paulmolluzzo.convert-css-in-js",
|
||||||
|
"ms-azuretools.vscode-docker",
|
||||||
|
"editorconfig.editorconfig",
|
||||||
|
"eamodio.gitlens",
|
||||||
|
"orta.vscode-jest",
|
||||||
|
"esbenp.prettier-vscode",
|
||||||
|
"pmneo.tsimporter"
|
||||||
|
]
|
||||||
|
}
|
||||||
Vendored
+6
-13
@@ -2,24 +2,17 @@
|
|||||||
"version": "0.2.0",
|
"version": "0.2.0",
|
||||||
"configurations": [
|
"configurations": [
|
||||||
{
|
{
|
||||||
"name": "Debug CRA Tests",
|
"name": "Debug Jest Tests",
|
||||||
"type": "node",
|
"type": "node",
|
||||||
"request": "launch",
|
"request": "launch",
|
||||||
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/react-scripts",
|
"runtimeArgs": [
|
||||||
"args": [
|
"--inspect-brk",
|
||||||
"test",
|
"${workspaceRoot}/node_modules/.bin/jest",
|
||||||
"--runInBand",
|
"--runInBand"
|
||||||
"--no-cache",
|
|
||||||
"--watchAll=false"
|
|
||||||
],
|
],
|
||||||
"cwd": "${workspaceRoot}",
|
|
||||||
"protocol": "inspector",
|
|
||||||
"console": "integratedTerminal",
|
"console": "integratedTerminal",
|
||||||
"internalConsoleOptions": "neverOpen",
|
"internalConsoleOptions": "neverOpen",
|
||||||
"env": {
|
"port": 9229
|
||||||
"CI": "true"
|
|
||||||
},
|
|
||||||
"disableOptimisticBPs": true
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
Vendored
+78
@@ -0,0 +1,78 @@
|
|||||||
|
{
|
||||||
|
"version": "2.0.0",
|
||||||
|
"tasks": [
|
||||||
|
{
|
||||||
|
"icon": {
|
||||||
|
"id": "server-environment"
|
||||||
|
},
|
||||||
|
"type": "shell",
|
||||||
|
"label": "Docker: Start Server",
|
||||||
|
"group": "none",
|
||||||
|
"command": [".vscode/bin/start-docker-server.sh"],
|
||||||
|
"runOptions": {
|
||||||
|
"runOn": "folderOpen"
|
||||||
|
},
|
||||||
|
"problemMatcher": []
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "npm",
|
||||||
|
"script": "tsc",
|
||||||
|
"problemMatcher": [],
|
||||||
|
"label": "npm: tsc",
|
||||||
|
"detail": "tsc -w",
|
||||||
|
"presentation": {
|
||||||
|
"reveal": "always",
|
||||||
|
"panel": "shared"
|
||||||
|
},
|
||||||
|
"runOptions": {
|
||||||
|
"runOn": "folderOpen"
|
||||||
|
},
|
||||||
|
"group": "test"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "npm",
|
||||||
|
"script": "test",
|
||||||
|
"problemMatcher": [],
|
||||||
|
"label": "npm: test",
|
||||||
|
"detail": "test",
|
||||||
|
"presentation": {
|
||||||
|
"reveal": "always",
|
||||||
|
"panel": "shared"
|
||||||
|
},
|
||||||
|
"runOptions": {
|
||||||
|
"runOn": "folderOpen"
|
||||||
|
},
|
||||||
|
"group": "test"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "npm",
|
||||||
|
"script": "storybook",
|
||||||
|
"problemMatcher": [],
|
||||||
|
"label": "npm: storybook",
|
||||||
|
"detail": "start-storybook -p 6006 -s public",
|
||||||
|
"promptOnClose": true,
|
||||||
|
"runOptions": {
|
||||||
|
"runOn": "folderOpen"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "npm",
|
||||||
|
"script": "build",
|
||||||
|
"problemMatcher": [],
|
||||||
|
"label": "npm: build",
|
||||||
|
"detail": "react-scripts build",
|
||||||
|
"group": "build"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "npm",
|
||||||
|
"script": "start",
|
||||||
|
"problemMatcher": [],
|
||||||
|
"label": "npm: start",
|
||||||
|
"detail": "react-scripts start",
|
||||||
|
"promptOnClose": true,
|
||||||
|
"runOptions": {
|
||||||
|
"runOn": "folderOpen"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
+13
-40
@@ -1,46 +1,19 @@
|
|||||||
# Getting Started with Create React App
|
# Development Guide
|
||||||
|
|
||||||
This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
|
## Prerequisites
|
||||||
|
|
||||||
## Available Scripts
|
- https://code.visualstudio.com/
|
||||||
|
- https://nodejs.org/en/
|
||||||
|
- https://www.docker.com/
|
||||||
|
|
||||||
In the project directory, you can run:
|
## Setup
|
||||||
|
|
||||||
### `yarn start`
|
Open this folder directly with vscode. As soon as it happens you will be prompted to install certain extensions and you should see a few tasks automatically spin up. Primarily:
|
||||||
|
|
||||||
Runs the app in the development mode.\
|
- `npm: tsc`: scans code and validate the syntax is correct
|
||||||
Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
|
- `npm: test`: automatically run test cases
|
||||||
|
- `npm: start`: automatically starts the webap on port `3000`
|
||||||
|
- `npm: storybook`: automatically starts storybook on port `6006` (I recommend you develop containers using this first!)
|
||||||
|
- `Docker: Server`: this will start the Shortumation server as well as a development Homeassistant container (you can access these over locahost:8123 and localhost:8000).
|
||||||
|
|
||||||
The page will reload if you make edits.\
|
If you don't need some of these, you can turn them off by selecting the 'trash can' icon to their right.
|
||||||
You will also see any lint errors in the console.
|
|
||||||
|
|
||||||
### `yarn test`
|
|
||||||
|
|
||||||
Launches the test runner in the interactive watch mode.\
|
|
||||||
See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
|
|
||||||
|
|
||||||
### `yarn build`
|
|
||||||
|
|
||||||
Builds the app for production to the `build` folder.\
|
|
||||||
It correctly bundles React in production mode and optimizes the build for the best performance.
|
|
||||||
|
|
||||||
The build is minified and the filenames include the hashes.\
|
|
||||||
Your app is ready to be deployed!
|
|
||||||
|
|
||||||
See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
|
|
||||||
|
|
||||||
### `yarn eject`
|
|
||||||
|
|
||||||
**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
|
|
||||||
|
|
||||||
If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
|
|
||||||
|
|
||||||
Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
|
|
||||||
|
|
||||||
You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
|
|
||||||
|
|
||||||
## Learn More
|
|
||||||
|
|
||||||
You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
|
|
||||||
|
|
||||||
To learn React, check out the [React documentation](https://reactjs.org/).
|
|
||||||
@@ -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:
|
||||||
|
- 8123: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"
|
||||||
|
- "../api:/app"
|
||||||
|
- "../docker/bin:/app/bin"
|
||||||
|
- "./build:/app/web"
|
||||||
|
networks:
|
||||||
|
- main
|
||||||
|
ports:
|
||||||
|
- "8000:8000"
|
||||||
|
env_file:
|
||||||
|
- ./development_config/.env
|
||||||
|
entrypoint: hypercorn src.app:app --reload -b 0.0.0.0:8000
|
||||||
|
|
||||||
|
networks:
|
||||||
|
main:
|
||||||
+49
-30
@@ -4,22 +4,36 @@
|
|||||||
"private": true,
|
"private": true,
|
||||||
"homepage": ".",
|
"homepage": ".",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@types/jest": "^26.0.15",
|
"@emotion/react": "11.9.3",
|
||||||
"@types/node": "^12.0.0",
|
"@emotion/styled": "11.9.3",
|
||||||
"@types/react": "^17.0.0",
|
"@mui/icons-material": "5.8.4",
|
||||||
"@types/react-dom": "^17.0.0",
|
"@mui/material": "5.8.6",
|
||||||
"jss": "^10.8.2",
|
"@mui/styles": "5.8.6",
|
||||||
"react": "^17.0.2",
|
"@types/jest": "28.1.6",
|
||||||
"react-dom": "^17.0.2",
|
"@types/node": "17.0.36",
|
||||||
"react-flow-renderer": "^10.1.2",
|
"@types/react": "18.0.15",
|
||||||
"react-jss": "^10.8.2",
|
"@types/react-dom": "18.0.6",
|
||||||
"react-router-dom": "6",
|
"@types/ws": "8.5.3",
|
||||||
"react-scripts": "4.0.3",
|
"@uiw/react-codemirror": "4.10.4",
|
||||||
"superstruct": "^0.15.4",
|
"autosuggest-highlight": "3.3.4",
|
||||||
"theming": "^3.3.0",
|
"home-assistant-js-websocket": "7.1.0",
|
||||||
"typescript": "^4.1.2",
|
"jss": "10.9.1",
|
||||||
"web-vitals": "^1.0.1",
|
"material-ui-confirm": "3.0.4",
|
||||||
"yarn": "^1.22.17"
|
"notistack": "2.0.5",
|
||||||
|
"react": "18.2.0",
|
||||||
|
"react-cookie": "4.1.1",
|
||||||
|
"react-dom": "18.2.0",
|
||||||
|
"react-flow-renderer": "10.3.12",
|
||||||
|
"react-imask": "6.4.2",
|
||||||
|
"react-jss": "10.9.1",
|
||||||
|
"react-router-dom": "6.3.0",
|
||||||
|
"react-scripts": "5.0.1",
|
||||||
|
"superstruct": "0.16.0",
|
||||||
|
"theming": "3.3.0",
|
||||||
|
"typescript": "4.7.4",
|
||||||
|
"web-vitals": "2.1.4",
|
||||||
|
"ws": "8.8.0",
|
||||||
|
"yarn": "1.22.19"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "react-scripts start",
|
"start": "react-scripts start",
|
||||||
@@ -62,20 +76,25 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@storybook/addon-actions": "^6.4.22",
|
"@storybook/addon-actions": "6.5.9",
|
||||||
"@storybook/addon-essentials": "^6.4.22",
|
"@storybook/addon-essentials": "6.5.9",
|
||||||
"@storybook/addon-links": "^6.4.22",
|
"@storybook/addon-links": "6.5.9",
|
||||||
"@storybook/addon-queryparams": "^6.2.9",
|
"@storybook/addon-queryparams": "6.2.9",
|
||||||
"@storybook/node-logger": "^6.4.22",
|
"@storybook/builder-webpack5": "6.5.9",
|
||||||
"@storybook/preset-create-react-app": "^3.2.0",
|
"@storybook/manager-webpack5": "6.5.9",
|
||||||
"@storybook/react": "^6.4.22",
|
"@storybook/node-logger": "6.5.9",
|
||||||
"@testing-library/jest-dom": "^5.11.4",
|
"@storybook/preset-create-react-app": "4.1.2",
|
||||||
"@testing-library/react": "^11.1.0",
|
"@storybook/react": "6.5.9",
|
||||||
"@testing-library/user-event": "^12.1.10",
|
"@testing-library/jest-dom": "5.16.4",
|
||||||
"@types/chroma-js": "^2.1.3",
|
"@testing-library/react": "13.3.0",
|
||||||
"@types/js-yaml": "^4.0.5",
|
"@testing-library/user-event": "14.3.0",
|
||||||
"jest-environment-jsdom": "^27.5.1",
|
"@types/autosuggest-highlight": "3.2.0",
|
||||||
"ts-node": "^10.4.0"
|
"@types/chroma-js": "2.1.4",
|
||||||
|
"@types/js-yaml": "4.0.5",
|
||||||
|
"jest-environment-jsdom": "28.1.3",
|
||||||
|
"ts-node": "10.9.1",
|
||||||
|
"webpack": "5.74.0",
|
||||||
|
"webpack-dev-server": "4.9.3"
|
||||||
},
|
},
|
||||||
"moduleDirectories": [
|
"moduleDirectories": [
|
||||||
"node_modules",
|
"node_modules",
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 3.8 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 19 KiB |
@@ -3,11 +3,11 @@
|
|||||||
|
|
||||||
<head>
|
<head>
|
||||||
<meta charset="utf-8" />
|
<meta charset="utf-8" />
|
||||||
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
|
<link rel="icon" href="%PUBLIC_URL%/icon.png" />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||||
<meta name="description" content="An easier way to maintain automations & scripts in
|
<meta name="description" content="An easier way to maintain automations & scripts in
|
||||||
home-assistant" />
|
home-assistant" />
|
||||||
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
|
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo.png" />
|
||||||
<!--
|
<!--
|
||||||
manifest.json provides metadata used when your web app is installed on a
|
manifest.json provides metadata used when your web app is installed on a
|
||||||
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
|
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 54 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 9.4 KiB |
@@ -1,21 +1,16 @@
|
|||||||
{
|
{
|
||||||
"short_name": "React App",
|
"short_name": "Shortumation",
|
||||||
"name": "Create React App Sample",
|
"name": "Shortumation",
|
||||||
"icons": [
|
"icons": [
|
||||||
{
|
{
|
||||||
"src": "favicon.ico",
|
"src": "favicon.png",
|
||||||
"sizes": "64x64 32x32 24x24 16x16",
|
"sizes": "64x64 32x32 24x24 16x16",
|
||||||
"type": "image/x-icon"
|
"type": "image/png"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"src": "logo192.png",
|
"src": "logo.png",
|
||||||
"type": "image/png",
|
"type": "image/png",
|
||||||
"sizes": "192x192"
|
"sizes": "192x192 512x512"
|
||||||
},
|
|
||||||
{
|
|
||||||
"src": "logo512.png",
|
|
||||||
"type": "image/png",
|
|
||||||
"sizes": "512x512"
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"start_url": ".",
|
"start_url": ".",
|
||||||
|
|||||||
@@ -1,12 +1,14 @@
|
|||||||
import App from "./App";
|
import App from "./App";
|
||||||
import { withQuery } from "@storybook/addon-queryparams";
|
import { withQuery } from "@storybook/addon-queryparams";
|
||||||
|
import { makeStory } from "devUtils";
|
||||||
|
|
||||||
const book = {
|
const { make, componentMeta } = makeStory({
|
||||||
title: "App/App",
|
Component: App,
|
||||||
decorators: [withQuery],
|
meta: {
|
||||||
component: App
|
title: "App",
|
||||||
};
|
decorators: [withQuery],
|
||||||
|
},
|
||||||
|
});
|
||||||
|
export default componentMeta;
|
||||||
|
|
||||||
export const Basic = () => <App />
|
export const RootApp = make({});
|
||||||
|
|
||||||
export default book;
|
|
||||||
+9
-5
@@ -3,17 +3,21 @@ import { Routes, Route, BrowserRouter } from "react-router-dom";
|
|||||||
import { AutomationRoute } from 'routes/automation';
|
import { AutomationRoute } from 'routes/automation';
|
||||||
import { useConnectedApiService } from 'apiService';
|
import { useConnectedApiService } from 'apiService';
|
||||||
import { ErrorBoundary } from 'components/ErrorBoundary';
|
import { ErrorBoundary } from 'components/ErrorBoundary';
|
||||||
|
import { CookiesProvider } from "react-cookie";
|
||||||
|
|
||||||
function App() {
|
function App() {
|
||||||
const api = useConnectedApiService();
|
const api = useConnectedApiService();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="app">
|
<div className="app">
|
||||||
<ErrorBoundary>
|
<ErrorBoundary>
|
||||||
<BrowserRouter>
|
<CookiesProvider>
|
||||||
<Routes>
|
<BrowserRouter>
|
||||||
<Route path="*" element={<AutomationRoute api={api} />} />
|
<Routes>
|
||||||
</Routes>
|
<Route path="*" element={<AutomationRoute api={api} />} />
|
||||||
</BrowserRouter>
|
</Routes>
|
||||||
|
</BrowserRouter>
|
||||||
|
</CookiesProvider>
|
||||||
</ErrorBoundary>
|
</ErrorBoundary>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,27 +1,46 @@
|
|||||||
import { AutomationData } from "types/automations";
|
import { AutomationData } from "types/automations";
|
||||||
import { API } from "./base";
|
import { API } from "./base";
|
||||||
import { ListData, ListParams } from "./types";
|
import { ListData, ListParams } from "./types";
|
||||||
import { AUTOMTAION_LIST, AUTOMTAION_ITEM } from './paths';
|
import {
|
||||||
|
AUTOMTAION_LIST,
|
||||||
|
AUTOMTAION_ITEM,
|
||||||
|
AUTOMTAION_ITEM_TAGS,
|
||||||
|
} from "./paths";
|
||||||
|
|
||||||
export const makeAutomationAPI = (api: API) => ({
|
export const makeAutomationAPI = (api: API) => ({
|
||||||
async list({ offset, limit }: ListParams) {
|
async list({ offset, limit }: ListParams) {
|
||||||
const data = await api.makeCall<ListData<AutomationData>, ListParams>({
|
const data = await api.makeCall<ListData<AutomationData>, ListParams>({
|
||||||
path: AUTOMTAION_LIST,
|
path: AUTOMTAION_LIST,
|
||||||
data: {
|
data: {
|
||||||
offset, limit,
|
offset,
|
||||||
}
|
limit,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
return data;
|
return data;
|
||||||
},
|
},
|
||||||
async update({ index, auto }: { index: number, auto: AutomationData }) {
|
async update({ index, auto }: { index: number; auto: AutomationData }) {
|
||||||
return await api.makeCall({
|
return await api.makeCall({
|
||||||
path: AUTOMTAION_ITEM,
|
path: AUTOMTAION_ITEM,
|
||||||
data: {
|
data: {
|
||||||
index,
|
index,
|
||||||
data: auto
|
data: auto,
|
||||||
},
|
},
|
||||||
})
|
});
|
||||||
|
},
|
||||||
|
async updateTags({
|
||||||
|
automation_id,
|
||||||
|
tags,
|
||||||
|
}: {
|
||||||
|
automation_id: string;
|
||||||
|
tags: Record<string, string>;
|
||||||
|
}) {
|
||||||
|
return await api.makeCall({
|
||||||
|
path: AUTOMTAION_ITEM_TAGS,
|
||||||
|
data: {
|
||||||
|
automation_id,
|
||||||
|
tags,
|
||||||
|
},
|
||||||
|
});
|
||||||
},
|
},
|
||||||
async remove({ index }: { index: number }) {
|
async remove({ index }: { index: number }) {
|
||||||
return await api.makeCall({
|
return await api.makeCall({
|
||||||
@@ -29,10 +48,9 @@ export const makeAutomationAPI = (api: API) => ({
|
|||||||
path: AUTOMTAION_ITEM,
|
path: AUTOMTAION_ITEM,
|
||||||
data: {
|
data: {
|
||||||
index,
|
index,
|
||||||
}
|
},
|
||||||
})
|
});
|
||||||
}
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
export type AutomationAPI = ReturnType<typeof makeAutomationAPI>;
|
export type AutomationAPI = ReturnType<typeof makeAutomationAPI>;
|
||||||
@@ -10,13 +10,16 @@ export const makeRemoteAPI = (baseURL: string): API => ({
|
|||||||
data = {}
|
data = {}
|
||||||
}) {
|
}) {
|
||||||
try {
|
try {
|
||||||
const reply = await fetch(baseURL + path, {
|
const payload: RequestInit = {
|
||||||
method,
|
method,
|
||||||
headers: {
|
headers: {
|
||||||
"Content-Type": "application/json"
|
"Content-Type": "application/json"
|
||||||
},
|
},
|
||||||
body: JSON.stringify(data),
|
};
|
||||||
});
|
if (method !== 'GET') {
|
||||||
|
payload["body"] = JSON.stringify(data);
|
||||||
|
}
|
||||||
|
const reply = await fetch(baseURL + path, payload);
|
||||||
let response: APIResponse<any>;
|
let response: APIResponse<any>;
|
||||||
if (reply.status === 200) {
|
if (reply.status === 200) {
|
||||||
response = {
|
response = {
|
||||||
|
|||||||
@@ -1,15 +1,16 @@
|
|||||||
import { useEffect } from 'react';
|
import { useEffect } from "react";
|
||||||
import { useDefaultApiState, makeReloadAutomations } from './util';
|
import { useDefaultApiState, makeReloadAutomations } from "./util";
|
||||||
import { AutomationAPI } from './automations';
|
import { AutomationAPI } from "./automations";
|
||||||
|
|
||||||
export type ApiService = ReturnType<typeof useAPIService>;
|
export type ApiService = ReturnType<typeof useAPIService>;
|
||||||
export const useAPIService = (
|
export const useAPIService = (automationAPI: AutomationAPI) => {
|
||||||
automationAPI: AutomationAPI
|
|
||||||
) => {
|
|
||||||
// state
|
// state
|
||||||
const [state, setState] = useDefaultApiState();
|
const [state, setState] = useDefaultApiState();
|
||||||
const { reload, wrapCall } = makeReloadAutomations(automationAPI, state, setState);
|
const { reload, wrapCall } = makeReloadAutomations(
|
||||||
|
automationAPI,
|
||||||
|
state,
|
||||||
|
setState
|
||||||
|
);
|
||||||
|
|
||||||
// initial load of autos
|
// initial load of autos
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -21,5 +22,6 @@ export const useAPIService = (
|
|||||||
state,
|
state,
|
||||||
removeAutomation: wrapCall(automationAPI.remove),
|
removeAutomation: wrapCall(automationAPI.remove),
|
||||||
updateAutomation: wrapCall(automationAPI.update),
|
updateAutomation: wrapCall(automationAPI.update),
|
||||||
}
|
updateTags: wrapCall(automationAPI.updateTags),
|
||||||
}
|
};
|
||||||
|
};
|
||||||
@@ -1,18 +1,24 @@
|
|||||||
import { AutomationData } from 'types/automations';
|
import { AutomationData } from "types/automations";
|
||||||
import { makeAutomationAPI } from './automations';
|
import { makeAutomationAPI } from "./automations";
|
||||||
import { makeRemoteAPI } from "./base";
|
import { makeRemoteAPI } from "./base";
|
||||||
import { useAPIService } from './core';
|
import { useAPIService } from "./core";
|
||||||
import { useMockAPI } from "./mock";
|
import { useMockAPI } from "./mock";
|
||||||
|
import { useRef } from "react";
|
||||||
|
|
||||||
const locationPrefixWeb = window.location.pathname.match(/(.+)\/web/i);
|
const locationPrefixWeb = window.location.pathname.match(/(\/.+\/)web/i);
|
||||||
|
const baseURL = new URL(
|
||||||
export const useConnectedApiService = () => useAPIService(
|
process.env.NODE_ENV === "development"
|
||||||
makeAutomationAPI(makeRemoteAPI(
|
? `http://${window.location.hostname}:8000`
|
||||||
process.env.NODE_ENV === 'development' ?
|
: window.location.origin + (!locationPrefixWeb ? "" : locationPrefixWeb[1])
|
||||||
"http://localhost:8000/automations" :
|
|
||||||
(!locationPrefixWeb ? '' : locationPrefixWeb[1]) + "/automations"
|
|
||||||
))
|
|
||||||
);
|
|
||||||
export const useMockApiService = (initialAutos: AutomationData[]) => useAPIService(
|
|
||||||
makeAutomationAPI(useMockAPI(initialAutos))
|
|
||||||
);
|
);
|
||||||
|
export const wsURL = baseURL + "socket";
|
||||||
|
export const remoteAutoAPI = makeRemoteAPI(baseURL + "automations");
|
||||||
|
export const useConnectedApiService = () =>
|
||||||
|
useAPIService(makeAutomationAPI(remoteAutoAPI));
|
||||||
|
export const useMockApiService = (
|
||||||
|
initialAutos: AutomationData[],
|
||||||
|
returnErrors: boolean = false
|
||||||
|
) =>
|
||||||
|
useAPIService(
|
||||||
|
makeAutomationAPI(useMockAPI(initialAutos, useRef, returnErrors))
|
||||||
|
);
|
||||||
@@ -1,57 +1,93 @@
|
|||||||
import { useMockAPI } from "./mock"
|
import { useMockAPI } from "./mock";
|
||||||
import { makeAutomationAPI } from "./automations";
|
import { makeAutomationAPI } from "./automations";
|
||||||
import { createMockAuto } from '../utils/mocks';
|
import { createMockAuto } from "../utils/mocks";
|
||||||
|
import { AutomationData } from "types/automations";
|
||||||
|
|
||||||
const fakeUseRef = (a: any) => ({ current: a });
|
const fakeUseRef = (a: any) => ({ current: a });
|
||||||
|
|
||||||
test('mock api uses initial autos for initial population -- empty', async () => {
|
test("mock api uses initial autos for initial population -- empty", async () => {
|
||||||
const mockApi = makeAutomationAPI(useMockAPI([], fakeUseRef as any));
|
const mockApi = makeAutomationAPI(useMockAPI([], fakeUseRef as any));
|
||||||
const data = await mockApi.list({ limit: 10, offset: 0 });
|
const data = await mockApi.list({ limit: 10, offset: 0 });
|
||||||
expect(data.ok).toBe(true);
|
expect(data.ok).toBe(true);
|
||||||
expect((data as any).data.data).toHaveLength(0);
|
expect((data as any).data.data).toHaveLength(0);
|
||||||
expect((data as any).data.totalItems).toBe(0);
|
expect((data as any).data.totalItems).toBe(0);
|
||||||
})
|
});
|
||||||
|
|
||||||
test('mock api uses initial autos for initial population -- some data', async () => {
|
test("mock api uses initial autos for initial population -- some data", async () => {
|
||||||
const initials = [
|
const initials = [createMockAuto(), createMockAuto()];
|
||||||
createMockAuto(),
|
|
||||||
createMockAuto()
|
|
||||||
];
|
|
||||||
const mockApi = makeAutomationAPI(useMockAPI(initials, fakeUseRef as any));
|
const mockApi = makeAutomationAPI(useMockAPI(initials, fakeUseRef as any));
|
||||||
const data = await mockApi.list({ limit: 10, offset: 0 });
|
const data = await mockApi.list({ limit: 10, offset: 0 });
|
||||||
expect(data.ok).toBe(true);
|
expect(data.ok).toBe(true);
|
||||||
expect((data as any).data.data).toHaveLength(2);
|
expect((data as any).data.data).toHaveLength(2);
|
||||||
expect((data as any).data.totalItems).toBe(2);
|
expect((data as any).data.totalItems).toBe(2);
|
||||||
})
|
});
|
||||||
|
|
||||||
test('populate mock api with some data', async () => {
|
test("populate mock api with some data", async () => {
|
||||||
const mockApi = makeAutomationAPI(useMockAPI([], fakeUseRef as any));
|
const mockApi = makeAutomationAPI(useMockAPI([], fakeUseRef as any));
|
||||||
await mockApi.update({index: 0, auto: createMockAuto()})
|
await mockApi.update({ index: 0, auto: createMockAuto() });
|
||||||
let data = await mockApi.list({ limit: 10, offset: 0 });
|
let data = await mockApi.list({ limit: 10, offset: 0 });
|
||||||
expect(data.ok).toBe(true);
|
expect(data.ok).toBe(true);
|
||||||
expect((data as any).data.data).toHaveLength(1);
|
expect((data as any).data.data).toHaveLength(1);
|
||||||
expect((data as any).data.totalItems).toBe(1);
|
expect((data as any).data.totalItems).toBe(1);
|
||||||
await mockApi.update({index: 1, auto: createMockAuto()})
|
await mockApi.update({ index: 1, auto: createMockAuto() });
|
||||||
data = await mockApi.list({ limit: 10, offset: 0 });
|
data = await mockApi.list({ limit: 10, offset: 0 });
|
||||||
expect((data as any).data.data).toHaveLength(2);
|
expect((data as any).data.data).toHaveLength(2);
|
||||||
expect((data as any).data.totalItems).toBe(2);
|
expect((data as any).data.totalItems).toBe(2);
|
||||||
})
|
});
|
||||||
|
|
||||||
test('delete/update data from mock api', async () => {
|
test("delete/update data from mock api", async () => {
|
||||||
const mockApi = makeAutomationAPI(useMockAPI([
|
const mockApi = makeAutomationAPI(
|
||||||
createMockAuto(),
|
useMockAPI(
|
||||||
createMockAuto(),
|
[
|
||||||
createMockAuto(),
|
createMockAuto(),
|
||||||
createMockAuto(),
|
createMockAuto(),
|
||||||
createMockAuto(),
|
createMockAuto(),
|
||||||
], fakeUseRef as any));
|
createMockAuto(),
|
||||||
let data = (await mockApi.list({ limit: 10, offset: 0 }) as any).data.data;
|
createMockAuto(),
|
||||||
|
],
|
||||||
|
fakeUseRef as any
|
||||||
|
)
|
||||||
|
);
|
||||||
|
let data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data.data;
|
||||||
const toBeEdited = data[0];
|
const toBeEdited = data[0];
|
||||||
toBeEdited.metadata.alias = "Bob is my uncle";
|
toBeEdited.metadata.alias = "Bob is my uncle";
|
||||||
await mockApi.update({index: 0, auto: toBeEdited})
|
await mockApi.update({ index: 0, auto: toBeEdited });
|
||||||
data = (await mockApi.list({ limit: 10, offset: 0 }) as any).data.data;
|
data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data.data;
|
||||||
expect(data[0].metadata.alias).toEqual("Bob is my uncle");
|
expect(data[0].metadata.alias).toEqual("Bob is my uncle");
|
||||||
await mockApi.remove({index: 0})
|
await mockApi.remove({ index: 0 });
|
||||||
data = (await mockApi.list({ limit: 10, offset: 0 }) as any).data.data;
|
data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data.data;
|
||||||
expect(data[0].metadata.alias === "Bob is my uncle").toEqual(false);
|
expect(data[0].metadata.alias === "Bob is my uncle").toEqual(false);
|
||||||
})
|
});
|
||||||
|
|
||||||
|
test("update tags from mock api", async () => {
|
||||||
|
const mockApi = makeAutomationAPI(
|
||||||
|
useMockAPI(
|
||||||
|
[
|
||||||
|
createMockAuto(),
|
||||||
|
createMockAuto(),
|
||||||
|
createMockAuto(),
|
||||||
|
createMockAuto(),
|
||||||
|
createMockAuto(),
|
||||||
|
],
|
||||||
|
fakeUseRef as any
|
||||||
|
)
|
||||||
|
);
|
||||||
|
let data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data
|
||||||
|
.data as AutomationData[];
|
||||||
|
const autoId = data[0].metadata.id;
|
||||||
|
expect(data[0].tags).toStrictEqual({});
|
||||||
|
mockApi.updateTags({
|
||||||
|
automation_id: autoId,
|
||||||
|
tags: {
|
||||||
|
room: "bathroom",
|
||||||
|
type: "popup",
|
||||||
|
},
|
||||||
|
});
|
||||||
|
data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data
|
||||||
|
.data as AutomationData[];
|
||||||
|
expect(data[0].metadata.id).toEqual(autoId);
|
||||||
|
expect(data[0].tags).toStrictEqual({
|
||||||
|
room: "bathroom",
|
||||||
|
type: "popup",
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -1,33 +1,41 @@
|
|||||||
import { useRef } from 'react';
|
import { useRef } from "react";
|
||||||
import { AutomationData } from 'types/automations';
|
import { AutomationData } from "types/automations";
|
||||||
import { API } from './base';
|
import { API } from "./base";
|
||||||
import { AUTOMTAION_LIST, AUTOMTAION_ITEM } from './paths';
|
import {
|
||||||
|
AUTOMTAION_LIST,
|
||||||
|
AUTOMTAION_ITEM,
|
||||||
|
AUTOMTAION_ITEM_TAGS,
|
||||||
|
} from "./paths";
|
||||||
|
|
||||||
export const useMockAPI = (
|
export const useMockAPI = (
|
||||||
initialAutos: AutomationData[] = [],
|
initialAutos: AutomationData[] = [],
|
||||||
makeRef = useRef,
|
makeRef = useRef,
|
||||||
|
returnErrors: boolean = false
|
||||||
): API => {
|
): API => {
|
||||||
const automationsRef = makeRef(initialAutos);
|
const automationsRef = makeRef(initialAutos);
|
||||||
return {
|
return {
|
||||||
async makeCall({
|
async makeCall({ path, method = "POST", data = {} }) {
|
||||||
path,
|
if (returnErrors) {
|
||||||
method = "POST",
|
return {
|
||||||
data = {}
|
ok: false,
|
||||||
}) {
|
error: "Test Error",
|
||||||
console.debug("[[mockCall]]", method, path, data);
|
};
|
||||||
|
}
|
||||||
|
// console.debug("[[mockCall]]", method, path, data);
|
||||||
if (path === AUTOMTAION_LIST) {
|
if (path === AUTOMTAION_LIST) {
|
||||||
return {
|
return {
|
||||||
ok: true,
|
ok: true,
|
||||||
data: JSON.parse(JSON.stringify({
|
data: JSON.parse(
|
||||||
totalItems: automationsRef.current.length,
|
JSON.stringify({
|
||||||
params: { offset: 0, limit: 100 },
|
totalItems: automationsRef.current.length,
|
||||||
data: automationsRef.current,
|
params: { offset: 0, limit: 100 },
|
||||||
}))
|
data: automationsRef.current,
|
||||||
} as any
|
})
|
||||||
|
),
|
||||||
|
} as any;
|
||||||
}
|
}
|
||||||
if (path === AUTOMTAION_ITEM) {
|
if (path === AUTOMTAION_ITEM) {
|
||||||
if (method === 'POST') {
|
if (method === "POST") {
|
||||||
const { index, data: auto } = data as any;
|
const { index, data: auto } = data as any;
|
||||||
if (index >= automationsRef.current.length) {
|
if (index >= automationsRef.current.length) {
|
||||||
automationsRef.current = [...automationsRef.current, auto];
|
automationsRef.current = [...automationsRef.current, auto];
|
||||||
@@ -35,29 +43,45 @@ export const useMockAPI = (
|
|||||||
automationsRef.current = [
|
automationsRef.current = [
|
||||||
...automationsRef.current.slice(0, index),
|
...automationsRef.current.slice(0, index),
|
||||||
auto,
|
auto,
|
||||||
...automationsRef.current.slice(index + 1)
|
...automationsRef.current.slice(index + 1),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
ok: true,
|
ok: true,
|
||||||
data: {}
|
data: {},
|
||||||
}
|
};
|
||||||
} else if (method === "DELETE") {
|
} else if (method === "DELETE") {
|
||||||
const { index } = data as any;
|
const { index } = data as any;
|
||||||
automationsRef.current = [
|
automationsRef.current = [
|
||||||
...automationsRef.current.slice(0, index),
|
...automationsRef.current.slice(0, index),
|
||||||
...automationsRef.current.slice(index + 1)
|
...automationsRef.current.slice(index + 1),
|
||||||
];
|
];
|
||||||
return {
|
return {
|
||||||
ok: true,
|
ok: true,
|
||||||
data: {}
|
data: {},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (path === AUTOMTAION_ITEM_TAGS) {
|
||||||
|
if (method === "POST") {
|
||||||
|
const { automation_id, tags } = data as any;
|
||||||
|
for (let i = 0; i < automationsRef.current.length; i++) {
|
||||||
|
const auto = automationsRef.current[i];
|
||||||
|
if (auto.metadata.id === automation_id) {
|
||||||
|
automationsRef.current[i].tags = JSON.parse(JSON.stringify(tags));
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
return {
|
||||||
|
ok: true,
|
||||||
|
data: {},
|
||||||
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
ok: false,
|
ok: false,
|
||||||
error: "PATH NOT FOUND " + method + ": " + path,
|
error: "PATH NOT FOUND " + method + ": " + path,
|
||||||
}
|
};
|
||||||
}
|
},
|
||||||
}
|
};
|
||||||
}
|
};
|
||||||
@@ -1,5 +1,4 @@
|
|||||||
|
export const AUTOMTAION_ROOT = "/" as const;
|
||||||
|
|
||||||
export const AUTOMTAION_ROOT = '/' as const;
|
|
||||||
export const AUTOMTAION_LIST = `${AUTOMTAION_ROOT}list` as const;
|
export const AUTOMTAION_LIST = `${AUTOMTAION_ROOT}list` as const;
|
||||||
export const AUTOMTAION_ITEM = `${AUTOMTAION_ROOT}item` as const;
|
export const AUTOMTAION_ITEM = `${AUTOMTAION_ROOT}item` as const;
|
||||||
|
export const AUTOMTAION_ITEM_TAGS = `${AUTOMTAION_ITEM}/tags` as const;
|
||||||
Loaded 100 of 371 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user