@camera.ui/server 0.0.70 → 0.0.71-dev.0

package/dist/server/src/plugins/runtime/python/child.py

@@ -1,10 +1,16 @@
+import truststore
+
+truststore.inject_into_ssl()
+
 import asyncio
+import importlib.util
 import json
 import os
 import sys
 from contextlib import suppress
 from pathlib import Path
-from typing import Any, Literal, Optional, Union, cast
+from types import ModuleType
+from typing import Any, Literal, cast
 
 import setproctitle
 from lmdbm import Lmdb
@@ -13,20 +19,14 @@ from _camera_ui_tools.camera_ui_common import (
     LoggerOptions,
     LoggerService,
     SignalHandler,
-    TaskSet,
 )
-from _camera_ui_tools.camera_ui_rpc_client import ClientInstance
-from _camera_ui_tools.camera_ui_rpc_client.utils.subscriptions import SubscriptionWrapper
-from _camera_ui_tools.camera_ui_types import Camera
-from _camera_ui_tools.camera_ui_types import CameraDevice as CameraDeviceInterface
+from _camera_ui_tools.camera_ui_rpc import CloseHandler, RPCClient, create_rpc_client
+from _camera_ui_tools.camera_ui_sdk import API_EVENT, BasePlugin, Camera
+from _camera_ui_tools.camera_ui_sdk import CameraDevice as CameraDeviceInterface
 from plugins.runtime.python.namespaces import NamespaceManager
-from plugins.runtime.python.plugin import Plugin
 from plugins.runtime.python.plugin_api import PluginAPI
 from plugins.runtime.python.proxy.camera_device import CameraDeviceProxy
-from plugins.runtime.python.proxy.core_manager import CoreManagerProxy
-from plugins.runtime.python.proxy.device_manager import DeviceManagerProxy
 from plugins.runtime.python.typings import (
-    API_EVENT,
     PLUGIN_COMMAND,
     PLUGIN_STATUS,
     PluginInfo,
@@ -54,33 +54,17 @@ class JsonLmdb(Lmdb[Literal["config"], dict[str, Any]]):
         return json.loads(value.decode("utf-8"))
 
 
-class PluginChild(ClientInstance):
+class PluginChild:
     def __init__(self) -> None:
-        super().__init__(
-            "plugin",
+        self.proxy: RPCClient = create_rpc_client(
             {
-                "endpoints": [endpoint for endpoint in os.environ["PROXY_ENDPOINTS"].split(",")],
+                "name": NamespaceManager.plugin_namespaces(os.environ["PLUGIN_ID"]).plugin_child,
+                "servers": os.environ["PROXY_ENDPOINTS"].split(","),
                 "auth": {
                     "user": os.environ["PROXY_USER"],
                     "password": os.environ["PROXY_PASSWORD"],
                 },
-                "tls": {
-                    "cert": os.environ["PROXY_CERT"],
-                    "key": os.environ["PROXY_KEY"],
-                    "ca": os.environ["PROXY_CA"],
-                },
-                "metadata": {
-                    "id": NamespaceManager.plugin_namespaces(os.environ["PLUGIN_ID"])["pluginChild"],
-                    "name": os.environ["PLUGIN_NAME"],
-                },
-                "connect": {
-                    "wait_for_server": True,
-                },
-                "reconnect": {
-                    "enabled": True,
-                },
-                "bundled_connection": False,
-            },
+            }
         )
 
         for key in ["PROXY_USER", "PROXY_PASSWORD", "PROXY_ENDPOINTS", "PROXY_CERT", "PROXY_KEY", "PROXY_CA"]:
@@ -93,16 +77,18 @@ class PluginChild(ClientInstance):
             "prefix": self.display_name,
             "debug_enabled": os.environ.get("LOGGER_LEVEL") in ["debug", "trace"],
             "trace_enabled": os.environ.get("LOGGER_LEVEL") == "trace",
+            "target_id": os.environ.get("PLUGIN_ID"),
+            "target_type": "plugin",
+            "plugin_id": os.environ.get("PLUGIN_ID"),
         }
 
         self.logger = LoggerService(logger_options)
+        self.logger.set_child_process_mode(True)
 
-        self.api: Optional[PluginAPI] = None
-        self.plugin: Optional[Plugin] = None
-        self.plugin_db: Optional[Lmdb[Literal["config"], dict[str, Any]]] = None
-
-        self.subscription: Optional[SubscriptionWrapper] = None
-        self.tasks: TaskSet = TaskSet(f"{self.display_name} PluginChild")
+        self.api: PluginAPI | None = None
+        self.plugin: BasePlugin | None = None
+        self.close_proxy: CloseHandler | None = None
+        self.plugin_db: Lmdb[Literal["config"], dict[str, Any]] | None = None
 
         self.stopped = False
 
@@ -118,23 +104,22 @@ class PluginChild(ClientInstance):
     async def run(self) -> None:
         try:
             self.signal_handler.setup_handlers()
-            await self.start()
+            await self.proxy.connect()
+            await self.on_start()
             await self.signal_handler.shutdown_event.wait()
         except asyncio.CancelledError:
             pass
+        except Exception as e:
+            self.logger.error(f"Failed to connect to proxy server: {e}")
+            raise
         finally:
             await self.stop_plugin()
 
     async def on_start(self) -> None:
-        self.subscription = await self.on_server_message(self.on_message)
+        self.channel = await self.proxy.private_channel("plugin-communication", "camera.ui")
+        self.channel.on("message", self.on_message)
         await self.send_message({"type": PLUGIN_STATUS.READY.value})
 
-    async def on_before_stop(self) -> None:
-        await self.stop_plugin()
-
-    async def on_stop(self) -> None:
-        pass
-
     async def start_plugin(self, data: ProcessLoadMessage) -> None:
         try:
             storage_path = data["storage"]["storagePath"]
@@ -144,28 +129,38 @@ class PluginChild(ClientInstance):
             self.plugin_db = await self.configure_plugin_db(storage_path)
 
             self.api = PluginAPI(
-                self,
+                self.proxy,
                 plugin_info,
                 storage_path,
                 self.logger,
                 self.plugin_db,
             )
 
-            self.plugin = Plugin(self, self.api, plugin_info, self.logger)
+            plugin_constructor = self.load_plugin()
+            plugin_storage = await self.api.storage_controller.createStorage("plugin")
+            self.plugin = cast(BasePlugin, plugin_constructor(self.logger, self.api, plugin_storage))
+
+            # Apply storage_schema if defined by plugin
+            if hasattr(self.plugin, "storage_schema") and self.plugin.storage_schema:
+                plugin_storage.defineSchemas(self.plugin.storage_schema)
 
-            core_manager = cast(CoreManagerProxy, self.api.core_manager)
-            device_manager = cast(DeviceManagerProxy, self.api.device_manager)
+            namespaces = NamespaceManager.plugin_namespaces(plugin_info["id"])
+            self.close_proxy = await self.proxy.register_handler(
+                namespaces.plugin_child_rpc, self.plugin, without_decorators=True
+            )
 
-            await device_manager.init()
-            await core_manager.init()
-            await self.plugin.load()
+            # Set the plugin instance on device_manager for lifecycle callbacks
+            self.api.device_manager.set_plugin(self.plugin)
+
+            await self.api.device_manager.init()
+            await self.api.core_manager.init()
             await self.configure_cameras(self.api, plugin_info, cameras)
 
             await self.send_message({"type": PLUGIN_STATUS.STARTED.value})
 
             await asyncio.sleep(0.1)
 
-            self.api.emit("finishLaunching")
+            self.api.emit(API_EVENT.FINISH_LAUNCHING)
         except Exception as e:
             await self.send_message({"type": PLUGIN_STATUS.ERROR.value, "error": str(e)})
 
@@ -180,39 +175,46 @@ class PluginChild(ClientInstance):
             await asyncio.sleep(0.5)
             self.api.cancel()
 
-        if self.plugin_db:
+        if self.plugin_db is not None:
             with suppress(Exception):
                 self.plugin_db.close()
+            self.plugin_db = None
 
-        if self.subscription:
-            await self.subscription.unsubscribe()
-            self.subscription = None
+        if self.channel:
+            with suppress(Exception):
+                await self.channel.close()
 
-        await self.stop()
+        if self.close_proxy:
+            with suppress(Exception):
+                await self.close_proxy()
+
+        await self.proxy.disconnect()
 
     async def send_message(self, message: ProcessResponse) -> None:
-        await self.send_to_server(message)
+        await self.channel.send(message)
 
     async def on_message(self, message: ProcessMessage) -> None:
         if self.stopped:
             return
 
-        if "type" in message:
-            if message["type"] == PLUGIN_COMMAND.START.value:
+        match message["type"]:
+            case PLUGIN_COMMAND.START.value:
                 if not message["data"]:
                     await self.send_message({"type": PLUGIN_STATUS.ERROR.value, "error": "No data provided"})
                     return
 
                 await self.start_plugin(message["data"])
-            elif message["type"] == PLUGIN_COMMAND.STOP.value:
+            case PLUGIN_COMMAND.STOP.value:
                 await self.stop_plugin()
+            case _:
+                pass
 
     async def configure_plugin_db(self, storage_path: str) -> Lmdb[Literal["config"], dict[str, Any]]:
         db_path = Path(storage_path) / "volume"
         Path(db_path).mkdir(parents=True, exist_ok=True)
 
-        plugin_db: Lmdb[Literal["config"], dict[str, Any]] = JsonLmdb.open(file=str(db_path), flag="c")
-        config = cast(Union[dict[str, Any], None], plugin_db.get("config"))
+        plugin_db = cast(Lmdb[Literal["config"], dict[str, Any]], JsonLmdb.open(file=str(db_path), flag="c"))
+        config = cast(dict[str, Any] | None, plugin_db.get("config"))
 
         if config is None:
             plugin_db.update({"config": {}})
@@ -223,11 +225,14 @@ class PluginChild(ClientInstance):
         cameras_devices: list[CameraDeviceProxy] = []
 
         for camera in cameras:
-            camera_logger = self.logger.create_logger({"suffix": camera["name"], "logger_id": camera["_id"]})
+            camera_logger = self.logger.create_logger(
+                {"suffix": camera["name"], "target_id": camera["_id"], "target_type": "camera"}
+            )
             cameras_devices.append(
                 CameraDeviceProxy(
-                    self,
+                    self.proxy,
                     api,
+                    api.storage_controller,
                     camera,
                     plugin_info,
                     camera_logger,
@@ -235,12 +240,47 @@ class PluginChild(ClientInstance):
             )
 
         if self.api:
-            device_manager = cast(DeviceManagerProxy, self.api.device_manager)
-            await device_manager.configure_cameras(cameras_devices)
+            await self.api.device_manager.configureCameras(cameras_devices)
 
         if self.plugin:
             await self.plugin.configureCameras(cast(list[CameraDeviceInterface], cameras_devices))
 
+    def load_plugin(self) -> Any:
+        module_path = os.environ.get("MODULE_PATH")
+        if not module_path:
+            raise Exception("MODULE_PATH environment variable not set")
+
+        if not os.path.exists(module_path):
+            raise Exception(f"Module path does not exist: {module_path}")
+
+        spec = importlib.util.spec_from_file_location("plugin_module", module_path)
+        if spec is None:
+            raise Exception(f"Could not load module from '{module_path}'.")
+
+        module = importlib.util.module_from_spec(spec)
+        sys.modules["plugin_module"] = module
+
+        if spec.loader is None:
+            raise Exception(f"Could not load module from '{module_path}'.")
+
+        spec.loader.exec_module(module)
+        return self.find_plugin_constructor(module)
+
+    def find_plugin_constructor(self, module: ModuleType) -> Any:
+        if hasattr(module, "__main__"):
+            main_func = module.__main__
+            if callable(main_func):
+                plugin_base_class = main_func()
+                if isinstance(plugin_base_class, type):
+                    return plugin_base_class
+                else:
+                    raise Exception("Plugin's __main__ must return a plugin constructor.")
+            else:
+                raise Exception("Plugin's __main__ is not callable.")
+
+        else:
+            raise Exception("Plugin does not have a __main__ function.")
+
 
 if __name__ == "__main__":
     plugin_child = PluginChild()

package/dist/server/src/plugins/runtime/python/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/plugins/runtime/python/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/plugins/runtime/python/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACxF,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAI/C,MAAM,OAAO,mBAAoB,SAAQ,iBAAiB;IAChD,EAAE,CAAkB;IAE5B,YAAY,MAAc;QACxB,KAAK,CAAC,MAAM,CAAC,CAAC;QAEd,IAAI,CAAC,EAAE,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;IACxI,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;YACrB,OAAO;QACT,CAAC;QAED,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAE1B,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,oBAAoB,IAAI,CAAC,MAAM,CAAC,WAAW,KAAK,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,MAAM,CAAC,CAAC;YAEnI,MAAM,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC,gBAAgB,CAAC;YACzC,MAAM,YAAY,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YACvE,MAAM,IAAI,GAAa,CAAC,IAAI,EAAE,gBAAgB,EAAE,GAAG,YAAY,CAAC,CAAC;YAEjE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;YAEhE,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,gBAAgB,EAAE,IAAI,EAAE;gBAClD,GAAG,EAAE;oBACH,gBAAgB,EAAE,GAAG;oBACrB,UAAU,EAAE,IAAI,CAAC,gBAAgB,EAAE;oBACnC,GAAG,IAAI,CAAC,MAAM,EAAE;iBACjB;gBACD,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ;aAC1B,CAAC,CAAC;YAEH,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,GAAI,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC;YACzG,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;YACzD,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAE/C,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YACvD,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACzD,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,YAAY;QACxB,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YACzB,MAAM,IAAI,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC;YAEpC,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC;YAC3E,IAAI,UAAU,CAAC,gBAAgB,CAAC,IAAI,QAAQ,CAAC,gBAAgB,CAAC,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;gBACxE,MAAM,IAAI,CAAC,EAAE,CAAC,wBAAwB,CAAC,gBAAgB,CAAC,CAAC;YAC3D,CAAC;YAED,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,uBAAuB,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,IAAI,kBAAkB,CAAC,EAAE,CAAC;gBAC9G,MAAM,IAAI,KAAK,CAAC,kBAAkB,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,IAAI,kBAAkB,mCAAmC,IAAI,CAAC,MAAM,CAAC,UAAU,GAAG,CAAC,CAAC;YAC1J,CAAC;QACH,CAAC;IACH,CAAC;IAEO,gBAAgB;QACtB,MAAM,SAAS,GAAG,QAAQ,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;QACrD,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,kBAAkB,EAAE,UAAU,EAAE,IAAI,CAAC,EAAE,CAAC,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACpH,CAAC;CACF"}

package/dist/server/src/plugins/runtime/python/namespaces.py

@@ -1,101 +1,196 @@
-from typing import TypedDict
+from dataclasses import dataclass
 
 
-class CoreManagerNamespaces(TypedDict):
-    coreManagerSubject: str
-    coreManagerRpc: str
+@dataclass(frozen=True, slots=True)
+class CoreManagerNamespaces:
+    core_manager_subject: str
+    core_manager_rpc: str
 
 
-class DeviceManagerNamespaces(TypedDict):
-    deviceManagerSubject: str
-    deviceManagerRpc: str
+@dataclass(frozen=True, slots=True)
+class DeviceManagerNamespaces:
+    device_manager_subject: str
+    device_manager_rpc: str
 
 
-class FrameWorkerNamespaces(TypedDict):
-    frameWorkerChildRpc: str
-    frameWorkerChild: str
+@dataclass(frozen=True, slots=True)
+class FrameWorkerNamespaces:
+    frame_worker_child_rpc: str
+    frame_worker_child: str
 
 
-class PluginNamespaces(TypedDict):
-    pluginDeviceManagerSubject: str
-    pluginChildRpc: str
-    pluginChild: str
-    pluginStorageRpc: str
+@dataclass(frozen=True, slots=True)
+class PluginNamespaces:
+    plugin_device_manager_subject: str
+    plugin_child_rpc: str
+    plugin_child: str
+    plugin_storage_rpc: str
 
 
-class CameraNamespaces(TypedDict):
-    cameraSubject: str
-    cameraControllerRpc: str
-    cameraMotionFrameSubject: str
+@dataclass(frozen=True, slots=True)
+class CameraNamespaces:
+    camera_subject: str
+    camera_controller_rpc: str
 
 
-class PluginCameraNamespaces(TypedDict):
-    cameraInterfacesRpc: str
-    cameraStorageRpc: str
+@dataclass(frozen=True, slots=True)
+class PluginCameraNamespaces:
+    camera_interfaces_rpc: str
+    camera_storage_rpc: str
+    camera_impl_rpc: str
 
 
-class PluginAndPluginCameraNamespaces(PluginNamespaces, PluginCameraNamespaces):
-    pass
+@dataclass(frozen=True, slots=True)
+class PluginSensorNamespaces:
+    sensor_storage_rpc: str
 
 
-class DeviceManagerPluginNamespaces(DeviceManagerNamespaces, PluginNamespaces):
-    pass
+@dataclass(frozen=True, slots=True)
+class SensorControllerNamespaces:
+    sensor_subject: str
+    sensor_rpc: str
 
 
-class CoreManagerPluginNamespaces(CoreManagerNamespaces, PluginNamespaces):
-    pass
+@dataclass(frozen=True, slots=True)
+class SensorEventNamespaces:
+    sensor_subject: str
 
 
-class FrameWorkerCoreManagerNamespaces(FrameWorkerNamespaces, CoreManagerNamespaces):
-    pass
+@dataclass(frozen=True, slots=True)
+class SensorProviderNamespaces:
+    sensor_rpc: str
 
 
-class CameraFrameWorkerPluginNamespaces(CameraNamespaces, FrameWorkerNamespaces, PluginCameraNamespaces):
-    pass
+@dataclass(frozen=True, slots=True)
+class FrameWorkerDetectionNamespaces:
+    detection_rpc: str
+
+
+@dataclass(frozen=True, slots=True)
+class DetectionEventNamespaces:
+    detection_event_subject: str
+
+
+@dataclass(frozen=True, slots=True)
+class DiscoveryManagerNamespaces:
+    discovery_manager_subject: str
+    discovery_manager_rpc: str
+
+
+@dataclass(frozen=True, slots=True)
+class DownloadManagerNamespaces:
+    download_manager_rpc: str
+
+
+@dataclass(frozen=True, slots=True)
+class NotificationManagerNamespaces:
+    notifications_publish_subject: str
 
 
 class NamespaceManager:
     @staticmethod
     def core_manager_namespaces() -> CoreManagerNamespaces:
-        return {
-            "coreManagerSubject": "coreManager.subscriber",
-            "coreManagerRpc": "coreManager.rpc",
-        }
+        return CoreManagerNamespaces(
+            core_manager_subject="coreManager.subscriber",
+            core_manager_rpc="coreManager.rpc",
+        )
 
     @staticmethod
     def device_manager_namespaces() -> DeviceManagerNamespaces:
-        return {
-            "deviceManagerSubject": "deviceManager.subscriber",
-            "deviceManagerRpc": "deviceManager.rpc",
-        }
+        return DeviceManagerNamespaces(
+            device_manager_subject="deviceManager.subscriber",
+            device_manager_rpc="deviceManager.rpc",
+        )
 
     @staticmethod
-    def frame_worker_namespaces(camera_id: str) -> FrameWorkerNamespaces:
-        return {
-            "frameWorkerChildRpc": f"camera.{camera_id}.frameWorker.child.rpc",
-            "frameWorkerChild": f"camera.{camera_id}.frameWorker.child",
-        }
+    def discovery_manager_namespaces() -> DiscoveryManagerNamespaces:
+        return DiscoveryManagerNamespaces(
+            discovery_manager_subject="discoveryManager.subscriber",
+            discovery_manager_rpc="discoveryManager.rpc",
+        )
+
+    @staticmethod
+    def download_manager_namespaces() -> DownloadManagerNamespaces:
+        return DownloadManagerNamespaces(
+            download_manager_rpc="downloadManager.rpc",
+        )
+
+    @staticmethod
+    def notification_manager_namespaces() -> NotificationManagerNamespaces:
+        return NotificationManagerNamespaces(
+            notifications_publish_subject="notifications.publish",
+        )
 
     @staticmethod
     def plugin_namespaces(plugin_id: str) -> PluginNamespaces:
-        return {
-            "pluginDeviceManagerSubject": f"plugin.{plugin_id}.deviceManager.subscriber",
-            "pluginChildRpc": f"plugin.{plugin_id}.child.rpc",
-            "pluginChild": f"plugin.{plugin_id}.child",
-            "pluginStorageRpc": f"plugin.{plugin_id}.storage.rpc",
-        }
+        return PluginNamespaces(
+            plugin_device_manager_subject=f"plugin.{plugin_id}.deviceManager.subscriber",
+            plugin_child_rpc=f"plugin.{plugin_id}.child.rpc",
+            plugin_child=f"plugin.{plugin_id}.child",
+            plugin_storage_rpc=f"plugin.{plugin_id}.storage.rpc",
+        )
 
     @staticmethod
     def camera_namespaces(camera_id: str) -> CameraNamespaces:
-        return {
-            "cameraSubject": f"camera.{camera_id}.subscriber",
-            "cameraMotionFrameSubject": f"camera.{camera_id}.motionFrame.subscriber",
-            "cameraControllerRpc": f"camera.{camera_id}.controller.rpc",
-        }
+        return CameraNamespaces(
+            camera_subject=f"camera.{camera_id}.subscriber",
+            camera_controller_rpc=f"camera.{camera_id}.controller.rpc",
+        )
+
+    @staticmethod
+    def frame_worker_namespaces(camera_id: str) -> FrameWorkerNamespaces:
+        return FrameWorkerNamespaces(
+            frame_worker_child_rpc=f"camera.{camera_id}.frameWorker.child.rpc",
+            frame_worker_child=f"camera.{camera_id}.frameWorker.child",
+        )
 
     @staticmethod
     def plugin_camera_namespaces(plugin_id: str, camera_id: str) -> PluginCameraNamespaces:
-        return {
-            "cameraInterfacesRpc": f"plugin.{plugin_id}.camera.{camera_id}.cameraInterfaces.rpc",
-            "cameraStorageRpc": f"plugin.{plugin_id}.camera.{camera_id}.cameraStorage.rpc",
-        }
+        return PluginCameraNamespaces(
+            camera_interfaces_rpc=f"plugin.{plugin_id}.camera.{camera_id}.cameraInterfaces.rpc",
+            camera_storage_rpc=f"plugin.{plugin_id}.camera.{camera_id}.cameraStorage.rpc",
+            camera_impl_rpc=f"plugin.{plugin_id}.camera.{camera_id}.impl.rpc",
+        )
+
+    @staticmethod
+    def plugin_sensor_namespaces(plugin_id: str, camera_id: str, sensor_id: str) -> PluginSensorNamespaces:
+        return PluginSensorNamespaces(
+            sensor_storage_rpc=f"plugin.{plugin_id}.camera.{camera_id}.sensor.{sensor_id}.storage.rpc",
+        )
+
+    @staticmethod
+    def sensor_controller_namespaces(camera_id: str) -> SensorControllerNamespaces:
+        return SensorControllerNamespaces(
+            sensor_subject=f"camera.{camera_id}.sensors.subject",
+            sensor_rpc=f"camera.{camera_id}.sensors.rpc",
+        )
+
+    @staticmethod
+    def sensor_event_namespaces(camera_id: str, sensor_id: str) -> SensorEventNamespaces:
+        return SensorEventNamespaces(
+            sensor_subject=f"camera.{camera_id}.sensor.{sensor_id}.subject",
+        )
+
+    @staticmethod
+    def sensor_provider_namespaces(
+        plugin_id: str, camera_id: str, sensor_id: str
+    ) -> SensorProviderNamespaces:
+        return SensorProviderNamespaces(
+            sensor_rpc=f"plugin.{plugin_id}.camera.{camera_id}.sensor.{sensor_id}.rpc",
+        )
+
+    @staticmethod
+    def frame_worker_detection_namespaces(camera_id: str) -> FrameWorkerDetectionNamespaces:
+        return FrameWorkerDetectionNamespaces(
+            detection_rpc=f"camera.{camera_id}.frameWorker.detection.rpc",
+        )
+
+    @staticmethod
+    def detection_event_namespaces(camera_id: str) -> DetectionEventNamespaces:
+        return DetectionEventNamespaces(
+            detection_event_subject=f"camera.{camera_id}.events.subject",
+        )
+
+    @staticmethod
+    def sensor_controller_rpc(camera_id: str) -> str:
+        return f"camera.{camera_id}.sensors.controller.rpc"