feat: migrate en-US intents to language-agnostic file-intents

README.md

@@ -34,9 +34,10 @@ pip install ovos-skill-mark1-ctrl
 * "look up and down"
 * "reset enclosure"
 
-* "narrow your eyes"
-* "spin your eyes"
-* "blink your eyes"
+* "narrow eyes"
+* "spin eyes"
+* "blink"
+* "blink left"
 
 * "smile animation"
 * "listen animation"

__init__.py

@@ -1,4 +1,4 @@
 import random
 import time
 from ast import literal_eval as parse_tuple
 from ovos_color_parser import color_from_description, sRGBAColor
@@ -6,11 +6,10 @@
 from ovos_utils.log import LOG
 from ovos_utils.process_utils import RuntimeRequirements
 from ovos_workshop.decorators import intent_handler
-from ovos_workshop.intents import IntentBuilder
 from ovos_workshop.skills import OVOSSkill
 from ovos_bus_client.message import Message
 from ovos_i2c_detection import is_mark_1
 from threading import Thread
 
 
 def _hex_to_rgb(_hex):
@@ -27,7 +26,7 @@
             return None
         (r, g, b) = int(_hex[0:2], 16), int(_hex[2:4], 16), int(_hex[4:6], 16)
         return (r, g, b)
     except Exception:
         return None
 
 class EnclosureControlSkill(OVOSSkill):
@@ -74,7 +73,7 @@
                    (self.enclosure.eyes_blink, None)]
 
         anim = []
         for i in range(0, 10):
             frame = random.choice(choices)
             anim.append(self.animate(i, 3, frame[0], frame[1]))
         return anim
@@ -156,113 +155,88 @@
             self.animations = animation
             self.thread = create_daemon(self.run)
 
-    @intent_handler(IntentBuilder("EnclosureLookRight")
-                    .require("look").require("right")
-                    .optionally("enclosure"))
+    @intent_handler("look_right.intent")
     def handle_look_right(self, message):
         self.speak("looking right")
         self.enclosure.eyes_look("r")
 
-    @intent_handler(IntentBuilder("EnclosureLookLeft")
-                    .require("look").require("left").optionally("enclosure"))
+    @intent_handler("look_left.intent")
     def handle_look_left(self, message):
         self.speak("looking left")
         self.enclosure.eyes_look("l")
 
-    @intent_handler(IntentBuilder("EnclosureLookUp")
-                    .require("look").require("up").optionally("enclosure"))
+    @intent_handler("look_up.intent")
     def handle_look_up(self, message):
         self.speak("looking up")
         self.enclosure.eyes_look("u")
 
-    @intent_handler(IntentBuilder("EnclosureLookDown")
-                    .require("look").require("down").optionally("enclosure"))
+    @intent_handler("look_down.intent")
     def handle_look_down(self, message):
         self.speak("looking down")
         self.enclosure.eyes_look("d")
 
-    @intent_handler(IntentBuilder("EnclosureLookUpDown")
-                    .require("look").require("up")
-                    .require("down").optionally("enclosure")
-                    .optionally("animation"))
+    @intent_handler("look_up_down.intent")
     def handle_look_up_down(self, message):
         self.speak("up and down, up and down")
         self.play_animation(self.up_down_animation)
 
-    @intent_handler(IntentBuilder("EnclosureLookLeftRight")
-                    .require("look").require("right")
-                    .require("left").optionally("enclosure")
-                    .optionally("animation"))
+    @intent_handler("look_left_right.intent")
     def handle_look_left_right(self, message):
         self.speak("left and right, left and right")
         self.play_animation(self.left_right_animation)
 
-    @intent_handler(IntentBuilder("EnclosureEyesBlink")
-                    .require("blink")
-                    .optionally("eyes").optionally("animation")
-                    .optionally("enclosure").optionally("right")
-                    .optionally("left"))
+    @intent_handler("blink.intent")
     def handle_blink_eyes(self, message):
+        """ Blink the eyes, optionally in just one direction.
+
+        Args:
+            message (Message): carries an optional {direction} slot
+                ("left"/"right"); absent means blink both eyes.
+        """
+        direction = message.data.get("direction")
         for i in range(0, 10):
-            if "right" in message.data:
+            if direction == "right":
                 self.enclosure.eyes_blink("r")
-            if "left" in message.data:
+            elif direction == "left":
                 self.enclosure.eyes_blink("l")
             else:
                 self.enclosure.eyes_blink("b")
         self.speak("so this is what it feels like having low F P S")
 
-    @intent_handler(IntentBuilder("EnclosureEyesSpin")
-                    .require("spin")
-                    .optionally("eyes").optionally("animation")
-                    .optionally("enclosure"))
+    @intent_handler("spin.intent")
     def handle_spin_eyes(self, message):
         self.speak("around the world, here i go")
         self.enclosure.eyes_spin()
 
-    @intent_handler(IntentBuilder("EnclosureEyesNarrow")
-                    .require("narrow").require("eyes")
-                    .optionally("enclosure"))
+    @intent_handler("narrow_eyes.intent")
     def handle_narrow_eyes(self, message):
         self.speak("this is my evil face")
         self.enclosure.eyes_narrow()
         self.enclosure.eyes_color(255, 0, 0)
 
-    @intent_handler(IntentBuilder("EnclosureReset")
-                    .require("reset").require("enclosure"))
+    @intent_handler("reset.intent")
     def handle_enclosure_reset(self, message):
         self.handle_default_eyes()
         self.enclosure.eyes_reset()
         self.enclosure.mouth_reset()
         self.speak("this was fun")
 
-    @intent_handler(IntentBuilder("EnclosureMouthSmile")
-                    .require("smile")
-                    .optionally("animation").optionally("mouth")
-                    .optionally("enclosure"))
+    @intent_handler("smile.intent")
     def handle_enclosure_smile(self, message):
         self.enclosure.mouth_smile()
         self.speak("i don't know how to smile")
 
-    @intent_handler(IntentBuilder("EnclosureMouthListen")
-                    .require("listen")
-                    .optionally("animation").optionally("mouth")
-                    .optionally("enclosure"))
+    @intent_handler("listen.intent")
     def handle_enclosure_listen(self, message):
         self.speak("when i do this i feel like I'm dancing")
         self.enclosure.mouth_listen()
 
-    @intent_handler(IntentBuilder("EnclosureMouthThink")
-                    .require("think")
-                    .optionally("animation").optionally("mouth")
-                    .optionally("enclosure"))
+    @intent_handler("think.intent")
     def handle_enclosure_think(self, message):
         self.speak("i love thinking")
         self.enclosure.mouth_think()
 
-    @intent_handler(IntentBuilder("EnclosureCrazyEyes")
-                    .require("eyes").optionally("animation").require("crazy")
-                    .optionally("enclosure"))
+    @intent_handler("crazy_eyes.intent")
     def handle_enclosure_crazy_eyes(self, message):
         self.speak("artificial intelligence performing artificial "
                    "stupidity, you don't see this every day")
@@ -291,7 +265,7 @@
             self.settings['current_eye_color'] = [r, g, b]
             if make_default:
                 self.settings['default_eye_color'] = [r, g, b]
         except Exception:
             self.log.debug('Bad color code: ' + str(color))
             if speak:
                 self.speak_dialog('error_set_color')
@@ -303,7 +277,7 @@
         def is_byte(utt):
             try:
                 return 0 <= int(utt) <= 255
             except Exception:
                 return False
 
         self.speak_dialog('set_custom_color', wait=True)
@@ -369,8 +343,8 @@
                     return (color.r, color.g, color.b)
                 else:
                     return None
         except Exception:
             pass
 
         # check if rgb tuple like '(0,0,128)'
         try:

locale/en-US/blink.intent

@@ -0,0 +1 @@
+blink [{direction}] [<eyes>] [<animation>] [<enclosure>]

locale/en-US/crazy_eyes.intent

@@ -0,0 +1 @@
+crazy <eyes> [<animation>] [<enclosure>]

locale/en-US/direction.entity

@@ -0,0 +1,2 @@
+right
+left

locale/en-US/listen.intent

@@ -0,0 +1 @@
+<listen> [<animation>] [mouth] [<enclosure>]

locale/en-US/look_down.intent

@@ -0,0 +1,2 @@
+<look> down [<enclosure>]
+down <look> [<enclosure>]

locale/en-US/look_left.intent

@@ -0,0 +1,2 @@
+<look> left [<enclosure>]
+left <look> [<enclosure>]

locale/en-US/look_left_right.intent

@@ -0,0 +1,2 @@
+<look> left [and] right [<animation>] [<enclosure>]
+left right <look> [<animation>] [<enclosure>]

locale/en-US/look_right.intent

@@ -0,0 +1,2 @@
+<look> right [<enclosure>]
+right <look> [<enclosure>]

locale/en-US/look_up.intent

@@ -0,0 +1,2 @@
+<look> up [<enclosure>]
+up <look> [<enclosure>]

locale/en-US/look_up_down.intent

@@ -0,0 +1,2 @@
+<look> up [and] down [<animation>] [<enclosure>]
+down up <look> [<animation>] [<enclosure>]

locale/en-US/narrow_eyes.intent

@@ -0,0 +1,2 @@
+narrow [<eyes>] [<enclosure>]
+<eyes> narrow [<enclosure>]

locale/en-US/reset.intent

@@ -0,0 +1,2 @@
+<reset> [<enclosure>]
+<enclosure> <reset>

locale/en-US/smile.intent

@@ -0,0 +1 @@
+<smile> [<animation>] [mouth] [<enclosure>]

locale/en-US/spin.intent

@@ -0,0 +1 @@
+<spin> [<eyes>] [<enclosure>]

locale/en-US/think.intent

@@ -0,0 +1 @@
+<think> [<animation>] [mouth] [<enclosure>]

pyproject.toml

@@ -55,4 +55,5 @@ ovos_skill_mark1_ctrl = [
     "locale/*/*.intent",
     "locale/*/*.dialog",
     "locale/*/*.voc",
+    "locale/*/*.entity",
 ]