diff --git a/CHANGELOG.md b/CHANGELOG.md index e96404ba..54c6358b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,52 +1,12 @@ # Changelog -## [1.8.3a6](https://github.com/NeonGeckoCom/neon-utils/tree/1.8.3a6) (2024-02-26) +## [1.9.1a1](https://github.com/NeonGeckoCom/neon-utils/tree/1.9.1a1) (2024-03-01) -[Full Changelog](https://github.com/NeonGeckoCom/neon-utils/compare/1.8.3a5...1.8.3a6) +[Full Changelog](https://github.com/NeonGeckoCom/neon-utils/compare/1.9.0...1.9.1a1) **Merged pull requests:** -- Update Hana utils to prep for release [\#501](https://github.com/NeonGeckoCom/neon-utils/pull/501) ([NeonDaniel](https://github.com/NeonDaniel)) - -## [1.8.3a5](https://github.com/NeonGeckoCom/neon-utils/tree/1.8.3a5) (2024-02-14) - -[Full Changelog](https://github.com/NeonGeckoCom/neon-utils/compare/1.8.3a4...1.8.3a5) - -**Merged pull requests:** - -- feat: adds function for installing packages via pip [\#499](https://github.com/NeonGeckoCom/neon-utils/pull/499) ([dblencowe](https://github.com/dblencowe)) - -## [1.8.3a4](https://github.com/NeonGeckoCom/neon-utils/tree/1.8.3a4) (2024-02-07) - -[Full Changelog](https://github.com/NeonGeckoCom/neon-utils/compare/1.8.3a3...1.8.3a4) - -**Merged pull requests:** - -- Fix directory errors in hana\_utils [\#500](https://github.com/NeonGeckoCom/neon-utils/pull/500) ([NeonDaniel](https://github.com/NeonDaniel)) - -## [1.8.3a3](https://github.com/NeonGeckoCom/neon-utils/tree/1.8.3a3) (2024-01-24) - -[Full Changelog](https://github.com/NeonGeckoCom/neon-utils/compare/1.8.3a2...1.8.3a3) - -**Merged pull requests:** - -- Add utilities for interfacing with Neon HANA [\#497](https://github.com/NeonGeckoCom/neon-utils/pull/497) ([NeonDaniel](https://github.com/NeonDaniel)) - -## [1.8.3a2](https://github.com/NeonGeckoCom/neon-utils/tree/1.8.3a2) (2024-01-02) - -[Full Changelog](https://github.com/NeonGeckoCom/neon-utils/compare/1.8.3a1...1.8.3a2) - -**Merged pull requests:** - -- Refactor and Deprecate NeonFallbackSkill [\#496](https://github.com/NeonGeckoCom/neon-utils/pull/496) ([NeonDaniel](https://github.com/NeonDaniel)) - -## [1.8.3a1](https://github.com/NeonGeckoCom/neon-utils/tree/1.8.3a1) (2023-12-29) - -[Full Changelog](https://github.com/NeonGeckoCom/neon-utils/compare/1.8.2...1.8.3a1) - -**Merged pull requests:** - -- Update for ovos-workshop compat [\#495](https://github.com/NeonGeckoCom/neon-utils/pull/495) ([NeonDaniel](https://github.com/NeonDaniel)) +- Resovle optional dependency import error in skills module [\#503](https://github.com/NeonGeckoCom/neon-utils/pull/503) ([NeonDaniel](https://github.com/NeonDaniel)) diff --git a/neon_utils/skills/neon_fallback_skill.py b/neon_utils/skills/neon_fallback_skill.py index 4a9a88d6..cd46e833 100644 --- a/neon_utils/skills/neon_fallback_skill.py +++ b/neon_utils/skills/neon_fallback_skill.py @@ -25,6 +25,8 @@ # LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import yaml import json import os import pathlib @@ -35,10 +37,8 @@ from threading import Event from typing import List, Any, Optional -import yaml from dateutil.tz import gettz from json_database import JsonStorage -from neon_mq_connector.utils.client_utils import send_mq_request from ovos_bus_client import Message from ovos_plugin_manager.language import OVOSLangDetectionFactory, OVOSLangTranslationFactory from ovos_utils.gui import is_gui_connected @@ -351,6 +351,12 @@ def send_email(self, title, body, message=None, email_addr=None, attachments (dict): Optional dict of file names to Base64 encoded files message (Message): Optional message to get email from """ + try: + from neon_utils.mq_utils import send_mq_request + except ImportError: + LOG.warning("MQ Dependencies not installed") + send_mq_request = None + message = message or dig_for_message() if not email_addr and message: email_addr = get_user_prefs(message)["user"].get("email") diff --git a/version.py b/version.py index 8c65da07..7133787a 100644 --- 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__ = "1.9.0" +__version__ = "1.9.1"