Compare commits

...
Author SHA1 Message Date
renovate[bot] 1d3242bba0 Update dependency ws to v8.17.1 [SECURITY] 2026-03-30 17:43:11 +00:00
renovate[bot] f061894430 Update dependency types-PyYAML to v6.0.12.20240311 (#185) 2024-05-02 14:08:40 -04:00
renovate[bot] 7769ba00c3 Update dependency fastapi to v0.109.1 [SECURITY] (#188) 2024-05-02 14:07:19 -04:00
renovate[bot] 18241c2057 Update dependency pydantic to v1.10.13 [SECURITY] (#189) 2024-05-02 09:47:50 -04:00
Ari Sosnovsky 8b516d958c Update README.md 2023-12-20 17:51:32 -05:00
Ari Sosnovsky 6422b8d974 Update README.md 2023-12-20 17:50:31 -05:00
dependabot[bot] ee77edea78 Bump deep-object-diff from 1.1.7 to 1.1.9 in /webapp (#171) 2022-11-16 23:52:14 -05:00
dependabot[bot] 4d667d1432 Bump loader-utils from 1.4.0 to 1.4.2 in /webapp (#170) 2022-11-16 23:51:46 -05:00
renovate[bot]andAri Sosnovsky 3df79c17d6 Update dependency @types/react to v18.0.25 (#167)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Ari Sosnovsky <asosnovsky@users.noreply.github.com>
2022-11-06 19:56:18 -05:00
renovate[bot] 5b920d366e Update dependency @types/react-dom to v18.0.8 (#168)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-11-06 19:55:45 -05:00
renovate[bot] 201912f471 Update dependency material-ui-confirm to v3.0.6 (#165) 2022-10-11 23:42:58 +03:00
renovate[bot] 117595f63f Update dependency @types/react to v18.0.21 (#164) 2022-10-11 23:38:39 +03:00
ari a5aec24686 fix 2022-09-24 15:15:54 -04:00
ari 8a6415a58b linting fix 2022-09-24 15:15:44 -04:00
ari d7ca62afa7 fixed visual bugs 2022-09-24 15:12:22 -04:00
ari 8fea6f1082 Hidable triggers/conditions 2022-09-24 14:24:03 -04:00
ari 51bac6f0e9 v0.7.6 2022-09-07 12:22:44 -04:00
ari 7020c6aee9 silent 2022-09-07 12:10:25 -04:00
ari 41dc77ff4f silencing invalid errors 2022-09-06 20:53:49 -04:00
ari c5cf8edfd6 update notice 2022-09-06 20:38:18 -04:00
ari 2dca59fa3f update notice 2022-09-06 20:38:07 -04:00
ari df95265af0 update notice 2022-09-06 20:38:00 -04:00
ari 78057939da clean up 2022-09-05 15:11:59 -04:00
ari a4a607768a rename 2022-09-05 15:09:41 -04:00
ari a9b2bdb775 minor refactor 2022-09-05 15:06:28 -04:00
ari eee37346ab v0.7.5 2022-09-02 16:06:34 -04:00
ari 6ee7ce8f70 ignoring non yaml 2022-09-02 15:45:16 -04:00
ari 2dfbc31b5d v0.7.3 2022-09-02 10:36:55 -04:00
ari ab4997494d lint 2022-09-02 10:34:16 -04:00
ari 83b1c85043 correct fix 2022-09-02 10:33:52 -04:00
ari 7526b578ba fixed return values from backend 2022-09-02 10:11:38 -04:00
ari c461640957 fixed storybook 2022-09-02 09:45:32 -04:00
ari fd0a0aa0c4 v0.7.1 2022-09-01 21:23:49 -04:00
ari 3aad35fbce fixed up linting 2022-09-01 17:25:56 -04:00
ari 774ebe482a handling missing ids better + more tranlsations 2022-09-01 17:21:00 -04:00
ari 69a9805c02 added random media player to package 2022-09-01 15:29:37 -04:00
ari 418b9704e7 added desc to dockerfile 2022-09-01 15:29:16 -04:00
ari 6dcbf4d0ed fixed up centering bug 2022-09-01 15:29:16 -04:00
awashingmachineandAri Sosnovsky df2e926711 Adds italian translation (#155)
* Adds italian translation

Adds ita.json

* added to userprofile

Co-authored-by: Ari Sosnovsky <asosnovsky@users.noreply.github.com>
2022-09-01 15:11:25 -04:00
Earion f6df4a0718 Updated French translation (#156)
* Update fra.json

For the record I'm a native french speaker, just wanting to propose my minor contribution

* Update fra.json

small changes
2022-09-01 11:17:34 -04:00
Ari Sosnovsky be5f73bcc7 Update bug_report.md 2022-08-31 22:23:58 -04:00
Ari Sosnovsky 7e9a7061b1 Update bug_report.md 2022-08-31 22:23:49 -04:00
ari 65c0ed1b69 v0.7.0 2022-08-31 22:16:07 -04:00
ari b206c50d80 caching again 2022-08-31 21:58:17 -04:00
ari dacc0730fe using hub 2022-08-31 21:43:06 -04:00
ari b102c6df49 correct grouping 2022-08-31 21:38:35 -04:00
ari d5d8468b78 using dockerhub 2022-08-31 21:37:20 -04:00
ari d6ba4bf3f5 grouping actions 2022-08-31 21:33:05 -04:00
renovate[bot] fff33c79d8 Update dependency @types/react to v18.0.18 (#152)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-08-31 21:26:13 -04:00
renovate[bot] a8b77261db Update dependency @types/jest to v28.1.8 (#151)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-08-31 21:26:03 -04:00
ari bb93e1e322 using ghcr 2022-08-31 21:25:41 -04:00
ari 61270c1528 using bullseye 2022-08-31 21:16:52 -04:00
ari 20b4b4870d trying new image 2022-08-31 19:03:57 -04:00
ari fa6e46aad0 added continue-on-error 2022-08-31 18:51:58 -04:00
ari b07babf178 really old 2022-08-31 16:28:12 -04:00
ari a4be507f1e using older action 2022-08-31 16:22:11 -04:00
ari 1bd41bb879 disabling buildx 2022-08-31 16:15:52 -04:00
ari 7b5258402a using fix 2022-08-31 16:15:19 -04:00
ari 5f28a5da16 removed strange centering 2022-08-31 16:07:05 -04:00
ari f60bbe8ddd added no cache flag 2022-08-31 15:57:10 -04:00
ari f58966c735 lint 2022-08-31 15:46:08 -04:00
ari 499752e02f using in-memory db 2022-08-31 15:44:52 -04:00
ari 00c234541d lint 2022-08-31 15:19:59 -04:00
ari 2918191541 nicer white mode 2022-08-31 15:18:48 -04:00
ari d890c1aa64 functioning profiles 2022-08-31 15:15:30 -04:00
ari 8985312dd2 added language support 2022-08-30 22:03:40 -04:00
ari 03a735b281 settings -> dark/light mode 2022-08-30 21:50:43 -04:00
ari 416d88b965 added user profile api 2022-08-29 12:51:24 -04:00
ari 95ac286b53 added user profile 2022-08-29 12:51:24 -04:00
ari caad458b48 added some initial work on intl 2022-08-29 12:51:24 -04:00
ari 157efa04b1 added some initial work for int 2022-08-29 12:51:24 -04:00
Ari Sosnovsky d4b0c02111 v0.6.3 (#148)
* Update CHANGELOG.md

* Update config.yaml
2022-08-27 14:28:17 -04:00
ari 99688f0c92 bringing back the armhf 2022-08-27 14:06:20 -04:00
ari e3c34eeae5 update ui + new dev config 2022-08-27 13:58:41 -04:00
ari ce142f9d84 update webapp 2022-08-27 13:58:41 -04:00
ari f95dd75198 added complete support for packages? 2022-08-27 13:58:41 -04:00
ari ac82a4c96c inline automation support 2022-08-27 13:58:41 -04:00
ari fbbc5af12d refactor of how automations are sorted 2022-08-27 13:58:41 -04:00
ari 80bfbdab80 partial support 2022-08-27 13:58:41 -04:00
ari 30a6f2ca6e package setup work 2022-08-27 13:58:41 -04:00
Ari Sosnovsky ddbd780560 Update build.yml 2022-08-25 17:41:34 -04:00
ari bee584d85c experimenting with noderow 2022-08-25 17:34:25 -04:00
ari 5115dd9490 visual clean up of metadata box 2022-08-25 12:58:08 -04:00
ari e2d4022bde less annoying ha connection state 2022-08-25 12:27:14 -04:00
ari 15dfa25e34 fixed ui docker compose 2022-08-25 12:01:22 -04:00
ari 277acc14cb v0.6.2 2022-08-25 11:55:38 -04:00
255 changed files with 4924 additions and 2478 deletions

No files matched your search

+10
View File
@@ -36,4 +36,14 @@ If applicable, add screenshots to help explain your problem.
- Version [e.g. 22]
**Additional context**
- Home Assistant Version: [e.g. core-2022.5.4]
- Shortumation Version: [e.g. v0.7.0]
- Homeassistant server type: [e.g. raspberry pi 4 / intel nuc]
Add any other context about the problem here.
**Shortumation Logs**
```log
<--- copy here --->
```
+9 -7
View File
@@ -8,6 +8,9 @@ on:
push:
branches:
- main
concurrency:
group: build-${{ github.event.inputs.version || github.head_ref || github.ref }}
cancel-in-progress: true
jobs:
metadata:
runs-on: ubuntu-latest
@@ -15,12 +18,6 @@ jobs:
outputs:
version: ${{ steps.version.outputs.VERSION }}
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.10.0
with:
all_but_latest: true
access_token: ${{ github.token }}
- name: Check out repository
uses: actions/checkout@v3
with:
@@ -76,12 +73,14 @@ jobs:
needs:
- metadata
- build-web
permissions:
packages: write
strategy:
matrix:
arch:
- "aarch64"
- "amd64"
# - "armhf"
- "armhf"
- "armv7"
- "i386"
@@ -89,6 +88,9 @@ jobs:
- name: Check out repository
uses: actions/checkout@v3
# - name: Login to Github Container Registry
# run: echo ${{ github.token }} | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin
- name: Login to DockerHub
uses: docker/login-action@v2.0.0
with:
+34 -31
View File
@@ -13,12 +13,16 @@ name: "CodeQL"
on:
push:
branches: [ "main" ]
branches: ["main"]
pull_request:
# The branches below must be a subset of the branches above
branches: [ "main" ]
branches: ["main"]
schedule:
- cron: '26 21 * * 2'
- cron: "26 21 * * 2"
concurrency:
group: codeql-${{ github.head_ref || github.ref }}
cancel-in-progress: true
jobs:
analyze:
@@ -32,41 +36,40 @@ jobs:
strategy:
fail-fast: false
matrix:
language: [ 'javascript', 'python' ]
language: ["javascript", "python"]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
steps:
- name: Checkout repository
uses: actions/checkout@v3
- 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.
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality
# 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.
# 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
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality
# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
# 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
# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
# - run: |
# echo "Run, Build Application using script"
# ./location_of_script_within_repo/buildscript.sh
# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
# - run: |
# echo "Run, Build Application using script"
# ./location_of_script_within_repo/buildscript.sh
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
+7 -3
View File
@@ -4,17 +4,21 @@
#
# Source repository: https://github.com/actions/dependency-review-action
# Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
name: 'Dependency Review'
name: "Dependency Review"
on: [pull_request]
permissions:
contents: read
concurrency:
group: deprev-${{ github.head_ref || github.ref }}
cancel-in-progress: true
jobs:
dependency-review:
runs-on: ubuntu-latest
steps:
- name: 'Checkout Repository'
- name: "Checkout Repository"
uses: actions/checkout@v3
- name: 'Dependency Review'
- name: "Dependency Review"
uses: actions/dependency-review-action@v2
+3
View File
@@ -6,6 +6,9 @@ on:
pull_request:
branches:
- main
concurrency:
group: test-${{ github.head_ref || github.ref }}
cancel-in-progress: true
jobs:
metadata:
runs-on: ubuntu-latest
+34 -131
View File
@@ -1,5 +1,39 @@
# Changelog ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=for-the-badge)
## [0.7.6] Bugfixes
- Less deadly error for invalid packages with better logs
- Update notification
## [0.7.4] Bugfixes
- Backend now correctly returns unset alias + description
## [0.7.1] Bugfixes + Italian!
- Added support for automations that do not have an `id`
- Added Italian
- Merged grammar fixes for french
- Fixed up strange centering styling bug
- Replaced more non-multilingual texts with multilingual text
## [0.7.0] Configuration Menu / Light Mode / Lang Support
- Added configuration menu
![image](https://user-images.githubusercontent.com/7451445/187817636-311b5a83-4e08-4b6b-b3b8-2e7086ace136.png)
- Experimental light mode
![image](https://user-images.githubusercontent.com/7451445/187817711-c7a8e23c-b9a4-472b-a348-c1492f3c5d56.png)
- First attempt at a french translation
- No longer using sqllite for automation db
## [0.6.3] - Packages Support & Minor UI improvements
- Full split config support for packages and all advance include directives (i.e. !include_dir_named, !include_dir_merge_list etc)
- Updated metadata box to display origin of the file
- Support for inlined automations!
![image](https://user-images.githubusercontent.com/7451445/187043147-15cea23b-0b64-4484-9c87-747998ea9fe6.png)
## [0.6.1] - v0.6.0 Split Config Support & Better Error handling!
- Added visual support for split config (this was a heavy refactor!)
@@ -15,11 +49,6 @@
- Better global error capture
![image](https://user-images.githubusercontent.com/7451445/185441268-9dbde36e-b28b-4a13-bd7f-45ae23834e78.png)
## [0.5.3] - Bug Fixes
- Redirecting `/` to `/web` to resolve container install strangeness reported in https://github.com/asosnovsky/Shortumation/issues/125
- Fixed missing flag that caused the automation to explode in https://github.com/asosnovsky/Shortumation/issues/124
## [0.5.2] - Better Controls
- Add automation trigger
@@ -40,11 +69,6 @@
- Websockets now live-refresh when updates occur
## [0.4.0] - Depedency update
- Core dependency updates
- Python port is now dynamically set
## [0.3.4] - Condition/Trigger Editor Upgrades!
- Many condition editor fixes
@@ -61,19 +85,6 @@
![image](https://user-images.githubusercontent.com/7451445/180238004-4b04f13a-77a2-4c4c-9144-963dbc394bf4.png)
## [0.3.2] - Fixed Addon Image for arm-based devices
- Using hypercon instead of uvicorn (this losses the rust dependency which makes it easier to install on arm)
- Pre-building web assets outside of docker (this takes the image size down and speeds up instaltion of addon)
- Updated build scripts to actually fail installation when build/prep steps fail
- Ensured that builds for all architecture run successfully
- Re-worked github actions (quicker test phases)
## [0.3.1] - Increased Pagination + Restricted Repeat Node
- Increased pagination to display up to 10,000 autos for now
- Repeat node now has types
## [0.3.0] - Complete Refactor of Graphs
- Added visual support for
@@ -92,113 +103,5 @@
![image](https://user-images.githubusercontent.com/7451445/179135916-8083aab5-bee1-4d27-b19d-9e000ca012f9.png)
## [0.1.22] - Many Visual improvements
- Deprecated several custom components in favor of mui.com
- Device Editor now has support for 99% of diplay types
- Condition Device is implemented
- Improved naming autogen for trigger & choose
## [0.1.21] - Service Editor
- first version of service editor
- reloading automations on save
## [0.1.20] - UI Bugfixes
- Using MUI elements for input time
- Added delay action / wait_on_triggers action
- Added enabled/disabled flag in node editor
- Optional flip vertical during desktop mode
- Fixed up modal clipping
## [0.1.19] - Vertical mobile mode
- in mobile mode we draw the graphs vertically now
## [0.1.17] - Websockets
- Connected to HA main websocket -- now we retrieve real-time information about
- Device names
- Entity names/ids
- Autocomplete for devices and entities
## [0.1.14] - Material UI + Autocomplete
- Brought some Material UI elements for input and text
- Autocomplete for tags
- Using 'id' as alias for trigger (as it seems to break HA otherwise)
- Not using 'alias' for conditions, always auto-generating it (again, this used to break HA)
- Added missing `data` object to service-actions
## [0.1.13] - YAML
- Better YAML
- Rewrote yaml parser/loader to use pyyaml and safe mode
- Cleaned up description vs alias
## [0.1.12] - Less Intense Error Messages
- Added more node-based errors (this way it's easier to see where validations failed)
- Made the validators less strict in order to capture more edge cases that HA supports
- Nicer auto-generated descriptions for some trigger nodes
## [0.1.10] - More Bug Fixes
- Allowing null or undefined values for metadata fields
- Trigger.platform==time will now have the .at property better supported
## [0.1.9] - Fixed up invalid types for various triggers
- Some triggers had invalid types and were causing a false-positive validation
## [0.1.8] - Support for Malformed Automations
- API will no longer error out on missing values or invalid lists
- Frontend has support for displaying bad automations
## [0.1.6] - Mobile Mode
- Improved mobile mode
- Fixed up arrow styles due to typos
- Added selection color
## [0.1.2] - Docker Hub Images
- Publishing images to docker hub is now stable
## [0.0.15] - Publish to dockerhub
- Publishing images to docker hub
## [0.0.14] - Using vanila ha yaml
- Supporing vanilla out of the box HA yaml as oppose to parsing them (no more $smType)
- Conditions have now a more a explicit node
## [0.0.13] - Better Styling with react-flow
- Fixed up styling (using react-flow)
- cleaned up some button styles
## [0.0.12] - Tags
- Added tag management system for automations
## [0.0.11] - Zoom
- Added lazy saving
## [0.0.10] - Zoom
- Introducing Zoom!
## [0.0.9] - First Working Version
- Instalable verion via github
- Initial POC done
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).
+3 -1
View File
@@ -2,7 +2,7 @@
ARG BUILD_ARCH
# <--- Main Image -->
FROM python:3.10-slim-buster
FROM python:3.10-slim-bullseye
WORKDIR /app
# <--- Post-Build Args -->
@@ -10,6 +10,7 @@ ARG BUILD_VERSION
# <--- Environment Variables -->
ENV BUILD_VERSION $BUILD_VERSION
ENV BUILD_ARCH $BUILD_ARCH
# <--- System Wide Dependencies -->
ENV LANG C.UTF-8
@@ -45,3 +46,4 @@ ENTRYPOINT [ "/app/bin/run.sh" ]
CMD [ "/app" ]
LABEL org.opencontainers.image.source https://github.com/asosnovsky/Shortumation
LABEL org.opencontainers.image.description "A better way to write automations in home-assistant without having to install and run a seperate automation engine!"
+3
View File
@@ -1,3 +1,6 @@
:no_entry: [DEPRECATED] Due to lack of time on my part, this project is no longer being worked on. :( :no_entry: [DEPRECATED]
----
# <img src="logo.png" height="40x"/> Shortumation ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=platsic)
[![Test](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml/badge.svg)](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml) [![Build](https://github.com/asosnovsky/Shortumation/actions/workflows/build.yml/badge.svg)](https://github.com/asosnovsky/Shortumation/actions/workflows/build.yml)
+26 -15
View File
@@ -1,20 +1,31 @@
get_index # unused function (src/api/app.py:43)
list_autos # unused function (src/api/routes/automations.py:13)
insert_auto # unused function (src/api/routes/automations.py:28)
update_auto # unused function (src/api/routes/automations.py:32)
delete_auto # unused function (src/api/routes/automations.py:40)
read_details # unused function (src/api/routes/details.py:11)
get_index # unused function (src/api/app.py:41)
list_autos # unused function (src/api/routes/automations.py:14)
insert_auto # unused function (src/api/routes/automations.py:30)
update_auto # unused function (src/api/routes/automations.py:37)
delete_auto # unused function (src/api/routes/automations.py:49)
read_details # unused function (src/api/routes/details.py:12)
read_profile # unused function (src/api/routes/details.py:24)
save_profile # unused function (src/api/routes/details.py:28)
read_ping # unused function (src/api/routes/ping.py:10)
websocket_endpoint # unused function (src/api/routes/socket.py:13)
params # unused variable (src/api/types.py:16)
total_items # unused variable (src/api/types.py:17)
data # unused variable (src/api/types.py:18)
trigger_variables # unused variable (src/automations/types.py:13)
trigger # unused variable (src/automations/types.py:15)
condition # unused variable (src/automations/types.py:16)
action # unused variable (src/automations/types.py:17)
_.to_json # unused method (src/automations/types.py:45)
_.automation_tags # unused property (src/hass_config/loader.py:17)
alias # unused variable (src/automations/types.py:36)
description # unused variable (src/automations/types.py:37)
trigger_variables # unused variable (src/automations/types.py:38)
mode # unused variable (src/automations/types.py:39)
trigger # unused variable (src/automations/types.py:40)
condition # unused variable (src/automations/types.py:41)
action # unused variable (src/automations/types.py:42)
_.to_json # unused method (src/automations/types.py:70)
error_name # unused variable (src/errors.py:22)
error_message # unused variable (src/errors.py:23)
error_traceback # unused variable (src/errors.py:24)
original_error # unused variable (src/errors.py:25)
_.automation_tags # unused property (src/hass_config/loader.py:28)
json_dumps # unused function (src/json_serializer.py:5)
SecretValue # unused class (src/yaml_serializer/__init__.py:40)
EnvVar # unused class (src/yaml_serializer/__init__.py:78)
theme # unused variable (src/user_profile.py:10)
lang # unused variable (src/user_profile.py:11)
flags # unused variable (src/user_profile.py:12)
SecretValue # unused class (src/yaml_serializer/__init__.py:55)
EnvVar # unused class (src/yaml_serializer/__init__.py:193)
+3 -3
View File
@@ -5,8 +5,8 @@ setuptools.setup(
python_requires=">=3.10",
install_requires=[
"PyYAML==6.0",
"fastapi==0.78.0",
"pydantic==1.9.1",
"fastapi==0.109.1",
"pydantic==1.10.13",
"hypercorn==0.13.2",
"python-decouple==3.6",
"websockets==10.3",
@@ -22,7 +22,7 @@ setuptools.setup(
"pre-commit==2.20.0",
"vulture==2.5",
"types-requests==2.28.4",
"types-PyYAML==6.0.11",
"types-PyYAML==6.0.12.20240311",
"requests==2.28.1",
],
},
+4 -6
View File
@@ -3,13 +3,13 @@ from fastapi.middleware.cors import CORSMiddleware
from fastapi.responses import RedirectResponse
from fastapi.staticfiles import StaticFiles
from src.automations.manager import AutomationManager
from src.env import API_PREFIX, ORIGIN, ROOT_FOLDER
from src.hass_config.loader import HassConfig
from .routes import automations, details, ping, socket
def make_app(automation_mgr: AutomationManager) -> FastAPI:
def make_app(hass_config: HassConfig) -> FastAPI:
app = FastAPI()
has_web_folder = (ROOT_FOLDER / "web").exists()
if has_web_folder:
@@ -33,11 +33,9 @@ def make_app(automation_mgr: AutomationManager) -> FastAPI:
)
app.include_router(ping.router, prefix="/ping")
app.include_router(
automations.make_automation_router(automation_mgr), prefix=f"{API_PREFIX}/automations"
)
app.include_router(
details.make_details_router(automation_mgr.hass_config), prefix=f"{API_PREFIX}/details"
automations.make_automation_router(hass_config), prefix=f"{API_PREFIX}/automations"
)
app.include_router(details.make_details_router(hass_config), prefix=f"{API_PREFIX}/details")
app.include_router(socket.router, prefix=f"{API_PREFIX}/socket")
@app.get("/")
+12 -2
View File
@@ -5,13 +5,15 @@ from src.automations.errors import FailedDeletion
from src.automations.manager import AutomationManager
from src.automations.types import Automation, ExtenededAutomation
from src.errors import ErrorSet
from src.hass_config.loader import HassConfig
def make_automation_router(automations: AutomationManager) -> APIRouter:
def make_automation_router(hass_config: HassConfig) -> APIRouter:
router = APIRouter()
@router.post("/list")
@router.post("/list", response_model_exclude_unset=True, response_model_exclude_none=True)
def list_autos(body: ListParams) -> ListData[ExtenededAutomation]:
automations = AutomationManager(hass_config)
try:
automations.reload()
return ListData(
@@ -27,18 +29,26 @@ def make_automation_router(automations: AutomationManager) -> APIRouter:
@router.post("/item")
def insert_auto(body: Automation):
if body.id is None:
raise HTTPException(status_code=400, detail={"msg": "must contain an id"})
automations = AutomationManager(hass_config)
automations.create(body)
@router.put("/item")
def update_auto(body: ExtenededAutomation):
if body.id is None:
raise HTTPException(status_code=400, detail={"msg": "must contain an id"})
automations = AutomationManager(hass_config)
automations.update(body)
@router.post("/item/tags")
def update_tags(body: UpdateTags):
automations = AutomationManager(hass_config)
automations.update_tags(body.automation_id, body.tags)
@router.delete("/item")
def delete_auto(body: ExtenededAutomation):
automations = AutomationManager(hass_config)
try:
automations.delete(body)
except FailedDeletion as err:
+13 -5
View File
@@ -1,8 +1,9 @@
from fastapi import APIRouter
from src.automations.loader import extract_automation_paths
from src.automations.loader import extract_automation_refs
from src.env import BUILD_VERSION, HASSIO_TOKEN, HASSIO_WS
from src.hass_config import HassConfig
from src.user_profile import UserProfile
def make_details_router(hass_config: HassConfig) -> APIRouter:
@@ -16,10 +17,17 @@ def make_details_router(hass_config: HassConfig) -> APIRouter:
"hassio_url": HASSIO_WS,
"config": hass_config.get_configuration_path(),
"tags": hass_config.get_automation_tags_path(),
"autos": {
config_key: auto_file
for config_key, auto_file in extract_automation_paths(hass_config)
},
"profile": hass_config.get_profile_path(),
"autos": list(map(repr, extract_automation_refs(hass_config))),
}
@router.get("/profile")
def read_profile():
return UserProfile.from_hass_config(hass_config)
@router.put("/profile")
def save_profile(user_profile: UserProfile):
user_profile.save(hass_config)
return {"saved": hass_config.get_profile_path()}
return router
+3 -3
View File
@@ -1,4 +1,4 @@
from typing import Dict, Generic, List, TypeVar
from typing import Generic, TypeVar
from pydantic import BaseModel
from pydantic.fields import Field
@@ -15,9 +15,9 @@ class ListParams(BaseModel):
class ListData(GenericModel, Generic[DataT]):
params: ListParams
total_items: int = Field(alias="totalItems")
data: List[DataT]
data: list[DataT]
class UpdateTags(BaseModel):
automation_id: str = Field(description="Automation Id to update")
tags: Dict[str, str]
tags: dict[str, str]
+1 -2
View File
@@ -1,6 +1,5 @@
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))
app = make_app(hass_config)
+27 -103
View File
@@ -1,121 +1,45 @@
import base64
import json
import sqlite3
from contextlib import contextmanager
from pathlib import Path
from typing import Iterable, Iterator, List, Optional
from typing import Iterable
from src.logger import get_logger
from .errors import (
DBDataError,
DBError,
DBNoAutomationFound,
RepeatedAutomationId,
)
from .errors import DBNoAutomationFound, RepeatedAutomationId
from .types import ExtenededAutomation
logger = get_logger(__file__)
automations_tbl = "autos"
def encode_auto(auto: ExtenededAutomation) -> str:
return base64.b64encode(
json.dumps(auto.to_primitive(include_tags=True)).encode("utf-8")
).decode("utf-8")
def decode_auto(
auto_str: str, source_file: str, source_file_type: str, configuration_key: str
) -> ExtenededAutomation:
return ExtenededAutomation(
source_file=source_file,
source_file_type=source_file_type,
configuration_key=configuration_key,
**json.loads(base64.b64decode(auto_str.encode("utf-8")).decode("utf-8")),
)
class AutomationDBConnection:
def __init__(self, db_file: Path) -> None:
self.db_file = db_file
def __init__(self) -> None:
self.db: dict[str, ExtenededAutomation] = {}
self.missing_id_db: list[ExtenededAutomation] = []
def reset(self):
self.db_file.unlink(missing_ok=True)
self.create_db()
self.db = {}
self.missing_id_db = []
@contextmanager
def get_cur(self) -> Iterator[sqlite3.Cursor]:
conn = sqlite3.connect(self.db_file)
cur = conn.cursor()
try:
yield cur
conn.commit()
except sqlite3.DatabaseError as err:
raise DBError(*err.args) from err
finally:
cur.close()
conn.close()
def create_db(self):
with self.get_cur() as cur:
cur.execute(
f"""
CREATE TABLE IF NOT EXISTS {automations_tbl} (
id TEXT NOT NULL PRIMARY KEY,
alias TEXT,
description TEXT,
mode TEXT NOT NULL,
source_file TEXT NOT NULL,
source_file_type TEXT NOT NULL,
configuration_key TEXT NOT NULL,
rest BLOB NOT NULL
);
"""
)
def insert_automations(self, automations: List[ExtenededAutomation]):
with self.get_cur() as cur:
for automation in automations:
try:
cur.execute(
f"""
INSERT INTO {automations_tbl} VALUES (
"{automation.id}",
"{automation.alias}",
"{automation.description}",
"{automation.mode}",
"{automation.source_file}",
"{automation.source_file_type}",
"{automation.configuration_key}",
"{encode_auto(automation)}"
);
""",
)
except sqlite3.IntegrityError as err:
raise RepeatedAutomationId(
f"automation id '{automation.id}' in '{automation.source_file}' was already seen before. Please check for duplicate automation ids in your files."
) from err
def insert_automations(self, automations: list[ExtenededAutomation]):
repeated_automations = []
for automation in automations:
if automation.id is None:
self.missing_id_db.append(automation)
elif self.db.get(automation.id, None) is None:
self.db[automation.id] = automation
else:
repeated_automations.append(
f"automation id '{automation.id}' in '{automation.source_file}' was already seen before. Please check for duplicate automation ids in your files."
)
if len(repeated_automations) > 0:
raise RepeatedAutomationId(repeated_automations)
def get_automation(self, automation_id: str) -> ExtenededAutomation:
with self.get_cur() as cur:
cur.execute(
f'SELECT rest, source_file, source_file_type, configuration_key FROM {automations_tbl} WHERE id = "{automation_id}"' # nosec
)
objs = cur.fetchone()
if objs is None:
raise DBNoAutomationFound(automation_id)
[rest, source_file, source_file_type, configuration_key] = objs
return decode_auto(rest, source_file, source_file_type, configuration_key)
if a := self.db.get(automation_id, None):
return a
raise DBNoAutomationFound(automation_id)
def list_automations(self, offset: int, limit: int) -> Iterable[ExtenededAutomation]:
with self.get_cur() as cur:
for [rest, source_file, source_file_type, configuration_key] in cur.execute(
f"SELECT rest, source_file, source_file_type, configuration_key FROM {automations_tbl} LIMIT {limit} OFFSET {offset}" # nosec
):
yield decode_auto(rest, source_file, source_file_type, configuration_key)
for i, auto in enumerate([*self.missing_id_db, *self.db.values()]):
if i >= offset and i < limit + offset:
yield auto
def count_automations(self) -> int:
with self.get_cur() as cur:
return cur.execute(f"SELECT count(id) FROM {automations_tbl}").fetchone()[0] # nosec
return len(self.db)
+4
View File
@@ -17,6 +17,10 @@ class FailedDeletion(AutomationLoaderException):
pass
class InvalidPackage(AutomationLoaderException):
pass
class DBError(Exception):
pass
+223 -25
View File
@@ -7,41 +7,213 @@ from src.utils import extract_files
from src.yaml_serializer import (
IncludedYaml,
IncludedYamlDir,
IncludedYamlDirList,
IncludedYamlDirMergedNamed,
IncludedYamlDirNamed,
dump_yaml,
load_yaml,
)
from ..hass_config.loader import HassConfig
from .errors import InvalidAutomationFile
from .errors import InvalidAutomationFile, InvalidPackage
from .tags import TagManager
from .types import ExtenededAutomation
from .types import (
AutomationExtractedIter,
ConfigurationKey,
ExtenededAutomation,
IncludedAutoamtion,
InlineAutomation,
)
logger = get_logger(__file__)
AUTOMATION_CONFIGURATION_KEY = "automation shortumation"
def extract_automation_paths(
def load_and_iter_automations(
hass_config: HassConfig, tag_manager: TagManager
) -> Iterator[ExtenededAutomation]:
for ref in extract_automation_refs(hass_config):
try:
if isinstance(ref, IncludedAutoamtion):
yield from load_automation_path(
hass_config.root_path,
hass_config.root_path / ref.ref.path,
ref.configuration_key,
tag_manager,
)
elif isinstance(ref, InlineAutomation):
yield from load_automation_inline_ref(hass_config.root_path, tag_manager, ref)
else:
raise logger.error(
AssertionError(f"ref has an invalid type of {type(ref)} = {ref}")
)
except InvalidAutomationFile as e:
logger.error(e)
def extract_automation_refs(
hass_config: HassConfig,
) -> Iterator[Tuple[str, str]]:
) -> AutomationExtractedIter:
found = False
for ref in extract_automation_root_refs(hass_config):
found = True
yield ref
try:
for ref in extract_automation_package_refs(hass_config):
found = True
yield ref
except InvalidPackage as err:
logger.fatal(err)
if not found:
yield IncludedAutoamtion([""], IncludedYaml(hass_config.root_path / "automations.yaml"))
def extract_automation_root_refs(
hass_config: HassConfig,
) -> AutomationExtractedIter:
for key, value in extract_automation_keys(hass_config):
logger.info(f"Loading automations from '{key}'")
found = True
if isinstance(value, IncludedYamlDir): # type: ignore
yield key, str(value.path.relative_to(hass_config.root_path))
yield IncludedAutoamtion([key], value) # type: ignore
elif isinstance(value, list):
yield InlineAutomation(
configuration_key=[key],
automations=value,
source_file=hass_config.get_configuration_path(),
)
else:
logger.warning(f"found an invalid type in {key}!")
if not found:
yield "", "automations.yaml"
logger.error(f"found an invalid type in {key}!")
def get_base_automation_key(hass_config: HassConfig):
def extract_automation_package_refs(hass_config: HassConfig) -> AutomationExtractedIter:
if packages_config := hass_config.homeassistant.get("packages", None):
if isinstance(packages_config, IncludedYaml):
packages = packages_config.to_normalized_json()
yield from extract_automation_inline_package_refs(
packages_config.path,
["homeassistant", "packages"],
packages,
)
elif isinstance(packages_config, IncludedYamlDirList):
raise InvalidPackage("cannot configure packages with 'included_dir_list' directive")
elif isinstance(packages_config, IncludedYamlDirNamed):
packages = packages_config.to_normalized_json(use_path_as_keys=True)
for package_path, package in packages.items():
yield from extract_automation_inline_package_refs(
package_path,
[],
{package_path.stem: package},
ignore_package_name=True,
)
elif isinstance(packages_config, IncludedYamlDirMergedNamed):
for (
pacakge_set_path,
package_set,
) in iter(packages_config):
if not isinstance(package_set, dict):
raise InvalidPackage(
f"expected {pacakge_set_path} to be a dictionary but got {type(package_set)}"
)
yield from extract_automation_inline_package_refs(
source_file=pacakge_set_path,
prefix_config_keys=[],
packages_config=package_set,
)
elif isinstance(packages_config, dict):
yield from extract_automation_inline_package_refs(
hass_config.root_path,
["homeassistant", "packages"],
packages_config,
)
else:
raise InvalidPackage("configurations.homeassistant.packages must be a dictionary!")
def extract_automation_inline_package_refs(
source_file: Path,
prefix_config_keys: ConfigurationKey,
packages_config: dict,
ignore_package_name=False,
) -> AutomationExtractedIter:
for package_name, package_data in packages_config.items():
logger.info(f"Loading package={package_name}:{type(package_data)} from {package_data}")
try:
if isinstance(package_data, IncludedYaml):
package_mapping = package_data.to_normalized_json()
yield from extract_automation_from_package(
package_data=package_mapping,
package_name=package_name,
source_file=source_file,
prefix_config_keys=prefix_config_keys,
ignore_package_name=ignore_package_name,
)
elif isinstance(package_data, IncludedYamlDirList):
raise NotImplementedError(package_data)
elif isinstance(package_data, IncludedYamlDirNamed):
for package_key_path in package_data.to_normalized_json(True).keys():
if package_key_path.stem == "automation":
yield IncludedAutoamtion(
configuration_key=[package_name], ref=IncludedYaml(package_key_path)
)
elif isinstance(package_data, IncludedYamlDirMergedNamed):
for data_path, data_set in iter(package_data):
yield from extract_automation_from_package(
package_name=package_name,
package_data=data_set,
source_file=data_path,
prefix_config_keys=[],
ignore_package_name=True,
)
elif isinstance(package_data, dict):
yield from extract_automation_from_package(
package_data=package_data,
package_name=package_name,
source_file=source_file,
prefix_config_keys=prefix_config_keys,
ignore_package_name=ignore_package_name,
)
elif package_data is not None:
raise InvalidPackage(
f"configurations.homeassistant.packages.{package_name} must be a dictionary but got {type(package_data)}!"
)
except InvalidPackage as err:
logger.error(err)
def extract_automation_from_package(
package_name: str,
package_data: dict,
source_file: Path,
prefix_config_keys: ConfigurationKey,
ignore_package_name=False,
) -> AutomationExtractedIter:
if automations := package_data.get("automation", None):
logger.info(f"Loading automations from package '{package_name}'")
suffix_keys = [package_name] if not ignore_package_name else []
if isinstance(automations, IncludedYamlDir): # type: ignore
yield IncludedAutoamtion(suffix_keys, automations)
elif isinstance(automations, list):
yield InlineAutomation(
source_file=source_file,
configuration_key=[*prefix_config_keys, *suffix_keys, "automation"],
automations=automations,
)
else:
logger.warning(
f"found an invalid type in {package_name}! automations must be included or inlined as a list"
)
def get_base_automation_key(hass_config: HassConfig) -> Tuple[ConfigurationKey, str]:
found_any = False
for key, value in extract_automation_keys(hass_config):
found_any = True
if isinstance(value, IncludedYaml):
return key, str(value.path.relative_to(hass_config.root_path))
return [key], str(value.path.relative_to(hass_config.root_path))
configurations = hass_config.configurations
if found_any:
out_path = hass_config.get_backup_automation_file_path()
@@ -53,35 +225,55 @@ def get_base_automation_key(hass_config: HassConfig):
out_path.touch(exist_ok=True)
with hass_config.get_configuration_path().open("w") as fp:
fp.write(dump_yaml(configurations, root_path=hass_config.root_path))
return AUTOMATION_CONFIGURATION_KEY, out_file
return [AUTOMATION_CONFIGURATION_KEY], out_file
def extract_automation_keys(
hass_config: HassConfig,
) -> Iterator[Tuple[str, IncludedYamlDir]]:
) -> Iterator[Tuple[str, IncludedYamlDir | list]]:
for key, value in hass_config.configurations.items():
if str(key).startswith("automation"):
if isinstance(value, dict) or isinstance(value, list):
raise NotImplementedError(
"No support for automations baked into configuration.yaml! Please extract these into a seperate file"
)
if isinstance(value, list):
yield key, value
elif isinstance(value, IncludedYamlDir): # type: ignore
yield key, value
else:
logger.warning(f"found an invalid type in {key}!")
def load_automation_inline_ref(
root_path: Path, tag_manager: TagManager, inline_automation: InlineAutomation
) -> Iterator[ExtenededAutomation]:
for auto in inline_automation.automations:
try:
cleaned_automation = clean_automation(auto)
automation_id = cleaned_automation.get("id", None)
yield ExtenededAutomation(
**cleaned_automation,
tags={} if automation_id is None else tag_manager.get(automation_id, {}),
configuration_key=inline_automation.configuration_key,
source_file=str(inline_automation.source_file.resolve().relative_to(root_path)),
source_file_type="inline",
)
except Exception as err:
raise InvalidAutomationFile(
when="reading file contents",
automation_path=inline_automation.source_file,
error=err,
) from err
def load_automation_path(
root_path: Path,
automation_path: Path,
configuration_key: str,
configuration_key: ConfigurationKey,
tag_manager: TagManager,
) -> Iterator[ExtenededAutomation]:
"""
Args:
automation_path (Path)
configuration_key (str)
configuration_key (list[str])
Returns:
Iterator[ExtenededAutomation]
@@ -106,11 +298,13 @@ def load_automation_path(
if isinstance(automations, dict):
try:
cleaned_automation = clean_automation(automations)
automation_id = cleaned_automation.get("id", None)
yield ExtenededAutomation(
**clean_automation(automations),
tags=tag_manager.get(automations["id"], {}),
**cleaned_automation,
tags={} if automation_id is None else tag_manager.get(automation_id, {}),
configuration_key=configuration_key,
source_file=str(automation_path.relative_to(root_path)),
source_file=str(automation_path.resolve().relative_to(root_path)),
source_file_type="obj",
)
except Exception as err:
@@ -125,11 +319,13 @@ def load_automation_path(
return
for automation in automations:
try:
cleaned_automation = clean_automation(automation)
automation_id = cleaned_automation.get("id", None)
yield ExtenededAutomation(
**clean_automation(automation),
tags=tag_manager.get(automation["id"], {}),
**cleaned_automation,
tags={} if automation_id is None else tag_manager.get(automation_id, {}),
configuration_key=configuration_key,
source_file=str(automation_path.relative_to(root_path)),
source_file=str(automation_path.resolve().relative_to(root_path)),
source_file_type="list",
)
except Exception as err:
@@ -144,6 +340,8 @@ def load_automation_path(
def clean_automation(auto_raw: dict):
return {
**auto_raw,
"alias": auto_raw.get("alias", "") or "",
"description": auto_raw.get("description", "") or "",
"condition": ifempty_or_null_then_list(load_conditions(auto_raw.get("condition", []))),
"action": ifempty_or_null_then_list(load_conditions(auto_raw.get("action", []))),
"trigger": ifempty_or_null_then_list(normalize_obj(auto_raw.get("trigger", []))),
+70 -43
View File
@@ -1,23 +1,17 @@
from pathlib import Path
from tempfile import mktemp
from typing import Dict, Optional, Union
from typing import Optional, Union
from src.errors import ErrorSet, FormattedError
from src.hass_config.loader import HassConfig
from src.logger import get_logger
from src.yaml_serializer import dump_yaml, load_yaml
from ..errors import ErrorSet
from ..logger import get_logger
from .db import AutomationDBConnection
from .errors import (
AttemptingToOverwriteAnIncompatibleFileError,
DBError,
InvalidAutomationFile,
)
from .loader import (
extract_automation_paths,
get_base_automation_key,
load_automation_path,
)
from .loader import get_base_automation_key, load_and_iter_automations
from .tags import TagManager
from .types import Automation, ExtenededAutomation
@@ -28,12 +22,9 @@ class AutomationManager:
def __init__(
self,
hass_config: HassConfig,
db_path: Optional[Path] = None,
) -> None:
if db_path is None:
db_path = Path(mktemp()) # nosec
self.hass_config = hass_config
self.db = AutomationDBConnection(db_path)
self.db = AutomationDBConnection()
self.tag_path = hass_config.get_automation_tags_path()
self.tag_manager = TagManager()
self.reload_tags()
@@ -42,27 +33,32 @@ class AutomationManager:
if self.tag_path.exists():
self.tag_manager = TagManager.load(self.tag_path)
def reload(self):
def reload(self, batch_size: int = 100):
self.db.reset()
self.reload_tags()
errors = []
for config_key, p in extract_automation_paths(self.hass_config):
auto_it = load_and_iter_automations(self.hass_config, self.tag_manager)
batch: list[ExtenededAutomation] = []
stop = False
while not stop:
try:
automations = list(
load_automation_path(
self.hass_config.root_path,
self.hass_config.root_path / p,
config_key,
self.tag_manager,
)
)
self.db.insert_automations(automations)
except InvalidAutomationFile as e:
logger.warning(e)
errors.append(e)
batch.append(next(auto_it))
if len(batch) >= batch_size:
self.db.insert_automations(batch)
batch = []
except StopIteration:
if stop:
break
stop = True
except DBError as e:
logger.warning(e)
errors.append(e)
try:
if len(batch) >= 0:
self.db.insert_automations(batch)
except DBError as e:
logger.warning(FormattedError.from_error(e))
errors.append(e)
if len(errors) > 0:
raise ErrorSet(*errors)
@@ -88,6 +84,8 @@ class AutomationManager:
)
def update(self, automation: ExtenededAutomation, create_if_not_found: bool = False):
if automation.id is None:
raise AssertionError("automation.id must be defined to update!")
automation_path = self.hass_config.root_path / automation.source_file
if not automation_path.parent.exists():
automation_path.parent.mkdir(parents=True)
@@ -104,7 +102,7 @@ class AutomationManager:
)
raw_auto = automation.to_primitive(include_tags=False)
automation_path.write_text(dump_yaml(raw_auto, self.hass_config.root_path))
else:
elif automation.source_file_type == "list":
if isinstance(objs, dict):
raise AttemptingToOverwriteAnIncompatibleFileError(
f"{automation_path} is a list, but expected a obj for {automation}"
@@ -115,23 +113,34 @@ class AutomationManager:
raise AssertionError(
f"Attemption to save automation to {automation_path} but encountering an invalid list yaml file. Did you modify this file prior to saving?\n{automation}"
)
found = False
for i, obj in enumerate(objs):
if obj["id"] == automation.id:
objs[i] = automation.to_primitive(include_tags=False)
found = True
break
if not found:
if create_if_not_found:
objs.append(automation.to_primitive(include_tags=False))
else:
raise InvalidAutomationFile(
"Could not update automations, not found in source file."
)
update_or_append_to_automation_list(
objs=objs,
automation=automation,
create_if_not_found=create_if_not_found,
)
automation_path.write_text(dump_yaml(objs, self.hass_config.root_path))
elif automation.source_file_type == "inline":
if not isinstance(objs, dict):
raise AssertionError(
f"expected {automation.source_file} to be a dict instead found {type(objs)}"
)
update_obj = objs
for key in automation.configuration_key:
update_obj = update_obj[key]
if not isinstance(update_obj, list):
raise AssertionError(
f"expected {automation.source_file}@{automation.configuration_key} to be a list instead found {type(update_obj)}"
)
update_or_append_to_automation_list(
objs=update_obj,
automation=automation,
create_if_not_found=create_if_not_found,
)
automation_path.write_text(dump_yaml(objs, self.hass_config.root_path))
self.update_tags(automation.id, automation.tags)
def update_tags(self, automation_id: str, tags: Dict[str, str]):
def update_tags(self, automation_id: str, tags: dict[str, str]):
self.reload_tags()
self.tag_manager[automation_id] = tags
self.tag_manager.save(self.tag_path)
@@ -143,6 +152,8 @@ class AutomationManager:
self.tag_manager.save(self.tag_path)
def delete(self, automation: ExtenededAutomation):
if automation.id is None:
raise AssertionError("automation.id must be defined to update!")
automation_path = self.hass_config.root_path / automation.source_file
if automation.source_file_type == "obj":
automation_path.unlink(missing_ok=True)
@@ -159,3 +170,19 @@ class AutomationManager:
kept.append(obj)
automation_path.write_text(dump_yaml(kept, self.hass_config.root_path))
self.delete_tags(automation.id)
def update_or_append_to_automation_list(
objs: list[dict],
automation: ExtenededAutomation,
create_if_not_found: bool = False,
):
for i, obj in enumerate(objs):
if obj["id"] == automation.id:
objs[i] = automation.to_primitive(include_tags=False)
return True
if create_if_not_found:
objs.append(automation.to_primitive(include_tags=False))
else:
raise InvalidAutomationFile("Could not update automations, not found in source file.")
return False
+1 -2
View File
@@ -1,10 +1,9 @@
from pathlib import Path
from typing import Dict
from src.yaml_serializer import dump_yaml, load_yaml
class TagManager(Dict[str, Dict[str, str]]):
class TagManager(dict[str, dict[str, str]]):
def save(self, path: Path):
if not path.parent.exists():
path.parent.mkdir(parents=True)
+36 -11
View File
@@ -1,27 +1,52 @@
import json
from pathlib import Path
from typing import Dict, List, Literal, Optional, Union
from typing import Iterator, Literal, NamedTuple, Optional, Union
from pydantic import BaseModel
from pydantic.fields import Field
from src.yaml_serializer import IncludedYamlDir
ConfigurationKey = list[str]
class InlineAutomation(NamedTuple):
configuration_key: ConfigurationKey
source_file: Path
automations: list[dict]
def __repr__(self) -> str:
return f"InlineAutomation(configuration_key='{self.configuration_key}', source_file='{self.source_file}')"
class IncludedAutoamtion(NamedTuple):
configuration_key: ConfigurationKey
ref: IncludedYamlDir
def __repr__(self) -> str:
return f"InlineAutomation(configuration_key='{self.configuration_key}', ref='{self.ref}')"
ExtractedAutomation = InlineAutomation | IncludedAutoamtion
AutomationExtractedIter = Iterator[ExtractedAutomation]
class BaseAutomation(BaseModel):
id: str
alias: Optional[str] = None
description: Optional[str] = None
trigger_variables: Optional[Dict[str, Union[str, int, bool, float]]] = None
id: Optional[str]
alias: str = ""
description: str = ""
trigger_variables: Optional[dict[str, Union[str, int, bool, float]]] = None
mode: str = "single"
trigger: List[dict] = []
condition: List[dict] = []
action: List[dict] = []
trigger: list[dict] = []
condition: list[dict] = []
action: list[dict] = []
def to_primitive(self):
return self.dict(exclude_unset=True, exclude_none=True)
class Automation(BaseAutomation):
tags: Dict[str, str] = Field(default_factory=dict)
tags: dict[str, str] = Field(default_factory=dict)
def to_primitive(self, include_tags: bool = False):
out = super().to_primitive()
@@ -32,8 +57,8 @@ class Automation(BaseAutomation):
class ExtenededAutomation(Automation):
source_file: str
source_file_type: Literal["list", "obj"]
configuration_key: str
source_file_type: Literal["list", "obj", "inline"]
configuration_key: ConfigurationKey
def to_primitive(self, include_tags: bool = False):
out = super().to_primitive(include_tags=include_tags)
+1 -2
View File
@@ -1,11 +1,10 @@
import argparse
from pathlib import Path
from typing import Dict, List
import yaml
def convert_tags(automations: List[dict], tags: Dict[int, dict]) -> Dict[str, dict]:
def convert_tags(automations: list[dict], tags: dict[int, dict]) -> dict[str, dict]:
converted = {}
for tagsIdx, tagValues in tags.items():
if tagsIdx < len(automations):
+23 -1
View File
@@ -1,3 +1,7 @@
import traceback
from typing import NamedTuple
class ErrorSet(Exception):
"""An exception collection exception"""
@@ -7,6 +11,24 @@ class ErrorSet(Exception):
def gen_message(self):
if len(self.errors) > 1:
return "Encountered multiple errors:\n >" + "\n >".join(map(repr, self.errors))
return "Encountered multiple errors:\n >" + "\n >".join(
map(FormattedError.from_error, self.errors)
)
else:
return str(self.errors[0].args)
class FormattedError(NamedTuple):
error_name: str
error_message: str
error_traceback: str
original_error: Exception
@classmethod
def from_error(cls, err: Exception):
return cls(
error_name=str(err.__class__.__name__),
error_message=str(err.args),
error_traceback="\n\n".join(traceback.format_tb(err.__traceback__)),
original_error=err,
)
+15 -1
View File
@@ -2,7 +2,7 @@ from pathlib import Path
from typing import Optional
from src.automations.tags import TagManager
from src.yaml_serializer import IncludedYaml, load_yaml
from src.yaml_serializer import IncludedYaml, IncludedYamlDir, load_yaml
class HassConfig:
@@ -14,6 +14,17 @@ class HassConfig:
with self.get_configuration_path().open("r") as f:
return dict(load_yaml(f, root_path=self.root_path)) # type: ignore
@property
def homeassistant(self) -> dict:
if homeassistant_config := self.configurations.get("homeassistant", None):
if isinstance(homeassistant_config, IncludedYamlDir): # type: ignore
homeassistant_config = homeassistant_config.to_normalized_json()
if isinstance(homeassistant_config, dict):
return homeassistant_config
else:
raise AssertionError("configurations.homeassistant must be a dictionary!")
return {}
@property
def automation_tags(self) -> TagManager:
tag_path = self.get_automation_tags_path()
@@ -49,5 +60,8 @@ class HassConfig:
def get_automation_tags_path(self) -> Path:
return self.get_shortumations_path() / "tags.yaml"
def get_profile_path(self) -> Path:
return self.get_shortumations_path() / "profile.yaml"
def get_configuration_path(self) -> Path:
return self.root_path / "configuration.yaml"
+1 -1
View File
@@ -1,5 +1,5 @@
import json
from typing import Any, List
from typing import Any
def json_dumps(obj: Any) -> str:
+25
View File
@@ -0,0 +1,25 @@
from typing import Dict, Literal
from pydantic import BaseModel, Field
from src.hass_config import HassConfig
from src.yaml_serializer import dump_yaml, load_yaml
class UserProfile(BaseModel):
theme: Literal["dark", "light"] = "dark"
lang: str = "eng"
flags: Dict[str, bool] = Field(default_factory=dict)
@classmethod
def from_hass_config(cls, hass_config: HassConfig):
path = hass_config.get_profile_path()
if path.exists():
with hass_config.get_profile_path().open("r") as fp:
return cls(**load_yaml(fp, hass_config.root_path)) # type: ignore
else:
return cls()
def save(self, hass_config: HassConfig):
with hass_config.get_profile_path().open("w") as fp:
fp.write(dump_yaml(self.dict(), hass_config.root_path))
+14 -1
View File
@@ -1,5 +1,5 @@
from pathlib import Path
from typing import Iterator
from typing import Iterator, TypeVar
def extract_files(p: Path) -> Iterator[Path]:
@@ -18,3 +18,16 @@ def extract_files(p: Path) -> Iterator[Path]:
yield from extract_files(c)
else:
yield p
T = TypeVar("T")
def batch(it: Iterator[T], batch_size: int) -> Iterator[list[T]]:
b = []
for n in it:
b.append(n)
if len(b) >= batch_size:
yield b
if len(b) > 0:
yield b
+18 -8
View File
@@ -1,21 +1,28 @@
from pathlib import Path
from typing import Iterator, NamedTuple, Tuple, Union
from typing import Iterator, NamedTuple, Tuple
from yaml.nodes import Node
from src.logger import get_logger
from .manager import YamlManager
dump_yaml = YamlManager.dump_yaml
load_yaml = YamlManager.load_yaml
logger = get_logger(__file__)
def load_dir_yaml(folder_or_file: Path) -> Iterator[Tuple[Path, dict | list]]:
if folder_or_file.is_dir():
for file in folder_or_file.iterdir():
yield from load_dir_yaml(file)
else:
with folder_or_file.open("r") as fp:
yield folder_or_file, load_yaml(fp, root_path=folder_or_file.parent)
if folder_or_file.suffix.lower() == ".yaml":
with folder_or_file.open("r") as fp:
yield folder_or_file, load_yaml(fp, root_path=folder_or_file.parent)
else:
logger.info(f"Ignoring the file {folder_or_file}")
@YamlManager.as_constructor("!include")
@@ -78,10 +85,13 @@ class IncludedYamlDirMergedNamed(NamedTuple):
def from_yaml(cls, constructor, node: Node):
return cls(constructor.root_path / node.value)
def __iter__(self):
return load_dir_yaml(self.path)
def to_normalized_json(self):
out = {}
for path, data in load_dir_yaml(self.path):
overlap = set(data.key()).intersection(set(out.keys()))
for path, data in self:
overlap = set(data.keys()).intersection(set(out.keys()))
if len(overlap) > 0:
raise AssertionError(
f"The keys {overlap} were found in more than 1 file, cannot handle overlapping keys due to undefined behavior expectation. See {path}"
@@ -111,11 +121,11 @@ class IncludedYamlDirNamed(NamedTuple):
def from_yaml(cls, constructor, node: Node):
return cls(constructor.root_path / node.value)
def to_normalized_json(self):
def to_normalized_json(self, use_path_as_keys=False):
out = {}
for path, data in load_dir_yaml(self.path):
if out.get(path.name, None):
out[path.name] = data
if out.get(path.name, None) is None:
out[path.stem if not use_path_as_keys else path] = data
else:
raise AssertionError(
f"expected {path.name} to be a unique file name but found a second file name in {path}"
@@ -0,0 +1,31 @@
# Loads default set of integrations. Do not remove.
default_config:
# Text to speech
tts:
- platform: google_translate
# automation manual: !include_dir_list ./automations/include_dir_list
# automation ui: !include automations/ui.yaml
# automation: !include automations/base.yaml
# automation cools: !include_dir_merge_list automations/include_dir_merge_list
script: !include scripts.yaml
scene: !include scenes.yaml
automation:
- id: "inline-auto"
alias: inline-auto
description: Example package auto
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
homeassistant:
packages: !include_dir_merge_named packages
@@ -0,0 +1,7 @@
# all the packages!
This is really cool :)
- A list item!
<<more thisngs!>>
@@ -0,0 +1,2 @@
ha:
automation: !include ../automations/ui.yaml
@@ -0,0 +1,15 @@
package2:
automation:
- id: "package2"
alias: package ha
description: Example package auto
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
@@ -12,7 +12,20 @@ tts:
script: !include scripts.yaml
scene: !include scenes.yaml
automation:
- id: "inline-auto"
alias: inline-auto
description: Example package auto
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
homeassistant:
packages:
ha:
automation: !include automations/ui.yaml
packages: !include packages.yaml
@@ -0,0 +1,2 @@
ha: !include packages/ha.yaml
sub: !include_dir_named packages/sub
@@ -0,0 +1,38 @@
automation: !include ../automations/ui.yaml
media_player:
- platform: template
media_players:
receiver:
friendly_name: Receiver
current_source_template: "{{ states('input_text.selected_source') }}"
value_template: >
{% if is_state("input_boolean.receiver_on", "on") -%}
on
{%- else -%}
off
{%- endif %}
turn_on:
service: switch.turn_on
data_template:
entity_id: switch.receiver_on
turn_off:
service: switch.turn_on
data_template:
entity_id: switch.receiver_off
volume_up:
service: switch.turn_on
data_template:
entity_id: switch.volume_up
volume_down:
service: switch.turn_on
data_template:
entity_id: switch.vol
input_templates:
source 1:
service: input_boolean.turn_on
data_template:
entity_id: input_boolean.source_1
source 2:
service: input_boolean.turn_on
data_template:
entity_id: input_boolean.source_2
@@ -0,0 +1,7 @@
# all the packages!
This is really cool :)
- A list item!
<<more thisngs!>>
@@ -0,0 +1,13 @@
- id: "package2"
alias: package ha
description: Example package auto
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
@@ -1,5 +1,5 @@
- id: "base1"
alias: BASE
- id: "ui1"
alias: UI 1
description: Example
mode: single
trigger:
@@ -11,8 +11,8 @@
data: {}
target:
entity_id: counter.up_times
- id: "base2"
alias: base 2
- id: "ui2"
alias: UI 2
description: ""
trigger:
- platform: sun
@@ -0,0 +1,31 @@
# Loads default set of integrations. Do not remove.
default_config:
# Text to speech
tts:
- platform: google_translate
# automation manual: !include_dir_list ./automations/include_dir_list
# automation ui: !include automations/ui.yaml
# automation: !include automations/base.yaml
# automation cools: !include_dir_merge_list automations/include_dir_merge_list
script: !include scripts.yaml
scene: !include scenes.yaml
automation:
- id: "inline-auto"
alias: inline-auto
description: Example package auto
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
homeassistant:
packages: !include packages.yaml
+17
View File
@@ -0,0 +1,17 @@
ha: !include packages/ha.yaml
sub: !include_dir_merge_named packages/sub
secret_ones:
automation:
- id: "inline-package-auto"
alias: package ha
description: Example package auto
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
@@ -0,0 +1 @@
automation: !include ../automations/ui.yaml
@@ -0,0 +1,7 @@
# all the packages!
This is really cool :)
- A list item!
<<more thisngs!>>
@@ -0,0 +1,14 @@
automation:
- id: "package2"
alias: package ha
description: Example package auto
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
@@ -1,5 +1,4 @@
- id: "base1"
alias: BASE
- alias: UI 1
description: Example
mode: single
trigger:
@@ -11,8 +10,7 @@
data: {}
target:
entity_id: counter.up_times
- id: "base2"
alias: base 2
- alias: UI 2
description: ""
trigger:
- platform: sun
@@ -12,7 +12,19 @@ tts:
script: !include scripts.yaml
scene: !include scenes.yaml
automation:
- alias: inline-auto
description: Example package auto
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
homeassistant:
packages:
ha:
automation: !include automations/ui.yaml
packages: !include packages.yaml
+16
View File
@@ -0,0 +1,16 @@
ha: !include packages/ha.yaml
sub: !include_dir_merge_named packages/sub
secret_ones:
automation:
- alias: package ha
description: Example package auto
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
@@ -0,0 +1 @@
automation: !include ../automations/ui.yaml
@@ -0,0 +1,7 @@
# all the packages!
This is really cool :)
- A list item!
<<more thisngs!>>
@@ -0,0 +1,13 @@
automation:
- alias: package ha
description: Example package auto
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
@@ -1,5 +1,4 @@
- id: "base1"
alias: BASE
- alias: UI 1
description: Example
mode: single
trigger:
@@ -11,8 +10,7 @@
data: {}
target:
entity_id: counter.up_times
- id: "base2"
alias: base 2
- alias: UI 2
description: ""
trigger:
- platform: sun
@@ -0,0 +1,2 @@
homeassistant:
packages: !include_dir_named integrations
Whitespace-only changes.
@@ -0,0 +1 @@
automation: !include ../automations.yaml
@@ -0,0 +1 @@
media_player: !include_dir_list ../entities/media_players
@@ -0,0 +1,21 @@
- alias: UI 1
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
- alias: UI 2
description: ""
trigger:
- platform: sun
event: sunrise
offset: 0
condition: []
action: []
mode: single
@@ -0,0 +1,2 @@
homeassistant:
packages: !include_dir_named integrations
@@ -0,0 +1 @@
automation: !include ../automations.yaml
@@ -0,0 +1 @@
# media_player: !include_dir_list ../entities/media_players
@@ -0,0 +1,21 @@
- alias: UI 1
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
- alias: UI 2
description: ""
trigger:
- platform: sun
event: sunrise
offset: 0
condition: []
action: []
mode: single
@@ -0,0 +1,2 @@
homeassistant:
packages: !include_dir_named integrations
@@ -0,0 +1 @@
automation: !include ../automations.yaml
@@ -0,0 +1 @@
media_player:
@@ -0,0 +1,21 @@
- alias: UI 1
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
- alias: UI 2
description: ""
trigger:
- platform: sun
event: sunrise
offset: 0
condition: []
action: []
mode: single
@@ -0,0 +1,2 @@
homeassistant:
packages: !include_dir_named integrations
@@ -0,0 +1 @@
- platform: media
@@ -0,0 +1 @@
automation: !include ../automations.yaml
@@ -0,0 +1,16 @@
- platform: ping
host: 192.168.0.119
name: "Ping Pc Tv"
scan_interval: 10
- platform: ping
host: 192.168.0.181
name: "Ping Living Room Tv"
scan_interval: 10
- platform: ping
host: 192.168.0.100
name: "Ping Printer"
scan_interval: 15
- platform: ping
host: 192.168.0.177
name: "Ping Broadlink"
scan_interval: 15
@@ -0,0 +1 @@
media_player: !include_dir_list ../entities/media_players
@@ -1,14 +0,0 @@
id: "1659114822642"
alias: On Home Down
description: Example
mode: single
trigger:
- platform: homeassistant
event: shutdown
condition: []
action:
- service: counter.increment
target:
entity_id:
- counter.up_times
data: {}
@@ -1,13 +0,0 @@
id: "1659114647066"
alias: HA Up
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
@@ -1,13 +0,0 @@
id: "1659114647067"
alias: Notify Washer
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
@@ -1,7 +0,0 @@
- id: "mlist1"
alias: Merged List 1
description: ""
trigger: []
condition: []
action: []
mode: single
@@ -1,14 +0,0 @@
- id: "mlist2"
alias: Merged List 2
description: ""
trigger: []
condition: []
action: []
mode: single
- id: "mlist3"
alias: Merged List 3
description: ""
trigger: []
condition: []
action: []
mode: single
@@ -1,14 +0,0 @@
- id: "sublist3-mlist2"
alias: Sublist 3 - Merged List 2
description: ""
trigger: []
condition: []
action: []
mode: single
- id: "sublist3-mlist3"
alias: Sublist 3 - Merged List 3
description: ""
trigger: []
condition: []
action: []
mode: single
@@ -1,14 +0,0 @@
id: "1659114822642"
alias: On Home Down
description: Example
mode: single
trigger:
- platform: homeassistant
event: shutdown
condition: []
action:
- service: counter.increment
target:
entity_id:
- counter.up_times
data: {}
@@ -1,13 +0,0 @@
id: "1659114647066"
alias: HA Up
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
@@ -1,13 +0,0 @@
id: "1659114647067"
alias: Notify Washer
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
@@ -1,7 +0,0 @@
- id: "mlist1"
alias: Merged List 1
description: ""
trigger: []
condition: []
action: []
mode: single
@@ -1,14 +0,0 @@
- id: "mlist2"
alias: Merged List 2
description: ""
trigger: []
condition: []
action: []
mode: single
- id: "mlist3"
alias: Merged List 3
description: ""
trigger: []
condition: []
action: []
mode: single
@@ -1,14 +0,0 @@
- id: "sublist3-mlist2"
alias: Sublist 3 - Merged List 2
description: ""
trigger: []
condition: []
action: []
mode: single
- id: "sublist3-mlist3"
alias: Sublist 3 - Merged List 3
description: ""
trigger: []
condition: []
action: []
mode: single
@@ -1,14 +0,0 @@
id: "1659114822642"
alias: On Home Down
description: Example
mode: single
trigger:
- platform: homeassistant
event: shutdown
condition: []
action:
- service: counter.increment
target:
entity_id:
- counter.up_times
data: {}
@@ -1,13 +0,0 @@
id: "1659114647066"
alias: HA Up
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
@@ -1,13 +0,0 @@
id: "1659114647067"
alias: Notify Washer
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
@@ -1,7 +0,0 @@
- id: "mlist1"
alias: Merged List 1
description: ""
trigger: []
condition: []
action: []
mode: single
@@ -1,14 +0,0 @@
- id: "mlist2"
alias: Merged List 2
description: ""
trigger: []
condition: []
action: []
mode: single
- id: "mlist3"
alias: Merged List 3
description: ""
trigger: []
condition: []
action: []
mode: single
@@ -1,14 +0,0 @@
- id: "sublist3-mlist2"
alias: Sublist 3 - Merged List 2
description: ""
trigger: []
condition: []
action: []
mode: single
- id: "sublist3-mlist3"
alias: Sublist 3 - Merged List 3
description: ""
trigger: []
condition: []
action: []
mode: single
@@ -13,7 +13,4 @@ script: !include scripts.yaml
scene: !include scenes.yaml
homeassistant:
packages: !include_dir_merge_named packages
packages base:
ha:
automation: !include automations/ui.yaml
packages: !include_dir_named packages
@@ -0,0 +1 @@
automation: !include ../automations/ui.yaml
@@ -0,0 +1,14 @@
automation:
- id: "package-sub"
alias: package ha
description: Example package auto
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
@@ -1,2 +1,4 @@
# empty configuration file
cloud:
homeassistant:
+14 -32
View File
@@ -1,26 +1,13 @@
from pathlib import Path
from unittest import TestCase
import yaml
from fastapi.testclient import TestClient
from src.api.app import make_app
from src.automations.types import Automation, ExtenededAutomation
from tests.utils import (
HA_CONFIG2_EXAMPLE,
HA_CONFIG6_EXAMPLE,
get_example_automation_loader,
HA_CONFIG10_EXAMPLE,
)
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))
from .util import BaseTestCase
class automation_pagination_tests(BaseTestCase):
@@ -89,20 +76,13 @@ class automation_pagination_tests(BaseTestCase):
class automation_pagination_tests_2(automation_pagination_tests):
source_config_path = HA_CONFIG2_EXAMPLE
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):
test_params = {
@@ -269,7 +249,7 @@ class automation_update_tests(BaseTestCase):
)
autos = resp.json()["data"]
self.assertEqual(resp.json()["totalItems"], self.test_params["total"])
self.assertNotIn("i am new", set([a["id"] for a in autos]))
self.assertNotIn("i am new", set([a.get("id", "") for a in autos]))
resp = self.client.post(
"/automations/item",
json=Automation(
@@ -282,7 +262,7 @@ class automation_update_tests(BaseTestCase):
)
data = resp.json()
self.assertEqual(data["totalItems"], self.test_params["total"] + 1)
self.assertIn("i am new", set([a["id"] for a in data["data"]]))
self.assertIn("i am new", set([a.get("id", "") for a in data["data"]]))
def test_update_some(self):
resp = self.client.post(
@@ -349,6 +329,7 @@ class automation_update_tests(BaseTestCase):
class automation_update_split_config_tests(automation_update_tests):
source_config_path = HA_CONFIG6_EXAMPLE
test_params = {
"total": 12,
"modify_item": 3,
@@ -377,13 +358,14 @@ class automation_update_split_config_tests(automation_update_tests):
},
}
def setUp(self) -> None:
(
self.config_folder,
self.hass_config,
self.automation_loader,
) = get_example_automation_loader(HA_CONFIG6_EXAMPLE)
self.client = TestClient(make_app(self.automation_loader))
class automation_update_split_config_and_inline_config_tests(automation_update_tests):
source_config_path = HA_CONFIG10_EXAMPLE
test_params = {
"total": 4,
"modify_item": 0,
"consitency_tests": {},
}
class automation_delete_tests(BaseTestCase):
+27
View File
@@ -0,0 +1,27 @@
from tests.unittests.api.util import BaseTestCase
class user_profile_tests(BaseTestCase):
def test_read_empty_profile(self):
resp = self.client.get("/details/profile")
self.assertEqual(resp.status_code, 200)
self.assertEqual(resp.json()["theme"], "dark")
self.assertEqual(resp.json()["lang"], "eng")
def test_update_profile(self):
resp = self.client.put("/details/profile", json={"theme": "light", "lang": "fra"})
self.assertEqual(resp.status_code, 200)
resp = self.client.get("/details/profile")
self.assertEqual(resp.status_code, 200)
self.assertEqual(resp.json()["theme"], "light")
self.assertEqual(resp.json()["lang"], "fra")
def test_update_invalid_profile(self):
resp = self.client.put("/details/profile", json={"theme": "creamy", "lang": "fra"})
self.assertEqual(resp.status_code, 422)
resp = self.client.get("/details/profile")
self.assertEqual(resp.status_code, 200)
self.assertEqual(resp.json()["theme"], "dark")
self.assertEqual(resp.json()["lang"], "eng")
+19
View File
@@ -0,0 +1,19 @@
from unittest import TestCase
from fastapi.testclient import TestClient
from src.api.app import make_app
from tests.utils import HA_CONFIG_EXAMPLE, get_example_automation_loader
class BaseTestCase(TestCase):
source_config_path = HA_CONFIG_EXAMPLE
def setUp(self) -> None:
(
self.config_folder,
self.hass_config,
self.automation_loader,
) = get_example_automation_loader(config_to_copy=self.source_config_path)
self.client = TestClient(make_app(self.hass_config))
+7 -18
View File
@@ -1,23 +1,12 @@
from pathlib import Path
from src.automations.errors import DBDataError
from src.automations.errors import DBDataError, RepeatedAutomationId
from src.automations.types import ExtenededAutomation
from .utils import TestWithDB
class db_tests(TestWithDB):
def test_db_creation(self):
with self.db.get_cur() as cur:
cur.execute("SELECT name FROM sqlite_master WHERE type ='table'")
tables = cur.fetchall()
self.assertListEqual(tables, [("autos",)])
self.db.create_db()
with self.db.get_cur() as cur:
cur.execute("SELECT name FROM sqlite_master WHERE type ='table'")
tables = cur.fetchall()
self.assertListEqual(tables, [("autos",)])
def test_insert_automations(self):
originals = [
ExtenededAutomation(
@@ -25,7 +14,7 @@ class db_tests(TestWithDB):
alias="test",
source_file="automation.yaml",
source_file_type="obj",
configuration_key="automation",
configuration_key=["automation"],
),
ExtenededAutomation(
id="test2",
@@ -33,7 +22,7 @@ class db_tests(TestWithDB):
source_file="automation.yaml",
source_file_type="obj",
action=[{"event": {"nice": "one"}, "event_type": "custom"}],
configuration_key="automation",
configuration_key=["automation"],
),
]
self.db.insert_automations(originals)
@@ -50,7 +39,7 @@ class db_tests(TestWithDB):
alias="test",
source_file="automation.yaml",
source_file_type="obj",
configuration_key="automation",
configuration_key=["automation"],
),
ExtenededAutomation(
id="test",
@@ -58,10 +47,10 @@ class db_tests(TestWithDB):
source_file="automation.yaml",
source_file_type="obj",
action=[{"event": {"nice": "one"}, "event_type": "custom"}],
configuration_key="automation",
configuration_key=["automation"],
),
]
with self.assertRaises(DBDataError) as err:
with self.assertRaises(RepeatedAutomationId):
self.db.insert_automations(originals)
autos = list(self.db.list_automations(0, 10))
self.assertEqual(len(autos), 0)
self.assertEqual(len(autos), 1)
+31 -11
View File
@@ -3,7 +3,7 @@ from tempfile import mktemp
from unittest import TestCase
from src.automations.loader import (
extract_automation_paths,
extract_automation_refs,
load_automation_path,
)
from src.automations.tags import TagManager
@@ -15,7 +15,17 @@ from tests.utils import (
HA_CONFIG4_EXAMPLE,
HA_CONFIG5_EXAMPLE,
HA_CONFIG6_EXAMPLE,
HA_CONFIG7_EXAMPLE,
HA_CONFIG8_EXAMPLE,
HA_CONFIG9_EXAMPLE,
HA_CONFIG10_EXAMPLE,
HA_CONFIG11_EXAMPLE,
HA_CONFIG12_EXAMPLE,
HA_CONFIG13_EXAMPLE,
HA_CONFIG14_EXAMPLE,
HA_CONFIG15_EXAMPLE,
HA_CONFIG16_EXAMPLE,
HA_CONFIG17_EXAMPLE,
HA_CONFIG_EXAMPLE,
)
@@ -26,7 +36,7 @@ class loader_tests(TestCase):
load_automation_path(
HA_CONFIG2_EXAMPLE,
HA_CONFIG2_EXAMPLE / "automations.yaml",
configuration_key="automation",
configuration_key=["automation"],
tag_manager=TagManager({"1652069225859": {"type": "routine"}}),
)
)
@@ -37,7 +47,7 @@ class loader_tests(TestCase):
id="1652069225859",
source_file="automations.yaml",
source_file_type="list",
configuration_key="automation",
configuration_key=["automation"],
alias="Climate - Pref temperature ",
description="",
mode="single",
@@ -70,7 +80,7 @@ class loader_tests(TestCase):
load_automation_path(
HA_CONFIG4_EXAMPLE,
HA_CONFIG4_EXAMPLE / "automations" / "notify_washer.yaml",
configuration_key="automation base",
configuration_key=["automation base"],
tag_manager=TagManager({"1659114647067": {"room": "laundry"}}),
)
)
@@ -81,7 +91,7 @@ class loader_tests(TestCase):
id="1659114647067",
source_file="automations/notify_washer.yaml",
source_file_type="obj",
configuration_key="automation base",
configuration_key=["automation base"],
alias="Notify Washer",
description="Example",
mode="single",
@@ -108,7 +118,7 @@ class loader_tests(TestCase):
load_automation_path(
HA_CONFIG9_EXAMPLE,
HA_CONFIG9_EXAMPLE / "automations.yaml",
configuration_key="automation base",
configuration_key=["automation base"],
tag_manager=TagManager({}),
)
)
@@ -122,7 +132,7 @@ class loader_tests(TestCase):
load_automation_path(
file_path.parent,
file_path,
configuration_key="automation ui",
configuration_key=["automation ui"],
tag_manager=TagManager(),
)
)
@@ -135,7 +145,7 @@ class loader_tests(TestCase):
load_automation_path(
file_path.parent,
file_path,
configuration_key="automation manual",
configuration_key=["automation manual"],
tag_manager=TagManager(),
)
)
@@ -149,9 +159,19 @@ class loader_tests(TestCase):
(HA_CONFIG4_EXAMPLE, 1),
(HA_CONFIG5_EXAMPLE, 3),
(HA_CONFIG6_EXAMPLE, 4),
(HA_CONFIG7_EXAMPLE, 1),
(HA_CONFIG8_EXAMPLE, 2),
(HA_CONFIG9_EXAMPLE, 1),
(HA_CONFIG10_EXAMPLE, 3),
(HA_CONFIG11_EXAMPLE, 3),
(HA_CONFIG12_EXAMPLE, 4),
(HA_CONFIG13_EXAMPLE, 4),
(HA_CONFIG14_EXAMPLE, 1),
(HA_CONFIG15_EXAMPLE, 1),
(HA_CONFIG16_EXAMPLE, 1),
(HA_CONFIG17_EXAMPLE, 1),
]:
with self.subTest(ha_path=ha_path, expected=expected):
with self.subTest(config_name=ha_path.name, expected=expected):
hass_config = HassConfig(ha_path)
paths = list(extract_automation_paths(hass_config))
self.assertEqual(len(paths), expected)
refs = list(extract_automation_refs(hass_config))
self.assertEqual(len(refs), expected)
+88 -24
View File
@@ -12,6 +12,10 @@ from src.errors import ErrorSet
from src.hass_config.loader import HassConfig
from tests.utils import (
HA_CONFIG6_EXAMPLE,
HA_CONFIG8_EXAMPLE,
HA_CONFIG10_EXAMPLE,
HA_CONFIG11_EXAMPLE,
HA_CONFIG12_EXAMPLE,
HA_CONFIG_EXAMPLE,
create_copy_of_example_config,
)
@@ -24,7 +28,6 @@ class manager_tests(TestWithDB):
self.config_path = create_copy_of_example_config(ha_config_example)
self.automation_manager = AutomationManager(
HassConfig(self.config_path),
self.db_file,
)
return self.config_path, self.automation_manager
@@ -45,15 +48,11 @@ class manager_tests(TestWithDB):
}
],
)
self.assertEqual(automation.configuration_key, "automation cools")
self.assertEqual(automation.configuration_key, ["automation cools"])
automation.trigger.append(
{"platform": "zone", "entity_id": "person.thor", "zone": "zone.azguard"}
)
automation_manager.update(automation)
self.assertEqual(
automation_manager.get("sublist3-mlist2").trigger,
[],
)
automation_manager.reload()
self.assertEqual(
automation_manager.get("sublist3-mlist2").trigger,
@@ -75,19 +74,13 @@ class manager_tests(TestWithDB):
def test_bad_automations_file(self):
config_path, automation_manager = self.get_manager(HA_CONFIG_EXAMPLE)
(config_path / "automations.yaml").write_text("bob is an uncle")
with self.assertRaises(ErrorSet) as err:
automation_manager.reload()
self.assertEqual(len(err.exception.errors), 1)
self.assertIsInstance(err.exception.errors[0], InvalidAutomationFile)
automation_manager.reload()
self.assertEqual(automation_manager.count(), 0)
def test_one_bad_automations_file(self):
config_path, automation_manager = self.get_manager(HA_CONFIG6_EXAMPLE)
(config_path / "automations" / "ui.yaml").write_text("bob is an uncle")
with self.assertRaises(ErrorSet) as err:
automation_manager.reload()
self.assertEqual(len(err.exception.errors), 1)
self.assertIsInstance(err.exception.errors[0], InvalidAutomationFile)
automation_manager.reload()
self.assertEqual(automation_manager.count(), 10)
def test_delete_automation_in_single_file(self):
@@ -95,7 +88,7 @@ class manager_tests(TestWithDB):
self.assertTrue((config_path / "automations/include_dir_list/home/down.yaml").exists())
automation_manager.reload()
automation = automation_manager.get("1659114822642")
self.assertEqual(automation.configuration_key, "automation manual")
self.assertEqual(automation.configuration_key, ["automation manual"])
automation_manager.delete(automation)
automation_manager.reload()
with self.assertRaises(DBNoAutomationFound):
@@ -109,7 +102,7 @@ class manager_tests(TestWithDB):
)
automation_manager.reload()
automation = automation_manager.get("mlist2")
self.assertEqual(automation.configuration_key, "automation cools")
self.assertEqual(automation.configuration_key, ["automation cools"])
automation_manager.delete(automation)
automation_manager.reload()
with self.assertRaises(DBNoAutomationFound):
@@ -127,7 +120,7 @@ class manager_tests(TestWithDB):
automation_manager.update(
ExtenededAutomation(
id="newlymade",
configuration_key="automation manual",
configuration_key=["automation manual"],
source_file="automations/include_dir_list/home/left.yaml",
source_file_type="obj",
)
@@ -138,7 +131,7 @@ class manager_tests(TestWithDB):
automation_manager.get("newlymade"),
ExtenededAutomation(
id="newlymade",
configuration_key="automation manual",
configuration_key=["automation manual"],
source_file="automations/include_dir_list/home/left.yaml",
source_file_type="obj",
),
@@ -155,7 +148,7 @@ class manager_tests(TestWithDB):
automation_manager.update(
ExtenededAutomation(
id="newlymade",
configuration_key="automation cools",
configuration_key=["automation cools"],
source_file="automations/include_dir_merge_list/sub/list2.yaml",
source_file_type="list",
),
@@ -169,7 +162,7 @@ class manager_tests(TestWithDB):
automation_manager.get("newlymade"),
ExtenededAutomation(
id="newlymade",
configuration_key="automation cools",
configuration_key=["automation cools"],
source_file="automations/include_dir_merge_list/sub/list2.yaml",
source_file_type="list",
),
@@ -186,7 +179,7 @@ class manager_tests(TestWithDB):
automation_manager.update(
ExtenededAutomation(
id="newlymade",
configuration_key="automation cools",
configuration_key=["automation cools"],
source_file="automations/include_dir_merge_list/sub/list4.yaml",
source_file_type="list",
),
@@ -200,7 +193,7 @@ class manager_tests(TestWithDB):
automation_manager.get("newlymade"),
ExtenededAutomation(
id="newlymade",
configuration_key="automation cools",
configuration_key=["automation cools"],
source_file="automations/include_dir_merge_list/sub/list4.yaml",
source_file_type="list",
),
@@ -218,7 +211,7 @@ class manager_tests(TestWithDB):
automation_manager.update(
ExtenededAutomation(
id="newlymade",
configuration_key="automation cools",
configuration_key=["automation cools"],
source_file="automations/include_dir_merge_list/sub/list2.yaml",
source_file_type="obj",
),
@@ -244,7 +237,7 @@ class manager_tests(TestWithDB):
automation_manager.update(
ExtenededAutomation(
id="newlymade",
configuration_key="automation cools",
configuration_key=["automation cools"],
source_file="automations/include_dir_list/home/down.yaml",
source_file_type="list",
),
@@ -327,3 +320,74 @@ class manager_tests(TestWithDB):
auto.tags,
{},
)
def test_load_pacakges_include_dir_named(self):
_, automation_manager = self.get_manager(HA_CONFIG8_EXAMPLE)
automation_manager.reload()
with self.subTest(name="inline"):
auto = automation_manager.get("package-sub")
self.assertEqual(auto.source_file_type, "inline")
self.assertEqual(auto.source_file, "packages/sub/package2.yaml")
self.assertEqual(auto.configuration_key, ["automation"])
with self.subTest(name="sub !inlcude"):
auto = automation_manager.get("ui1")
self.assertEqual(auto.source_file, "automations/ui.yaml")
self.assertEqual(auto.source_file_type, "list")
self.assertEqual(auto.configuration_key, [])
def test_load_pacakges_include_dir_merge_named(self):
_, automation_manager = self.get_manager(HA_CONFIG10_EXAMPLE)
automation_manager.reload()
with self.subTest(name="inline"):
auto = automation_manager.get("package2")
self.assertEqual(auto.source_file_type, "inline")
self.assertEqual(auto.source_file, "packages/sub/package2.yaml")
self.assertEqual(auto.configuration_key, ["package2", "automation"])
with self.subTest(name="sub !inlcude"):
auto = automation_manager.get("ui1")
self.assertEqual(auto.source_file, "automations/ui.yaml")
self.assertEqual(auto.source_file_type, "list")
self.assertEqual(auto.configuration_key, ["ha"])
def test_load_pacakges_include(self):
_, automation_manager = self.get_manager(HA_CONFIG11_EXAMPLE)
automation_manager.reload()
with self.subTest(name="inline"):
auto = automation_manager.get("package2")
self.assertEqual(auto.source_file_type, "list")
self.assertEqual(auto.source_file, "packages/sub/automation.yaml")
self.assertEqual(auto.configuration_key, ["sub"])
with self.subTest(name="sub !inlcude"):
auto = automation_manager.get("ui1")
self.assertEqual(auto.source_file, "automations/ui.yaml")
self.assertEqual(auto.source_file_type, "list")
self.assertEqual(auto.configuration_key, ["ha"])
def test_load_inline_auto(self):
_, automation_manager = self.get_manager(HA_CONFIG10_EXAMPLE)
automation_manager.reload()
auto = automation_manager.get("inline-auto")
self.assertEqual(auto.source_file_type, "inline")
self.assertEqual(auto.configuration_key, ["automation"])
def test_load_pacakges_nested_include_dir_merge_named(self):
_, automation_manager = self.get_manager(HA_CONFIG12_EXAMPLE)
automation_manager.reload()
with self.subTest(name="inline"):
auto = automation_manager.get("package2")
self.assertEqual(auto.source_file_type, "inline")
self.assertEqual(auto.source_file, "packages/sub/automation.yaml")
self.assertEqual(auto.configuration_key, ["automation"])
with self.subTest(name="sub !inlcude"):
auto = automation_manager.get("ui1")
self.assertEqual(auto.source_file, "automations/ui.yaml")
self.assertEqual(auto.source_file_type, "list")
self.assertEqual(auto.configuration_key, ["ha"])
+1 -12
View File
@@ -1,19 +1,8 @@
from pathlib import Path
from tempfile import mktemp
from unittest import TestCase
from src.automations.db import AutomationDBConnection
def make_temp_db():
return AutomationDBConnection(Path(mktemp() + ".db"))
class TestWithDB(TestCase):
def setUp(self) -> None:
self.db = make_temp_db()
self.db.create_db()
self.db_file = self.db.db_file
def tearDown(self) -> None:
self.db_file.unlink()
self.db = AutomationDBConnection()
+11 -1
View File
@@ -2,7 +2,11 @@ from unittest import TestCase
from src.automations.types import BaseAutomation
from src.hass_config.loader import HassConfig
from tests.utils import create_dummy_config_folder
from tests.utils import (
HA_CONFIG8_EXAMPLE,
SAMPLES_FOLDER,
create_dummy_config_folder,
)
class loader_tests(TestCase):
@@ -41,3 +45,9 @@ class loader_tests(TestCase):
(folder / "automations.yaml").unlink()
hass_config = HassConfig(folder)
self.assertIsInstance(hass_config.configurations, dict)
def test_load_homeassitant(self):
for folder in SAMPLES_FOLDER.iterdir():
with self.subTest(name=folder.name):
hass_config = HassConfig(folder)
assert isinstance(hass_config.homeassistant, dict)
Loaded 100 of 255 files, more files were not shown because too many files have changed in this diff. Show more