README.md

@@ -27,7 +27,7 @@ trigger event="Raid" {
 ## For developers
 Extending audiencekit's automation abilities is made as simple as possible. For example, a plugin that automatically changes "simp" to "shrimp" in every message (as seen by those consuming this project's output) is simply:
 ```python
-from ovtk_audiencekit.core import PluginBase
+from ovtk_audiencekit.plugins import PluginBase
 from ovtk_audiencekit.events import Message
 
 class Plugin(PluginBase):

src/ovtk_audiencekit/__init__.py

@@ -1 +0,0 @@
-__path__ = __import__('pkgutil').extend_path(__path__, __name__)

src/ovtk_audiencekit/core/MainProcess.py

@@ -17,12 +17,11 @@ import hypercorn
 import hypercorn.asyncio
 import hypercorn.logging
 
+from ovtk_audiencekit.core import WebsocketServerProcess
 from ovtk_audiencekit.core.Config import parse_kdl_deep, kdl_reserved, compute_dynamic
-from ovtk_audiencekit.core.Plugins import PluginError
-from ovtk_audiencekit.core.WebsocketServerProcess import WebsocketServerProcess
 from ovtk_audiencekit.events import Event, Delete
 from ovtk_audiencekit.chats.ChatProcess import ShutdownRequest
-from ovtk_audiencekit.plugins import builtins
+from ovtk_audiencekit.plugins import builtins, PluginError
 from ovtk_audiencekit.utils import format_exception
 
 logger = logging.getLogger(__name__)

src/ovtk_audiencekit/core/__init__.py

@@ -1,4 +1,3 @@
 from .WebsocketServerProcess import WebsocketServerProcess
-from .Plugins import PluginBase, PluginError
 from .MainProcess import MainProcess
 from .Audio import Clip, Stream

src/ovtk_audiencekit/events/__init__.py

@@ -7,4 +7,3 @@ from .Subscription import Subscription
 from .Follow import Follow
 
 __all__ = ['Event', 'Message', 'SysMessage', 'Delete', 'Control', 'Subscription', 'Follow']
-__path__ = __import__('pkgutil').extend_path(__path__, __name__)

src/ovtk_audiencekit/plugins/AudioAlert/AudioAlert.py

@@ -3,13 +3,11 @@ from collections import deque
 
 import maya
 
-from ovtk_audiencekit.core import PluginBase
+from ovtk_audiencekit.plugins import PluginBase
 from ovtk_audiencekit.core import Clip, Stream
 
 class AudioAlert(PluginBase):
     def setup(self, output=None, timeout_min=1, sample_rate=None, buffer_length=4096, force_stereo=True):
-        self._cleanup_task = asyncio.create_task(self._cleanup())
-
         self.force_stereo = force_stereo
         self.timeout_min = timeout_min
         self.clips = {}
@@ -23,6 +21,8 @@ class AudioAlert(PluginBase):
             except StopIteration:
                 self.logger.warn('Target audio device does not claim to support common sample rates! Attempting playback at native rate of audio')
 
+        self._cleanup_task = asyncio.create_task(self._cleanup())
+
     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"}'

src/ovtk_audiencekit/plugins/Jail/JailPlugin.py

@@ -7,7 +7,7 @@ import maya
 from requests.exceptions import HTTPError
 from owoify.owoify import owoify, Owoness
 
-from ovtk_audiencekit.core import PluginBase
+from ovtk_audiencekit.plugins import PluginBase
 from ovtk_audiencekit.core.Data import CACHE_DIR
 from ovtk_audiencekit.plugins.builtins.Command import Command, CommandTypes
 from ovtk_audiencekit.events.Message import Message, SysMessage

src/ovtk_audiencekit/plugins/Midi/Midi.py

@@ -2,7 +2,7 @@ import asyncio
 
 import mido
 
-from ovtk_audiencekit.core import PluginBase
+from ovtk_audiencekit.plugins import PluginBase
 
 
 def matches(msg, attrs):

src/ovtk_audiencekit/plugins/OBS/obs.py

@@ -2,7 +2,7 @@ import asyncio
 
 import simpleobsws
 
-from ovtk_audiencekit.core import PluginBase
+from ovtk_audiencekit.plugins import PluginBase
 
 
 class OBSWSPlugin(PluginBase):

src/ovtk_audiencekit/plugins/OSC/osc.py

@@ -1,6 +1,6 @@
 from pythonosc.udp_client import SimpleUDPClient
 
-from ovtk_audiencekit.core import PluginBase
+from ovtk_audiencekit.plugins import PluginBase
 
 
 class OSCPlugin(PluginBase):

src/ovtk_audiencekit/plugins/PhraseCounter/PhraseCounter.py

@@ -4,7 +4,7 @@ import json
 import os
 
 from ovtk_audiencekit.core.Data import CACHE_DIR
-from ovtk_audiencekit.core import PluginBase
+from ovtk_audiencekit.plugins import PluginBase
 from ovtk_audiencekit.events import Message
 
 from .Formatter import PhraseCountFormatter

src/ovtk_audiencekit/plugins/Shoutout/ShoutoutPlugin.py

@@ -2,7 +2,7 @@ from argparse import ArgumentError
 
 from requests.exceptions import HTTPError
 
-from ovtk_audiencekit.core import PluginBase
+from ovtk_audiencekit.plugins import PluginBase
 from ovtk_audiencekit.plugins.builtins.Command import Command, CommandTypes
 from ovtk_audiencekit.events.Message import Message, SysMessage, USER_TYPE
 from ovtk_audiencekit.chats.Twitch import Process as Twitch

src/ovtk_audiencekit/plugins/TTS/TTS.py

@@ -6,7 +6,7 @@ from TTS.utils.synthesizer import Synthesizer
 from TTS.utils.manage import ModelManager
 from TTS.config import load_config
 
-from ovtk_audiencekit.core import PluginBase
+from ovtk_audiencekit.plugins import PluginBase
 from ovtk_audiencekit.events import Message, SysMessage
 from ovtk_audiencekit.core import Clip, Stream
 from ovtk_audiencekit.core.Data import CACHE_DIR

src/ovtk_audiencekit/plugins/__init__.py

@@ -1 +1,3 @@
-__path__ = __import__('pkgutil').extend_path(__path__, __name__)
+from ovtk_audiencekit.core.PluginBase import PluginBase, PluginError
+
+__all__ = ['PluginBase', 'PluginError']

src/ovtk_audiencekit/plugins/builtins/Chance.py

@@ -1,6 +1,6 @@
 import random
 
-from ovtk_audiencekit.core import PluginBase
+from ovtk_audiencekit.plugins import PluginBase
 
 
 class ChancePlugin(PluginBase):

src/ovtk_audiencekit/plugins/builtins/Choice.py

@@ -1,7 +1,7 @@
 import subprocess
 import random
 
-from ovtk_audiencekit.core import PluginBase
+from ovtk_audiencekit.plugins import PluginBase
 from ovtk_audiencekit.events import SysMessage
 
 

src/ovtk_audiencekit/plugins/builtins/Command.py

@@ -7,7 +7,7 @@ import sys
 
 from multipledispatch import dispatch
 
-from ovtk_audiencekit.core import PluginBase
+from ovtk_audiencekit.plugins import PluginBase
 from ovtk_audiencekit.events import Message, SysMessage
 from ovtk_audiencekit.events.Message import USER_TYPE
 

src/ovtk_audiencekit/plugins/builtins/Cue.py

@@ -6,7 +6,7 @@ import uuid
 import maya
 import aioscheduler
 
-from ovtk_audiencekit.core import PluginBase
+from ovtk_audiencekit.plugins import PluginBase
 from ovtk_audiencekit.utils import format_exception
 
 logger = logging.getLogger(__name__)

src/ovtk_audiencekit/plugins/builtins/Exec.py

@@ -1,6 +1,6 @@
 import subprocess
 
-from ovtk_audiencekit.core import PluginBase
+from ovtk_audiencekit.plugins import PluginBase
 from ovtk_audiencekit.events import SysMessage
 
 

src/ovtk_audiencekit/plugins/builtins/Log.py

@@ -1,4 +1,4 @@
-from ovtk_audiencekit.core import PluginBase
+from ovtk_audiencekit.plugins import PluginBase
 
 import logging
 

src/ovtk_audiencekit/plugins/builtins/Reply.py

@@ -1,4 +1,4 @@
-from ovtk_audiencekit.core import PluginBase
+from ovtk_audiencekit.plugins import PluginBase
 from ovtk_audiencekit.events import SysMessage, Message
 
 

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

@@ -6,7 +6,7 @@ import json
 
 import kdl
 
-from ovtk_audiencekit.core import PluginBase
+from ovtk_audiencekit.plugins import PluginBase
 from ovtk_audiencekit.utils import format_exception
 
 

src/ovtk_audiencekit/plugins/builtins/Set.py

@@ -1,4 +1,4 @@
-from ovtk_audiencekit.core import PluginBase
+from ovtk_audiencekit.plugins import PluginBase
 from ovtk_audiencekit.core.Config import compute_dynamic
 
 

src/ovtk_audiencekit/plugins/builtins/Trigger.py

@@ -2,7 +2,7 @@ import re
 from dataclasses import dataclass
 import typing
 
-from ovtk_audiencekit.core import PluginBase
+from ovtk_audiencekit.plugins import PluginBase
 from ovtk_audiencekit.events import Message
 
 

src/ovtk_audiencekit/plugins/builtins/Write.py

@@ -1,6 +1,6 @@
 import os
 
-from ovtk_audiencekit.core import PluginBase
+from ovtk_audiencekit.plugins import PluginBase
 from ovtk_audiencekit.events import SysMessage, Message