sysmlpy 0.33.3__tar.gz → 0.33.4__tar.gz

{sysmlpy-0.33.3 → sysmlpy-0.33.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sysmlpy
-Version: 0.33.3
+Version: 0.33.4
 Summary: 
 License-File: LICENSE
 Author: Jon R. Fox (mycr0ft)
@@ -831,6 +831,13 @@ See [`docs/plantuml-examples/`](docs/plantuml-examples/) for all rendered exampl
   3. New `as_case_view()` — maps actors and use cases onto PlantUML use-case diagram syntax.
   4. Added `docs/GUARDS.md` documenting guard condition syntax for confused users (canonical keyword is `if`, transition order is `accept` before `if` before `do` before `then`).
 
+- **v0.33.4** — Fix `timeslice`/`snapshot`/`individual` parsing and PlantUML rendering:
+  1. `portionUsage` and `individualUsage` were silently dropped from nested body definitions (visitor gaps in `_visit_nested_occurrence_usage`, `_visit_nested_usage`).
+  2. Added `PortionUsage` grammar class and dispatch in `StructureUsageElement.__init__`.
+  3. Added `_make_portion_usage_prefix()` to extract prefix info from `PortionUsageContext`.
+  4. Added `load_from_grammar` handler for `PortionUsage` in `usage.py`.
+  5. PlantUML `_get_stereotype()` now includes `individual`/`timeslice`/`snapshot` prefixes (e.g. `<<timeslice part>>`, `<<individual part>>`).
+
 ## Conformance
 
 **100% of 123 OMG XPect conformance tests pass** (123/123).

{sysmlpy-0.33.3 → sysmlpy-0.33.4}/README.md

@@ -806,6 +806,13 @@ See [`docs/plantuml-examples/`](docs/plantuml-examples/) for all rendered exampl
   3. New `as_case_view()` — maps actors and use cases onto PlantUML use-case diagram syntax.
   4. Added `docs/GUARDS.md` documenting guard condition syntax for confused users (canonical keyword is `if`, transition order is `accept` before `if` before `do` before `then`).
 
+- **v0.33.4** — Fix `timeslice`/`snapshot`/`individual` parsing and PlantUML rendering:
+  1. `portionUsage` and `individualUsage` were silently dropped from nested body definitions (visitor gaps in `_visit_nested_occurrence_usage`, `_visit_nested_usage`).
+  2. Added `PortionUsage` grammar class and dispatch in `StructureUsageElement.__init__`.
+  3. Added `_make_portion_usage_prefix()` to extract prefix info from `PortionUsageContext`.
+  4. Added `load_from_grammar` handler for `PortionUsage` in `usage.py`.
+  5. PlantUML `_get_stereotype()` now includes `individual`/`timeslice`/`snapshot` prefixes (e.g. `<<timeslice part>>`, `<<individual part>>`).
+
 ## Conformance
 
 **100% of 123 OMG XPect conformance tests pass** (123/123).

{sysmlpy-0.33.3 → sysmlpy-0.33.4}/pyproject.toml

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

{sysmlpy-0.33.3 → sysmlpy-0.33.4}/src/sysmlpy/__init__.py

@@ -22,7 +22,7 @@ __all__ = [
     "SysMLSyntaxError",
 ]
 __author__ = "Jon Fox"
-__version__ = "0.33.3"
+__version__ = "0.33.4"
 
 from sysmlpy.usage import (
     Item, Attribute, Part, Port, Action, Reference, UseCase, Requirement, Interface, Message,

{sysmlpy-0.33.3 → sysmlpy-0.33.4}/src/sysmlpy/antlr_visitor.py

@@ -1079,6 +1079,81 @@ def _get_occurrence_usage_prefix(ctx):
     }
 
 
+def _make_portion_usage_prefix(ctx):
+    """Build an OccurrenceUsagePrefix dict from a PortionUsageContext.
+    
+    PortionUsageContext has basicUsagePrefix directly (not via occurrenceUsagePrefix),
+    plus optional INDIVIDUAL and required portionKind.
+    """
+    is_reference = False
+    direction_in = ""
+    direction_out = ""
+    direction_inout = ""
+    is_end = False
+    is_individual = False
+    portion_kind = None
+
+    if hasattr(ctx, 'basicUsagePrefix') and ctx.basicUsagePrefix():
+        bup = ctx.basicUsagePrefix()
+        is_reference = hasattr(bup, 'REF') and bup.REF() is not None
+        if hasattr(bup, 'refPrefix') and bup.refPrefix():
+            rp = bup.refPrefix()
+            if hasattr(rp, 'featureDirection') and rp.featureDirection():
+                fd = rp.featureDirection()
+                direction_in = "in " if fd.IN() is not None else ""
+                direction_out = "out" if fd.OUT() is not None else ""
+                direction_inout = "inout" if fd.INOUT() is not None else ""
+            if hasattr(rp, 'END') and rp.END() is not None:
+                is_end = True
+
+    if hasattr(ctx, 'INDIVIDUAL') and ctx.INDIVIDUAL() is not None:
+        is_individual = True
+
+    if hasattr(ctx, 'portionKind') and ctx.portionKind():
+        pk_ctx = ctx.portionKind()
+        if hasattr(pk_ctx, 'SNAPSHOT') and pk_ctx.SNAPSHOT() is not None:
+            portion_kind = "snapshot"
+        elif hasattr(pk_ctx, 'TIMESLICE') and pk_ctx.TIMESLICE() is not None:
+            portion_kind = "timeslice"
+
+    ref_prefix = None
+    has_direction = any([direction_in, direction_out, direction_inout])
+    if has_direction or is_end:
+        ref_prefix = {
+            "name": "RefPrefix",
+            "direction": {
+                "name": "FeatureDirection",
+                "in": direction_in,
+                "out": direction_out,
+                "inout": direction_inout
+            },
+            "isAbstract": None,
+            "isVariation": None,
+            "isReadOnly": None,
+            "isDerived": None,
+            "isEnd": "end" if is_end else None
+        }
+
+    portion_kind_dict = None
+    if portion_kind is not None:
+        portion_kind_dict = {
+            "name": "PortionKind",
+            "kind": portion_kind
+        }
+
+    return {
+        "name": "OccurrenceUsagePrefix",
+        "prefix": {
+            "name": "BasicUsagePrefix",
+            "prefix": ref_prefix,
+            "isReference": is_reference
+        },
+        "isIndividual": "individual" if is_individual else None,
+        "portionKind": portion_kind_dict,
+        "usageExtension": []
+    }
+
+
 def _get_occurrence_definition_prefix(ctx):
     """Extract OccurrenceDefinitionPrefix from a definition context (for 'abstract' etc.)."""
     is_abstract = False
@@ -9322,6 +9397,22 @@ def _visit_nested_occurrence_usage(occ_elem):
                 inner = result.get("ownedRelatedElement", {})
                 return inner
             return result
+        elif hasattr(occ_elem, 'portionUsage') and occ_elem.portionUsage():
+            ctx = occ_elem.portionUsage()
+            name, shortname = _get_usage_identification(ctx)
+            body_items = _get_usage_body_items(ctx)
+            occ_prefix = _make_portion_usage_prefix(ctx)
+            specialization = _build_full_specialization_from_ctx(ctx)
+            valuepart = _get_usage_value_part(ctx)
+            return _make_nested_usage_element("PortionUsage", name, shortname, occ_prefix, body_items, specialization, valuepart)
+        elif hasattr(occ_elem, 'individualUsage') and occ_elem.individualUsage():
+            ctx = occ_elem.individualUsage()
+            name, shortname = _get_usage_identification(ctx)
+            body_items = _get_usage_body_items(ctx)
+            occ_prefix = _make_portion_usage_prefix(ctx)
+            specialization = _build_full_specialization_from_ctx(ctx)
+            valuepart = _get_usage_value_part(ctx)
+            return _make_nested_usage_element("PortionUsage", name, shortname, occ_prefix, body_items, specialization, valuepart)
         return None
     
     # print(f"DEBUG _visit_nested_occurrence_usage: {type(occ_elem).__name__}")
@@ -9377,6 +9468,22 @@ def _visit_nested_occurrence_usage(occ_elem):
         elif hasattr(struct_elem, 'connectionUsage') and struct_elem.connectionUsage():
             ctx = struct_elem.connectionUsage()
             return _make_nested_connection_usage_dict(ctx, None)
+        elif hasattr(struct_elem, 'portionUsage') and struct_elem.portionUsage():
+            ctx = struct_elem.portionUsage()
+            name, shortname = _get_usage_identification(ctx)
+            body_items = _get_usage_body_items(ctx)
+            occ_prefix = _make_portion_usage_prefix(ctx)
+            specialization = _build_full_specialization_from_ctx(ctx)
+            valuepart = _get_usage_value_part(ctx)
+            return _make_nested_usage_element("PortionUsage", name, shortname, occ_prefix, body_items, specialization, valuepart)
+        elif hasattr(struct_elem, 'individualUsage') and struct_elem.individualUsage():
+            ctx = struct_elem.individualUsage()
+            name, shortname = _get_usage_identification(ctx)
+            body_items = _get_usage_body_items(ctx)
+            occ_prefix = _make_portion_usage_prefix(ctx)
+            specialization = _build_full_specialization_from_ctx(ctx)
+            valuepart = _get_usage_value_part(ctx)
+            return _make_nested_usage_element("PortionUsage", name, shortname, occ_prefix, body_items, specialization, valuepart)
     
     # Check for interface occurrence usage element (has defaultInterfaceEnd keyword)
     if hasattr(occ_elem, 'defaultInterfaceEnd') and occ_elem.defaultInterfaceEnd() is not None:
@@ -9625,6 +9732,22 @@ def _visit_nested_occurrence_usage(occ_elem):
                 inner = result.get("ownedRelatedElement", {})
                 return inner
             return result
+        elif hasattr(struct_elem, 'portionUsage') and struct_elem.portionUsage():
+            ctx = struct_elem.portionUsage()
+            name, shortname = _get_usage_identification(ctx)
+            body_items = _get_usage_body_items(ctx)
+            occ_prefix = _make_portion_usage_prefix(ctx)
+            specialization = _build_full_specialization_from_ctx(ctx)
+            valuepart = _get_usage_value_part(ctx)
+            return _make_nested_usage_element("PortionUsage", name, shortname, occ_prefix, body_items, specialization, valuepart)
+        elif hasattr(struct_elem, 'individualUsage') and struct_elem.individualUsage():
+            ctx = struct_elem.individualUsage()
+            name, shortname = _get_usage_identification(ctx)
+            body_items = _get_usage_body_items(ctx)
+            occ_prefix = _make_portion_usage_prefix(ctx)
+            specialization = _build_full_specialization_from_ctx(ctx)
+            valuepart = _get_usage_value_part(ctx)
+            return _make_nested_usage_element("PortionUsage", name, shortname, occ_prefix, body_items, specialization, valuepart)
     
     # Check behavior usage elements (action)
     if hasattr(occ_elem, 'behaviorUsageElement') and occ_elem.behaviorUsageElement():
@@ -10653,6 +10776,22 @@ def _visit_nested_usage(usage_elem_ctx):
                 specialization = _build_full_specialization_from_ctx(ctx)
                 valuepart = _get_usage_value_part(ctx)
                 return _make_nested_usage_element("PortUsage", name, shortname, occ_prefix, body_items, specialization, valuepart)
+            elif hasattr(struct_elem, 'portionUsage') and struct_elem.portionUsage():
+                ctx = struct_elem.portionUsage()
+                name, shortname = _get_usage_identification(ctx)
+                body_items = _get_usage_body_items(ctx)
+                occ_prefix = _make_portion_usage_prefix(ctx)
+                specialization = _build_full_specialization_from_ctx(ctx)
+                valuepart = _get_usage_value_part(ctx)
+                return _make_nested_usage_element("PortionUsage", name, shortname, occ_prefix, body_items, specialization, valuepart)
+            elif hasattr(struct_elem, 'individualUsage') and struct_elem.individualUsage():
+                ctx = struct_elem.individualUsage()
+                name, shortname = _get_usage_identification(ctx)
+                body_items = _get_usage_body_items(ctx)
+                occ_prefix = _make_portion_usage_prefix(ctx)
+                specialization = _build_full_specialization_from_ctx(ctx)
+                valuepart = _get_usage_value_part(ctx)
+                return _make_nested_usage_element("PortionUsage", name, shortname, occ_prefix, body_items, specialization, valuepart)
         
         # Check behavior usage elements (action)
         if hasattr(occ_elem, 'behaviorUsageElement') and occ_elem.behaviorUsageElement():
@@ -10837,6 +10976,21 @@ def _visit_usage_element_dict(usage_elem_ctx, prefix=None):
             elif hasattr(struct_elem, 'individualUsage') and struct_elem.individualUsage():
                 ctx = struct_elem.individualUsage()
                 return _make_individual_usage_dict(ctx, prefix)
+            elif hasattr(struct_elem, 'portionUsage') and struct_elem.portionUsage():
+                ctx = struct_elem.portionUsage()
+                name, shortname = _get_usage_identification(ctx)
+                body_items = _get_usage_body_items(ctx)
+                occ_prefix = _make_portion_usage_prefix(ctx)
+                specialization = _build_full_specialization_from_ctx(ctx)
+                valuepart = _get_usage_value_part(ctx)
+                inner = _make_nested_usage_element("PortionUsage", name, shortname, occ_prefix, body_items, specialization, valuepart)
+                if inner:
+                    return {
+                        "name": "PackageMember",
+                        "prefix": None,
+                        "ownedRelatedElement": inner
+                    }
+                return None
             elif hasattr(struct_elem, 'viewUsage') and struct_elem.viewUsage():
                 ctx = struct_elem.viewUsage()
                 return _make_view_usage_dict(ctx, prefix)

{sysmlpy-0.33.3 → sysmlpy-0.33.4}/src/sysmlpy/grammar/classes.py

@@ -6298,6 +6298,8 @@ class StructureUsageElement:
                 self.children = AllocationUsage(definition["ownedRelatedElement"])
             elif name == "RenderingUsage":
                 self.children = RenderingUsage(definition["ownedRelatedElement"])
+            elif name == "PortionUsage":
+                self.children = PortionUsage(definition["ownedRelatedElement"])
             elif name == "ViewUsage":
                 self.children = ViewUsage(definition["ownedRelatedElement"])
             elif name == "SuccessionFlowConnectionUsage":
@@ -9615,6 +9617,40 @@ class IndividualUsageSimple(_PrefixedUsageBase):
     keyword = "individual"
 
 
+class PortionUsage:
+    """Portion usage (timeslice or snapshot) inside a body."""
+
+    def __init__(self, definition=None):
+        if definition is not None:
+            if valid_definition(definition, "PortionUsage"):
+                if definition.get("prefix") is not None:
+                    prefix_name = definition["prefix"].get("name", "OccurrenceUsagePrefix")
+                    self.prefix = globals()[prefix_name](definition["prefix"])
+                else:
+                    self.prefix = None
+                self.usage = Usage(definition.get("usage"))
+        else:
+            self.prefix = None
+            self.usage = Usage()
+
+    def dump(self):
+        output = []
+        if self.prefix is not None:
+            output.append(self.prefix.dump())
+        if self.usage is not None:
+            output.append(self.usage.dump())
+        return " ".join(output)
+
+    def get_definition(self):
+        pre = None
+        if self.prefix is not None:
+            pre = self.prefix.get_definition()
+        u = None
+        if self.usage is not None:
+            u = self.usage.get_definition()
+        return {"name": self.__class__.__name__, "prefix": pre, "usage": u}
+
+
 class FlowUsageSimple(_PrefixedUsageBase):
     """Alternative FlowUsage (flow without connection - simple usage)."""
     keyword = "flow"

{sysmlpy-0.33.3 → sysmlpy-0.33.4}/src/sysmlpy/plantuml.py

@@ -310,8 +310,21 @@ def _get_stereotype(element, style="bw"):
     stereotype_map = DEFINITION_STEREOTYPES if is_def else USAGE_STEREOTYPES
     label = stereotype_map.get(sysml_type, sysml_type)
 
+    # Check for portionKind and individual in the grammar prefix
+    prefix = _get_grammar_prefix(element)
+    if prefix is not None:
+        parts = []
+        if getattr(prefix, 'isIndividual', None):
+            parts.append("individual")
+        pk = getattr(prefix, 'portionKind', None)
+        if pk is not None:
+            pk_kind = getattr(pk, 'kind', None)
+            if pk_kind:
+                parts.append(pk_kind)
+        if parts:
+            label = " ".join(parts) + " " + label
+
     if style == "bw":
-        # Simple label without colors for journal rendering
         return f"<<{label}>>"
 
     color_info = STEREOTYPE_COLORS.get(sysml_type, ("T", "#3498DB"))
@@ -320,6 +333,14 @@ def _get_stereotype(element, style="bw"):
     return f"<<({letter},{color}) {label}>>"
 
 
+def _get_grammar_prefix(element):
+    """Navigate element.grammar to find the OccurrenceUsagePrefix."""
+    grammar = getattr(element, 'grammar', None)
+    if grammar is None:
+        return None
+    return getattr(grammar, 'prefix', None)
+
+
 def _get_element_name(element):
     """Get a safe PlantUML name for an element."""
     name = getattr(element, 'name', None)

{sysmlpy-0.33.3 → sysmlpy-0.33.4}/src/sysmlpy/usage.py

@@ -818,6 +818,10 @@ class Usage(Searchable):
                 c = Item().load_from_grammar(sc)
                 c.parent = self
                 self.children.append(c)
+            elif class_name == "PortionUsage":
+                c = Part().load_from_grammar(sc)
+                c.parent = self
+                self.children.append(c)
             elif class_name == "AttributeUsage":
                 c = Attribute().load_from_grammar(sc)
                 c.parent = self
@@ -849,6 +853,10 @@ class Usage(Searchable):
                         c = Flow().load_from_grammar(inner)
                         c.parent = self
                         self.children.append(c)
+                    elif inner.__class__.__name__ == "PortionUsage":
+                        c = Part().load_from_grammar(inner)
+                        c.parent = self
+                        self.children.append(c)
             elif class_name == "StructureDefinitionElement":
                 if hasattr(sc, 'children'):
                     inner = sc.children