haybale-haystack 0.3.0__tar.gz → 0.3.2__tar.gz

{haybale_haystack-0.3.0 → haybale_haystack-0.3.2}/.gitignore

@@ -220,6 +220,8 @@ packages/haywire-core/src/haywire/_baked_docs/*
 # Haywire project config (user-local, not repo state)
 .haywire/
 
-# Local symlink to external dev project (machine-specific path)
+# Local symlinks to external dev projects (machine-specific paths)
 barn/haybale-visiongraph
+barn/haybale-spandrel
 
+assets/*

{haybale_haystack-0.3.0 → haybale_haystack-0.3.2}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.5
 Name: haybale-haystack
-Version: 0.3.0
+Version: 0.3.2
 Summary: File-centric multi-graph manager
 License: MIT
 Keywords: graph-management
 Requires-Python: >=3.12
-Requires-Dist: haybale-graph-editor>=0.3.0
-Requires-Dist: haybale-studio>=0.3.0
-Requires-Dist: haywire-core>=0.3.0
+Requires-Dist: haybale-graph-editor>=0.3.2
+Requires-Dist: haybale-studio>=0.3.2
+Requires-Dist: haywire-core>=0.3.2
 Requires-Dist: nicegui>=3.18.0
 Requires-Dist: toml>=0.10.2

{haybale_haystack-0.3.0 → haybale_haystack-0.3.2}/haybale_haystack/QUICKREF.md

@@ -1,4 +1,4 @@
-# haybale-haystack — component index (v0.3.0)
+# haybale-haystack — component index (v0.3.2)
 
 ## setting
 - `haybale-haystack:setting:HaystackSettings` — Haystack — Per-workspace settings for haystack scalars.

{haybale_haystack-0.3.0 → haybale_haystack-0.3.2}/haybale_haystack/editors/haystack_editor.py

@@ -8,6 +8,7 @@ from nicegui import ui
 
 from haywire.core.access import AccessTier, LevelMode
 from haywire.ui import elements as hui
+from haywire.ui.components.popup import Popup
 from haywire.ui.editor import BaseEditor, SlotName, editor
 from haywire.core.session import (
     IAppState,
@@ -27,6 +28,7 @@ from haywire.core.signals import (
 )
 from haywire.ui.modals import confirm_modal, pick_modal, rename_modal
 
+from haybale_graph_editor.notices import GraphNotice, GraphNoticesChanged
 from haybale_graph_editor.state.edit_state import EditState
 from haybale_graph_editor.state.graph_app_state import GraphAppState
 from haybale_graph_editor.editors.graph_editor import GraphEditor, definition_path
@@ -75,12 +77,16 @@ class HaystackEditor(BaseEditor):
     def __init__(self, wrapper):
         super().__init__(wrapper)
         self._list_container = None
+        self._dismissed_notices: set[tuple[str, str]] = set()
+        self._notice_popups: list[Popup] = []
 
     # ------------------------------------------------------------------
     # Signal-bus subscriptions / draw
     # ------------------------------------------------------------------
 
-    @redraw_on(ActiveGraphMoved, GraphDataMutated, GraphUnsavedChanged, HaystackReloaded)
+    @redraw_on(
+        ActiveGraphMoved, GraphDataMutated, GraphUnsavedChanged, HaystackReloaded, GraphNoticesChanged
+    )
     def _refresh_on_state_move(self, context: "SessionContext", event) -> None:
         """Empty body — the decorator triggers ``wrapper.redraw()`` after
         this returns, which re-runs ``draw`` and ``_render_list``."""
@@ -225,6 +231,7 @@ class HaystackEditor(BaseEditor):
         if self._list_container is None:
             return
         self._list_container.clear()
+        self._delete_notice_popups()
 
         app = context.app
         if app is None:
@@ -309,6 +316,8 @@ class HaystackEditor(BaseEditor):
                     on_click=lambda eid=eid: self._on_start_execution(eid, context),
                 )
 
+            self._render_notices(eid, context)
+
             # Dirty dot — amber when unsaved, hidden when clean
             if is_unsaved:
                 ui.element("div").classes("w-2 h-2 rounded-full flex-shrink-0 bg-amber-400").style(
@@ -364,6 +373,89 @@ class HaystackEditor(BaseEditor):
                             on_click=lambda eid=eid: self._on_entry_delete(eid, context),
                         )
 
+    # ------------------------------------------------------------------
+    # graph notices
+    # ------------------------------------------------------------------
+
+    def _delete_notice_popups(self) -> None:
+        for popup in self._notice_popups:
+            popup.delete()
+        self._notice_popups.clear()
+
+    def _visible_notices(self, binding_id: str, context: "SessionContext") -> list[GraphNotice]:
+        """Return the notices on a graph that this editor has not dismissed."""
+        posted = list(context.app_data[GraphAppState].notices(binding_id))
+        return [n for n in posted if (binding_id, n.key) not in self._dismissed_notices]
+
+    def _render_notices(self, binding_id: str, context: "SessionContext") -> None:
+        """Draw the notice icon, tinted warning, and the popup listing each notice and its action."""
+        notices = self._visible_notices(binding_id, context)
+        if not notices:
+            return
+        popup = Popup(
+            title="Notices", width="26rem", closable=True, backdrop_click_close=True, escape_close=True
+        )
+        self._notice_popups.append(popup)
+        with popup:
+            for notice in notices:
+                self._render_notice_line(binding_id, notice, popup, context)
+        icons = {n.icon for n in notices}
+        shared = icons.pop() if len(icons) == 1 else None
+        btn = ui.button().props("flat round dense size=xs data-hw-mark=graph-notice")
+        with btn:
+            # The icon carries the opt-out: the .hw-panel dim rule beats an inline colour.
+            ui.icon(shared or hui.icon.notice).classes("hw-use-props-color hw-text-warning")
+        btn.tooltip("\n".join(n.text for n in notices))
+        btn.on("click.stop", popup.open)
+
+    def _render_notice_line(
+        self, binding_id: str, notice: GraphNotice, popup: Popup, context: "SessionContext"
+    ) -> None:
+        with (
+            ui.column()
+            .classes("w-full gap-1 p-2 rounded")
+            .style(
+                "border-left: 3px solid var(--hw-warning);"
+                " background: color-mix(in srgb, var(--hw-warning) 12%, transparent)"
+            )
+        ):
+            with ui.row().classes("w-full items-start gap-2 no-wrap"):
+                ui.icon(notice.icon or hui.icon.notice, size="sm").classes(
+                    "hw-use-props-color hw-text-warning"
+                ).props("data-hw-mark=graph-notice-line-icon")
+                ui.label(notice.text).classes("flex-1 min-w-0 text-sm")
+                if notice.dismissable:
+                    hui.icon_action(
+                        hui.icon.close,
+                        tooltip="Dismiss",
+                        on_click=lambda k=notice.key: self._dismiss_notice(binding_id, k, context),
+                    )
+            if notice.action is not None and notice.action_label and context.can_access(notice.requires):
+                with ui.row().classes("w-full justify-end"):
+                    hui.button(
+                        notice.action_label,
+                        on_click=lambda n=notice: self._run_notice_action(n, popup, context),
+                    ).props("data-hw-mark=graph-notice-action").classes("w-auto")
+
+    def _run_notice_action(self, notice: GraphNotice, popup: Popup, context: "SessionContext") -> None:
+        """Run a notice's action with this session's context, then close the popup."""
+        client = ui.context.client
+        popup.close()
+        if notice.action is None:
+            return
+        try:
+            notice.action(context)
+        except Exception as exc:
+            logger.warning(f"HaystackEditor: notice action {notice.key} failed: {exc}")
+            with client:
+                ui.notify(f"{notice.action_label or 'Action'} failed: {exc}", type="negative")
+
+    def _dismiss_notice(self, binding_id: str, key: str, context: "SessionContext") -> None:
+        """Hide a notice in this editor instance only."""
+        self._dismissed_notices.add((binding_id, key))
+        # The list redraw deletes the popup (and this button's slot) holding the handler.
+        self._render_list(context)
+
     # ------------------------------------------------------------------
     # per-entry file actions
     # ------------------------------------------------------------------
@@ -899,4 +991,5 @@ class HaystackEditor(BaseEditor):
     # ------------------------------------------------------------------
 
     def cleanup(self) -> None:
+        self._delete_notice_popups()
         self._list_container = None

{haybale_haystack-0.3.0 → haybale_haystack-0.3.2}/haybale_haystack/graph_entry.py

@@ -152,7 +152,12 @@ class GraphEntry(GraphContainer):
             )
 
         library_state_container = get_library_state_container()
-        interpreter = Interpreter(library_state_container=library_state_container)
+        interpreter = Interpreter(
+            library_state_container=library_state_container,
+            exception_bail=lambda: self.run_settings.on_exception_bail,
+            # Stopping waits for the runner threads, so it cannot run on the runner that bailed.
+            on_bail_run=lambda: self.graph._validation.call_soon(self._stop_after_bail),
+        )
         try:
             interpreter.load_graph(self.graph)
         except RuntimeError as exc:
@@ -179,6 +184,14 @@ class GraphEntry(GraphContainer):
             self.start()
         return result
 
+    def _stop_after_bail(self) -> None:
+        """Stop the run after a worker exception bailed it, and tell every session's haystack UI."""
+        if self.haystack is None:
+            self.stop_execution()
+            return
+        self.haystack.stop_execution(self)
+        self.haystack._broadcast_data_mutated()
+
     def stop_execution(self) -> None:
         """Stop execution and shut down the Interpreter."""
         if not self.is_executing:

{haybale_haystack-0.3.0 → haybale_haystack-0.3.2}/haybale_haystack/haybale.toml

@@ -3,7 +3,7 @@
 # Edited in the studio's library overview — no reinstall, no reload.
 
 name = "haybale-haystack"
-version = "0.3.0"
+version = "0.3.2"
 label = "Haystack"
 description = "File-centric multi-graph manager"
 tags = ["graph-management"]

haybale_haystack-0.3.2/haybale_haystack/settings/graph_run_settings.py

@@ -0,0 +1,27 @@
+from haywire.core.settings import setting
+from haywire.core.settings.settings import Settings
+from haywire.barn.builtin.types import BOOL, CHOICES
+
+
+class GraphRunSettings(Settings):
+    """Per-entry run policy. Persisted in the haystack TOML ``[graphs.run]`` table."""
+
+    autorestart = setting[BOOL](
+        False,
+        label="Auto-restart",
+        description=(
+            "Restart this graph automatically after it is stopped by a "
+            "structural change that requires recompilation."
+        ),
+    )
+
+    on_exception_bail = setting[CHOICES](
+        "branch",
+        label="On exception, bail",
+        description=(
+            "How far a run gives up when a node raises: 'branch' ends the current branch "
+            "(a loop goes on with its next item), 'frame' ends the current frame, 'run' stops "
+            "the graph. The failing node is retried at its next evaluation either way."
+        ),
+        widget_config={"options": ["branch", "frame", "run"]},
+    )

{haybale_haystack-0.3.0 → haybale_haystack-0.3.2}/pyproject.toml

@@ -1,14 +1,14 @@
 [project]
 name = "haybale-haystack"
-version = "0.3.0"
+version = "0.3.2"
 description = "File-centric multi-graph manager"
 requires-python = ">=3.12"
 license = {text = "MIT"}
 
 dependencies = [
-    "haywire-core>=0.3.0",
-    "haybale-studio>=0.3.0",
-    "haybale-graph-editor>=0.3.0",
+    "haywire-core>=0.3.2",
+    "haybale-studio>=0.3.2",
+    "haybale-graph-editor>=0.3.2",
     "nicegui>=3.18.0",
     "toml>=0.10.2",
 ]

haybale_haystack-0.3.0/haybale_haystack/settings/graph_run_settings.py

@@ -1,16 +0,0 @@
-from haywire.core.settings import setting
-from haywire.core.settings.settings import Settings
-from haywire.barn.builtin.types import BOOL
-
-
-class GraphRunSettings(Settings):
-    """Per-entry run policy. Persisted in the haystack TOML ``[graphs.run]`` table."""
-
-    autorestart = setting[BOOL](
-        False,
-        label="Auto-restart",
-        description=(
-            "Restart this graph automatically after it is stopped by a "
-            "structural change that requires recompilation."
-        ),
-    )