sysmlpy 0.80.0__tar.gz → 0.82.0__tar.gz

{sysmlpy-0.80.0 → sysmlpy-0.82.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sysmlpy
-Version: 0.80.0
+Version: 0.82.0
 Summary: 
 License-File: LICENSE
 Author: Jon R. Fox (mycr0ft)

{sysmlpy-0.80.0 → sysmlpy-0.82.0}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name = "sysmlpy"
-version = "0.80.0"
+version = "0.82.0"
 description = ""
 authors = [{ name = "Jon R. Fox (mycr0ft)", email = "jon.fox@drfox.com" }]
 readme = "README.md"

{sysmlpy-0.80.0 → sysmlpy-0.82.0}/src/sysmlpy/__init__.py

@@ -34,7 +34,7 @@ __all__ = [
     "render_state_transition_view_svg", "boxes_view",
 ]
 __author__ = "Jon Fox"
-__version__ = "0.80.0"
+__version__ = "0.82.0"
 
 from sysmlpy.usage import (
     Item, Attribute, Part, Port, Action, Reference, UseCase, Requirement, Interface, Message,
@@ -449,7 +449,7 @@ def __getattr__(name):
         globals()[name] = fn
         return fn
     if name in ("ModelDiff", "ElementChange", "FieldChange",
-                "diff_models", "diff_files"):
+                "diff_models", "diff_files", "diff_state_machines"):
         from sysmlpy import diff as _diff
         fn = getattr(_diff, name)
         globals()[name] = fn

{sysmlpy-0.80.0 → sysmlpy-0.82.0}/src/sysmlpy/__main__.py

@@ -117,15 +117,25 @@ def cmd_diff(args) -> int:
         print(f"Parse error: {e}", file=sys.stderr)
         return 2
 
+    threshold = getattr(args, "threshold", None)
+    if threshold is not None and not 0 <= threshold <= 1:
+        print(f"Error: --threshold expects a fraction in 0..1, "
+              f"got {threshold}", file=sys.stderr)
+        return 2
+
     if args.format == "json":
         import json as _json
         print(_json.dumps({
             "summary": d.summary(),
+            "elements_old": d.elements_old,
+            "elements_new": d.elements_new,
+            "change_rate": round(d.change_rate, 6),
             "changes": [
                 {
                     "change": c.change,
                     "kind": c.kind,
                     "qualified_name": c.qualified_name,
+                    "old_qualified_name": c.old_qualified_name,
                     "fields": [
                         {"field": fc.field, "old": fc.old,
                          "new": fc.new} for fc in c.fields
@@ -139,6 +149,14 @@ def cmd_diff(args) -> int:
     else:
         print(d.as_text(), end="")
 
+    if threshold is not None:
+        rate = d.change_rate
+        failed = rate > threshold
+        print(f"change gate: {len(d.changes)} changes / "
+              f"{d.elements_old} elements = {rate:.2%}; threshold "
+              f"{threshold:.2%} -> {'FAIL' if failed else 'OK'}")
+        return 1 if failed else 0
+
     # CI-friendly: differences are findings
     return 1 if not d.is_empty() else 0
 
@@ -567,10 +585,12 @@ def cmd_sim(args) -> int:
         name, _, raw = spec.partition("=")
         values[name.strip()] = _parse_eval_value(raw)
 
+    deep = bool(getattr(args, "deep_history", False))
     script = [t.strip() for t in (args.run or "").split(";") if t.strip()]
     try:
         from sysmlpy.sim import StateSimulator, SimulationError
-        sim = StateSimulator(model, focus=args.focus, values=values)
+        sim = StateSimulator(model, focus=args.focus, values=values,
+                             deep_history=deep)
     except (ImportError, SimulationError) as e:
         print(f"Simulation error: {e}", file=sys.stderr)
         return 2
@@ -582,7 +602,7 @@ def cmd_sim(args) -> int:
             print(f"{trigger}: {'fired' if fired else 'blocked'} "
                   f"-> {sim.state!r}")
         return 0
-    run_tui(model, focus=args.focus, values=values)
+    run_tui(model, focus=args.focus, values=values, deep_history=deep)
     return 0
 
 
@@ -760,6 +780,13 @@ def build_parser() -> argparse.ArgumentParser:
         "--format", choices=("text", "markdown", "json"), default="text",
         help="Output format: text (default), markdown or JSON",
     )
+    p_diff.add_argument(
+        "--threshold", type=float, default=None, metavar="FRAC",
+        help="CI gate: exit 1 only when the change rate (changes / old "
+             "elements) exceeds FRAC (0..1); exit 0 under the gate "
+             "even when the models differ.  Without this flag any "
+             "difference exits 1.",
+    )
     p_diff.set_defaults(func=cmd_diff)
 
     # -- view ----------------------------------------------------------------
@@ -967,6 +994,11 @@ def build_parser() -> argparse.ArgumentParser:
         "-l", "--library",
         help="Path to SysML v2 library files to use for parsing",
     )
+    p_sim.add_argument(
+        "--deep-history", action="store_true",
+        help="History pseudostates restore the deepest visited state "
+             "(default: one level, shallow)",
+    )
     p_sim.set_defaults(func=cmd_sim)
 
     # -- xlsx (v0.66.0, Goal 7) -------------------------------------------------

{sysmlpy-0.80.0 → sysmlpy-0.82.0}/src/sysmlpy/boxes_view.py

@@ -380,6 +380,44 @@ def _top_member(item, target):
     return None
 
 
+def _pseudostate_kind(usage: dict) -> Optional[str]:
+    """Classify a usage inside a state body as a pseudostate marker.
+
+    Recognizes history pseudostates: ``state h : HistoryUsage;`` /
+    ``h : HistoryUsage;`` (typed) and — for bare *reference* usages
+    only, as a name convention — ``h;``/``history;`` (untyped).
+    Returns ``"history"`` or ``None``.
+    """
+    if not isinstance(usage, dict):
+        return None
+    decl = usage.get("declaration") or {}
+    is_state = usage.get("name") == "StateUsage"
+
+    def _hunt(x):
+        if isinstance(x, dict):
+            if x.get("name") == "QualifiedName" and \
+                    isinstance(x.get("names"), list) and x["names"]:
+                qns.append(x["names"])
+            for v in x.values():
+                _hunt(v)
+        elif isinstance(x, list):
+            for v in x:
+                _hunt(v)
+
+    qns: list = []
+    _hunt(decl)
+    typed_history = any(ns and ns[-1] == "HistoryUsage" for ns in qns)
+    if typed_history:
+        return "history"
+    if is_state:
+        return None  # a real state named h is a state, not a marker
+    fd = decl.get("declaration") or {}
+    name = (fd.get("identification") or {}).get("declaredName")
+    if name in ("history", "h"):
+        return "history"
+    return None
+
+
 def _state_declared_name(state_usage: dict) -> Optional[str]:
     """Extract the declaredName from a StateUsage dict."""
     decl = state_usage.get("declaration", {})
@@ -405,6 +443,7 @@ def _collect_state_body(items: list, prefix: str = "",
           "initial": <state name:str>|None,
           "transitions": [ {name, source, target, trigger, guard}, ... ],
           "composites": [ {name, items, ...}, ... ],
+          "pseudostates": [ {name, kind}, ... ],
           "entry": <action label str|None>,
           "do": <action label str|None>,
           "exit": <action label str|None>,
@@ -416,6 +455,7 @@ def _collect_state_body(items: list, prefix: str = "",
         "initial": None,
         "transitions": [],
         "composites": [],
+        "pseudostates": [],
         "entry": None, "do": None, "exit": None,
     }
 
@@ -483,6 +523,12 @@ def _collect_state_body(items: list, prefix: str = "",
             if isinstance(orel, dict) and orel.get("name") == "BehaviorUsageElement":
                 su = orel.get("ownedRelationship", {})
                 if isinstance(su, dict) and su.get("name") == "StateUsage":
+                    if _pseudostate_kind(su):
+                        sname = _state_declared_name(su)
+                        if sname:
+                            result["pseudostates"].append(
+                                {"name": sname, "kind": "history"})
+                        continue
                     sname = _state_declared_name(su)
                     if sname:
                         sub_body = su.get("body", {})
@@ -506,9 +552,39 @@ def _collect_state_body(items: list, prefix: str = "",
                                 "entry": None, "do": None, "exit": None,
                                 "states": [], "initial": None,
                                 "transitions": [], "composites": [],
+                                "pseudostates": [],
                             })
                         continue
 
+        # History / pseudostate markers as bare references in a state
+        # body (``h;``, ``history;``, ``h : HistoryUsage;``).  They are
+        # not states; sim treats transitions targeting them as history
+        # re-entries.
+        ps_name, ps_kind = None, None
+        for member_name in ("NonOccurrenceUsageMember",
+                            "OccurrenceUsageMember"):
+            pm = _top_member(item, member_name)
+            if pm is None:
+                continue
+            orel = pm.get("ownedRelatedElement")
+            orel_list = orel if isinstance(orel, list) else (
+                [orel] if isinstance(orel, dict) else [])
+            for oe in orel_list:
+                usage = (oe.get("ownedRelatedElement")
+                         if isinstance(oe, dict) else None)
+                if isinstance(usage, dict):
+                    kind = _pseudostate_kind(usage)
+                    if kind:
+                        ps_name, ps_kind = usage, kind
+        if ps_name is not None:
+            fd = ((ps_name.get("declaration") or {}).get("declaration")
+                  or {})
+            nm = (fd.get("identification") or {}).get("declaredName")
+            if nm:
+                result["pseudostates"].append(
+                    {"name": nm, "kind": ps_kind})
+            continue
+
         # If this item was a pure entry/do/exit member, we already
         # handled it above and there's nothing else to register.
         if entry_do_exit_handled: