ha-mcp-dev 7.3.0.dev397__tar.gz → 7.3.0.dev399__tar.gz

{ha_mcp_dev-7.3.0.dev397/src/ha_mcp_dev.egg-info → ha_mcp_dev-7.3.0.dev399}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.3.0.dev397
+Version: 7.3.0.dev399
 Summary: Home Assistant MCP Server - Complete control of Home Assistant through MCP
 Author-email: Julien <github@qc-h.net>
 License: MIT

{ha_mcp_dev-7.3.0.dev397 → ha_mcp_dev-7.3.0.dev399}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "7.3.0.dev397"
+version = "7.3.0.dev399"
 description = "Home Assistant MCP Server - Complete control of Home Assistant through MCP"
 readme = "README.md"
 requires-python = ">=3.13,<3.14"

{ha_mcp_dev-7.3.0.dev397 → ha_mcp_dev-7.3.0.dev399}/src/ha_mcp/__init__.py

@@ -5,7 +5,9 @@ A Model Context Protocol server that provides complete control over Home Assista
 through REST API and WebSocket integration with 20+ enhanced tools.
 """
 
-__version__ = "7.3.0"
+from ._version import get_version
+
+__version__ = get_version()
 __author__ = "Julien"
 __license__ = "MIT"
 

{ha_mcp_dev-7.3.0.dev397 → ha_mcp_dev-7.3.0.dev399}/src/ha_mcp/__main__.py

@@ -30,6 +30,8 @@ import threading  # noqa: E402
 from collections.abc import Coroutine  # noqa: E402
 from typing import TYPE_CHECKING, Any  # noqa: E402
 
+from fastmcp.exceptions import ToolError  # noqa: E402
+from pydantic import ValidationError as PydanticValidationError  # noqa: E402
 from starlette.requests import Request  # noqa: E402
 from starlette.responses import PlainTextResponse  # noqa: E402
 
@@ -281,6 +283,7 @@ def _setup_standard_mode() -> None:
     settings = get_settings()
     _validate_standard_credentials(settings)
     _setup_logging(settings.log_level)
+    _log_startup_version()
 
 
 def _http_run_kwargs(transport: str, port: int, path: str) -> dict:
@@ -365,6 +368,36 @@ class StatelessSessionLogFilter(logging.Filter):
         return True
 
 
+class ToolValidationLogFilter(logging.Filter):
+    """Demote fastmcp tool-failure tracebacks to single-line warnings.
+
+    Pydantic ValidationError and tool-raised ToolError aren't server bugs,
+    so the traceback through fastmcp/pydantic internals is just noise. The
+    structured error detail is preserved in the WARNING message; stack is
+    intentionally dropped because these are user-input errors, not bugs.
+    """
+
+    def filter(self, record: logging.LogRecord) -> bool:
+        if record.name != "fastmcp.server.server" or not record.exc_info:
+            return True
+
+        msg = record.getMessage()
+        err = record.exc_info[1]
+        if "Error validating tool" in msg and isinstance(err, PydanticValidationError):
+            record.msg = f"{msg}: {err.errors(include_url=False)}"
+        elif "Error calling tool" in msg and isinstance(err, ToolError):
+            record.msg = f"{msg}: {err}"
+        else:
+            return True
+
+        record.args = ()
+        record.levelno = logging.WARNING
+        record.levelname = "WARNING"
+        record.exc_info = None
+        record.exc_text = None
+        return True
+
+
 def _setup_logging(log_level_str: str, force: bool = False) -> None:
     """Configure root logger with consistent timestamp format."""
     logging.basicConfig(
@@ -376,6 +409,26 @@ def _setup_logging(log_level_str: str, force: bool = False) -> None:
     logging.getLogger("mcp.server.streamable_http").addFilter(
         StatelessSessionLogFilter()
     )
+    logging.getLogger("fastmcp.server.server").addFilter(ToolValidationLogFilter())
+
+
+def _log_startup_version() -> None:
+    """Log ha-mcp version at startup, plus a dev-channel banner when relevant.
+
+    The dev banner only fires for standalone dev installs (Docker ``:dev`` /
+    ``:latest``, or ``pip install ha-mcp-dev``). It is suppressed under the HA
+    Supervisor because add-on users already pick dev vs stable in the HAOS UI.
+    """
+    from ha_mcp._version import get_version, is_dev_version, is_running_in_addon
+
+    version = get_version()
+    logger.info(f"ha-mcp {version}")
+    if is_dev_version(version) and not is_running_in_addon():
+        logger.warning(
+            "This is the dev channel. For the stable release use the "
+            "'ghcr.io/homeassistant-ai/ha-mcp:stable' Docker tag "
+            "(or 'pip install ha-mcp' on PyPI)."
+        )
 
 
 def _get_timestamped_uvicorn_log_config() -> dict:
@@ -547,9 +600,9 @@ def main() -> None:
     """Run server via CLI using FastMCP's stdio transport."""
     # Handle --version flag early, before server creation requires config
     if "--version" in sys.argv or "-V" in sys.argv:
-        from importlib.metadata import version
+        from ha_mcp._version import get_version
 
-        print(f"ha-mcp {version('ha-mcp-dev')}")
+        print(f"ha-mcp {get_version()}")
         sys.exit(0)
 
     # Check for smoke test flag
@@ -572,6 +625,7 @@ def main() -> None:
         sys.exit(1)
 
     _setup_logging(settings.log_level)
+    _log_startup_version()
 
     _run_entrypoint(_run_with_graceful_shutdown(), "Server")
 
@@ -747,6 +801,7 @@ def main_oauth() -> None:
     for logger_name in ["ha_mcp", "ha_mcp.auth", "ha_mcp.auth.provider"]:
         logging.getLogger(logger_name).setLevel(getattr(logging, log_level))
     logger.info(f"OAuth mode logging configured at {log_level} level")
+    _log_startup_version()
 
     port, path = _get_http_runtime(default_port=8086)
     base_url = os.getenv("MCP_BASE_URL")

ha_mcp_dev-7.3.0.dev399/src/ha_mcp/_version.py

@@ -0,0 +1,58 @@
+"""Version resolution for the ha-mcp package.
+
+Kept as a standalone module (no other ``ha_mcp`` imports) so it can be used from
+``__init__.py`` and ``config.py`` without circular-import risk.
+"""
+
+from __future__ import annotations
+
+import importlib.metadata
+import logging
+import os
+
+logger = logging.getLogger(__name__)
+
+
+def get_version() -> str:
+    """Return the installed ha-mcp version.
+
+    Resolution order:
+    1. ``HA_MCP_BUILD_VERSION`` env var — set by Docker/add-on builds that can't
+       rewrite ``pyproject.toml`` before install, so the dev suffix still reaches
+       the running process. Stable builds leave it unset.
+    2. ``ha-mcp`` package metadata — stable PyPI + stable Docker.
+    3. ``ha-mcp-dev`` package metadata — PyPI dev channel (renamed package).
+
+    If none of the above resolve, logs a warning and returns ``"unknown"``.
+    The "unknown" string is itself diagnostic in bug reports and startup logs
+    — it tells triagers the install didn't register package metadata (e.g. a
+    source checkout without ``pip install -e .``, or a broken Docker layer).
+    """
+    if override := os.environ.get("HA_MCP_BUILD_VERSION"):
+        return override
+    for pkg_name in ("ha-mcp", "ha-mcp-dev"):
+        try:
+            return importlib.metadata.version(pkg_name)
+        except importlib.metadata.PackageNotFoundError:
+            continue
+    logger.warning(
+        "ha-mcp package metadata not found and HA_MCP_BUILD_VERSION unset — "
+        "version will be reported as 'unknown'. Reinstall the package or set "
+        "HA_MCP_BUILD_VERSION if this is an intentional source-tree run."
+    )
+    return "unknown"
+
+
+def is_dev_version(version: str) -> bool:
+    """Return True when the version string contains a PEP 440 ``.dev`` suffix."""
+    return ".dev" in version
+
+
+def is_running_in_addon() -> bool:
+    """Return True when running inside a Home Assistant add-on container.
+
+    The HA Supervisor injects ``SUPERVISOR_TOKEN`` into every add-on's env.
+    Checked so the standalone-Docker ``:stable`` banner isn't shown to add-on
+    users, who already see the dev/stable distinction in the HAOS add-on UI.
+    """
+    return bool(os.environ.get("SUPERVISOR_TOKEN"))

{ha_mcp_dev-7.3.0.dev397 → ha_mcp_dev-7.3.0.dev399}/src/ha_mcp/config.py

@@ -2,22 +2,20 @@
 Configuration management for Home Assistant MCP Server.
 """
 
-import importlib.metadata
 import os
 
 # Load environment variables from .env file with HAMCP_ENV_FILE support
 # Use absolute path to ensure .env is found regardless of cwd
 from pathlib import Path
 
-try:
-    _PACKAGE_VERSION = importlib.metadata.version("ha-mcp")
-except importlib.metadata.PackageNotFoundError:
-    _PACKAGE_VERSION = "unknown"
-
 from dotenv import load_dotenv
 from pydantic import Field, field_validator, model_validator
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
+from ha_mcp._version import get_version
+
+_PACKAGE_VERSION = get_version()
+
 project_root = Path(__file__).parent.parent.parent
 
 # Demo environment token - use HOMEASSISTANT_TOKEN="demo" to connect to the public demo

{ha_mcp_dev-7.3.0.dev397 → ha_mcp_dev-7.3.0.dev399/src/ha_mcp_dev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.3.0.dev397
+Version: 7.3.0.dev399
 Summary: Home Assistant MCP Server - Complete control of Home Assistant through MCP
 Author-email: Julien <github@qc-h.net>
 License: MIT

{ha_mcp_dev-7.3.0.dev397 → ha_mcp_dev-7.3.0.dev399}/src/ha_mcp_dev.egg-info/SOURCES.txt

@@ -5,6 +5,7 @@ pyproject.toml
 src/ha_mcp/__init__.py
 src/ha_mcp/__main__.py
 src/ha_mcp/_pypi_marker
+src/ha_mcp/_version.py
 src/ha_mcp/config.py
 src/ha_mcp/errors.py
 src/ha_mcp/py.typed