4.1.0 (#172)

NeonGeckoCom · Jul 19, 2023 · 82a555c · 82a555c
2 parents 43ee221 + afd95b1
commit 82a555c
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 110 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,108 +1,20 @@
 # Changelog
 
-## [3.3.2a12](https://github.com/NeonGeckoCom/neon_speech/tree/3.3.2a12) (2023-06-05)
+## [4.0.1a2](https://github.com/NeonGeckoCom/neon_speech/tree/4.0.1a2) (2023-07-18)
 
-[Full Changelog](https://github.com/NeonGeckoCom/neon_speech/compare/3.3.2a11...3.3.2a12)
+[Full Changelog](https://github.com/NeonGeckoCom/neon_speech/compare/4.0.1a1...4.0.1a2)
 
 **Merged pull requests:**
 
-- Update dependencies to stable versions [\#166](https://github.com/NeonGeckoCom/neon_speech/pull/166) ([NeonDaniel](https://github.com/NeonDaniel))
+- Update dependencies and mark deprecation [\#171](https://github.com/NeonGeckoCom/neon_speech/pull/171) ([NeonDaniel](https://github.com/NeonDaniel))
 
-## [3.3.2a11](https://github.com/NeonGeckoCom/neon_speech/tree/3.3.2a11) (2023-06-03)
+## [4.0.1a1](https://github.com/NeonGeckoCom/neon_speech/tree/4.0.1a1) (2023-06-27)
 
-[Full Changelog](https://github.com/NeonGeckoCom/neon_speech/compare/3.3.2a10...3.3.2a11)
+[Full Changelog](https://github.com/NeonGeckoCom/neon_speech/compare/4.0.0...4.0.1a1)
 
 **Merged pull requests:**
 
-- Implement tests for CLI module [\#165](https://github.com/NeonGeckoCom/neon_speech/pull/165) ([NeonDaniel](https://github.com/NeonDaniel))
-
-## [3.3.2a10](https://github.com/NeonGeckoCom/neon_speech/tree/3.3.2a10) (2023-06-03)
-
-[Full Changelog](https://github.com/NeonGeckoCom/neon_speech/compare/3.3.2a9...3.3.2a10)
-
-**Merged pull requests:**
-
-- Update dependencies [\#164](https://github.com/NeonGeckoCom/neon_speech/pull/164) ([NeonDaniel](https://github.com/NeonDaniel))
-
-## [3.3.2a9](https://github.com/NeonGeckoCom/neon_speech/tree/3.3.2a9) (2023-06-01)
-
-[Full Changelog](https://github.com/NeonGeckoCom/neon_speech/compare/3.3.2a8...3.3.2a9)
-
-**Merged pull requests:**
-
-- Replace Hotword reload tests [\#163](https://github.com/NeonGeckoCom/neon_speech/pull/163) ([NeonDaniel](https://github.com/NeonDaniel))
-
-## [3.3.2a8](https://github.com/NeonGeckoCom/neon_speech/tree/3.3.2a8) (2023-05-31)
-
-[Full Changelog](https://github.com/NeonGeckoCom/neon_speech/compare/3.3.2a7...3.3.2a8)
-
-**Merged pull requests:**
-
-- Update Dinkum listener dependency and clean up config reload handling [\#162](https://github.com/NeonGeckoCom/neon_speech/pull/162) ([NeonDaniel](https://github.com/NeonDaniel))
-
-## [3.3.2a7](https://github.com/NeonGeckoCom/neon_speech/tree/3.3.2a7) (2023-05-26)
-
-[Full Changelog](https://github.com/NeonGeckoCom/neon_speech/compare/3.3.2a6...3.3.2a7)
-
-**Merged pull requests:**
-
-- Refactor config init to CLI and out of `main` method [\#160](https://github.com/NeonGeckoCom/neon_speech/pull/160) ([NeonDaniel](https://github.com/NeonDaniel))
-
-## [3.3.2a6](https://github.com/NeonGeckoCom/neon_speech/tree/3.3.2a6) (2023-05-25)
-
-[Full Changelog](https://github.com/NeonGeckoCom/neon_speech/compare/3.3.2a5...3.3.2a6)
-
-**Closed issues:**
-
-- Resolve non-server unit test failures [\#84](https://github.com/NeonGeckoCom/neon_speech/issues/84)
-
-**Merged pull requests:**
-
-- Refactor on Dinkum Listener [\#157](https://github.com/NeonGeckoCom/neon_speech/pull/157) ([NeonDaniel](https://github.com/NeonDaniel))
-
-## [3.3.2a5](https://github.com/NeonGeckoCom/neon_speech/tree/3.3.2a5) (2023-05-24)
-
-[Full Changelog](https://github.com/NeonGeckoCom/neon_speech/compare/3.3.2a4...3.3.2a5)
-
-**Merged pull requests:**
-
-- Refactor 'speech' to 'voice' for future compat. [\#159](https://github.com/NeonGeckoCom/neon_speech/pull/159) ([NeonDaniel](https://github.com/NeonDaniel))
-
-## [3.3.2a4](https://github.com/NeonGeckoCom/neon_speech/tree/3.3.2a4) (2023-05-18)
-
-[Full Changelog](https://github.com/NeonGeckoCom/neon_speech/compare/3.3.2a3...3.3.2a4)
-
-**Merged pull requests:**
-
-- Add malloc logging to speech service [\#156](https://github.com/NeonGeckoCom/neon_speech/pull/156) ([NeonDaniel](https://github.com/NeonDaniel))
-
-## [3.3.2a3](https://github.com/NeonGeckoCom/neon_speech/tree/3.3.2a3) (2023-05-18)
-
-[Full Changelog](https://github.com/NeonGeckoCom/neon_speech/compare/3.3.2a2...3.3.2a3)
-
-**Merged pull requests:**
-
-- Refactor on ovos-listener module [\#155](https://github.com/NeonGeckoCom/neon_speech/pull/155) ([NeonDaniel](https://github.com/NeonDaniel))
-
-## [3.3.2a2](https://github.com/NeonGeckoCom/neon_speech/tree/3.3.2a2) (2023-05-11)
-
-[Full Changelog](https://github.com/NeonGeckoCom/neon_speech/compare/3.3.2a1...3.3.2a2)
-
-**Merged pull requests:**
-
-- Add test coverage for non-streaming STT init [\#154](https://github.com/NeonGeckoCom/neon_speech/pull/154) ([NeonDaniel](https://github.com/NeonDaniel))
-
-## [3.3.2a1](https://github.com/NeonGeckoCom/neon_speech/tree/3.3.2a1) (2023-05-11)
-
-[Full Changelog](https://github.com/NeonGeckoCom/neon_speech/compare/3.3.1...3.3.2a1)
-
-**Fixed bugs:**
-
-- \[BUG\] Whisper STT plugins don't work with neon\_speech [\#150](https://github.com/NeonGeckoCom/neon_speech/issues/150)
-
-**Merged pull requests:**
-
-- Fix non-streaming plugin config compat. with ovos-plugin-manager [\#153](https://github.com/NeonGeckoCom/neon_speech/pull/153) ([NeonDaniel](https://github.com/NeonDaniel))
+- Update Docker to use OVOS\_CONFIG envvars [\#169](https://github.com/NeonGeckoCom/neon_speech/pull/169) ([NeonDaniel](https://github.com/NeonDaniel))
 
 
 

diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,8 @@ FROM python:3.8-slim as base
 LABEL vendor=neon.ai \
     ai.neon.name="neon-speech"
 
-ENV NEON_CONFIG_PATH /config
+ENV OVOS_CONFIG_BASE_FOLDER neon
+ENV OVOS_CONFIG_FILENAME neon.yaml
 
 RUN apt-get update && \
   apt-get install -y \

diff --git a/docker_overlay/etc/OpenVoiceOS/ovos.conf b/docker_overlay/etc/OpenVoiceOS/ovos.conf
diff --git a/neon_speech/__main__.py b/neon_speech/__main__.py
@@ -55,5 +55,12 @@ def main(*args, **kwargs):
     service.shutdown()
 
 
+def deprecated_entrypoint():
+    from ovos_utils.log import log_deprecation
+    log_deprecation("Use `neon-speech run` in place of `neon_speech_client`",
+                    "2.0.0")
+    main()
+
+
 if __name__ == "__main__":
     main()
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
@@ -4,7 +4,7 @@ ovos-utils~=0.0.30
 ovos-plugin-manager~=0.0.23
 click~=8.0
 click-default-group~=1.2
-neon-utils[network,audio]~=1.5
+neon-utils[network,audio]~=1.6
 ovos-config~=0.0.7
 
 ovos-vad-plugin-webrtcvad~=0.0.1

diff --git a/setup.py b/setup.py
@@ -78,7 +78,8 @@ def get_requirements(requirements_filename: str):
     long_description_content_type="text/markdown",
     entry_points={
         'console_scripts': [
-            'neon_speech_client=neon_speech.__main__:main',
+            # TODO: Deprecate `neon_speech_client` entrypoint
+            'neon_speech_client=neon_speech.__main__:deprecated_entrypoint',
             'neon-speech=neon_speech.cli:neon_speech_cli'
         ]
     }

diff --git a/version.py b/version.py
@@ -26,4 +26,4 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE,  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-__version__ = "4.0.0"
+__version__ = "4.1.0"