refactor/ovos-bus-client (#110)

* refactor/ovos-bus-client

* circular import

* scripts module

(cherry picked from commit 34f269f)

ovos_utils/intents/intent_service_interface.py

@@ -1,8 +1,8 @@
 from os.path import exists, isfile
 
 
-from mycroft_bus_client import MessageBusClient
-from mycroft_bus_client.message import Message, dig_for_message
+from ovos_bus_client import MessageBusClient
+from ovos_bus_client.message import Message, dig_for_message
 from ovos_utils import create_daemon
 from ovos_utils.log import LOG
 

ovos_utils/log.py

@@ -17,7 +17,6 @@
 from logging.handlers import RotatingFileHandler
 from os.path import join
 
-from mycroft_bus_client.message import dig_for_message
 
 
 class LOG:
@@ -115,9 +114,13 @@ def _get_real_logger(cls):
 
         logger = cls.create_logger(name, tostdout=True)
         if cls.diagnostic_mode:
-            msg = dig_for_message()
-            if msg:
-                logger.debug(f"DIAGNOSTIC - source bus message {msg.serialize()}")
+            try:
+                from ovos_bus_client.message import dig_for_message
+                msg = dig_for_message()
+                if msg:
+                    logger.debug(f"DIAGNOSTIC - source bus message {msg.serialize()}")
+            except ImportError:
+                pass
         return logger
 
     @classmethod

ovos_utils/messagebus.py

@@ -3,8 +3,7 @@
 from inspect import signature
 from threading import Event
 
-from mycroft_bus_client import MessageBusClient
-from mycroft_bus_client.message import dig_for_message, Message
+
 from ovos_config.config import Configuration
 from ovos_config.locale import get_default_lang
 from pyee import BaseEventEmitter
@@ -127,6 +126,8 @@ def get_message_lang(message=None):
     Returns:
         The language code from the message or the default language.
     """
+    from ovos_bus_client.message import dig_for_message
+
     message = message or dig_for_message()
     default_lang = get_default_lang()
     if not message:
@@ -139,6 +140,8 @@ def get_websocket(host, port, route='/', ssl=False, threaded=True):
     """
     Returns a connection to a websocket
     """
+    from ovos_bus_client import MessageBusClient
+
     client = MessageBusClient(host, port, route, ssl)
     if threaded:
         client.run_in_thread()
@@ -198,6 +201,8 @@ def wait_for_reply(message, reply_type=None, timeout=3.0, bus=None):
     Returns:
         The received message or None if the response timed out
     """
+    from ovos_bus_client.message import Message
+
     auto_close = bus is None
     bus = bus or get_mycroft_bus()
     if isinstance(message, str):
@@ -220,6 +225,8 @@ def wait_for_reply(message, reply_type=None, timeout=3.0, bus=None):
 
 
 def send_message(message, data=None, context=None, bus=None):
+    from ovos_bus_client.message import Message
+
     auto_close = bus is None
     bus = bus or get_mycroft_bus()
     if isinstance(message, str):
@@ -572,6 +579,8 @@ def set_data_gatherer(self, callback, default_data=None, daemonic=False, interva
         """
           prepare responder for sending, register answers
         """
+        from ovos_bus_client.message import Message
+
         self.bus.remove_all_listeners(self.trigger_message)
         if ".request" in self.trigger_message:
             response_type = self.trigger_message.replace(".request", ".reply")
@@ -623,6 +632,7 @@ class BusQuery:
     """
 
     def __init__(self, message, bus=None):
+        from ovos_bus_client.message import Message
         self.bus = bus or get_mycroft_bus()
         self._waiting = False
         self.response = Message(None, None, None)
@@ -649,6 +659,8 @@ def _wait_response(self, timeout):
         self._waiting = False
 
     def send(self, response_type=None, timeout=10):
+        from ovos_bus_client.message import Message
+
         self.response = Message(None, None, None)
         if response_type is None:
             response_type = self.query.type + ".reply"

requirements/requirements.txt

@@ -1,4 +1,4 @@
-mycroft-messagebus-client~=0.9,!=0.9.2,!=0.9.3
+ovos-bus-client~=0.0, >=0.0.3a4
 pexpect~=4.8
 requests~=2.26
 json_database~=0.7

setup.py

@@ -70,12 +70,5 @@ def required(requirements_file):
     license='Apache',
     author='jarbasAI',
     author_email='jarbasai@mailfence.com',
-    description='collection of simple utilities for use across the mycroft ecosystem',
-    entry_points={
-        'console_scripts': [
-            'ovos-listen=ovos_utils.scripts:ovos_listen',
-            'ovos-speak=ovos_utils.scripts:ovos_speak',
-            'ovos-say-to=ovos_utils.scripts:ovos_say_to',
-        ]
-    }
+    description='collection of simple utilities for use across the mycroft ecosystem'
 )