Merge pull request #211 from kpustelnik/dev

Update entity (state) & service model

Author: GrandMoff100

.gitignore

@@ -18,7 +18,7 @@ venv/
 .breakpoints
 
 # Informal testing
-main.py
+main*.py
 
 # Cache files
 *.sqlite
@@ -88,6 +88,7 @@ instance/
 # Scrapy stuff:
 .scrapy
 
+
 # Sphinx documentation
 docs/_build/
 

.pre-commit-config.yaml

@@ -5,7 +5,7 @@ repos:
         additional_dependencies:
           - types-requests
           - types-simplejson
-    rev: "v0.931"
+    rev: "v1.17.1"
   - repo: https://github.com/pre-commit/pre-commit-hooks
     hooks:
       - id: trailing-whitespace

compose.yml

@@ -19,7 +19,7 @@ services:
       HOMEASSISTANTAPI_URL: http://server:8123/api
       HOMEASSISTANTAPI_WS_URL: ws://server:8123/api/websocket
       HOMEASSISTANTAPI_TOKEN: ${HOMEASSISTANTAPI_TOKEN}
-      DELAY: 60
+      DELAY: 10
 
 networks:
   default:

docs/conf.py

@@ -27,7 +27,9 @@
 # The full version, including alpha/beta/rc tags
 with open("../pyproject.toml") as f:
     pyproject = f.read()
-    release = version = re.search('version = "(.+?)"', pyproject).group(1)
+    search_result = re.search('version = "(.+?)"', pyproject)
+    assert search_result is not None
+    release = version = search_result.group(1)
 
 # -- General configuration ---------------------------------------------------
 
@@ -46,6 +48,8 @@
     "sphinx.ext.autosectionlabel",
 ]
 
+autodoc_pydantic_model_show_json = False
+
 resource_links = {
     "repo": "https://github.com/GrandMoff100/HomeassistantAPI/",
     "issues": "https://github.com/GrandMoff100/HomeassistantAPI/issues",

entrypoint.sh

@@ -1,3 +1,5 @@
 . .venv/bin/activate
+echo "Waiting $DELAY seconds for Home Assistant to start..."
 python -c "import time; time.sleep($DELAY)"
+echo "Finished waiting $DELAY seconds. Starting tests..."
 pytest tests --disable-warnings --cov --cov-report xml:coverage/coverage.xml

homeassistant_api/models/base.py

@@ -6,6 +6,11 @@
 from pydantic import BaseModel as PydanticBaseModel
 from pydantic import ConfigDict, PlainSerializer
 
+__all__ = (
+    "BaseModel",
+    "DatetimeIsoField",
+)
+
 DatetimeIsoField = Annotated[
     datetime,
     PlainSerializer(lambda x: x.isoformat(), return_type=str, when_used="json"),
@@ -18,4 +23,6 @@ class BaseModel(PydanticBaseModel):
     model_config = ConfigDict(
         arbitrary_types_allowed=True,
         validate_assignment=True,
+        extra="forbid",
+        protected_namespaces=(),
     )