mycroft.mic.listen (#38)

.gitignore

@@ -0,0 +1,160 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/#use-with-ide
+.pdm.toml
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/

hivemind_voice_satellite/__main__.py

@@ -1,12 +1,14 @@
+from threading import Event
+
 import click
 from hivemind_bus_client import HiveMessageBusClient
+from hivemind_bus_client.identity import NodeIdentity
+from hivemind_ggwave import GGWaveSlave
 from ovos_audio.service import PlaybackService
 from ovos_utils import wait_for_exit_signal
 from ovos_utils.log import init_service_logger, LOG
+
 from hivemind_voice_satellite import VoiceClient
-from threading import Event
-from hivemind_bus_client.identity import NodeIdentity
-from hivemind_ggwave import GGWaveSlave
 
 
 @click.command(help="connect to HiveMind")
@@ -17,7 +19,6 @@
 @click.option("--selfsigned", help="accept self signed certificates", is_flag=True)
 @click.option("--siteid", help="location identifier for message.context", type=str, default="")
 def connect(host, key, password, port, selfsigned, siteid):
-
     init_service_logger("HiveMind-voice-sat")
 
     identity = NodeIdentity()
@@ -43,7 +44,6 @@ def handle_complete(message):
                 LOG.info(f"will connect to: {host}")
                 ready.set()
 
-
             ggwave.bus.on("hm.ggwave.identity_updated",
                           handle_complete)
             ggwave.start()

hivemind_voice_satellite/service.py

@@ -29,8 +29,8 @@ class VoiceClient(OVOSDinkumVoiceService):
     def __init__(self, bus: HiveMessageBusClient, on_ready=on_ready, on_error=on_error,
                  on_stopping=on_stopping, on_alive=on_alive,
                  on_started=on_started, watchdog=lambda: None, mic=None):
-        super().__init__(on_ready, on_error, on_stopping, on_alive, on_started, watchdog, mic)
-        self.bus = bus
+        super().__init__(on_ready, on_error, on_stopping, on_alive, on_started, watchdog, mic,
+                         bus=bus, validate_source=False)
 
     def _connect_to_bus(self):
         pass

requirements.txt

@@ -1,6 +1,6 @@
 hivemind_bus_client>=0.0.4a10
 ovos-audio
-ovos-dinkum-listener>=0.0.2, < 0.1.0
+ovos-dinkum-listener>=0.0.3a14, < 0.1.0
 ovos-vad-plugin-webrtcvad
 ovos-stt-plugin-server
 ovos-tts-plugin-server

setup.py

@@ -25,7 +25,7 @@ def get_version():
                     '# END_VERSION_BLOCK' in line):
                 break
     version = f"{major}.{minor}.{build}"
-    if alpha:
+    if int(alpha) > 0:
         version += f"a{alpha}"
     return version