Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

default VAD to "ovos-vad-plugin-webrtcvad" + setup/requirements cleanup #271

Merged
merged 7 commits into from
Feb 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/license_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
requirements: 'requirements-all.txt'
fail: 'Copyleft,Other,Error'
fails-only: true
exclude: '^(precise-runner|fann2|tqdm).*'
exclude: '^(precise-runner|fann2|tqdm|bs4).*'
exclude-license: '^(Mozilla).*$'
- name: Print report
if: ${{ always() }}
Expand Down
2 changes: 1 addition & 1 deletion mycroft/configuration/mycroft.conf
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@
"initial_energy_threshold": 1000.0,
// vad module can be any plugin, by default it is not used
// recommended plugin: "ovos-vad-plugin-silero"
"module": "",
"module": "ovos-vad-plugin-webrtcvad",
"ovos-vad-plugin-silero": {"threshold": 0.2},
"ovos-vad-plugin-webrtcvad": {"vad_mode": 3}
},
Expand Down
1 change: 1 addition & 0 deletions requirements/extra-stt.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
SpeechRecognition~=3.8
PyAudio~=0.2
ovos-vad-plugin-webrtcvad
ovos-ww-plugin-pocketsphinx~=0.1, >=0.1.3
ovos-ww-plugin-precise~=0.1
ovos-stt-plugin-selene
Expand Down
25 changes: 16 additions & 9 deletions requirements/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,30 @@ combo-lock~=0.2
PyYAML~=5.4
watchdog

mycroft-messagebus-client~=0.9,!=0.9.2,!=0.9.3
adapt-parser~=0.5
padatious~=0.4.8
padacioso~=0.1.2
fann2==1.0.7
padaos~=0.1

ovos_backend_client~=0.0, >=0.0.5
ovos-config~=0.0,>=0.0.5
ovos-utils~=0.0, >=0.0.27
ovos-plugin-manager~=0.0, >=0.0.19
ovos_workshop~=0.0, >=0.0.10
ovos_PHAL~=0.0, >=0.0.2
ovos-lingua-franca>=0.4.6

ovos-stt-plugin-server~=0.0, >=0.0.2
ovos-tts-plugin-mimic~=0.2, >=0.2.6
ovos-tts-plugin-mimic2~=0.1, >=0.1.5
ovos-tts-plugin-google-tx~=0.0, >=0.0.3
ovos-ww-plugin-pocketsphinx~=0.1
ovos-ww-plugin-precise~=0.1
ovos_workshop~=0.0, >=0.0.10
ovos_PHAL~=0.0, >=0.0.2
ovos-vad-plugin-webrtcvad

ovos-lingua-franca>=0.4.6

mycroft-messagebus-client~=0.9,!=0.9.2,!=0.9.3
adapt-parser~=0.5
padatious~=0.4.8
fann2==1.0.7
padaos~=0.1
ovos-skill-volume~=0.0.1
ovos-skill-fallback-unknown~=0.0.2
ovos-skill-setup~=0.0.1
ovos-skill-stop~=0.2
3 changes: 1 addition & 2 deletions requirements/skills-essential.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
ovos-skill-homescreen~=0.0.1
ovos-skill-volume~=0.0.1
ovos-skill-fallback-unknown~=0.0.2
ovos-skill-setup~=0.0.1
ovos-skill-stop~=0.2
ovos-skill-stop~=0.2
5 changes: 5 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,11 @@ def required(requirements_file):
},
packages=find_packages(include=['mycroft*']),
include_package_data=True,
classifiers=[
"Development Status :: 4 - Beta",
"Programming Language :: Python :: 3",
"License :: OSI Approved :: Apache-2.0",
],
entry_points={
'console_scripts': [
'mycroft-speech-client=mycroft.listener.__main__:main',
Expand Down