Compare commits

...
473 Commits
Author SHA1 Message Date
ari 67f5358f45 $ 2022-07-21 09:55:01 -04:00
ari c40e441f33 t2 2022-07-21 09:53:27 -04:00
ari a3ee13e8e3 rename test 2022-07-21 09:50:41 -04:00
ari a3fa409eda pre 2022-07-21 09:49:49 -04:00
ari 7ac7d60468 testing releases 2022-07-21 09:49:16 -04:00
dependabot[bot] cb34db3c86 Bump terser from 4.8.0 to 4.8.1 in /webapp (#80)
Bumps [terser](https://github.com/terser/terser) from 4.8.0 to 4.8.1.
- [Release notes](https://github.com/terser/terser/releases)
- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/terser/terser/commits)

---
updated-dependencies:
- dependency-name: terser
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-07-21 09:37:44 -04:00
ari ea8697137a fixed pytests 2022-07-21 09:37:23 -04:00
Ari Sosnovsky e9246a5b6c Update TriggerTime.tsx 2022-07-20 22:45:18 -04:00
Ari Sosnovsky d121082d4f Update triggers.ts 2022-07-20 22:44:10 -04:00
Ari Sosnovsky 2605978b43 Update editorRender.tsx 2022-07-20 22:43:18 -04:00
Ari Sosnovsky f5b21be26d Update README.md 2022-07-20 22:19:27 -04:00
ari 582859b35b added weekday and refactored condition time 2022-07-20 22:13:46 -04:00
ari 184734ee70 abstracted away input time entity 2022-07-20 22:13:46 -04:00
ari 3a44057a40 cleaned up time trigger 2022-07-20 22:13:46 -04:00
Ari Sosnovsky ef02abe0cb Update README.md 2022-07-19 21:59:37 -04:00
ari 1d52993253 cleaned up unused 2022-07-19 21:47:36 -04:00
ari 50031c4868 area id incorrect errror 2022-07-19 21:22:49 -04:00
ari b3dae6fea7 fixed area id incorrect error 2022-07-19 21:22:43 -04:00
ari fd35938fcb fixed state 2022-07-19 21:13:19 -04:00
ari 649ee0f31e fixed zones 2022-07-19 20:59:11 -04:00
ari e7110dc97b new conditions open up in edit mode 2022-07-19 20:44:37 -04:00
ari dcf577f84c cleaned up choose + distance between nodes 2022-07-19 20:27:02 -04:00
ari fabb5612d5 ground work for minimal tag update 2022-07-18 16:12:48 -04:00
ari 2958fa49f8 action fix 2022-07-18 14:29:33 -04:00
ari 211f5d8be7 updated actions + v0.3.2 2022-07-18 14:28:46 -04:00
ari 3dac905fda cleaner job 2022-07-18 13:50:50 -04:00
ari 75d70b1133 using slim 2022-07-18 13:47:59 -04:00
ari 47b0c89589 correct run.sh 2022-07-18 13:47:37 -04:00
ari 212349b4c0 nomo rust 2022-07-18 13:30:56 -04:00
ari a4789cf43e buster 2022-07-18 13:30:45 -04:00
ari 395a9d955e swiching to hypercorn 2022-07-18 13:30:33 -04:00
ari 937a3f97c4 switching to hypercorn 2022-07-18 13:30:24 -04:00
ari 6bb18563b4 using buster image 2022-07-18 12:58:57 -04:00
ari 2a9ba678d3 only run tests when api or webapp changes 2022-07-18 12:50:13 -04:00
ari 38e362a469 passing -y to rustup 2022-07-18 12:48:42 -04:00
ari b56b5fc184 added rust install 2022-07-18 12:41:32 -04:00
ari 1cce2d20f4 not publishing armhf 2022-07-18 11:58:26 -04:00
ari 717fada35e removed build from ignore 2022-07-18 10:46:30 -04:00
ari ca4be32d63 fixing docker image 2022-07-18 10:40:15 -04:00
ari ad4c1f66f2 fix commit build 2022-07-18 10:34:19 -04:00
ari 4af6b1688a using build stage 2022-07-18 10:07:03 -04:00
ari 045ce75362 added symlink 2022-07-17 20:56:26 -04:00
ari 442a49da8b fixed trigger validator 2022-07-17 20:47:45 -04:00
ari 8e859ff191 using n for docker node versions 2022-07-17 20:46:28 -04:00
ari 3b1b88b404 using buster image 2022-07-17 19:58:54 -04:00
ari 8306686e4c removed standard 2022-07-16 10:04:29 -04:00
ari 6d67dd129c upgrading alpine 2022-07-16 00:39:32 -04:00
ari 5086ecd993 imporoved build failures 2022-07-16 00:29:34 -04:00
ari bbb87ebf9e support for if/else 2022-07-15 23:41:14 -04:00
ari a1ca9d62b7 opening modal when adding new parallel node 2022-07-15 23:15:23 -04:00
ari 0e4e4783fa Moved infobox to modal 2022-07-15 22:53:51 -04:00
ari 1719148c58 editable title 2022-07-15 21:21:15 -04:00
ari 2ea96973ad top bar 2022-07-15 18:35:25 -04:00
ari a35e8e127f v0.3.1 2022-07-15 13:42:35 -04:00
renovate[bot] 46a67b1395 Update dependency @types/react to v18.0.15 (#75)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-07-15 13:26:40 -04:00
ari 6b465219a9 upping limits of display 2022-07-15 13:25:43 -04:00
ari e769a8e798 clean up
added mock large qty autos
2022-07-15 12:37:10 -04:00
ari d8a2dd53d5 ensuring triggers & conditions are not too close to one another 2022-07-15 12:02:02 -04:00
renovate[bot] 4aedd9323b Update dependency @types/jest to v28.1.5 (#74)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-07-15 11:08:29 -04:00
renovate[bot] 2fc984a3ae Update dependency @types/react-dom to v18.0.6 (#76)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-07-15 11:08:06 -04:00
renovate[bot] bbfc87a334 Update dependency autosuggest-highlight to v3.3.2 (#77)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-07-15 11:07:56 -04:00
ari bbe6a5abf3 better support for repeats 2022-07-15 11:07:02 -04:00
Ari Sosnovsky 9dd23fd8e7 Update README.md 2022-07-14 22:50:12 -04:00
Ari Sosnovsky 24b3beaf0a Update README.md 2022-07-14 22:42:06 -04:00
Ari Sosnovsky d55d86b177 Update CHANGELOG.md 2022-07-14 22:37:45 -04:00
Ari Sosnovsky 32fc5bce07 v0.3.0 2022-07-14 22:35:44 -04:00
ari 45ace08cbe parallel nodes 2022-07-14 17:50:37 -04:00
ari d4e2e2f1e5 Initial support for parallel 2022-07-14 16:09:17 -04:00
ari 50f1d2a42d clean up 2022-07-14 16:02:14 -04:00
ari 58f18232b7 fixed breakage 2022-07-14 16:01:54 -04:00
ari 8bf25547eb stop action 2022-07-14 15:43:12 -04:00
ari 07ab4b9089 condition + repeat node 2022-07-14 15:24:35 -04:00
ari 89c7007612 choose options 2022-07-13 15:03:22 -04:00
ari de2307901b repeat node initial support 2022-07-13 10:52:56 -04:00
ari f392cf17fd fixed typing for repeat 2022-07-12 22:04:13 -04:00
ari 595aa2dfa1 using new board 2022-07-12 21:28:45 -04:00
ari 2d78319683 choose no longer asks for missing values 2022-07-12 21:15:34 -04:00
ari befe293f1c expandable choose node 2022-07-12 21:12:03 -04:00
ari 0b381a6e50 renamed state to outputstate 2022-07-12 20:33:31 -04:00
ari b4f46bec92 zoom groups 2022-07-12 20:31:00 -04:00
ari 1661df888a state updater for choosenodes 2022-07-12 20:25:20 -04:00
ari 0c5ef76f4b fixed up styling for choose 2022-07-12 18:47:18 -04:00
ari 084a3585d0 hack for board zoom 2022-07-11 21:09:28 -04:00
ari 2cb2e779d7 refactor of graph pt2 2022-07-11 17:12:49 -04:00
ari 730c804c22 hacking nodes 2022-07-10 14:18:53 -04:00
ari 649c1fbdeb add in tooltip 2022-07-10 14:13:31 -04:00
ari edb3dafe12 sequence node drawing v1 2022-07-10 13:37:11 -04:00
ari 1d7b6e96c1 resizeable collection nodes 2022-07-10 13:12:37 -04:00
ari 7483f2b65d removed dead tests 2022-07-10 13:00:22 -04:00
ari e7dec306df flipped trigger + condition
createMode for condition editor
2022-07-10 12:59:33 -04:00
ari f549993d3e abstsracted away sequence node collections
added generic action updaters
2022-07-10 12:40:44 -04:00
ari d62c484f33 refactor of dagflow start 2022-07-09 19:22:04 -04:00
ari 3cb6070aca clean up 2022-07-05 23:02:17 -04:00
ari e94151cf94 renamed tests 2022-07-05 22:59:33 -04:00
ari 518563fddd fixed tests 2022-07-05 22:51:12 -04:00
ari 34394feb9d add to middle 2022-07-05 22:51:12 -04:00
renovate[bot] e8b76039a9 Update home-assistant/builder action to v2022.07.0 (#70)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-07-04 23:48:10 -04:00
ari 8c1f29226b cleaner nodes 2022-07-04 22:45:34 -04:00
ari 550795bf7f clean up 2022-07-04 22:40:20 -04:00
ari 905a5ac4d7 using more of mui colors 2022-07-04 22:38:55 -04:00
ari d50674c8fe passing mui colors to css 2022-07-04 22:24:48 -04:00
ari 81f22ccd2a modifiable tags 2022-07-04 22:06:21 -04:00
renovate[bot] 2b1b7526c3 Update dependency @uiw/react-codemirror to v4.10.4 (#68) 2022-07-03 14:22:56 -04:00
renovate[bot] 6e534f446d Update dependency autosuggest-highlight to v3.3.0 (#69) 2022-07-03 14:21:29 -04:00
renovate[bot] b3b1126a12 Pin dependency material-ui-confirm to 3.0.4 (#67) 2022-07-03 14:21:20 -04:00
renovate[bot] cf9f24f41e Update devDependencies (non-major) (#65) 2022-07-02 15:19:08 -04:00
renovate[bot] 897953b0db Update dependency yarn to v1.22.19 (#66) 2022-07-02 15:18:37 -04:00
renovate[bot] 3fadcd94b6 Update dependency @types/jest to v28.1.4 (#61) 2022-07-02 15:18:10 -04:00
ari a8229eb7bd - removed multi node
- updated tag updater
2022-07-01 14:28:18 -04:00
ari 72afaee719 fixed up renovate 2022-07-01 14:10:35 -04:00
ari 9a171c880e updated messages 2022-06-30 20:37:51 -04:00
ari 7488ecc3ae onSave 2022-06-30 20:37:51 -04:00
ari d99512d6e5 description for condition: time 2022-06-30 20:37:51 -04:00
renovate[bot]andAri Sosnovsky e6e57be3ed Update dependency jest-environment-jsdom to v28.1.2 (#63)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Ari Sosnovsky <asosnovsky@users.noreply.github.com>
2022-06-30 20:31:45 -04:00
ari 47f57c313e removed all window.confirm 2022-06-29 21:20:37 -04:00
ari dc3470fdf5 enabled/disabled 2022-06-29 20:56:46 -04:00
ari 5bd5c5e445 enable/disable node 2022-06-29 17:37:17 -04:00
ari 869c23212b desc to trigger zone 2022-06-29 17:04:39 -04:00
ari 08f7ee2393 zone description 2022-06-29 16:42:03 -04:00
ari 0088dd8448 cleaned up options styles 2022-06-29 16:34:59 -04:00
ari 4d9afbe26b cleaned up styles for node display 2022-06-29 15:07:55 -04:00
ari 9a43330501 schedule 2022-06-29 13:34:09 -04:00
renovate[bot] 6c78af45f6 Update dependency requests to v2.28.1 (#62)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-29 16:36:28 +00:00
renovate[bot] 1da9f44232 Update dependency uvicorn to v0.18.2 (#58)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-29 12:31:53 -04:00
ari 7b958f6c3b updated renovate 2022-06-29 12:27:11 -04:00
ari d08d091723 updated actions 2022-06-29 12:20:38 -04:00
ari 3371d6b95f updated actions 2022-06-29 12:20:28 -04:00
ari c07e1aca49 cleand up lint errors 2022-06-29 12:14:26 -04:00
ari cc2597c408 rebuilt condition editor 2022-06-29 12:12:05 -04:00
ari 6da5a7592e extracted speeddial 2022-06-29 12:12:05 -04:00
renovate[bot] fe4f0e9881 Update dependency coverage to v6 (#56) 2022-06-29 06:28:41 -04:00
renovate[bot] ff195796d8 Update dependency @types/jest to v28 (#55) 2022-06-29 06:28:24 -04:00
renovate[bot] fe2fd19be8 Update actions/setup-python action to v4 (#54) 2022-06-29 06:28:15 -04:00
renovate[bot] 3b6b34f6e5 Update styfle/cancel-workflow-action action to v0.10.0 (#57) 2022-06-29 06:28:01 -04:00
renovate[bot] a39755d599 Update dependency black to v22.6.0 (#60) 2022-06-29 06:27:44 -04:00
renovate[bot] bb1d8c6492 Update react monorepo to v18.2.0 (#53) 2022-06-28 23:26:51 -04:00
renovate[bot] 8780d206c9 Update material-ui monorepo to v5.8.6 (#59) 2022-06-28 23:26:08 -04:00
ari 1d1d52480a converted tags example 2022-06-27 19:15:03 -04:00
ari ec7c28adba using automation id instead of idx for tags 2022-06-25 23:04:03 -04:00
ari f120fcfd65 fixed up yaml 2022-06-25 22:51:57 -04:00
ari 5e3e499c9d removed more unused 2022-06-25 22:23:44 -04:00
ari 361bc9b7d6 fixed up unsued 2022-06-25 22:22:41 -04:00
ari 4eccd75058 moved the edit to the tooltip 2022-06-25 22:22:13 -04:00
renovate[bot] dc99d57964 Update dependency types-PyYAML to v6.0.9 (#51)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-25 22:11:28 -04:00
renovate[bot] 7233c50492 Update storybook monorepo to v6.5.9 (#36)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-25 22:10:29 -04:00
renovate[bot] e1fbb8103b Update home-assistant/builder action to v2022.06.2 (#52)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-25 22:09:35 -04:00
renovate[bot] 7d28ffd761 Update material-ui monorepo (#35)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-25 22:09:11 -04:00
renovate[bot] a9905956d8 Update dependency requests to v2.28.0 (#44)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-25 22:08:29 -04:00
renovate[bot]andAri Sosnovsky 7836a5281a Update dependency @uiw/react-codemirror to v4.9.4 (#37)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Ari Sosnovsky <asosnovsky@users.noreply.github.com>
2022-06-25 22:07:59 -04:00
renovate[bot] 213dc1517d Update dependency superstruct to v0.16.0 (#45)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-25 22:07:32 -04:00
renovate[bot] 983753afe1 Update dependency ws to v8.8.0 (#50)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-25 22:07:20 -04:00
renovate[bot] 2da4d4b929 Update dependency webpack to v5.73.0 (#49)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-25 22:06:59 -04:00
renovate[bot] 610a7c77b9 Update dependency python-decouple to v3.6 (#43)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-25 22:05:55 -04:00
renovate[bot] cd9bf9d8b7 Update dependency pydantic to v1.9.1 (#42)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-25 22:05:32 -04:00
renovate[bot] 3cb2725907 Update dependency types-requests to v2.28.0 (#46)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-25 22:05:11 -04:00
renovate[bot] 94ae295c9f Update dependency uvicorn to v0.18.1 (#47)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-24 20:46:05 -04:00
renovate[bot] f274f6281f Update dependency vulture to v2.4 (#48)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-24 20:45:54 -04:00
ari d62835ba80 updated actions 2022-06-24 20:44:54 -04:00
renovate[bot] f7762b823b Update dependency pre-commit to v2.19.0 (#41)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-23 22:58:55 -04:00
renovate[bot] aa1fb2f499 Update dependency mypy to v0.961 (#40)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-23 22:58:37 -04:00
renovate[bot] ed07e35830 Update dependency isort to v5.10.1 (#39)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-23 22:58:21 -04:00
renovate[bot] 52ac28ffd2 Update dependency fastapi to v0.78.0 (#38)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-23 22:58:05 -04:00
renovate[bot] ed9a5a9aa1 Update jest monorepo (#34)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-23 22:56:38 -04:00
ari d6d47168e3 more lightweight test for prs 2022-06-22 21:51:14 -04:00
renovate[bot] 2f0f8f7dfe Update dependency @storybook/preset-create-react-app to v4.1.2 (#22)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-22 21:37:53 -04:00
renovate[bot]andAri Sosnovsky 24093eb0b0 Update dependency bandit to v1.7.4 (#26)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Ari Sosnovsky <asosnovsky@users.noreply.github.com>
2022-06-22 21:37:34 -04:00
renovate[bot]andAri Sosnovsky 5a48007154 Update dependency types-PyYAML to v6.0.8 (#29)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Ari Sosnovsky <asosnovsky@users.noreply.github.com>
2022-06-22 21:37:15 -04:00
renovate[bot] 9a93b30f4b Update dependency typescript to v4.7.4 (#30)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-22 21:36:54 -04:00
renovate[bot]andAri Sosnovsky cdb12bfdcb Update emotion monorepo to v11.9.3 (#33)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Ari Sosnovsky <asosnovsky@users.noreply.github.com>
2022-06-22 21:36:15 -04:00
renovate[bot]andAri Sosnovsky f2e4b6802d Update dependency @testing-library/user-event to v14.2.1 (#24)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Ari Sosnovsky <asosnovsky@users.noreply.github.com>
2022-06-22 21:33:59 -04:00
renovate[bot]andAri Sosnovsky b092d12dca Update dependency @types/react to v18.0.14 (#25)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Ari Sosnovsky <asosnovsky@users.noreply.github.com>
2022-06-22 21:33:37 -04:00
renovate[bot] dce5d0b260 Update dependency ts-node to v10.8.1 (#28)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-22 21:33:07 -04:00
renovate[bot] e1c222aeb0 Update dependency webpack-dev-server to v4.9.2 (#31)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-22 21:31:40 -04:00
renovate[bot] bd29cf6576 Pin dependencies (#21)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-22 21:27:15 -04:00
renovate[bot] 54f9b9c2f4 Update dependency react-flow-renderer to v10.3.8 (#27) 2022-06-22 21:23:42 -04:00
ari 6722854700 complex movements 2022-06-22 21:22:10 -04:00
renovate[bot] 939ec2dc99 Configure Renovate (#20)
Add renovate.json

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-06-21 20:36:05 -04:00
ari 4f05e64652 fixed device editor issue 2022-06-19 15:51:14 -04:00
ari 13ea3632e3 0.1.22 2022-06-19 14:20:16 -04:00
ari 465e5a4268 clean up 2022-06-19 14:02:16 -04:00
ari eeaa64a8e7 flipped cookies 2022-06-19 14:01:53 -04:00
ari 3a1cee61b8 fixed up unittest 2022-06-19 13:56:21 -04:00
ari 21dd880e37 updated choose name 2022-06-19 13:55:51 -04:00
ari 218972ed5d fixxed typo 2022-06-19 13:39:03 -04:00
ari 451b3638bf cleaned up styles a bit 2022-06-19 13:38:43 -04:00
ari 3acbaf576d fixerd up event 2022-06-19 03:14:06 -04:00
ari eaec599109 auto jump into new automation in mobile mode 2022-06-19 02:59:56 -04:00
ari c6c1efddae removing input area for now 2022-06-19 02:55:19 -04:00
ari ae352ff244 entity dispay 2022-06-19 02:11:25 -04:00
ari dde8d76772 entity filter by integration 2022-06-19 02:06:51 -04:00
ari 34a4bd93bd better saving for yaml editor 2022-06-19 01:04:02 -04:00
ari 7154f206b4 updated inputyaml 2022-06-19 00:53:01 -04:00
ari 19a2d10a2f fixed typing error 2022-06-19 00:31:54 -04:00
ari da699403df added boolean to serviceeditor
helpertext
2022-06-19 00:29:39 -04:00
ari 1496bc66ad device editor working with special caps 2022-06-18 23:23:08 -04:00
ari debe48f2b4 renamed unit test 2022-06-17 22:22:49 -04:00
ari 4bada614b9 better name for device trigger 2022-06-17 22:22:37 -04:00
ari 537bfe824b clean up unused 2022-06-17 17:47:03 -04:00
ari a25ec99cb1 fixed unittests 2022-06-17 17:46:31 -04:00
ari 8ac5bfdfed typing errror 2022-06-17 17:45:41 -04:00
ari 618a62affe added condition editor for device 2022-06-17 17:45:14 -04:00
ari 1ce934fd54 generic device editor 2022-06-17 16:56:51 -04:00
ari ab8ecfeefb updated zone condition 2022-06-17 16:26:54 -04:00
ari a32e365d86 target device & action device v2 2022-06-17 16:06:51 -04:00
ari 04f3e6194f generic ha extras 2022-06-17 14:57:14 -04:00
ari 0b183353d3 prettier names 2022-06-17 14:34:37 -04:00
ari 0c9b0ec6e6 clean up 2022-06-17 14:25:48 -04:00
ari 5bef962977 fixed up service editor 2022-06-17 14:23:15 -04:00
ari 029df7932e device action builder 2022-06-17 13:37:25 -04:00
ari 6be6005531 reordered what shows up 2022-06-16 21:25:21 -04:00
ari 326775848b trigger state autofill 2022-06-16 21:23:28 -04:00
ari 736a6053ef always pretty list 2022-06-16 20:39:11 -04:00
ari f4a41331b1 clean up 2022-06-16 17:25:34 -04:00
ari 15c97b81b4 input area 2022-06-16 17:24:31 -04:00
ari 0fc3ea6146 selector.select 2022-06-15 10:43:14 -04:00
ari 596c3363e7 fixed up unit of measure 2022-06-14 22:01:21 -04:00
ari 529b5599e4 input number unit 2022-06-14 21:57:39 -04:00
ari 184d8a8584 added entity input for service target 2022-06-14 21:57:39 -04:00
Ari Sosnovsky f6ca454999 Update config.yaml 2022-06-14 18:17:56 -04:00
Ari Sosnovsky cdc5aa16b0 Update CHANGELOG.md 2022-06-14 18:17:28 -04:00
ari 7b816c3fbf v1 of service editor 2022-06-14 15:06:02 -04:00
ari 0cecae5faa reloading autos 2022-06-13 19:26:55 -04:00
ari c17783064c update config 2022-06-12 22:44:16 -04:00
ari d824a93695 delay fixes 2022-06-12 22:23:30 -04:00
ari 5207c48f8d v0.1.20 2022-06-12 22:11:58 -04:00
ari b30f4ed59a enabled flag 2022-06-12 21:55:32 -04:00
ari e3a816f2c8 wait template 2022-06-12 21:39:45 -04:00
ari 240f8faef7 latest work 2022-06-12 16:42:44 -04:00
ari 651ba865b1 fixed up inputtime 2022-06-11 18:54:33 -04:00
ari a3e9d19c45 added icon for flip 2022-06-09 17:13:34 -04:00
ari 942867d646 adjusted tasks 2022-06-08 09:38:58 -04:00
ari 041c2f02d5 added tasks + timestring validation 2022-06-08 09:34:52 -04:00
ari fb30d577aa clean up 2022-06-06 22:42:08 -04:00
ari c4a90fcd1c clean up 2022-06-06 22:39:30 -04:00
ari 4c3b34195a service autocomplete 2022-06-06 22:37:34 -04:00
ari 78494ee74d fixed up some styling issues 2022-06-06 19:40:20 -04:00
ari d3fff074e5 fixed up linting 2022-06-06 17:35:35 -04:00
ari 0ee0a06737 more reliable ws 2022-06-06 17:34:06 -04:00
ari 61000f2ff1 namer in conditions 2022-06-06 11:28:51 -04:00
ari ac1ee86cc7 namer 2022-06-06 11:27:25 -04:00
ari c934a4afcb using cookies to remember where we are 2022-06-06 11:02:06 -04:00
Ari Sosnovsky 359958aada 1.1.19 2022-06-05 23:16:30 -04:00
ari 7a73af4434 initial proto of mobile mode graph 2022-06-05 20:55:44 -04:00
ari 55bb941399 some fixes for invalid nodes 2022-06-04 23:36:12 -04:00
ari afb765024d clean up on actions 2022-06-04 22:12:32 -04:00
ari 911f867518 fixed up issues with saving 2022-06-04 22:10:41 -04:00
ari 25bb19dbe5 new logo 2022-06-04 21:32:45 -04:00
ari 9960ce2909 new logo 2022-06-04 21:25:42 -04:00
ari c2fde70954 logo 2022-06-04 21:13:54 -04:00
Ari Sosnovsky 5ca9c4a361 Prepped v0.1.17 (#12)
prepped v0.1.17
2022-06-04 20:56:42 -04:00
ari c27f2d13f0 no latest for tests 2022-06-04 18:40:57 -04:00
ari 26c81effd6 fixed routing issue 2022-06-04 17:54:32 -04:00
ari e72c83b980 location fix 2022-06-04 16:09:52 -04:00
ari e222c42150 fixed typing errors 2022-06-04 15:56:15 -04:00
ari e7b88fc6f6 ensured ci passes 2022-06-04 15:50:28 -04:00
ari 079f353dbf trying to just redirect ws 2022-06-04 15:45:14 -04:00
ari e6e51be5a5 using dockerhub 2022-06-01 21:50:01 -04:00
ari 3a6b21a117 updated ignore list 2022-06-01 21:48:31 -04:00
ari f42df5a70f added build actions to ghcr.io 2022-06-01 21:22:58 -04:00
ari 0c3e9b5ace added build actions to ghcr.io 2022-06-01 21:22:44 -04:00
ari bc773154c6 all the latest socket work 2022-06-01 21:17:16 -04:00
ari a530e5e6e0 clean ups 2022-05-31 17:13:15 -04:00
ari 1ad87c205d updated emitters 2022-05-31 13:28:11 -04:00
ari d45f72b168 badges 2022-05-31 13:21:31 -04:00
ari 0c7db09c32 removed desc 2022-05-31 12:50:53 -04:00
ari 2b1648eff2 added desc to build 2022-05-31 12:50:15 -04:00
ari 06356b46e9 deployment 2022-05-31 12:46:11 -04:00
ari 21fe64f4bf added supervisor token + snackbar for errors 2022-05-31 12:19:58 -04:00
ari e22f64dd51 updated all packages to latest 2022-05-31 11:24:37 -04:00
ari f1b24ec783 device id 2022-05-30 19:48:55 -04:00
ari 8a90b56ac3 fixed tsc 2022-05-30 15:20:42 -04:00
ari 7d111c853b slight improvement on condition editor for mobile 2022-05-30 15:14:47 -04:00
ari 0c72481729 clean up 2022-05-30 15:10:33 -04:00
ari 996626f9af input entities 2022-05-30 15:05:54 -04:00
ari 878035e748 added ha websockets 2022-05-29 22:06:21 -04:00
ari cc930ee4ac dealt with linitng errors 2022-05-29 21:06:43 -04:00
ari 169a2e9059 loaders 2022-05-27 16:43:31 -04:00
ari 6275123071 v0.1.14 2022-05-27 14:37:21 -04:00
ari 0001c93792 speeding up build times 2022-05-27 13:37:43 -04:00
ari 90d3fa0587 sorting tag names 2022-05-27 13:01:50 -04:00
ari 938040e519 sorting tag values 2022-05-27 13:01:27 -04:00
ari 14b3132c64 ensured unique tag types 2022-05-27 13:00:52 -04:00
ari 17c79d7aab updated deps 2022-05-27 12:54:15 -04:00
Ari Sosnovsky 67cc57f068 Create SECURITY.md 2022-05-27 12:36:59 -04:00
ari a4743b0353 added helper text for error 2022-05-27 12:31:56 -04:00
ari 5efda5f3b2 using mui select 2022-05-27 12:25:44 -04:00
ari 7d7a788723 added unsupported 2022-05-27 12:08:58 -04:00
ari cdf67aa1a9 fixed up alias issues 2022-05-27 12:02:25 -04:00
ari 98133607ca revamp grouper 2022-05-27 11:46:54 -04:00
ari 5729b74c89 tag autocomplete 2022-05-26 21:49:28 -04:00
ari fb8eb4f38c cleaner test 2022-05-24 22:14:34 -04:00
ari 21adcb6973 better autoinfobox styling 2022-05-24 22:11:42 -04:00
ari 8a33d05ced slightly better node condition editor 2022-05-24 22:00:34 -04:00
ari 334268b5ee deprecated textarea 2022-05-24 21:31:54 -04:00
ari 3b7b17021f replaced yaml editor 2022-05-24 21:28:14 -04:00
ari 44c4ac12dd initial work with mui 2022-05-24 21:12:01 -04:00
ari f8233dd6ab added mui 2022-05-24 21:11:49 -04:00
ari 54f528deb4 simple tmux as help build 2022-05-20 15:46:10 -04:00
ari eb363acf81 v0.1.13 2022-05-20 14:08:36 -04:00
ari 415acf06cc correct slash 2022-05-20 13:46:09 -04:00
ari 0325b8eec3 trying to get a valid version 2022-05-20 13:45:23 -04:00
ari d184871217 trying to get build test working 2022-05-20 13:40:02 -04:00
ari 0499feb61d added test badge; 2022-05-20 12:34:40 -04:00
ari 0030920558 fixed up typing 2022-05-20 12:33:25 -04:00
ari f62f139f55 fixed up tests 2022-05-20 12:32:36 -04:00
ari 2d80798ccb removed rumeal references 2022-05-20 12:29:24 -04:00
ari 3da5e1c88c fixed python issues 2022-05-20 11:05:15 -04:00
ari 7df34bdf7f build post test 2022-05-20 11:01:39 -04:00
ari 554528ace0 fixed yarn build 2022-05-20 10:56:06 -04:00
ari 298a233a5f changed yaml loaders 2022-05-20 10:53:53 -04:00
ari cbbc099384 no repeat alias editor 2022-05-20 10:05:27 -04:00
ari 48decb2e16 saving colors when not modified 2022-05-19 23:22:16 -04:00
ari 7afda7eb1c fixing up yaml modder 2022-05-19 23:18:16 -04:00
ari f6270c94f3 clean up 2022-05-19 22:57:58 -04:00
ari 952dcba3ac nicer yaml editor 2022-05-19 22:56:34 -04:00
ari 25770e1c1d v0.1.12 2022-05-18 23:09:19 -04:00
ari 029a2dac9f better formatting 2022-05-18 22:57:51 -04:00
ari 8732ab8dda not populating changelog 2022-05-18 22:42:56 -04:00
ari 42ab6e5913 improper save for conditions 2022-05-18 22:41:24 -04:00
ari c28796872f condition validation 2022-05-18 22:37:25 -04:00
ari 40690293a8 added initial pre-validation per node 2022-05-18 22:23:57 -04:00
ari 621f43e5c8 v0.1.10 2022-05-18 11:57:34 -04:00
ari f3496f9d32 fixed nodejs test 2022-05-18 11:04:15 -04:00
ari 409cf2b21a simpler names 2022-05-18 11:03:07 -04:00
ari ef92261666 reverting something stupid 2022-05-18 11:01:29 -04:00
ari 83edaf9bf8 tagged names 2022-05-18 11:00:41 -04:00
ari f8efd895a9 not building 2022-05-18 10:59:35 -04:00
ari da0d153b81 fixed up linting 2022-05-18 10:58:26 -04:00
ari bcd262dd46 - fixed up optional metadata + + desc
- using timestamp for default new ids
'
2022-05-18 10:54:53 -04:00
ari ea47b3e1eb fixed up automation time 2022-05-18 10:37:41 -04:00
ari 5192c09681 trying to provide test 2022-05-18 09:50:08 -04:00
ari d3adfaaacb making sure the version is required 2022-05-17 22:16:09 -04:00
ari c249a94b3d fixing up typo 2022-05-17 22:15:44 -04:00
ari dce028d0bc clean up 2022-05-17 22:15:18 -04:00
ari 7333f9e159 added manual build 2022-05-17 22:15:06 -04:00
ari 809095f8e0 added edge tag 2022-05-17 22:14:38 -04:00
ari 8942693a32 added a manual build 2022-05-17 22:13:57 -04:00
ari db49ed02ed updated tsc 2022-05-17 22:10:08 -04:00
ari cce2e03053 fixed up trigger issues 2022-05-17 22:03:22 -04:00
ari 4509a224a9 minor style patch 2022-05-17 21:51:20 -04:00
ari 7f8b75fa02 added installation instructions 2022-05-17 21:46:47 -04:00
ari d2c5310b93 new version release 2022-05-17 21:31:10 -04:00
ari a19db93c37 support for malformed automations 2022-05-17 20:48:43 -04:00
ari 6c57408f27 making PRs don't trigger deployments 2022-05-17 12:20:28 -04:00
ari b9a77746c0 updated changelog 2022-05-17 12:19:34 -04:00
ari f1ffab13be fixed up unittest 2022-05-17 12:18:15 -04:00
Ari Sosnovsky 52fcfd9271 Merge pull request #9 from issy/main 2022-05-17 07:50:30 -04:00
Issy Szemeti f435bb70aa Spelling 2022-05-17 11:05:41 +01:00
root 2598c23fd2 no local host 2022-05-16 23:56:47 -04:00
Ari Sosnovsky 070dc7c871 Update config.yaml 2022-05-16 22:51:12 -04:00
Ari Sosnovsky 3d70f04e60 Update CHANGELOG.md 2022-05-16 22:50:53 -04:00
ari cf29d9d61c added build ways 2022-05-16 22:03:27 -04:00
ari 2245fd556b removed logs 2022-05-16 21:54:22 -04:00
ari f50f22190e mobile mode 2022-05-16 21:50:05 -04:00
ari b342088b96 fixed up tsc error 2022-05-16 19:37:32 -04:00
ari c0c0d3181c v0.1.5 2022-05-16 19:27:03 -04:00
ari cf013cc342 fixed up styles 2022-05-16 19:27:03 -04:00
Ari Sosnovsky 23b869d43e Update README.md 2022-05-16 19:07:14 -04:00
Ari Sosnovsky e333e80ea3 Update README.md 2022-05-16 16:03:45 -04:00
Ari Sosnovsky 996e23038f Update README.md 2022-05-16 16:01:46 -04:00
ari 0be03b1536 updating api routing 2022-05-16 15:38:13 -04:00
ari dc726ff184 consolidated 2022-05-16 12:58:39 -04:00
ari 7e5885a34d added manual 2022-05-16 12:46:14 -04:00
ari 38396c4d98 added manual 2022-05-16 12:45:31 -04:00
ari ea832884f1 fixed deploy 2022-05-16 12:45:02 -04:00
ari ea14cd4239 trying autogenerated release 2022-05-16 12:44:25 -04:00
ari 4e19bdf4c4 changed up paths 2022-05-16 12:43:12 -04:00
Ari Sosnovsky 75c5870e00 Update config.yaml 2022-05-16 12:03:26 -04:00
Ari Sosnovsky 4b75ac9199 Update README.md 2022-05-16 11:14:11 -04:00
Ari Sosnovsky fd3780f5bc Update CHANGELOG.md 2022-05-16 11:13:49 -04:00
ari 035ac0c898 prepping 0.1.2 2022-05-16 11:05:17 -04:00
ari b331e4c5a0 using setup python instead of container 2022-05-16 11:03:56 -04:00
ari b9fb49fd32 updated test ci 2022-05-16 11:02:27 -04:00
ari a33a18c102 updated tests 2022-05-16 10:58:54 -04:00
ari defa0ce787 updated test yaml 2022-05-16 10:52:56 -04:00
ari b17e4c75b3 ran linters 2022-05-16 10:42:47 -04:00
ari ef5e66a8f1 fixed test cases 2022-05-16 10:29:05 -04:00
ari edc65da14b added cancel last run 2022-05-15 17:12:58 -04:00
ari 1ee34b234d new version 2022-05-15 17:11:38 -04:00
ari cf178e23d0 updated version 2022-05-15 17:09:34 -04:00
ari 7caac74d2d updated latest 2022-05-15 17:08:33 -04:00
ari 8b9d400a4d names 2022-05-15 16:47:43 -04:00
ari c830f35ee4 correct version 2022-05-15 16:45:08 -04:00
ari 7ac92fb98e neater job names in actions 2022-05-15 16:42:43 -04:00
ari 88ad07aabc cleaned up workflow names 2022-05-15 16:39:49 -04:00
ari 80e98d4a28 cleaned up actions 2022-05-15 16:39:20 -04:00
ari 1a2a78b1e8 setting init to false 2022-05-15 16:38:01 -04:00
ari 5c99308fa6 trying build 2022-05-15 16:24:37 -04:00
ari 0e63bb5b25 updated config 2022-05-15 16:21:29 -04:00
ari b0dd9dfddc trying ha builder 2022-05-15 16:15:03 -04:00
ari 33eae5e027 trying ha builder 2022-05-15 16:13:03 -04:00
ari 6372ec77f7 trying ha builder 2022-05-15 16:08:42 -04:00
ari c9e6bb78da build main when push 2022-05-15 16:03:57 -04:00
ari a7ec4da5cd more correct commands for deploy 2022-05-15 16:03:36 -04:00
ari 0d29642703 redoing deploy 2022-05-15 15:54:50 -04:00
ari 80121c9ee8 extracting the version correctly 2022-05-14 17:26:16 -04:00
ari 1c5bff7c47 building v0.0.15 2022-05-14 17:22:40 -04:00
ari 2af528db36 gh workflow 2022-05-14 17:19:41 -04:00
ari 9dc4c9c59f gh workflow 2022-05-14 17:05:27 -04:00
ari e2c669dcf2 gh workflow 2022-05-14 17:04:45 -04:00
ari d33df7f532 gh workflow 2022-05-14 17:04:23 -04:00
ari 48cb1207b2 gh workflow 2022-05-14 17:04:00 -04:00
ari 36cfcd625b gh workflow 2022-05-14 17:03:05 -04:00
ari 56d5ca3d08 github workflow 2022-05-14 17:01:57 -04:00
ari 06eb6e27b7 github workflow 2022-05-14 17:01:17 -04:00
ari b1a86f3bf0 0.0.14 2022-05-13 17:26:44 -04:00
ari a626a89ed3 cleand up webapp for building 2022-05-13 17:26:44 -04:00
ari 3526fbd9ee updated api 2022-05-13 17:26:44 -04:00
ari 4cfc429980 cleaned up styling for editor 2022-05-13 17:26:44 -04:00
ari bfc95db6f6 cleaned up multinode stlying 2022-05-13 17:26:44 -04:00
ari 8d804add13 cleaned up styling 2022-05-13 17:26:44 -04:00
ari 2db116ad9b fixed test 2022-05-13 17:26:44 -04:00
ari 6981eddb49 Added Gear Icon 2022-05-13 17:26:44 -04:00
ari c118ccc99b no more $smType in webapp 2022-05-13 17:26:44 -04:00
ari 429dfd5b50 removed $smType for conditions and trigger 2022-05-13 17:26:44 -04:00
ari 49fea3fabd cleaned up types 2022-05-13 17:26:44 -04:00
Ari Sosnovsky 38b0aecffa Update README.md 2022-05-05 17:23:48 -04:00
ari b76dc672f3 v0.0.13 2022-05-05 15:21:08 -04:00
ari 6821bb8714 cleaned up 2022-05-05 15:20:08 -04:00
ari c256400518 fixed up styling for autos 2022-05-05 15:03:33 -04:00
ari 634f3e9219 automation editor fixed up 2022-05-05 13:57:44 -04:00
ari a56c7ff964 stable editor 2022-05-05 13:48:51 -04:00
ari b29596fe78 added add node to end of flow 2022-05-01 21:14:24 -04:00
ari 1620d04624 stable flow 2022-05-01 20:55:04 -04:00
ari 1ed1e63330 aligned graph 2022-04-30 23:10:04 -04:00
ari 7ae50e634a removed numerics 2022-04-30 22:52:26 -04:00
ari 56d68d9065 choose flow 2022-04-30 22:51:51 -04:00
ari 468a022582 dagflow triggers 2022-04-27 19:28:09 -04:00
Ari Sosnovsky 5dcd17ad17 Merge pull request #7 from asosnovsky/dependabot/npm_and_yarn/webapp/node-fetch-2.6.7
Bump node-fetch from 2.6.6 to 2.6.7 in /webapp
2022-04-27 17:02:05 -04:00
ari b1df6aebe2 better on click 2022-04-27 17:01:01 -04:00
ari b98d4a8812 tag mod 2022-04-27 17:00:55 -04:00
Ari Sosnovsky 58379ebfc8 Update README.md 2022-04-26 23:18:48 -04:00
ari 41059b4974 better samples 2022-04-26 23:17:44 -04:00
ari af600aaf57 fixed build issues 2022-04-26 23:02:38 -04:00
ari 738712e946 preparing release 2022-04-26 23:02:38 -04:00
dependabot[bot] 7a278c856a Bump node-fetch from 2.6.6 to 2.6.7 in /webapp
Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.6 to 2.6.7.
- [Release notes](https://github.com/node-fetch/node-fetch/releases)
- [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.6...v2.6.7)

---
updated-dependencies:
- dependency-name: node-fetch
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-27 02:16:24 +00:00
Ari Sosnovsky 3c64550d10 Merge pull request #4 from asosnovsky/dependabot/npm_and_yarn/webapp/async-2.6.4
Bump async from 2.6.3 to 2.6.4 in /webapp
2022-04-26 22:15:54 -04:00
Ari Sosnovsky beff46aeff Merge pull request #5 from asosnovsky/dependabot/npm_and_yarn/webapp/follow-redirects-1.14.9
Bump follow-redirects from 1.13.2 to 1.14.9 in /webapp
2022-04-26 22:15:46 -04:00
Ari Sosnovsky 7f3173684d Merge pull request #6 from asosnovsky/dependabot/npm_and_yarn/webapp/postcss-7.0.36
Bump postcss from 7.0.35 to 7.0.36 in /webapp
2022-04-26 22:15:37 -04:00
ari 8a06a1674b added details route 2022-04-26 22:11:14 -04:00
ari 3e28974abf fixred tag scrolling 2022-04-26 21:49:39 -04:00
ari 19ea12a70e Tag management 2022-04-25 14:37:41 -04:00
dependabot[bot] f30ba7286b Bump async from 2.6.3 to 2.6.4 in /webapp
Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md)
- [Commits](https://github.com/caolan/async/compare/v2.6.3...v2.6.4)

---
updated-dependencies:
- dependency-name: async
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-24 20:15:56 +00:00
dependabot[bot] 2617febece Bump postcss from 7.0.35 to 7.0.36 in /webapp
Bumps [postcss](https://github.com/postcss/postcss) from 7.0.35 to 7.0.36.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/7.0.35...7.0.36)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-24 19:38:35 +00:00
ari 81bd15436e fixed typos + uppd storybook 2022-04-24 15:37:30 -04:00
ari 4b3028355d nicer edit style 2022-04-23 23:10:17 -04:00
ari 46209564f0 matching tag definitions 2022-04-23 22:07:11 -04:00
ari bd3cfdf859 updated api makefile 2022-04-23 22:00:08 -04:00
ari 44ad46cff3 clean up 2022-04-23 18:10:20 -04:00
ari baada590c5 updated api for tag support 2022-04-22 12:51:57 -04:00
ari 4f78e42699 full tag support on UI 2022-04-20 22:08:04 -04:00
dependabot[bot] 43c3438b2f Bump follow-redirects from 1.13.2 to 1.14.9 in /webapp
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.13.2 to 1.14.9.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.13.2...v1.14.9)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-21 01:51:41 +00:00
ari 7ea923a050 automation list box finidhed 2022-04-20 21:50:02 -04:00
ari afc67a17ec automation list box 2022-04-20 15:40:26 -04:00
ari 248660ff30 input multi select styling bug 2022-04-19 22:14:49 -04:00
ari 3314d111d6 cleaned up debugging and testing 2022-04-19 22:14:38 -04:00
ari b368be0ff4 latest work 2022-04-19 16:23:33 -04:00
ari acb12e73e8 multiselect numbered 2022-04-18 20:00:22 -04:00
ari 9e9cea9269 better FE error handling 2022-04-18 18:03:00 -04:00
ari b329e3f594 added a proper exposed config folder to ensure tests can be re-ran 2022-04-15 15:50:45 -04:00
ari e9cbacbc92 added a proper exposed config folder to ensure tests can be re-ran 2022-04-15 15:50:45 -04:00
ari 5e345d20e5 - clean up
- origins
2022-04-15 15:50:33 -04:00
Ari Sosnovsky f6af594a8f Merge pull request #3 from asosnovsky/dependabot/npm_and_yarn/webapp/url-parse-1.5.10
Bump url-parse from 1.5.1 to 1.5.10 in /webapp
2022-04-13 22:16:25 -04:00
Ari Sosnovsky ff7dee0879 Merge branch 'main' into dependabot/npm_and_yarn/webapp/url-parse-1.5.10 2022-04-13 22:16:10 -04:00
ari d250018c9a v0.0.11 2022-04-13 22:15:03 -04:00
ari 95af6392ba fixed styling 2022-04-13 22:14:24 -04:00
ari fedc6c889a added lazy saving 2022-04-13 22:06:38 -04:00
ari 77c338eb90 v0.0.10 2022-04-13 16:54:37 -04:00
ari 967508c29e added zoomability 2022-04-13 16:53:04 -04:00
ari 93fe26e787 proper zoom level 2022-04-13 16:20:12 -04:00
dependabot[bot] 5a6f79a0d6 Bump url-parse from 1.5.1 to 1.5.10 in /webapp
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.1 to 1.5.10.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.1...1.5.10)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-13 19:41:01 +00:00
Ari Sosnovsky b1c5bce584 Create codeql-analysis.yml 2022-04-13 15:35:36 -04:00
ari 50ba9f3d6b added version increment in yaml 2022-04-13 15:34:33 -04:00
346 changed files with 39998 additions and 96132 deletions

No files matched your search

+9 -1
View File
@@ -1,4 +1,12 @@
webapp/node_modules
webapp/build
webapp/.storybook
webapp/.vscode
webapp/.env.local
webapp/tmux.sh
api/.env
api/.coverage
api/venv
api/build
api/.mypy_cache
api/.vscode
api/.coverage
+109
View File
@@ -0,0 +1,109 @@
name: Build
on:
workflow_dispatch:
inputs:
version:
type: string
description: "Version Number"
push:
branch: [main]
jobs:
metadata:
runs-on: ubuntu-latest
name: Metadata
outputs:
version: ${{ steps.version.outputs.VERSION }}
steps:
- name: Check out repository
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Get Version
id: version
shell: bash
run: |
if [ -z "${INPUT_VERSION}" ]; then
echo ::set-output name=VERSION::$(git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')
else
echo ::set-output name=VERSION::${INPUT_VERSION}
fi
env:
INPUT_VERSION: ${{ github.event.inputs.version }}
- name: ${{ steps.version.outputs.VERSION }}
shell: bash
run: |
echo ${{ steps.version.outputs.VERSION }}
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
uses: docker/login-action@v2.0.0
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: "Save version number"
run: echo "REACT_APP_BUILD_VERSION=${{ needs.metadata.outputs.version }}" > ./webapp/.env.production
- name: "Build Web"
run: cd webapp && yarn install && yarn build
- name: ${{ matrix.arch }} / ${{ needs.metadata.outputs.version }}
uses: home-assistant/builder@2022.07.0
with:
args: |
--${{ matrix.arch }} \
--no-latest \
--version ${{ needs.metadata.outputs.version }} \
--target .
publish:
runs-on: ubuntu-latest
if: "${{ github.event.inputs.version != '' }}"
needs:
- metadata
- deploy
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,
});
+44
View File
@@ -0,0 +1,44 @@
name: Test Release
on:
workflow_dispatch:
inputs:
version:
type: string
description: "Version Number"
jobs:
release:
runs-on: ubuntu-latest
name: Publish Github Release
permissions:
contents: write
steps:
- name: "${{ github.event.inputs.version }}"
uses: actions/github-script@v6
env:
VERSION: "${{ github.event.inputs.version }}"
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
github.rest.repos.createRelease({
owner: context.repo.owner,
repo: context.repo.repo,
tag_name: process.env.VERSION,
});
pre:
runs-on: ubuntu-latest
name: Publish Github PreRelease
permissions:
contents: write
steps:
- name: "${{ github.event.inputs.version }}"
uses: actions/github-script@v6
env:
VERSION: pre-${{ github.event.inputs.version }}
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
github.rest.repos.createRelease({
owner: context.repo.owner,
repo: context.repo.repo,
tag_name: process.env.VERSION,
});
+77
View File
@@ -0,0 +1,77 @@
name: Commit Tests
on:
push:
branch:
- main
paths:
- "webapp"
- "api"
pull_request:
branch:
- main
jobs:
metadata:
runs-on: ubuntu-latest
name: Metadata
outputs:
version: ${{ steps.version.outputs.VERSION }}
steps:
- name: Check out repository
uses: actions/checkout@v3
with:
fetch-depth: 0
- 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 }}
python:
name: "Python Tests"
runs-on: ubuntu-latest
needs:
- metadata
strategy:
matrix:
action:
- lint
- coverage
- security-checks
steps:
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.9
- name: Install Dependencies
run: cd api && make setup
- name: Echo dependencies
run: cd api && ./venv/bin/pip freeze
- name: ${{ needs.metadata.outputs.version }} / ${{ matrix.action }}
run: cd api && make ${{ matrix.action }}
nodejs:
name: "NodeJs Tests"
runs-on: ubuntu-latest
needs:
- metadata
strategy:
matrix:
action:
- "test:ci"
- "tsc:ci"
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
cache: "yarn"
cache-dependency-path: webapp/yarn.lock
- name: Install Dependencies
run: cd webapp && yarn install
- name: ${{ needs.metadata.outputs.version }} / ${{ matrix.action }}
run: cd webapp && yarn ${{ matrix.action }}
+2
View File
@@ -0,0 +1,2 @@
.vscode/*.log
webapp/src/types/validators/index.test.ts
+14 -2
View File
@@ -1,3 +1,15 @@
{
"python.formatting.provider": "black"
}
"python.formatting.provider": "black",
"python.testing.unittestArgs": [
"-v",
"-s",
"./api/tests",
"-p",
"*test_*.py"
],
"python.testing.pytestEnabled": false,
"python.testing.unittestEnabled": true,
"yaml.schemas": {
"https://json.schemastore.org/github-action.json": ".github/workflows/*.yml"
}
}
+138 -5
View File
@@ -1,10 +1,143 @@
# Changelog
All notable changes to this project will be documented in this file.
# Changelog ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=for-the-badge)
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).
## [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
![image](https://user-images.githubusercontent.com/7451445/179135734-8d7ca46d-7e6f-4975-abc3-de86a48de0c0.png)
![image](https://user-images.githubusercontent.com/7451445/179135790-a5e77e2b-6d42-4810-a27b-ff4d165e99ec.png)
![image](https://user-images.githubusercontent.com/7451445/179135916-8083aab5-bee1-4d27-b19d-9e000ca012f9.png)
## [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
- Some triggers had invalid types and were causing a false-positive validation
## [0.1.8] - Support for Malformed Automations
- API will no longer error out on missing values or invalid lists
- Frontend has support for displaying bad automations
## [0.1.6] - Mobile Mode
- Improved mobile mode
- Fixed up arrow styles due to typos
- Added selection color
## [0.1.2] - Docker Hub Images
- Publishing images to docker hub is now stable
## [0.0.15] - Publish to dockerhub
- Publishing images to docker hub
## [0.0.14] - Using vanila ha yaml
- Supporing vanilla out of the box HA yaml as oppose to parsing them (no more $smType)
- Conditions have now a more a explicit node
## [0.0.13] - Better Styling with react-flow
- Fixed up styling (using react-flow)
- cleaned up some button styles
## [0.0.12] - Tags
- Added tag management system for automations
## [0.0.11] - Zoom
- Added lazy saving
## [0.0.10] - Zoom
- Introducing Zoom!
## [0.0.9] - First Working Version
- Instalable verion via github
- Initial POC done
- Initial POC done
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+24 -26
View File
@@ -1,40 +1,36 @@
# <--- Build Args -->
# <--- Pre-Build Args -->
ARG BUILD_ARCH
# <--- Main Image -->
FROM python:3.9.13-slim-buster
WORKDIR /app
# <--- Post-Build Args -->
ARG BUILD_VERSION
# <--- Image Setup -->
FROM homeassistant/${BUILD_ARCH}-base-python:3.9-alpine3.14
WORKDIR /app
# <--- Environment Variables -->
ENV BUILD_VERSION $BUILD_VERSION
# <--- System Wide Dependencies -->
ENV LANG C.UTF-8
RUN apk add --no-cache \
nodejs \
npm \
build-base \
python3-dev
RUN pip install -U wheel setuptools pip
RUN apt-get update -y && \
apt-get install -y gcc git build-essential libtool automake curl
# <--- Scripts -->
COPY docker/bin /app/bin
# <--- PREP -->
RUN /app/bin/prep.sh
# <--- Python Dependencies -->
COPY api/setup.py /app/setup.py
RUN pip install . /app
# <--- Webapp Build -->
COPY webapp/ /app/web-builder
RUN cd /app/web-builder && \
npm install && \
npm run build && \
cp -r /app/web-builder/build /app/web && \
rm -rf /app/web-builder
# <--- BUILD -->
RUN /app/bin/build.sh /app
# <--- Api Code -->
COPY api/src /app/src
COPY run.sh /app/run.sh
RUN chmod +x /app/run.sh
# <--- Environment Variables -->
ENV HASSIO_TOKEN ""
ENV BUILD_VERSION $BUILD_VERSION
COPY webapp/build /app/web
# <--- Ports -->
EXPOSE 8000
@@ -42,7 +38,9 @@ EXPOSE 8000
# <--- Final -->
LABEL \
io.hass.type="addon" \
io.hass.arch="armhf|aarch64|i386|amd64"
io.hass.arch="armhf|aarch64|i386|amd64|armv7"
CMD [ "/app/run.sh" ]
ENTRYPOINT [ "/app/bin/run.sh" ]
CMD [ "/app" ]
LABEL org.opencontainers.image.source https://github.com/asosnovsky/Shortumation
+34 -6
View File
@@ -1,18 +1,46 @@
DC=docker-compose -f docker-compose.build.yaml -f docker-compose.test.yaml
BUILD_TAG=$(shell git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')
DC=BUILD_TAG=${BUILD_TAG} docker-compose -f docker-compose.build.yaml -f docker-compose.test.yaml
local_run:
build-with-builder:
docker run \
--rm \
--privileged \
-v ~/.docker:/root/.docker \
-v /var/run/docker.sock:/var/run/docker.sock:ro \
-v ${PWD}:/data \
homeassistant/amd64-builder \
--amd64 \
--test \
--version ${BUILD_TAG} \
-t /data
build:
cd webapp && yarn build
$(DC) build
build-no-cache:
cd webapp && yarn buil
$(DC) build --no-cache
push:
$(DC) push
start:
$(DC) up -d
sleep 1
$(DC) ps
local_logs:
logs:
$(DC) logs -f
local_ps:
ps:
$(DC) ps
local_stop:
stop:
$(DC) stop
bash:
$(DC) exec addon bash
config:
$(DC) config
+72 -8
View File
@@ -1,20 +1,84 @@
# Shortumation
# Shortumation ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=platsic)
![image](https://user-images.githubusercontent.com/7451445/163254230-412eb427-c0f9-4ffa-91e2-9d276db82205.png)
[![Test](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml/badge.svg)](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml) [![Build](https://github.com/asosnovsky/Shortumation/actions/workflows/build.yml/badge.svg)](https://github.com/asosnovsky/Shortumation/actions/workflows/build.yml)
| | Stable | Edge
| --- | --- | ---
| Version | ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=for-the-badge) | ![Docker Image Version (latest semver)](https://img.shields.io/docker/v/asosnovsky/shortumation-amd64?&sort=date&label=&style=for-the-badge)
A [home-assistent 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/).
A better way to write automations in home-assistant without having to install and run a seperate automation engine!
Sort and organize your home-assistant automations using tags!
![image](https://user-images.githubusercontent.com/7451445/179136346-cf04a8c0-ac4e-44b2-b9fe-806824864660.png)
Utilize the auto-generated node descriptions to understand what your automation is doing! No more reading YAML to just understand what 1 node does!
![image](https://user-images.githubusercontent.com/7451445/179137357-455260f3-2cdd-44ca-ae62-084ed7c59ebd.png)
More condense UI for service calls!
![image](https://user-images.githubusercontent.com/7451445/179137126-93601ea9-435f-4c4f-8f21-0d09cd61c7a2.png)
Visualize complex 'choose' or 'if/else' nodes
![image](https://user-images.githubusercontent.com/7451445/179135734-8d7ca46d-7e6f-4975-abc3-de86a48de0c0.png)
Visualize parallel nodes!
![image](https://user-images.githubusercontent.com/7451445/179136706-695912d7-e223-42d9-a27b-f330b021a56a.png)
Visualize repeat nodes!
![image](https://user-images.githubusercontent.com/7451445/179135790-a5e77e2b-6d42-4810-a27b-ff4d165e99ec.png)
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
- [X] View your automations & scripts in a visual graph
- [X] See all automations in one common view
- [X] Automation Manager
- [ ] Script Manager
- [ ] Use secrets and global parameters
- [ ] Autocomplete fields for entities/devices
- [ ] Autocomplete fields for template editor
- [ ] Autocomplete fields for referencing scripts
- [X] Tags for automation organization
- [X] Autocomplete fields for entities/devices
- [X] Visualize parallel/repeat/choose/if-else nodes
- [X] Autogenerate node names
- [ ] Clean error reporting
- [ ] Script Editor
See roadmap in [Version 1 Github Project](https://github.com/asosnovsky/Shortumation/projects/1).
## Installation
### Addon
Add the repository URL under **Supervisor → Add-on store → ⋮ → Manage add-on repositories**:
https://github.com/asosnovsky/Shortumation
It should now appear in your `Add-on Store` and you should be able to install it!
### Containerized
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.
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).
## FAQ
**How is this different from Node-Red?**
> Node-Red is both an execution engine and an automation editor, which means that in order for your automations to run you have to have an additional component running and executing the automations. Shortumation simply provides a different editor and manager for writing Homeassistant automations, while relying on Homeassistant to execute the automations (this uses the `automations.yaml` file as the backend database)
**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).
**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`
+12
View File
@@ -0,0 +1,12 @@
# Security Policy
## Supported Versions
| Version | Supported |
| ------- | ------------------ |
| 0.1.x | :white_check_mark: |
## Reporting a Vulnerability
Please open an issue with the tag 'Vulnerability', and include your reasoning in it.
+14
View File
@@ -0,0 +1,14 @@
list_autos # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:17)
upsert_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:28)
delete_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:32)
read_details # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/details.py:10)
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/ping.py:10)
websocket_endpoint # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/socket.py:9)
params # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:18)
total_items # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:19)
id # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:8)
alias # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:9)
description # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:10)
trigger_variables # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:11)
mode # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:12)
json_dumps # unused function (/home/ari/Projects/Shortumation/api/src/json_serializer.py:5)
+3 -4
View File
@@ -8,10 +8,9 @@ setup:
python3 -m venv $(VENV_FOLDER)
$(PIP) install wheel==0.35.1
$(PIP) install .[dev]
$(VENV_BIN)/pre-commit install
lint:
$(VENV_BIN)/vulture --exclude src
$(VENV_BIN)/vulture src .vulture_whitelist
$(MAKE) lint-project
$(MAKE) lint-tests
@@ -34,7 +33,7 @@ test:
coverage:
$(VENV_BIN)/coverage run -m unittest discover tests
$(VENV_BIN)/coverage report -m --fail-under=90
$(VENV_BIN)/coverage report -m --fail-under=80
clean:
rm -rf dist *.sqlite *.egg-info build .mypy_cache .coverage
@@ -44,4 +43,4 @@ clean:
run-local:
rm -f web
ln -s ../webapp/build web
USE_EXAMPLE_REPO=1 uvicorn src.app:app --reload
USE_EXAMPLE_REPO=1 $(VENV_BIN)/hypercorn src.app:app --reload
+12
View File
@@ -29,3 +29,15 @@ exclude = '''
[tool.coverage.run]
omit = ["./venv/*", "tests/*"]
[[tool.mypy.overrides]]
module = "decouple.*"
ignore_missing_imports = true
[[tool.mypy.overrides]]
module = "ruamel.*"
ignore_missing_imports = true
[[tool.mypy.overrides]]
module = "tests.*"
ignore_missing_imports = true
+16 -14
View File
@@ -4,24 +4,26 @@ import setuptools # type: ignore
setuptools.setup(
python_requires=">=3.9",
install_requires=[
"ruamel.yaml==0.17.17",
"fastapi==0.70.0",
"pydantic==1.8.2",
"uvicorn[standard]==0.15.0",
"python-decouple==3.5",
"PyYAML==6.0",
"fastapi==0.78.0",
"pydantic==1.9.1",
"hypercorn==0.13.2",
"python-decouple==3.6",
"websockets==10.3"
],
extras_require={
"dev": [
"mypy==0.910",
"mypy==0.961",
"mypy-extensions==0.4.3",
"black==21.7b0",
"bandit==1.7.0",
"isort==5.9.3",
"coverage==5.5",
"pre-commit==2.13.0",
"vulture==2.3",
"types-requests==2.25.6",
"requests==2.27.0",
"black==22.6.0",
"bandit==1.7.4",
"isort==5.10.1",
"coverage==6.4.1",
"pre-commit==2.19.0",
"vulture==2.4",
"types-requests==2.28.0",
"types-PyYAML==6.0.9",
"requests==2.28.1",
],
},
)
+20 -5
View File
@@ -1,15 +1,18 @@
from fastapi import FastAPI
from fastapi.middleware.cors import CORSMiddleware
from fastapi.staticfiles import StaticFiles
from src.automations.manager import AutomationManager
from src.env import ROOT_FOLDER
from .routes import ping, automations
from src.env import API_PREFIX, ORIGIN, ROOT_FOLDER
from .routes import automations, details, ping, socket
def make_app(automation_mgr: AutomationManager) -> FastAPI:
app = FastAPI()
if (ROOT_FOLDER / "web").exists():
app.mount(
"/web",
f"{API_PREFIX}/web",
StaticFiles(
directory=ROOT_FOLDER / "web",
html=True,
@@ -18,7 +21,19 @@ def make_app(automation_mgr: AutomationManager) -> FastAPI:
)
else:
print("WARN: could not find web folder")
app.add_middleware(
CORSMiddleware,
allow_origins=ORIGIN,
allow_credentials=True,
allow_methods=["*"],
allow_headers=["*"],
)
app.include_router(ping.router, prefix="/ping")
app.include_router(automations.make_automation_router(automation_mgr), prefix="/automations")
app.include_router(
automations.make_automation_router(automation_mgr), prefix=f"{API_PREFIX}/automations"
)
app.include_router(
details.make_details_router(automation_mgr.hass_config), prefix=f"{API_PREFIX}/details"
)
app.include_router(socket.router, prefix=f"{API_PREFIX}/socket")
return app
+9 -3
View File
@@ -1,12 +1,14 @@
from fastapi import APIRouter, HTTPException
from src.automations.manager import AutomationManager
from src.api.types import (
DeleteAutoRequest,
ListData,
ListParams,
UpdateAutoRequest,
UpdateTags,
)
from src.automations.errors import FailedDeletion
from src.automations.manager import AutomationManager
from src.automations.types import AutomationData
@@ -24,11 +26,15 @@ def make_automation_router(automations: AutomationManager) -> APIRouter:
),
)
@router.post("")
@router.post("/item")
def upsert_auto(body: UpdateAutoRequest):
automations.update(body.index, body.data)
@router.delete("")
@router.post("/item/tags")
def update_tags(body: UpdateTags):
automations.update_tags(body.automation_id, body.tags)
@router.delete("/item")
def delete_auto(body: DeleteAutoRequest):
try:
automations.delete(body.index)
+21
View File
@@ -0,0 +1,21 @@
from fastapi import APIRouter
from src.env import BUILD_VERSION, HASSIO_TOKEN, HASSIO_WS
from src.hass_config import HassConfig
def make_details_router(hass_config: HassConfig) -> APIRouter:
router = APIRouter()
@router.get("/")
def read_details():
return {
"version": BUILD_VERSION,
"hassio_token": HASSIO_TOKEN,
"hassio_url": HASSIO_WS,
"config": hass_config.get_configuration_path(),
"tags": hass_config.get_automation_tags_path(),
"autos": hass_config.get_automation_path(),
}
return router
+2 -1
View File
@@ -1,6 +1,7 @@
from fastapi import APIRouter
from datetime import datetime
from fastapi import APIRouter
from src.env import BUILD_VERSION
router = APIRouter()
+39
View File
@@ -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(),
)
+10 -3
View File
@@ -1,8 +1,10 @@
from typing import Generic, List, TypeVar
from typing import Dict, Generic, List, TypeVar
from pydantic import BaseModel
from pydantic.fields import Field
from pydantic.generics import GenericModel
from src.automations.types import AutomationData
from src.automations.types import ExtenededAutomationData
DataT = TypeVar("DataT")
@@ -20,7 +22,12 @@ class ListData(GenericModel, Generic[DataT]):
class UpdateAutoRequest(BaseModel):
index: int = Field(description="Index of the automation to update")
data: AutomationData
data: ExtenededAutomationData
class UpdateTags(BaseModel):
automation_id: str = Field(description="Automation Id to update")
tags: Dict[str, str]
class DeleteAutoRequest(BaseModel):
+1 -1
View File
@@ -1,6 +1,6 @@
from src.api.app import make_app
from src.automations.manager import AutomationManager
from src.hass_config import find_hass_config
from src.api.app import make_app
hass_config = find_hass_config()
app = make_app(AutomationManager(hass_config))
+4 -1
View File
@@ -1,5 +1,8 @@
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):
+45 -23
View File
@@ -1,15 +1,18 @@
from itertools import chain
from typing import Iterable, Iterator
from typing import Any, Iterator, Union
from pydantic.error_wrappers import ValidationError
from src.json_serializer import normalize_obj
from .types import AutomationData, AutomationMetdata
from .parsers import _parse_actions
from .errors import InvalidAutomationFile
from .types import AutomationMetdata, ExtenededAutomationData
# Single loader
def load_automation(
automations_raw_data: Iterable[dict],
) -> Iterator[AutomationData]:
auto_raw: dict,
tags: dict,
) -> Iterator[ExtenededAutomationData]:
"""Converts an automation dictionary loaded directly from the config into
several python typed objects
@@ -17,22 +20,41 @@ def load_automation(
automations_raw_data (Iterable[dict])
Returns:
Iterator[AutomationData]
Iterator[ExtenededAutomationData]
"""
for auto_raw in automations_raw_data:
try:
yield AutomationData(
metadata=AutomationMetdata.parse_obj(auto_raw),
sequence=list(
_parse_actions(
chain(
auto_raw.get("condition", []),
auto_raw.get("action", []),
)
)
),
trigger=[normalize_obj(obj) for obj in auto_raw.get("trigger", [])],
)
except ValidationError as err:
raise InvalidAutomationFile from err
try:
yield ExtenededAutomationData(
metadata=AutomationMetdata.parse_obj(auto_raw),
condition=ifempty_or_null_then_list(load_conditions(auto_raw.get("condition", []))),
sequence=ifempty_or_null_then_list(load_conditions(auto_raw.get("action", []))),
trigger=ifempty_or_null_then_list(normalize_obj(auto_raw.get("trigger", []))),
tags=tags,
)
except ValidationError as err:
raise InvalidAutomationFile from err
def ifempty_or_null_then_list(obj: Any):
if not isinstance(obj, list):
return []
else:
return obj
def load_conditions(conditions: Union[dict, list, str]):
if isinstance(conditions, list):
return list(map(ensure_condition_dictionary, conditions))
elif not conditions:
return []
else:
return [ensure_condition_dictionary(conditions)]
def ensure_condition_dictionary(c: Union[str, dict]):
c = normalize_obj(c)
if isinstance(c, str):
return {"condition": "template", "value_template": c}
elif isinstance(c, dict):
return c
raise InvalidAutomationFile(f"Invalid type for condition object {c}")
+25 -10
View File
@@ -1,7 +1,9 @@
from typing import Iterator, List, Optional
from src.automations.errors import FailedDeletion
from src.automations.types import AutomationData
from typing import Dict, Iterator, List, Optional
from src.automations.errors import FailedDeletion, InvalidAutomationFile
from src.automations.types import AutomationData, ExtenededAutomationData
from src.hass_config.loader import HassConfig
from .loader import load_automation
@@ -14,32 +16,45 @@ class AutomationManager:
offset: int = 0,
limit: int = 10,
) -> Iterator[AutomationData]:
tags = self.hass_config.automation_tags
for i, auto in enumerate(self.hass_config.automations):
if i < offset:
continue
if i >= offset + limit:
break
yield from load_automation([auto])
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
if index >= 0:
for i, auto in enumerate(self.hass_config.automations):
if not isinstance(auto, dict):
raise InvalidAutomationFile(automation_index=i)
if i == index:
return next(load_automation(([auto])))
return next(load_automation(auto, tags.get(auto.get("id", ""), {})))
return None
def update(self, index: int, automation: AutomationData):
def update(self, index: int, automation: ExtenededAutomationData):
tags = self.hass_config.automation_tags
automations: List[dict] = []
updated = False
updated_index: Optional[int] = None
for i, orig_auto in enumerate(self.hass_config.automations):
if i == index:
automations.append(automation.to_primitive())
updated = True
updated_index = i
else:
automations.append(orig_auto)
if not updated:
if updated_index is None:
automations.append(automation.to_primitive())
updated_index = len(automations) - 1
tags[automation.metadata.id] = automation.tags
self.hass_config.save_automations(automations)
self.hass_config.save_tags(tags)
def 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):
automations: List[dict] = []
-88
View File
@@ -1,88 +0,0 @@
from typing import Iterable, Union
from src.json_serializer import json_dumps, normalize_obj
from src.yaml_serializer.types import SecretValue, NOT_IMPLEMENTED_SV_MSG
from .types import AutomationActionNode, AutomationConditionNode
def _parse_actions(
raw_actions: Iterable[Union[dict, str]]
) -> Iterable[Union[AutomationActionNode, AutomationConditionNode]]:
for raw_c in raw_actions:
action_type = "unknown"
if isinstance(raw_c, str):
yield from _parse_conditions([raw_c])
continue
elif isinstance(raw_c, dict):
if raw_c.get("condition"):
yield from _parse_conditions([raw_c])
continue
elif raw_c.get("service"):
action_type = "service"
action_data = normalize_obj(raw_c)
elif raw_c.get("repeat"):
action_type = "repeat"
repeat_data = raw_c.pop("repeat")
action_data = {
**raw_c,
"repeat": {
"count": repeat_data.get("count", 0),
"sequence": list(_parse_actions(repeat_data.get("sequence", []))),
},
}
elif raw_c.get("wait_template"):
action_type = "wait"
action_data = normalize_obj(raw_c)
elif raw_c.get("event"):
action_type = "event"
action_data = normalize_obj(raw_c)
elif raw_c.get("type") and raw_c.get("device_id"):
action_type = "device"
action_data = normalize_obj(raw_c)
elif raw_c.get("choose"):
action_type = "choose"
choose_data = raw_c.pop("choose")
default_data = raw_c.pop("default", [])
action_data = {
**raw_c,
"choose": [
{
"conditions": list(_parse_conditions(option.get("conditions", []))),
"sequence": list(_parse_actions(option.get("sequence", []))),
}
for option in choose_data
],
"default": list(_parse_actions(default_data)),
}
else:
action_data = normalize_obj(raw_c)
yield AutomationActionNode(
action=action_type,
action_data=action_data,
)
def _parse_conditions(
raw_conditions: Iterable[Union[dict, str]]
) -> Iterable[AutomationConditionNode]:
for raw_c in raw_conditions:
if isinstance(raw_c, str):
yield AutomationConditionNode(
condition="template",
condition_data={"value_template": raw_c},
)
elif isinstance(raw_c, SecretValue):
yield AutomationConditionNode(
condition="template",
condition_data={"value_template": NOT_IMPLEMENTED_SV_MSG},
)
elif isinstance(raw_c, dict):
condition = raw_c.pop("condition")
yield AutomationConditionNode(
condition=condition,
condition_data=normalize_obj(raw_c),
)
else:
yield AutomationConditionNode(
condition="template",
condition_data=json_dumps(raw_c),
)
+14
View File
@@ -0,0 +1,14 @@
from pathlib import Path
from typing import Dict
from src.yaml_serializer import dump_yaml, load_yaml
class TagManager(Dict[str, Dict[str, str]]):
def save(self, path: Path):
path.write_text(dump_yaml(dict(self)))
@classmethod
def load(cls, path: Path):
with path.open("r") as fp:
return cls(load_yaml(fp))
+13 -28
View File
@@ -1,27 +1,7 @@
from typing import Dict, List, Literal, Optional, Union
from pydantic.fields import Field
from typing import Dict, List, Optional, Union
from pydantic import BaseModel
class AutomationConditionNode(BaseModel):
condition: str
condition_data: dict
node_type: Literal["condition"] = Field(alias="$smType", default="condition")
def to_primitive(self):
return {
**self.condition_data,
"condition": self.condition,
}
class AutomationActionNode(BaseModel):
action: str
action_data: dict
node_type: Literal["action"] = Field(alias="$smType", default="action")
def to_primitive(self):
return self.action_data
from pydantic.fields import Field
class AutomationMetdata(BaseModel):
@@ -29,18 +9,23 @@ class AutomationMetdata(BaseModel):
alias: Optional[str] = None
description: Optional[str] = None
trigger_variables: Optional[Dict[str, Union[str, int, bool, float]]] = None
mode: Literal["single", "restart", "queued", "parallel"] = "single"
mode: str = "single"
class AutomationData(BaseModel):
metadata: AutomationMetdata
trigger: List[dict] = []
sequence: List[Union[AutomationConditionNode, AutomationActionNode]] = []
condition: List[dict] = []
sequence: List[dict] = []
def to_primitive(self):
return {
**self.metadata.dict(),
**self.metadata.dict(exclude_unset=True, exclude_none=True),
"trigger": self.trigger,
"condition": [],
"action": [action.to_primitive() for action in self.sequence],
"condition": self.condition,
"action": self.sequence,
}
class ExtenededAutomationData(AutomationData):
tags: Dict[str, str] = Field(default_factory=dict)
+28
View File
@@ -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))
+5 -1
View File
@@ -1,7 +1,11 @@
from decouple import config
from pathlib import Path
from decouple import Csv, config
ROOT_FOLDER = Path(__file__).parent.parent.absolute()
BUILD_VERSION = config("BUILD_VERSION", "0.0.0")
HASSIO_TOKEN = config("SUPERVISOR_TOKEN", "")
HASSIO_WS = config("HASSIO_WS", "ws://supervisor/core/websocket")
LOG_LEVEL = config("LOG_LEVEL", "INFO")
API_PREFIX = config("API_PREFIX", "")
ORIGIN = config("ORIGIN", cast=Csv(), default="*")
+13 -6
View File
@@ -1,7 +1,8 @@
import os
from typing import cast
from decouple import config
from pathlib import Path
from decouple import config
from .loader import HassConfig
@@ -9,12 +10,18 @@ def find_hass_config() -> HassConfig:
"""Try to find HASS config."""
if config("USE_EXAMPLE_REPO", False, cast=bool):
print("using USE_EXAMPLE_REPO")
from tests.utils import create_copy_of_example_config
from tests.utils import (
HA_CONFIG3_EXAMPLE,
create_copy_of_example_config,
)
return HassConfig(create_copy_of_example_config())
path = create_copy_of_example_config(HA_CONFIG3_EXAMPLE)
print("|-> ", path)
return HassConfig(path)
if "HASSIO_TOKEN" in os.environ:
return HassConfig(Path("/config"))
config_dir = Path("/config")
if config_dir.is_dir():
return HassConfig(config_dir)
"""Put together the default configuration directory based on the OS."""
data_dir = Path(config("APPDATA", None) if os.name == "nt" else os.path.expanduser("~"))
+18 -1
View File
@@ -1,8 +1,10 @@
from pathlib import Path
from typing import List, Optional
from src.yaml_serializer import load_yaml, dump_yaml
from src.automations.tags import TagManager
from src.yaml_serializer import dump_yaml, load_yaml
from src.yaml_serializer.types import IncludedYaml
from .errors import MissingFile
@@ -25,6 +27,18 @@ class HassConfig:
raise MissingFile("automations.yaml") from err
return self.configurations["automation"]
@property
def automation_tags(self) -> TagManager:
tag_path = self.get_automation_tags_path()
if not tag_path.exists():
tag_path.parent.mkdir(parents=True, exist_ok=True)
return TagManager()
else:
return TagManager.load(tag_path)
def get_automation_tags_path(self) -> Path:
return self.root_path / ".shortumations" / "tags.yaml"
def get_configuration_path(self) -> Path:
return self.root_path / "configuration.yaml"
@@ -50,3 +64,6 @@ class HassConfig:
self.get_configuration_path().write_text(
dump_yaml({**self.configurations, "automation": automations})
)
def save_tags(self, tags: TagManager):
tags.save(self.get_automation_tags_path())
+2 -1
View File
@@ -1,5 +1,5 @@
import json
from typing import Any
from typing import Any, List
def json_dumps(obj: Any) -> str:
@@ -34,6 +34,7 @@ def normalize_obj(obj: Any) -> Any:
or isinstance(obj, int)
or isinstance(obj, float)
or isinstance(obj, bool)
or obj is None
):
return obj
else:
+4
View File
@@ -14,3 +14,7 @@ else:
logging.basicConfig(level=logging.NOTSET)
logger = logging.getLogger()
def get_logger(name: str):
return logging.getLogger(name)
+59
View File
@@ -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())
+15 -4
View File
@@ -1,6 +1,10 @@
import io
from typing import Any, Union, TextIO
from src.yaml_serializer.base_yaml import yaml
from typing import Any, TextIO, Union
import yaml
from src.yaml_serializer.dumper import YamlSafeDumper
from src.yaml_serializer.loader import YamlSafeLoader
def dump_yaml(obj: Any) -> str:
@@ -13,7 +17,14 @@ def dump_yaml(obj: Any) -> str:
str
"""
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)
return stream.read()
@@ -27,4 +38,4 @@ def load_yaml(yaml_stream: TextIO) -> Union[dict, list]:
Returns:
List[dict, list]
"""
return yaml.load(yaml_stream)
return yaml.load(yaml_stream, Loader=YamlSafeLoader) # nosec
-14
View File
@@ -1,14 +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)
+16
View File
@@ -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
+20
View File
@@ -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)
+3 -2
View File
@@ -1,6 +1,7 @@
from typing import NamedTuple
from ruamel.yaml.nodes import Node
from ruamel.yaml.representer import BaseRepresenter
from yaml.nodes import Node
from yaml.representer import BaseRepresenter
class IncludedYaml(NamedTuple):
@@ -0,0 +1,15 @@
- id: '1652069225859'
alias: 'Climate - Pref temperature '
description: ''
trigger:
- platform: state
entity_id: input_number.preferred_temperature
condition: []
action:
- service: climate.set_temperature
data:
temperature:
'[object Object]':
target:
entity_id: climate.main_floor
mode: single
@@ -0,0 +1,2 @@
# empty configuration file
cloud:
@@ -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
@@ -0,0 +1,2 @@
# empty configuration file
cloud:
@@ -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
+841
View File
@@ -0,0 +1,841 @@
- id: '1616887975473'
alias: Home Assistant Off
description: ''
trigger:
- platform: homeassistant
event: shutdown
condition: []
action:
- device_id: das2qdasdasdasadaasd
domain: mobile_app
type: notify
title: Hassio Status
message: Hassio Is turning off...
mode: single
- id: '1616888026264'
alias: Home Assistant On
description: ''
trigger:
- platform: homeassistant
event: start
condition: []
action:
- device_id: das2qdasdasdasadaasd
domain: mobile_app
type: notify
title: Hassio Status
message: Home assistant is up!
mode: single
- id: '1619371298367'
alias: Living Room Button - Single Press
description: ''
trigger:
- device_id: das2qdasdasdasadaasd
domain: zha
platform: device
type: remote_button_short_press
subtype: remote_button_short_press
condition: []
action:
- service: light.toggle
data: {}
target:
area_id: dining_table
mode: single
- id: '1620239986670'
alias: Kitchen Button - Short Press
description: ''
trigger:
- device_id: das2qdasdasdasadaasd
domain: zha
platform: device
type: remote_button_short_press
subtype: remote_button_short_press
condition: []
action:
- service: light.toggle
data: {}
target:
entity_id: light.switch_kitchen
mode: single
- id: '1620324780561'
alias: Kitchen Island Button - Single Press
description: ''
trigger:
- device_id: das2qdasdasdasadaasd
domain: zha
platform: device
type: remote_button_short_press
subtype: remote_button_short_press
condition: []
action:
- type: toggle
device_id: das2qdasdasdasadaasd
entity_id: light.switch_island
domain: light
mode: single
- id: '1621352850204'
alias: Kitchen Button - Double Press
description: ''
trigger:
- device_id: das2qdasdasdasadaasd
domain: zha
platform: device
type: remote_button_double_press
subtype: remote_button_double_press
condition: []
action:
- type: toggle
device_id: das2qdasdasdasadaasd
entity_id: light.switch_island
domain: light
mode: single
- id: '1622210698281'
alias: Kitchen Button - Long Press
description: ''
trigger:
- device_id: das2qdasdasdasadaasd
domain: zha
platform: device
type: remote_button_long_press
subtype: remote_button_long_press
condition: []
action:
- choose:
- conditions:
- condition: numeric_state
entity_id: light.switch_kitchen
attribute: brightness
above: '200'
sequence:
- service: light.turn_on
data:
brightness: 50
target:
entity_id: light.switch_kitchen
default:
- service: light.turn_on
data:
brightness: 255
target:
entity_id: light.switch_kitchen
mode: single
- id: '1622769811245'
alias: Living Room Button - Double Press
description: ''
trigger:
- device_id: das2qdasdasdasadaasd
domain: zha
platform: device
type: remote_button_double_press
subtype: remote_button_double_press
condition: []
action:
- service: light.toggle
data:
brightness: 255
target:
entity_id: light.switch_living
mode: single
- id: '1623430479201'
alias: Bedroom Button - Single Press
description: ''
trigger:
- device_id: das2qdasdasdasadaasd
domain: zha
platform: device
type: remote_button_short_press
subtype: remote_button_short_press
condition: []
action:
- type: toggle
device_id: das2qdasdasdasadaasd
entity_id: light.bulb_ari_lamp
domain: light
mode: single
- id: '1623642118976'
alias: Bedroom Button - Double Press
description: ''
trigger:
- device_id: das2qdasdasdasadaasd
domain: zha
platform: device
type: remote_button_double_press
subtype: remote_button_double_press
condition: []
action:
- service: script.turn_all_lights_off
mode: single
- id: '1624640900951'
alias: Baby Button - Double Press
description: ''
trigger:
- device_id: das2qdasdasdasadaasd
domain: zha
platform: device
type: remote_button_double_press
subtype: remote_button_double_press
condition: []
action:
- service: media_player.play_media
target:
entity_id: media_player.baby_bedroom_dot
data:
media_content_id: Baby Sleep Music
media_content_type: SPOTIFY
mode: single
- id: '1628024070687'
alias: Baby Light Setting - Night
description: ''
trigger:
- platform: time
at: '20:35:00'
condition: []
action:
- service: zwave_js.set_config_parameter
data:
parameter: '5'
value: '15'
target:
area_id: bedroom
- condition: state
entity_id: light.switch_baby
state: 'on'
- service: light.turn_on
data:
transition: 5
brightness_pct: 15
target:
area_id: bedroom
- service: light.turn_on
target:
area_id: bedroom
data:
brightness_pct: 25
mode: single
- id: '1628024123214'
alias: Baby Light Setting - Day
description: ''
trigger:
- platform: time
at: 07:00:00
condition: []
action:
- service: zwave_js.set_config_parameter
data:
value: '100'
parameter: '5'
target:
area_id: bedroom
- condition: state
entity_id: light.switch_baby
state: 'on'
- service: light.turn_on
data:
transition: 5
brightness_pct: 50
target:
area_id: bedroom
mode: single
- id: '1628444671951'
alias: Office Window Opened
description: ''
trigger:
- type: opened
platform: device
device_id: das2qdasdasdasadaasd
entity_id: binary_sensor.window_office
domain: binary_sensor
condition:
- condition: time
after: '21:00'
- condition: state
entity_id: alarm_control_panel.home_alarm
state: armed_away
action:
- service: notify.mobile_app_levas_phone
data:
message: Window is opened in office
mode: single
- id: '1629309267204'
alias: On Balcony Door Open
description: ''
trigger:
- type: opened
platform: device
device_id: das2qdasdasdasadaasd
entity_id: binary_sensor.door_balcony
domain: binary_sensor
condition: []
action:
- service: switch.turn_on
target:
area_id: balcony
data: {}
- service: light.turn_on
target:
area_id: balcony
data: {}
- repeat:
until:
- type: is_not_open
condition: device
device_id: das2qdasdasdasadaasd
entity_id: binary_sensor.door_balcony
domain: binary_sensor
sequence:
- delay:
hours: 0
minutes: 5
seconds: 0
milliseconds: 0
- service: switch.turn_off
target:
device_id:
- das2qdasdasdasadaasd
- sad2q3qdewqdasdadasdas
area_id: balcony
data: {}
mode: single
- id: '1629422438707'
alias: Vita Night Light
description: ''
trigger:
- platform: time
at: input_datetime.vita_night_pump_time
condition:
- condition: and
conditions:
- condition: time
after: input_datetime.vita_night_pump_time
before: 00:00:00
- condition: time
after: 00:00:00
before: 06:00:00
action:
- service: light.turn_on
target:
entity_id: light.bulb_staircase
area_id: living_room
data:
brightness_pct: 40
transition: 15
mode: single
- id: '1634497376234'
alias: Baby Button - Long Press
description: ''
trigger:
- device_id: das2qdasdasdasadaasd
domain: zha
platform: device
type: remote_button_long_press
subtype: remote_button_long_press
condition: []
action:
- service: media_player.media_pause
target:
device_id: das2qdasdasdasadaasd
- type: turn_off
device_id: das2qdasdasdasadaasd
entity_id: light.switch_baby
domain: light
mode: single
- id: '1635539262562'
alias: On Home Enter
description: ''
trigger:
- platform: zone
entity_id: person.ari
zone: zone.home_2
event: enter
condition:
- condition: not
conditions:
- condition: state
entity_id: alarm_control_panel.home_alarm
state: disarmed
action:
- service: alarm_control_panel.alarm_disarm
target:
entity_id: alarm_control_panel.home_alarm
data:
code: '8012'
- condition: state
entity_id: light.switch_living
state: 'off'
- wait_template: '{{ states("binary_sensor.door_main") == "on" }}'
timeout: 00:10:00
- service: light.turn_on
target:
area_id: living_room
data:
transition: 5
brightness: 255
mode: single
- id: '1636428429596'
alias: Night - On TV off
description: Auto runs things when we go to sleep
trigger:
- platform: time
at: '22:30:00'
- platform: device
device_id: das2qdasdasdasadaasd
domain: media_player
entity_id: media_player.ari_s_fire_tv
type: turned_off
- platform: device
device_id: das2qdasdasdasadaasd
domain: media_player
entity_id: media_player.living_room_firetv
type: turned_off
- platform: numeric_state
entity_id: sensor.analog_input_living_room_tv
below: '1'
condition:
- condition: time
before: 07:00:00
after: '21:00:00'
- condition: numeric_state
entity_id: sensor.analog_input_living_room_tv
below: '1'
- condition: state
entity_id: input_boolean.night_automation_ran
state: 'off'
action:
- service: switch.turn_off
data: {}
target:
area_id:
- dining_table
- office
- living_room
- service: light.turn_off
target:
entity_id:
- light.switch_kitchen
- light.switch_island
- light.switch_dining_chandelier
- light.switch_office_hallway
- switch.light_office
area_id:
- dining_table
- kitchen
data:
transition: 5
- service: light.turn_on
data:
transition: 10
brightness_pct: 50
target:
entity_id: light.switch_living
- service: light.turn_on
data:
brightness_pct: 47
kelvin: 4600
target:
entity_id:
- light.bulb_ari_lamp
- light.bulb_ari_lamp_philip
device_id: das2qdasdasdasadaasd
- service: input_boolean.turn_on
data: {}
target:
entity_id: input_boolean.night_automation_ran
- wait_template: '{{ states("light.bulb_ari_lamp") == "off" }}'
- service: script.turn_all_lights_off
data: {}
mode: single
- id: '1639500650865'
alias: Main Bedroom - Closet Door - Toggle
description: ''
trigger:
- platform: state
entity_id: binary_sensor.door_main_bedroom_closet
condition: []
action:
- choose:
- conditions:
- condition: template
value_template: '{{ trigger.to_state.attributes.contact }}'
sequence:
- service: light.turn_off
target:
entity_id:
- light.bulb_closet
default:
- service: light.turn_on
target:
entity_id:
- light.bulb_closet
data:
transition: 3
mode: single
- id: '1641617168123'
alias: Ensure On
description: ''
trigger:
- platform: device
type: turned_off
device_id: das2qdasdasdasadaasd
entity_id: switch.power_washer
domain: switch
- platform: device
type: turned_off
device_id: das2qdasdasdasadaasd
entity_id: switch.plug_living_room_tv
domain: switch
condition: []
action:
- type: turn_on
device_id: das2qdasdasdasadaasd
entity_id: switch.power_washer
domain: switch
- type: turn_on
device_id: das2qdasdasdasadaasd
entity_id: switch.plug_living_room_tv
domain: switch
mode: single
- id: '1648071019802'
alias: 'Keep Bug Light On '
description: Keeps living room bug lamp on
trigger:
- platform: device
type: turned_off
device_id: das2qdasdasdasadaasd
entity_id: switch.plug_buglamp_indoor
domain: switch
condition: []
action:
- type: turn_on
device_id: das2qdasdasdasadaasd
entity_id: switch.plug_buglamp_indoor
domain: switch
mode: single
- id: '1649426399020'
alias: Office Motion
description: Turn lights on or off when motion is detected
trigger:
- platform: state
entity_id: binary_sensor.motion_office_inv
for:
hours: 0
minutes: 0
seconds: 0
condition:
- condition: time
before: '18:00:00'
after: 06:00:00
weekday:
- mon
- tue
- wed
- thu
- fri
action:
- choose:
- conditions:
- condition: state
entity_id: binary_sensor.motion_office_inv
state: 'on'
sequence:
- type: turn_on
device_id: das2qdasdasdasadaasd
entity_id: switch.light_office
domain: switch
default:
- type: turn_off
device_id: das2qdasdasdasadaasd
entity_id: switch.light_office
domain: switch
mode: single
- id: '1649432254675'
alias: Baby Light Setting
description: Controls max brightness on the baby light
trigger:
- platform: time
at: 07:00:00
- platform: time
at: '20:30:00'
condition: []
action:
- choose:
- conditions:
- condition: time
before: 07:00:00
after: '20:30:00'
sequence:
- service: zwave_js.set_config_parameter
data:
parameter: '5'
value: '15'
target:
area_id: bedroom
- condition: state
entity_id: light.switch_baby
state: 'on'
- service: light.turn_on
data:
transition: 5
brightness_pct: 15
target:
area_id: bedroom
- service: light.turn_on
target:
area_id: bedroom
data:
brightness_pct: 25
default:
- service: zwave_js.set_config_parameter
data:
value: '100'
parameter: '5'
target:
area_id: bedroom
- condition: state
entity_id: light.switch_baby
state: 'on'
- service: light.turn_on
data:
transition: 5
brightness_pct: 50
target:
area_id: bedroom
mode: single
- id: '1649726828269'
alias: Climate Heat Mode Settings
description: Ensures that the climate is always in sync with the house settings
trigger:
- platform: state
entity_id: climate.main_floor
id: main
- platform: state
entity_id: climate.second_floor
id: second
- platform: state
entity_id: input_boolean.thermostats_house_is_heating
id: setting
condition: []
action:
- choose:
- conditions:
- condition: template
value_template: '{{ trigger.id == "setting" }}'
sequence:
- service: climate.turn_off
data: {}
target:
device_id:
- das2qdasdasdasadaasd
- 32424rsafdsafsasq2341
- conditions:
- condition: state
entity_id: input_boolean.thermostats_house_is_heating
state: 'on'
sequence:
- choose:
- conditions:
- condition: and
conditions:
- condition: template
value_template: '{{ trigger.to_state.state != ''heat'' }}'
- condition: template
value_template: '{{ trigger.to_state.state != ''off'' }}'
sequence:
- service: climate.set_hvac_mode
data:
hvac_mode: heat
target:
entity_id: '{{ trigger.entity_id }}'
default:
- choose:
- conditions:
- condition: and
conditions:
- condition: template
value_template: '{{ trigger.to_state.state != ''cool'' }}'
- condition: template
value_template: '{{ trigger.to_state.state != ''off'' }}'
sequence:
- service: climate.set_hvac_mode
data:
hvac_mode: cool
target:
entity_id: '{{ trigger.entity_id }}'
mode: single
- id: '1649727810678'
alias: Climate Timing
description: ''
trigger:
- platform: time
at: 01:00:00
id: night
- platform: time
at: 06:00:00
id: day
condition: []
action:
- choose:
- conditions:
- condition: template
value_template: '{{ trigger.id == "night" }}'
sequence:
- service: climate.turn_off
data: {}
target:
area_id:
- living_room
- main_bedroom
default:
- choose:
- conditions:
- condition: state
entity_id: input_boolean.thermostats_house_is_heating
state: 'on'
sequence:
- service: climate.set_hvac_mode
data:
hvac_mode: heat
target:
area_id:
- living_room
- main_bedroom
default:
- service: climate.set_hvac_mode
data:
hvac_mode: cool
target:
area_id:
- living_room
- main_bedroom
- service: climate.set_temperature
data:
temperature: 23.5
target:
area_id:
- living_room
- main_bedroom
mode: single
- id: '1649820885714'
alias: Turn off Night Auto Ran
description: ''
trigger:
- platform: time
at: 07:00:00
condition: []
action:
- service: input_boolean.turn_off
data: {}
target:
entity_id: input_boolean.night_automation_ran
mode: single
- id: '1649947692702'
alias: Bed Remote
description: ''
trigger:
- device_id: das2qdasdasdasadaasd
domain: zha
platform: device
type: remote_button_short_press
subtype: turn_on
id: turn_on
- device_id: das2qdasdasdasadaasd
domain: zha
platform: device
type: remote_button_short_press
subtype: turn_off
id: turn_off
- device_id: das2qdasdasdasadaasd
domain: zha
platform: device
type: remote_button_short_press
subtype: dim_up
id: dim_up
- device_id: das2qdasdasdasadaasd
domain: zha
platform: device
type: remote_button_short_press
subtype: dim_down
id: dim_down
- device_id: das2qdasdasdasadaasd
domain: zha
platform: device
type: remote_button_double_press
subtype: turn_on
id: up_dbclk
condition: []
action:
- choose:
- conditions:
- condition: trigger
id: turn_off
sequence:
- type: turn_off
device_id: das2qdasdasdasadaasd
entity_id: light.bulb_ari_lamp
domain: light
- conditions:
- condition: trigger
id: turn_on
sequence:
- service: light.turn_on
data:
color_temp: 153
brightness_pct: 100
target:
device_id: das2qdasdasdasadaasd
- conditions:
- condition: trigger
id: dim_up
sequence:
- device_id: das2qdasdasdasadaasd
domain: light
entity_id: light.bulb_ari_lamp
type: brightness_increase
- conditions:
- condition: trigger
id: dim_down
sequence:
- device_id: das2qdasdasdasadaasd
domain: light
entity_id: light.bulb_ari_lamp
type: brightness_decrease
- conditions:
- condition: trigger
id: up_dbclk
sequence:
- service: light.turn_on
data:
color_temp: 500
brightness_pct: 100
target:
device_id: das2qdasdasdasadaasd
default: []
mode: single
- id: 'baddy-1'
alias: 'bad triggers'
description: ''
trigger: ""
condition: []
action: []
mode: single
- id: 'baddy-2'
alias: 'null things'
description: ''
trigger:
condition:
action:
mode: single
- id: 'baddy-3'
alias: 'big null things'
description:
trigger:
condition:
action:
mode: single
- id: 'bad mode'
alias: 'bade mode'
description: ""
trigger: []
condition: []
action: []
mode: bad
@@ -0,0 +1,2 @@
# empty configuration file
cloud:
Submodule api/tests/samples/example_config_folder deleted from 2f2c69d6db.
+227 -17
View File
@@ -1,8 +1,15 @@
from unittest import TestCase
import yaml
from fastapi.testclient import TestClient
from src.api.app import make_app
from src.automations.types import AutomationData, AutomationMetdata
from tests.utils import get_example_automation_loader
from src.automations.types import (
AutomationData,
AutomationMetdata,
ExtenededAutomationData,
)
from tests.utils import HA_CONFIG2_EXAMPLE, get_example_automation_loader
class BaseTestCase(TestCase):
@@ -16,6 +23,9 @@ class BaseTestCase(TestCase):
class automation_list_tests(BaseTestCase):
test_params = {"total": 32, "subtest2_found_items": 7, "subtest1_found_items": 10}
def test_get_list_of_everything(self):
data = self.client.post(
"/automations/list",
@@ -33,8 +43,8 @@ class automation_list_tests(BaseTestCase):
"limit": 50,
},
)
self.assertEqual(d["totalItems"], 31)
self.assertEqual(len(d["data"]), 31)
self.assertEqual(d["totalItems"], self.test_params["total"])
self.assertEqual(len(d["data"]), self.test_params["total"])
def test_subset1(self):
data = self.client.post(
@@ -53,8 +63,8 @@ class automation_list_tests(BaseTestCase):
"limit": 10,
},
)
self.assertEqual(d["totalItems"], 31)
self.assertEqual(len(d["data"]), 10)
self.assertEqual(d["totalItems"], self.test_params["total"])
self.assertEqual(len(d["data"]), self.test_params["subtest1_found_items"])
def test_subset2(self):
data = self.client.post(
@@ -73,32 +83,48 @@ class automation_list_tests(BaseTestCase):
"limit": 10,
},
)
self.assertEqual(d["totalItems"], 31)
self.assertEqual(len(d["data"]), 6)
self.assertEqual(d["totalItems"], self.test_params["total"])
self.assertEqual(len(d["data"]), self.test_params["subtest2_found_items"])
class automation2_lists_tests(automation_list_tests):
test_params = {
"total": 1,
"subtest2_found_items": 0,
"subtest1_found_items": 1,
}
def setUp(self) -> None:
(
self.config_folder,
self.hass_config,
self.automation_loader,
) = get_example_automation_loader(HA_CONFIG2_EXAMPLE)
self.client = TestClient(make_app(self.automation_loader))
class automation_update_tests(BaseTestCase):
def test_insert_new(self):
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0})
self.assertEqual(resp.json()["totalItems"], 31)
self.assertEqual(resp.json()["totalItems"], 32)
resp = self.client.post(
"/automations",
"/automations/item",
json={
"index": 33,
"data": AutomationData(metadata=AutomationMetdata(id="testme")).dict(),
},
)
self.assertEqual(resp.status_code, 200)
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 31})
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 32})
data = resp.json()
self.assertEqual(data["totalItems"], 32)
self.assertEqual(data["totalItems"], 33)
self.assertEqual(data["data"][0]["metadata"]["id"], "testme")
def test_update_some(self):
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 20})
original_auto = resp.json()["data"][0]
resp = self.client.post(
"/automations",
"/automations/item",
json={
"index": 20,
"data": AutomationData(metadata=AutomationMetdata(id="testme")).dict(),
@@ -108,19 +134,203 @@ class automation_update_tests(BaseTestCase):
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 20})
new_auto = resp.json()["data"][0]
self.assertNotEqual(original_auto, new_auto)
self.assertEqual(AutomationData(metadata=AutomationMetdata(id="testme")).dict(), new_auto)
self.assertEqual(
ExtenededAutomationData(metadata=AutomationMetdata(id="testme")).dict(), new_auto
)
def test_consistent_standard_1(self):
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 15})
original_auto = resp.json()["data"][0]
original_auto["metadata"]["alias"] = "I CHANGED!"
resp = self.client.post(
"/automations/item",
json={
"index": 15,
"data": original_auto,
},
)
self.assertEqual(resp.status_code, 200)
with (self.config_folder / "automations.yaml").open("r") as fp:
disk_data = dict(yaml.safe_load(fp)[15])
trigger = list(map(dict, disk_data.pop("trigger")))
condition = disk_data.pop("condition")
action = list(map(dict, disk_data.pop("action")))
self.assertDictEqual(
disk_data,
{"id": "1629422438707", "alias": "I CHANGED!", "description": "", "mode": "single"},
)
self.assertListEqual(
trigger, [{"platform": "time", "at": "input_datetime.vita_night_pump_time"}]
)
self.assertListEqual(
condition,
[
{
"conditions": [
{
"condition": "time",
"after": "input_datetime.vita_night_pump_time",
"before": "00:00:00",
},
{"condition": "time", "after": "00:00:00", "before": "06:00:00"},
],
"condition": "and",
},
],
)
self.assertListEqual(
action,
[
{
"service": "light.turn_on",
"target": {"entity_id": "light.bulb_staircase", "area_id": "living_room"},
"data": {"brightness_pct": 40, "transition": 15},
}
],
)
def test_consistent_standard_2(self):
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 27})
original_auto = resp.json()["data"][0]
original_auto["metadata"]["alias"] = "I CHANGED!"
resp = self.client.post(
"/automations/item",
json={
"index": 27,
"data": original_auto,
},
)
self.assertEqual(resp.status_code, 200)
with (self.config_folder / "automations.yaml").open("r") as fp:
disk_data = dict(yaml.safe_load(fp)[27])
trigger = list(map(dict, disk_data.pop("trigger")))
condition = disk_data.pop("condition")
action = list(map(dict, disk_data.pop("action")))
self.assertDictEqual(
disk_data,
{"id": "1649947692702", "alias": "I CHANGED!", "description": "", "mode": "single"},
)
self.assertListEqual(
trigger,
[
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "turn_on",
"id": "turn_on",
},
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "turn_off",
"id": "turn_off",
},
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "dim_up",
"id": "dim_up",
},
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "dim_down",
"id": "dim_down",
},
{
"device_id": "das2qdasdasdasadaasd",
"domain": "zha",
"platform": "device",
"type": "remote_button_double_press",
"subtype": "turn_on",
"id": "up_dbclk",
},
],
)
self.assertListEqual(condition, [])
self.assertListEqual(
action,
[
{
"choose": [
{
"conditions": [{"condition": "trigger", "id": "turn_off"}],
"sequence": [
{
"type": "turn_off",
"device_id": "das2qdasdasdasadaasd",
"entity_id": "light.bulb_ari_lamp",
"domain": "light",
}
],
},
{
"conditions": [{"condition": "trigger", "id": "turn_on"}],
"sequence": [
{
"service": "light.turn_on",
"data": {"color_temp": 153, "brightness_pct": 100},
"target": {"device_id": "das2qdasdasdasadaasd"},
}
],
},
{
"conditions": [{"condition": "trigger", "id": "dim_up"}],
"sequence": [
{
"device_id": "das2qdasdasdasadaasd",
"domain": "light",
"entity_id": "light.bulb_ari_lamp",
"type": "brightness_increase",
}
],
},
{
"conditions": [{"condition": "trigger", "id": "dim_down"}],
"sequence": [
{
"device_id": "das2qdasdasdasadaasd",
"domain": "light",
"entity_id": "light.bulb_ari_lamp",
"type": "brightness_decrease",
}
],
},
{
"conditions": [{"condition": "trigger", "id": "up_dbclk"}],
"sequence": [
{
"service": "light.turn_on",
"data": {"color_temp": 500, "brightness_pct": 100},
"target": {"device_id": "das2qdasdasdasadaasd"},
}
],
},
],
"default": [],
}
],
)
class automation_delete_tests(BaseTestCase):
def test_delete_some(self):
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0})
self.assertEqual(resp.json()["totalItems"], 31)
self.assertEqual(resp.json()["totalItems"], 32)
resp = self.client.delete(
"/automations",
"/automations/item",
json={
"index": 20,
},
)
self.assertEqual(resp.status_code, 200)
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0})
self.assertEqual(resp.json()["totalItems"], 30)
self.assertEqual(resp.json()["totalItems"], 31)
+37 -45
View File
@@ -1,45 +1,37 @@
from unittest import TestCase
from src.automations.types import (
AutomationActionNode,
AutomationConditionNode,
AutomationData,
AutomationMetdata,
)
from src.automations.loader import load_automation
from src.yaml_serializer.types import (
SecretValue,
NOT_IMPLEMENTED_SV_MSG,
)
from src.automations.types import AutomationMetdata, ExtenededAutomationData
from src.yaml_serializer.types import NOT_IMPLEMENTED_SV_MSG, SecretValue
class loader_tests(TestCase):
def test_load_automation_runs(self):
auto = list(
load_automation(
[
{
"id": "1616887975473",
"alias": "Home Assistant Off",
"description": "",
"trigger": [{"platform": "homeassistant", "event": "shutdown"}],
"condition": ["states(time.time) >= '10:00:00'"],
"action": [
{
"device_id": SecretValue("my_mobile_phone", "..."),
"domain": "mobile_app",
"type": "notify",
"title": "Hassio Status",
"message": "Hassio Is turning off...",
}
],
"mode": "single",
}
]
{
"id": "1616887975473",
"alias": "Home Assistant Off",
"description": "",
"trigger": [{"platform": "homeassistant", "event": "shutdown"}],
"condition": ["states(time.time) >= '10:00:00'"],
"action": [
{
"device_id": SecretValue("my_mobile_phone", "..."),
"domain": "mobile_app",
"type": "notify",
"title": "Hassio Status",
"message": "Hassio Is turning off...",
}
],
"mode": "single",
},
{},
)
)
self.assertEqual(
auto[0],
AutomationData(
ExtenededAutomationData(
metadata=AutomationMetdata(
id="1616887975473",
alias="Home Assistant Off",
@@ -47,21 +39,21 @@ class loader_tests(TestCase):
mode="single",
),
trigger=[{"platform": "homeassistant", "event": "shutdown"}],
sequence=[
AutomationConditionNode(
condition="template",
condition_data={"value_template": "states(time.time) >= '10:00:00'"},
),
AutomationActionNode(
action="device",
action_data={
"device_id": NOT_IMPLEMENTED_SV_MSG,
"domain": "mobile_app",
"type": "notify",
"title": "Hassio Status",
"message": "Hassio Is turning off...",
},
),
condition=[
{
"condition": "template",
"value_template": "states(time.time) >= '10:00:00'",
}
],
sequence=[
{
"device_id": NOT_IMPLEMENTED_SV_MSG,
"domain": "mobile_app",
"type": "notify",
"title": "Hassio Status",
"message": "Hassio Is turning off...",
}
],
tags={},
),
)
+32 -18
View File
@@ -1,6 +1,7 @@
from unittest import TestCase
from src.automations.errors import FailedDeletion, InvalidAutomationFile
from src.automations.types import AutomationData, AutomationMetdata
from src.automations.types import AutomationMetdata, ExtenededAutomationData
from tests.utils import (
get_dummy_automation_loader,
get_example_automation_loader,
@@ -23,11 +24,11 @@ class manager_tests(TestCase):
_, _, loader = get_example_automation_loader()
self.assertIsNone(loader.get(-1))
self.assertIsNone(loader.get(1_000))
self.assertIsNone(loader.get(31))
self.assertIsNone(loader.get(33))
def test_length(self):
_, _, loader = get_example_automation_loader()
self.assertEqual(loader.get_total_items(), 31)
self.assertEqual(loader.get_total_items(), 32)
def test_bad_automations_file(self):
folder, _, manager = get_dummy_automation_loader(
@@ -43,41 +44,41 @@ class manager_tests(TestCase):
[],
automation_in_conifguration_mode="none",
)
manager.update(1, AutomationData(metadata=AutomationMetdata(id="test1")))
manager.update(1, ExtenededAutomationData(metadata=AutomationMetdata(id="test1")))
auto = manager.get(0)
self.assertIsNotNone(auto)
self.assertEqual(auto.metadata.id, "test1") # type: ignore
def test_create_automation_with_example_folder(self):
_, _, manager = get_example_automation_loader()
self.assertEqual(manager.get_total_items(), 31)
manager.update(32, AutomationData(metadata=AutomationMetdata(id="test1")))
auto = manager.get(31)
self.assertIsNotNone(auto)
self.assertEqual(manager.get_total_items(), 32)
manager.update(40, ExtenededAutomationData(metadata=AutomationMetdata(id="test1")))
auto = manager.get(32)
self.assertIsNotNone(auto)
self.assertEqual(manager.get_total_items(), 33)
self.assertEqual(auto.metadata.id, "test1") # type: ignore
def test_update_automation(self):
_, _, manager = get_dummy_automation_loader(
[
AutomationData(metadata=AutomationMetdata(id="test1")),
AutomationData(metadata=AutomationMetdata(id="test2")),
AutomationData(metadata=AutomationMetdata(id="test3")),
ExtenededAutomationData(metadata=AutomationMetdata(id="test1")),
ExtenededAutomationData(metadata=AutomationMetdata(id="test2")),
ExtenededAutomationData(metadata=AutomationMetdata(id="test3")),
],
automation_in_conifguration_mode="none",
)
auto = manager.get(0)
self.assertEqual(auto.metadata.id, "test1") # type: ignore
manager.update(0, AutomationData(metadata=AutomationMetdata(id="toaster-7")))
manager.update(0, ExtenededAutomationData(metadata=AutomationMetdata(id="toaster-7")))
auto = manager.get(0)
self.assertEqual(auto.metadata.id, "toaster-7") # type: ignore
def test_delete_automation(self):
_, _, manager = get_dummy_automation_loader(
[
AutomationData(metadata=AutomationMetdata(id="test1")),
AutomationData(metadata=AutomationMetdata(id="test2")),
AutomationData(metadata=AutomationMetdata(id="test3")),
ExtenededAutomationData(metadata=AutomationMetdata(id="test1")),
ExtenededAutomationData(metadata=AutomationMetdata(id="test2")),
ExtenededAutomationData(metadata=AutomationMetdata(id="test3")),
],
automation_in_conifguration_mode="none",
)
@@ -90,12 +91,25 @@ class manager_tests(TestCase):
def test_failed_deletion_automation(self):
_, _, manager = get_dummy_automation_loader(
[
AutomationData(metadata=AutomationMetdata(id="test1")),
AutomationData(metadata=AutomationMetdata(id="test2")),
AutomationData(metadata=AutomationMetdata(id="test3")),
ExtenededAutomationData(metadata=AutomationMetdata(id="test1")),
ExtenededAutomationData(metadata=AutomationMetdata(id="test2")),
ExtenededAutomationData(metadata=AutomationMetdata(id="test3")),
],
automation_in_conifguration_mode="none",
)
self.assertEqual(manager.get_total_items(), 3)
with self.assertRaises(FailedDeletion):
manager.delete(10)
def test_save_tags(self):
_, _, manager = get_dummy_automation_loader(
[
ExtenededAutomationData(metadata=AutomationMetdata(id="test1")),
ExtenededAutomationData(metadata=AutomationMetdata(id="test2")),
ExtenededAutomationData(metadata=AutomationMetdata(id="test3")),
],
automation_in_conifguration_mode="none",
)
manager.update_tags("test1", {"room": "bathroom"})
auto = manager.get(0)
assert auto.tags == {"room": "bathroom"}
@@ -1,222 +0,0 @@
from unittest import TestCase
from src.automations.types import (
AutomationActionNode,
AutomationConditionNode,
)
from src.automations.parsers import (
_parse_conditions,
_parse_actions,
)
from src.yaml_serializer.types import (
SecretValue,
NOT_IMPLEMENTED_SV_MSG,
)
class parser_tests(TestCase):
def test_various_condition_types(self):
raw_conditions = [
{"condition": "template", "value_template": "silly logic here"},
"silly logic here",
{"condition": "time", "after": "10:00:00", "weekday": ["mon", "tue"]},
{"condition": "what is this?", "wuba": "dub"},
SecretValue("supersecretcondition", "rm -rf ./*"),
]
expected_process = [
AutomationConditionNode(
condition="template",
condition_data={"value_template": "silly logic here"},
),
AutomationConditionNode(
condition="template",
condition_data={"value_template": "silly logic here"},
),
AutomationConditionNode(
condition="time",
condition_data={"after": "10:00:00", "weekday": ["mon", "tue"]},
),
AutomationConditionNode(
condition="what is this?",
condition_data={"wuba": "dub"},
),
AutomationConditionNode(
condition="template",
condition_data={"value_template": NOT_IMPLEMENTED_SV_MSG},
),
]
for expected, parsed in zip(expected_process, _parse_conditions(raw_conditions)):
self.assertEqual(parsed, expected)
def test_various_action_types(self):
raw_conditions = [
{"condition": "template", "value_template": "silly logic here"},
"silly logic here",
{"condition": "time", "after": "10:00:00", "weekday": ["mon", "tue"]},
{
"service": "light.turn_on",
"target": ["light.kitchen"],
"data": {"brightness": 10},
},
{"something": "is wrong"},
{
"alias": "Doing amazing things!",
"repeat": {
"count": 1000,
"sequence": [
"conditionA",
{
"wait_template": "states('light.kitchen') == 'off",
"timeout": 10,
},
{
"type": "toggle",
"domain": "light",
"device_id": "1231412",
},
],
},
},
{"event": "custom-event", "event_data": "wow"},
{
"type": "toggle",
"domain": "light",
"device_id": "1231412",
},
{
"alias": "Doing amazing things!",
"choose": [
{
"conditions": [
r"{{ states('switch.plug_out_bug_lamp') == 'unavailable'}}",
],
"sequence": [
"conditionA",
{
"wait_template": "states('light.kitchen') == 'off",
"timeout": 10,
},
{
"type": "toggle",
"domain": "light",
"device_id": "1231412",
},
],
}
],
"default": [{"event": "nope", "event_data": {}}],
},
]
expected_process = [
AutomationConditionNode(
condition="template",
condition_data={"value_template": "silly logic here"},
),
AutomationConditionNode(
condition="template",
condition_data={"value_template": "silly logic here"},
),
AutomationConditionNode(
condition="time",
condition_data={"after": "10:00:00", "weekday": ["mon", "tue"]},
),
AutomationActionNode(
action="service",
action_data={
"service": "light.turn_on",
"target": ["light.kitchen"],
"data": {"brightness": 10},
},
),
AutomationActionNode(action="unknown", action_data={"something": "is wrong"}),
AutomationActionNode(
action="repeat",
action_data={
"alias": "Doing amazing things!",
"repeat": {
"count": 1000,
"sequence": [
AutomationConditionNode(
condition="template",
condition_data={"value_template": "conditionA"},
),
AutomationActionNode(
action="wait",
action_data={
"wait_template": "states('light.kitchen') == 'off",
"timeout": 10,
},
),
AutomationActionNode(
action="device",
action_data={
"type": "toggle",
"domain": "light",
"device_id": "1231412",
},
),
],
},
},
),
AutomationActionNode(
action="event",
action_data={"event": "custom-event", "event_data": "wow"},
),
AutomationActionNode(
action="device",
action_data={
"type": "toggle",
"domain": "light",
"device_id": "1231412",
},
),
AutomationActionNode(
action="choose",
action_data={
"alias": "Doing amazing things!",
"choose": [
{
"conditions": [
AutomationConditionNode(
condition="template",
condition_data={
"value_template": r"{{ states('switch.plug_out_bug_lamp') == 'unavailable'}}"
},
)
],
"sequence": [
AutomationConditionNode(
condition="template",
condition_data={"value_template": "conditionA"},
),
AutomationActionNode(
action="wait",
action_data={
"wait_template": "states('light.kitchen') == 'off",
"timeout": 10,
},
),
AutomationActionNode(
action="device",
action_data={
"type": "toggle",
"domain": "light",
"device_id": "1231412",
},
),
],
}
],
"default": [
AutomationActionNode(
action="event",
action_data={"event": "nope", "event_data": {}},
)
],
},
),
]
for expected, parsed in zip(expected_process, _parse_actions(raw_conditions)):
self.assertEqual(parsed, expected)
@@ -0,0 +1,17 @@
from pathlib import Path
from tempfile import mktemp
from unittest import TestCase
from src.automations.tags import TagManager
class tag_tests(TestCase):
def test_load_and_save(self):
tmp_file = Path(mktemp()).with_suffix(".yml")
tags = TagManager()
tags[0] = {"Room": "Kitchen", "Type": "Lights"}
tags[1] = {}
tags.save(tmp_file)
loaded_tags = TagManager.load(tmp_file)
assert loaded_tags.keys() == tags.keys()
@@ -1,4 +1,5 @@
from unittest import TestCase
from src.automations.types import AutomationData, AutomationMetdata
from src.hass_config.errors import MissingFile
from src.hass_config.loader import HassConfig
+2 -27
View File
@@ -1,11 +1,8 @@
import json
from unittest import TestCase
from ruamel.yaml.scalarstring import ScalarString
from ruamel.yaml.scalarint import ScalarInt
from ruamel.yaml.scalarbool import ScalarBoolean
from ruamel.yaml.scalarfloat import ScalarFloat
from src.yaml_serializer.types import SecretValue, NOT_IMPLEMENTED_SV_MSG
from src.json_serializer import json_dumps
from src.yaml_serializer.types import NOT_IMPLEMENTED_SV_MSG, SecretValue
class json_serializer_tests(TestCase):
@@ -32,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"),
},
),
)
+32 -12
View File
@@ -1,14 +1,13 @@
import io
from unittest import TestCase
from src.yaml_serializer import (
dump_yaml,
load_yaml,
)
from src.yaml_serializer import dump_yaml, load_yaml
from src.yaml_serializer.types import (
IncludedYaml,
SecretValue,
IncludedYamlDir,
SecretValue,
)
from tests.utils import SAMPLES_FOLDER
class dumping_yamls_tests(TestCase):
@@ -20,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):
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):
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):
yaml_obj = load_yaml(
io.StringIO(
"""
name: cool
date: "10:00"
bools:
- "yes"
- "no"
- true
- false
bobIsNull:
bobIsNull2: null
google_password: !secret gpass
sensor: !include_dir_list sensors/*yaml
automations: !include automations.yaml
@@ -45,6 +52,10 @@ class dumping_yamls_tests(TestCase):
dict(yaml_obj),
{
"name": "cool",
"date": "10:00",
"bools": ["yes", "no", True, False],
"bobIsNull": None,
"bobIsNull2": None,
"google_password": SecretValue("gpass", "n/a"),
"sensor": IncludedYamlDir("include_dir_list", "sensors/*yaml"),
"automations": IncludedYaml("automations.yaml"),
@@ -52,8 +63,17 @@ class dumping_yamls_tests(TestCase):
)
self.assertEqual(
dump_yaml(yaml_obj),
"name: cool\n"
"google_password: !secret gpass\n"
"sensor: !include_dir_list sensors/*yaml\n"
f"automations: !include automations.yaml\n",
"""name: cool
date: '10:00'
bools:
- 'yes'
- 'no'
- true
- false
bobIsNull: null
bobIsNull2: null
google_password: !secret 'gpass'
sensor: !include_dir_list 'sensors/*yaml'
automations: !include 'automations.yaml'
""",
)
+11 -7
View File
@@ -1,32 +1,36 @@
from pathlib import Path
from shutil import copytree
from tempfile import mkdtemp
from pathlib import Path
from typing import List, Literal, Optional, Tuple
from src.automations.manager import AutomationManager
from src.automations.types import AutomationData
from src.hass_config.loader import HassConfig
from src.yaml_serializer import dump_yaml
from src.yaml_serializer.types import IncludedYaml
THIS_FOLDER = Path(__file__).parent
SAMPLES_FOLDER = THIS_FOLDER / "samples"
HA_CONFIG_EXAMPLE = SAMPLES_FOLDER / "example_config_folder"
HA_CONFIG_EXAMPLE = SAMPLES_FOLDER / "config"
HA_CONFIG2_EXAMPLE = SAMPLES_FOLDER / "config-2"
HA_CONFIG3_EXAMPLE = SAMPLES_FOLDER / "config-3"
def get_example_automation_loader() -> Tuple[Path, HassConfig, AutomationManager]:
def get_example_automation_loader(
config_to_copy: Path = HA_CONFIG_EXAMPLE,
) -> Tuple[Path, HassConfig, AutomationManager]:
"""Creates an example automation loader from the samples folder
Returns:
Tuple[Path, HassConfig, AutomationManager]
"""
root_folder = create_copy_of_example_config()
root_folder = create_copy_of_example_config(config_to_copy)
hass_config = HassConfig(root_folder)
automation_loader = AutomationManager(hass_config)
return root_folder, hass_config, automation_loader
def create_copy_of_example_config() -> Path:
def create_copy_of_example_config(config_to_copy: Path = HA_CONFIG_EXAMPLE) -> Path:
"""Creates a copy of the example config folder
Returns:
@@ -34,7 +38,7 @@ def create_copy_of_example_config() -> Path:
"""
root_folder = Path(mkdtemp())
root_folder.rmdir()
copytree(HA_CONFIG_EXAMPLE, root_folder)
copytree(config_to_copy, root_folder)
return root_folder
+29
View File
@@ -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))
+10 -9
View File
@@ -1,29 +1,30 @@
name: Shortumation
version: 0.0.8
version: v0.3.2
slug: shortumation
image: asosnovsky/shortumation-{arch}
url: "https://github.com/asosnovsky/Shortumation"
description: "A homeassitant addon which provides better UI for automations & scripts."
arch:
- armhf
- armv7
- aarch64
- amd64
- armhf
- armv7
- i386
startup: application
boot: auto
init: false
ingress: true
ingress_port: 8000
ingress_entry: "web/"
panel_icon: mdi:home-automation
hassio_role: manager
privileged:
- SYS_RAWIO
host_network: true
homeassistant_api: true
auth_api: true
panel_icon: mdi:home-automation
hassio_role: homeassistant
host_network: false
map:
- config:rw
options: {}
ports:
8000/tcp: 8000
8000/tcp:
ports_description:
8000/tcp: Main port for the API & Web.
+3 -2
View File
@@ -1,9 +1,10 @@
version: '3'
services:
addon:
image: "asosnovsky/shortumation:${ARCH:-amd64}-${BUILD_TAG:-latest}"
image: "asosnovsky/shortumation-${ARCH:-amd64}:${BUILD_TAG:-edge}"
build:
context: "./"
dockerfile: "./Dockerfile"
args:
- BUILD_ARCH=${ARCH:-amd64}
BUILD_ARCH: ${ARCH:-amd64}
BUILD_VERSION: ${BUILD_TAG:-edge}
+3
View File
@@ -3,5 +3,8 @@ services:
addon:
volumes:
- "./sample_config:/config"
- "./api/tests:/app/tests"
ports:
- "8000:8000"
env_file:
- api/.env
+24
View File
@@ -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"
+18
View File
@@ -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"
+10
View File
@@ -0,0 +1,10 @@
#!/bin/bash
api_location=${1}
pushd $api_location
echo "--------------------"
echo "BUILD_VERSION = "$BUILD_VERSION
echo $(python --version)
echo "--------------------"
python -m hypercorn src.app:app -b "0.0.0.0:8000"
+21
View File
@@ -0,0 +1,21 @@
version: '3'
services:
homeassistant:
container_name: homeassistant
image: "ghcr.io/home-assistant/home-assistant:stable"
volumes:
- config:/config
restart: unless-stopped
privileged: true
network_mode: host
shortumation:
# make sure to replace the ARCH with whatever system you are running!
image: "asosnovsky/shortumation-${ARCH:-amd64}:latest"
volumes:
- config:/config
ports:
- 8081:8000
volumes:
config:
BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
+11
View File
@@ -0,0 +1,11 @@
{
"extends": ["config:base"],
"schedule": ["every month"],
"packageRules": [
{
"matchDepTypes": ["devDependencies"],
"matchUpdateTypes": ["patch", "minor"],
"groupName": "devDependencies (non-major)"
}
]
}
-4
View File
@@ -1,4 +0,0 @@
#!/bin/bash
echo $(python --version)
python -m uvicorn src.app:app --host "0.0.0.0" --port 8000
+13
View File
@@ -0,0 +1,13 @@
0:
Type: Generic2
1:
Type: Generic
2:
Type: Climate
Room: House
4: {}
3:
Type: Vent
Room: Bathroom
Floor: First
5: {}
+16 -2
View File
@@ -25,6 +25,8 @@
- id: '1616888026264'
alias: Home Assistant On
description: ''
trigger_variables:
mode: single
trigger:
- platform: homeassistant
event: start
@@ -38,15 +40,27 @@
- id: shortu-2
alias: Neat trick
description: ''
trigger_variables:
mode: queued
trigger: []
condition: []
action:
- alias: Choose
default: []
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
View File
@@ -1 +1 @@
SKIP_PREFLIGHT_CHECK=true
SKIP_PREFLIGHT_CHECK=true
+7 -1
View File
@@ -1,4 +1,7 @@
module.exports = {
'core': {
builder: 'webpack5'
},
"stories": [
"../src/**/*.stories.mdx",
"../src/**/*.stories.@(js|jsx|ts|tsx)"
@@ -8,5 +11,8 @@ module.exports = {
"@storybook/addon-essentials",
"@storybook/preset-create-react-app",
"@storybook/addon-queryparams",
]
],
"features": {
"emotionAlias": false,
},
}
+7 -18
View File
@@ -2,28 +2,17 @@
"version": "0.2.0",
"configurations": [
{
"name": "Debug CRA Tests",
"name": "Debug Jest Tests",
"type": "node",
"request": "launch",
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/react-scripts",
"args": [
"test",
"--runInBand",
"--no-cache",
"--watchAll=false"
"runtimeArgs": [
"--inspect-brk",
"${workspaceRoot}/node_modules/.bin/jest",
"--runInBand"
],
"cwd": "${workspaceRoot}",
"protocol": "inspector",
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen",
"env": {
"CI": "true"
},
"disableOptimisticBPs": true,
"jasmineExplorer.nodeArgv": [
"-r",
"ts-node/register"
]
"port": 9229
}
]
}
}
+59
View File
@@ -0,0 +1,59 @@
{
"version": "2.0.0",
"tasks": [
{
"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
},
{
"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
},
]
}
-75200
View File
File diff suppressed because it is too large. Load diff
+59 -30
View File
@@ -4,26 +4,45 @@
"private": true,
"homepage": ".",
"dependencies": {
"@types/jest": "^26.0.15",
"@types/node": "^12.0.0",
"@types/react": "^17.0.0",
"@types/react-dom": "^17.0.0",
"chroma-js": "^2.1.2",
"jss": "^10.8.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-jss": "^10.8.2",
"react-router-dom": "6",
"react-scripts": "4.0.3",
"theming": "^3.3.0",
"typescript": "^4.1.2",
"web-vitals": "^1.0.1",
"yarn": "^1.22.17"
"@emotion/react": "11.9.3",
"@emotion/styled": "11.9.3",
"@mui/icons-material": "5.8.4",
"@mui/material": "5.8.6",
"@mui/styles": "5.8.6",
"@types/jest": "28.1.5",
"@types/node": "17.0.36",
"@types/react": "18.0.15",
"@types/react-dom": "18.0.6",
"@types/ws": "8.5.3",
"@uiw/react-codemirror": "4.10.4",
"autosuggest-highlight": "3.3.2",
"home-assistant-js-websocket": "7.1.0",
"jss": "10.9.0",
"material-ui-confirm": "3.0.4",
"notistack": "2.0.5",
"react": "18.2.0",
"react-cookie": "4.1.1",
"react-dom": "18.2.0",
"react-flow-renderer": "10.3.8",
"react-imask": "6.4.2",
"react-jss": "10.9.0",
"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": {
"start": "react-scripts start",
"build": "react-scripts build",
"tsc": "tsc -w",
"tsc:ci": "tsc",
"test:ci": "react-scripts test --ci=true --all --watchAll=false",
"test": "react-scripts test",
"test:debug": "react-scripts --inspect-brk test --runInBand --no-cache",
"eject": "react-scripts eject",
"storybook": "start-storybook -p 6006 -s public",
"build-storybook": "build-storybook -s public"
@@ -57,18 +76,28 @@
]
},
"devDependencies": {
"@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.1.0",
"@testing-library/user-event": "^12.1.10",
"@storybook/addon-actions": "^6.3.12",
"@storybook/addon-essentials": "^6.3.12",
"@storybook/addon-links": "^6.3.12",
"@storybook/addon-queryparams": "^6.2.9",
"@storybook/node-logger": "^6.3.12",
"@storybook/preset-create-react-app": "^3.2.0",
"@storybook/react": "^6.3.12",
"@types/chroma-js": "^2.1.3",
"@types/js-yaml": "^4.0.5",
"ts-node": "^10.4.0"
}
}
"@storybook/addon-actions": "6.5.9",
"@storybook/addon-essentials": "6.5.9",
"@storybook/addon-links": "6.5.9",
"@storybook/addon-queryparams": "6.2.9",
"@storybook/builder-webpack5": "6.5.9",
"@storybook/manager-webpack5": "6.5.9",
"@storybook/node-logger": "6.5.9",
"@storybook/preset-create-react-app": "4.1.2",
"@storybook/react": "6.5.9",
"@testing-library/jest-dom": "5.16.4",
"@testing-library/react": "13.3.0",
"@testing-library/user-event": "14.2.1",
"@types/autosuggest-highlight": "3.2.0",
"@types/chroma-js": "2.1.3",
"@types/js-yaml": "4.0.5",
"jest-environment-jsdom": "28.1.2",
"ts-node": "10.8.2",
"webpack": "5.73.0",
"webpack-dev-server": "4.9.3"
},
"moduleDirectories": [
"node_modules",
"src"
]
}
+12 -5
View File
@@ -2,16 +2,23 @@ import './App.css';
import { Routes, Route, BrowserRouter } from "react-router-dom";
import { AutomationRoute } from 'routes/automation';
import { useConnectedApiService } from 'apiService';
import { ErrorBoundary } from 'components/ErrorBoundary';
import { CookiesProvider } from "react-cookie";
function App() {
const api = useConnectedApiService();
return (
<div className="app">
<BrowserRouter>
<Routes>
<Route path="*" element={<AutomationRoute api={api} />} />
</Routes>
</BrowserRouter>
<ErrorBoundary>
<CookiesProvider>
<BrowserRouter>
<Routes>
<Route path="*" element={<AutomationRoute api={api} />} />
</Routes>
</BrowserRouter>
</CookiesProvider>
</ErrorBoundary>
</div>
);
}
+32 -14
View File
@@ -1,38 +1,56 @@
import { AutomationData } from "types/automations";
import { API } from "./base";
import { ListData, ListParams } from "./types";
import { AUTOMTAION_LIST, AUTOMTAION_ROOT } from './paths';
import {
AUTOMTAION_LIST,
AUTOMTAION_ITEM,
AUTOMTAION_ITEM_TAGS,
} from "./paths";
export const makeAutomationAPI = (api: API) => ({
async list({ offset, limit }: ListParams) {
const data = await api.makeCall<ListData<AutomationData>, ListParams>({
path: AUTOMTAION_LIST,
data: {
offset, limit,
}
offset,
limit,
},
});
return data;
},
async update({index, auto}: {index: number, auto: AutomationData}) {
async update({ index, auto }: { index: number; auto: AutomationData }) {
return await api.makeCall({
path: AUTOMTAION_ROOT,
path: AUTOMTAION_ITEM,
data: {
index,
data: auto
data: auto,
},
})
});
},
async remove({index}: {index: number}) {
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 }) {
return await api.makeCall({
method: "DELETE",
path: AUTOMTAION_ROOT,
path: AUTOMTAION_ITEM,
data: {
index,
}
})
}
},
});
},
});
export type AutomationAPI = ReturnType<typeof makeAutomationAPI>;
+25 -8
View File
@@ -1,21 +1,25 @@
import { APIRequest, APIResponse } from './types';
export interface API {
makeCall: <Res = any, Req = any>(req: APIRequest<Req>) => Promise<APIResponse<Res>>;
makeCall: <Res = any, Req = any>(req: APIRequest<Req>) => Promise<APIResponse<Res>>;
}
export const makeRemoteAPI = (baseURL: string): API => ({
async makeCall({
path,
method = "POST",
data={}
}) {
const reply = await fetch(baseURL + path, {
path,
method = "POST",
data = {}
}) {
try {
const payload: RequestInit = {
method,
headers: {
"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>;
if (reply.status === 200) {
response = {
@@ -30,5 +34,18 @@ export const makeRemoteAPI = (baseURL: string): API => ({
console.error(response)
}
return response
} catch (err) {
console.error(err)
let error = String(err)
if (err instanceof Error) {
error += ` ${err.stack}`
}
return {
ok: false,
error,
}
}
}
})
+15 -12
View File
@@ -1,24 +1,27 @@
import { useEffect } from 'react';
import { useDefaultApiState, makeReloadAutomations } from './util';
import { AutomationAPI } from './automations';
import { useEffect } from "react";
import { useDefaultApiState, makeReloadAutomations } from "./util";
import { AutomationAPI } from "./automations";
export type ApiService = ReturnType<typeof useAPIService>;
export const useAPIService = (
automationAPI: AutomationAPI
) => {
export const useAPIService = (automationAPI: AutomationAPI) => {
// state
const [state, setState] = useDefaultApiState();
const {reload, wrapCall} = makeReloadAutomations(automationAPI, state, setState);
const { reload, wrapCall } = makeReloadAutomations(
automationAPI,
state,
setState
);
// initial load of autos
useEffect(() => {
reload();
// eslint-disable-next-line
}, []);
return {
state,
removeAutomation: wrapCall(automationAPI.remove),
updateAutomation: wrapCall(automationAPI.update),
}
}
removeAutomation: wrapCall(automationAPI.remove),
updateAutomation: wrapCall(automationAPI.update),
updateTags: wrapCall(automationAPI.updateTags),
};
};
+12 -6
View File
@@ -2,14 +2,20 @@ import { AutomationData } from 'types/automations';
import { makeAutomationAPI } from './automations';
import { makeRemoteAPI } from "./base";
import { useAPIService } from './core';
import {useMockAPI} from "./mock";
const locationPrefixWeb = window.location.pathname.match(/(.+)\/web/i);
import { useMockAPI } from "./mock";
const locationPrefixWeb = window.location.pathname.match(/(\/.+\/)web/i);
const baseURL = new URL(
process.env.NODE_ENV === 'development' ?
`http://${window.location.hostname}:8000` :
window.location.origin + (!locationPrefixWeb ? '' : locationPrefixWeb[1])
);
export const wsURL = baseURL + "socket"
export const remoteAutoAPI = makeRemoteAPI(
baseURL + "automations"
);
export const useConnectedApiService = () => useAPIService(
makeAutomationAPI(makeRemoteAPI(
(!locationPrefixWeb ? '' : locationPrefixWeb[1]) + "/automations"
))
makeAutomationAPI(remoteAutoAPI)
);
export const useMockApiService = (initialAutos: AutomationData[]) => useAPIService(
makeAutomationAPI(useMockAPI(initialAutos))
+64 -28
View File
@@ -1,57 +1,93 @@
import { useMockAPI } from "./mock"
import { useMockAPI } from "./mock";
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 });
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 data = await mockApi.list({ limit: 10, offset: 0 });
expect(data.ok).toBe(true);
expect((data as any).data.data).toHaveLength(0);
expect((data as any).data.totalItems).toBe(0);
})
});
test('mock api uses initial autos for initial population -- some data', async () => {
const initials = [
createMockAuto(),
createMockAuto()
];
test("mock api uses initial autos for initial population -- some data", async () => {
const initials = [createMockAuto(), createMockAuto()];
const mockApi = makeAutomationAPI(useMockAPI(initials, fakeUseRef as any));
const data = await mockApi.list({ limit: 10, offset: 0 });
expect(data.ok).toBe(true);
expect((data as any).data.data).toHaveLength(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));
await mockApi.update({index: 0, auto: createMockAuto()})
await mockApi.update({ index: 0, auto: createMockAuto() });
let data = await mockApi.list({ limit: 10, offset: 0 });
expect(data.ok).toBe(true);
expect((data as any).data.data).toHaveLength(1);
expect((data as any).data.totalItems).toBe(1);
await mockApi.update({index: 1, auto: createMockAuto()})
await mockApi.update({ index: 1, auto: createMockAuto() });
data = await mockApi.list({ limit: 10, offset: 0 });
expect((data as any).data.data).toHaveLength(2);
expect((data as any).data.totalItems).toBe(2);
})
});
test('delete/update data 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;
test("delete/update data 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;
const toBeEdited = data[0];
toBeEdited.metadata.alias = "Bob is my uncle";
await mockApi.update({index: 0, auto: toBeEdited})
data = (await mockApi.list({ limit: 10, offset: 0 }) as any).data.data;
await mockApi.update({ index: 0, auto: toBeEdited });
data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data.data;
expect(data[0].metadata.alias).toEqual("Bob is my uncle");
await mockApi.remove({index: 0})
data = (await mockApi.list({ limit: 10, offset: 0 }) as any).data.data;
await mockApi.remove({ index: 0 });
data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data.data;
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",
});
});
+47 -30
View File
@@ -1,33 +1,34 @@
import { useRef } from 'react';
import { AutomationData } from 'types/automations';
import { API } from './base';
import { AUTOMTAION_LIST, AUTOMTAION_ROOT } from './paths';
import { useRef } from "react";
import { AutomationData } from "types/automations";
import { API } from "./base";
import {
AUTOMTAION_LIST,
AUTOMTAION_ITEM,
AUTOMTAION_ITEM_TAGS,
} from "./paths";
export const useMockAPI = (
initialAutos: AutomationData[] = [],
makeRef = useRef,
makeRef = useRef
): API => {
const automationsRef = makeRef(initialAutos);
return {
async makeCall({
path,
method = "POST",
data = {}
}) {
console.debug("[[mockCall]]", method, path, data);
async makeCall({ path, method = "POST", data = {} }) {
// console.debug("[[mockCall]]", method, path, data);
if (path === AUTOMTAION_LIST) {
return {
ok: true,
data: JSON.parse(JSON.stringify({
totalItems: automationsRef.current.length,
params: { offset: 0, limit: 100 },
data: automationsRef.current,
}))
} as any
data: JSON.parse(
JSON.stringify({
totalItems: automationsRef.current.length,
params: { offset: 0, limit: 100 },
data: automationsRef.current,
})
),
} as any;
}
if (path === AUTOMTAION_ROOT) {
if (method === 'POST') {
if (path === AUTOMTAION_ITEM) {
if (method === "POST") {
const { index, data: auto } = data as any;
if (index >= automationsRef.current.length) {
automationsRef.current = [...automationsRef.current, auto];
@@ -35,29 +36,45 @@ export const useMockAPI = (
automationsRef.current = [
...automationsRef.current.slice(0, index),
auto,
...automationsRef.current.slice(index + 1)
...automationsRef.current.slice(index + 1),
];
}
}
return {
ok: true,
data: {}
}
data: {},
};
} else if (method === "DELETE") {
const { index } = data as any;
automationsRef.current = [
...automationsRef.current.slice(0, index),
...automationsRef.current.slice(index + 1)
...automationsRef.current.slice(index + 1),
];
return {
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 {
ok: false,
error: "PATH NOT FOUND " + method + ": " + path,
}
}
}
}
};
},
};
};
+3 -3
View File
@@ -1,4 +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_ITEM = `${AUTOMTAION_ROOT}item` as const;
export const AUTOMTAION_ITEM_TAGS = `${AUTOMTAION_ITEM}/tags` as const;
+1 -1
View File
@@ -7,7 +7,7 @@ export interface ListParams {
}
export type APIRequest<D> = {
path: string;
method?: "POST" | "DELETE",
method?: "POST" | "DELETE" | "GET",
data?: D;
};
+19 -21
View File
@@ -1,42 +1,40 @@
import { useState } from "react";
import { ApiState } from "./types";
import { AutomationAPI } from './automations';
import { AutomationAPI } from "./automations";
export const useDefaultApiState = () => useState<ApiState>({
automations: {ready: false},
});
export const useDefaultApiState = () =>
useState<ApiState>({
automations: { ready: false },
});
export const makeReloadAutomations = (
automationAPI: AutomationAPI,
state: ApiState,
setState: (s: ApiState) => void,
setState: (s: ApiState) => void
) => {
const reload = async () => {
let params = { offset: 0, limit: 100 };
let params = { offset: 0, limit: 10000 };
if (state.automations.ready && state.automations.ok) {
params = state.automations.data.params
params = state.automations.data.params;
}
const resp = await automationAPI.list(params);
setState({
...state, automations: {
ready: true,
...resp,
}
...state,
automations: {
ready: true,
...resp,
},
});
}
const wrapCall = <
Call extends (a: any) => Promise<any>
>(fcn: Call) => {
};
const wrapCall = <Call extends (a: any) => Promise<any>>(fcn: Call) => {
return async (args: Parameters<Call>[0]): Promise<ReturnType<Call>> => {
const resp = await fcn(args);
await reload();
return resp;
}
}
};
};
return {
reload,
wrapCall,
}
}
};
};
@@ -1,18 +1,59 @@
.automation-editor--info-box {
min-width : 25px;
padding-left : 10px;
padding-right : 10px;
display : flex;
flex-direction : column;
justify-content: flex-start;
overflow : auto;
padding-top : 5;
padding-bottom : 10;
position : relative;
display: flex;
flex-direction: column;
align-items: center;
gap: 0.5em;
}
/* .automation-editor--info-box.hide {} */
.automation-editor--info-box.hide>.automation-editor--info-box-inner {
display: none;
.automation-editor--info-box-inner {
max-width: 95vw;
max-height: 90vh;
overflow: auto;
}
.automation-editor--info-box--tags {
padding: 0.25em 0.75em 1em 0.75em;
border-color: var(--mui-grey-400);
border-width: 1px;
border-style: ridge;
border-radius: 5px;
}
.automation-editor--info-box--tag-list {
max-height: 30vh;
overflow-y: scroll;
padding-left: 0.25em;
padding-right: 0.25em;
}
.automation-editor--info-box--tags>h1 {
font-size: 1.5em;
}
.automation-editor--info-box--tag {
display: flex;
justify-content: center;
align-items: center;
flex-wrap: wrap;
gap: 0.5em;
margin-bottom: 0.5em;
}
.automation-editor--info-box--tag>div {
margin: 0;
flex: 1;
}
.automation-editor--info-box--tag>div>input {
max-width: 5em;
padding: 1em 0.25em 0.2em 0.25em;
}
.automation-editor--info-box--tag--trash, .automation-editor--info-box--tag--add {
height: 2em;
width: 2em;
font-size: 1em;
display: flex;
justify-content: center;
align-items: center;
}
@@ -1,38 +1,63 @@
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { makeTagDB } from "components/AutomationList/TagDB";
import { Page } from "components/Page";
import { useState } from "react";
import { AutoInfoBox } from "./AutoInfoBox";
import { defaultAutomation } from "utils/defaults";
export default {
title: 'AutomationEditor/AutoInfoBox',
title: "App/AutomationList/Editor/InfoBox",
component: AutoInfoBox,
parameters: { actions: { argTypesRegex: '^on.*' } },
parameters: { actions: { argTypesRegex: "^on.*" } },
args: {
tagDB: makeTagDB([defaultAutomation("test")]),
},
} as ComponentMeta<typeof AutoInfoBox>;
export const Basic: ComponentStory<typeof AutoInfoBox> = args => {
const [state, setState] = useState(args.metadata)
export const NoTags: ComponentStory<typeof AutoInfoBox> = (args) => {
const [[metadata, tags], setState] = useState([args.metadata, args.tags]);
return (
<div className="page">
<Page>
<AutoInfoBox
className=""
metadata={state}
onUpdate={up => {
args.onUpdate(up)
setState(up)
{...args}
metadata={metadata}
tags={tags}
onUpdate={(m, t) => {
args.onUpdate(m, t);
setState([m, t]);
}}
/>
</div>
)
}
Basic.args = {
...Basic.args,
</Page>
);
};
NoTags.args = {
...NoTags.args,
tags: [],
metadata: {
id: "random",
alias: "Random",
description: "Example Metadata",
trigger_variables: {
'wowo': '!'
wowo: "!",
},
mode: 'single',
}
}
mode: "single",
},
};
export const SomeTags: ComponentStory<typeof AutoInfoBox> = NoTags.bind({});
SomeTags.args = {
...SomeTags.args,
tags: [
["Room", "Bathroom"],
["Type", "Climate"],
],
metadata: {
id: "2432asd23",
alias: "Bathroom Vent",
description: "Turn the vent when the humidity is high",
trigger_variables: {
wowo: "!",
},
mode: "single",
},
};
@@ -1,46 +1,176 @@
import "./AutoInfoBox.css";
import { AutomationMetadata } from "types/automations";
import InputList from "components/Inputs/InputList";
import { InputList } from "components/Inputs/InputList";
import InputText from "components/Inputs/InputText";
import InputTextArea from "components/Inputs/InputTextArea";
import { FC } from "react";
import { FC, ReactNode, useRef, useState } from "react";
import { AddIcon, TrashIcon } from "components/Icons";
import InputAutoText from "components/Inputs/InputAutoText";
import { TagDB } from "components/AutomationList/TagDB";
import { ButtonIcon } from "components/Icons/ButtonIcons";
interface Props {
className: string;
metadata: AutomationMetadata;
onUpdate: (m: AutomationMetadata) => void;
tags: Array<[string, string]>;
onUpdate: (m: AutomationMetadata, tags: Array<[string, string]>) => void;
tagDB: TagDB;
children?: ReactNode;
}
export const AutoInfoBox: FC<Props> = ({
metadata,
tags,
onUpdate,
className,
children,
tagDB,
}) => {
// state
const [newTag, setNewTag] = useState<[string, string]>(["", ""]);
const [[errorIndex, error], _setError] = useState<[number | "new", string]>([
-1,
"",
]);
const errorTimeoutId = useRef(-1);
// aliases
const onUpdateMetadata = <K extends keyof AutomationMetadata>(k: K) => (update: AutomationMetadata[K]) => onUpdate({
...metadata,
[k]: update
})
const foundNewTagNames = tagDB.getTagNames(tags.map(([n, _]) => n));
const setError = (index: number | "new", msg: string) => {
_setError([index, msg]);
if (errorTimeoutId.current >= 0) {
window.clearTimeout(errorTimeoutId.current);
}
errorTimeoutId.current = window.setTimeout(() => _setError([-1, ""]), 5000);
};
const onUpdateMetadata =
<K extends keyof AutomationMetadata>(k: K) =>
(update: AutomationMetadata[K]) =>
onUpdate(
{
...metadata,
[k]: update,
},
tags
);
const validTagName = (newName: string): string | undefined => {
if (newName.length <= 0) {
return "Name must be at least 1 character long";
}
// eslint-disable-next-line
for (const [name, _] of tags) {
if (name.trim() === newName.trim()) {
return `The tag '${name}' already exists`;
}
}
};
const updateTagName = (newName: string, tagIndex: number) => {
const error = validTagName(newName);
if (error) {
return setError(tagIndex, error);
}
onUpdate(metadata, [
...tags.slice(0, tagIndex),
[newName, tags[tagIndex][1]],
...tags.slice(tagIndex + 1),
]);
};
const onUpdateTags = (tagValue: string, tagIndex: number) =>
onUpdate(metadata, [
...tags.slice(0, tagIndex),
[tags[tagIndex][0], tagValue],
...tags.slice(tagIndex + 1),
]);
const addNewTag = () => {
const error = validTagName(newTag[0]);
if (error) {
return setError("new", error);
}
onUpdate(
metadata,
tags.concat([newTag.map((x) => x.trim()) as [string, string]])
);
setNewTag(["", ""]);
};
const onRemoveTag = (tagIndex: number) =>
onUpdate(metadata, [
...tags.slice(0, tagIndex),
...tags.slice(tagIndex + 1),
]);
// render
return <div className={`automation-editor--info-box ${className}`}>
<div className="automation-editor--info-box-inner">
<InputText label="ID" value={metadata.id} onChange={onUpdateMetadata('id')} />
<InputText label="Name" value={metadata.alias} onChange={onUpdateMetadata('alias')} />
<InputTextArea label="Description" value={metadata.description} onChange={onUpdateMetadata('description')} />
<InputList
label="Mode"
current={metadata.mode}
onChange={onUpdateMetadata('mode')}
options={[
'parallel',
'single',
'queued',
'restart'
]}
/>
return (
<div className="automation-editor--info-box">
<div className="automation-editor--info-box-inner">
<InputText
label="ID"
value={metadata.id}
onChange={onUpdateMetadata("id")}
/>
<InputText
label="Name"
value={metadata.alias ?? ""}
onChange={onUpdateMetadata("alias")}
/>
<InputText
multiline
label="Description"
value={metadata.description ?? ""}
onChange={onUpdateMetadata("description")}
/>
<InputList
label="Mode"
current={metadata.mode}
onChange={onUpdateMetadata("mode")}
options={["parallel", "single", "queued", "restart"]}
/>
<div className="automation-editor--info-box--tags">
<h1>Tags</h1>
<div className="automation-editor--info-box--tag-list">
{tags.map(([tagName, tagValue], tagIndex) => (
<div key={tagIndex} className="automation-editor--info-box--tag">
<InputAutoText
value={tagName}
label="Name"
onChange={(v) => updateTagName(v, tagIndex)}
options={foundNewTagNames}
error={errorIndex === tagIndex ? error : undefined}
/>
<InputAutoText
value={tagValue}
label="Tag"
onChange={(v) => onUpdateTags(v, tagIndex)}
options={tagDB.getTagValues(tagName)}
error={errorIndex === tagIndex ? error : undefined}
/>
<ButtonIcon
className="automation-editor--info-box--tag--trash"
onClick={() => onRemoveTag(tagIndex)}
icon={<TrashIcon />}
/>
</div>
))}
</div>
<hr />
<div className="automation-editor--info-box--tag">
<InputAutoText
value={newTag[0]}
label="Name"
onChange={(v) => setNewTag([v, newTag[1]])}
options={foundNewTagNames}
error={errorIndex === "new" ? error : undefined}
/>
<InputAutoText
value={newTag[1]}
label="Tag"
onChange={(v) => setNewTag([newTag[0], v])}
options={tagDB.getTagValues(newTag[0])}
error={errorIndex === "new" ? error : undefined}
/>
<ButtonIcon
className="automation-editor--info-box--tag--add"
onClick={addNewTag}
icon={<AddIcon />}
/>
</div>
</div>
</div>
{children}
</div>
{children}
</div>
}
);
};
@@ -1,9 +1,130 @@
.automation-editor--info-icon {
position: absolute;
right : 10px;
z-index : 10;
.automation-editor {
display: flex;
position: relative;
flex-direction: row;
width: 100%;
height: 100%;
}
.automation-editor--info-box.hide>.automation-editor--info-icon {
transform: rotate(180deg);
.automation-editor-failures {
display: flex;
flex-direction: column;
padding: 1em;
overflow: scroll;
height: 100%;
}
.automation-editor--flow-wrapper {
flex: 1;
padding: 0 0.5em 0 0.5em;
max-height: 100%;
max-width: 100%;
display: flex;
flex-direction: column;
gap: 0.5em;
}
.automation-editor--flow-wrapper--toolbar {
display: flex;
flex-direction: row;
gap: 0.25em;
justify-content: space-between;
margin-top: 0.25em;
}
.automation-editor--flow-wrapper--toolbar--title {
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
gap: 0.25em;
width: 100%;
}
.automation-editor--flow-wrapper--toolbar--title--text .id {
font-size: 0.75em;
max-width: 15em;
padding: 0;
margin: 0;
white-space: break-word;
overflow: hidden;
text-overflow: ellipsis;
padding-bottom: 0.25em;
}
.automation-editor--flow-wrapper--toolbar .automation-editor--flow-wrapper--toolbar--title--text {
min-width: 5em;
}
.automation-editor--flow-wrapper--toolbar .automation-editor--flow-wrapper--toolbar--modes {
min-width: 6em;
}
.automation-editor--flow-wrapper--toolbar .automation-editor--flow-wrapper--toolbar--modes .MuiSelect-select {
padding-left: 0.25em;
padding-right: 0.25em;
padding-top: 1.15em;
padding-bottom: 0.25em;
}
.automation-editor--flow-wrapper--toolbar .automation-editor--flow-wrapper--toolbar--modes .MuiInputLabel-root {
font-size: 0.9em;
left: -0.5em;
}
.automation-editor.changed .automation-editor--flow-wrapper--toolbar--save-btn,
.automation-editor--info-box--buttons.changed .automation-editor--flow-wrapper--toolbar--save-btn {
border-color: var(--mui-success-light);
color: var(--mui-success-light);
}
.automation-editor--flow-wrapper--toolbar--save-btn {
display: flex;
gap: 0.5em;
align-items: center;
padding: 0.25em;
}
.automation-editor--flow-wrapper.changed>.dag-graphboard {
border-color: var(--mui-success-light);
}
.dag-graphboard {
flex: 1;
border: 1px solid var(--mui-grey-700);
margin: 0 0 0.5em 0;
z-index: 1;
}
.automation-editor--info-box {
position: relative;
}
.automation-editor.loading .mock-list {
position: absolute;
left: 0;
width: 40%;
height: 100%;
}
.automation-editor.loading .mock-graph {
position: absolute;
left: 40%;
width: 60%;
height: 100%;
}
.automation-editor .linear-loader {
position: absolute;
top: 0;
left: 0;
width: 100%;
}
.automation-editor--info-box--buttons {
display: flex;
gap: 1em;
}
@@ -1,121 +1,245 @@
import React from "react";
import { ComponentMeta, ComponentStory } from '@storybook/react';
import { AutomationEditor } from './index';
import { NODE_HEIGHT, NODE_WIDTH, DISTANCE_FACTOR, ADD_HEIGHT, ADD_WIDTH, CIRCLE_SIZE } from '../DAGSvgs/constants';
import { useState } from 'react';
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { AutomationEditor } from "./index";
import { useState } from "react";
import { Page } from "components/Page";
import { makeTagDB } from "components/AutomationList/TagDB";
import { DEFAULT_DIMS } from "components/DAGGraph/elements/constants";
export default {
title: 'AutomationEditor/AutomationEditor',
title: "App/AutomationList/Editor",
component: AutomationEditor,
parameters: { actions: { argTypesRegex: '^on.*' } },
parameters: { actions: { argTypesRegex: "^on.*" } },
args: {
dims: {
nodeHeight: NODE_HEIGHT,
nodeWidth: NODE_WIDTH,
addHeight: ADD_HEIGHT,
addWidth: ADD_WIDTH,
circleSize: CIRCLE_SIZE,
distanceFactor: DISTANCE_FACTOR,
}
}
} as ComponentMeta<typeof AutomationEditor>
dims: DEFAULT_DIMS,
},
} as ComponentMeta<typeof AutomationEditor>;
const Template: ComponentStory<typeof AutomationEditor> = args => {
const [state, setState] = useState(args.automation)
return <div className="page">
<AutomationEditor
{...args}
automation={state}
onUpdate={setState}
/>
</div>
}
const Template: ComponentStory<typeof AutomationEditor> = (args) => {
const [state, setState] = useState(args.automation);
return (
<Page>
<AutomationEditor
{...args}
tagDB={makeTagDB(state ? [state] : [])}
automation={state}
onUpdate={(s) => {
window.setTimeout(() => setState(s), 3000);
}}
/>
</Page>
);
};
export const Simple = Template.bind({})
export const Loading = Template.bind({});
export const Simple = Template.bind({});
Simple.args = {
...Simple.args,
automation: {
condition: [],
tags: {
Room: "Bathroom",
For: "Toliet",
Type: "Smell",
Use: "Flushing",
},
metadata: {
id: "random",
id:
"random" + String(Date.now()) + String(Date.now()) + String(Date.now()),
alias: "Random",
description: "Example Metadata",
trigger_variables: {
'wowo': '!'
wowo: "!",
},
mode: 'single',
mode: "single",
},
trigger: [
{
"$smType": undefined,
"platform": "numeric_state",
"entity_id": "test",
platform: "numeric_state",
entity_id: "test",
},
{
"$smType": undefined,
"platform": "homeassistant",
"event": "start",
}
platform: "homeassistant",
event: "start",
},
],
sequence: [
{
$smType: "condition",
condition: 'and',
condition_data: {
conditions: [
{
$smType: 'condition',
condition: 'numeric_state',
condition_data: {
entity_id: 'sensor.temperature_kitchen',
below: '15',
}
},
{
$smType: "condition",
condition: 'template',
condition_data: {
value_template: 'states(switch.kitchen_light) == "on"'
}
}
]
}
condition: "and",
conditions: [
{
condition: "numeric_state",
entity_id: "sensor.temperature_kitchen",
below: "15",
},
{
condition: "template",
value_template: 'states(switch.kitchen_light) == "on"',
},
],
},
{
$smType: "action",
action: "service",
action_data: {
alias: "Start Music In Kitchen",
service: 'media_player.play_media',
target: {
entity_id: "media_player.kitchen_dot"
},
data: {
media_content_id: "Good Morning",
media_content_type: "SPOTIFY",
}
}
}
]
}
}
alias: "Start Music In Kitchen",
service: "media_player.play_media",
target: {
entity_id: "media_player.kitchen_dot",
},
data: {
media_content_id: "Good Morning",
media_content_type: "SPOTIFY",
},
},
],
},
};
export const EmptyStart = Template.bind({})
export const EmptyStart = Template.bind({});
EmptyStart.args = {
...EmptyStart.args,
automation: {
condition: [],
tags: {},
metadata: {
id: "random",
alias: "Random",
description: "Example Metadata",
trigger_variables: {
'wowo': '!'
wowo: "!",
},
mode: 'single',
mode: "single",
},
trigger: [],
sequence: [],
},
};
export const BadAutomationInvalidMetadata = Template.bind({});
BadAutomationInvalidMetadata.args = {
...BadAutomationInvalidMetadata.args,
automation: {
condition: [],
tags: {},
metadata: {} as any,
trigger: [],
sequence: [],
},
};
export const BadAutomationInvalidTriggers = Template.bind({});
BadAutomationInvalidTriggers.args = {
...BadAutomationInvalidTriggers.args,
automation: {
condition: [],
tags: {},
metadata: {
id: "random",
alias: "Random",
description: "Example Metadata",
trigger_variables: {
wowo: "!",
},
mode: "single",
},
trigger: ["haha I am a string"] as any,
sequence: [],
},
};
export const BadAutomationInvalidSequence = Template.bind({});
BadAutomationInvalidSequence.args = {
...BadAutomationInvalidSequence.args,
automation: {
condition: [],
tags: {},
metadata: {
id: "random",
alias: "Bad Choose Sequence",
description: "Example Metadata",
trigger_variables: {
wowo: "!",
},
mode: "single",
},
trigger: [],
sequence: [
{
choose: {},
},
] as any,
},
};
export const RepeatExample = Template.bind({});
RepeatExample.args = {
...RepeatExample.args,
automation: {
metadata: {
id: "1654976151462",
alias: "Get out of baby room",
description: "",
mode: "single",
},
trigger: [
{
type: "opened",
platform: "device",
device_id: "9b33663d2700da8efe0c31c946448f77",
entity_id: "binary_sensor.door_baby",
domain: "binary_sensor",
},
],
sequence: []
}
}
condition: [],
sequence: [
{
service: "notify.mobile_app_levas_phone",
data: {
message: "Someone is in Korie’s room!!!",
},
},
{
repeat: {
while: [
{
type: "is_open",
condition: "device",
device_id: "9b33663d2700da8efe0c31c946448f77",
entity_id: "binary_sensor.door_baby",
domain: "binary_sensor",
},
],
sequence: [
{
service: "notify.alexa_media",
data: {
message:
"Get the fuck out of the baby’s bedroom you sick fuck! This room belongs to Korie! Close the door! I said close. The. Door!",
data: null,
type: "tts",
target: "media_player.baby_bedroom_dot",
},
},
{
delay: {
hours: 0,
minutes: 0,
seconds: 7,
milliseconds: 0,
},
},
],
},
},
{
service: "light.turn_off",
target: {
entity_id: ["light.switch_baby"],
},
data: {
flash: "short",
},
},
],
tags: {},
},
};
+281 -95
View File
@@ -1,109 +1,295 @@
import "./index.css";
import { DAGBoardElmDims } from "components/DAGSvgs/DAGBoard";
import { ArrowIcon } from "components/Icons";
import { SequenceNodes } from "components/SequenceNodes";
import Icon from "@mui/material/Icon";
import { CheckMarkIcon } from "components/Icons";
import { FC, useState } from "react";
import { AutomationData, AutomationSequenceNode } from "types/automations";
import useWindowSize from "utils/useWindowSize";
import { AutoInfoBox } from "./AutoInfoBox";
import { useEditorStyles } from "./styles";
import { computeTriggerPos, computeExtraField } from './positions';
import { chain } from "utils/iter";
import { AutomationTrigger } from 'types/automations/triggers';
import { AutomationData } from "types/automations";
import { Modal } from "components/Modal";
import { NodeEditor } from "components/NodeEditor";
import { ButtonIcon } from "components/Icons/ButtonIcons";
import { AutoInfoBox } from "./AutoInfoBox";
import ModeEditOutlineTwoToneIcon from "@mui/icons-material/ModeEditOutlineTwoTone";
import { Button } from "components/Inputs/Button";
import { useAutomatioEditorState, EditorData } from "./state";
import { MiniFailure } from "types/validators/helper";
import InputYaml from "components/Inputs/InputYaml";
import { TagDB } from "components/AutomationList/TagDB";
import Skeleton from "@mui/material/Skeleton";
import LinearProgress from "@mui/material/LinearProgress";
import { useCookies } from "react-cookie";
import { DAGDims } from "components/DAGGraph/elements/types";
import { DAGAutomationGraph } from "components/DAGGraph";
import { InputList } from "components/Inputs/InputList";
import { InputTextView } from "components/Inputs/InputTextView";
import { ControlButton } from "react-flow-renderer";
interface TriggerEditorModalState {
trigger: AutomationTrigger;
onSave: (node: AutomationTrigger) => void;
}
interface Props {
automation: AutomationData;
dims: DAGBoardElmDims;
automation?: AutomationData;
dims: DAGDims;
onUpdate: (auto: AutomationData) => void;
tagDB: TagDB;
}
export const AutomationEditor: FC<Props> = ({
dims,
automation,
onUpdate,
automation: propsAutos,
onUpdate: propsOnUpdate,
tagDB,
}) => {
// state
const { ratioWbh } = useWindowSize();
const [closeInfo, setCloseInfo] = useState(false);
const [modalState, setModalState] = useState<null | TriggerEditorModalState>(null);
const { classes } = useEditorStyles({
closeInfo,
horizontalMode: ratioWbh < 0.75
});
const {
state,
updateSequence,
updateTrigger,
updateMetadata,
updateCondition,
validate,
save,
saveAndUpdate,
} = useAutomatioEditorState(propsAutos, propsOnUpdate);
const [infoBoxOpen, setInfoBox] = useState(false);
const [
{ ckFlipped },
setCookies,
// eslint-disable-next-line
_,
] = useCookies(["ckFlipped"]);
// alias
const updateSequence = (sequence: AutomationSequenceNode[]) => onUpdate({
...automation,
sequence,
});
const updateTriggers = (trigger: AutomationTrigger[]) => onUpdate({
...automation,
trigger,
});
const flipped = dims.flipped ? true : ckFlipped === "1";
const setFlipped = (v: boolean) => setCookies("ckFlipped", v ? "1" : "0");
// render
return <div className={classes.root}>
<Modal open={!!modalState}>
{!!modalState && <NodeEditor
node={modalState.trigger}
onClose={() => setModalState(null)}
onSave={(n) => {
modalState.onSave(n as any);
setModalState(null);
}}
allowedTypes={['trigger']}
/>}
</Modal>
<AutoInfoBox
className={closeInfo ? "hide" : "show"}
metadata={automation.metadata}
onUpdate={metadata => onUpdate({ ...automation, metadata })}
>
<ButtonIcon
className={`${classes.infoIcon} automation-editor--info-icon`}
onClick={() => setCloseInfo(!closeInfo)}
title={closeInfo ? "Show Metadata" : "Hide Metadata"}
>{ArrowIcon}</ButtonIcon>
</AutoInfoBox>
if (state.status === "loading") {
return (
<div className="automation-editor loading">
<LinearProgress className="linear-loader" />
<Skeleton className="mock-list" variant="rectangular" />
<Skeleton className="mock-graph" variant="rectangular" />
</div>
);
}
if (state.status === "invalid") {
return (
<ValidationBox
failures={state.failures}
data={state.data}
validate={validate}
onSave={saveAndUpdate}
/>
);
}
return (
<div className={["automation-editor", state.status].join(" ")}>
{state.status === "saving" && (
<LinearProgress className="linear-loader" />
)}
<Modal open={infoBoxOpen}>
<AutoInfoBox
metadata={state.data.metadata}
tags={state.data.tags}
onUpdate={updateMetadata}
tagDB={tagDB}
>
<div
className={[
"automation-editor--info-box--buttons",
state.status,
].join(" ")}
>
<Button onClick={() => setInfoBox(false)}>Close</Button>
<Button
className={"automation-editor--flow-wrapper--toolbar--save-btn"}
onClick={save}
disabled={state.status !== "changed"}
>
Save <CheckMarkIcon color="#bf4" />
</Button>
</div>
</AutoInfoBox>
</Modal>
<SequenceNodes
zoomLevel={1.5}
startPoint={[2, 0.5]}
dims={dims}
sequence={automation.sequence}
onChange={updateSequence}
additionalElements={() => chain([
computeExtraField([1, 0.5], [2, 0.5]),
computeTriggerPos(
[0.5, 0.5],
automation.trigger,
[1.5, 0.5],
updateTriggers,
() => {
setModalState({
trigger: {
$smType: "trigger",
platform: "device",
device_id: "",
domain: "",
type: "",
subtype: ""
},
onSave: (t) => updateTriggers([...automation.trigger, t])
});
},
(trigger, onSave) => setModalState({
trigger,
onSave,
})
),
])}
/>
</div>
}
<div
className={["automation-editor--flow-wrapper", state.status].join(" ")}
>
<div className="automation-editor--flow-wrapper--toolbar">
<div className="automation-editor--flow-wrapper--toolbar--title">
<span className="automation-editor--flow-wrapper--toolbar--title--text">
<div className="id">{state.data.metadata.id}</div>
<InputTextView
value={state.data.metadata.alias ?? ""}
placeholder="Name"
onChange={(alias) =>
updateMetadata(
{
...state.data.metadata,
alias,
},
state.data.tags
)
}
/>
</span>
<InputList
fullWidth={false}
label="Mode"
className="automation-editor--flow-wrapper--toolbar--modes"
current={{
id: state.data.metadata.mode,
label: "",
}}
onChange={({ id }) =>
updateMetadata(
{
...state.data.metadata,
mode: id,
},
state.data.tags
)
}
getKey={({ id }) => id}
getDescription={({ label }) => label}
options={[
{
id: "single",
label: "Do not start a new run. Issue a warning.",
},
{
id: "parallel",
label:
"Start a new, independent run in parallel with previous runs.",
},
{
id: "queued",
label:
"Start a new run after all previous runs complete. Runs are guaranteed to execute in the order they were queued.",
},
{
id: "restart",
label: "Start a new run after first stopping previous run.",
},
]}
/>
<InputTextView
className="description"
value={state.data.metadata.description ?? ""}
placeholder="Description"
onChange={(description) =>
updateMetadata(
{
...state.data.metadata,
description,
},
state.data.tags
)
}
/>
</div>
{!dims.flipped && (
<Button
className={"automation-editor--flow-wrapper--toolbar--flip-btn"}
onClick={() => setFlipped(!flipped)}
>
<Icon>{flipped ? "flip_to_front" : "flip_to_back"}</Icon>
Flip
</Button>
)}
<Button
className={"automation-editor--flow-wrapper--toolbar--save-btn"}
onClick={save}
disabled={state.status !== "changed"}
>
Save <CheckMarkIcon color="#bf4" />
</Button>
</div>
<DAGAutomationGraph
sequence={state.data.sequence}
trigger={state.data.trigger}
condition={state.data.condition}
onSequenceUpdate={updateSequence}
onTriggerUpdate={updateTrigger}
onConditionUpdate={updateCondition}
isFlipped={flipped}
additionalControls={
<ControlButton onClick={() => setInfoBox(!infoBoxOpen)}>
<ModeEditOutlineTwoToneIcon />
</ControlButton>
}
/>
</div>
</div>
);
};
export const ValidationBox: FC<{
failures: MiniFailure[];
validate: (d: any) => MiniFailure[] | null;
data: EditorData;
onSave: (d: EditorData) => void;
}> = (props) => {
const [{ failures, data }, setState] = useState({
failures: props.failures,
data: props.data,
});
const makeSave =
<K extends keyof EditorData>(k: K) =>
(d: EditorData[K]) => {
const newData = {
...data,
[k]: d,
};
const newFails = props.validate(newData);
if (newFails) {
setState({
failures: newFails,
data: newData,
});
} else {
setState({
failures: [],
data: newData,
});
}
};
return (
<div className="automation-editor-failures">
<ul>
{failures.map((f, i) => (
<>
<li key={i}>
<b>{f.path}</b>:
<ul>
{f.message.map((m, j) => (
<li key={j}>{m}</li>
))}
</ul>
</li>
</>
))}
</ul>
<span>
Please correct the automation file manually and then continue!
</span>
<InputYaml
label="Metadata"
value={data.metadata}
onChange={makeSave("metadata")}
/>
<InputYaml label="Tags" value={data.tags} onChange={makeSave("tags")} />
<InputYaml
label="Trigger"
value={data.trigger}
onChange={makeSave("trigger")}
/>
<InputYaml
label="Condition"
value={data.condition}
onChange={makeSave("condition")}
/>
<InputYaml
label="Actions"
value={data.sequence}
onChange={makeSave("sequence")}
/>
<Button disabled={failures.length > 0} onClick={() => props.onSave(data)}>
Save
</Button>
</div>
);
};
@@ -1,78 +0,0 @@
import { DAGElement } from "components/DAGSvgs/DAGBoard";
import { Point } from "types/graphs";
import { AutomationTrigger } from 'types/automations/triggers';
import { avgPoints } from "utils/graph";
export function* computeTriggerPos(
startPoint: Point,
triggers: AutomationTrigger[],
toPath: Point,
onUpdate: (ts: AutomationTrigger[]) => void,
onAdd: () => void,
onEdit: (nt: AutomationTrigger, onSave: (ts: AutomationTrigger) => void) => void,
): Generator<DAGElement> {
// functions
const makeRemoveNode = (i: number) => () => onUpdate([
...triggers.slice(0, i),
...triggers.slice(i + 1),
]);
const updateNode = (n: AutomationTrigger, i: number) => onUpdate([
...triggers.slice(0, i),
n,
...triggers.slice(i + 1),
])
// main loop
for (let i = 0; i < triggers.length; i++) {
const node = triggers[i];
const nodeLoc: Point = [startPoint[0], startPoint[1] + i];
yield {
type: "node",
node,
loc: nodeLoc,
onRemove: makeRemoveNode(i),
onOpen: () => onEdit(node, up => updateNode(up, i))
}
yield {
type: "edge",
p1: nodeLoc,
p2: toPath,
direction: "1->2",
}
}
// if we had nothing to loop on
if (triggers.length === 0) {
yield {
type: "edge",
p1: [startPoint[0] - 0.25, startPoint[1] + triggers.length],
p2: toPath,
direction: "1->2",
}
}
// add circle
yield {
type: 'circle',
icon: 'add',
loc: [startPoint[0] + 0.25, startPoint[1] + triggers.length],
onAdd
}
}
export function* computeExtraField(
triggerEndPos: Point,
sequenceStartPos: Point,
): Generator<DAGElement> {
yield {
type: 'circle',
loc: avgPoints(triggerEndPos, sequenceStartPos),
icon: 'color',
color: 'blue',
}
yield {
type: 'edge',
p1: triggerEndPos,
p2: sequenceStartPos,
direction: '1->2',
}
}
@@ -0,0 +1,117 @@
import { useState, useEffect } from 'react';
import { AutomationData, AutomationMetadata } from "types/automations";
import * as v from "types/validators/autmation";
import { getFailures } from "types/validators/helper";
import { MiniFailure } from '../../types/validators/helper';
export type EditorData = ReturnType<typeof genEditorData>;
export type EditorState = {
status: 'unchanged' | 'changed' | 'saving',
data: EditorData
} | {
status: 'loading'
} | {
status: 'invalid',
failures: MiniFailure[],
data: EditorData,
}
export type EditorStatus = EditorState['status'];
export const useAutomatioEditorState = (
automation: AutomationData | undefined,
onSave: (a: AutomationData) => void,
) => {
const [state, update] = useState<EditorState>({
status: "loading",
});
const makeUpdate = <K extends keyof EditorData, D extends EditorData[K]>(name: K) => (
data: D
) => ((state.status === 'changed') || (state.status === 'unchanged')) && update({
status: 'changed',
data: {
...state.data,
[name]: data,
}
})
const saveAndUpdate = (data: EditorData) => {
const cleanData = {
...data,
tags: data.tags.reduce((all, [tagName, tagValue]) => ({
...all,
[tagName.trim()]: tagValue.trim(),
}), {})
};
update({
status: "saving",
data,
})
onSave(cleanData);
}
useEffect(() => {
if (automation) {
const failures = getFailures(automation, v.AutomationData);
if (failures) {
update({
status: 'invalid',
failures,
data: genEditorData(automation),
})
} else {
update({
status: 'unchanged',
data: genEditorData(automation),
})
}
}
}, [automation]);
return {
validate: (data: any) => getFailures(data, v.AutomationData),
updateTrigger: makeUpdate('trigger'),
updateSequence: makeUpdate('sequence'),
updateCondition: makeUpdate('condition'),
saveAndUpdate,
updateMetadata: (metadata: AutomationMetadata, tags: Array<[string, string]>) => {
if ((state.status === 'changed') || (state.status === 'unchanged')) {
update({
status: 'changed',
data: {
...state.data,
tags,
metadata,
}
})
}
},
save: () => {
if (state.status !== 'loading') {
saveAndUpdate(state.data)
}
},
get state() {
return state;
}
}
}
const genEditorData = (automation: AutomationData) => {
const {
metadata,
trigger,
sequence,
condition,
} = automation;
const tags: [string, string][] = Object.keys(automation.tags).map(tagName => [tagName, automation.tags[tagName]]);
return {
metadata,
trigger,
sequence,
condition,
tags,
}
}
@@ -1,24 +0,0 @@
import { createAppUseStyles } from "styles/theme";
export const useEditorStyles = createAppUseStyles<{
closeInfo: boolean;
horizontalMode: boolean;
}>(theme => ({
root: ({horizontalMode}) => ({
height: '100%',
width: '100%',
color: theme.primaryAccent,
display: 'flex',
flexDirection: horizontalMode ? 'column' : 'row',
}),
dag: {
borderWidth: 1,
borderStyle: 'solid',
borderColor: theme.secondaryAccent,
width: '100%',
},
infoIcon: ({horizontalMode}) => ({
bottom: horizontalMode ? '90%' : 10
})
}))
@@ -1,72 +1,187 @@
import "styles/root.css";
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { useState } from "react";
import { AutomationList } from ".";
import { NODE_HEIGHT, NODE_WIDTH, ADD_HEIGHT, ADD_WIDTH, CIRCLE_SIZE, DISTANCE_FACTOR } from 'components/DAGSvgs/constants';
import { createMockAuto } from "utils/mocks";
import { bigMockAutoList } from "utils/mocks";
import { Page } from "components/Page";
import { DEFAULT_DIMS } from "components/DAGGraph/elements/constants";
import { AutomationData } from "types/automations";
export default {
title: 'App/AutomationList',
title: "App/AutomationList",
component: AutomationList,
parameters: { actions: { argTypesRegex: '^on.*' } },
parameters: { actions: { argTypesRegex: "^on.*" } },
args: {
dims: {
nodeHeight: NODE_HEIGHT,
nodeWidth: NODE_WIDTH,
addHeight: ADD_HEIGHT,
addWidth: ADD_WIDTH,
circleSize: CIRCLE_SIZE,
distanceFactor: DISTANCE_FACTOR,
}
}
dims: DEFAULT_DIMS,
},
} as ComponentMeta<typeof AutomationList>;
const Template: ComponentStory<typeof AutomationList> = (args) => {
const [autos, setAutos] = useState(args.automations.data);
return (
<Page>
<AutomationList
{...args}
automations={{
...args.automations,
data: autos,
}}
onAdd={(a) => {
args.onAdd(a);
setAutos([...autos, a]);
}}
onRemove={(i) => {
args.onRemove(i);
setAutos([...autos.slice(0, i), ...autos.slice(i + 1)]);
}}
onUpdate={(i, a) => {
args.onUpdate(i, a);
setAutos([...autos.slice(0, i), a, ...autos.slice(i + 1)]);
}}
/>
</Page>
);
};
const Template: ComponentStory<typeof AutomationList> = args => {
const [autos, setAutos] = useState(args.automations)
return <div className="page">
<AutomationList {...args} automations={autos}
onAdd={a => {
args.onAdd(a);
setAutos([...autos, a]);
}}
onRemove={i => {
args.onRemove(i);
setAutos([
...autos.slice(0, i),
...autos.slice(i + 1),
]);
}}
onUpdate={(i, a) => {
args.onUpdate(i, a);
setAutos([
...autos.slice(0, i),
a,
...autos.slice(i + 1),
]);
}}
/>
</div>
}
const make = (autos: AutomationData[]) => {
const NewTemp = Template.bind({});
NewTemp.args = {
...NewTemp.args,
automations: {
data: autos,
params: {
offset: 0,
limit: 100,
},
totalItems: autos.length,
},
};
export const EmptyStart = Template.bind({})
EmptyStart.args = {
...EmptyStart.args,
automations: [],
}
return NewTemp;
};
export const FewAutos = Template.bind({})
FewAutos.args = {
...FewAutos.args,
automations: [
createMockAuto(),
createMockAuto(),
createMockAuto(),
createMockAuto(),
createMockAuto(),
createMockAuto(),
createMockAuto(),
createMockAuto(),
createMockAuto(),
createMockAuto(),
],
}
export const EmptyStart = make([]);
export const FewAutos = make(bigMockAutoList);
export const BadAutmations = make([
{
metadata: {
alias: "Set Thermostat to 76 at 8am",
description: "",
mode: "single",
} as any,
trigger: [
{
at: "08:00:00",
platform: "time",
},
],
condition: [
{
condition: "state",
entity_id: "climate.thermostat",
state: "cool",
},
],
sequence: [
{
data: {
temperature: 76,
},
service: "climate.set_temperature",
target: {
entity_id: "climate.thermostat",
},
},
],
tags: {},
},
{
condition: [],
tags: {},
metadata: {
id: "Bad Choose Example",
alias: "Bad Choose",
description: "Example Metadata",
trigger_variables: {
wowo: "!",
},
mode: "single",
},
trigger: [],
sequence: [
{
choose: [],
},
] as any,
},
{
condition: [],
tags: {},
metadata: {
id: "random",
alias: "Bad Trigger",
description: "Example Metadata",
trigger_variables: {
wowo: "!",
},
mode: "single",
},
trigger: ["haha I am a string"] as any,
sequence: [],
},
{
condition: [],
tags: {},
metadata: {} as any,
trigger: [],
sequence: [],
},
]);
export const FewAutosWithSlowLoader: ComponentStory<typeof AutomationList> = (
args
) => {
const [autos, setAutos] = useState(args.automations.data);
return (
<Page>
<AutomationList
{...args}
automations={{
...args.automations,
data: autos,
}}
onAdd={(a) => {
window.setTimeout(() => {
args.onAdd(a);
setAutos([...autos, a]);
}, 10000);
}}
onRemove={(i) => {
window.setTimeout(() => {
args.onRemove(i);
setAutos([...autos.slice(0, i), ...autos.slice(i + 1)]);
}, 10000);
}}
onUpdate={(i, a) => {
window.setTimeout(() => {
args.onUpdate(i, a);
setAutos([...autos.slice(0, i), a, ...autos.slice(i + 1)]);
}, 10000);
}}
/>
</Page>
);
};
FewAutosWithSlowLoader.args = {
...FewAutosWithSlowLoader.args,
automations: {
data: bigMockAutoList,
params: {
limit: 100,
offset: 0,
},
totalItems: 100,
},
};
Loaded 100 of 346 files, more files were not shown because too many files have changed in this diff. Show more