Fixes related to hrvstatus and body composition data

Bump vulture from 2.11 to 2.14

.devcontainer.json

@@ -0,0 +1,58 @@
+{
+  "name": "cyberjunky/home-assistant-garmin_connect",
+  "image": "mcr.microsoft.com/vscode/devcontainers/python:0-3.11-bullseye",
+  "postCreateCommand": "scripts/setup",
+  "forwardPorts": [
+    8123
+  ],
+  "portsAttributes": {
+    "8123": {
+      "label": "Home Assistant"
+    },
+    "0-8122": {
+      "label": "Auto-Forwarded - Other",
+      "onAutoForward": "ignore"
+    },
+    "8124-999999": {
+      "label": "Auto-Forwarded - Other",
+      "onAutoForward": "ignore"
+    }
+  },
+  "customizations": {
+    "extensions": [
+      "ms-python.python",
+      "github.vscode-pull-request-github",
+      "ryanluker.vscode-coverage-gutters",
+      "ms-python.vscode-pylance"
+    ],
+    "vscode": {
+      "settings": {
+        "python.defaultInterpreterPath": "/usr/local/bin/python",
+        "files.eol": "\n",
+        "editor.tabSize": 4,
+        "python.pythonPath": "/usr/local/python/bin/python",
+        "python.analysis.autoSearchPaths": false,
+        "python.linting.pylintArgs": [
+          "--disable",
+          "import-error"
+        ],
+        "python.formatting.provider": "black",
+        "editor.formatOnPaste": false,
+        "editor.formatOnSave": true,
+        "editor.formatOnType": true,
+        "files.trimTrailingWhitespace": true
+      },
+      "extensions": [
+        "github.vscode-pull-request-github",
+        "ms-python.python",
+        "ms-python.vscode-pylance",
+        "ms-vscode.makefile-tools",
+        "ryanluker.vscode-coverage-gutters"
+      ]
+    }
+  },
+  "remoteUser": "vscode",
+  "features": {
+    "rust": "latest"
+  }
+}

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

.github/dependabot.yml

@@ -0,0 +1,15 @@
+# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    ignore:
+      # Dependabot should not update Home Assistant as that should match the homeassistant key in hacs.json
+      - dependency-name: "homeassistant"

.github/pre-commit-config.yaml

@@ -0,0 +1,50 @@
+repos:
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v2.34.0
+    hooks:
+      - id: pyupgrade
+        stages: [manual]
+        args:
+          - "--py39-plus"
+
+  - repo: https://github.com/pycqa/isort
+    rev: 5.12.0
+    hooks:
+      - id: isort
+        name: isort (python)
+
+  - repo: https://github.com/psf/black
+    rev: 23.1.0
+    hooks:
+      - id: black
+        stages: [manual]
+        args:
+          - --safe
+          - --quiet
+        files: ^((custom_components|script|tests)/.+)?[^/]+\.py$
+
+  - repo: https://github.com/codespell-project/codespell
+    rev: v2.1.0
+    hooks:
+      - id: codespell
+        stages: [manual]
+        args:
+          - --quiet-level=2
+          - --ignore-words-list=hass,ba,fo
+          - --exclude-file=custom_components/hacs/utils/default.repositories
+
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.3.0
+    hooks:
+      - id: check-executables-have-shebangs
+        stages: [manual]
+      - id: check-json
+        stages: [manual]
+      - id: requirements-txt-fixer
+        stages: [manual]
+      - id: check-ast
+        stages: [manual]
+      - id: mixed-line-ending
+        stages: [manual]
+        args:
+          - --fix=lf

.github/release.yml

@@ -0,0 +1,25 @@
+changelog:
+  categories:
+    - title: '💥 Breaking changes'
+      labels:
+        - 'Breaking Change'
+
+    - title: '🛎️ Experimental'
+      labels:
+        - 'Experimental'
+
+    - title: '✨ New features'
+      labels:
+        - 'pr: new-feature'
+
+    - title: '⚡ Enhancements'
+      labels:
+        - 'pr: enhancement'
+
+    - title: '♻️ Refactor'
+      labels:
+        - 'pr: refactor'
+
+    - title: '🐛 Bug Fixes'
+      labels:
+        - 'pr: bugfix'

.github/workflows/hassfest.yaml

@@ -0,0 +1,14 @@
+name: Validate with hassfest
+
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: "0 0 * * *"
+
+jobs:
+  validate:
+    runs-on: "ubuntu-latest"
+    steps:
+      - uses: "actions/checkout@v4"
+      - uses: home-assistant/actions/hassfest@master

.gitignore

@@ -1,3 +1,15 @@
+# misc
+.vscode
+outputdata
+settings.json
+
+# Translation files
+custom_components/garmin_connect/translations
+!custom_components/garmin_connect/translations/en.json
+
+# Home Assistant configuration
+config
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

.pre-commit-config.yaml

@@ -0,0 +1,89 @@
+ci:
+  skip:
+    - mypy
+    - pylint
+
+default_language_version:
+  python: python3.11
+
+repos:
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.15.0
+    hooks:
+      - id: pyupgrade
+        args: [--py310-plus]
+  - repo: https://github.com/psf/black
+    rev: 23.12.1
+    hooks:
+      - id: black
+        args:
+          - --safe
+          - --quiet
+        <<: &python-files-with-tests
+          files: ^((custom_components|tests)/.+)?[^/]+\.py$
+  - repo: https://github.com/PyCQA/flake8
+    rev: 6.1.0
+    hooks:
+      - id: flake8
+        additional_dependencies:
+          - flake8-docstrings==1.6.0
+          - pydocstyle==6.1.1
+        <<: &python-files
+          files: ^(custom_components/.+)?[^/]+\.py$
+  - repo: https://github.com/PyCQA/bandit
+    rev: 1.7.6
+    hooks:
+      - id: bandit
+        args:
+          - --quiet
+          - --format=custom
+          - --configfile=bandit.yaml
+        <<: *python-files-with-tests
+  - repo: https://github.com/PyCQA/isort
+    rev: 5.13.2
+    hooks:
+      - id: isort
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.5.0
+    hooks:
+      - id: check-executables-have-shebangs
+      - id: check-merge-conflict
+      - id: detect-private-key
+      - id: no-commit-to-branch
+      - id: requirements-txt-fixer
+      - id: mixed-line-ending
+        args:
+          - --fix=lf
+        stages: [manual]
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: v4.0.0-alpha.8
+    hooks:
+      - id: prettier
+        additional_dependencies:
+          - prettier@2.7.1
+          - prettier-plugin-sort-json@0.0.3
+        exclude_types:
+          - python
+        exclude: manifest\.json$
+  - repo: https://github.com/adrienverge/yamllint.git
+    rev: v1.33.0
+    hooks:
+      - id: yamllint
+  - repo: local
+    hooks:
+      # Run mypy through our wrapper script in order to get the possible
+      # pyenv and/or virtualenv activated; it may not have been e.g. if
+      # committing from a GUI tool that was not launched from an activated
+      # shell.
+      - id: mypy
+        name: Check with mypy
+        entry: scripts/run-in-env.sh mypy
+        language: script
+        types: [python]
+        <<: *python-files
+      - id: pylint
+        name: Check with pylint
+        entry: scripts/run-in-env.sh pylint
+        language: script
+        types: [python]
+        <<: *python-files

.prettierrc

@@ -0,0 +1,3 @@
+{
+  "jsonRecursiveSort": true
+}

.ruff.toml

@@ -0,0 +1,48 @@
+# The contents of this file is based on https://github.com/home-assistant/core/blob/dev/pyproject.toml
+
+target-version = "py310"
+
+select = [
+    "B007",    # Loop control variable {name} not used within loop body
+    "B014",    # Exception handler with duplicate exception
+    "C",       # complexity
+    "D",       # docstrings
+    "E",       # pycodestyle
+    "F",       # pyflakes/autoflake
+    "ICN001",  # import concentions; {name} should be imported as {asname}
+    "PGH004",  # Use specific rule codes when using noqa
+    "PLC0414", # Useless import alias. Import alias does not rename original package.
+    "SIM105",  # Use contextlib.suppress({exception}) instead of try-except-pass
+    "SIM117",  # Merge with-statements that use the same scope
+    "SIM118",  # Use {key} in {dict} instead of {key} in {dict}.keys()
+    "SIM201",  # Use {left} != {right} instead of not {left} == {right}
+    "SIM212",  # Use {a} if {a} else {b} instead of {b} if not {a} else {a}
+    "SIM300",  # Yoda conditions. Use 'age == 42' instead of '42 == age'.
+    "SIM401",  # Use get from dict with default instead of an if block
+    "T20",     # flake8-print
+    "TRY004",  # Prefer TypeError exception for invalid type
+    "RUF006",  # Store a reference to the return value of asyncio.create_task
+    "UP",      # pyupgrade
+    "W",       # pycodestyle
+]
+
+ignore = [
+    "D202", # No blank lines allowed after function docstring
+    "D203", # 1 blank line required before class docstring
+    "D213", # Multi-line docstring summary should start at the second line
+    "D404", # First word of the docstring should not be This
+    "D406", # Section name should end with a newline
+    "D407", # Section name underlining
+    "D411", # Missing blank line before section
+    "E501", # line too long
+    "E731", # do not assign a lambda expression, use a def
+]
+
+[flake8-pytest-style]
+fixture-parentheses = false
+
+[pyupgrade]
+keep-runtime-typing = true
+
+[mccabe]
+max-complexity = 25

.yamlllint

@@ -0,0 +1,59 @@
+rules:
+  braces:
+    level: error
+    min-spaces-inside: 0
+    max-spaces-inside: 1
+    min-spaces-inside-empty: -1
+    max-spaces-inside-empty: -1
+  brackets:
+    level: error
+    min-spaces-inside: 0
+    max-spaces-inside: 0
+    min-spaces-inside-empty: -1
+    max-spaces-inside-empty: -1
+  colons:
+    level: error
+    max-spaces-before: 0
+    max-spaces-after: 1
+  commas:
+    level: error
+    max-spaces-before: 0
+    min-spaces-after: 1
+    max-spaces-after: 1
+  comments:
+    level: error
+    require-starting-space: true
+    min-spaces-from-content: 2
+  comments-indentation:
+    level: error
+  document-end:
+    level: error
+    present: false
+  document-start:
+    level: error
+    present: false
+  empty-lines:
+    level: error
+    max: 1
+    max-start: 0
+    max-end: 1
+  hyphens:
+    level: error
+    max-spaces-after: 1
+  indentation:
+    level: error
+    spaces: 2
+    indent-sequences: true
+    check-multi-line-strings: false
+  key-duplicates:
+    level: error
+  line-length: disable
+  new-line-at-end-of-file:
+    level: error
+  new-lines:
+    level: error
+    type: unix
+  trailing-spaces:
+    level: error
+  truthy:
+    disable

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Ron Klinkien
+Copyright (c) 2021-2024 Ron Klinkien
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -135,6 +135,39 @@ Metabolic Age
 
 ![screenshot](https://github.com/cyberjunky/home-assistant-garmin_connect/blob/main/screenshots/garmin_connect.png?raw=true "Screenshot Garmin Connect")
 
+## Tips and Tricks
+
+### Set up an automation using the garmin_connect.add_body_composition service
+
+Useful if you want to pass your weight from another (incompatible) device to Garmin Connect. Garmin Connect does not calculate your BMI when you enter your weight manually so it needs to be passed along for now.  
+
+```
+alias: uiSendWeightToGarminConnect
+description: ""
+trigger:
+  - platform: state
+    entity_id:
+      - sensor.my_weight
+condition:
+  - condition: and
+    conditions:
+      - condition: numeric_state
+        entity_id: sensor.my_weight
+        above: 75
+      - condition: numeric_state
+        entity_id: sensor.my_weight
+        below: 88
+action:
+  - service: garmin_connect.add_body_composition
+    data:
+      entity_id: sensor.garmin_connect_weight
+      weight: "{{trigger.to_state.state}}"
+      timestamp: "{{ as_timestamp(now())  | timestamp_local}}"
+      bmi: >-
+        {{ (trigger.to_state.state | float(0) / 1.86**2 )| round(1, default=0)
+        }}
+mode: single
+```
 ## Debugging
 
 Add the relevant lines below to the `configuration.yaml`:

bandit.yaml

@@ -0,0 +1,20 @@
+# https://bandit.readthedocs.io/en/latest/config.html
+
+tests:
+  - B103
+  - B108
+  - B306
+  - B307
+  - B313
+  - B314
+  - B315
+  - B316
+  - B317
+  - B318
+  - B319
+  - B320
+  - B601
+  - B602
+  - B604
+  - B608
+  - B609

custom_components/garmin_connect/__init__.py

@@ -104,7 +104,6 @@ class GarminConnectDataUpdateCoordinator(DataUpdateCoordinator):
 
         summary = {}
         body = {}
-        activites = {}
         alarms = {}
         gear = {}
         gear_stats = {}
@@ -112,13 +111,15 @@ class GarminConnectDataUpdateCoordinator(DataUpdateCoordinator):
         activity_types = {}
         sleep_data = {}
         sleep_score = None
-        
+        hrv_data = {}
+        hrvStatus = {"status": "UNKNOWN"}
+
         try:
             summary = await self.hass.async_add_executor_job(
                 self._api.get_user_summary, date.today().isoformat()
             )
             _LOGGER.debug(f"Summary data: {summary}")
-            
+
             body = await self.hass.async_add_executor_job(
                 self._api.get_body_composition, date.today().isoformat()
             )
@@ -130,6 +131,12 @@ class GarminConnectDataUpdateCoordinator(DataUpdateCoordinator):
             _LOGGER.debug(f"Activities data: {activities}")
             summary['lastActivities'] = activities
 
+            badges = await self.hass.async_add_executor_job(
+                self._api.get_earned_badges
+            )
+            _LOGGER.debug(f"Badges data: {badges}")
+            summary['badges'] = badges
+
             alarms = await self.hass.async_add_executor_job(self._api.get_device_alarms)
             _LOGGER.debug(f"Alarms data: {alarms}")
 
@@ -141,10 +148,14 @@ class GarminConnectDataUpdateCoordinator(DataUpdateCoordinator):
             sleep_data = await self.hass.async_add_executor_job(
                 self._api.get_sleep_data, date.today().isoformat())
             _LOGGER.debug(f"Sleep data: {sleep_data}")
+
+            hrv_data = await self.hass.async_add_executor_job(
+                self._api.get_hrv_data, date.today().isoformat())
+            _LOGGER.debug(f"hrv data: {hrv_data}")
         except (
             GarminConnectAuthenticationError,
             GarminConnectTooManyRequestsError,
-            GarminConnectConnectionError,
+            GarminConnectConnectionError
         ) as error:
             _LOGGER.debug("Trying to relogin to Garmin Connect")
             if not await self.async_login():
@@ -179,6 +190,13 @@ class GarminConnectDataUpdateCoordinator(DataUpdateCoordinator):
         except KeyError:
             _LOGGER.debug("Sleep score data is not available")
 
+        try:
+            if "hrvSummary" in hrv_data:
+                hrvStatus = hrv_data["hrvSummary"]
+                _LOGGER.debug(f"HRV status: {hrvStatus} ")
+        except KeyError:
+            _LOGGER.debug("HRV data is not available")
+
         return {
             **summary,
             **body["totalAverage"],
@@ -188,6 +206,7 @@ class GarminConnectDataUpdateCoordinator(DataUpdateCoordinator):
             "activity_types": activity_types,
             "gear_defaults": gear_defaults,
             "sleepScore": sleep_score,
+            "hrvStatus": hrvStatus,
         }
 
     async def set_active_gear(self, entity, service_data):
@@ -257,3 +276,19 @@ class GarminConnectDataUpdateCoordinator(DataUpdateCoordinator):
                     service_data.data.get("visceral_fat_rating", None),
                     service_data.data.get("bmi", None)
         )
+
+    async def add_blood_pressure(self, entity, service_data):
+        """Record a blood pressure measurement"""
+
+        if not await self.async_login():
+            raise IntegrationError(
+                "Failed to login to Garmin Connect, unable to update"
+            )
+
+        await self.hass.async_add_executor_job(
+            self._api.set_blood_pressure,
+                    service_data.data.get('systolic'),
+                    service_data.data.get('diastolic'),
+                    service_data.data.get('pulse'),
+                    service_data.data.get('note', None)
+        )

custom_components/garmin_connect/alarm_util.py

@@ -19,8 +19,7 @@ DAY_TO_NUMBER = {
 
 
 def calculate_next_active_alarms(alarms):
-    """
-    Calculate garmin next active alarms from settings.
+    """Calculate garmin next active alarms from settings.
 
     Alarms are sorted by time
     """

custom_components/garmin_connect/const.py

@@ -1,6 +1,5 @@
 """Constants for the Garmin Connect integration."""
 from datetime import timedelta
-from enum import Enum
 from typing import NamedTuple
 
 from homeassistant.const import (
@@ -138,11 +137,11 @@ GARMIN_ENTITY_LIST = {
         SensorStateClass.TOTAL,
         True,
     ],
-    "minHeartRate": ["Min Heart Rate", "bpm", "mdi:heart-pulse", None, SensorStateClass.TOTAL, True],
-    "maxHeartRate": ["Max Heart Rate", "bpm", "mdi:heart-pulse", None, SensorStateClass.TOTAL, True],
-    "restingHeartRate": ["Resting Heart Rate", "bpm", "mdi:heart-pulse", None, SensorStateClass.TOTAL, True],
-    "minAvgHeartRate": ["Min Avg Heart Rate", "bpm", "mdi:heart-pulse", None, SensorStateClass.TOTAL, False],
-    "maxAvgHeartRate": ["Max Avg Heart Rate", "bpm", "mdi:heart-pulse", None, SensorStateClass.TOTAL, False],
+    "minHeartRate": ["Min Heart Rate", "bpm", "mdi:heart-pulse", None, SensorStateClass.MEASUREMENT, True],
+    "maxHeartRate": ["Max Heart Rate", "bpm", "mdi:heart-pulse", None, SensorStateClass.MEASUREMENT, True],
+    "restingHeartRate": ["Resting Heart Rate", "bpm", "mdi:heart-pulse", None, SensorStateClass.MEASUREMENT, True],
+    "minAvgHeartRate": ["Min Avg Heart Rate", "bpm", "mdi:heart-pulse", None, SensorStateClass.MEASUREMENT, False],
+    "maxAvgHeartRate": ["Max Avg Heart Rate", "bpm", "mdi:heart-pulse", None, SensorStateClass.MEASUREMENT, False],
     "abnormalHeartRateAlertsCount": [
         "Abnormal HR Counts",
         None,
@@ -156,11 +155,11 @@ GARMIN_ENTITY_LIST = {
         "bpm",
         "mdi:heart-pulse",
         None,
-        SensorStateClass.TOTAL,
+        SensorStateClass.MEASUREMENT,
         False,
     ],
-    "averageStressLevel": ["Avg Stress Level", "lvl", "mdi:flash-alert", None, SensorStateClass.TOTAL, True],
-    "maxStressLevel": ["Max Stress Level", "lvl", "mdi:flash-alert", None, SensorStateClass.TOTAL, True],
+    "averageStressLevel": ["Avg Stress Level", "lvl", "mdi:flash-alert", None, SensorStateClass.MEASUREMENT, True],
+    "maxStressLevel": ["Max Stress Level", "lvl", "mdi:flash-alert", None, SensorStateClass.MEASUREMENT, True],
     "stressQualifier": ["Stress Qualifier", None, "mdi:flash-alert", None, None, False],
     "stressDuration": ["Stress Duration", UnitOfTime.MINUTES, "mdi:flash-alert", None, SensorStateClass.TOTAL, False],
     "restStressDuration": [
@@ -224,7 +223,7 @@ GARMIN_ENTITY_LIST = {
         PERCENTAGE,
         "mdi:flash-alert",
         None,
-        SensorStateClass.TOTAL,
+        SensorStateClass.MEASUREMENT,
         False,
     ],
     "restStressPercentage": [
@@ -232,7 +231,7 @@ GARMIN_ENTITY_LIST = {
         PERCENTAGE,
         "mdi:flash-alert",
         None,
-        SensorStateClass.TOTAL,
+        SensorStateClass.MEASUREMENT,
         False,
     ],
     "activityStressPercentage": [
@@ -240,7 +239,7 @@ GARMIN_ENTITY_LIST = {
         PERCENTAGE,
         "mdi:flash-alert",
         None,
-        SensorStateClass.TOTAL,
+        SensorStateClass.MEASUREMENT,
         False,
     ],
     "uncategorizedStressPercentage": [
@@ -248,7 +247,7 @@ GARMIN_ENTITY_LIST = {
         PERCENTAGE,
         "mdi:flash-alert",
         None,
-        SensorStateClass.TOTAL,
+        SensorStateClass.MEASUREMENT,
         False,
     ],
     "lowStressPercentage": [
@@ -256,7 +255,7 @@ GARMIN_ENTITY_LIST = {
         PERCENTAGE,
         "mdi:flash-alert",
         None,
-        SensorStateClass.TOTAL,
+        SensorStateClass.MEASUREMENT,
         False,
     ],
     "mediumStressPercentage": [
@@ -264,7 +263,7 @@ GARMIN_ENTITY_LIST = {
         PERCENTAGE,
         "mdi:flash-alert",
         None,
-        SensorStateClass.TOTAL,
+        SensorStateClass.MEASUREMENT,
         False,
     ],
     "highStressPercentage": [
@@ -272,7 +271,7 @@ GARMIN_ENTITY_LIST = {
         PERCENTAGE,
         "mdi:flash-alert",
         None,
-        SensorStateClass.TOTAL,
+        SensorStateClass.MEASUREMENT,
         False,
     ],
     "moderateIntensityMinutes": [
@@ -339,9 +338,9 @@ GARMIN_ENTITY_LIST = {
         SensorStateClass.TOTAL,
         True,
     ],
-    "averageSpo2": ["Average SPO2", PERCENTAGE, "mdi:diabetes", None, SensorStateClass.TOTAL, True],
-    "lowestSpo2": ["Lowest SPO2", PERCENTAGE, "mdi:diabetes", None, SensorStateClass.TOTAL, True],
-    "latestSpo2": ["Latest SPO2", PERCENTAGE, "mdi:diabetes", None, SensorStateClass.TOTAL, True],
+    "averageSpo2": ["Average SPO2", PERCENTAGE, "mdi:diabetes", None, SensorStateClass.MEASUREMENT, True],
+    "lowestSpo2": ["Lowest SPO2", PERCENTAGE, "mdi:diabetes", None, SensorStateClass.MEASUREMENT, True],
+    "latestSpo2": ["Latest SPO2", PERCENTAGE, "mdi:diabetes", None, SensorStateClass.MEASUREMENT, True],
     "latestSpo2ReadingTimeLocal": [
         "Latest SPO2 Time",
         None,
@@ -363,7 +362,7 @@ GARMIN_ENTITY_LIST = {
         "brpm",
         "mdi:progress-clock",
         None,
-        SensorStateClass.TOTAL,
+        SensorStateClass.MEASUREMENT,
         False,
     ],
     "lowestRespirationValue": [
@@ -371,7 +370,7 @@ GARMIN_ENTITY_LIST = {
         "brpm",
         "mdi:progress-clock",
         None,
-        SensorStateClass.TOTAL,
+        SensorStateClass.MEASUREMENT,
         False,
     ],
     "latestRespirationValue": [
@@ -379,7 +378,7 @@ GARMIN_ENTITY_LIST = {
         "brpm",
         "mdi:progress-clock",
         None,
-        SensorStateClass.TOTAL,
+        SensorStateClass.MEASUREMENT,
         False,
     ],
     "latestRespirationTimeGMT": [
@@ -391,16 +390,17 @@ GARMIN_ENTITY_LIST = {
         False,
     ],
     "weight": ["Weight", UnitOfMass.KILOGRAMS, "mdi:weight-kilogram", SensorDeviceClass.WEIGHT, SensorStateClass.MEASUREMENT, False],
-    "bmi": ["BMI", "bmi", "mdi:food", None, SensorStateClass.TOTAL, False],
-    "bodyFat": ["Body Fat", PERCENTAGE, "mdi:food", None, SensorStateClass.TOTAL, False],
-    "bodyWater": ["Body Water", PERCENTAGE, "mdi:water-percent", None, SensorStateClass.TOTAL, False],
+    "bmi": ["BMI", "bmi", "mdi:food", None, SensorStateClass.MEASUREMENT, False],
+    "bodyFat": ["Body Fat", PERCENTAGE, "mdi:food", None, SensorStateClass.MEASUREMENT, False],
+    "bodyWater": ["Body Water", PERCENTAGE, "mdi:water-percent", None, SensorStateClass.MEASUREMENT, False],
     "boneMass": ["Bone Mass", UnitOfMass.KILOGRAMS, "mdi:bone", SensorDeviceClass.WEIGHT, SensorStateClass.MEASUREMENT, False],
     "muscleMass": ["Muscle Mass", UnitOfMass.KILOGRAMS, "mdi:dumbbell", SensorDeviceClass.WEIGHT, SensorStateClass.MEASUREMENT, False],
-    "physiqueRating": ["Physique Rating", None, "mdi:numeric", None, SensorStateClass.TOTAL, False],
-    "visceralFat": ["Visceral Fat", PERCENTAGE, "mdi:food", None, SensorStateClass.TOTAL, False],
-    "metabolicAge": ["Metabolic Age", UnitOfTime.YEARS, "mdi:calendar-heart", None, SensorStateClass.TOTAL, False],
+    "physiqueRating": ["Physique Rating", None, "mdi:numeric", None, SensorStateClass.MEASUREMENT, False],
+    "visceralFat": ["Visceral Fat", PERCENTAGE, "mdi:food", None, SensorStateClass.MEASUREMENT, False],
+    "metabolicAge": ["Metabolic Age", UnitOfTime.YEARS, "mdi:calendar-heart", None, SensorStateClass.MEASUREMENT, False],
     "nextAlarm": ["Next Alarm Time", None, "mdi:alarm", SensorDeviceClass.TIMESTAMP, None, True],
     "lastActivities": ["Last Activities", None, "mdi:numeric", SensorStateClass.TOTAL, None, False],
+    "badges": ["Badges", None, "mdi:numeric", SensorStateClass.TOTAL, None, False],
     "sleepScore": [
         "Sleep Score",
         None,
@@ -408,8 +408,15 @@ GARMIN_ENTITY_LIST = {
         SensorStateClass.TOTAL,
         SensorStateClass.MEASUREMENT,
         True,
-    ]
-
+    ],
+    "hrvStatus": [
+        "HRV Status",
+        None,
+        "mdi:heart-pulse",
+        None,
+        None,
+        True,
+    ],
 }
 
 GEAR_ICONS = {

custom_components/garmin_connect/manifest.json

@@ -3,9 +3,10 @@
   "name": "Garmin Connect",
   "codeowners": ["@cyberjunky"],
   "config_flow": true,
+  "dependencies": [],
   "documentation": "https://github.com/cyberjunky/home-assistant-garmin_connect",
-  "issue_tracker": "https://github.com/cyberjunky/home-assistant-garmin_connect/issues",
   "iot_class": "cloud_polling",
-  "requirements": ["garminconnect==0.2.12", "tzlocal"],
-  "version": "0.2.19"
+  "issue_tracker": "https://github.com/cyberjunky/home-assistant-garmin_connect/issues",
+  "requirements": ["garminconnect>=0.2.24", "tzlocal"],
+  "version": "0.2.25"
 }

custom_components/garmin_connect/sensor.py

@@ -104,6 +104,10 @@ async def async_setup_entry(
         "add_body_composition", BODY_COMPOSITION_SERVICE_SCHEMA, coordinator.add_body_composition
     )
 
+    platform.async_register_entity_service(
+        "add_blood_pressure", BLOOD_PRESSURE_SERVICE_SCHEMA, coordinator.add_blood_pressure
+    )
+
 ENTITY_SERVICE_SCHEMA = vol.Schema(
     {
         vol.Required(ATTR_ENTITY_ID): str,
@@ -131,6 +135,17 @@ BODY_COMPOSITION_SERVICE_SCHEMA = vol.Schema(
     }
 )
 
+BLOOD_PRESSURE_SERVICE_SCHEMA = vol.Schema(
+    {
+        vol.Required(ATTR_ENTITY_ID): str,
+        vol.Required("systolic"): int,
+        vol.Required("diastolic"): int,
+        vol.Required("pulse"): int,
+        vol.Optional("note"): str
+
+    }
+)
+
 class GarminConnectSensor(CoordinatorEntity, SensorEntity):
     """Representation of a Garmin Connect Sensor."""
 
@@ -169,6 +184,12 @@ class GarminConnectSensor(CoordinatorEntity, SensorEntity):
         if self._type == "lastActivities":
             return len(self.coordinator.data[self._type])
 
+        if self._type == "badges":
+            return len(self.coordinator.data[self._type])
+        
+        if self._type == "hrvStatus":
+            return self.coordinator.data[self._type]["status"]
+
         if not self.coordinator.data or not self.coordinator.data[self._type]:
             return None
 
@@ -212,11 +233,18 @@ class GarminConnectSensor(CoordinatorEntity, SensorEntity):
         if self._type == "lastActivities":
             attributes["last_Activities"] = self.coordinator.data[self._type]
 
+        if self._type == "badges":
+            attributes["badges"] = self.coordinator.data[self._type]
+
         if self._type == "nextAlarm":
             attributes["next_alarms"] = calculate_next_active_alarms(
                 self.coordinator.data[self._type]
             )
 
+        if self._type == "hrvStatus":
+            attributes = {**attributes, **self.coordinator.data[self._type]}
+            del attributes["status"]
+
         return attributes
 
     @property

custom_components/garmin_connect/services.yaml

@@ -1,5 +1,6 @@
 set_active_gear:
   name: Set active gear for activity
+  description: Set active gear for activity.
   fields:
     activity_type:
       required: true
@@ -28,6 +29,7 @@ set_active_gear:
             - set as default
             - unset default
     entity_id:
+      name: entity
       description: entity
       required: true
       selector:
@@ -37,6 +39,7 @@ set_active_gear:
 
 add_body_composition:
   name: Adds updated body composition metrics
+  description: Adds updated body composition metrics.
   fields:
     weight:
       required: true
@@ -104,9 +107,43 @@ add_body_composition:
       description: Visceral Fat Rating
       example: 10
     entity_id:
+      name: entity
       description: entity
       required: true
       selector:
         entity:
           integration: garmin_connect
           device_class: weight
+
+add_blood_pressure:
+  name: Adds updated blood pressure metrics
+  description: Adds updated blood pressure metrics.
+  fields:
+    entity_id:
+      name: entity
+      description: entity
+      required: true
+      selector:
+        entity:
+          integration: garmin_connect
+          device_class: weight
+    systolic:
+      required: true
+      name: Systolic
+      description: Systolic value
+      example: 120
+    diastolic:
+      required: true
+      name: Diastolic
+      description: Diastolic value
+      example: 80
+    pulse:
+      required: true
+      name: Pulse
+      description: Pulse
+      example: 60
+    notes:
+      required: false
+      name: Notes
+      description: Add a note to the measurement
+      example: 'Measured with Beurer BC54'

custom_components/garmin_connect/translations/sk.json

@@ -15,7 +15,8 @@
                     "password": "Heslo",
                     "username": "Užívateľské meno"
                 },
-                "description": "Zadajte svoje poverenia.",
+                "description": "Zadajte svoje poverovacie údaje.",
+                "title": "Garmin Connect"
             }
         }
     }

hacs.json

@@ -1,5 +1,6 @@
 {
     "name": "Garmin Connect",
     "render_readme": true,
-    "domains": ["sensor"]
+    "homeassistant": "2024.11.0",
+    "hacs": "1.34.0"
 }

mypy.ini

@@ -0,0 +1,19 @@
+[mypy]
+python_version = 3.11
+show_error_codes = true
+follow_imports = silent
+ignore_missing_imports = true
+strict_equality = true
+warn_incomplete_stub = true
+warn_redundant_casts = true
+warn_unused_configs = true
+warn_unused_ignores = true
+check_untyped_defs = true
+disallow_incomplete_defs = true
+disallow_subclassing_any = true
+disallow_untyped_calls = true
+disallow_untyped_decorators = true
+disallow_untyped_defs = true
+no_implicit_optional = true
+warn_return_any = true
+warn_unreachable = true

pylintrc

@@ -0,0 +1,81 @@
+[MASTER]
+ignore=tests
+# Use a conservative default here; 2 should speed up most setups and not hurt
+# any too bad. Override on command line as appropriate.
+jobs=2
+
+# Return non-zero exit code if any of these messages/categories are detected,
+# even if score is above --fail-under value. Syntax same as enable. Messages
+# specified are enabled, while categories only check already-enabled messages.
+fail-on=
+  useless-suppression,
+
+# Specify a score threshold to be exceeded before program exits with error.
+fail-under=10.0
+
+# List of plugins (as comma separated values of python module names) to load,
+# usually to register additional checkers.
+# load-plugins=
+
+# Pickle collected data for later comparisons.
+persistent=no
+
+# A comma-separated list of package or module names from where C extensions may
+# be loaded. Extensions are loading into the active Python interpreter and may
+# run arbitrary code. (This is an alternative name to extension-pkg-allow-list
+# for backward compatibility.)
+extension-pkg-whitelist=ciso8601,
+                        cv2
+
+
+[BASIC]
+good-names=i,j,k,ex,_,T,x,y,id
+
+[MESSAGES CONTROL]
+# Reasons disabled:
+# format - handled by black
+# duplicate-code - unavoidable
+# cyclic-import - doesn't test if both import on load
+# too-many-* - are not enforced for the sake of readability
+# abstract-method - with intro of async there are always methods missing
+# inconsistent-return-statements - doesn't handle raise
+# wrong-import-order - isort guards this
+disable=
+  format,
+  abstract-class-little-used,
+  abstract-method,
+  cyclic-import,
+  duplicate-code,
+  inconsistent-return-statements,
+  too-many-instance-attributes,
+  wrong-import-order,
+  too-few-public-methods
+
+# enable useless-suppression temporarily every now and then to clean them up
+enable=
+  useless-suppression,
+  use-symbolic-message-instead,
+
+[REPORTS]
+score=no
+
+[REFACTORING]
+
+# Maximum number of nested blocks for function / method body
+max-nested-blocks=5
+
+# Complete name of functions that never returns. When checking for
+# inconsistent-return-statements if a never returning function is called then
+# it will be considered as an explicit return statement and no message will be
+# printed.
+never-returning-functions=sys.exit,argparse.parse_error
+
+[FORMAT]
+expected-line-ending-format=LF
+
+[EXCEPTIONS]
+
+# Exceptions that will emit a warning when being caught. Defaults to
+# "BaseException, Exception".
+overgeneral-exceptions=BaseException,
+                       Exception

requirements.txt

@@ -0,0 +1,8 @@
+colorlog==6.8.2
+homeassistant==2024.1.0
+pip>=24.1.1,<24.2
+ruff==0.8.3
+mypy==1.13.0
+pre-commit==4.0.1
+pylint==3.3.2
+types-cachetools

requirements_lint.txt

@@ -0,0 +1,3 @@
+-r requirements.txt
+pre-commit==4.0.1
+vulture==2.14

scripts/develop

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+set -e
+
+cd "$(dirname "$0")/.."
+
+# Create config dir if not present
+if [[ ! -d "${PWD}/config" ]]; then
+    mkdir -p "${PWD}/config"
+    hass --config "${PWD}/config" --script ensure_config
+fi
+
+# Set the path to custom_components
+## This let's us have the structure we want <root>/custom_components/integration_blueprint
+## while at the same time have Home Assistant configuration inside <root>/config
+## without resulting to symlinks.
+export PYTHONPATH="${PYTHONPATH}:${PWD}/custom_components"
+
+# Start Home Assistant
+hass --config "${PWD}/config" --debug

scripts/install/pip_packages

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -e
+
+python3 -m pip \
+    install \
+    --upgrade \
+    --disable-pip-version-check \
+    "${@}"

scripts/lint

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -e
+
+cd "$(dirname "$0")/.."
+
+python3 -m pip install --requirement requirements_lint.txt
+
+ruff check . --fix;
+pre-commit install-hooks --config .github/pre-commit-config.yaml;
+pre-commit run --hook-stage manual --all-files --config .github/pre-commit-config.yaml;
+
+vulture . --min-confidence 55 --ignore-names policy

scripts/setup

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -e
+
+cd "$(dirname "$0")/.."
+
+python3 -m pip install --requirement requirements.txt

setup.cfg

@@ -0,0 +1,21 @@
+[flake8]
+exclude = .venv,.git,.tox,docs,venv,bin,lib,deps,build
+doctests = True
+# To work with Black
+max-line-length = 88
+# E501: line too long
+# W503: Line break occurred before a binary operator
+# E203: Whitespace before ':'
+# D202 No blank lines allowed after function docstring
+# D107 Missing docstring in __init__
+ignore =
+    E501,
+    W503,
+    E203,
+    D202,
+    D107
+
+[isort]
+# https://github.com/timothycrosley/isort
+# https://github.com/timothycrosley/isort/wiki/isort-Settings
+profile = black