feat v1.6.0+v1.6.1 (phase 3): device edit mode — markers model (hybrid auto+manual), click info-card in view / edit dialog in edit; dialog: name/binding-picker(filter,exclude placed+name-dupes,+virtual)/mdi-icon/model/link/description/PDF-upload/room; toolbar + add device; backend MARKER_SCHEMA + file/set upload + files static

custom_components/houseplan/__init__.py

@@ -12,6 +12,8 @@ from homeassistant.helpers.storage import Store
 from . import websocket_api as hp_ws
 from .const import (
     DOMAIN,
+    FILES_DIR,
+    FILES_URL,
     FRONTEND_URL,
     PLANS_DIR,
     PLANS_URL,
@@ -41,7 +43,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     card_path = Path(__file__).parent / "frontend" / "houseplan-card.js"
     plans_path = Path(hass.config.path(PLANS_DIR))
-    await hass.async_add_executor_job(lambda: plans_path.mkdir(parents=True, exist_ok=True))
+    files_path = Path(hass.config.path(FILES_DIR))
+    await hass.async_add_executor_job(
+        lambda: (plans_path.mkdir(parents=True, exist_ok=True), files_path.mkdir(parents=True, exist_ok=True))
+    )
 
     static_paths = []
     try:
@@ -50,11 +55,13 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         if card_path.exists():
             static_paths.append(StaticPathConfig(FRONTEND_URL, str(card_path), cache_headers=False))
         static_paths.append(StaticPathConfig(PLANS_URL, str(plans_path), cache_headers=True))
+        static_paths.append(StaticPathConfig(FILES_URL, str(files_path), cache_headers=True))
         await hass.http.async_register_static_paths(static_paths)
     except ImportError:  # старые версии HA
         if card_path.exists():
             hass.http.register_static_path(FRONTEND_URL, str(card_path), cache_headers=False)
         hass.http.register_static_path(PLANS_URL, str(plans_path), cache_headers=True)
+        hass.http.register_static_path(FILES_URL, str(files_path), cache_headers=True)
 
     if card_path.exists():
         add_extra_js_url(hass, f"{FRONTEND_URL}?v={VERSION}")

custom_components/houseplan/const.py

@@ -7,8 +7,10 @@ STORAGE_VERSION = 1
 FRONTEND_URL = "/houseplan_files/houseplan-card.js"
 PLANS_URL = "/houseplan_files/plans"
 PLANS_DIR = "houseplan/plans"  # относительно каталога конфигурации HA
+FILES_URL = "/houseplan_files/files"
+FILES_DIR = "houseplan/files"
 CONF_ADMIN_ONLY = "admin_only"
-VERSION = "1.5.1"
+VERSION = "1.6.1"
 
 DEFAULT_CONFIG: dict = {
     "spaces": [],

custom_components/houseplan/websocket_api.py

@@ -12,7 +12,10 @@ import voluptuous as vol
 from homeassistant.components import websocket_api
 from homeassistant.core import HomeAssistant, callback
 
-from .const import CONF_ADMIN_ONLY, DEFAULT_CONFIG, DOMAIN, PLANS_DIR, PLANS_URL
+from .const import (
+    CONF_ADMIN_ONLY, DEFAULT_CONFIG, DOMAIN,
+    FILES_DIR, FILES_URL, PLANS_DIR, PLANS_URL,
+)
 
 POS_SCHEMA = vol.Schema(
     {vol.Required("x"): vol.Coerce(float), vol.Required("y"): vol.Coerce(float)},
@@ -66,6 +69,26 @@ VIRTUAL_SCHEMA = vol.Schema(
     },
     extra=vol.ALLOW_EXTRA,
 )
+MARKER_SCHEMA = vol.Schema(
+    {
+        vol.Required("id"): str,
+        # 'device:<device_id>' | 'entity:<entity_id>' | 'virtual'
+        vol.Required("binding"): str,
+        vol.Optional("space"): vol.Any(str, None),
+        vol.Optional("area"): vol.Any(str, None),
+        vol.Optional("hidden"): bool,
+        vol.Optional("name"): vol.Any(str, None),
+        vol.Optional("icon"): vol.Any(str, None),
+        vol.Optional("model"): vol.Any(str, None),
+        vol.Optional("link"): vol.Any(str, None),
+        vol.Optional("description"): vol.Any(str, None),
+        vol.Optional("pdfs"): [
+            vol.Schema({vol.Required("name"): str, vol.Required("url"): str}, extra=vol.ALLOW_EXTRA)
+        ],
+    },
+    extra=vol.ALLOW_EXTRA,
+)
+
 CONFIG_SCHEMA = vol.Schema(
     {
         vol.Required("spaces"): [SPACE_SCHEMA],
@@ -80,6 +103,7 @@ CONFIG_SCHEMA = vol.Schema(
             )
         },
         vol.Optional("virtual_devices", default=list): [VIRTUAL_SCHEMA],
+        vol.Optional("markers", default=list): [MARKER_SCHEMA],
         vol.Optional("settings", default=dict): vol.Schema({}, extra=vol.ALLOW_EXTRA),
     },
     extra=vol.ALLOW_EXTRA,
@@ -88,6 +112,9 @@ CONFIG_SCHEMA = vol.Schema(
 SPACE_ID_RE = re.compile(r"^[a-z0-9_-]{1,64}$")
 PLAN_EXTENSIONS = {"svg": "image/svg+xml", "png": "image/png", "jpg": "image/jpeg", "webp": "image/webp"}
 MAX_PLAN_BYTES = 8 * 1024 * 1024
+FILE_EXTENSIONS = {"pdf", "png", "jpg", "jpeg", "webp", "txt"}
+MAX_FILE_BYTES = 25 * 1024 * 1024
+_SAFE_NAME_RE = re.compile(r"[^A-Za-z0-9._-]+")
 
 
 @callback
@@ -99,6 +126,7 @@ def async_register(hass: HomeAssistant) -> None:
     websocket_api.async_register_command(hass, ws_config_get)
     websocket_api.async_register_command(hass, ws_config_set)
     websocket_api.async_register_command(hass, ws_plan_set)
+    websocket_api.async_register_command(hass, ws_file_set)
 
 
 def _store(hass: HomeAssistant):
@@ -252,3 +280,46 @@ async def ws_plan_set(hass: HomeAssistant, connection, msg: dict[str, Any]) -> N
     connection.send_result(
         msg["id"], {"ok": True, "url": f"{PLANS_URL}/{space_id}.{msg['ext']}?v={mtime}"}
     )
+
+
+@websocket_api.websocket_command(
+    {
+        vol.Required("type"): "houseplan/file/set",
+        vol.Required("marker_id"): str,
+        vol.Required("filename"): str,
+        vol.Required("data"): str,  # base64
+    }
+)
+@websocket_api.async_response
+async def ws_file_set(hass: HomeAssistant, connection, msg: dict[str, Any]) -> None:
+    """Загрузить файл-инструкцию (PDF и т.п.) для маркера; вернуть URL."""
+    if not _check_write(hass, connection):
+        connection.send_error(msg["id"], "unauthorized", "Загрузка файлов разрешена только администраторам")
+        return
+    marker_id = _SAFE_NAME_RE.sub("_", msg["marker_id"])[:64] or "misc"
+    raw_name = msg["filename"].rsplit("/", 1)[-1].rsplit("\\", 1)[-1]
+    ext = raw_name.rsplit(".", 1)[-1].lower() if "." in raw_name else ""
+    if ext not in FILE_EXTENSIONS:
+        connection.send_error(msg["id"], "bad_ext", f"Разрешены: {', '.join(sorted(FILE_EXTENSIONS))}")
+        return
+    safe_name = _SAFE_NAME_RE.sub("_", raw_name)[:120]
+    try:
+        blob = base64.b64decode(msg["data"], validate=True)
+    except (binascii.Error, ValueError):
+        connection.send_error(msg["id"], "invalid_data", "data должен быть корректным base64")
+        return
+    if len(blob) > MAX_FILE_BYTES:
+        connection.send_error(msg["id"], "too_large", f"Файл больше {MAX_FILE_BYTES // 1024 // 1024} МБ")
+        return
+    target_dir = Path(hass.config.path(FILES_DIR)) / marker_id
+    path = target_dir / safe_name
+
+    def _write() -> None:
+        target_dir.mkdir(parents=True, exist_ok=True)
+        path.write_bytes(blob)
+
+    await hass.async_add_executor_job(_write)
+    mtime = int(path.stat().st_mtime)
+    connection.send_result(
+        msg["id"], {"ok": True, "url": f"{FILES_URL}/{marker_id}/{safe_name}?v={mtime}", "name": raw_name}
+    )