Compare commits

...
284 Commits
Author SHA1 Message Date
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
ari d54ac4a779 changelog 2022-04-13 15:32:04 -04:00
Ari Sosnovsky 045af7bfdb Update README.md 2022-04-13 15:19:40 -04:00
Ari Sosnovsky 8639ac8646 Update FUNDING.yml 2022-04-13 15:17:34 -04:00
Ari Sosnovsky 682bbf799b Update README.md 2022-04-13 15:14:45 -04:00
Ari Sosnovsky 8cee78b5aa Create FUNDING.yml 2022-04-13 15:05:48 -04:00
Ari adf44dca65 v0.0.8 2022-04-13 14:46:36 -04:00
ari 1341e205cf increased sizes 2022-04-13 14:43:36 -04:00
ari 9d7634c37b fixed up modal not closing for triggers 2022-04-13 14:29:15 -04:00
Ari 6995136704 updated autmation api 2022-04-13 14:27:20 -04:00
ari 32589b7c64 fixed typoing issues 2022-04-13 14:10:47 -04:00
ari 964ff54dc1 more trigger options 2022-04-13 14:08:36 -04:00
ari 56baef2662 more trigger editors 2022-04-13 13:52:25 -04:00
ari 2ee980b862 all comndition editors 2022-04-13 13:44:57 -04:00
Ari 38c312f849 merged 2022-04-13 13:37:44 -04:00
Ari cc8cd60920 local path 2022-04-13 13:36:49 -04:00
ari 2953ac45dd added support for more condition editors 2022-04-13 13:35:52 -04:00
ari b71cd3ad0a fixed typing issue 2022-04-12 17:58:56 -04:00
ari b2c7529d66 fixed up nodeeditor modal styling 2022-01-14 12:40:30 -05:00
ari d77f079a23 added more trigger managers 2022-01-14 12:40:17 -05:00
ari 7296a2c518 fixed annoying bug where the trigger disappears when you edit 2022-01-14 11:38:08 -05:00
ari 9d13785985 fixed up how dummy data is made for dagboard 2022-01-14 11:34:19 -05:00
ari d43356dfe0 Merge branch 'main' of github.com:asosnovsky/Shortumation into main 2022-01-14 11:32:09 -05:00
ari 28fbdf1698 adjusted scrollbar for dag in all possible modes
removed pages
2022-01-14 11:31:55 -05:00
root d9e889c1ce updated config yaml to work well 2022-01-10 16:20:53 -05:00
ari 3f74c10cbf added reload to makefile 2022-01-10 16:20:28 -05:00
ari 1351727ecf cleanedup public 2022-01-10 16:05:55 -05:00
root b202012570 fixed up dockerfile run.sh 2022-01-10 16:05:22 -05:00
ari 0a89ca0deb version tick 2022-01-09 14:09:25 -05:00
ari 6f8ffabfdc ensured webapp builds 2022-01-09 14:09:13 -05:00
ari 2e01704d88 added react-scripts to Dockerfile 2022-01-08 18:32:30 -05:00
ari 3775ad79b7 fixed up run.sh 2022-01-08 18:31:44 -05:00
ari e68a357e94 no longer using orjson 2022-01-08 17:32:13 -05:00
ari f041346ad3 added forgotten npm 2022-01-08 17:04:45 -05:00
ari 07c00e3999 attempting to build from py image 2022-01-08 16:18:27 -05:00
ari 3db67431e1 single docker file build 2022-01-06 21:52:39 -05:00
ari 98184104ee using dockerhub for hosting 2022-01-06 16:45:33 -05:00
root fa575dd142 fixed up yaml 2022-01-05 17:23:10 -05:00
ari b4bbdaaf22 fixed up container 2022-01-05 17:12:18 -05:00
root 3c9c43a39c trying different things with config 2022-01-05 16:59:50 -05:00
root 4558620553 additional docker fields 2022-01-05 16:32:51 -05:00
ari b43aa6c181 updated config 2022-01-05 16:23:19 -05:00
ari 00c338ca8d updated config 2022-01-05 15:44:49 -05:00
ari ae51b7de6f working local docker file 2022-01-05 15:29:45 -05:00
ari 1e44a28919 - readme
- functional code
2022-01-05 14:55:46 -05:00
ari 63cfd936b5 setup local hosting 2022-01-04 23:27:23 -05:00
ari 25e65540e1 cleaned up api 2022-01-04 22:59:53 -05:00
ari f8e615304c simple api tests 2022-01-04 21:53:19 -05:00
ari fbbfee8873 initial api work 2022-01-04 21:42:25 -05:00
ari 00505c0faa functioning manager 2022-01-03 21:25:00 -05:00
ari ef5715ea6c manager code 2021-12-30 23:16:15 -05:00
ari 8adb86b2ec added support for ruamel types 2021-12-30 23:15:41 -05:00
ari 381835c642 refactor + cleanup 2021-12-30 22:30:21 -05:00
ari 4a08956e1a added api setup 2021-12-30 12:37:30 -05:00
ari 787716ccba added api setup 2021-12-30 12:37:17 -05:00
ari fa88b3840c more clean up + public 2021-12-28 21:56:09 -05:00
ari 8058e314db clean up 2021-12-28 21:53:41 -05:00
ari 9d8cc9ed3e clean up styling 2021-12-25 17:06:49 -05:00
ari 0aff219645 auto viewer styles 2021-12-24 11:48:43 -05:00
ari 0d33af94dc using secondary accent for button icon 2021-12-24 11:32:52 -05:00
ari 039c0631de nicer styling for editor close/open 2021-12-24 11:31:58 -05:00
ari cc591f854f button icon 2021-12-24 11:26:39 -05:00
ari 175034bbcc mocks + defaults 2021-12-24 11:10:19 -05:00
ari 9a04ba7f83 list ideas 2021-12-24 11:10:11 -05:00
ari ca48891597 added arrow icon 2021-12-24 11:10:06 -05:00
ari 2cd3ddb7d8 removed old web 2021-12-21 22:54:36 -05:00
ari dd74c400d4 ensuring everything does not magically resize 2021-12-21 22:51:07 -05:00
ari 24f7c3c3af working trigger editor 2021-12-21 22:46:16 -05:00
ari 3cfb8151eb show hide metadata dim 2021-12-16 17:19:59 -05:00
ari 997c793c36 info icons 2021-12-16 16:58:55 -05:00
ari f759a7c8d5 removed dead comments 2021-12-16 16:41:51 -05:00
ari 1efb04fe68 added root styles
added auto editor
cleaned up styles for dagboard
2021-12-16 16:41:33 -05:00
ari fff15f65ce remove condition nodes 2021-12-16 15:47:59 -05:00
ari 49bb35717f added trash icon 2021-12-16 15:28:18 -05:00
ari 40db8d41d7 tests 2021-12-16 15:07:20 -05:00
ari e9fa762827 removed logs 2021-12-15 15:33:06 -05:00
ari 1ea5f83590 functional editor 2021-12-15 15:31:26 -05:00
ari 8dfbb9faa9 multinode editor 2021-12-15 14:50:48 -05:00
ari fde0f49688 simple modal node editor 2021-12-15 14:06:13 -05:00
ari 90d4fbf8f6 functional modal 2021-12-15 13:18:42 -05:00
ari 48aae0bf98 generic modal 2021-12-15 13:05:08 -05:00
ari dc955fcee3 added on open 2021-12-15 11:02:56 -05:00
ari 64cafb401f added cleaner names + tooltip 2021-12-15 10:59:41 -05:00
ari 7e54e31efc fixed styling for chrome 2021-12-15 10:50:08 -05:00
ari 1643558240 good enough node editor 2021-12-15 10:43:45 -05:00
ari 54e628481c moved old state handler code 2021-12-14 15:56:07 -05:00
ari d0bc01d2f1 cleaned up delete 2021-12-02 09:57:35 -05:00
ari 6e8e409a89 ported back condition editor 2021-12-02 09:47:52 -05:00
ari 59542abad7 ported parts of node editor 2021-12-01 17:07:43 -05:00
ari 0764feb432 moved back the components 2021-12-01 16:38:30 -05:00
ari 24afb602cb ability to add new branches 2021-12-01 15:47:05 -05:00
ari 55239e6517 added branching icons 2021-12-01 15:30:27 -05:00
ari 146a48b7c3 circle element 2021-12-01 15:06:31 -05:00
ari d848a3738b stable 2021-12-01 12:25:14 -05:00
ari 0c8c113e28 fixed more styling issues 2021-11-30 22:53:26 -05:00
ari c36050380d Merge branch 'main' of github.com:asosnovsky/Shortumation into main 2021-11-30 22:35:53 -05:00
ari 0a28c28906 removed logs 2021-11-30 22:35:39 -05:00
ari aae609c248 much better placement 2021-11-30 22:35:28 -05:00
ari 8e02468eab clean up types 2021-11-30 16:55:00 -05:00
ari 6e6c6e09a6 targetting es2015 2021-11-30 16:54:45 -05:00
ari 8ff9f29ac0 iter wrapper 2021-11-30 16:54:36 -05:00
ari 60b522922a zoom 2021-11-30 16:50:18 -05:00
ari f56c8db9a6 dynamic svg board 2021-11-30 11:55:48 -05:00
ari e6ef41623a notes 2021-11-29 22:26:56 -05:00
ari 4c21dc6090 moving board 2021-11-29 22:26:52 -05:00
ari 91704c3da2 all current work 2021-11-25 15:24:55 -05:00
ari f31ec2e60a remove and add new nodes 2021-11-25 14:54:10 -05:00
ari a3774bc6fb add icon 2021-11-25 14:05:44 -05:00
ari 844145aeaf add button 2021-11-25 14:03:15 -05:00
ari 13c9ede31c deleting sequence nodes 2021-11-25 12:52:11 -05:00
ari e83e074fe8 mini sequence diagram 2021-11-25 12:36:19 -05:00
ari 69edca7685 simple two node dag 2021-11-25 12:00:07 -05:00
ari d8747a7ee2 plural 2021-11-25 11:29:49 -05:00
ari de49905e62 latest work 2021-11-25 11:28:39 -05:00
ari 39757d0045 stable storybook+react+jest 2021-11-24 13:45:19 -05:00
ari 2de4c700a7 removed public 2021-11-24 13:43:30 -05:00
ari 82232d467b removed public 2021-11-24 13:43:15 -05:00
ari 75f0841978 Working webapp 2021-11-24 13:19:34 -05:00
ari 262e2971a1 stable 2021-11-24 12:44:56 -05:00
ari 89d1abe343 new webapp 2021-11-24 11:30:23 -05:00
ari f6216d5fd6 [200~latest changes to web~ 2021-11-24 11:30:13 -05:00
ari 22bc5dfcf6 [200~latest changes to web~ 2021-11-24 11:30:00 -05:00
ari f11d060ed2 added linux fix for storybok 2021-11-22 16:53:27 -05:00
Ari Sosnovsky 3899cd4a04 notes 2021-11-17 12:42:40 -05:00
Ari Sosnovsky 019fa23758 all work 2021-11-17 12:41:21 -05:00
Ari Sosnovsky 3e79ddffcc latest thinking about automation editor 2021-11-17 12:07:05 -05:00
Ari Sosnovsky 5b14210f95 styling for auto editor 2021-11-17 11:45:33 -05:00
Ari Sosnovsky fe1b66d2d9 yaml mode 2021-11-16 22:36:05 -05:00
Ari Sosnovsky eb12ecc5d6 added defaults 2021-11-16 22:16:51 -05:00
Ari Sosnovsky 25f21fcc93 input list 2021-11-16 21:46:07 -05:00
Ari Sosnovsky 1dd11eae18 more cleanup 2021-11-16 21:19:42 -05:00
Ari Sosnovsky 1bb61436e4 cleanup 2021-11-16 21:19:02 -05:00
Ari Sosnovsky 831de545a2 nested updater 2021-11-16 21:17:22 -05:00
Ari Sosnovsky 1ac812da60 numeric condition editor 2021-11-16 13:51:54 -05:00
Ari Sosnovsky 4b966bf5e1 input number 2021-11-16 13:46:19 -05:00
Ari Sosnovsky 60ec7c3f29 + added bubble editor
+ initial numeric editor
+ entity id input
2021-11-16 13:25:53 -05:00
Ari Sosnovsky 6be9f1ba12 propogated nested editor 2021-11-16 12:15:53 -05:00
Ari Sosnovsky 2a64d06eb2 minor touches 2021-11-16 11:57:45 -05:00
Ari Sosnovsky d210c3924b fnctional display mode for nested conditions 2021-11-16 11:51:42 -05:00
Ari Sosnovsky 23ece34a50 renamed to editor 2021-11-16 09:53:13 -05:00
Ari Sosnovsky b683cbb65e new text area + editable template 2021-11-16 09:52:19 -05:00
Ari Sosnovsky fed45e1d78 - refactorted icons
- condition box view and editor
2021-11-15 20:26:23 -05:00
Ari Sosnovsky df272e138c using storybook
converted to jss
2021-11-15 16:27:28 -05:00
Ari Sosnovsky 6d4fe7749a initial graph view 2021-11-12 15:58:44 -05:00
Ari Sosnovsky 12d086a5c0 adjusting dims for info box 2021-11-12 14:59:22 -05:00
Ari Sosnovsky ccca0edb65 updated automation metadata 2021-11-12 14:39:55 -05:00
Ari Sosnovsky 54c1edba0c added input text view + moved things 2021-11-12 14:09:00 -05:00
Ari Sosnovsky 9694ffb238 fixed stupid root import bug in typescript 2021-11-12 10:52:36 -05:00
Ari Sosnovsky 337ba3491e moving some stuff 2021-11-11 16:22:27 -05:00
Ari Sosnovsky 9b50f73b62 updated data type 2021-11-11 16:21:12 -05:00
Ari Sosnovsky 7127c3c0b9 backuping up stuff 2021-11-11 15:18:30 -05:00
Ari Sosnovsky 9ec15d5ab9 added endpoint to upsert autos 2021-11-11 13:18:58 -05:00
Ari Sosnovsky 9e23885b28 added upesert for autos 2021-11-11 13:12:45 -05:00
Ari Sosnovsky 3c082608f8 added root path for ha 2021-11-11 12:41:10 -05:00
Ari Sosnovsky c493c0a3d0 added simpler loader 2021-11-11 12:33:33 -05:00
Ari Sosnovsky d6adbb897d upped coverage 2021-11-11 12:08:45 -05:00
Ari Sosnovsky 2768975f9d added yaml deserializer and move all yamll stuff to one folder 2021-11-11 11:51:58 -05:00
Ari Sosnovsky a05c1b9dca added auto searching 2021-11-11 11:12:50 -05:00
Ari Sosnovsky d61085c2f1 added more processng 2021-11-10 16:03:46 -05:00
Ari Sosnovsky 862ec58193 initial test for actions 2021-11-10 15:27:52 -05:00
Ari Sosnovsky 5169cfbca9 updated gitignore 2021-11-10 15:23:22 -05:00
Ari Sosnovsky 47af2fccff initial conversion of automation 2021-11-10 15:22:10 -05:00
Ari Sosnovsky 12b4ff6615 added config loader 2021-11-10 12:46:30 -05:00
Ari Sosnovsky c794661e05 added a way to query entities 2021-11-10 11:17:43 -05:00
Ari Sosnovsky 759a002bce removed pycache 2021-11-10 11:17:25 -05:00
Ari Sosnovsky e87c41f496 initial api 2021-11-09 21:38:17 -05:00
Ari Sosnovsky 899d78fba5 added ha 2021-11-09 20:45:19 -05:00
Ari Sosnovsky ea9dd2a8a3 more name stuff + .gitignore 2021-11-09 20:43:08 -05:00
Ari Sosnovsky 76dca488ee initial work on dag converison 2021-11-09 14:12:31 -05:00
Ari Sosnovsky a7fda74168 initial work on dag converison 2021-11-09 14:12:11 -05:00
Ari Sosnovsky 5ac972101a added top color to node 2021-11-08 19:54:36 -05:00
Ari Sosnovsky 8b4c8aec22 svg work 2021-11-08 19:46:06 -05:00
Ari Sosnovsky a8c83afaff initial svg 2021-11-08 15:21:39 -05:00
Ari Sosnovsky c933589998 added condition 2021-11-03 10:59:26 -04:00
Ari Sosnovsky f66895d0eb added more state managers 2021-11-03 09:27:21 -04:00
Ari Sosnovsky 08a50051d5 initial attempt at visual 2021-11-02 22:54:38 -04:00
Ari Sosnovsky 126f1df657 input booleans 2021-11-02 21:45:15 -04:00
Ari Sosnovsky 70eba32b34 added foundation for tooltip 2021-10-31 22:56:42 -04:00
Ari Sosnovsky 53ec0d417b standardized rendering of inputs 2021-10-31 14:13:51 -04:00
Ari Sosnovsky 32fd7f2dff added state modifier 2021-10-29 12:39:31 -04:00
255 changed files with 28589 additions and 12535 deletions

No files matched your search

+4
View File
@@ -0,0 +1,4 @@
webapp/node_modules
webapp/build
webapp/.storybook
webapp/.vscode
+13
View File
@@ -0,0 +1,13 @@
# These are supported funding model platforms
github: #[asosnovsky]
patreon: # Replace with a single Patreon username
open_collective: # Replace with a single Open Collective username
ko_fi: arisosnovsky
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay: # Replace with a single Liberapay username
issuehunt: asosnovsky
otechie: # Replace with a single Otechie username
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
+75
View File
@@ -0,0 +1,75 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"
on:
push:
branches: [ main ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ main ]
schedule:
- cron: '29 23 * * 0'
jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write
strategy:
fail-fast: false
matrix:
language: [ 'javascript', 'python' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://git.io/codeql-language-support
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.9.1
with:
access_token: ${{ github.token }}
- name: Checkout repository
uses: actions/checkout@v3
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language
#- run: |
# make bootstrap
# make release
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
+30
View File
@@ -0,0 +1,30 @@
name: Deploy
env:
MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs"
on:
release:
types: [published]
jobs:
build:
runs-on: ubuntu-latest
name: ${{ matrix.arch }}
strategy:
matrix:
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
steps:
- name: Check out repository
uses: actions/checkout@v3
- name: Login to DockerHub
uses: docker/login-action@v2.0.0
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: ${{ github.ref }} / ${{ matrix.arch }}
uses: home-assistant/builder@2022.03.1
with:
args: |
--${{ matrix.arch }} \
--target .
+77
View File
@@ -0,0 +1,77 @@
name: Test
env:
MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs"
on:
workflow_dispatch:
push:
branch: [main]
pull_request:
branches: [main]
jobs:
build:
runs-on: ubuntu-latest
name: Build Test for ${{ matrix.arch }}
strategy:
matrix:
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.9.1
with:
all_but_latest: true
access_token: ${{ github.token }}
- name: Check out repository
uses: actions/checkout@v3
- name: Login to DockerHub
uses: docker/login-action@v2.0.0
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: ${{ matrix.arch }}
uses: home-assistant/builder@2022.03.1
with:
args: |
--test \
--${{ matrix.arch }} \
--target .
python:
name: "Python Tests"
runs-on: ubuntu-latest
strategy:
matrix:
action: [lint, coverage, security-checks]
steps:
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v3
with:
python-version: 3.9
- name: Install Dependencies
run: cd api && make setup
- name: Echo dependencies
run: cd api && ./venv/bin/pip freeze
- name: Running ${{ matrix.action }}
run: cd api && make ${{ matrix.action }}
nodejs:
name: "NodeJs Tests"
runs-on: ubuntu-latest
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: Run Tests
run: cd webapp && yarn test:ci
+12
View File
@@ -0,0 +1,12 @@
{
"python.formatting.provider": "black",
"python.testing.unittestArgs": [
"-v",
"-s",
"./api/tests",
"-p",
"*test_*.py"
],
"python.testing.pytestEnabled": false,
"python.testing.unittestEnabled": true
}
+40
View File
@@ -0,0 +1,40 @@
# Changelog -- [![GitHub version](https://badge.fury.io/gh/asosnovsky%2FShortumation.svg)](https://badge.fury.io/gh/asosnovsky%2FShortumation)
## [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
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).
+49
View File
@@ -0,0 +1,49 @@
# <--- Build Args -->
ARG BUILD_ARCH
ARG BUILD_VERSION
# <--- Image Setup -->
FROM homeassistant/${BUILD_ARCH}-base-python:3.9-alpine3.14
WORKDIR /app
# <--- System Wide Dependencies -->
ENV LANG C.UTF-8
RUN apk add --no-cache \
nodejs \
npm \
build-base \
python3-dev
RUN pip install -U wheel setuptools pip && \
npm i -g yarn
# <--- Python Dependencies -->
COPY api/setup.py /app/setup.py
RUN pip install . /app
# <--- Webapp Build -->
COPY webapp/ /app/web-builder
RUN cd /app/web-builder && \
yarn && \
yarn build && \
cp -r /app/web-builder/build /app/web && \
rm -rf /app/web-builder
# <--- 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
# <--- Ports -->
EXPOSE 8000
# <--- Final -->
LABEL \
io.hass.type="addon" \
io.hass.arch="armhf|aarch64|i386|amd64"
CMD [ "/app/run.sh" ]
+24
View File
@@ -0,0 +1,24 @@
DC=docker-compose -f docker-compose.build.yaml -f docker-compose.test.yaml
build:
$(DC) build
push:
$(DC) push
local_run:
$(MAKE) build
$(DC) up -d
sleep 1
$(DC) ps
local_logs:
$(DC) logs -f
local_ps:
$(DC) ps
local_stop:
$(DC) stop
+21
View File
@@ -0,0 +1,21 @@
# Shortumation [![GitHub version](https://badge.fury.io/gh/asosnovsky%2FShortumation.svg)](https://badge.fury.io/gh/asosnovsky%2FShortumation)
![image](https://user-images.githubusercontent.com/7451445/167028000-41528244-47be-408e-8f47-55187c0e5dcd.png)
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/).
## Features
- [X] View your automations & scripts in a visual graph
- [X] See all automations in one common view
- [X] Automation Manager
- [X] Tags for automation organization
- [ ] Script Manager
- [ ] Use secrets and global parameters
- [ ] Autocomplete fields for entities/devices
- [ ] Autocomplete fields for template editor
- [ ] Autocomplete fields for referencing scripts
See roadmap in [Version 1 Github Project](https://github.com/asosnovsky/Shortumation/projects/1).
+145
View File
@@ -0,0 +1,145 @@
# Created by https://www.toptal.com/developers/gitignore/api/python
# Edit at https://www.toptal.com/developers/gitignore?templates=python
### Python ###
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class
# C extensions
*.so
# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST
# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec
# Installer logs
pip-log.txt
pip-delete-this-directory.txt
# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
*.py,cover
.hypothesis/
.pytest_cache/
cover/
# Translations
*.mo
*.pot
# Django stuff:
*.log
local_settings.py
db.sqlite3
db.sqlite3-journal
# Flask stuff:
instance/
.webassets-cache
# Scrapy stuff:
.scrapy
# Sphinx documentation
docs/_build/
# PyBuilder
.pybuilder/
target/
# Jupyter Notebook
.ipynb_checkpoints
# IPython
profile_default/
ipython_config.py
# pyenv
# For a library or package, you might want to ignore these files since the code is
# intended to run in multiple environments; otherwise, check them in:
# .python-version
# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock
# PEP 582; used by e.g. github.com/David-OConnor/pyflow
__pypackages__/
# Celery stuff
celerybeat-schedule
celerybeat.pid
# SageMath parsed files
*.sage.py
# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/
# Spyder project settings
.spyderproject
.spyproject
# Rope project settings
.ropeproject
# mkdocs documentation
/site
# mypy
.mypy_cache/
.dmypy.json
dmypy.json
# Pyre type checker
.pyre/
# pytype static type analyzer
.pytype/
# Cython debug symbols
cython_debug/
# End of https://www.toptal.com/developers/gitignore/api/python
+21
View File
@@ -0,0 +1,21 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Python: Current File",
"type": "python",
"request": "launch",
"program": "${file}",
"console": "integratedTerminal"
}
// ,{
// "name": "Debug Unit Test",
// "type": "python",
// "request": "test",
// "justMyCode": false
// }
]
}
+12
View File
@@ -0,0 +1,12 @@
{
"python.formatting.provider": "black",
"python.testing.unittestArgs": [
"-v",
"-s",
"./tests",
"-p",
"*test_*.py"
],
"python.testing.pytestEnabled": false,
"python.testing.unittestEnabled": true
}
+17
View File
@@ -0,0 +1,17 @@
list_autos # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:16)
upsert_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:27)
delete_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:31)
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/details.py:12)
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/ping.py:9)
params # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:16)
total_items # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:17)
id # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:6)
alias # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:7)
description # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:8)
trigger_variables # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:9)
mode # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:10)
json_dumps # unused function (/home/ari/Projects/Shortumation/api/src/json_serializer.py:5)
logger # unused variable (/home/ari/Projects/Shortumation/api/src/logger.py:16)
_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:13)
_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:30)
_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:54)
+46
View File
@@ -0,0 +1,46 @@
VENV_FOLDER=./venv
VENV_BIN=$(VENV_FOLDER)/bin
PIP=$(VENV_BIN)/pip
PYTHON=$(VENV_BIN)/python
setup:
rm -rf $(VENV_FOLDER)
python3 -m venv $(VENV_FOLDER)
$(PIP) install wheel==0.35.1
$(PIP) install .[dev]
lint:
$(VENV_BIN)/vulture src .vulture_whitelist
$(MAKE) lint-project
$(MAKE) lint-tests
lint-project:
$(VENV_BIN)/black src
$(VENV_BIN)/isort --trailing-comma src
$(VENV_BIN)/mypy src
lint-tests:
$(VENV_BIN)/black tests
$(VENV_BIN)/isort --trailing-comma tests
$(VENV_BIN)/mypy tests
security-checks:
$(VENV_BIN)/bandit -r src
test:
$(PYTHON) -m unittest discover tests
coverage:
$(VENV_BIN)/coverage run -m unittest discover tests
$(VENV_BIN)/coverage report -m --fail-under=90
clean:
rm -rf dist *.sqlite *.egg-info build .mypy_cache .coverage
find . -type d -name "__pycache__" -exec rm -r {} +
find . -type d -name "*tmp" -exec rm -r {} +
run-local:
rm -f web
ln -s ../webapp/build web
USE_EXAMPLE_REPO=1 $(VENV_BIN)/uvicorn src.app:app --reload
+43
View File
@@ -0,0 +1,43 @@
[project]
[build-system]
requires = ["setuptools >= 40.9.0", "wheel"]
build-backend = "setuptools.build_meta"
[tool.isort]
multi_line_output = 3
[tool.black]
line-length = 100
target_version = ['py39']
include = '\.pyi?$'
exclude = '''
(
/(
\.eggs
| \.git
| \.hg
| \.mypy_cache
| \.tox
| \.venv
| _build
| buck-out
| build
| dist
)/
)
'''
[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
+27
View File
@@ -0,0 +1,27 @@
# -*- coding: utf-8 -*-
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",
],
extras_require={
"dev": [
"mypy==0.910",
"mypy-extensions==0.4.3",
"black==22.3.0",
"bandit==1.7.0",
"isort==5.9.3",
"coverage==5.5",
"pre-commit==2.13.0",
"vulture==2.3",
"types-requests==2.25.6",
"requests==2.27.0",
],
},
)
View File
Whitespace-only changes.
View File
Whitespace-only changes.
+34
View File
@@ -0,0 +1,34 @@
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 ORIGIN, ROOT_FOLDER
from .routes import automations, details, ping
def make_app(automation_mgr: AutomationManager) -> FastAPI:
app = FastAPI()
if (ROOT_FOLDER / "web").exists():
app.mount(
"/web",
StaticFiles(
directory=ROOT_FOLDER / "web",
html=True,
),
name="web",
)
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(details.make_details_router(automation_mgr.hass_config), prefix="/details")
return app
View File
Whitespace-only changes.
+42
View File
@@ -0,0 +1,42 @@
from fastapi import APIRouter, HTTPException
from src.api.types import (
DeleteAutoRequest,
ListData,
ListParams,
UpdateAutoRequest,
)
from src.automations.errors import FailedDeletion
from src.automations.manager import AutomationManager
from src.automations.types import AutomationData
def make_automation_router(automations: AutomationManager) -> APIRouter:
router = APIRouter()
@router.post("/list")
def list_autos(body: ListParams) -> ListData[AutomationData]:
return ListData(
params=body,
totalItems=automations.get_total_items(),
data=automations.find(
offset=body.offset,
limit=body.limit,
),
)
@router.post("")
def upsert_auto(body: UpdateAutoRequest):
automations.update(body.index, body.data)
@router.delete("")
def delete_auto(body: DeleteAutoRequest):
try:
automations.delete(body.index)
except FailedDeletion as err:
return HTTPException(
status_code=400,
detail=err.args,
)
return router
+21
View File
@@ -0,0 +1,21 @@
from datetime import datetime
from fastapi import APIRouter
from src.env import BUILD_VERSION
from src.hass_config import HassConfig
def make_details_router(hass_config: HassConfig) -> APIRouter:
router = APIRouter()
@router.get("/")
def read_ping():
return {
"version": BUILD_VERSION,
"config": hass_config.get_configuration_path(),
"tags": hass_config.get_automation_tags_path(),
"autos": hass_config.get_automation_path(),
}
return router
+15
View File
@@ -0,0 +1,15 @@
from datetime import datetime
from fastapi import APIRouter
from src.env import BUILD_VERSION
router = APIRouter()
@router.get("/")
def read_ping():
return {
"version": BUILD_VERSION,
"current_time": datetime.now(),
}
+29
View File
@@ -0,0 +1,29 @@
from typing import Generic, List, TypeVar
from pydantic import BaseModel
from pydantic.fields import Field
from pydantic.generics import GenericModel
from src.automations.types import ExtenededAutomationData
DataT = TypeVar("DataT")
class ListParams(BaseModel):
offset: int
limit: int
class ListData(GenericModel, Generic[DataT]):
params: ListParams
total_items: int = Field(alias="totalItems")
data: List[DataT]
class UpdateAutoRequest(BaseModel):
index: int = Field(description="Index of the automation to update")
data: ExtenededAutomationData
class DeleteAutoRequest(BaseModel):
index: int = Field(description="Index of the automation to update")
+6
View File
@@ -0,0 +1,6 @@
from src.api.app import make_app
from src.automations.manager import AutomationManager
from src.hass_config import find_hass_config
hass_config = find_hass_config()
app = make_app(AutomationManager(hass_config))
View File
Whitespace-only changes.
+10
View File
@@ -0,0 +1,10 @@
class AutomationLoaderException(Exception):
pass
class InvalidAutomationFile(AutomationLoaderException):
pass
class FailedDeletion(AutomationLoaderException):
pass
+51
View File
@@ -0,0 +1,51 @@
from typing import Iterator, Union
from pydantic.error_wrappers import ValidationError
from src.json_serializer import normalize_obj
from .errors import InvalidAutomationFile
from .types import AutomationMetdata, ExtenededAutomationData
# Single loader
def load_automation(
auto_raw: dict,
tags: dict,
) -> Iterator[ExtenededAutomationData]:
"""Converts an automation dictionary loaded directly from the config into
several python typed objects
Args:
automations_raw_data (Iterable[dict])
Returns:
Iterator[ExtenededAutomationData]
"""
try:
yield ExtenededAutomationData(
metadata=AutomationMetdata.parse_obj(auto_raw),
condition=load_conditions(auto_raw.get("condition", [])),
sequence=load_conditions(auto_raw.get("action", [])),
trigger=normalize_obj(auto_raw.get("trigger", [])),
tags=tags,
)
except ValidationError as err:
raise InvalidAutomationFile from err
def load_conditions(conditions: Union[dict, list, str]):
if isinstance(conditions, list):
return list(map(ensure_condition_dictionary, conditions))
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}")
+68
View File
@@ -0,0 +1,68 @@
from typing import Iterator, List, Optional
from src.automations.errors import FailedDeletion
from src.automations.types import AutomationData, ExtenededAutomationData
from src.hass_config.loader import HassConfig
from .loader import load_automation
class AutomationManager:
def __init__(self, hass_config: HassConfig) -> None:
self.hass_config = hass_config
def find(
self,
offset: int = 0,
limit: int = 10,
) -> Iterator[AutomationData]:
tags = self.hass_config.automation_tags
for i, auto in enumerate(self.hass_config.automations):
if i < offset:
continue
if i >= offset + limit:
break
yield from load_automation(auto, tags.get(i, {}))
def get(self, index: int) -> Optional[AutomationData]:
tags = self.hass_config.automation_tags
if index >= 0:
for i, auto in enumerate(self.hass_config.automations):
if i == index:
return next(load_automation(auto, tags.get(i, {})))
return None
def update(self, index: int, automation: ExtenededAutomationData):
tags = self.hass_config.automation_tags
automations: List[dict] = []
updated = False
for i, orig_auto in enumerate(self.hass_config.automations):
if i == index:
automations.append(automation.to_primitive())
updated = True
else:
automations.append(orig_auto)
if not updated:
automations.append(automation.to_primitive())
tags[index] = automation.tags
self.hass_config.save_automations(automations)
self.hass_config.save_tags(tags)
def delete(self, index: int):
automations: List[dict] = []
deleted = False
for i, orig_auto in enumerate(self.hass_config.automations):
if i == index:
deleted = True
else:
automations.append(orig_auto)
if not deleted:
raise FailedDeletion("No such automation found")
self.hass_config.save_automations(automations)
# TODO: improve on this without keeping things in memory
def get_total_items(self) -> int:
count = 0
for i, _ in enumerate(self.hass_config.automations):
count = i
return count + 1
+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[int, 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))
+31
View File
@@ -0,0 +1,31 @@
from typing import Dict, List, Literal, Optional, Union
from pydantic import BaseModel
from pydantic.fields import Field
class AutomationMetdata(BaseModel):
id: str
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"
class AutomationData(BaseModel):
metadata: AutomationMetdata
trigger: List[dict] = []
condition: List[dict] = []
sequence: List[dict] = []
def to_primitive(self):
return {
**self.metadata.dict(exclude_unset=True, exclude_none=True),
"trigger": self.trigger,
"condition": self.condition,
"action": self.sequence,
}
class ExtenededAutomationData(AutomationData):
tags: Dict[str, str] = Field(default_factory=dict)
+8
View File
@@ -0,0 +1,8 @@
from pathlib import Path
from decouple import Csv, config
ROOT_FOLDER = Path(__file__).parent.parent.absolute()
BUILD_VERSION = config("BUILD_VERSION", "0.0.0")
LOG_LEVEL = config("LOG_LEVEL", "INFO")
ORIGIN = config("ORIGIN", cast=Csv(), default="*")
+32
View File
@@ -0,0 +1,32 @@
import os
from pathlib import Path
from decouple import config
from .loader import HassConfig
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
path = create_copy_of_example_config()
print("|-> ", path)
return HassConfig(path)
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("~"))
config_dir = data_dir / ".homeassistant"
if config_dir.is_dir():
return HassConfig(config_dir)
raise ValueError(
"Unable to automatically find the location of Home Assistant " "config. Please pass it in."
)
+6
View File
@@ -0,0 +1,6 @@
class HassConfigError(Exception):
pass
class MissingFile(HassConfigError):
pass
+69
View File
@@ -0,0 +1,69 @@
from pathlib import Path
from typing import List, Optional
from src.automations.tags import TagManager
from src.yaml_serializer import dump_yaml, load_yaml
from src.yaml_serializer.types import IncludedYaml
from .errors import MissingFile
class HassConfig:
def __init__(self, root_path: Path) -> None:
self.root_path = root_path
@property
def configurations(self) -> dict:
with self.get_configuration_path().open("r") as f:
return dict(load_yaml(f)) # type: ignore
@property
def automations(self) -> List[dict]:
if automation_path := self.get_automation_path():
try:
with automation_path.open("r") as f:
return load_yaml(f) # type: ignore
except FileNotFoundError as err:
raise MissingFile("automations.yaml") from err
return self.configurations["automation"]
@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"
def get_automation_path(self) -> Optional[Path]:
"""Get Automation Path (if not included in configuration.yaml, in this case the return value is None)
Returns:
Optional[Path]
"""
config = self.configurations
if "automation" in config:
automation_ref = config["automation"]
if isinstance(automation_ref, IncludedYaml):
return self.root_path / automation_ref.path_str
else:
return None
return self.root_path / "automations.yaml"
def save_automations(self, automations: List[dict]):
if automation_path := self.get_automation_path():
automation_path.write_text(dump_yaml(automations))
else:
self.get_configuration_path().write_text(
dump_yaml({**self.configurations, "automation": automations})
)
def save_tags(self, tags: TagManager):
tags.save(self.get_automation_tags_path())
+1
View File
@@ -0,0 +1 @@
+41
View File
@@ -0,0 +1,41 @@
import json
from typing import Any, List
def json_dumps(obj: Any) -> str:
"""Serializes a python object into a json string
Args:
obj (Any)
Returns:
str
"""
return json.dumps(normalize_obj(obj))
def normalize_obj(obj: Any) -> Any:
"""Converts any python object to primitive python types
Args:
obj (Any)
Returns:
Any
"""
if hasattr(obj, "to_normalized_json"):
return obj.to_normalized_json()
elif isinstance(obj, dict):
return {normalize_obj(k): normalize_obj(v) for k, v in obj.items()}
elif isinstance(obj, list) or isinstance(obj, tuple):
return list(map(normalize_obj, obj))
elif (
isinstance(obj, str)
or isinstance(obj, int)
or isinstance(obj, float)
or isinstance(obj, bool)
or obj is None
):
return obj
else:
raise TypeError(f"Cannot normalized obj {obj}")
+16
View File
@@ -0,0 +1,16 @@
import logging
from src.env import LOG_LEVEL
if LOG_LEVEL == "DEBUG":
logging.basicConfig(level=logging.DEBUG)
elif LOG_LEVEL == "INFO":
logging.basicConfig(level=logging.INFO)
elif LOG_LEVEL == "WARN":
logging.basicConfig(level=logging.WARN)
elif LOG_LEVEL == "ERROR":
logging.basicConfig(level=logging.ERROR)
else:
logging.basicConfig(level=logging.NOTSET)
logger = logging.getLogger()
+31
View File
@@ -0,0 +1,31 @@
import io
from typing import Any, TextIO, Union
from src.yaml_serializer.base_yaml import yaml
def dump_yaml(obj: Any) -> str:
"""Convert a python object to a hass-compliant yaml string
Args:
obj (Any)
Returns:
str
"""
stream = io.StringIO()
yaml.dump(obj, stream)
stream.seek(0)
return stream.read()
def load_yaml(yaml_stream: TextIO) -> Union[dict, list]:
"""Load yaml from string using some hass-compliant yaml strings
Args:
yaml_stream (io.StringIO)
Returns:
List[dict, list]
"""
return yaml.load(yaml_stream)
+19
View File
@@ -0,0 +1,19 @@
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)
+61
View File
@@ -0,0 +1,61 @@
from typing import NamedTuple
from ruamel.yaml.nodes import Node
from ruamel.yaml.representer import BaseRepresenter
class IncludedYaml(NamedTuple):
"""Any time something in the yaml is specified as `include !filepath`
this data type will represent it.
"""
path_str: str # original node path
@classmethod
def to_yaml(cls, representer: BaseRepresenter, node: "IncludedYaml"):
return representer.represent_scalar("!include", node.path_str)
@classmethod
def from_yaml(cls, _constructor, node: Node):
return cls(node.value)
# TODO: add support for these
NOT_IMPLEMENTED_SV_MSG = "SECRET VALUE NOT IMPLEMENTED"
class SecretValue(NamedTuple):
name: str
value: str
@classmethod
def to_yaml(cls, representer: BaseRepresenter, node: "SecretValue"):
return representer.represent_scalar("!secret", node.name)
@classmethod
def from_yaml(cls, _constructor, node: Node):
return cls(node.value, "n/a")
def to_normalized_json(self):
return NOT_IMPLEMENTED_SV_MSG
class IncludedYamlDir(NamedTuple):
"""
This is a stub for when we see, still need to add support!
- !include_dir_list
- !include_dir_merge_list
- !include_dir_named
- !include_dir_merge_named
"""
original_tag: str # original node name
name: str # original node name
@classmethod
def to_yaml(cls, representer: BaseRepresenter, node: "IncludedYamlDir"):
return representer.represent_scalar(f"!{node.original_tag}", node.name)
@classmethod
def from_yaml(cls, _constructor, node: Node):
return cls(node.tag[1:], node.value)
@@ -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 @@
0:
Type: HA
1:
Type: HA
2:
Type: Button
Room: Living
3:
Type: Button
Room: Kitchen
4:
Type: Button
Room: Kitchen
5:
Type: Button
Room: Kitchen
6:
Type: Button
Room: Kitchen
7:
Type: Button
Room: Living
8:
Type: Button
Room: Baby
9:
Type: Button
Room: Baby
10:
Type: Button
Room: Baby
11:
Type: Routine
Room: Baby
12:
Type: Routine
Room: Baby
13:
Type: Window
Room: Office
14:
Type: Door
Room: Balcony
15:
Type: Routine
16:
Type: Button
Room: Baby
17:
Type: Routine
18:
Type: Routine
19:
Type: Door
Room: Bedroom
20:
Type: Ensure Power
21:
Type: Ensure Power
22:
Type: Motion
Room: Office
23:
Type: Routine
Room: Baby
24:
Type: Climate
Climate: Heat
25:
Type: Climate
Climate: Time
26:
Type: Routine
27:
Type: Button
Room: Bedroom
BadOne: yes
+813
View File
@@ -0,0 +1,813 @@
- 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
@@ -0,0 +1,2 @@
# empty configuration file
cloud:
View File
Whitespace-only changes.
View File
Whitespace-only changes.
+336
View File
@@ -0,0 +1,336 @@
from unittest import TestCase
from fastapi.testclient import TestClient
from ruamel.yaml import YAML
from src.api.app import make_app
from src.automations.types import (
AutomationData,
AutomationMetdata,
ExtenededAutomationData,
)
from tests.utils import HA_CONFIG2_EXAMPLE, get_example_automation_loader
class BaseTestCase(TestCase):
def setUp(self) -> None:
(
self.config_folder,
self.hass_config,
self.automation_loader,
) = get_example_automation_loader()
self.client = TestClient(make_app(self.automation_loader))
class automation_list_tests(BaseTestCase):
test_params = {"total": 28, "subtest2_found_items": 3, "subtest1_found_items": 10}
def test_get_list_of_everything(self):
data = self.client.post(
"/automations/list",
json={
"offset": 0,
"limit": 50,
},
)
self.assertEqual(data.status_code, 200)
d = data.json()
self.assertEqual(
d["params"],
{
"offset": 0,
"limit": 50,
},
)
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(
"/automations/list",
json={
"offset": 0,
"limit": 10,
},
)
self.assertEqual(data.status_code, 200)
d = data.json()
self.assertEqual(
d["params"],
{
"offset": 0,
"limit": 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(
"/automations/list",
json={
"offset": 25,
"limit": 10,
},
)
self.assertEqual(data.status_code, 200)
d = data.json()
self.assertEqual(
d["params"],
{
"offset": 25,
"limit": 10,
},
)
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"], 28)
resp = self.client.post(
"/automations",
json={
"index": 29,
"data": AutomationData(metadata=AutomationMetdata(id="testme")).dict(),
},
)
self.assertEqual(resp.status_code, 200)
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 28})
data = resp.json()
self.assertEqual(data["totalItems"], 29)
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",
json={
"index": 20,
"data": AutomationData(metadata=AutomationMetdata(id="testme")).dict(),
},
)
self.assertEqual(resp.status_code, 200)
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(
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",
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().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",
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().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"], 28)
resp = self.client.delete(
"/automations",
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"], 27)
Whitespace-only changes.
@@ -0,0 +1,59 @@
from unittest import TestCase
from src.automations.loader import load_automation
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",
},
{},
)
)
self.assertEqual(
auto[0],
ExtenededAutomationData(
metadata=AutomationMetdata(
id="1616887975473",
alias="Home Assistant Off",
description="",
mode="single",
),
trigger=[{"platform": "homeassistant", "event": "shutdown"}],
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={},
),
)
@@ -0,0 +1,102 @@
from unittest import TestCase
from src.automations.errors import FailedDeletion, InvalidAutomationFile
from src.automations.types import AutomationMetdata, ExtenededAutomationData
from tests.utils import (
get_dummy_automation_loader,
get_example_automation_loader,
)
class manager_tests(TestCase):
def test_find_limit_and_get(self):
_, _, loader = get_example_automation_loader()
first_auto_with_find = list(loader.find(limit=1))
first_auto_with_get = loader.get(0)
self.assertEqual(first_auto_with_find[0], first_auto_with_get)
def test_find_at_most_with_offset(self):
_, _, loader = get_example_automation_loader()
autos = list(loader.find(limit=10, offset=10))
self.assertTrue(len(autos), 10)
def test_find_invalid(self):
_, _, loader = get_example_automation_loader()
self.assertIsNone(loader.get(-1))
self.assertIsNone(loader.get(1_000))
self.assertIsNone(loader.get(31))
def test_length(self):
_, _, loader = get_example_automation_loader()
self.assertEqual(loader.get_total_items(), 28)
def test_bad_automations_file(self):
folder, _, manager = get_dummy_automation_loader(
[],
automation_in_conifguration_mode="none",
)
(folder / "automations.yaml").write_text("bob is an uncle")
with self.assertRaises(InvalidAutomationFile):
manager.get(0)
def test_create_automation(self):
_, _, manager = get_dummy_automation_loader(
[],
automation_in_conifguration_mode="none",
)
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(), 28)
manager.update(32, ExtenededAutomationData(metadata=AutomationMetdata(id="test1")))
auto = manager.get(28)
self.assertIsNotNone(auto)
self.assertEqual(manager.get_total_items(), 29)
self.assertEqual(auto.metadata.id, "test1") # type: ignore
def test_update_automation(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",
)
auto = manager.get(0)
self.assertEqual(auto.metadata.id, "test1") # type: ignore
manager.update(0, ExtenededAutomationData(metadata=AutomationMetdata(id="toaster-7")))
auto = manager.get(0)
self.assertEqual(auto.metadata.id, "toaster-7") # type: ignore
def test_delete_automation(self):
_, _, 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",
)
self.assertEqual(manager.get_total_items(), 3)
manager.delete(1)
self.assertEqual(manager.get_total_items(), 2)
for auto in manager.find(0, 1000):
self.assertNotEqual(auto.metadata.id, "test2")
def test_failed_deletion_automation(self):
_, _, 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",
)
self.assertEqual(manager.get_total_items(), 3)
with self.assertRaises(FailedDeletion):
manager.delete(10)
@@ -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()
Whitespace-only changes.
@@ -0,0 +1,49 @@
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
from tests.utils import create_dummy_config_folder
class loader_tests(TestCase):
def test_load_automation_from_config_yaml(self):
folder = create_dummy_config_folder(
[AutomationData(metadata=AutomationMetdata(id="test"))],
automation_in_conifguration_mode="inline",
)
hass_config = HassConfig(folder)
self.assertIsInstance(hass_config.configurations, dict)
self.assertTrue("automation" in hass_config.configurations)
self.assertEqual(hass_config.automations[0]["id"], "test")
def test_load_automation_from_config_yaml_include(self):
folder = create_dummy_config_folder(
[AutomationData(metadata=AutomationMetdata(id="test"))],
automation_in_conifguration_mode="include",
)
hass_config = HassConfig(folder)
self.assertIsInstance(hass_config.configurations, dict)
self.assertTrue("automation" in hass_config.configurations)
self.assertEqual(hass_config.automations[0]["id"], "test")
def test_load_automation_from_infer(self):
folder = create_dummy_config_folder(
[AutomationData(metadata=AutomationMetdata(id="test"))],
automation_in_conifguration_mode="none",
)
hass_config = HassConfig(folder)
self.assertIsInstance(hass_config.configurations, dict)
self.assertFalse("automation" in hass_config.configurations)
self.assertEqual(hass_config.automations[0]["id"], "test")
def test_missing_automations(self):
folder = create_dummy_config_folder(
[AutomationData(metadata=AutomationMetdata(id="test"))],
automation_in_conifguration_mode="none",
)
(folder / "automations.yaml").unlink()
hass_config = HassConfig(folder)
self.assertIsInstance(hass_config.configurations, dict)
with self.assertRaises(MissingFile):
list(hass_config.automations)
@@ -0,0 +1,58 @@
import json
from unittest import TestCase
from ruamel.yaml.scalarbool import ScalarBoolean
from ruamel.yaml.scalarfloat import ScalarFloat
from ruamel.yaml.scalarint import ScalarInt
from ruamel.yaml.scalarstring import ScalarString
from src.json_serializer import json_dumps
from src.yaml_serializer.types import NOT_IMPLEMENTED_SV_MSG, SecretValue
class json_serializer_tests(TestCase):
def test_convert_secret_value(self):
self.assertEqual(
json_dumps(
{
"int": 1,
"float": 1.3,
"bool": False,
"list": [1, "w"],
"tup": (1, "w"),
"some": {"deep": {"obj": SecretValue("super", "sec")}},
}
),
json.dumps(
{
"int": 1,
"float": 1.3,
"bool": False,
"list": [1, "w"],
"tup": (1, "w"),
"some": {"deep": {"obj": NOT_IMPLEMENTED_SV_MSG}},
},
),
)
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"),
},
),
)
@@ -0,0 +1,58 @@
import io
from unittest import TestCase
from src.yaml_serializer import dump_yaml, load_yaml
from src.yaml_serializer.types import (
IncludedYaml,
IncludedYamlDir,
SecretValue,
)
from tests.utils import SAMPLES_FOLDER
class dumping_yamls_tests(TestCase):
def test_dumping_includes(self):
yaml = dump_yaml(
{
"automations": IncludedYaml(
"automations.yaml",
)
}
)
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")
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")
def test_load_stub(self):
yaml_obj = load_yaml(
io.StringIO(
"""
name: cool
google_password: !secret gpass
sensor: !include_dir_list sensors/*yaml
automations: !include automations.yaml
"""
)
)
self.assertDictEqual(
dict(yaml_obj),
{
"name": "cool",
"google_password": SecretValue("gpass", "n/a"),
"sensor": IncludedYamlDir("include_dir_list", "sensors/*yaml"),
"automations": IncludedYaml("automations.yaml"),
},
)
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",
)
+103
View File
@@ -0,0 +1,103 @@
from pathlib import Path
from shutil import copytree
from tempfile import mkdtemp
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 / "config"
HA_CONFIG2_EXAMPLE = SAMPLES_FOLDER / "config-2"
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(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(config_to_copy: Path = HA_CONFIG_EXAMPLE) -> Path:
"""Creates a copy of the example config folder
Returns:
Path
"""
root_folder = Path(mkdtemp())
root_folder.rmdir()
copytree(config_to_copy, root_folder)
return root_folder
def get_dummy_automation_loader(
auto: List[AutomationData],
secrets: Optional[dict] = None,
other_config: Optional[dict] = None,
automation_in_conifguration_mode: Literal["include", "inline", "none"] = "include",
) -> Tuple[Path, HassConfig, AutomationManager]:
"""Creates a dummy /config structure for testing and return the loader and config
Args:
auto (List[AutomationData]): automations
secrets (Optional[dict], optional): dictionary of secrets
other_config (Optional[dict], optional): some config stuff to place into configuration.yaml. Defaults to None.
automation_in_conifguration_mode (Literal['include', 'inline', 'none'], optional): whether to !include automation as a separete file or in the configuration yaml. Defaults to inline.
Returns:
Path: [description]
"""
root_folder = create_dummy_config_folder(
auto,
secrets,
other_config,
automation_in_conifguration_mode,
)
hass_config = HassConfig(root_folder)
automation_loader = AutomationManager(hass_config)
return root_folder, hass_config, automation_loader
def create_dummy_config_folder(
auto: List[AutomationData],
secrets: Optional[dict] = None,
other_config: Optional[dict] = None,
automation_in_conifguration_mode: Literal["include", "inline", "none"] = "include",
) -> Path:
"""Creates a dummy /config structure for testing
Args:
auto (List[AutomationData]): automations
secrets (Optional[dict], optional): dictionary of secrets
other_config (Optional[dict], optional): some config stuff to place into configuration.yaml. Defaults to None.
automation_in_conifguration_mode (Literal['include', 'inline', 'none'], optional): whether to !include automation as a separete file or in the configuration yaml. Defaults to inline.
Returns:
Path: [description]
"""
root_folder = Path(mkdtemp())
auto_prims = [a.to_primitive() for a in auto]
configuration_yaml = {**other_config} if other_config is not None else {}
if automation_in_conifguration_mode == "inline":
configuration_yaml["automation"] = auto_prims
elif automation_in_conifguration_mode == "include":
configuration_yaml["automation"] = IncludedYaml(
"automations.yaml",
)
if automation_in_conifguration_mode != "inline":
(root_folder / "automations.yaml").write_text(dump_yaml(auto_prims))
if secrets is not None:
(root_folder / "secrets.yaml").write_text(dump_yaml(secrets))
(root_folder / "configuration.yaml").write_text(dump_yaml(configuration_yaml))
return root_folder
Symlink
+1
View File
@@ -0,0 +1 @@
../webapp/build
+31
View File
@@ -0,0 +1,31 @@
name: Shortumation
version: 0.1.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:
- 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
auth_api: true
map:
- config:rw
options: {}
ports:
8000/tcp: 8000
ports_description:
8000/tcp: Main port for the API & Web.
+9
View File
@@ -0,0 +1,9 @@
version: '3'
services:
addon:
image: "asosnovsky/shortumation-${ARCH:-amd64}:${BUILD_TAG:-latest}"
build:
context: "./"
dockerfile: "./Dockerfile"
args:
- BUILD_ARCH=${ARCH:-amd64}
+7
View File
@@ -0,0 +1,7 @@
version: '3'
services:
addon:
volumes:
- "./sample_config:/config"
ports:
- "8000:8000"
+1
View File
@@ -0,0 +1 @@
<mxfile host="Electron" modified="2021-12-22T03:59:52.849Z" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/13.7.3 Chrome/85.0.4183.98 Electron/10.1.2 Safari/537.36" etag="tLc5i3WharxOLc8-v9Jg" version="13.7.3" type="device" pages="2"><diagram id="jPQkoFvJ-TX3pFbO5KUV" name="autos">7V1bk5s4Fv41rtp5aBfizmM6l9mZ7exkJpNN5qkLg2yzwcgFuNvOrx9oI2wktQ22JATj9EOMwBi+c3TuOpoYb1fbn1N/vfyIQhhPdC3cTox3E10HuuMW/5Uju/2IrVUDizQKq4sOA5+jH7Aa1KrRTRTCrHFhjlCcR+vmYICSBAZ5Y8xPU/TcvGyO4uavrv0FpAY+B35Mj36Nwny5H3Ut7TD+bxgtlviXgVadWfn44mogW/ohej4aMt5PjLcpQvn+02r7FsYleBiX/fc+vHK2frAUJnmbL3x9cr+iHx/m/m/hl49go2lf7t7c2fr+Nk9+vKneuHrafIchSNEmCWF5FzAx7p+XUQ4/r/2gPPtcEL0YW+aruDpNP1X1oE8wzeH2aKh6yp8hWsE83RWXVGdtp0KsYhlgVsfPBwKYXjW2PAK/YK6K8BXRF/W9D7gUHypoOsAEXI2CBYYFo1SHKM2XaIESP35/GL0PNulTjdsBRa04OnzhAaF1dcn/YZ7vqingb3LURLYANN19q77/cvBXeTC18OG77fHJd7vq6FWK5H66gPmpt3as/ZXlq56kXApjP4+emnOGRYXqq59QVDxMTXEPWFPt6J/VoL/lmM0bZmiTBrC6B0HZ+qEuJ7ah3pQwdGJKGBY1JQzAmhKGqCnhKogSITh0jUaplhHHKAFxgoNCyU/C64CaR3H8FsUoffmuEfrQnQfFeJan6Ds8OmMHLpzNizN+HC2SYiwooIWpPI60GFAL40eTQjqHq3UhliBfuC3ohiYLblefGbYthpNrSdwXuhaFbpYX0Gb/issfn36P8mAJk58muu2vSgCTWbZ+gUKbTqe9CwaTZFYGnMCQiadN4ZmgXLZckCRypTIqoOXARL/niux8PtcDJrKhPbMtXiLAbVpBOsMK1lkaXxiyDoXsli+ubgDZuM5cy7RO2rIdcLUIWeAyjASWjSDOtxglrjroGVdskA4cVxMQuJo942oACsXzrnBv3i+MZy9BlxLwKPBj0i1/lUJ7J/MUf1Xy8KwbrXsTzl70dfOCluN5tLrSSvbToCKdyctmI8S0Tqs/wOJ7Ya4cNln+8XzvDpPvbeMC+nEO4W2j/NvR5yNSFkcHSpYHu2Oy8gz7nSew15LAhlL0xY99KiJV3CZaZ7CFPMvW+2zCPNqWFO/Hu6KEYN8+gEH7rd8okIuXywk0yQAUlkpvqhOrKAz38hJm0Q9/9nKrkovXZZD35S2s+4n1rrxXMauy/QQDFP4JSiBBrGqIh0ZyCGLoPRODVuQULbLvMA+Wx2DC9P0T3GP6gh/OSpUXhH62rOXbEf3Ogjwpzf/yrxiP/RmMPxU0yiPEJPoDccEM5TlaMbgiL8XqPdrkcZQUv44TfBqLo4r3WJfvvNouykTkFM3nUQCnAUoCuM6z6XNa/FyyeFzDJIhiPgxRh4xOcAT2ghqmuSWII7B4OMURi0KLrdu/fJ1ZrSbl5Dh52cJu07W+7Tad9q9D+FQwBwUNX4v3NIXOM1l/hm6L1M5NrrSXK9cyAk6SEhOLEcKWKWsM2twarCnAiUJN+4DhsEo1D6wWeWzRysAjmNbo3Yu36PxA9lxmr6b5Jk0eJ7odlxw7S4tPi/ITSq7OYF2mKmr6KawqLDoveFMVvFVFB0ZQU1VYI/IaOVFIMVXRwpMUrSqApjW5ti7K6U+60YbwCoaR/7iO/R1Mp7SyKE889qQunFcooZK6aBGiu6mLa9VFe0ZQU11g9huvuuhMIbXUhU1XNQ4xs26QCse0W+EqLLNu09Z0NOcLrJTSJYcE1jEoYE0GsOKq7VwKxcFX759N49kVN59N42EzR5E8nk17CxlMMpTiKtPH5WalQFGp45Fcrk97LyulDflks4JpFNC26ksBL1fpIqc22iGTogzpIrXk1KatWhiPQnDrmsdgaami29EpcClgZUcxddNkzXSprpRDR3cVjWPWFFTYMXVYVeM3x5SvY9qBEdR0TB3aPh+XY9qdQmo5pmNcpXvWznfa1iHj1Jcidr5D26owzvhapP2YTQZrwbpMo8llGU1DXATlXLj4QZyEoc2uIYa+bJfwofpeBOXSTv8gcXW8Jr/ixV294arA4rKD28ANZnINn9XO8BAHMx0CCJYIcdZmPS31t+0mU7Oq0B0gUb15ClQ2mUTtr87of1DXvjZ4UFwHBJtCYbjW70nCn7WJq+vOmsS4/ZHoBjc6sUz+zqtjxfgm+2cV1tSmReb9ygD66anaKfgjeeLQjkgPTVqEAirV+8BadkBJiGuhxpqS8ANpPSm3Fwadp29m0vhn0TgBCcBZJFkN4MQhSTvUo+ZcRumdXM59NbtRc+5QWJcBpVTW1VnGsgKxIF5wE4Ki5/iQTieSFIhjcMKaSLy3XIwsrsELnY4ZLdZO31jT8bkxSRGn2WvLa4e2MCnitUhHiw5wkGU27FoQyZ6aZ1E4jC3EwT1Jp2xEgiVSZJh0eHKpHJLwBhWTuAhRqTEJj86DDDMm0R5qNWMSHh2I7Ccm0RlI5WISWCINJShxLev2HpTQGPG0fqISVzNv31EJoNERNYUdiu54qxWWAJqSdSucwFYsLgG0AQWBrgW778AE0FgtKMYjSBSLTABtTEUGbUtsvbZL6Ry1WmICjdXYQYHJ0b3VHtVrz+19JrDapI0CW5Z1KBlbVrnKKLBl1YbLxRbv4/BP72MNQNtG1vVaNFXEOmPLCBVbuBNVumbvDX0A8G68v+doc6i8byjQxl26AVpT4Ty9DMXohZ98TG3ZScHWuy2q05HJwa5M7a5mHIIaet/UYMU2CWLcVpOLbMxORgQZLCF15ThgVuERLCG6ooOQWhbDE5FsjjGq5fprzX6gkcKNKgCj6O0mW3h3qujCCmq2qgCMgr3BWgS8aKRWswrQZsMi0TqB3MbZtFhVfpJlnEG7DFcXP12qE7xXkFZJJxi09X/TCfx1QntWUFQnGLRfMjad0JlGiukE45IA5eCjW1jgt4huVZNDlejWgDvLXrIZ5TU0ttrSGLeXFl0Cb5NRAtz+DN9i/1LCCuCBPdzJLox5rPmd8eT9iX6/M+/e/Io+peHu4Q60Zh3u4uEV1iFKUy2H0AivrJ04z4OebB5sEZ4XvvUH8BT0Qhhd7tXd/eNAR5UdFdxu5eaoiHRUOrCCoo6KTUfLR+aodKeRYo6KrcISVatZHGuZdCd42RKODs8r2pb7QEGlNUaLRaI3jXG1xuhclq6cxqALncemMbovHVBLYzisKPUga3oNLITqwAG7NYJUdFmm9RDRdd0muBbeNLA/aBXtoNS9mzZhL9mgd5mggBUJNECakSatzeSaPYydJhSOPThDsCSdmyUpwZLswAqKWpKMbSlGZkl2p5FqluR4Vt6ZhOqx5Rk7+h/G/d0vyS+/z379r2s/fPnffx7+umPZ6JL1sUXspqJEMsCgFTKPBv9nFe5JIqmsbo2buuWqbq9khFeULXPHUrk1SSNSt3xo1FS2wJEYWjiVfB/R+i1y9yMLryA6ghjXVDa6IXEoI2JCPNwljZfUgcAkfJOmL3K9mkrFyIeohExEkdEpphZdJ+KQa26wfde5ToSs03Y9sl0nv0oRJmKX9H3hwJY1qwSxn2VR0OAW4eWKTCRaL53m3w2mHZfZpC7g18n1FCDnNnIcmpYg9nKzNVoRi9rcnQnzcHsfD1VLSOrFfLlw5yYKCqj93dFllZUsQFiwOlLd/EJ5a6NtvCVkbZLY4pzA4jBFKD/moPJFP6IQllf8DQ==</diagram><diagram id="7X2k5OJ-jCNTzSic57L4" name="Page-2">5Zlbc9o8EIZ/DZdhZMnGcJlAekyaTunXdnrTUWxhayJbrixO/fXfCsuAEU1IG4cwhQvs1cl63vVqJTpkmC1eK1qk1zJmooNRvOiQUQdjD5E+/BjLsrL0kDUkise20sYw5r9Y3dJapzxmZaOillJoXjSNkcxzFumGjSol581qEymaoxY0YY5hHFHhWr/yWKeVtY/Djf0N40laj+z1BlVJRuvKdiZlSmM53zKRyw4ZKil1dZUthkwYeDWXvr794NPPfoh+RFdfxvLbMsJnVWevHtNkPQXFcv3HXY9wcF32hmefv7+ek7dSq7dfRmeexTCjYmqB2cnqZU1QyWkeM9ML6pCLeco1Gxc0MqVz8BmwpToTcOfB5YQLMZRCqlVbMgnMF+ylVvKObZX0Vh/TQuZ6y159wG4fjCnNFjtSPsDBW4sDXs1kxrRaQjvbi2/ltP5MQns/33gHRtaWbnnG2kitRybrrjfU4cKCf4QI/r+uweBQCfpPIMHexyWOBFd8xvMEbJ+kzODnYqq1zO8RxntYmLZw9ps4vT08PbyHp98WTtejbyYTDlQwupaaG47o5oXCDJswfXxsmMEhMCeT06C5J9o+L83eATSvmaYngTN4Tufcu3a5gdMBlwC54rdAbN5Hb+vqqJWQ6B/b77AD6j3XUcry51xbfi+hC/JoLuWSasGlHkPC+lDYDVwf8gKXDH4CMuLupxz9t/hYTNOrAH8IZrPRO5vg30umvGPgVTZPLCTPNVOXM5h2af1kvYsxFWJapuuscsuZmpliLnPmppUBMl+wC3rLxEdZ8lX0JKOImUGhwEjDYSd2tVPhVoK7Z1sVzgVPTIGWxqnlVAuew+j1htAMQm2Vdecwj8LMOVskZuPalaso3gXLine truncated
+3
View File
@@ -0,0 +1,3 @@
name: Shortumations
url: "https://github.com/asosnovsky/Shortumation"
maintainer: Ari Sosnovsky <ariel@sosnovsky.ca>
Executable
+4
View File
@@ -0,0 +1,4 @@
#!/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: Generic
1:
Type: Generic
2:
Type: Climate
Room: House
4: {}
3:
Type: Vent
Room: Bathroom
Floor: First
5: {}
+66
View File
@@ -0,0 +1,66 @@
- id: '1616887975473'
alias: Home Assistant Off
description: ''
trigger_variables:
mode: single
trigger:
- platform: homeassistant
event: shutdown
- $smType: trigger
platform: device
device_id: ''
domain: ''
type: ''
subtype: ''
condition: []
action:
- device_id: 2a98db84af7526c7ec3cc7aebd1a9e1c
domain: mobile_app
type: notify
title: Hassio Status
message: Hassio Is turning off...
- choose: []
default: []
alias: choose better days
- id: '1616888026264'
alias: Home Assistant On
description: ''
trigger_variables:
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- device_id: 2a98db84af7526c7ec3cc7aebd1a9e1c
domain: mobile_app
type: notify
title: Hassio Status
message: Home assistant is up!
- id: shortu-2
alias: Neat trick
description: ''
mode: queued
trigger: []
condition: []
action:
- alias: Choose
default:
- condition: and
alias: ''
conditions:
- condition: or
conditions: []
choose: []
- service: lights.turn_on
target:
entity: bear
data: {}
- id: shortu-3
alias: Bathroom Vent
description: Turn the vent on when the humidity is high or it's smelly
trigger_variables:
mode: single
trigger: []
condition: []
action: []
+2
View File
@@ -0,0 +1,2 @@
# empty configuration file
cloud:
-3
View File
@@ -1,3 +0,0 @@
{
"typescript.tsdk": "node_modules/typescript/lib"
}
-53
View File
@@ -1,53 +0,0 @@
{
"dependencies": {
"parcel": "^2.0.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-router-dom": "^5.3.0"
},
"devDependencies": {
"@parcel/transformer-sass": "^2.0.0",
"@parcel/transformer-yaml": "^2.0.0",
"@types/jest": "^27.0.2",
"@types/node": "^16.11.6",
"@types/react": "^17.0.33",
"@types/react-dom": "^17.0.10",
"@types/react-router-dom": "^5.3.2",
"concurrently": "^6.3.0",
"husky": "^7.0.4",
"jest": "^27.3.1",
"jest-dom": "^4.0.0",
"jest-extended": "^1.1.0",
"prettier": "^2.4.1",
"react-test-renderer": "^17.0.2",
"react-testing-library": "^8.0.1",
"ts-jest": "^27.0.7",
"tslint": "^6.1.3",
"tslint-react": "^5.0.0",
"typescript": "^4.4.4"
},
"scripts": {
"develop": "concurrently -r \"npm:type-check:watch\" \"npm:start\"",
"start": "parcel ./src/index.html",
"build": "npm run type-check && parcel build ./src/index.html --public-url '/'",
"prettify": "prettier --write './src/**/*.{ts,tsx}'",
"test": "jest",
"test:watch": "jest --watch",
"type-check": "tsc --noEmit",
"type-check:watch": "tsc --noEmit --watch"
},
"jest": {
"preset": "ts-jest",
"moduleFileExtensions": [
"ts",
"tsx",
"js"
],
"setupFilesAfterEnv": [
"<rootDir>/src/setupTests.ts"
],
"moduleNameMapper": {
".+\\.css$": "<rootDir>/src/styleMock.ts"
}
}
}
@@ -1,17 +0,0 @@
import { useState } from "react";
export abstract class BaseStateManager<T> {
abstract defaultState(): T ;
abstract isReady(): boolean;
abstract renderOptionList(): JSX.Element;
public state: T;
public setState: (s:T) => void;
constructor(){
[this.state, this.setState] = useState(this.defaultState());
}
}
@@ -1,47 +0,0 @@
import { ServiceScript } from "../types/script";
import { BaseStateManager } from "./BaseManager";
export class ScriptCallService extends BaseStateManager<ServiceScript> {
defaultState(): ServiceScript {
return {
service: "",
alias: "Call Service",
target: "",
data: {},
}
}
isReady(): boolean {
return this.state.service !== '' &&
this.state.alias !== '' &&
this.state.target !== ''
}
renderOptionList(): JSX.Element {
return <div className="state-manager-options">
<label htmlFor="#alias">Description</label>
<input id="alias" value={this.state.alias} onChange={e => {
e.preventDefault();
this.setState({
...this.state,
alias: e.target.value,
})
}}/>
<label htmlFor="#service">Service</label>
<input id="service" value={this.state.service} onChange={e => {
e.preventDefault();
this.setState({
...this.state,
service: e.target.value,
})
}}/>
<label htmlFor="#target">Target</label>
<input id="target" value={this.state.target} onChange={e => {
e.preventDefault();
this.setState({
...this.state,
target: e.target.value,
})
}}/>
</div>
}
}
-58
View File
@@ -1,58 +0,0 @@
import { AutomationTime } from "./common";
interface BaseCondition {
alias: string;
};
export interface LogicCondition extends BaseCondition {
condition: 'and' | 'or' | 'not';
conditions: AutomationCondition[];
}
export interface NumericCondition extends BaseCondition {
condition: 'numeric_state';
entity_id: string;
above?: string;
below?: string;
attribute?: string;
value_template?: string;
}
export interface StateCondition extends BaseCondition {
condition: 'state';
entity_id: string | string[];
state: string | string[];
for?: AutomationTime | string;
attribute?: string;
}
export interface TemplateCondition extends BaseCondition {
condition: 'template';
value_template: string;
}
export interface TimeCondition extends BaseCondition {
condition: 'time';
after?: string;
before?: string;
weekday?: Array<'mon' | 'tue' | 'wed' | 'thu' | 'fri' | 'sat' | 'sun'>;
}
export interface TriggerCondition extends BaseCondition {
condition: 'trigger';
id: string | string[];
}
export interface ZoneCondition extends BaseCondition {
condition: 'zone';
zone: string;
entity_id: string | string[];
state: string | string[];
}
export interface GenericCondition extends BaseCondition {
condition: string;
}
export type AutomationCondition =
| string // <-- this is the same as "TemplateCondition"
| LogicCondition
| NumericCondition
| StateCondition
| TemplateCondition
| TimeCondition
| TriggerCondition
| ZoneCondition
| GenericCondition
;
-21
View File
@@ -1,21 +0,0 @@
import { AutomationCondition } from "./condition";
import { AutomationScript } from "./script";
import { AutomationTrigger } from "./triggers";
export interface Automation {
id: string;
alias: string;
description: string;
trigger_variables: Record<string, string>;
mode: "single" | "restart" | "queued" | "parallel";
trigger: AutomationTrigger[];
condition: AutomationCondition[];
action: AutomationAction[];
}
export type AutomationNodeTypes = Pick<Automation, 'trigger' | 'condition' | 'action'>;
export type AutomationNodeType = keyof AutomationNodeTypes;
export type AutomationAction = AutomationScript | AutomationCondition;
export type AutomationNode<T extends AutomationNodeType> =
AutomationNodeTypes[T][number];
-48
View File
@@ -1,48 +0,0 @@
import { AutomationCondition } from "./condition";
interface BaseScript {
alias: string;
variables?: Record<string, any>;
}
export interface ServiceScript extends BaseScript {
service: string;
target: any;
data: any;
}
export interface RepeatScript extends BaseScript {
repeat: {
count: number;
sequence: AutomationScript[];
}
}
export interface WaitScript extends BaseScript {
wait_template: string;
timeout?: number;
continue_on_timeout?: boolean;
}
export interface FireEventScript extends BaseScript {
event: string;
event_data: any;
}
export interface DeviceScript extends BaseScript {
type: string;
device_id: string;
entity_id: string;
domain: string;
}
export interface ChooseScript extends BaseScript {
choose: Array<{
conditions: AutomationCondition[];
sequence: AutomationScript[];
}>;
default: AutomationScript[];
}
export type AutomationScript =
| ServiceScript
| RepeatScript
| WaitScript
| FireEventScript
| DeviceScript
| ChooseScript
;
-112
View File
@@ -1,112 +0,0 @@
import { BaseStateManager } from "./StateManager/BaseManager";
import { ScriptCallService } from "./StateManager/ScriptService";
import { AutomationNode, AutomationNodeType } from "./types";
export const triggerTypes = [
'Event',
'Home Assistant',
'MQTT',
'Numeric State',
'State',
'Tag',
'Template',
'Time',
'Time Pattern',
'Webhook',
'Zone',
'Device',
] as const;
export type TriggerType = typeof triggerTypes[number];
export const conditionTypes = [
'And' ,
'Or' ,
'Not',
'Numeric State',
'State',
'Template',
'Time',
'Trigger',
'Zone',
] as const;
export type ConditionType = typeof conditionTypes[number];
export const scriptTypes = [
'Service',
'Repeat',
'Wait',
'Event',
'Device',
'Choose'
] as const;
export type ScriptType = typeof scriptTypes[number];
export type NodeStateType<T> =
T extends 'action' ? ScriptType :
T extends 'condition' ? ConditionType :
T extends 'trigger' ? TriggerType :
never;
export const typeList = {
'action': scriptTypes,
'condition': conditionTypes,
'trigger': triggerTypes,
} as const;
export const useNewNodeState = <T extends AutomationNodeType>(
node_type: T,
node_subtype: NodeStateType<T>
) : BaseStateManager<AutomationNode<T>> => {
if ( node_type === 'action') {
switch (node_subtype) {
case 'Service':
return new ScriptCallService() as any;
// case 'Repeat':
// return {
// repeat: {
// count: 0,
// sequence: [],
// }
// }
// case 'Wait':
// return {
// wait_template: ""
// }
// case 'Event':
// return {
// event: "",
// event_data: {}
// }
// case "Device":
// return {
// type: "",
// device_id: "",
// entity_id: "",
// domain: "",
// }
// case "Choose":
// return {
// choose: [],
// default: [],
// }
}
}
// else if (node_type === "condition") {
// if (node_subtype in ['And', 'Or', 'Noe']) {
// return {
// condition: node_subtype.toLowerCase(),
// conditions: [],
// }
// } else if (node_subtype === 'Numeric State') {
// return {
// condition: "numeric_state",
// entity_id: ""
// }
// } else if (node_subtype === 'State') {
// return {
// condition: "state",
// entity_id: "",
// state: "",
// }
// }
// }
throw new Error(`Invalid or Not implemented node type ${node_type} -> ${node_subtype}`)
}
-30
View File
@@ -1,30 +0,0 @@
import { AutomationNode } from "./types";
export const getNameFromAction = (action: AutomationNode): string => {
if(typeof action === 'string') {
return action;
}
if ('alias' in action && action.alias){
return action.alias;
}
if ('service' in action) {
return action.service
}
if ('repeat' in action) {
return 'Repeat'
}
if ('wait_template' in action) {
return 'Wait'
}
if ('event' in action) {
return action.event
}
if ('type' in action) {
return 'Device ' +action.type
}
if ('choose' in action) {
return 'Choose'
}
return 'n/a'
}
@@ -1,34 +0,0 @@
import { useState } from "react";
import { AutomationNodeType, AutomationNodeTypes } from "../../automation/types";
import { typeList } from "../../automation/useNodeState";
import InputList from "../InputList";
import InputWrapper from "../InputWrapper";
export interface Props<T extends AutomationNodeType> {
node_type: T,
onClose: () => void,
onCreate: (newnode: AutomationNodeTypes[T]) => void,
}
export default function NewNodeModal<T extends AutomationNodeType>({
node_type,
onClose,
onCreate,
}: Props<T>) {
const [selectedSubType, setSubType] = useState<string>(typeList[node_type][0]);
return <div className="new-node-modal">
<div className="new-node-modal--background" onClick={() => onClose()}></div>
<div className="new-node-modal--inner" onClick={e => e.preventDefault()}>
<div className="new-node-modal--title">Create {node_type[0].toUpperCase()}{node_type.slice(1)}</div>
<div className="new-node-modal--body">
<InputWrapper label="Type:">
<InputList options={typeList[node_type]} current={selectedSubType} onChange={n => setSubType(n)}/>
</InputWrapper>
</div>
<div className="new-node-modal--footer">
<button className="secondary" onClick={() => onClose()}>Close</button>
<button onClick={() => onCreate({} as any)}>Create</button>
</div>
</div>
</div>
}
@@ -1,87 +0,0 @@
import { useState } from "react";
import * as types from "../../automation/types";
import { getNameFromAction } from "../../automation/utils";
import AutomationNode from "../Node";
import NewNodeModal from "./NewNodeModal";
export interface Props {
automation: types.Automation;
}
export default function AutomationEditor({ automation }: Props) {
// state
const [modalState, setModalState] = useState<types.AutomationNodeType | null>(null);
const [state, setState] = useState(automation);
// helper state functions
const addNode = <T extends types.AutomationNodeType>(node_type: T, node: types.AutomationNodeTypes[T]) => {
const nodes: types.AutomationNode[] = state[node_type];
setState({
...state,
[node_type]: nodes.concat([node as any])
});
}
const removeNode = <T extends types.AutomationNodeType>(node_type: T, node_id: number) => {
const nodes: types.AutomationNode[] = state[node_type];
setState({
...state,
[node_type]: nodes
.slice(0, node_id)
.concat(
nodes.slice(
node_id + 1,
nodes.length
)
)
});
}
// helper element functions
const makeChild = (node_type: types.AutomationNodeType) => {
const nodes: types.AutomationNode[] = state[node_type];
return [
<div className="automation-box--elm-list" key="list">
{state[node_type].map((n, i) => (
<AutomationNode
key={i}
title={getNameFromAction(n)}
showX={false}
initialOpenState={false}
onXClick={() => removeNode(node_type, i)}
/>
))}
</div>,
<button
key="btn"
className="elm-list"
onClick={() => setModalState(node_type)}
>
Add +
</button>
];
}
return <div className="automation-editor">
<AutomationNode
title={`${automation.alias} (${automation.mode})`}
initialOpenState={true}
showChildren={true}
showX={false}
>
<div className="automation-editor--root">
<h4>Trigger</h4>
{makeChild("trigger")}
<h4>Condition</h4>
{makeChild("condition")}
<h4>Actions</h4>
{makeChild("action")}
</div>
</AutomationNode>
{modalState && <NewNodeModal
node_type={modalState}
onClose={() => setModalState(null)}
onCreate={node => {
addNode(modalState, node);
setModalState(null);
}}
/>}
</div>
}
-18
View File
@@ -1,18 +0,0 @@
import { SelectHTMLAttributes } from "react";
export interface Props {
current: string;
options: readonly string[];
onChange: (n: string) => void;
id?: string;
className?: string;
}
export default function InputList({current, options, onChange, ...selattr}: Props) {
return <select {...selattr} value={current} onChange={e => {
e.preventDefault();
onChange(e.currentTarget.value);
}}>
{options.map((t, i) => <option id={String(i)} key={i}>{t}</option>)}
</select>
}
-12
View File
@@ -1,12 +0,0 @@
import { PropsWithChildren } from "react";
export interface Props {
label: string;
}
export default function InputWrapper({label, children}: PropsWithChildren<Props>) {
return <div className="input-wrapper">
<label>{label}</label>
{children}
</div>
}
-42
View File
@@ -1,42 +0,0 @@
import { PropsWithChildren, useState } from "react";
export interface Props {
title: string;
showX?: boolean;
showChildren?: boolean;
initialOpenState?: boolean;
onXClick?: () => void;
}
export default function AutomationNode({
children,
title,
showX=false,
showChildren=false,
initialOpenState=false,
onXClick = () => {},
}: PropsWithChildren<Props>) {
const [isOpen, setOpen] = useState(initialOpenState);
console.log(children);
return <div className="automation-node">
<div className="automation-node-inner">
<div
className="automation-node-inner-edge left"
onClick={() => onXClick()}
>
{showX && (
<div className="automation-node-side-button">X</div>
)}
</div>
<div className="automation-node-inner-text">{title}</div>
<div
className="automation-node-inner-edge right"
onClick={() => setOpen(!isOpen)}
>
{showChildren && <div className="automation-node-side-button">{isOpen ? "▲" : "▼"}</div>}
</div>
</div>
{showChildren&&<div className={`automation-node-children ${isOpen ? "open" : "closed"}`}>
{children}
</div>}
</div>
}
-31
View File
@@ -1,31 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta
content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"
name="viewport"
/>
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="mobile-web-app-capable" content="yes" />
<meta name="application-name" content="MurderFriends" />
<meta name="apple-mobile-web-app-title" content="MurderFriends" />
<meta name="msapplication-starturl" content="/" />
<meta
name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no"
/>
<link rel="stylesheet" href="styles/index.scss" />
<title>Shortumation</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="app"></div>
<script src="main.tsx" type="module"></script>
</body>
</html>
-6
View File
@@ -1,6 +0,0 @@
import ReactDOM from "react-dom";
import App from "./router";
const app = document.getElementById("app");
ReactDOM.render(<App />, app);
-22
View File
@@ -1,22 +0,0 @@
import AutomationEditor from "../components/AutomationEditor";
import sample from "../sample/auto_01.yaml";
console.log(sample)
export function Home() {
return (
<div id="page--home" className="page">
<div
style={{
display: "flex",
flexDirection: "row",
justifyContent: "space-around",
alignItems: "center",
width: "100vw"
}}
>
<AutomationEditor automation={sample}/>
</div>
</div>
);
}
-17
View File
@@ -1,17 +0,0 @@
import React from "react";
import { BrowserRouter as Router, Switch, Route, Link } from "react-router-dom";
import { Home } from "./pages/Home";
export default function App() {
return (
<Router>
<div>
<Switch>
<Route path="/">
<Home />
</Route>
</Switch>
</div>
</Router>
);
}
-31
View File
@@ -1,31 +0,0 @@
alias: On Balcony Door Open
description: "Determines what to do when the door opens..."
trigger:
- type: opened
platform: device
device_id: bad6b55ae91b7ced810fd5310c0a0fce
entity_id: binary_sensor.door_balcony
domain: binary_sensor
condition: []
action:
- choose:
- conditions:
- condition: template
value_template: "{{ states('switch.plug_out_bug_lamp') == 'unavailable' }}"
sequence:
- type: turn_on
device_id: 03065414e37dafc42ce0597f5458a084
entity_id: switch.plug_balcony_power
domain: switch
- wait_template: "{{ states('switch.plug_out_bug_lamp') != 'unavailable' }}"
timeout: "00:05:00"
- type: turn_on
device_id: 687cb5b66de19eaab5eb64cbaad90c58
entity_id: switch.plug_out_bug_lamp
domain: switch
default:
- type: turn_on
device_id: 687cb5b66de19eaab5eb64cbaad90c58
entity_id: switch.plug_out_bug_lamp
domain: switch
mode: single
-3
View File
@@ -1,3 +0,0 @@
import 'jest-extended'
import 'jest-dom/extend-expect'
import 'react-testing-library/cleanup-after-each'
-1
View File
@@ -1 +0,0 @@
module.exports = {}
-9
View File
@@ -1,9 +0,0 @@
$primary: #111111;
$secondary: #1c1c1c;
$primary-accent: #bbbbbb;
$secondary-accent: #929191;
$font-color-primary: #e1e1e1;
$green: #68caa4;
$blue: #68aaca;
@@ -1,17 +0,0 @@
.automation-editor {
&--root {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}
button.elm-list {
width: 90%;
}
&--elm-list {
max-height: 300px;
overflow-y: auto;
overflow-x: hidden;
padding: 5%;
}
}
@@ -1,69 +0,0 @@
.automation-node {
display: flex;
flex-direction: row;
&-inner {
padding: 10px;
border-radius: 25px;
background-color: $secondary;
max-width: 200px;
max-height: 75px;
min-width: 200px;
min-height: 75px;
display: flex;
flex-direction: row;
flex-wrap: nowrap;
justify-content: space-around;
&-text {
flex: 2;
display: flex;
text-align: center;
justify-content: center;
align-items: center;
}
&-edge {
flex: 1;
border-radius: 30px;
display: flex;
flex-direction: column;
flex-wrap: nowrap;
justify-content: space-around;
align-items: center;
&.left {
border-left: 1px $secondary-accent solid;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
&.right {
border-right: 1px $secondary-accent solid;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
&:hover {
background-color: $primary-accent;
cursor: pointer;
}
}
}
&-children {
min-width: 250px;
padding: 2.5px;
&.closed {
height: 0;
width: 0;
display: none;
}
&.open {
border-radius: 25px;
border-color: $secondary-accent;
border-width: 1px;
border-style: solid;
display: flex;
flex-direction: column;
}
}
}
@@ -1,7 +0,0 @@
.input-wrapper {
display: flex;
flex-direction: column;
label {
font-size: 12px;
}
}
@@ -1,45 +0,0 @@
.new-node-modal {
position: absolute;
display: flex;
justify-content: center;
align-items: center;
width: 100vw;
height: 100vh;
left: 0;
top: 0;
&--background {
position: absolute;
z-index: 0;
width: 100vw;
height: 100vw;
background-color: rgba($secondary, 0.5);
}
&--inner {
z-index: 1;
max-width: 80%;
max-height: 60%;
min-height: 200px;
min-width: 200px;
border-radius: 20px;
padding: 15px;
display: flex;
flex-direction: column;
background-color: $primary;
border: 1px solid $primary-accent;
}
&--title {
text-align: center;
padding: 10px;
font-weight: bold;
}
&--body {
flex-grow: 1;
}
&--footer {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
}
-4
View File
@@ -1,4 +0,0 @@
@import "./AutomationNode.scss";
@import "./AutomationEditor.scss";
@import "./NewNodeModal.scss";
@import "./InputWrapper.scss";
-105
View File
@@ -1,105 +0,0 @@
@import "./colors.scss";
@import "./pages/index.scss";
@import "./utils.scss";
@import "./components/index.scss";
html,
body,
#app {
margin: 0;
padding: 0;
height: 100vh;
width: 100vw;
overflow: hidden;
font-family: Tahoma, Geneva, sans-serif;
background-color: $primary;
display: grid;
align-items: center;
justify-items: center;
color: $font-color-primary;
}
.row {
display: flex;
flex-direction: row;
}
.col {
display: flex;
flex-direction: column;
}
.center {
display: flex;
justify-content: center;
align-items: center;
}
h1,
h2,
h3,
h4,
h5 {
justify-content: center;
align-items: center;
display: flex;
text-align: center;
}
/* width */
::-webkit-scrollbar {
width: 10px;
}
/* Track */
::-webkit-scrollbar-track {
background: $secondary;
}
/* Handle */
::-webkit-scrollbar-thumb {
background: $secondary-accent;
}
/* Handle on hover */
::-webkit-scrollbar-thumb:hover {
background: $primary-accent;
}
:root {
touch-action: pan-x pan-y;
height: 100%;
}
button {
background-color: $secondary;
color: $primary-accent;
border-color: $primary-accent;
&:hover {
background-color: $primary;
border-color: $secondary-accent;
}
&.secondary {
background-color: $primary;
color: $secondary-accent;
border-color: $secondary-accent;
&:hover {
background-color: $secondary;
border-color: $primary-accent;
}
}
border-style: solid;
border-width: 1px;
padding: 2.5%;
margin-left: 5%;
margin-right: 5%;
border-radius: 5px;
cursor: pointer;
}
select {
@extend button;
margin: 0;
}
-4
View File
@@ -1,4 +0,0 @@
#page--home {
align-items: center;
justify-content: center;
}
-18
View File
@@ -1,18 +0,0 @@
@import "./Home.scss";
.page {
height: 100vh;
width: 100vw;
overflow: hidden;
font-size: 16px;
color: $font-color-primary;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
> div {
flex: 1;
}
}
-9
View File
@@ -1,9 +0,0 @@
.box {
background-color: $secondary;
max-width: 80%;
max-height: 30%;
min-width: 80%;
min-height: 30%;
border-radius: 10px;
padding: 10px;
}
Loaded 100 of 255 files, more files were not shown because too many files have changed in this diff. Show more