openprocess 0.7.1__tar.gz → 0.7.2__tar.gz

{openprocess-0.7.1/openprocess.egg-info → openprocess-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openprocess
-Version: 0.7.1
+Version: 0.7.2
 Summary: Process mining, Petri nets and workflows in one open app: every algorithm visible, every result reproducible, every step teachable
 Author: Sam Struthers
 License: MIT

{openprocess-0.7.1 → openprocess-0.7.2}/openprocess/__init__.py

@@ -48,7 +48,7 @@ from .sim.simulator import Simulator
 #: The one place the version number is written (pyproject.toml, the update
 #: check and packaging/build.py read it from here).  A release is tagged
 #: "v" + this, e.g. v0.2.0.
-__version__ = "0.7.1"
+__version__ = "0.7.2"
 
 __all__ = [
     "Arc", "BindingElement", "CPNet", "Marking", "Multiset", "Page", "Place",

{openprocess-0.7.1 → openprocess-0.7.2}/openprocess/gui/flow/page.py

@@ -671,10 +671,22 @@ class WorkflowPage(QWidget):
             if result is None:
                 return label("Runs first; the result shows here.", "muted", wrap=True)
             if result.status == FAILED:
+                # The box's own words first (a missing file, a dataset to fetch
+                # by hand, a setting out of range), with any address or folder
+                # in them clickable; the traceback is for whoever fixes the box.
+                kind, text = _error_message(result.error)
+                message = label(_linkified(text), "failedMessage", wrap=True, selectable=True)
+                message.setTextFormat(Qt.RichText)
+                message.setOpenExternalLinks(True)
+                parts = [label("WHAT WENT WRONG", "sectionLabel"), message]
+                if kind:
+                    parts.append(label(kind, "muted"))
+                if result.traceback:
+                    parts += [label("DETAILS", "sectionLabel"), _error_box(result.traceback)]
+                parts.append(label("The rest of the workflow keeps working. Fix the setting or the file, and "
+                                   "it runs again on its own.", "muted", wrap=True))
                 host = QWidget()
-                host.setLayout(vbox(label("WHAT WENT WRONG", "sectionLabel"), _error_box(result.traceback or result.error),
-                                    label("The rest of the workflow keeps working. Fix the setting or the file, and "
-                                          "it runs again on its own.", "muted", wrap=True)))
+                host.setLayout(vbox(*parts))
                 return host
             if result.status == BLOCKED:
                 host = QWidget()
@@ -963,10 +975,43 @@ def _delete_layout(layout) -> None:
             _delete_layout(item.layout())
 
 
+def _error_message(error: str) -> tuple[str, str]:
+    """``"DatasetMissing: Sepsis cases is not in the cache…"`` → the kind of error
+    (shown small) and what it says; an error without a message keeps its kind
+    as the message."""
+    error = (error or "The box failed without saying why.").strip()
+    kind, separator, text = error.partition(": ")
+    if separator and text.strip() and " " not in kind:
+        return kind.rsplit(".", 1)[-1], text.strip()      # the class, not its module path
+    return "", error
+
+
+def _linkified(text: str) -> str:
+    """The text as rich text, with web addresses and folder paths as links."""
+    from html import escape
+    from urllib.parse import quote
+
+    def link(match) -> str:
+        address = match.group(0)
+        trailing = ""
+        while address and address[-1] in ".,;:)”\"'":
+            trailing = address[-1] + trailing
+            address = address[:-1]
+        shown = escape(address)
+        if address.startswith("http"):
+            return f'<a href="{escape(address)}">{shown}</a>{escape(trailing)}'
+        folder = Path(address)
+        target = folder if folder.is_dir() else folder.parent
+        if target.is_dir():
+            return f'<a href="file://{quote(str(target))}">{shown}</a>{escape(trailing)}'
+        return shown + escape(trailing)
+    return re.sub(r"https?://\S+|(?<![\w/])(?:/|[A-Za-z]:\\)[^\s“”\"']+", link, escape(text)).replace("\n", "<br>")
+
+
 def _error_box(text: str) -> QPlainTextEdit:
     box = QPlainTextEdit(text)
     box.setReadOnly(True)
     box.setFont(theme.mono_font(10))
-    box.setMaximumHeight(220)
+    box.setMaximumHeight(160)
     box.setStyleSheet(f"color: {style.STATUS['critical']};")
     return box

{openprocess-0.7.1 → openprocess-0.7.2/openprocess.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openprocess
-Version: 0.7.1
+Version: 0.7.2
 Summary: Process mining, Petri nets and workflows in one open app: every algorithm visible, every result reproducible, every step teachable
 Author: Sam Struthers
 License: MIT

{openprocess-0.7.1 → openprocess-0.7.2}/tests/test_flow_gui.py

@@ -325,3 +325,40 @@ def test_quick_actions_make_workflows(app):
     for document in window.documents:
         document.dirty = False
     window.close()
+
+
+def test_a_failed_box_says_what_went_wrong_in_its_own_words(app, tmp_path, monkeypatch):
+    """Open dataset without the file in the cache: the message and its links
+    come first, the traceback under Details."""
+    from PySide6.QtWidgets import QLabel, QPlainTextEdit
+
+    from openprocess.flow import datasets
+    from openprocess.gui.flow.page import _error_message, _linkified
+
+    from PySide6.QtCore import QPointF
+
+    from openprocess.gui.studio.app import StudioWindow
+
+    monkeypatch.setattr(datasets, "cache_dir", lambda: tmp_path)
+    window = StudioWindow()
+    window.resize(1400, 900)
+    window.show()
+    window.action_new_workflow()                                    # empty
+    page = window.current_page()
+    node = page.scene.add_node("open_dataset", QPointF(0, 300))
+    _wait_run(app, page)
+    result = page.run.result(node)
+    assert result.status == "failed" and "not in the cache" in result.error
+    page.select(node.id, 0)
+    _pump(app, 0.1)
+    labels = page.panel_host.findChildren(QLabel)
+    texts = [w.text() for w in labels]
+    assert any("not in the cache" in t and 'href="https://doi.org' in t for t in texts)
+    assert "DatasetMissing" in texts
+    assert "Traceback" in page.panel_host.findChild(QPlainTextEdit).toPlainText()
+    assert _error_message("ValueError: the noise must be 0..1") == ("ValueError", "the noise must be 0..1")
+    assert _error_message("Not a box error") == ("", "Not a box error")
+    assert _linkified(f"put it in {tmp_path}.") == f'put it in <a href="file://{tmp_path}">{tmp_path}</a>.'
+    assert _linkified("see https://doi.org/10.1/x, then") == 'see <a href="https://doi.org/10.1/x">https://doi.org/10.1/x</a>, then'
+    page.document.dirty = False                   # closing would otherwise ask to save
+    window.close()