Update NeonMQHandler import path

Refactor shutdown to ensure MQ client connections are closed

neon_iris/client.py

@@ -42,7 +42,7 @@
 from pika.exceptions import StreamLostError
 from neon_utils.configuration_utils import get_neon_user_config
 from neon_utils.metrics_utils import Stopwatch
-from neon_utils.mq_utils import NeonMQHandler
+from neon_mq_connector.utils.client_utils import NeonMQHandler
 from neon_utils.socket_utils import b64_to_dict
 from neon_utils.file_utils import decode_base64_string_to_file, \
     encode_file_to_base64_string
@@ -130,6 +130,9 @@ def shutdown(self):
         """
         try:
             self._connection.stop()
+            # TODO: This is patching bad behavior in upstream neon_mq_connector
+            if self._connection.connection.is_open:
+                self._connection.connection.close()
         except Exception as e:
             LOG.error(e)
             try:

tests/test_client.py

@@ -30,7 +30,7 @@
 import sys
 import unittest
 
-from neon_utils.mq_utils import NeonMQHandler
+from neon_mq_connector.utils.client_utils import NeonMQHandler
 
 sys.path.append(os.path.dirname(os.path.dirname(os.path.realpath(__file__))))
 from neon_iris.client import NeonAIClient