statable 3.1.0__py3-none-any.whl

statable_gui/transition_editor_direct/dialog.py

@@ -0,0 +1,335 @@
+# statable_gui/transition_editor_direct/dialog.py
+"""Action edit main dialog (v2.2: 5-tab structure).
+
+Tabs:
+  - Transitions       : ordered list of transitions
+  - Pre / Post Actions: cell-level actions (before / after transitions)
+  - Relations         : relations between transitions
+  - Overview          : coverage / reachability report
+  - Preview           : generated C code
+
+[v2.2 fix]
+  - _load_draft() order: Actions -> Relations -> Transitions (last)
+    to prevent intermediate signals from wiping cell_actions /
+    cell_relations before they are loaded.
+  - _loading flag suppresses _on_content_changed during initial load.
+  - _sync_member_details() propagates {label: "cond -> target"} to
+    RelationsTab so the member list shows identifiable entries.
+
+[v2.5 change]
+  - TransitionsTab and ActionsTab now receive `role_function_library`
+    and `literal_library` from this dialog.
+
+[R-6 change]
+  - ActionEditorDialog now accepts `layer_names_provider` and forwards
+    it to TransitionsTab and ActionsTab.  This completes the 4-hop
+    wiring:
+        MainWindow → StateMachineTab → MatrixTableWidget
+                  → ActionEditorDialog → TransitionsTab / ActionsTab
+    so the namespace combo box on those tabs lists every layer in
+    the project, not just the current tab's layer.
+  - Previously this dialog intentionally did NOT forward the
+    provider (v2.5 scope).  R-6 completes the wiring.
+"""
+
+import logging
+import sys
+import os
+from typing import List, Callable
+
+current_dir = os.path.dirname(os.path.abspath(__file__))
+parent_dir = os.path.dirname(current_dir)
+if parent_dir not in sys.path:
+    sys.path.insert(0, parent_dir)
+
+from PySide6.QtWidgets import (
+    QDialog, QVBoxLayout, QHBoxLayout, QPushButton, QTabWidget,
+    QWidget, QMessageBox, QToolBar, QLabel,
+)
+from PySide6.QtCore import Qt
+
+from .draft import (
+    ActionDraft, FlowItem, transition_to_flow_item, flow_item_to_transition,
+)
+from .transitions_tab import TransitionsTab
+from .actions_tab import ActionsTab
+from .relations_tab import RelationsTab
+from .overview_tab import OverviewTab
+from .code_widget import CodeWidget
+
+from statable_gui.libcntrl.role_function_library import (
+    RoleFunctionLibrary, RoleFunction,
+)
+from statable_gui.libcntrl.condition_library import (
+    ConditionLibrary, ConditionTemplate,
+)
+from statable_gui.libcntrl.literal_library import LiteralLibrary
+
+logger = logging.getLogger("transition_editor_direct.dialog")
+
+
+class ActionEditorDialog(QDialog):
+    """Main dialog for editing a transition cell (v2.2 / 5 tabs)."""
+
+    TAB_NAMES = ("Transitions", "Pre / Post Actions",
+                 "Relations", "Overview", "Preview")
+
+    def __init__(self, draft: ActionDraft,
+                 role_functions=None, transition_events=None,
+                 states=None, global_defs=None, state_machine=None,
+                 role_function_library=None, condition_library=None,
+                 literal_library=None,
+                 layer_names_provider: Callable[[], List[str]] = None,
+                 parent=None):
+        super().__init__(parent)
+        self.draft = draft
+        self.role_functions = role_functions or []
+        self.states = states or []
+        self.global_defs = global_defs
+        self.state_machine = state_machine
+
+        self.role_function_library = (
+            role_function_library if role_function_library
+            else RoleFunctionLibrary()
+        )
+        self.condition_library = (
+            condition_library if condition_library
+            else ConditionLibrary()
+        )
+        self.literal_library = (
+            literal_library if literal_library
+            else LiteralLibrary()
+        )
+        # [R-6] All-tabs namespace provider (forwarded to tabs).
+        self.layer_names_provider = layer_names_provider
+
+        # v2.2 fix: guard flag for _load_draft
+        self._loading = False
+
+        logger.debug("=== ActionEditorDialog init ===")
+        logger.debug(f"source={draft.source}, event={draft.event}")
+        logger.debug(
+            f"has_layer_names_provider="
+            f"{layer_names_provider is not None}")
+
+        self.setWindowTitle(
+            f"Action edit: {draft.source} --[{draft.event}]--> ?")
+        self.setMinimumSize(1000, 700)
+
+        self._setup_ui()
+        self._load_draft()
+
+        logger.debug("=== ActionEditorDialog init end ===")
+
+    # ------------------------------------------------------------------
+    # UI
+    # ------------------------------------------------------------------
+    def _setup_ui(self):
+        main_layout = QVBoxLayout(self)
+
+        toolbar = QToolBar()
+        refresh_btn = QPushButton(self.tr("Refresh preview"))
+        refresh_btn.clicked.connect(self._on_refresh_preview)
+        toolbar.addWidget(refresh_btn)
+        main_layout.addWidget(toolbar)
+
+        self.tabs = QTabWidget()
+        main_layout.addWidget(self.tabs)
+
+        # ==============================================================
+        # Tab 1: Transitions
+        # ==============================================================
+        # [v2.5] Pass shared libraries so "+ New Role Function" on this
+        #        tab can build the same RoleFunctionDialog kwargs as
+        #        SettingsPanel (global_vars / events / literals /
+        #        namespace_choices).
+        # [R-6]  Forward layer_names_provider so namespace_choices
+        #        include every layer in the project.
+        self.transitions_tab = TransitionsTab(
+            self.draft,
+            states=self.states,
+            global_defs=self.global_defs,
+            state_machine=self.state_machine,
+            role_function_library=self.role_function_library,
+            literal_library=self.literal_library,
+            condition_library=self.condition_library,
+            layer_names_provider=self.layer_names_provider,
+        )
+        # v2.2: provide role function candidates to the TransitionsTab
+        self.transitions_tab.set_role_functions(self.role_functions)
+        self.tabs.addTab(self.transitions_tab, self.TAB_NAMES[0])
+
+        # ==============================================================
+        # Tab 2: Pre / Post Actions
+        # ==============================================================
+        # [v2.5] Same context propagation as Tab 1.
+        # [R-6]  Forward layer_names_provider.
+        self.actions_tab = ActionsTab(
+            self.draft,
+            role_functions=self.role_functions,
+            global_defs=self.global_defs,
+            state_machine=self.state_machine,
+            role_function_library=self.role_function_library,
+            literal_library=self.literal_library,
+            layer_names_provider=self.layer_names_provider,
+        )
+        self.tabs.addTab(self.actions_tab, self.TAB_NAMES[1])
+
+        # ==============================================================
+        # Tab 3: Relations
+        # ==============================================================
+        self.relations_tab = RelationsTab(self.draft)
+        self.tabs.addTab(self.relations_tab, self.TAB_NAMES[2])
+
+        # ==============================================================
+        # Tab 4: Overview
+        # ==============================================================
+        self.overview_tab = OverviewTab(
+            self.draft,
+            state_machine=self.state_machine,
+        )
+        self.tabs.addTab(self.overview_tab, self.TAB_NAMES[3])
+
+        # ==============================================================
+        # Tab 5: Preview
+        # ==============================================================
+        self.code_widget = CodeWidget(self.draft)
+        self.tabs.addTab(self.code_widget, self.TAB_NAMES[4])
+
+        # ==============================================================
+        # Signal connections
+        # ==============================================================
+        self.transitions_tab.transitions_changed.connect(
+            self._on_content_changed)
+        self.actions_tab.actions_changed.connect(
+            self._on_content_changed)
+        self.relations_tab.relations_changed.connect(
+            self._on_content_changed)
+
+        # ==============================================================
+        # OK / Cancel
+        # ==============================================================
+        btn_layout = QHBoxLayout()
+        btn_layout.addStretch()
+        cancel_btn = QPushButton(self.tr("Cancel"))
+        cancel_btn.clicked.connect(self.reject)
+        btn_layout.addWidget(cancel_btn)
+        ok_btn = QPushButton(self.tr("OK"))
+        ok_btn.clicked.connect(self._on_accept)
+        btn_layout.addWidget(ok_btn)
+        main_layout.addLayout(btn_layout)
+
+    # ------------------------------------------------------------------
+    # Load / save
+    # ------------------------------------------------------------------
+    def _load_draft(self):
+        """Populate tabs from the current draft state.
+
+        [v2.2 fix]
+          Order: Actions -> Relations -> Transitions (last).
+        """
+        self._loading = True
+        try:
+            # 1. Actions first
+            actions = list(self.draft.cell_actions)
+            logger.debug(
+                f"_load_draft: actions={len(actions)}, "
+                f"relations={len(self.draft.cell_relations)}")
+            self.actions_tab.set_actions(actions)
+
+            # 2. Relations
+            relations = list(self.draft.cell_relations)
+            self.relations_tab.set_relations(relations)
+
+            # 3. Transitions last (emits signals)
+            transitions = []
+            for item in self.draft.flow_items:
+                if item.item_type == "transition":
+                    t = flow_item_to_transition(
+                        item, self.draft.source, self.draft.event)
+                    transitions.append(t)
+            self.transitions_tab.set_transitions(transitions)
+        finally:
+            self._loading = False
+
+        # v2.2: sync member details before refreshing preview
+        self._sync_member_details()
+
+        # Refresh preview / overview once after load
+        try:
+            self.code_widget.update_code()
+        except Exception as e:
+            logger.warning(f"code update failed: {e}")
+        try:
+            self.overview_tab.refresh()
+        except Exception as e:
+            logger.warning(f"overview refresh failed: {e}")
+
+    def _save_draft(self):
+        """Sync tab contents back to the draft."""
+        transitions = self.transitions_tab.get_transitions()
+        self.draft.flow_items = [
+            transition_to_flow_item(t) for t in transitions
+        ]
+        self.draft.cell_actions = list(self.actions_tab.get_actions())
+        self.draft.cell_relations = list(self.relations_tab.get_relations())
+
+    # ------------------------------------------------------------------
+    # v2.2: member details propagation
+    # ------------------------------------------------------------------
+    def _sync_member_details(self):
+        """Build {label: 'cond -> target [mode]'} from the TransitionsTab
+        and pass it to RelationsTab so members are identifiable.
+        """
+        details = {}
+        try:
+            transitions = self.transitions_tab.get_transitions()
+        except Exception as e:
+            logger.warning(f"_sync_member_details failed: {e}")
+            return
+
+        for t in transitions:
+            label = getattr(t, 'label', '') or ''
+            if not label:
+                continue
+            cond = (getattr(t, 'condition', '') or '').strip() or "(no cond)"
+            target = (getattr(t, 'target', '') or '').strip() or "(none)"
+            mode = "Commit" if getattr(t, 'early_return', False) else "Tentative"
+            details[label] = f"{cond} -> {target}  [{mode}]"
+
+        self.relations_tab.set_member_details(details)
+
+    # ------------------------------------------------------------------
+    # Slots
+    # ------------------------------------------------------------------
+    def _on_content_changed(self):
+        # v2.2 fix: ignore signals emitted during initial load
+        if getattr(self, "_loading", False):
+            return
+
+        self._save_draft()
+        self._sync_member_details()
+        self.code_widget.update_code()
+        try:
+            self.overview_tab.refresh()
+        except Exception as e:
+            logger.warning(f"overview refresh failed: {e}")
+
+    def _on_refresh_preview(self):
+        self._save_draft()
+        self._sync_member_details()
+        self.code_widget.update_code()
+        try:
+            self.overview_tab.refresh()
+        except Exception as e:
+            logger.warning(f"overview refresh failed: {e}")
+
+    def _on_accept(self):
+        self._save_draft()
+        self.accept()
+
+    # ------------------------------------------------------------------
+    # Public API (test-friendly)
+    # ------------------------------------------------------------------
+    def get_tab_names(self) -> List[str]:
+        return [self.tabs.tabText(i) for i in range(self.tabs.count())]

statable_gui/transition_editor_direct/draft.py

@@ -0,0 +1,270 @@
+# statable_gui/transition_editor_direct/draft.py
+"""Action edit draft model.
+
+[v2.2 additions]
+  - ActionDraft.cell_actions / cell_relations
+  - FlowItem.params['early_return'] / ['label']
+"""
+
+import logging
+from dataclasses import dataclass, field
+from typing import List, Dict, Any, Optional
+
+from statable.model import (
+    ActionStep, TransitionRelation, Transition as ModelTransition,
+)
+
+logger = logging.getLogger("transition_editor_direct.draft")
+
+
+def ensure_list(value) -> List[str]:
+    if isinstance(value, list):
+        return value
+    if value is None:
+        return []
+    if isinstance(value, str):
+        stripped = value.strip()
+        if not stripped:
+            return []
+        return [stripped]
+    logger.warning(
+        f"Unexpected type for list: {type(value)}. Returning empty list.")
+    return []
+
+
+@dataclass
+class SystemGlobal:
+    name: str
+    type: str = "uint16_t"
+    initial_value: str = "0"
+    description: str = ""
+
+    def to_dict(self) -> dict:
+        return {
+            'name': self.name,
+            'type': self.type,
+            'initial_value': self.initial_value,
+            'description': self.description,
+        }
+
+    @classmethod
+    def from_dict(cls, data: dict) -> 'SystemGlobal':
+        return cls(
+            name=data.get('name', ''),
+            type=data.get('type', 'uint16_t'),
+            initial_value=data.get('initial_value', '0'),
+            description=data.get('description', ''),
+        )
+
+
+@dataclass
+class TransitionParams:
+    event: str = "NewEvent"
+    condition: str = ""
+    pre_actions: List[str] = field(default_factory=list)
+    target: str = ""
+    has_else: bool = True
+    else_target: str = ""
+    else_actions: List[str] = field(default_factory=list)
+    early_return: bool = False    # v2.2
+    label: str = ""               # v2.2
+
+
+@dataclass
+class FlowItem:
+    item_type: str = ""
+    name: str = ""
+    edited_text: str = ""
+    params: Dict[str, Any] = field(default_factory=dict)
+    pos_x: Optional[float] = None
+    pos_y: Optional[float] = None
+
+    def display_text(self) -> str:
+        return self.edited_text or self.name
+
+    def to_dict(self) -> dict:
+        return {
+            'item_type': self.item_type,
+            'name': self.name,
+            'edited_text': self.edited_text,
+            'params': self.params,
+            'pos_x': self.pos_x,
+            'pos_y': self.pos_y,
+        }
+
+    @classmethod
+    def from_dict(cls, data: dict) -> 'FlowItem':
+        return cls(
+            item_type=data.get('item_type', ''),
+            name=data.get('name', ''),
+            edited_text=data.get('edited_text', ''),
+            params=data.get('params', {}),
+            pos_x=data.get('pos_x'),
+            pos_y=data.get('pos_y'),
+        )
+
+
+@dataclass
+class ActionDraft:
+    source: str = ""
+    event: str = ""
+    layer_name: str = ""
+
+    flow_items: List[FlowItem] = field(default_factory=list)
+    default_target: str = ""
+
+    system_globals: List[SystemGlobal] = field(default_factory=list)
+    generated_code: str = ""
+
+    role_func_map: Dict[str, str] = field(default_factory=dict)
+    user_code: Dict[str, str] = field(default_factory=dict)
+
+    # === v2.2: cell-level metadata ===
+    cell_actions: List[ActionStep] = field(default_factory=list)
+    cell_relations: List[TransitionRelation] = field(default_factory=list)
+
+    def clear(self):
+        self.flow_items = []
+        self.default_target = ""
+        self.system_globals = []
+        self.generated_code = ""
+        self.role_func_map = {}
+        self.user_code = {}
+        self.cell_actions = []
+        self.cell_relations = []
+
+    def get_role_func_name(self, base_name: str, phase: str) -> str:
+        key = f"{self.source}|{self.event}|{phase}|{base_name}"
+        if key not in self.role_func_map:
+            func_name = f"RoleFunc_{base_name}_{self.source}_{self.event}_{phase}"
+            self.role_func_map[key] = func_name
+        return self.role_func_map[key]
+
+    def to_dict(self) -> dict:
+        return {
+            'source': self.source,
+            'event': self.event,
+            'layer_name': self.layer_name,
+            'flow_items': [i.to_dict() for i in self.flow_items],
+            'default_target': self.default_target,
+            'system_globals': [g.to_dict() for g in self.system_globals],
+            'generated_code': self.generated_code,
+            'role_func_map': self.role_func_map,
+            'user_code': self.user_code,
+            # v2.2
+            'cell_actions': [
+                {'role_function': a.role_function, 'trigger': a.trigger,
+                 'title': a.title}
+                for a in self.cell_actions
+            ],
+            'cell_relations': [
+                {'kind': r.kind, 'members': list(r.members),
+                 'shared_condition': r.shared_condition, 'note': r.note}
+                for r in self.cell_relations
+            ],
+        }
+
+    @classmethod
+    def from_dict(cls, data: dict) -> 'ActionDraft':
+        d = cls(
+            source=data.get('source', ''),
+            event=data.get('event', ''),
+            layer_name=data.get('layer_name', ''),
+            flow_items=[FlowItem.from_dict(i)
+                        for i in data.get('flow_items', [])],
+            default_target=data.get('default_target', ''),
+            system_globals=[SystemGlobal.from_dict(g)
+                            for g in data.get('system_globals', [])],
+            generated_code=data.get('generated_code', ''),
+            role_func_map=data.get('role_func_map', {}),
+            user_code=data.get('user_code', {}),
+        )
+        d.cell_actions = [
+            ActionStep(
+                role_function=a.get('role_function', ''),
+                trigger=a.get('trigger', 'always'),
+                title=a.get('title', ''),
+            )
+            for a in data.get('cell_actions', [])
+        ]
+        d.cell_relations = [
+            TransitionRelation(
+                kind=r.get('kind', 'sequential'),
+                members=list(r.get('members', [])),
+                shared_condition=r.get('shared_condition', ''),
+                note=r.get('note', ''),
+            )
+            for r in data.get('cell_relations', [])
+        ]
+        return d
+
+
+def transition_to_flow_item(trans) -> FlowItem:
+    """Transition -> FlowItem (v2.2: preserves early_return / label)."""
+    pre_actions = ensure_list(getattr(trans, 'pre_actions', []))
+    else_actions = ensure_list(getattr(trans, 'else_actions', []))
+    condition = getattr(trans, 'condition', '')
+    if not isinstance(condition, str):
+        logger.error(f"Condition is not str: {type(condition)}. Using empty string.")
+        condition = ""
+
+    event_name = trans.event if trans.event else "NewEvent"
+
+    logger.debug(
+        f"transition_to_flow_item: event='{event_name}', "
+        f"condition='{condition}', pre_actions={pre_actions}, "
+        f"else_actions={else_actions}")
+
+    return FlowItem(
+        item_type="transition",
+        name=event_name,
+        edited_text=(
+            trans.title if trans.title != "(untitled transition)"
+            else event_name
+        ),
+        params={
+            "event": event_name,
+            "condition": condition,
+            "pre_actions": pre_actions,
+            "target": trans.target,
+            "has_else": getattr(trans, 'has_else', True),
+            "else_target": getattr(trans, 'else_target', ''),
+            "else_actions": else_actions,
+            # v2.2
+            "early_return": getattr(trans, 'early_return', False),
+            "label": getattr(trans, 'label', ''),
+        }
+    )
+
+
+def flow_item_to_transition(item: FlowItem, source: str, event: str):
+    """FlowItem -> Transition (v2.2: preserves early_return / label)."""
+    from statable.model import Transition
+    params = item.params
+    pre_actions = ensure_list(params.get('pre_actions', []))
+    else_actions = ensure_list(params.get('else_actions', []))
+    condition = params.get('condition', '')
+    if not isinstance(condition, str):
+        logger.error(f"Condition is not str: {type(condition)}. Using empty string.")
+        condition = ""
+
+    logger.debug(
+        f"flow_item_to_transition: condition='{condition}', "
+        f"pre_actions={pre_actions}, else_actions={else_actions}")
+
+    return Transition(
+        source=source,
+        event=event,
+        condition=condition,
+        pre_actions=pre_actions,
+        target=params.get('target', ''),
+        has_else=params.get('has_else', True),
+        else_target=params.get('else_target', ''),
+        else_actions=else_actions,
+        early_return=params.get('early_return', False),
+        label=params.get('label', ''),
+        action="",
+        transition_type="external",
+        title=item.edited_text if item.edited_text and item.edited_text != item.name
+        else "(untitled transition)",
+    )