fix series 3 behavior sensor bug (#22)

Author: ajacques

custom_components/tryfi/pytryfi/fiPet.py

@@ -191,7 +191,7 @@ def updateAllDetails(self, session: requests.Session):
             try:
                 self.updateBehaviorStats(session)
             except Exception as e:
-                LOGGER.debug(f"Could not update behavior stats for Pet {self.name}. This may be an older collar model.\n{e}")
+                LOGGER.warning(f"Could not update behavior stats for Pet {self.name}.\n{e}")
                 # Behavior stats may not be available for older collars
                 pass
 
@@ -200,8 +200,20 @@ def updateBehaviorStats(self, sessionId: requests.Session):
         """Update behavior statistics for Series 3+ collars."""
         healthTrendsJSON = query.getPetHealthTrends(sessionId, self.petId, 'DAY')
         behavior_trends = healthTrendsJSON.get('behaviorTrends', [])
+
         self.setBehaviorStatsFromTrends(behavior_trends)
 
+    def _parseBehaviorDuration(self, input: str) -> int:
+        # examples: '46min'
+        if input.startswith('<'):
+            return 0
+        elif input.endswith('min'):
+            return int(input.replace('min', ''), 10)
+        elif input.endswith('hr'):
+            return int(input.replace('hr', ''), 10) * 60
+        else:
+            return int(input)
+
     def setBehaviorStatsFromTrends(self, behaviorTrends):
         """Parse behavior data from health trends API."""
         # Reset all metrics
@@ -238,16 +250,7 @@ def setBehaviorStatsFromTrends(self, behaviorTrends):
             duration_summary = summary.get('durationSummary')
             duration_seconds = 0
             if duration_summary:
-                if duration_summary.startswith('<'):
-                    duration_seconds = 30
-                else:
-                    parts = duration_summary.replace('h', '').replace('m', '').split()
-                    if len(parts) == 2:
-                        duration_seconds = int(parts[0]) * 3600 + int(parts[1]) * 60
-                    elif 'h' in duration_summary:
-                        duration_seconds = int(parts[0]) * 3600
-                    else:
-                        duration_seconds = int(parts[0]) * 60
+                duration_seconds = self._parseBehaviorDuration(duration_summary)
 
             # Map to our attributes
             if trend_id == 'barking:DAY':

custom_components/tryfi/sensor.py

@@ -593,7 +593,7 @@ def __init__(self, coordinator: Any, pet: FiPet, behavior_type: str, metric_type
             self._attr_native_unit_of_measurement = "events"
             self._attr_state_class = SensorStateClass.MEASUREMENT
         else:  # duration
-            self._attr_native_unit_of_measurement = UnitOfTime.SECONDS
+            self._attr_native_unit_of_measurement = UnitOfTime.MINUTES
             self._attr_device_class = SensorDeviceClass.DURATION
             self._attr_state_class = SensorStateClass.MEASUREMENT
 
@@ -605,6 +605,11 @@ def __init__(self, coordinator: Any, pet: FiPet, behavior_type: str, metric_type
             model="Series 3+ Collar",
         )
 
+    def _fipet_attr_name(self) -> str:
+        attr_name = f"{self._period}{self._behavior_type.title()}{'Count' if self._metric_type == 'count' else 'Duration'}"
+
+        return attr_name
+
     @property
     def native_value(self) -> StateType:
         """Return the behavior metric value."""
@@ -613,12 +618,11 @@ def native_value(self) -> StateType:
             return None
 
         # Build attribute name
-        attr_name = f"{self._period}{self._behavior_type.title()}{'Count' if self._metric_type == 'count' else 'Duration'}"
-        attr_name = attr_name.replace("Licking", "Licking").replace("Barking", "Barking").replace("Scratching", "Scratching").replace("Eating", "Eating").replace("Drinking", "Drinking")
+        attr_name = self._fipet_attr_name()
 
         # Get the value from the pet object
-        value = getattr(pet, attr_name, 0)
-        
+        value = getattr(pet, attr_name, None)
+
         # Return 0 if None
         return value if value is not None else 0
 

tests/pytryfi/fixture_petHealthTrends.json

@@ -0,0 +1,52 @@
+[
+    {
+        "__typename": "PetHealthTrend",
+        "id": "barking:DAY",
+        "title": "Barking",
+        "summaryComponents": {
+            "__typename": "PetHealthTrendSummary",
+            "eventsSummary": "24 events",
+            "durationSummary": "46min"
+        }
+    },
+    {
+        "__typename": "PetHealthTrend",
+        "id": "eating:DAY",
+        "title": "Eating",
+        "summaryComponents": {
+            "__typename": "PetHealthTrendSummary",
+            "eventsSummary": "6 events",
+            "durationSummary": "6min"
+        }
+    },
+    {
+        "__typename": "PetHealthTrend",
+        "id": "drinking:DAY",
+        "title": "Drinking",
+        "summaryComponents": {
+            "__typename": "PetHealthTrendSummary",
+            "eventsSummary": "3 events",
+            "durationSummary": "<1min"
+        }
+    },
+    {
+        "__typename": "PetHealthTrend",
+        "id": "cleaning_self:DAY",
+        "title": "Licking",
+        "summaryComponents": {
+            "__typename": "PetHealthTrendSummary",
+            "eventsSummary": "6 events",
+            "durationSummary": "6min"
+        }
+    },
+    {
+        "__typename": "PetHealthTrend",
+        "id": "scratching:DAY",
+        "title": "Scratching",
+        "summaryComponents": {
+            "__typename": "PetHealthTrendSummary",
+            "eventsSummary": "4 events",
+            "durationSummary": "1min"
+        }
+    }
+]

tests/pytryfi/test_pet.py

@@ -1,8 +1,10 @@
 from custom_components.tryfi.pytryfi import FiPet, FiDevice
 from .utils import mock_graphql, GRAPHQL_FIXTURE_PET_ALL_INFO, REQ_PET_ALL_INFO
 
+import json
 import requests
 import responses
+import urllib.parse
 
 
 @responses.activate
@@ -31,3 +33,52 @@ def test_get_sleep():
 
     assert pet.dailySleep == 60
     assert pet.dailyNap == 30
+
+
+@responses.activate
+def test_update_behavior_stats():
+    with open("tests/pytryfi/fixture_petHealthTrends.json", "r") as f:
+        health_trends_fixture = json.load(f)
+
+    behavior_trends_response = {
+        "getPetHealthTrendsForPet": {"behaviorTrends": health_trends_fixture}
+    }
+
+    qString = """
+    query PetHealthTrends {
+        getPetHealthTrendsForPet(petId: "test-pet", period: DAY) {
+            behaviorTrends {
+                __typename
+                id
+                title
+                summaryComponents {
+                    __typename
+                    eventsSummary
+                    durationSummary
+                }
+            }
+        }
+    }
+    """
+    url = f"https://api.tryfi.com/graphql?query={urllib.parse.quote_plus(qString)}"
+    responses.add(
+        method=responses.GET,
+        url=url,
+        status=200,
+        json={"data": behavior_trends_response},
+    )
+
+    pet = FiPet("test-pet")
+    pet._device = FiDevice("device-id")
+    pet.updateBehaviorStats(requests.Session())
+
+    assert pet.dailyBarkingCount == 24
+    assert pet.dailyBarkingDuration == 46
+    assert pet.dailyEatingCount == 6
+    assert pet.dailyEatingDuration == 6
+    assert pet.dailyDrinkingCount == 3
+    assert pet.dailyDrinkingDuration == 0
+    assert pet.dailyLickingCount == 6
+    assert pet.dailyLickingDuration == 6
+    assert pet.dailyScratchingCount == 4
+    assert pet.dailyScratchingDuration == 1