pynode-flow 0.2.3__tar.gz → 0.2.4__tar.gz

{pynode_flow-0.2.3 → pynode_flow-0.2.4}/.dockerignore

@@ -11,7 +11,6 @@ __pycache__/
 *.egg-info
 dist/
 build/
-.git/
 .gitignore
 .vscode/
 .idea/

{pynode_flow-0.2.3 → pynode_flow-0.2.4}/.gitignore

@@ -152,6 +152,8 @@ Thumbs.db
 *.json
 # ...but keep the bundled, GUI-loadable example workflows
 !pynode/static/examples/*.json
+# ...and the example Node-RED flow shipped with the SocketNode nodes
+!pynode/nodes/SocketNode/interop/*.json
 
 # PyTorch model files
 *.pt

{pynode_flow-0.2.3 → pynode_flow-0.2.4}/DOCKER.md

@@ -65,6 +65,13 @@ The following directories are mounted for persistence:
 
 ## Building
 
+### Version
+
+The version shown in the UI is derived automatically from git history during
+the Docker build — no extra flags or environment variables are needed. Tagged
+commits display a clean version (e.g. `v0.2.3`); untagged commits include the
+distance and short SHA (e.g. `v0.2.3-1-gcd272cf`).
+
 ### Custom CUDA Version
 
 To use a different CUDA version, edit the `Dockerfile`:

{pynode_flow-0.2.3 → pynode_flow-0.2.4}/Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/nvidia/cuda:12.6.0-devel-ubuntu22.04
+FROM docker.io/nvidia/cuda:12.6.0-runtime-ubuntu22.04
 
 # Set environment variables
 ENV DEBIAN_FRONTEND=noninteractive
@@ -12,6 +12,7 @@ RUN apt-get update && apt-get install -y \
     python3-venv \
     git \
     wget \
+    gosu \
     gfortran \
     libgl1-mesa-glx \
     libgtk-3-0 \
@@ -44,16 +45,29 @@ WORKDIR /app
 # Copy application files
 COPY . /app/
 
-# Make scripts executable
-RUN chmod +x /app/setup.sh /app/install_nodes.sh
-
-# Run setup script
-RUN bash -c "source /app/setup.sh < /dev/null"
+# Derive the display version from git history, then remove .git to save
+# space.  SETUPTOOLS_SCM_PRETEND_VERSION keeps pip install happy (PEP 440);
+# the real version string is written to _version.py afterwards.
+RUN chmod +x /app/setup.sh /app/install_nodes.sh && \
+    RAW=$(git -C /app describe --tags --always 2>/dev/null || true) && \
+    if echo "$RAW" | grep -qE '^v?[0-9]+\.[0-9]+'; then \
+        VERSION=$(echo "$RAW" | sed 's/^v//'); \
+    elif [ -n "$RAW" ]; then \
+        VERSION="0.0.0+g${RAW}"; \
+    else \
+        VERSION="0.0.0"; \
+    fi && \
+    rm -rf /app/.git && \
+    SETUPTOOLS_SCM_PRETEND_VERSION=0.0.0 bash -c "source /app/setup.sh < /dev/null" && \
+    printf '__version__ = "%s"\n' "$VERSION" > /app/pynode/_version.py
 
 # Create a non-root user and give it ownership of the app directory
 RUN useradd --create-home --uid 1000 appuser \
     && chown -R appuser:appuser /app
-USER appuser
+
+# Entrypoint ensures bind-mounted directories are writable by appuser
+COPY docker-entrypoint.sh /app/docker-entrypoint.sh
+RUN chmod +x /app/docker-entrypoint.sh
 
 # Expose port
 EXPOSE 5000
@@ -62,5 +76,5 @@ EXPOSE 5000
 HEALTHCHECK --interval=30s --timeout=5s --start-period=40s --retries=3 \
     CMD ["/app/appenv/bin/python", "-c", "import urllib.request; urllib.request.urlopen('http://localhost:5000/')"]
 
-# Run the application in production mode
+ENTRYPOINT ["/app/docker-entrypoint.sh"]
 CMD ["/app/appenv/bin/python", "-m", "pynode", "--production", "--host", "0.0.0.0", "--port", "5000"]

{pynode_flow-0.2.3 → pynode_flow-0.2.4}/Dockerfile.cpu

@@ -6,6 +6,7 @@ ENV PYTHONUNBUFFERED=1
 
 # Install system dependencies
 RUN apt-get update && apt-get install -y \
+    gosu \
     libgl1-mesa-glx \
     libglib2.0-0 \
     libsm6 \
@@ -19,15 +20,24 @@ WORKDIR /app
 # Copy application files
 COPY . /app/
 
-# Create virtual environment
-RUN python3 -m venv appenv
-
-# Activate venv and install dependencies (declared in pyproject.toml;
-# CPU-only torch is installed first so the vision extra reuses it)
-RUN . appenv/bin/activate && \
+# Derive the display version from git history, then remove .git to save
+# space.  SETUPTOOLS_SCM_PRETEND_VERSION keeps pip install happy (PEP 440);
+# the real version string is written to _version.py afterwards.
+RUN RAW=$(git describe --tags --always 2>/dev/null || true) && \
+    if echo "$RAW" | grep -qE '^v?[0-9]+\.[0-9]+'; then \
+        VERSION=$(echo "$RAW" | sed 's/^v//'); \
+    elif [ -n "$RAW" ]; then \
+        VERSION="0.0.0+g${RAW}"; \
+    else \
+        VERSION="0.0.0"; \
+    fi && \
+    rm -rf /app/.git && \
+    python3 -m venv appenv && \
+    . appenv/bin/activate && \
     pip install --upgrade pip && \
     pip install torch torchvision --index-url https://download.pytorch.org/whl/cpu && \
-    pip install -e ".[vision,mqtt]"
+    SETUPTOOLS_SCM_PRETEND_VERSION=0.0.0 pip install -e ".[vision,mqtt]" && \
+    printf '__version__ = "%s"\n' "$VERSION" > /app/pynode/_version.py
 
 # Install per-node dependencies (best-effort: a node whose vendor SDK is not
 # on PyPI, e.g. OmronCameraNode's stapipy, is skipped without failing the build)
@@ -36,7 +46,10 @@ RUN . appenv/bin/activate && pynode-install-nodes || true
 # Create a non-root user and give it ownership of the app directory
 RUN useradd --create-home --uid 1000 appuser \
     && chown -R appuser:appuser /app
-USER appuser
+
+# Entrypoint ensures bind-mounted directories are writable by appuser
+COPY docker-entrypoint.sh /app/docker-entrypoint.sh
+RUN chmod +x /app/docker-entrypoint.sh
 
 # Expose port
 EXPOSE 5000
@@ -45,5 +58,5 @@ EXPOSE 5000
 HEALTHCHECK --interval=30s --timeout=5s --start-period=40s --retries=3 \
     CMD ["/app/appenv/bin/python", "-c", "import urllib.request; urllib.request.urlopen('http://localhost:5000/')"]
 
-# Run the application in production mode
+ENTRYPOINT ["/app/docker-entrypoint.sh"]
 CMD ["/app/appenv/bin/python", "-m", "pynode", "--production", "--host", "0.0.0.0", "--port", "5000"]

{pynode_flow-0.2.3 → pynode_flow-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pynode-flow
-Version: 0.2.3
+Version: 0.2.4
 Summary: Python based Node-RED-like visual workflow system
 Author: olkham
 License-Expression: MIT

pynode_flow-0.2.4/docker-entrypoint.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+set -e
+
+# Ensure bind-mounted directories are writable by appuser (uid 1000).
+# docker-compose mounts host directories that may be owned by root.
+for dir in /app/workflows /app/workflows/services /app/logs; do
+    mkdir -p "$dir"
+    chown -R 1000:1000 "$dir" 2>/dev/null || true
+done
+
+# Drop privileges and exec the CMD
+exec gosu appuser "$@"

{pynode_flow-0.2.3 → pynode_flow-0.2.4}/pynode/__init__.py

@@ -21,7 +21,11 @@ def _resolve_version() -> str:
     try:
         from importlib.metadata import PackageNotFoundError, version
         try:
-            return version("pynode-flow")
+            v = version("pynode-flow")
+            # 0.0.0 is the placeholder used during Docker builds; skip it so
+            # the real version written to _version.py is preferred.
+            if v != "0.0.0":
+                return v
         except PackageNotFoundError:
             pass
     except Exception:

{pynode_flow-0.2.3 → pynode_flow-0.2.4}/pynode/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.2.3'
-__version_tuple__ = version_tuple = (0, 2, 3)
+__version__ = version = '0.2.4'
+__version_tuple__ = version_tuple = (0, 2, 4)
 
-__commit_id__ = commit_id = 'g6a8c7c6b1'
+__commit_id__ = commit_id = 'ga1c7a9d87'

{pynode_flow-0.2.3 → pynode_flow-0.2.4}/pynode/api/nodes.py

@@ -349,6 +349,7 @@ def _register_json_route(route, methods, handler_name, endpoint_name):
         _, method, error = _resolve_node_handler(node_id, handler_name)
         if error:
             return error
+        assert method is not None
         try:
             result = method()
             if result is None:
@@ -369,6 +370,8 @@ def _register_file_upload_route(route, methods, handler_name, endpoint_name, all
             payload, status = error
             return jsonify({'success': False, 'error': payload.get_json()['error']}), status
 
+        assert method is not None
+
         if 'file' not in request.files:
             return jsonify({'success': False, 'error': 'No file provided'}), 400
 
@@ -397,9 +400,10 @@ def _register_stream_route(route, handler_name, endpoint_name):
         _, method, error = _resolve_node_handler(node_id, handler_name)
         if error:
             return error
+        assert method is not None
 
         def generate():
-            for img_data in method():
+            for img_data in method():  # type: ignore[reportGeneralTypeIssues]
                 yield (b'--frame\r\n'
                        b'Content-Type: image/jpeg\r\n\r\n' + img_data + b'\r\n')
 

pynode_flow-0.2.4/pynode/nodes/ControlSliderNode/control_slider_node.py

@@ -0,0 +1,208 @@
+"""
+Slider control node - an interactive slider on the node card that stamps its
+current value onto a configurable path of every message flowing through.
+
+Drag the slider to tune a value live and watch the effect ripple through the
+downstream pipeline in real time (no redeploy). Because the node has an input
+and an output and only sets one path, several can be daisy-chained to control
+a compound value - e.g. four sliders writing bbox[0..3] to drive a Crop node's
+detection box.
+"""
+
+from typing import Any, Dict
+
+from pynode.nodes.base_node import BaseNode, Info, MessageKeys
+
+_info = Info()
+_info.add_text("Interactive slider. Drag it on the node card to set a value; "
+               "each message passing through has that value written to the "
+               "configured path and is then forwarded. Changes take effect "
+               "live on the next message - no redeploy needed.")
+_info.add_header("Inputs")
+_info.add_bullets(
+    ("Input 0:", "Any message. The slider value is written to Target Path, "
+                 "then the message is forwarded."),
+)
+_info.add_header("Outputs")
+_info.add_bullets(
+    ("Output 0:", "The same message with Target Path set to the slider value."),
+)
+_info.add_header("Configuration")
+_info.add_bullets(
+    ("Target Path:", "Dot/bracket path to set, e.g. 'payload.threshold', "
+                     "'payload.crop.x', or 'payload.detections[0].bbox[2]'. "
+                     "Intermediate objects/lists are created as needed."),
+    ("Min / Max:", "Slider range (e.g. 0 and 1)."),
+    ("Step:", "Slider granularity (e.g. 0.01). A whole-number step emits "
+              "integers, otherwise floats."),
+    ("Value:", "Current/initial value; persisted with the workflow."),
+    ("Label:", "Optional caption shown on the node card."),
+    ("Send on Change:", "When on, moving the slider emits a message (value "
+                        "at Target Path) immediately - even with no input "
+                        "wired - so the slider can act as a live source."),
+)
+_info.add_header("Tips")
+_info.add_bullets(
+    ("Daisy-chain:", "Wire several sliders in series to control a compound "
+                     "value - 4 sliders -> a crop box, 2 -> an x/y point. "
+                     "Leave Send on Change OFF for this - the frames drive it."),
+    ("As a source:", "Turn Send on Change ON and leave the input unwired to "
+                     "drive a downstream value purely by dragging."),
+    ("Live tuning:", "Feed a steady message stream (e.g. a camera) and the "
+                     "downstream result updates as you drag."),
+)
+
+
+class ControlSliderNode(BaseNode):
+    """Stamps an interactive slider's value onto a message path, then forwards."""
+
+    display_name = 'Slider'
+    icon = '🎚'
+    category = 'function'
+    color = '#D8C7ED'
+    border_color = '#A98FC9'
+    text_color = '#000000'
+    input_count = 1
+    output_count = 1
+    info = str(_info)
+
+    ui_component = 'slider'
+
+    # UI-triggerable action: the on-card slider POSTs its live value here.
+    actions = ['set_value']
+
+    DEFAULT_CONFIG = {
+        'path': 'msg.payload',
+        'min': 0,
+        'max': 1,
+        'step': 0.01,
+        'value': 0.5,
+        'label': '',
+        'send_on_change': False,
+        # A control shouldn't silently drop frames while tuning a pipeline.
+        MessageKeys.DROP_MESSAGES: False,
+    }
+
+    properties = [
+        {
+            'name': 'path',
+            'label': 'Target Path',
+            'type': 'text',
+            'default': DEFAULT_CONFIG['path'],
+            'help': "Message path to set, e.g. payload.crop.x or "
+                    "payload.detections[0].bbox[2]",
+        },
+        {
+            'name': 'min',
+            'label': 'Min',
+            'type': 'number',
+            'default': DEFAULT_CONFIG['min'],
+        },
+        {
+            'name': 'max',
+            'label': 'Max',
+            'type': 'number',
+            'default': DEFAULT_CONFIG['max'],
+        },
+        {
+            'name': 'step',
+            'label': 'Step',
+            'type': 'number',
+            'default': DEFAULT_CONFIG['step'],
+        },
+        {
+            'name': 'value',
+            'label': 'Value',
+            'type': 'number',
+            'default': DEFAULT_CONFIG['value'],
+        },
+        {
+            'name': 'label',
+            'label': 'Label',
+            'type': 'text',
+            'default': DEFAULT_CONFIG['label'],
+            'help': 'Optional caption shown on the node card',
+        },
+        {
+            'name': 'send_on_change',
+            'label': 'Send on Change',
+            'type': 'checkbox',
+            'default': DEFAULT_CONFIG['send_on_change'],
+            'help': 'Emit a message every time the slider moves, even with no '
+                    'input wired (use as a live source). Redeploy to apply.',
+        },
+    ]
+
+    def __init__(self, node_id=None, name="slider"):
+        super().__init__(node_id, name)
+        # Live value set from the UI; None until set, then falls back to config.
+        self._live_value = None
+
+    def _coerce(self, raw: Any) -> Any:
+        """Parse to a number, clamp to [min, max], and pick int vs float.
+
+        A whole-number result is returned as ``int`` so paths like a bbox
+        pixel come out as ``200`` rather than ``200.0``; fractional values
+        stay ``float``.
+        """
+        try:
+            val = float(raw)
+        except (TypeError, ValueError):
+            val = self.get_config_float('value', float(self.DEFAULT_CONFIG['value']))
+
+        lo = self.get_config_float('min', float(self.DEFAULT_CONFIG['min']))
+        hi = self.get_config_float('max', float(self.DEFAULT_CONFIG['max']))
+        if lo > hi:
+            lo, hi = hi, lo
+        val = max(lo, min(hi, val))
+
+        return int(val) if val.is_integer() else val
+
+    def _active_value(self) -> Any:
+        """The value to stamp: the live UI value if set, else the config value."""
+        raw = self._live_value if self._live_value is not None else self.config.get('value', 0)
+        return self._coerce(raw)
+
+    def set_value(self, value: Any):
+        """UI action: update the live slider value.
+
+        The new value is applied to the next incoming message. When
+        ``send_on_change`` is enabled it is ALSO emitted immediately as a
+        fresh message, so dragging drives downstream nodes with no input
+        wired. Called on the deployed node from the Flask action thread -
+        the same place InjectNode.inject() sends from, so ``send()`` here is
+        safe.
+        """
+        self._live_value = self._coerce(value)
+        if self.get_config_bool('send_on_change', False):
+            self._emit_value()
+
+    def _emit_value(self):
+        """Emit a fresh message carrying the current value at the target path."""
+        msg = self.create_message()
+        path = str(self.config.get('path', '')).strip()
+        try:
+            if path:
+                self._set_nested_value(msg, path, self._active_value())
+            else:
+                # No path: the value is the payload.
+                msg[MessageKeys.PAYLOAD] = self._active_value()
+        except Exception as e:
+            self.report_error(f"Slider: could not set '{path}': {e}")
+            return
+        self.send(msg)
+
+    def on_start(self):
+        """Seed the live value from config so it is active right after deploy."""
+        super().on_start()
+        self._live_value = self._coerce(self.config.get('value', 0))
+
+    def on_input(self, msg: Dict[str, Any], input_index: int = 0):
+        """Write the current value to the target path and forward the message."""
+        path = str(self.config.get('path', '')).strip()
+        if path:
+            try:
+                self._set_nested_value(msg, path, self._active_value())
+            except Exception as e:
+                self.report_error(f"Slider: could not set '{path}': {e}")
+        self.send(msg)