Compare commits

..

3 Commits

Author SHA1 Message Date
John Lancaster
475bdb9dd9 simple fixes 2025-06-20 08:50:43 -05:00
John Lancaster
ba043554dc linting 2025-06-20 08:30:46 -05:00
John Lancaster
bd5c7ee339 updated ruff rules 2025-06-20 08:29:28 -05:00
16 changed files with 58 additions and 39 deletions

View File

@@ -4,5 +4,4 @@ logger = logging.getLogger('AppDaemon.Perimeter')
logger.info('Imported statemachine')
class StateMachine:
...
class StateMachine: ...

View File

@@ -5,8 +5,8 @@ from dataclasses import dataclass
class Rule1:
state: str
@dataclass
class Rule2:
value: int
other: str = "default" # test changing this
other: str = 'default' # test changing this

View File

@@ -2,5 +2,5 @@ from appdaemon.adapi import ADAPI
class GrandParent(ADAPI):
def initialize(self):
def initialize(self) -> None:
self.log(f'{self.__class__.__name__} Initialized')

View File

@@ -2,5 +2,5 @@ from appdaemon.adapi import ADAPI
class Parent(ADAPI):
def initialize(self):
def initialize(self) -> None:
self.log(f'{self.__class__.__name__} Initialized')

View File

@@ -1,7 +1,6 @@
from child import Child
class Sibling(Child):
def initialize(self):
def initialize(self) -> None:
self.log(f'{self.__class__.__name__} Initialized')

View File

@@ -1,5 +1,4 @@
from dataclasses import dataclass, field
from typing import List
from .base import FoodItem
from .eggs import Eggs
@@ -12,7 +11,7 @@ class GreenEggs(Eggs):
@dataclass
class Menu:
dishes: List[type[FoodItem]] = field(init=False)
dishes: list[type[FoodItem]] = field(init=False)
def __post_init__(self):
self.dishes = [GreenEggs, Ham]

View File

@@ -13,4 +13,5 @@ class Utensil(Enum):
POT = auto()
PAN = auto()
GLOBAL_VAR = Utensil.FORK

View File

@@ -5,7 +5,7 @@ from food.menu import Menu
class Restaurant(ADAPI):
menu: Menu
def initialize(self):
def initialize(self) -> None:
self.log(f'{self.__class__.__name__} initialized')
self.menu = Menu()

View File

@@ -1,18 +1,22 @@
import logging
from enum import Enum
GLOBAL_VAR = "Hello, World!"
LOGGER = logging.getLogger('AppDaemon._globals')
def global_function():
print('This is a global function.')
GLOBAL_VAR = 'Hello, World!'
def global_function() -> None:
LOGGER.info('This is a global function.')
class GlobalClass:
def __init__(self):
def __init__(self) -> None:
self.value = 'This is a global class instance.'
def display(self):
print(self.value)
def display(self) -> None:
LOGGER.info(self.value)
class ModeSelect(Enum):

View File

@@ -3,8 +3,9 @@ from typing import Any
logger = logging.getLogger('AppDaemon.Perimeter')
class HAL:
def __init__(self, *args: Any, **kwargs: Any):
def __init__(self, *args: Any, **kwargs: Any) -> None:
self.args = args
self.kwargs = kwargs
logger.info('Logging from HAL')

View File

@@ -1,8 +1,9 @@
CONSTANTS = {
'A': 1,
'B': 2,
'C': 3
'C': 3,
}
def utility_function():
return 123, 456

View File

@@ -12,17 +12,16 @@ simple_app:
# dependencies:
# - hello_world
base_app:
module: simple
class: BaseApp
AppA:
module: app_a
class: AppA
dependencies:
- AppB # This is only set to demonstrate forcing it to load after AppB
# AppA:
# module: app_a
# class: AppA
# dependencies:
# - AppB # This is only set to demonstrate forcing it to load after AppB
AppB:
module: app_b
class: AppB
# AppB:
# module: app_b
# class: AppB

View File

@@ -10,14 +10,15 @@ from appdaemon.adapi import ADAPI
# fake/
# SimpleApp
class HelloWorld(ADAPI):
def initialize(self):
def initialize(self) -> None:
self.log(f'{self.__class__.__name__} Initialized')
self.log('+' * 50)
# fake
self.register_service("my_domain/my_exciting_service", self.my_exciting_cb)
self.register_service('my_domain/my_exciting_service', self.my_exciting_cb)
def my_exciting_cb(self, *args: str, my_arg: int = 0, **kwargs: Any) -> Any:
namespace, domain, service = args
self.log(f"Service {domain}/{service} in the {namespace} namepsace called with {kwargs}")
self.log(f'Service {domain}/{service} in the {namespace} namepsace called with {kwargs}')
return 999 + my_arg

View File

@@ -8,7 +8,7 @@ class SimpleApp(Hass):
match self.ping():
case float() as ping:
ping = utils.format_timedelta(ping)
self.log(f"{self.__class__.__name__} Initialized: {ping}")
self.log(f'{self.__class__.__name__} Initialized: {ping}')
case _:
pass
@@ -17,5 +17,5 @@ class BaseApp(ADBase):
def initialize(self) -> None:
self.adapi = self.get_ad_api()
self.log = self.adapi.log
self.hassapi = self.get_plugin_api("HASS")
assert isinstance(self.hassapi, Hass), "HASS API not available"
self.hassapi = self.get_plugin_api('HASS')
assert isinstance(self.hassapi, Hass), 'HASS API not available'

View File

@@ -1,14 +1,29 @@
line-length = 88
line-length = 100
target-version = "py312"
[format]
quote-style = "single"
indent-style = "space"
[lint]
exclude = [
"conf/apps/simple_app/malformed.py"
]
select = ["ALL"]
extend-ignore = ["ANN", "D", "E501", "COM812", "ERA001", "S101", "INP001"]
extend-ignore = [
"ANN",
"BLE001",
"COM812",
"D",
"E501",
"ERA001",
"INP001",
"S101",
]
[format]
quote-style = "single"
indent-style = "space"
[lint.flake8-quotes]
inline-quotes = "single"
docstring-quotes = "double"
multiline-quotes = "double"