src/ovtk_audiencekit/cli/start.py

@@ -15,14 +15,12 @@ logger = logging.getLogger(__name__)
 @click.option('--bus-port', default='8080')
 @click.option('--web-bind', default='localhost')
 @click.option('--web-port', default='8000')
-@click.option('--parallel', default=5)
-def start(config_file, bus_bind=None, bus_port=None, web_bind=None, web_port=None, parallel=None):
+def start(config_file, bus_bind=None, bus_port=None, web_bind=None, web_port=None):
     """Start audiencekit server"""
     logger.info('Hewwo!!')
     main = MainProcess(config_file,
                        bus_conf=(bus_bind, bus_port),
-                       web_conf=(web_bind, web_port),
-                       max_concurrent=parallel)
+                       web_conf=(web_bind, web_port))
     try:
         asyncio.run(main.run())
     except KeyboardInterrupt:

src/ovtk_audiencekit/cli/websocketutils.py

@@ -76,11 +76,10 @@ class EventCommandFactory(click.MultiCommand):
                 param = click.Option(param_decls=[f'--{field.name}'], type=param_type, default=field.default, show_default=True)
             params.append(param)
 
+        if target_event.__dict__.get('__cli__'):
+            params.extend(target_event.__cli__())
+
         command = click.Command(name, callback=mkevent_generic, params=params, help=target_event.__doc__)
-
-        if target_event.__dict__.get('_cli'):
-            command = target_event._cli(command)
-
         return command
 
 

src/ovtk_audiencekit/core/MainProcess.py

@@ -53,12 +53,11 @@ def import_or_reload_mod(module_name, default_package=None, external=False):
 
 
 class MainProcess:
-    def __init__(self, config_path, bus_conf, web_conf, max_concurrent=5):
+    def __init__(self, config_path, bus_conf=(None, None), web_conf=(None, None)):
         self._running = False
         self.config_path = config_path
         self.bus_conf = bus_conf
         self.web_conf = web_conf
-        self.max_concurrent = max_concurrent
 
         self.chat_processes = {}
         self.plugins = {}
@@ -295,7 +294,6 @@ class MainProcess:
                     await self.user_setup()
                     # Start plumbing tasks
                     user_tasks.add(loop.create_task(self.tick_plugins()))
-                    for i in range(0, self.max_concurrent):
                     user_tasks.add(loop.create_task(self.handle_events()))
 
                     logger.info(f'Ready to rumble! Press Ctrl+C to shut down')

src/ovtk_audiencekit/events/Control.py

@@ -1,47 +1,20 @@
 from dataclasses import dataclass, field
 import json
 
-import click
-
 from ovtk_audiencekit.events import Event
 
 
 @dataclass
 class Control(Event):
     """Generic inter-bus communication"""
-    target: str = None
+    target: str
     data: dict = field(default_factory=dict)
 
-    def __init__(self, via, target, **kwargs):
-        super().__init__(via)
-        self.target = target
-        self.data = kwargs
-
     def __repr__(self):
         return f"Control message : target = {self.target}, data = {self.data}"
 
     def serialize(self):
         return json.dumps({
             'type': [cls.__name__ for cls in self.__class__.__mro__],
-            'data': {**self.data, **self.to_dict()},
+            'data': {**self.data, 'target': self.target},
         })
-
-    @classmethod
-    def _cli(cls, cmd):
-        def parse(ctx, param, value):
-            if value:
-                return json.loads(value)
-
-        super_cb = cmd.callback
-
-        @click.pass_context
-        def expand(ctx, *args, json=None, **kwargs):
-            if json:
-                kwargs = {**json, **kwargs}
-            return ctx.invoke(super_cb, *args, **kwargs)
-
-        cmd.params.append(
-            click.Option(['--json', '-d'], callback=parse, help="Add arbitrary data in JSON format")
-        )
-        cmd.callback = expand
-        return cmd

src/ovtk_audiencekit/events/Message.py

@@ -43,13 +43,14 @@ class Message(Event):
         return super().hydrate(user_type=user_type, **kwargs)
 
     @classmethod
-    def _cli(cls, cmd):
+    def __cli__(cls):
         def dono(ctx, param, value):
             if value:
                 return [value, value]
 
-        cmd.params.append(click.Option(['--monitization', '-m'], type=click.FLOAT, callback=dono))
-        return cmd
+        return [
+            click.Option(['--monitization', '-m'], type=click.FLOAT, callback=dono),
+        ]
 
 
 @dataclass

src/ovtk_audiencekit/events/Subscription.py

@@ -28,12 +28,11 @@ class Subscription(Event):
         return f"Subcription from {self.user_name or 'anonymous'} to {recipent} - tier = {self.tier}"
 
     @classmethod
-    def _cli(cls, cmd):
+    def __cli__(cls):
         def userfactory(ctx, param, value):
             if value:
                 return [User(user_name=name, user_id=name) for name in value]
 
-        cmd.params.append(
-            click.Option(['--gifted_to', '-g'], type=click.STRING, callback=userfactory, multiple=True)
-        )
-        return cmd
+        return [
+            click.Option(['--gifted_to', '-g'], type=click.STRING, callback=userfactory, multiple=True),
+        ]

src/ovtk_audiencekit/plugins/AudioAlert/AudioAlert.py

@@ -22,16 +22,14 @@ class AudioAlert(PluginBase):
                 sample_rate = next((rate for rate in [44100, 48000] if Stream.check_rate(self.output_index, 1, rate)))
             except StopIteration:
                 self.logger.warn('Target audio device does not claim to support common sample rates! Attempting playback at native rate of audio')
-        self.sample_rate = sample_rate
 
-    async def run(self, path, speed=1, keep_pitch=False, wait=False, poly=1, **kwargs):
+    def run(self, path, speed=1, keep_pitch=False, immediate=True, poly=1, **kwargs):
         poly = int(poly)
         key = f'{path}@{speed}{"X" if keep_pitch else "x"}'
         clip = self.clips.get(key, [None, None])[0]
 
         if clip is None:
-            clip = Clip(path, speed=speed, keep_pitch=keep_pitch,
-                        samplerate=self.sample_rate, force_stereo=self.force_stereo)
+            clip = Clip(path, speed=speed, keep_pitch=keep_pitch, force_stereo=self.force_stereo)
             self.clips[key] = [clip, maya.now()]
         else:
             self.clips[key][1] = maya.now()
@@ -53,12 +51,12 @@ class AudioAlert(PluginBase):
             stream_dq.append(stream)
 
 
-        if wait:
-            await stream.aplay()
-        else:
+        if immediate:
             task = asyncio.create_task(stream.aplay())
-            task.add_done_callback(self.tasks.discard)
+            task.add_done_callback(self.tasks.remove)
             self.tasks.add(task)
+        else:
+            stream.play()
 
     def close(self):
         self._cleanup_task.cancel()

src/ovtk_audiencekit/plugins/TTS/TTS.py

@@ -19,11 +19,6 @@ class TextToSpeechPlugin(PluginBase):
         self.speaker_wav = speaker_wav
 
         self.output_index = Stream.find_output_index(output)
-        try:
-            sample_rate = next((rate for rate in [44100, 48000] if Stream.check_rate(self.output_index, 1, rate)))
-        except StopIteration:
-            self.logger.warn('Target audio device does not claim to support common sample rates! Attempting playback at native rate of audio')
-        self.sample_rate = sample_rate
 
         conf_overrides = {k[2:]: v for k, v in kwargs.items() if k.startswith('o_')}
 
@@ -58,12 +53,6 @@ class TextToSpeechPlugin(PluginBase):
             use_cuda=self.cuda,
         )
 
-        self.tasks = set()
-
-    def close(self):
-        for task in self.tasks:
-            task.cancel()
-
     def make_tts_wav(self, text, filename=None):
         if filename is None:
             filename = os.path.join(self.cache_dir, f'{uuid.uuid1()}.wav')
@@ -76,29 +65,25 @@ class TextToSpeechPlugin(PluginBase):
         self.synthesizer.save_wav(wav, filename)
         return filename
 
-    async def run(self, text, *args, _ctx={}, wait=False, **kwargs):
+    async def run(self, text, *args, _ctx={}, wait=True, **kwargs):
         try:
             # Force punctuation (keep AI from spinning off into random noises)
             if not any([text.endswith(punc) for punc in '.!?:']):
                 text += '.'
-            # Do TTS processing in a thread to avoid blocking main loop
-            filename = await asyncio.get_running_loop().run_in_executor(None, self.make_tts_wav, text)
-
+            filename = self.make_tts_wav(text)
             # TODO: Play direct from memory
-            clip = Clip(filename, force_stereo=True, samplerate=self.sample_rate)
+            clip = Clip(filename, force_stereo=True)
             stream = Stream(clip, self.output_index)
+            if wait:
                 async def play():
-                try:
                     await stream.aplay()
-                finally:
                     stream.close()
                     os.remove(os.path.join(self.cache_dir, filename))
-            task = asyncio.create_task(play())
-            self.tasks.add(task)
-            task.add_done_callback(self.tasks.discard)
-
-            if wait:
-                await task
+                asyncio.create_task(play())
+            else:
+                stream.play()
+                stream.close()
+                os.remove(os.path.join(self.cache_dir, filename))
         except Exception as e:
             self.logger.error(f"Failed to make speech from input: {e}")
             if source_event := _ctx.get('event'):

src/ovtk_audiencekit/plugins/builtins/Command.py

@@ -87,7 +87,7 @@ class Command:
         args = emoteless.split()[1:]
         parsed, unknown = self._parser.parse_known_args(args)
         parsed_asdict = vars(parsed)
-        return parsed_asdict, unknown
+        return parsed_asdict
 
 
 class CommandPlugin(PluginBase):
@@ -127,10 +127,9 @@ class CommandPlugin(PluginBase):
                     continue
                 if command.invoked(event):
                     try:
-                        args, unknown = command.parse(event.text)
+                        args = command.parse(event.text)
                         self.logger.debug(f"Parsed args for {command.name}: {args}")
-                        self.logger.debug(f"Remaining text: {unknown}")
-                        ctx = dict(event=event, rest=' '.join(unknown), **args)
+                        ctx = dict(event=event, **args)
                         await self.execute_kdl(actionnode.nodes, _ctx=ctx)
                     except argparse.ArgumentError as e:
                         msg = SysMessage(self._name, f"{e}. See !help {command.name}", replies_to=event)

src/ovtk_audiencekit/plugins/builtins/Mkevent.py

@@ -1,53 +0,0 @@
-import dataclasses
-
-from enum import Enum
-
-from ovtk_audiencekit.core import PluginBase
-from ovtk_audiencekit.events import Event
-from ovtk_audiencekit.utils import get_subclasses
-
-
-class EvFactory:
-    def __init__(self, ev_class):
-        self.target_class = ev_class
-        self.arg_convs = []
-        self.kwarg_convs = {}
-        for field in dataclasses.fields(self.target_class):
-            required = all(isinstance(default, dataclasses.MISSING.__class__) for default in [field.default, field.default_factory])
-            if issubclass(field.type, Enum):
-                conv = lambda value: field.type.__members__[value]
-            else:
-                conv = None
-            if required:
-                self.arg_convs.append(conv)
-            else:
-                self.kwarg_convs[field.name] = conv
-
-    def make(self, via, *args, **kwargs):
-        args = [
-            conv(arg) if conv else arg
-            for arg, conv in zip(args, self.arg_convs)
-        ]
-        kwargs = {
-            key: self.kwarg_convs[key](value) if self.kwarg_convs.get(key) else value
-            for key, value in kwargs.items()
-        }
-        return self.target_class(via, *args, **kwargs)
-
-
-class MakeEventPkugin(PluginBase):
-    """Create a new event and send it to the event bus"""
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.event_factories = {}
-        for event_class in get_subclasses(Event):
-            event_name = event_class.__name__
-            self.event_factories[event_name] = EvFactory(event_class)
-
-    def run(self, event_name, *args, _children=[], _ctx={}, **kwargs):
-        event_factory = self.event_factories.get(event_name)
-        if event_factory is None:
-            raise ValueError(f'Unknown event type "{event_name}"')
-        ev = event_factory.make('kdl', *args, **kwargs)
-        self.send_to_bus(ev)

src/ovtk_audiencekit/plugins/builtins/Scene/Plugin.py

@@ -36,14 +36,14 @@ class ScenePlugin(PluginBase):
         self.blueprint.add_url_rule('/<name>/<cmd>', 'api-sceneset', self.ui_setscene)
         self.blueprint.add_url_rule('/monitor', 'monitor', self.ui_monitor_ws, is_websocket=True)
 
-    async def run(self, name, _children=None, _ctx={}, active=None, group=None, oneshot=False, **kwargs):
+    async def run(self, name, _children=None, _ctx={}, active=None, group=None, immediate=True, oneshot=False, **kwargs):
         if _children is None:
             raise UsageError('Empty scene definition! Did you mean scene.set?')
 
         await self.define(name, group, _children, default_active=active, oneshot=oneshot, ctx=_ctx)
 
-    async def set(self, name, _children=None, _ctx={}, active=True, wait=False):
-        await self.switch(name, active, is_immediate=not wait, ctx=_ctx)
+    async def set(self, name, _children=None, _ctx={}, active=True, immediate=True):
+        await self.switch(name, active, is_immediate=immediate, ctx=_ctx)
 
     async def define(self, name, group, children, default_active=False, oneshot=False, ctx={}):
         if self.scenes.get(name) is not None:

src/ovtk_audiencekit/plugins/builtins/Wait.py

@@ -1,9 +0,0 @@
-from ovtk_audiencekit.core import PluginBase
-
-import asyncio
-
-
-class WaitPlugin(PluginBase):
-    """Halt execution for a bit"""
-    async def run(self, seconds=0, minutes=0, **kwargs): # If you want `hours`, why??????
-        await asyncio.sleep(seconds + (minutes * 60))

src/ovtk_audiencekit/plugins/builtins/__init__.py

@@ -9,10 +9,5 @@ from .Choice import ChoicePlugin as choice
 from .Set import SetPlugin as set
 from .Scene import ScenePlugin as scene
 from .Log import LogPlugin as log
-from .Mkevent import MakeEventPkugin as mkevent
-from .Wait import WaitPlugin as wait
 
-__all__ = [
-    'trigger', 'reply', 'command', 'cue', 'write', 'exec', 'chance', 'choice',
-    'set', 'scene', 'log', 'mkevent', 'wait',
-]
+__all__ = ['trigger', 'reply', 'command', 'cue', 'write', 'exec', 'chance', 'choice', 'set', 'scene', 'log']