buildzr 0.0.8__py3-none-any.whl → 0.0.10__py3-none-any.whl

buildzr/__about__.py

@@ -1 +1 @@
-VERSION = "0.0.8"
+VERSION = "0.0.10"

buildzr/dsl/__init__.py

@@ -9,10 +9,13 @@ from .dsl import (
     SystemContextView,
     ContainerView,
     ComponentView,
+    StyleElements,
+    StyleRelationships,
 )
 from .relations import (
     desc,
     With,
 )
 from .explorer import Explorer
-from .expression import Expression
+from .expression import Expression
+from .color import Color

buildzr/dsl/color.py

@@ -0,0 +1,121 @@
+import re
+from typing import Tuple, Optional, Union, Literal
+
+class Color:
+    r: int
+    g: int
+    b: int
+
+    _ENGLISH_COLORS = {
+        'black': '#000000',
+        'white': '#ffffff',
+        'red': '#ff0000',
+        'green': '#00ff00',
+        'blue': '#0000ff',
+        'yellow': '#ffff00',
+        'cyan': '#00ffff',
+        'magenta': '#ff00ff',
+        'gray': '#808080',
+        'grey': '#808080',
+        'orange': '#ffa500',
+        'purple': '#800080',
+        'pink': '#ffc0cb',
+        'brown': '#a52a2a',
+        'lime': '#00ff00',
+        'navy': '#000080',
+        'teal': '#008080',
+        'olive': '#808000',
+        'maroon': '#800000',
+        'silver': '#c0c0c0',
+        'gold': '#ffd700',
+    }
+
+    def __init__(
+        self,
+        value: Union[
+            'Color',
+            str,
+            Tuple[int, int, int],
+            Literal[
+                'black', 'white', 'red', 'green', 'blue', 'yellow', 'cyan', 'magenta', 'gray', 'grey', 'orange', 'purple', 'pink', 'brown', 'lime', 'navy', 'teal', 'olive', 'maroon', 'silver', 'gold'
+            ]
+        ]
+    ):
+        if isinstance(value, Color):
+            self.r, self.g, self.b = value.r, value.g, value.b
+        elif isinstance(value, tuple):
+            if len(value) == 3:
+                self.r, self.g, self.b = value
+            else:
+                raise ValueError("Tuple must be (r, g, b)")
+        elif isinstance(value, str):
+            self.r, self.g, self.b = self._parse_color(value)
+        else:
+            raise TypeError("Invalid type for Color constructor")
+
+    @classmethod
+    def is_valid_color(cls, value: Union[str, Tuple[int, int, int], 'Color']) -> bool:
+        try:
+            if isinstance(value, tuple):
+                if len(value) == 3 and all(isinstance(x, int) and 0 <= x <= 255 for x in value):
+                    return True
+                return False
+            elif isinstance(value, str):
+                v = value.strip().lower()
+                if v in cls._ENGLISH_COLORS:
+                    return True
+                if v.startswith('#'):
+                    try:
+                        cls._parse_hex(v)
+                        return True
+                    except Exception:
+                        return False
+                if v.startswith('rgb'):
+                    try:
+                        cls._parse_rgb(v)
+                        return True
+                    except Exception:
+                        return False
+                return False
+            return False
+        except Exception:
+            return False
+
+    @classmethod
+    def _parse_color(cls, value: str) -> Tuple[int, int, int]:
+        value = value.strip().lower()
+        if value in cls._ENGLISH_COLORS:
+            value = cls._ENGLISH_COLORS[value]
+        if value.startswith('#'):
+            return cls._parse_hex(value)
+        if value.startswith('rgb'):
+            return cls._parse_rgb(value)
+        raise ValueError(f"Unknown color format: {value}")
+
+    @classmethod
+    def _parse_hex(cls, value: str) -> Tuple[int, int, int]:
+        value = value.lstrip('#')
+        if len(value) == 3:
+            value = ''.join([c*2 for c in value])
+        if len(value) == 6:
+            r, g, b = value[0:2], value[2:4], value[4:6]
+            return int(r, 16), int(g, 16), int(b, 16)
+        raise ValueError(f"Invalid hex color: #{value}")
+
+    @classmethod
+    def _parse_rgb(cls, value: str) -> Tuple[int, int, int]:
+        # Match rgb(r, g, b)
+        match = re.match(r"rgb\(([^)]+)\)", value)
+        if not match:
+            raise ValueError(f"Invalid rgb color: {value}")
+        parts = [x.strip() for x in match.group(1).split(',')]
+        if len(parts) == 3:
+            r, g, b = map(int, parts)
+            return r, g, b
+        raise ValueError(f"Invalid rgb color: {value}")
+
+    def to_hex(self) -> str:
+        return f"#{self.r:02x}{self.g:02x}{self.b:02x}"
+
+    def __str__(self) -> str:
+        return f"rgb({self.r}, {self.g}, {self.b})"

buildzr/dsl/dsl.py

@@ -33,7 +33,10 @@ from buildzr.dsl.interfaces import (
 )
 from buildzr.dsl.relations import (
     DslElementRelationOverrides,
+    DslRelationship,
+    _Relationship,
 )
+from buildzr.dsl.color import Color
 
 def _child_name_transform(name: str) -> str:
     return name.lower().replace(' ', '_')
@@ -186,6 +189,30 @@ class Workspace(DslWorkspaceElement):
     ) -> None:
         Views(self).add_views(*views)
 
+    def apply_style( self,
+        style: Union['StyleElements', 'StyleRelationships'],
+    ) -> None:
+
+        style._parent = self
+
+        if not self.model.views:
+            self.model.views = buildzr.models.Views()
+        if not self.model.views.configuration:
+            self.model.views.configuration = buildzr.models.Configuration()
+        if not self.model.views.configuration.styles:
+            self.model.views.configuration.styles = buildzr.models.Styles()
+
+        if isinstance(style, StyleElements):
+            if self.model.views.configuration.styles.elements:
+                self.model.views.configuration.styles.elements.extend(style.model)
+            else:
+                self.model.views.configuration.styles.elements = style.model
+        elif isinstance(style, StyleRelationships):
+            if self.model.views.configuration.styles.relationships:
+                self.model.views.configuration.styles.relationships.extend(style.model)
+            else:
+                self.model.views.configuration.styles.relationships = style.model
+
     def to_json(self, path: str) -> None:
         from buildzr.sinks.json_sink import JsonSink, JsonSinkConfig
         sink = JsonSink()
@@ -245,6 +272,10 @@ class SoftwareSystem(DslElementRelationOverrides[
     def destinations(self) -> List[DslElement]:
         return self._destinations
 
+    @property
+    def relationships(self) -> Set[_Relationship]:
+        return self._relationships
+
     @property
     def tags(self) -> Set[str]:
         return self._tags
@@ -256,6 +287,7 @@ class SoftwareSystem(DslElementRelationOverrides[
         self._children: Optional[List['Container']] = []
         self._sources: List[DslElement] = []
         self._destinations: List[DslElement] = []
+        self._relationships: Set[_Relationship] = set()
         self._tags = {'Element', 'Software System'}.union(tags)
         self._dynamic_attrs: Dict[str, 'Container'] = {}
         self._label: Optional[str] = None
@@ -354,6 +386,10 @@ class Person(DslElementRelationOverrides[
     def destinations(self) -> List[DslElement]:
         return self._destinations
 
+    @property
+    def relationships(self) -> Set[_Relationship]:
+        return self._relationships
+
     @property
     def tags(self) -> Set[str]:
         return self._tags
@@ -363,6 +399,7 @@ class Person(DslElementRelationOverrides[
         self._parent: Optional[Workspace] = None
         self._sources: List[DslElement] = []
         self._destinations: List[DslElement] = []
+        self._relationships: Set[_Relationship] = set()
         self._tags = {'Element', 'Person'}.union(tags)
         self._label: Optional[str] = None
         self.model.id = GenerateId.for_element()
@@ -420,6 +457,10 @@ class Container(DslElementRelationOverrides[
     def destinations(self) -> List[DslElement]:
         return self._destinations
 
+    @property
+    def relationships(self) -> Set[_Relationship]:
+        return self._relationships
+
     @property
     def tags(self) -> Set[str]:
         return self._tags
@@ -431,6 +472,7 @@ class Container(DslElementRelationOverrides[
         self._children: Optional[List['Component']] = []
         self._sources: List[DslElement] = []
         self._destinations: List[DslElement] = []
+        self._relationships: Set[_Relationship] = set()
         self._tags = {'Element', 'Container'}.union(tags)
         self._dynamic_attrs: Dict[str, 'Component'] = {}
         self._label: Optional[str] = None
@@ -527,6 +569,10 @@ class Component(DslElementRelationOverrides[
     def destinations(self) -> List[DslElement]:
         return self._destinations
 
+    @property
+    def relationships(self) -> Set[_Relationship]:
+        return self._relationships
+
     @property
     def tags(self) -> Set[str]:
         return self._tags
@@ -536,6 +582,7 @@ class Component(DslElementRelationOverrides[
         self._parent: Optional[Container] = None
         self._sources: List[DslElement] = []
         self._destinations: List[DslElement] = []
+        self._relationships: Set[_Relationship] = set()
         self._tags = {'Element', 'Component'}.union(tags)
         self._label: Optional[str] = None
         self.model.id = GenerateId.for_element()
@@ -567,9 +614,32 @@ class Group:
     def __init__(
         self,
         name: str,
+        workspace: Optional[Workspace]=None,
     ) -> None:
+
+        if not workspace:
+            workspace = _current_workspace.get()
+            if workspace is not None:
+                self._group_separator = workspace._group_separator
+
+        self._group_separator = workspace._group_separator
         self._name = name
 
+        if len(self._group_separator) > 1:
+            raise ValueError('Group separator must be a single character.')
+
+        if self._group_separator in self._name:
+            raise ValueError('Group name cannot contain the group separator.')
+
+        stack = _current_group_stack.get()
+        new_stack = stack.copy()
+        new_stack.extend([self])
+
+        self._full_name = self._group_separator.join([group._name for group in new_stack])
+
+    def full_name(self) -> str:
+        return self._full_name
+
     def add_element(
         self,
         model: Union[
@@ -577,27 +647,11 @@ class Group:
             'SoftwareSystem',
             'Container',
             'Component',
-        ],
-        group_separator: str="/",
+        ]
     ) -> None:
 
-        separator = group_separator
-
-        workspace = _current_workspace.get()
-        if workspace is not None:
-            separator = workspace._group_separator
-
-        if len(separator) > 1:
-            raise ValueError('Group separator must be a single character.')
-
-        if separator in self._name:
-            raise ValueError('Group name cannot contain the group separator.')
-
-        stack = _current_group_stack.get()
 
-        index = next((i for i, group in enumerate(stack) if group._name == self._name), -1)
-        if index >= 0:
-            model.model.group = separator.join([group._name for group in stack[:index + 1]])
+        model.model.group = self._full_name
 
     def __enter__(self) -> Self:
         stack = _current_group_stack.get() # stack: a/b
@@ -1073,6 +1127,9 @@ class ComponentView(DslViewElement):
 
 class Views(DslViewsElement):
 
+    # TODO: Make this view a "hidden" class -- it's not a "first class citizen"
+    # in buildzr DSL.
+
     @property
     def model(self) -> buildzr.models.Views:
         return self._m
@@ -1130,4 +1187,278 @@ class Views(DslViewsElement):
         """
         Get the `Workspace` which contain this views definition.
         """
-        return self._parent
+        return self._parent
+
+class StyleElements:
+
+    from buildzr.dsl.expression import Element
+
+    Shapes = Union[
+        Literal['Box'],
+        Literal['RoundedBox'],
+        Literal['Circle'],
+        Literal['Ellipse'],
+        Literal['Hexagon'],
+        Literal['Cylinder'],
+        Literal['Pipe'],
+        Literal['Person'],
+        Literal['Robot'],
+        Literal['Folder'],
+        Literal['WebBrowser'],
+        Literal['MobileDevicePortrait'],
+        Literal['MobileDeviceLandscape'],
+        Literal['Component'],
+    ]
+
+    @property
+    def model(self) -> List[buildzr.models.ElementStyle]:
+        return self._m
+
+    @property
+    def parent(self) -> Optional[Workspace]:
+        return self._parent
+
+    # TODO: Validate arguments with pydantic.
+    def __init__(
+            self,
+            on: List[Union[
+                DslElement,
+                Group,
+                Callable[[Workspace, Element], bool],
+                Type[Union['Person', 'SoftwareSystem', 'Container', 'Component']],
+                str
+            ]],
+            shape: Optional[Shapes]=None,
+            icon: Optional[str]=None,
+            width: Optional[int]=None,
+            height: Optional[int]=None,
+            background: Optional[Union['str', Tuple[int, int, int], Color]]=None,
+            color: Optional[Union['str', Tuple[int, int, int], Color]]=None,
+            stroke: Optional[Union[str, Tuple[int, int, int], Color]]=None,
+            stroke_width: Optional[int]=None,
+            font_size: Optional[int]=None,
+            border: Optional[Literal['solid', 'dashed', 'dotted']]=None,
+            opacity: Optional[int]=None,
+            metadata: Optional[bool]=None,
+            description: Optional[bool]=None,
+    ) -> None:
+
+        # How the tag is populated depends on each element type in the
+        # `elemenets`.
+        # - If the element is a `DslElement`, then we create a unique tag
+        #   specifically to help the stylizer identify that specific element.
+        #   For example, if the element has an id `3`, then we should create a
+        #   tag, say, `style-element-3`.
+        # - If the element is a `Group`, then we simply make create the tag
+        #   based on the group name and its nested path. For example,
+        #   `Group:Company 1/Department 1`.
+        # - If the element is a `Callable[[Workspace, Element], bool]`, we just
+        #   run the function to filter out all the elements that matches the
+        #   description, and create a unique tag for all of the filtered
+        #   elements.
+        # - If the element is a `Type[Union['Person', 'SoftwareSystem', 'Container', 'Component']]`,
+        #   we create a tag based on the class name. This is based on the fact
+        #   that the default tag for each element is the element's type.
+        # - If the element is a `str`, we just use the string as the tag.
+        #   This is useful for when you want to apply a style to all elements
+        #   with a specific tag, just like in the original Structurizr DSL.
+        #
+        # Note that a new `buildzr.models.ElementStyle` is created for each
+        # item, not for each of `StyleElements` instance. This makes the styling
+        # makes more concise and flexible.
+
+        from buildzr.dsl.expression import Element
+        from uuid import uuid4
+
+        if background:
+            assert Color.is_valid_color(background), "Invalid background color: {}".format(background)
+        if color:
+            assert Color.is_valid_color(color), "Invalid color: {}".format(color)
+        if stroke:
+            assert Color.is_valid_color(stroke), "Invalid stroke color: {}".format(stroke)
+
+        self._m: List[buildzr.models.ElementStyle] = []
+        self._parent: Optional[Workspace] = None
+
+        workspace = _current_workspace.get()
+        if workspace is not None:
+            self._parent = workspace
+
+        self._elements = on
+
+        border_enum: Dict[str, buildzr.models.Border] = {
+            'solid': buildzr.models.Border.Solid,
+            'dashed': buildzr.models.Border.Dashed,
+            'dotted': buildzr.models.Border.Dotted,
+        }
+
+        shape_enum: Dict[str, buildzr.models.Shape] = {
+            'Box': buildzr.models.Shape.Box,
+            'RoundedBox': buildzr.models.Shape.RoundedBox,
+            'Circle': buildzr.models.Shape.Circle,
+            'Ellipse': buildzr.models.Shape.Ellipse,
+            'Hexagon': buildzr.models.Shape.Hexagon,
+            'Cylinder': buildzr.models.Shape.Cylinder,
+            'Pipe': buildzr.models.Shape.Pipe,
+            'Person': buildzr.models.Shape.Person,
+            'Robot': buildzr.models.Shape.Robot,
+            'Folder': buildzr.models.Shape.Folder,
+            'WebBrowser': buildzr.models.Shape.WebBrowser,
+            'MobileDevicePortrait': buildzr.models.Shape.MobileDevicePortrait,
+            'MobileDeviceLandscape': buildzr.models.Shape.MobileDeviceLandscape,
+            'Component': buildzr.models.Shape.Component,
+        }
+
+        # A single unique element to be applied to all elements
+        # affected by this style.
+        element_tag = "buildzr-styleelements-{}".format(uuid4().hex)
+
+        for element in self._elements:
+
+            element_style = buildzr.models.ElementStyle()
+            element_style.shape = shape_enum[shape] if shape else None
+            element_style.icon = icon
+            element_style.width = width
+            element_style.height = height
+            element_style.background = Color(background).to_hex() if background else None
+            element_style.color = Color(color).to_hex() if color else None
+            element_style.stroke = Color(stroke).to_hex() if stroke else None
+            element_style.strokeWidth = stroke_width
+            element_style.fontSize = font_size
+            element_style.border = border_enum[border] if border else None
+            element_style.opacity = opacity
+            element_style.metadata = metadata
+            element_style.description = description
+
+            if isinstance(element, DslElement) and not isinstance(element.model, buildzr.models.Workspace):
+                element_style.tag = element_tag
+                element.add_tags(element_tag)
+            elif isinstance(element, Group):
+                element_style.tag = f"Group:{element.full_name()}"
+            elif isinstance(element, type):
+                element_style.tag = f"{element.__name__}"
+            elif isinstance(element, str):
+                element_style.tag = element
+            elif callable(element):
+                from buildzr.dsl.expression import Element, Expression
+                if self._parent:
+                    matched_elems = Expression(include_elements=[element]).elements(self._parent)
+                    for e in matched_elems:
+                        element_style.tag = element_tag
+                        e.add_tags(element_tag)
+                else:
+                    raise ValueError("Cannot use callable to select elements to style without a Workspace.")
+            self._m.append(element_style)
+
+        workspace = _current_workspace.get()
+        if workspace is not None:
+            workspace.apply_style(self)
+
+class StyleRelationships:
+
+    from buildzr.dsl.expression import Relationship
+
+    @property
+    def model(self) -> List[buildzr.models.RelationshipStyle]:
+        return self._m
+
+    @property
+    def parent(self) -> Optional[Workspace]:
+        return self._parent
+
+    def __init__(
+        self,
+        on: Optional[List[Union[
+            DslRelationship,
+            Group,
+            Callable[[Workspace, Relationship], bool],
+            str
+        ]]]=None,
+        thickness: Optional[int]=None,
+        color: Optional[Union[str, Tuple[int, int, int], Color]]=None,
+        routing: Optional[Literal['Direct', 'Orthogonal', 'Curved']]=None,
+        font_size: Optional[int]=None,
+        width: Optional[int]=None,
+        dashed: Optional[bool]=None,
+        position: Optional[int]=None,
+        opacity: Optional[int]=None,
+    ) -> None:
+
+        from uuid import uuid4
+
+        if color is not None:
+            assert Color.is_valid_color(color), "Invalid color: {}".format(color)
+
+        routing_enum: Dict[str, buildzr.models.Routing1] = {
+            'Direct': buildzr.models.Routing1.Direct,
+            'Orthogonal': buildzr.models.Routing1.Orthogonal,
+            'Curved': buildzr.models.Routing1.Curved,
+        }
+
+        self._m: List[buildzr.models.RelationshipStyle] = []
+        self._parent: Optional[Workspace] = None
+
+        workspace = _current_workspace.get()
+        if workspace is not None:
+            self._parent = workspace
+
+        # A single unique tag to be applied to all relationships
+        # affected by this style.
+        relation_tag = "buildzr-stylerelationships-{}".format(uuid4().hex)
+
+        if on is None:
+            self._m.append(buildzr.models.RelationshipStyle(
+                thickness=thickness,
+                color=Color(color).to_hex() if color else None,
+                routing=routing_enum[routing] if routing else None,
+                fontSize=font_size,
+                width=width,
+                dashed=dashed,
+                position=position,
+                opacity=opacity,
+                tag="Relationship",
+            ))
+        else:
+            for relationship in on:
+
+                relationship_style = buildzr.models.RelationshipStyle()
+                relationship_style.thickness = thickness
+                relationship_style.color = Color(color).to_hex() if color else None
+                relationship_style.routing = routing_enum[routing] if routing else None
+                relationship_style.fontSize = font_size
+                relationship_style.width = width
+                relationship_style.dashed = dashed
+                relationship_style.position = position
+                relationship_style.opacity = opacity
+
+                if isinstance(relationship, DslRelationship):
+                    relationship.add_tags(relation_tag)
+                    relationship_style.tag = relation_tag
+                elif isinstance(relationship, Group):
+                    from buildzr.dsl.expression import Expression
+                    if self._parent:
+                        rels = Expression(include_relationships=[
+                            lambda w, r: r.source.group == relationship.full_name() and \
+                                         r.destination.group == relationship.full_name()
+                        ]).relationships(self._parent)
+                        for r in rels:
+                            r.add_tags(relation_tag)
+                        relationship_style.tag = relation_tag
+                    else:
+                        raise ValueError("Cannot use callable to select elements to style without a Workspace.")
+                elif isinstance(relationship, str):
+                    relationship_style.tag = relationship
+                elif callable(relationship):
+                    from buildzr.dsl.expression import Expression
+                    if self._parent:
+                        matched_rels = Expression(include_relationships=[relationship]).relationships(self._parent)
+                        for matched_rel in matched_rels:
+                            matched_rel.add_tags(relation_tag)
+                            relationship_style.tag = relation_tag
+                    else:
+                        raise ValueError("Cannot use callable to select elements to style without a Workspace.")
+                self._m.append(relationship_style)
+
+        workspace = _current_workspace.get()
+        if workspace is not None:
+            workspace.apply_style(self)

buildzr/dsl/explorer.py

@@ -33,35 +33,14 @@ class Explorer:
                 yield from explorer
 
     def walk_relationships(self) -> Generator[_Relationship, None, None]:
-        import buildzr
-        from buildzr.dsl.factory.gen_id import GenerateId
 
         if self._workspace_or_element.children:
-            for child in self._workspace_or_element.children:
-                # Relationships aren't materialized in the `Workspace` or in any
-                # of the `DslElement`s. As such, we need to recreate the `_Relationship` objects
-                # from the Structurizr model.
 
-                if child.model.relationships and child.destinations:
-                    for relationship, destination in zip(child.model.relationships, child.destinations):
-                        fake_relationship = _Relationship(
-                            _UsesData(
-                                relationship=buildzr.models.Relationship(
-                                    id=relationship.id,
-                                    description=relationship.description,
-                                    properties=relationship.properties,
-                                    technology=relationship.technology,
-                                    tags=relationship.tags,
-                                    sourceId=relationship.sourceId,
-                                ),
-                                source=child,
-                            ),
-                            destination=destination,
-                            _include_in_model=False,
-                        )
-                        fake_relationship._tags = set(relationship.tags.split(','))
+            for child in self._workspace_or_element.children:
 
-                        yield fake_relationship
+                if child.relationships:
+                    for relationship in child.relationships:
+                        yield relationship
 
                 explorer = Explorer(child).walk_relationships()
                 yield from explorer

buildzr/dsl/expression.py

@@ -88,6 +88,16 @@ class Element:
     def properties(self) -> Dict[str, Any]:
         return self._element.model.properties
 
+    @property
+    def group(self) -> Optional[str]:
+        """
+        Returns the group of the element. The group is a string that is used to
+        group elements in the Structurizr DSL.
+        """
+        if not isinstance(self._element.model, buildzr.models.Workspace):
+            return self._element.model.group
+        return None
+
     def __eq__(self, element: object) -> bool:
         return isinstance(element, type(self._element)) and\
                element.model.id == self._element.model.id

buildzr/dsl/interfaces/interfaces.py

@@ -11,6 +11,7 @@ from typing import (
     Callable,
     overload,
     Sequence,
+    MutableSet,
     cast,
 )
 from typing_extensions import (
@@ -125,11 +126,24 @@ class DslElement(BindRight[TSrc, TDst]):
     def destinations(self) -> List['DslElement']:
         pass
 
+    @property
+    @abstractmethod
+    def relationships(self) -> MutableSet['DslRelationship']:
+        pass
+
     @property
     @abstractmethod
     def tags(self) -> Set[str]:
         pass
 
+    def add_tags(self, *tags: str) -> None:
+        """
+        Add tags to the element.
+        """
+        self.tags.update(tags)
+        if not isinstance(self.model, buildzr.models.Workspace):
+            self.model.tags = ','.join(self.tags)
+
     def uses(
         self,
         other: 'DslElement',
@@ -167,6 +181,13 @@ class DslRelationship(ABC, Generic[TSrc, TDst]):
     def destination(self) -> DslElement:
         pass
 
+    def add_tags(self, *tags: str) -> None:
+        """
+        Adds tags to the relationship.
+        """
+        self.tags.update(tags)
+        self.model.tags = ','.join(self.tags)
+
     def __contains__(self, other: 'DslElement') -> bool:
         return self.source.model.id == other.model.id or self.destination.model.id == other.model.id
 

buildzr/dsl/relations.py

@@ -102,6 +102,10 @@ class _Relationship(DslRelationship[TSrc, TDst]):
             if not any([self._src.model.id == src.model.id for src in self._dst.sources]):
                 self._dst.sources.append(self._src)
 
+            # Make this relationship accessible from the source element.
+            if not any([r.model.id == self.model.id for r in self._src.relationships]):
+                self._src.relationships.add(self)
+
             if _include_in_model:
                 if uses_data.source.model.relationships:
                     uses_data.source.model.relationships.append(uses_data.relationship)

{buildzr-0.0.8.dist-info → buildzr-0.0.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: buildzr
-Version: 0.0.8
+Version: 0.0.10
 Summary: Structurizr for the `buildzr`s 🧱⚒️
 Project-URL: homepage, https://github.com/amirulmenjeni/buildzr
 Project-URL: issues, https://github.com/amirulmenjeni/buildzr/issues

{buildzr-0.0.8.dist-info → buildzr-0.0.10.dist-info}/RECORD

@@ -1,14 +1,15 @@
-buildzr/__about__.py,sha256=4c61OddVWS6L9IjCPX5Ldepb6zkgj8z9bKRq9nu3ESs,17
+buildzr/__about__.py,sha256=wEjCYQzurEzDt1Qp6SwlCKMqyhpgH57_IpRlf0zm9fk,18
 buildzr/__init__.py,sha256=hY-cOdjBQcz0v2m8cBF1oEJFIbcR3sWI-xww--0RKSo,99
-buildzr/dsl/__init__.py,sha256=paxuMCCDuOs1eSvBPyuW5pv5j1UZD6TxRZcCzC2iKss,307
-buildzr/dsl/dsl.py,sha256=gjYExKxrbv3QyJFNknkW5lPpleYysvDDlllM5NSB0Xg,40395
-buildzr/dsl/explorer.py,sha256=numMPqD3RYJ1oeMgX5wYnT6aHRHmBN2EsFZFYRuFffA,2523
-buildzr/dsl/expression.py,sha256=k5R98lW15TYepWV0P-2AYCmUw_gOceGGiLJwynm-NMI,7913
-buildzr/dsl/relations.py,sha256=lypzwpBuK9IHtz60T_oI8l0pZh4sLp_ylorW_7I7QJo,11679
+buildzr/dsl/__init__.py,sha256=k0G9blhA3NSzCBs1dSfBNzCh0iDS_ylkzS_5a3pqrSY,375
+buildzr/dsl/color.py,sha256=at5lo3WgLEDCjrnbu37ra1p1TjzdB51sxeW7pBMC_7U,4019
+buildzr/dsl/dsl.py,sha256=47_O2OqN6XR7MNZnmJK2EaX8JPZrGu-h5YEVEaLUwdM,54154
+buildzr/dsl/explorer.py,sha256=vLAgQEYd0h22QuVfWfBdk4zyDpGaE1T67Pn9V7P1C-I,1238
+buildzr/dsl/expression.py,sha256=EMAtaZQA0O_zwENCZs3l4u_w9wUuO09XA0LgnvsomfA,8256
+buildzr/dsl/relations.py,sha256=GBs5epr9uuExU_H6VcP4XY76iJPQ__rz_d8tZlhhWQ4,11891
 buildzr/dsl/factory/__init__.py,sha256=niaYqvNPUWJejoPyRyABUtzVsoxaV8eSjzS9dta4bMI,30
 buildzr/dsl/factory/gen_id.py,sha256=LnaeOCMngSvYkcGnuARjQYoUVWdcOoNHO2EHe6PMGco,538
 buildzr/dsl/interfaces/__init__.py,sha256=ncYARIPB4ARcCCRObgV1b4jluEubpm2s46mp1ZC8Urk,197
-buildzr/dsl/interfaces/interfaces.py,sha256=sYBi887fLr6Nrw_dTkvwOjoIfzjo7VcMY5O_wshv0Jk,4994
+buildzr/dsl/interfaces/interfaces.py,sha256=j8UCPCRegmFZ2Jl4qCz0uW0OxBS2mRe0VjPcNExH8mc,5553
 buildzr/encoders/__init__.py,sha256=suID63Ay-023T0uKD25EAoGYmAMTa9AKxIjioccpiPM,32
 buildzr/encoders/encoder.py,sha256=n8WLVMrisykBTLTr1z6PAxgqhqW2dFRZhSupOuMdx_A,3235
 buildzr/models/__init__.py,sha256=SRfF7oDVlOOAi6nGKiJIUK6B_arqYLO9iSMp-2IZZps,21
@@ -17,7 +18,7 @@ buildzr/models/models.py,sha256=0LhLG1wmbt4dvROV5MEBZLLoxPbMpkUsOqNz525cynE,4248
 buildzr/sinks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 buildzr/sinks/interfaces.py,sha256=LOZekP4WNjomD5J5f3FnZTwGj0aXMr6RbrvyFV5zn0E,383
 buildzr/sinks/json_sink.py,sha256=onKOZTpwOQfeMEj1ONkuIEHBAQhx4yQSqqI_lgZBaP8,777
-buildzr-0.0.8.dist-info/METADATA,sha256=83EbUbu1-_Amvjh2oweVgAy6NpRop3eM_K-CiDfkDqs,6578
-buildzr-0.0.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-buildzr-0.0.8.dist-info/licenses/LICENSE.md,sha256=e8e6W6tL4MbBY-c-gXMgDbaMf_BnaQDQv4Yoy42b-CI,1070
-buildzr-0.0.8.dist-info/RECORD,,
+buildzr-0.0.10.dist-info/METADATA,sha256=CWSrdAVndP4HsBW00aeGNVqDmngxJqEE1VqKa_97E8k,6579
+buildzr-0.0.10.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+buildzr-0.0.10.dist-info/licenses/LICENSE.md,sha256=e8e6W6tL4MbBY-c-gXMgDbaMf_BnaQDQv4Yoy42b-CI,1070
+buildzr-0.0.10.dist-info/RECORD,,