ran linters

This commit is contained in:
ari committed 2022-05-16 10:42:47 -04:00
1 parent ef5e66a8f1
commit b17e4c75b3
27 files changed
+290 -266

No files matched your search

+5 -4
View File
@@ -1,10 +1,11 @@
from sys import prefix
from fastapi import FastAPI
from fastapi.staticfiles import StaticFiles
from fastapi.middleware.cors import CORSMiddleware
from fastapi.staticfiles import StaticFiles
from src.automations.manager import AutomationManager
from src.env import ROOT_FOLDER, ORIGIN
from .routes import ping, automations, details
from src.env import ORIGIN, ROOT_FOLDER
from .routes import automations, details, ping
def make_app(automation_mgr: AutomationManager) -> FastAPI:
+2 -1
View File
@@ -1,5 +1,5 @@
from fastapi import APIRouter, HTTPException
from src.automations.manager import AutomationManager
from src.api.types import (
DeleteAutoRequest,
ListData,
@@ -7,6 +7,7 @@ from src.api.types import (
UpdateAutoRequest,
)
from src.automations.errors import FailedDeletion
from src.automations.manager import AutomationManager
from src.automations.types import AutomationData
+4 -4
View File
@@ -1,9 +1,9 @@
from fastapi import APIRouter
from datetime import datetime
from src.hass_config import HassConfig
from src.env import BUILD_VERSION
from fastapi import APIRouter
from src.env import BUILD_VERSION
from src.hass_config import HassConfig
def make_details_router(hass_config: HassConfig) -> APIRouter:
@@ -18,4 +18,4 @@ def make_details_router(hass_config: HassConfig) -> APIRouter:
"autos": hass_config.get_automation_path(),
}
return router
return router
+2 -1
View File
@@ -1,6 +1,7 @@
from fastapi import APIRouter
from datetime import datetime
from fastapi import APIRouter
from src.env import BUILD_VERSION
router = APIRouter()
+2
View File
@@ -1,7 +1,9 @@
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")
+1 -1
View File
@@ -1,6 +1,6 @@
from src.api.app import make_app
from src.automations.manager import AutomationManager
from src.hass_config import find_hass_config
from src.api.app import make_app
hass_config = find_hass_config()
app = make_app(AutomationManager(hass_config))
+9 -9
View File
@@ -1,8 +1,12 @@
from typing import Iterator, Union
from pydantic.error_wrappers import ValidationError
from src.json_serializer import normalize_obj
from .types import AutomationMetdata, ExtenededAutomationData
from .errors import InvalidAutomationFile
from .types import AutomationMetdata, ExtenededAutomationData
# Single loader
def load_automation(
@@ -35,17 +39,13 @@ 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)
]
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
}
return {"condition": "template", "value_template": c}
elif isinstance(c, dict):
return c
raise InvalidAutomationFile(f"Invalid type for condition object {c}")
raise InvalidAutomationFile(f"Invalid type for condition object {c}")
+3 -1
View File
@@ -1,7 +1,9 @@
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
@@ -45,7 +47,7 @@ class AutomationManager:
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
+5 -6
View File
@@ -1,15 +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))
with path.open("r") as fp:
return cls(load_yaml(fp))
+6 -3
View File
@@ -1,6 +1,8 @@
from typing import Dict, List, Literal, Optional, Union
from pydantic.fields import Field
from pydantic import BaseModel
from pydantic.fields import Field
class AutomationMetdata(BaseModel):
id: str
@@ -14,7 +16,7 @@ class AutomationData(BaseModel):
metadata: AutomationMetdata
trigger: List[dict] = []
condition: List[dict] = []
sequence: List[dict] = []
sequence: List[dict] = []
def to_primitive(self):
return {
@@ -24,5 +26,6 @@ class AutomationData(BaseModel):
"action": self.sequence,
}
class ExtenededAutomationData(AutomationData):
tags: Dict[str, str] = Field(default_factory=dict)
tags: Dict[str, str] = Field(default_factory=dict)
+2 -3
View File
@@ -1,9 +1,8 @@
from email.policy import default
from decouple import config, Csv
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="*")
ORIGIN = config("ORIGIN", cast=Csv(), default="*")
+4 -2
View File
@@ -1,6 +1,8 @@
import os
from decouple import config
from pathlib import Path
from decouple import config
from .loader import HassConfig
@@ -9,7 +11,7 @@ def find_hass_config() -> HassConfig:
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)
+5 -5
View File
@@ -1,9 +1,10 @@
from pathlib import Path
from typing import List, Optional
from src.automations.tags import TagManager
from src.yaml_serializer import load_yaml, dump_yaml
from src.automations.tags import TagManager
from src.yaml_serializer import dump_yaml, load_yaml
from src.yaml_serializer.types import IncludedYaml
from .errors import MissingFile
@@ -25,7 +26,7 @@ class HassConfig:
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()
@@ -35,7 +36,6 @@ class HassConfig:
else:
return TagManager.load(tag_path)
def get_automation_tags_path(self) -> Path:
return self.root_path / ".shortumations" / "tags.yaml"
@@ -66,4 +66,4 @@ class HassConfig:
)
def save_tags(self, tags: TagManager):
tags.save(self.get_automation_tags_path())
tags.save(self.get_automation_tags_path())
+2 -1
View File
@@ -1,5 +1,6 @@
import io
from typing import Any, Union, TextIO
from typing import Any, TextIO, Union
from src.yaml_serializer.base_yaml import yaml
+6 -1
View File
@@ -1,5 +1,10 @@
from ruamel.yaml import YAML
from src.yaml_serializer.types import IncludedYaml, IncludedYamlDir, SecretValue
from src.yaml_serializer.types import (
IncludedYaml,
IncludedYamlDir,
SecretValue,
)
yaml = YAML()
yaml.register_class(IncludedYaml)
+1
View File
@@ -1,4 +1,5 @@
from typing import NamedTuple
from ruamel.yaml.nodes import Node
from ruamel.yaml.representer import BaseRepresenter