rocket-welder-sdk 1.1.34rc1__py3-none-any.whl → 1.1.35.dev12__py3-none-any.whl

rocket_welder_sdk/__init__.py

@@ -16,11 +16,22 @@ from .opencv_controller import OpenCvController
 from .periodic_timer import PeriodicTimer, PeriodicTimerSync
 from .rocket_welder_client import RocketWelderClient
 from .session_id import (
+    # Explicit URL functions (PREFERRED - set by rocket-welder2)
+    ACTIONS_SINK_URL_ENV,
+    KEYPOINTS_SINK_URL_ENV,
+    SEGMENTATION_SINK_URL_ENV,
+    # SessionId-derived URL functions (fallback for backwards compatibility)
     get_actions_url,
+    get_actions_url_from_env,
+    get_configured_nng_urls,
     get_keypoints_url,
+    get_keypoints_url_from_env,
     get_nng_urls,
+    get_nng_urls_from_env,
     get_segmentation_url,
+    get_segmentation_url_from_env,
     get_session_id_from_env,
+    has_explicit_nng_urls,
     parse_session_id,
 )
 
@@ -49,7 +60,10 @@ if _log_level:
         pass  # Invalid log level, ignore
 
 __all__ = [
+    "ACTIONS_SINK_URL_ENV",
     "FRAME_METADATA_SIZE",
+    "KEYPOINTS_SINK_URL_ENV",
+    "SEGMENTATION_SINK_URL_ENV",
     "BytesSize",
     "Client",
     "ConnectionMode",
@@ -66,11 +80,16 @@ __all__ = [
     "PeriodicTimerSync",
     "Protocol",
     "RocketWelderClient",
-    # SessionId utilities for NNG URL generation
     "get_actions_url",
+    "get_actions_url_from_env",
+    "get_configured_nng_urls",
     "get_keypoints_url",
+    "get_keypoints_url_from_env",
     "get_nng_urls",
+    "get_nng_urls_from_env",
     "get_segmentation_url",
+    "get_segmentation_url_from_env",
     "get_session_id_from_env",
+    "has_explicit_nng_urls",
     "parse_session_id",
 ]

rocket_welder_sdk/controllers.py

@@ -338,7 +338,7 @@ class OneWayShmController(IController):
         Matches C# CreateMat behavior - creates Mat wrapping the data.
 
         Frame data layout from GStreamer zerosink:
-        [FrameMetadata (16 bytes)][Pixel Data (W×H×C bytes)]
+        [FrameMetadata (16 bytes)][Pixel Data (WxHxC bytes)]
 
         Args:
             frame: ZeroBuffer frame
@@ -438,7 +438,9 @@ class OneWayShmController(IController):
                 sqrt_pixels = math.sqrt(pixels)
                 if sqrt_pixels == int(sqrt_pixels):
                     dimension = int(sqrt_pixels)
-                    logger.info(f"Pixel data size {pixel_data_size} suggests {dimension}x{dimension} RGB")
+                    logger.info(
+                        f"Pixel data size {pixel_data_size} suggests {dimension}x{dimension} RGB"
+                    )
                     pixel_data = np.frombuffer(frame.data[FRAME_METADATA_SIZE:], dtype=np.uint8)
                     return pixel_data.reshape((dimension, dimension, 3))  # type: ignore[no-any-return]
 
@@ -448,7 +450,9 @@ class OneWayShmController(IController):
                 sqrt_pixels = math.sqrt(pixels)
                 if sqrt_pixels == int(sqrt_pixels):
                     dimension = int(sqrt_pixels)
-                    logger.info(f"Pixel data size {pixel_data_size} suggests {dimension}x{dimension} RGBA")
+                    logger.info(
+                        f"Pixel data size {pixel_data_size} suggests {dimension}x{dimension} RGBA"
+                    )
                     pixel_data = np.frombuffer(frame.data[FRAME_METADATA_SIZE:], dtype=np.uint8)
                     return pixel_data.reshape((dimension, dimension, 4))  # type: ignore[no-any-return]
 

rocket_welder_sdk/frame_metadata.py

@@ -18,7 +18,7 @@ from __future__ import annotations
 
 import struct
 from dataclasses import dataclass
-from typing import Optional
+from typing import ClassVar, Dict, Optional
 
 # Size of the FrameMetadata structure in bytes
 FRAME_METADATA_SIZE = 16
@@ -113,7 +113,7 @@ class GstVideoFormat:
     GRAY16_BE = 26
     GRAY16_LE = 27
 
-    _FORMAT_NAMES: dict[int, str] = {
+    _FORMAT_NAMES: ClassVar[Dict[int, str]] = {
         0: "UNKNOWN",
         2: "I420",
         3: "YV12",

rocket_welder_sdk/high_level/__init__.py

@@ -1,26 +1,18 @@
 """
 High-level API for RocketWelder SDK.
 
-Provides a simplified, user-friendly API for common video processing workflows
-with automatic transport management and schema definitions.
+Mirrors C# RocketWelder.SDK API for consistent developer experience.
 
 Example:
-    from rocket_welder_sdk.high_level import RocketWelderClient, Transport
+    from rocket_welder_sdk.high_level import RocketWelderClient
 
-    async with RocketWelderClient.from_environment() as client:
-        # Define keypoints schema
+    with RocketWelderClient.from_environment() as client:
         nose = client.keypoints.define_point("nose")
-        left_eye = client.keypoints.define_point("left_eye")
-
-        # Define segmentation classes
         person = client.segmentation.define_class(1, "person")
-
-        async for input_frame, seg_ctx, kp_ctx, output_frame in client.start():
-            # Process frame...
-            kp_ctx.add(nose, x=100, y=200, confidence=0.95)
-            seg_ctx.add(person, instance_id=0, points=contour_points)
+        client.start(process_frame)
 """
 
+from .client import RocketWelderClient, RocketWelderClientOptions
 from .connection_strings import (
     KeyPointsConnectionString,
     SegmentationConnectionString,
@@ -34,15 +26,11 @@ from .data_context import (
 from .schema import (
     IKeyPointsSchema,
     ISegmentationSchema,
-    KeyPoint,
+    KeyPointDefinition,
     SegmentClass,
 )
 from .transport_protocol import (
-    MessagingLibrary,
-    MessagingPattern,
-    Transport,
-    TransportBuilder,
-    TransportLayer,
+    TransportKind,
     TransportProtocol,
 )
 
@@ -51,15 +39,13 @@ __all__ = [
     "IKeyPointsSchema",
     "ISegmentationDataContext",
     "ISegmentationSchema",
-    "KeyPoint",
+    "KeyPointDefinition",
     "KeyPointsConnectionString",
-    "MessagingLibrary",
-    "MessagingPattern",
+    "RocketWelderClient",
+    "RocketWelderClientOptions",
     "SegmentClass",
     "SegmentationConnectionString",
-    "Transport",
-    "TransportBuilder",
-    "TransportLayer",
+    "TransportKind",
     "TransportProtocol",
     "VideoSourceConnectionString",
     "VideoSourceType",

rocket_welder_sdk/high_level/client.py

@@ -0,0 +1,262 @@
+"""
+RocketWelderClient - High-level API matching C# RocketWelder.SDK.
+
+Usage:
+    with RocketWelderClient.from_environment() as client:
+        # Define schema
+        nose = client.keypoints.define_point("nose")
+        person = client.segmentation.define_class(1, "person")
+
+        # Start processing
+        client.start(process_frame)
+"""
+
+from __future__ import annotations
+
+import logging
+from dataclasses import dataclass, field
+from typing import TYPE_CHECKING, Any, Callable, Optional
+
+import numpy as np
+import numpy.typing as npt
+from typing_extensions import TypeAlias
+
+from .connection_strings import (
+    KeyPointsConnectionString,
+    SegmentationConnectionString,
+    VideoSourceConnectionString,
+)
+from .data_context import (
+    IKeyPointsDataContext,
+    ISegmentationDataContext,
+    KeyPointsDataContext,
+    SegmentationDataContext,
+)
+from .schema import (
+    IKeyPointsSchema,
+    ISegmentationSchema,
+    KeyPointsSchema,
+    SegmentationSchema,
+)
+from .transport_protocol import TransportKind
+
+if TYPE_CHECKING:
+    from rocket_welder_sdk.keypoints_protocol import KeyPointsSink
+    from rocket_welder_sdk.transport.frame_sink import IFrameSink
+
+# Type alias for OpenCV Mat (numpy array)
+Mat: TypeAlias = npt.NDArray[np.uint8]
+
+logger = logging.getLogger(__name__)
+
+
+@dataclass
+class RocketWelderClientOptions:
+    """Configuration options for RocketWelderClient."""
+
+    video_source: VideoSourceConnectionString = field(
+        default_factory=VideoSourceConnectionString.default
+    )
+    keypoints: KeyPointsConnectionString = field(default_factory=KeyPointsConnectionString.default)
+    segmentation: SegmentationConnectionString = field(
+        default_factory=SegmentationConnectionString.default
+    )
+
+    @classmethod
+    def from_environment(cls) -> RocketWelderClientOptions:
+        """Create from environment variables."""
+        return cls(
+            video_source=VideoSourceConnectionString.from_environment(),
+            keypoints=KeyPointsConnectionString.from_environment(),
+            segmentation=SegmentationConnectionString.from_environment(),
+        )
+
+
+class RocketWelderClient:
+    """
+    High-level client for RocketWelder SDK.
+
+    Mirrors C# RocketWelder.SDK.IRocketWelderClient interface.
+    """
+
+    def __init__(self, options: RocketWelderClientOptions) -> None:
+        self._options = options
+        self._keypoints_schema = KeyPointsSchema()
+        self._segmentation_schema = SegmentationSchema()
+        self._keypoints_sink: Optional[KeyPointsSink] = None
+        self._keypoints_frame_sink: Optional[IFrameSink] = None
+        self._segmentation_frame_sink: Optional[IFrameSink] = None
+        self._closed = False
+        logger.debug("RocketWelderClient created with options: %s", options)
+
+    @classmethod
+    def from_environment(cls) -> RocketWelderClient:
+        """Create client from environment variables."""
+        logger.info("Creating RocketWelderClient from environment variables")
+        return cls(RocketWelderClientOptions.from_environment())
+
+    @classmethod
+    def create(cls, options: Optional[RocketWelderClientOptions] = None) -> RocketWelderClient:
+        """Create client with explicit options."""
+        return cls(options or RocketWelderClientOptions())
+
+    @property
+    def keypoints(self) -> IKeyPointsSchema:
+        """Schema for defining keypoints."""
+        return self._keypoints_schema
+
+    @property
+    def segmentation(self) -> ISegmentationSchema:
+        """Schema for defining segmentation classes."""
+        return self._segmentation_schema
+
+    def start(
+        self,
+        process_frame: Callable[[Mat, ISegmentationDataContext, IKeyPointsDataContext, Mat], None],
+    ) -> None:
+        """Start with both keypoints and segmentation."""
+        self._run_loop(process_frame, use_keypoints=True, use_segmentation=True)
+
+    def start_keypoints(
+        self,
+        process_frame: Callable[[Mat, IKeyPointsDataContext, Mat], None],
+    ) -> None:
+        """Start with keypoints only."""
+        self._run_loop(process_frame, use_keypoints=True, use_segmentation=False)
+
+    def start_segmentation(
+        self,
+        process_frame: Callable[[Mat, ISegmentationDataContext, Mat], None],
+    ) -> None:
+        """Start with segmentation only."""
+        self._run_loop(process_frame, use_keypoints=False, use_segmentation=True)
+
+    def _run_loop(
+        self,
+        process_frame: Callable[..., None],
+        use_keypoints: bool,
+        use_segmentation: bool,
+    ) -> None:
+        """Run processing loop."""
+        from rocket_welder_sdk.keypoints_protocol import KeyPointsSink
+
+        logger.info(
+            "Starting processing loop (keypoints=%s, segmentation=%s)",
+            use_keypoints,
+            use_segmentation,
+        )
+
+        # Initialize sinks
+        if use_keypoints:
+            cs = self._options.keypoints
+            logger.info("Initializing keypoints sink: %s -> %s", cs.protocol, cs.address)
+            self._keypoints_frame_sink = self._create_frame_sink(cs.protocol, cs.address)
+            self._keypoints_sink = KeyPointsSink(
+                frame_sink=self._keypoints_frame_sink,
+                master_frame_interval=cs.master_frame_interval,
+                owns_sink=False,  # We manage frame sink lifecycle in close()
+            )
+            logger.debug(
+                "KeyPointsSink created with master_frame_interval=%d", cs.master_frame_interval
+            )
+
+        if use_segmentation:
+            seg_cs = self._options.segmentation
+            logger.info("Initializing segmentation sink: %s -> %s", seg_cs.protocol, seg_cs.address)
+            self._segmentation_frame_sink = self._create_frame_sink(seg_cs.protocol, seg_cs.address)
+            logger.debug("Segmentation frame sink created")
+
+        # TODO: Video capture loop - for now raise NotImplementedError
+        raise NotImplementedError(
+            "Video capture not implemented. Use process_frame_sync() or low-level API."
+        )
+
+    def process_frame_sync(
+        self,
+        frame_id: int,
+        input_frame: Mat,
+        output_frame: Mat,
+        width: int,
+        height: int,
+    ) -> tuple[Optional[IKeyPointsDataContext], Optional[ISegmentationDataContext]]:
+        """
+        Process a single frame synchronously.
+
+        Returns (keypoints_context, segmentation_context) for the caller to use.
+        Caller must call commit() on contexts when done.
+        """
+        from rocket_welder_sdk.segmentation_result import SegmentationResultWriter
+
+        kp_ctx: Optional[IKeyPointsDataContext] = None
+        seg_ctx: Optional[ISegmentationDataContext] = None
+
+        if self._keypoints_sink is not None:
+            kp_writer = self._keypoints_sink.create_writer(frame_id)
+            kp_ctx = KeyPointsDataContext(frame_id, kp_writer)
+
+        if self._segmentation_frame_sink is not None:
+            seg_writer = SegmentationResultWriter(
+                frame_id, width, height, frame_sink=self._segmentation_frame_sink
+            )
+            seg_ctx = SegmentationDataContext(frame_id, seg_writer)
+
+        return kp_ctx, seg_ctx
+
+    def _create_frame_sink(self, protocol: Any, address: str) -> IFrameSink:
+        """Create frame sink from protocol."""
+        from rocket_welder_sdk.transport import NngFrameSink
+        from rocket_welder_sdk.transport.stream_transport import StreamFrameSink
+        from rocket_welder_sdk.transport.unix_socket_transport import UnixSocketFrameSink
+
+        from .transport_protocol import TransportProtocol
+
+        if not isinstance(protocol, TransportProtocol):
+            raise TypeError(f"Expected TransportProtocol, got {type(protocol)}")
+
+        if protocol.kind == TransportKind.FILE:
+            logger.debug("Creating file sink: %s", address)
+            file_handle = open(address, "wb")
+            try:
+                return StreamFrameSink(file_handle)
+            except Exception:
+                file_handle.close()
+                raise
+        elif protocol.kind == TransportKind.SOCKET:
+            logger.debug("Creating Unix socket sink: %s", address)
+            return UnixSocketFrameSink.connect(address)
+        elif protocol.kind in (TransportKind.NNG_PUSH_IPC, TransportKind.NNG_PUSH_TCP):
+            logger.debug("Creating NNG pusher: %s", address)
+            return NngFrameSink.create_pusher(address)
+        elif protocol.kind in (TransportKind.NNG_PUB_IPC, TransportKind.NNG_PUB_TCP):
+            logger.debug("Creating NNG publisher: %s", address)
+            return NngFrameSink.create_publisher(address)
+        else:
+            raise ValueError(f"Unsupported protocol: {protocol}")
+
+    def close(self) -> None:
+        """Release resources."""
+        if self._closed:
+            return
+
+        logger.info("Closing RocketWelderClient")
+
+        # Close frame sinks (KeyPointsSink has owns_sink=False, so we manage lifecycle)
+        self._keypoints_sink = None
+        if self._keypoints_frame_sink is not None:
+            logger.debug("Closing keypoints frame sink")
+            self._keypoints_frame_sink.close()
+            self._keypoints_frame_sink = None
+
+        if self._segmentation_frame_sink is not None:
+            logger.debug("Closing segmentation frame sink")
+            self._segmentation_frame_sink.close()
+            self._segmentation_frame_sink = None
+
+        self._closed = True
+        logger.info("RocketWelderClient closed")
+
+    def __enter__(self) -> RocketWelderClient:
+        return self
+
+    def __exit__(self, *args: object) -> None:
+        self.close()

rocket_welder_sdk/high_level/connection_strings.py

@@ -6,7 +6,8 @@ Connection string format: protocol://path?param1=value1&param2=value2
 Examples:
     nng+push+ipc://tmp/keypoints?masterFrameInterval=300
     nng+pub+tcp://localhost:5555
-    file://path/to/output.bin
+    file:///path/to/output.bin
+    socket:///tmp/my.sock
 """
 
 from __future__ import annotations
@@ -144,19 +145,19 @@ class KeyPointsConnectionString:
     """
     Strongly-typed connection string for KeyPoints output.
 
-    Supported protocols (composable with + operator):
-    - Transport.Nng + Transport.Push + Transport.Ipc → nng+push+ipc://tmp/keypoints
-    - Transport.Nng + Transport.Push + Transport.Tcp → nng+push+tcp://host:port
-    - file://path/to/file.bin - File output
+    Supported protocols:
+    - file:///path/to/file.bin - File output (absolute path)
+    - socket:///tmp/socket.sock - Unix domain socket
+    - nng+push+ipc://tmp/keypoints - NNG Push over IPC
+    - nng+push+tcp://host:port - NNG Push over TCP
 
     Supported parameters:
     - masterFrameInterval: Interval between master frames (default: 300)
     """
 
     value: str
-    protocol: Optional[TransportProtocol] = None
-    is_file: bool = False
-    address: str = ""
+    protocol: TransportProtocol
+    address: str
     master_frame_interval: int = 300
     parameters: Dict[str, str] = field(default_factory=dict)
 
@@ -199,25 +200,26 @@ class KeyPointsConnectionString:
 
         # Parse protocol and address
         scheme_end = endpoint_part.find("://")
-        if scheme_end > 0:
-            protocol_str = endpoint_part[:scheme_end]
-            path_part = endpoint_part[scheme_end + 3 :]  # skip "://"
-
-            if protocol_str.lower() == "file":
-                address = "/" + path_part  # Restore absolute path
-                is_file = True
-                protocol = None
-            else:
-                protocol = TransportProtocol.try_parse(protocol_str)
-                if protocol is None:
-                    return None
-                address = protocol.create_nng_address(path_part)
-                is_file = False
-        elif s.startswith("/"):
-            # Assume absolute file path
-            address = s
-            is_file = True
-            protocol = None
+        if scheme_end <= 0:
+            return None
+
+        schema_str = endpoint_part[:scheme_end]
+        path_part = endpoint_part[scheme_end + 3 :]  # skip "://"
+
+        protocol = TransportProtocol.try_parse(schema_str)
+        if protocol is None:
+            return None
+
+        # Build address based on protocol type
+        if protocol.is_file:
+            # file:///absolute/path -> /absolute/path
+            address = path_part if path_part.startswith("/") else "/" + path_part
+        elif protocol.is_socket:
+            # socket:///tmp/sock -> /tmp/sock
+            address = path_part if path_part.startswith("/") else "/" + path_part
+        elif protocol.is_nng:
+            # NNG protocols need proper address format
+            address = protocol.create_nng_address(path_part)
         else:
             return None
 
@@ -230,7 +232,6 @@ class KeyPointsConnectionString:
         return cls(
             value=s,
             protocol=protocol,
-            is_file=is_file,
             address=address,
             master_frame_interval=master_frame_interval,
             parameters=parameters,
@@ -245,16 +246,16 @@ class SegmentationConnectionString:
     """
     Strongly-typed connection string for Segmentation output.
 
-    Supported protocols (composable with + operator):
-    - Transport.Nng + Transport.Push + Transport.Ipc → nng+push+ipc://tmp/segmentation
-    - Transport.Nng + Transport.Push + Transport.Tcp → nng+push+tcp://host:port
-    - file://path/to/file.bin - File output
+    Supported protocols:
+    - file:///path/to/file.bin - File output (absolute path)
+    - socket:///tmp/socket.sock - Unix domain socket
+    - nng+push+ipc://tmp/segmentation - NNG Push over IPC
+    - nng+push+tcp://host:port - NNG Push over TCP
     """
 
     value: str
-    protocol: Optional[TransportProtocol] = None
-    is_file: bool = False
-    address: str = ""
+    protocol: TransportProtocol
+    address: str
     parameters: Dict[str, str] = field(default_factory=dict)
 
     @classmethod
@@ -296,32 +297,32 @@ class SegmentationConnectionString:
 
         # Parse protocol and address
         scheme_end = endpoint_part.find("://")
-        if scheme_end > 0:
-            protocol_str = endpoint_part[:scheme_end]
-            path_part = endpoint_part[scheme_end + 3 :]  # skip "://"
-
-            if protocol_str.lower() == "file":
-                address = "/" + path_part  # Restore absolute path
-                is_file = True
-                protocol = None
-            else:
-                protocol = TransportProtocol.try_parse(protocol_str)
-                if protocol is None:
-                    return None
-                address = protocol.create_nng_address(path_part)
-                is_file = False
-        elif s.startswith("/"):
-            # Assume absolute file path
-            address = s
-            is_file = True
-            protocol = None
+        if scheme_end <= 0:
+            return None
+
+        schema_str = endpoint_part[:scheme_end]
+        path_part = endpoint_part[scheme_end + 3 :]  # skip "://"
+
+        protocol = TransportProtocol.try_parse(schema_str)
+        if protocol is None:
+            return None
+
+        # Build address based on protocol type
+        if protocol.is_file:
+            # file:///absolute/path -> /absolute/path
+            address = path_part if path_part.startswith("/") else "/" + path_part
+        elif protocol.is_socket:
+            # socket:///tmp/sock -> /tmp/sock
+            address = path_part if path_part.startswith("/") else "/" + path_part
+        elif protocol.is_nng:
+            # NNG protocols need proper address format
+            address = protocol.create_nng_address(path_part)
         else:
             return None
 
         return cls(
             value=s,
             protocol=protocol,
-            is_file=is_file,
             address=address,
             parameters=parameters,
         )