Merge pull request #27 from SiemaApplications/try_import

Try relative imports of tahu files if global import fails

enki.py

@@ -5,7 +5,10 @@
 import argparse
 import signal
 
-from sparkplug_b_pb2 import Payload
+try:
+    from sparkplug_b_pb2 import Payload
+except ImportError:
+    from tahu.python.core.sparkplug_b_pb2 import Payload
 
 from mqtt_if import MQTTInterface
 from sp_topic import SPTopic

shell.py

@@ -5,8 +5,14 @@
 
 import cmd2
 
-import sparkplug_b_pb2
-from sparkplug_b import MetricDataType, addMetric, addNullMetric, initDatasetMetric
+try:
+    from sparkplug_b_pb2 import Payload
+    from sparkplug_b import MetricDataType, addMetric
+    from sparkplug_b import addNullMetric, initDatasetMetric
+except ImportError:
+    from tahu.python.core.sparkplug_b_pb2 import Payload
+    from tahu.python.core.sparkplug_b import MetricDataType, addMetric
+    from tahu.python.core.sparkplug_b import addNullMetric, initDatasetMetric
 
 import sp_helpers
 from sp_helpers import MsgType
@@ -433,7 +439,7 @@ def do_send(self, args):
 
         msg_type = MsgType.CMD if args.msg_type == "CMD" else MsgType.DATA
         topic = sp_dev.get_msg_topic(msg_type)
-        payload = sparkplug_b_pb2.Payload()
+        payload = Payload()
         new_metric = True
         while new_metric:
             metric = self.choose_metric(sp_dev)

sp_helpers.py

@@ -4,7 +4,10 @@
 from typing import Optional
 from enum import Enum
 
-from sparkplug_b import MetricDataType
+try:
+    from sparkplug_b import MetricDataType
+except ImportError:
+    from tahu.python.core.sparkplug_b import MetricDataType
 
 
 # Sparkplug namespace used