Revert "bump hassil and intents" (#132138)

* Revert "Fix bad hassil tests on CI (#132132)" This reverts commit 101bb09. * Revert "Bump hassil and intents (#132092)" This reverts commit e521829.
home-assistant · Dec 3, 2024 · 39b2cf6 · 39b2cf6
1 parent bb7dc07
commit 39b2cf6
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 16 deletions.
diff --git a/homeassistant/components/conversation/manifest.json b/homeassistant/components/conversation/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/conversation",
   "integration_type": "system",
   "quality_scale": "internal",
-  "requirements": ["hassil==2.0.5", "home-assistant-intents==2024.12.2"]
+  "requirements": ["hassil==2.0.4", "home-assistant-intents==2024.11.27"]
 }
diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt
@@ -32,10 +32,10 @@ go2rtc-client==0.1.1
 ha-ffmpeg==3.2.2
 habluetooth==3.6.0
 hass-nabucasa==0.85.0
-hassil==2.0.5
+hassil==2.0.4
 home-assistant-bluetooth==1.13.0
 home-assistant-frontend==20241127.1
-home-assistant-intents==2024.12.2
+home-assistant-intents==2024.11.27
 httpx==0.27.2
 ifaddr==0.2.0
 Jinja2==3.1.4

diff --git a/requirements_all.txt b/requirements_all.txt
@@ -1093,7 +1093,7 @@ hass-nabucasa==0.85.0
 hass-splunk==0.1.1
 
 # homeassistant.components.conversation
-hassil==2.0.5
+hassil==2.0.4
 
 # homeassistant.components.jewish_calendar
 hdate==0.11.1
@@ -1130,7 +1130,7 @@ holidays==0.61
 home-assistant-frontend==20241127.1
 
 # homeassistant.components.conversation
-home-assistant-intents==2024.12.2
+home-assistant-intents==2024.11.27
 
 # homeassistant.components.home_connect
 homeconnect==0.8.0

diff --git a/requirements_test_all.txt b/requirements_test_all.txt
@@ -928,7 +928,7 @@ habluetooth==3.6.0
 hass-nabucasa==0.85.0
 
 # homeassistant.components.conversation
-hassil==2.0.5
+hassil==2.0.4
 
 # homeassistant.components.jewish_calendar
 hdate==0.11.1
@@ -956,7 +956,7 @@ holidays==0.61
 home-assistant-frontend==20241127.1
 
 # homeassistant.components.conversation
-home-assistant-intents==2024.12.2
+home-assistant-intents==2024.11.27
 
 # homeassistant.components.home_connect
 homeconnect==0.8.0

diff --git a/script/hassfest/docker/Dockerfile b/script/hassfest/docker/Dockerfile
@@ -23,7 +23,7 @@ RUN --mount=from=ghcr.io/astral-sh/uv:0.5.4,source=/uv,target=/bin/uv \
         -c /usr/src/homeassistant/homeassistant/package_constraints.txt \
         -r /usr/src/homeassistant/requirements.txt \
         stdlib-list==0.10.0 pipdeptree==2.23.4 tqdm==4.66.5 ruff==0.8.1 \
-        PyTurboJPEG==1.7.5 go2rtc-client==0.1.1 ha-ffmpeg==3.2.2 hassil==2.0.5 home-assistant-intents==2024.12.2 mutagen==1.47.0 pymicro-vad==1.0.1 pyspeex-noise==1.0.2
+        PyTurboJPEG==1.7.5 go2rtc-client==0.1.1 ha-ffmpeg==3.2.2 hassil==2.0.4 home-assistant-intents==2024.11.27 mutagen==1.47.0 pymicro-vad==1.0.1 pyspeex-noise==1.0.2
 
 LABEL "name"="hassfest"
 LABEL "maintainer"="Home Assistant <[email protected]>"

diff --git a/tests/components/conversation/snapshots/test_default_agent.ambr b/tests/components/conversation/snapshots/test_default_agent.ambr
@@ -308,7 +308,7 @@
       'speech': dict({
         'plain': dict({
           'extra_data': None,
-          'speech': 'Sorry, I am not aware of any area called late added',
+          'speech': 'Sorry, I am not aware of any device called late added light',
         }),
       }),
     }),
@@ -378,7 +378,7 @@
       'speech': dict({
         'plain': dict({
           'extra_data': None,
-          'speech': 'Sorry, I am not aware of any area called kitchen',
+          'speech': 'Sorry, I am not aware of any device called kitchen light',
         }),
       }),
     }),
@@ -428,7 +428,7 @@
       'speech': dict({
         'plain': dict({
           'extra_data': None,
-          'speech': 'Sorry, I am not aware of any area called renamed',
+          'speech': 'Sorry, I am not aware of any device called renamed light',
         }),
       }),
     }),

diff --git a/tests/components/conversation/snapshots/test_http.ambr b/tests/components/conversation/snapshots/test_http.ambr
@@ -535,7 +535,7 @@
           'name': 'HassTurnOn',
         }),
         'match': True,
-        'sentence_template': '<turn> on [<all>] <light> <in> <area>',
+        'sentence_template': '<turn> on [all] <light> in <area>',
         'slots': dict({
           'area': 'kitchen',
           'domain': 'light',
@@ -606,7 +606,7 @@
           'name': 'OrderBeer',
         }),
         'match': True,
-        'sentence_template': "[I'd like to ]order a {beer_style} [please]",
+        'sentence_template': "I'd like to order a {beer_style} [please]",
         'slots': dict({
           'beer_style': 'lager',
         }),

diff --git a/tests/components/conversation/test_default_agent.py b/tests/components/conversation/test_default_agent.py
@@ -2930,7 +2930,7 @@ async def test_intent_cache_fuzzy(hass: HomeAssistant) -> None:
     )
     result = await agent.async_recognize_intent(user_input)
     assert result is not None
-    assert result.unmatched_entities["area"].text == "test "
+    assert result.unmatched_entities["name"].text == "test light"
 
     # Mark this result so we know it is from cache next time
     mark = "_from_cache"

diff --git a/tests/testing_config/custom_sentences/en/beer.yaml b/tests/testing_config/custom_sentences/en/beer.yaml
@@ -3,11 +3,11 @@ intents:
   OrderBeer:
     data:
       - sentences:
-          - "[I'd like to ]order a {beer_style} [please]"
+          - "I'd like to order a {beer_style} [please]"
   OrderFood:
     data:
       - sentences:
-          - "[I'd like to ]order {food_name:name} [please]"
+          - "I'd like to order {food_name:name} [please]"
 lists:
   beer_style:
     values: