@camstack/addon-import-alexa 0.2.176 → 0.2.177

package/i18n/en.json

@@ -14,7 +14,6 @@
   "echoTarget.s_echo.title": "Echo",
   "echoTarget.s_echo.brokerId.label": "Amazon account",
   "echoTarget.s_echo.echoId.label": "Echo",
-  "echoTarget.s_echo.volume.label": "Volume",
   "echoTarget.s_echo.respectDnd.label": "Respect Do Not Disturb",
   "globalSettings": {
     "s_alexa-proxy-login": {

package/i18n/it.json

@@ -14,7 +14,6 @@
   "echoTarget.s_echo.title": "Echo",
   "echoTarget.s_echo.brokerId.label": "Account Amazon",
   "echoTarget.s_echo.echoId.label": "Echo",
-  "echoTarget.s_echo.volume.label": "Volume",
   "echoTarget.s_echo.respectDnd.label": "Rispetta Non disturbare",
   "globalSettings": {
     "s_alexa-proxy-login": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-import-alexa",
-  "version": "0.2.176",
+  "version": "0.2.177",
   "description": "Alexa device-import provider for CamStack — imports the smart-home devices in a user's Alexa account via the unofficial alexa-remote2 cookie/token client (the inverse of the Alexa exporter)",
   "keywords": [
     "camstack",
@@ -68,7 +68,7 @@
       }
     ],
     "requires": {
-      "server": ">=1.2.729"
+      "server": ">=1.2.730"
     }
   },
   "files": [

package/python/alexa_protocol.py

@@ -89,9 +89,6 @@ class Session:
         text = message.get("text")
         if not isinstance(text, str) or text == "":
             raise ValueError("text required")
-        volume = message.get("volume")
-        if not isinstance(volume, int):
-            volume = 40
         locale = REGION_LOCALE.get(self._gateway.region, "en-GB")
         outcomes: list[dict] = []
         for serial in targets:
@@ -104,7 +101,7 @@ class Session:
                 continue
             try:
                 if op == "speak":
-                    sequence = build_speak_sequence(target, text, volume, locale)
+                    sequence = build_speak_sequence(target, text, locale)
                     await self._gateway.speak(sequence, target["customerId"])
                 else:
                     announcement = build_announcement(target, text, locale)

package/python/alexa_sequences.py

@@ -29,27 +29,12 @@ def _speak_node(target: EchoTarget, text: str, locale: str) -> dict:
     }
 
 
-def _volume_node(target: EchoTarget, volume: int, nxt: dict) -> dict:
-    return {
-        "@type": "com.amazon.alexa.behaviors.model.OpaquePayloadOperationNode",
-        "type": "Alexa.DeviceControls.Volume",
-        "operationPayload": {
-            "deviceType": target["deviceType"],
-            "deviceSerialNumber": target["id"],
-            "customerId": target["customerId"],
-            "value": volume,
-        },
-        "next": nxt,
-    }
-
-
-def build_speak_sequence(target: EchoTarget, text: str, volume: int, locale: str) -> dict:
-    """Volume, then speech. Speak honours Do Not Disturb on the device."""
+def build_speak_sequence(target: EchoTarget, text: str, locale: str) -> dict:
+    """Speech at the Echo's current volume. Speak honours Do Not Disturb on the device."""
     speak = _speak_node(target, text, locale)
-    start = _volume_node(target, volume, speak) if volume >= 0 else speak
     return {
         "@type": "com.amazon.alexa.behaviors.model.Sequence",
-        "startNode": start,
+        "startNode": speak,
     }
 
 

package/python/test_alexa_protocol.py

@@ -136,19 +136,20 @@ class ProtocolTests(unittest.TestCase):
         session = Session(gateway)
         spoken = run(
             session,
-            {"id": "4", "op": "speak", "targets": ["echo-1"], "text": "Person at the door", "volume": 30},
+            {"id": "4", "op": "speak", "targets": ["echo-1"], "text": "Person at the door"},
         )
         self.assertTrue(spoken["result"]["outcomes"][0]["ok"])
         sequence = gateway.spoken[0]["sequence"]
-        self.assertEqual(sequence["startNode"]["type"], "Alexa.DeviceControls.Volume")
-        self.assertEqual(sequence["startNode"]["next"]["type"], "Alexa.Speak")
+        # No volume node: the Echo speaks at its current volume.
+        self.assertEqual(sequence["startNode"]["type"], "Alexa.Speak")
+        self.assertNotIn("next", sequence["startNode"])
         self.assertEqual(
-            sequence["startNode"]["next"]["operationPayload"]["textToSpeak"],
+            sequence["startNode"]["operationPayload"]["textToSpeak"],
             "Person at the door",
         )
         announced = run(
             session,
-            {"id": "5", "op": "announce", "targets": ["echo-1"], "text": "Hello", "volume": 30},
+            {"id": "5", "op": "announce", "targets": ["echo-1"], "text": "Hello"},
         )
         self.assertTrue(announced["result"]["outcomes"][0]["ok"])
         self.assertEqual(gateway.announced[0]["content"][0]["speak"]["value"], "Hello")
@@ -167,7 +168,7 @@ class ProtocolTests(unittest.TestCase):
 
     def test_sequence_helpers_do_not_embed_markup(self) -> None:
         target = {"id": "echo-1", "deviceType": "T", "customerId": "c"}
-        sequence = build_speak_sequence(target, "plain", 10, "en-GB")
+        sequence = build_speak_sequence(target, "plain", "en-GB")
         self.assertNotIn("<", json.dumps(sequence))
         announcement = build_announcement(target, "plain", "en-GB")
         self.assertEqual(announcement["content"][0]["speak"]["type"], "text")