Changes necessary to recreate video streaming bug

Author: philip-khaisman

src/oshconnect/oshconnectapi.py

@@ -8,7 +8,6 @@
 import json
 from uuid import UUID
 
-from eventbus import EventHandler
 from .csapi4py.default_api_helpers import APIHelper
 from .datastore import DataStore
 from .resource_datamodels import DatastreamResource
@@ -32,7 +31,6 @@ class OSHConnect:
     _tasks: list = []
     _playback_mode: TemporalModes = TemporalModes.REAL_TIME
     _session_manager: SessionManager = None
-    _event_bus: EventHandler = None
 
     def __init__(self, name: str, **kwargs):
         """
@@ -42,7 +40,6 @@ def __init__(self, name: str, **kwargs):
         self._name = name
         logging.info(f"OSHConnect instance {name} created")
         self._session_manager = SessionManager()
-        self._event_bus = EventHandler()
 
     def get_name(self):
         """
@@ -217,7 +214,7 @@ def find_system(self, system_id: str) -> System | None:
         :return: the found system or None if not found
         """
         for system in self._systems:
-            if system.uid == system_id:
+            if system.urn == system_id:
                 return system
         return None
 

src/oshconnect/streamableresource.py

@@ -539,7 +539,7 @@ def _publish_mqtt(self, topic, payload):
         if self._mqtt_client is None:
             logging.warning(f"No MQTT client configured for streamable resource {self._id}.")
             return
-        print(f'Publishing to MQTT topic {topic}: {payload}')
+        # print(f'Publishing to MQTT topic {topic}: {payload}')
         self._mqtt_client.publish(topic, payload, qos=0)
 
     async def _write_to_mqtt(self):
@@ -940,7 +940,7 @@ def start(self):
                     print(traceback.format_exc())
                     print(f"Error starting MQTT write task: {e}")
 
-            # self._mqtt_client.start()
+            # self._mqtt_client.start()i
 
     def init_mqtt(self):
         super().init_mqtt()
@@ -959,6 +959,10 @@ def insert(self, data: dict):
         encoded = json.dumps(data).encode('utf-8')
         self._publish_mqtt(self._topic, encoded)
 
+    def insert_bytes(self, data: dict):
+        print("*** Insert bytes")
+        self._publish_mqtt(self._topic, data)
+
     def serialize(self) -> dict:
         data = super().serialize()
         data["should_poll"] = getattr(self, "should_poll", None)