buildzr 0.0.11__tar.gz → 0.0.13__tar.gz

{buildzr-0.0.11 → buildzr-0.0.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: buildzr
-Version: 0.0.11
+Version: 0.0.13
 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.13/buildzr/__about__.py

@@ -0,0 +1 @@
+VERSION = "0.0.13"

{buildzr-0.0.11 → buildzr-0.0.13}/buildzr/dsl/dsl.py

@@ -29,7 +29,6 @@ from buildzr.dsl.interfaces import (
     DslWorkspaceElement,
     DslElement,
     DslViewElement,
-    DslViewsElement,
 )
 from buildzr.dsl.relations import (
     DslElementRelationOverrides,
@@ -181,13 +180,43 @@ class Workspace(DslWorkspaceElement):
         else:
             raise ValueError('Invalid element type: Trying to add an element of type {} to a workspace.'.format(type(model)))
 
-    def apply_views( self, *views: Union[ 'SystemLandscapeView',
+    def apply_view(
+        self,
+        view: Union[
+            'SystemLandscapeView',
             'SystemContextView',
             'ContainerView',
             'ComponentView',
         ]
     ) -> None:
-        Views(self).add_views(*views)
+
+        view._on_added(self)
+
+        if not self.model.views:
+            self.model.views = buildzr.models.Views()
+
+        if isinstance(view, SystemLandscapeView):
+            if not self.model.views.systemLandscapeViews:
+                self.model.views.systemLandscapeViews = [view.model]
+            else:
+                self.model.views.systemLandscapeViews.append(view.model)
+        elif isinstance(view, SystemContextView):
+            if not self.model.views.systemContextViews:
+                self.model.views.systemContextViews = [view.model]
+            else:
+                self.model.views.systemContextViews.append(view.model)
+        elif isinstance(view, ContainerView):
+            if not self.model.views.containerViews:
+                self.model.views.containerViews = [view.model]
+            else:
+                self.model.views.containerViews.append(view.model)
+        elif isinstance(view, ComponentView):
+            if not self.model.views.componentViews:
+                self.model.views.componentViews = [view.model]
+            else:
+                self.model.views.componentViews.append(view.model)
+        else:
+            raise NotImplementedError("The view {0} is currently not supported", type(view))
 
     def apply_style( self,
         style: Union['StyleElements', 'StyleRelationships'],
@@ -273,7 +302,7 @@ class SoftwareSystem(DslElementRelationOverrides[
         return self._destinations
 
     @property
-    def relationships(self) -> Set[_Relationship]:
+    def relationships(self) -> Set[DslRelationship]:
         return self._relationships
 
     @property
@@ -287,7 +316,7 @@ class SoftwareSystem(DslElementRelationOverrides[
         self._children: Optional[List['Container']] = []
         self._sources: List[DslElement] = []
         self._destinations: List[DslElement] = []
-        self._relationships: Set[_Relationship] = set()
+        self._relationships: Set[DslRelationship] = set()
         self._tags = {'Element', 'Software System'}.union(tags)
         self._dynamic_attrs: Dict[str, 'Container'] = {}
         self._label: Optional[str] = None
@@ -387,7 +416,7 @@ class Person(DslElementRelationOverrides[
         return self._destinations
 
     @property
-    def relationships(self) -> Set[_Relationship]:
+    def relationships(self) -> Set[DslRelationship]:
         return self._relationships
 
     @property
@@ -399,7 +428,7 @@ class Person(DslElementRelationOverrides[
         self._parent: Optional[Workspace] = None
         self._sources: List[DslElement] = []
         self._destinations: List[DslElement] = []
-        self._relationships: Set[_Relationship] = set()
+        self._relationships: Set[DslRelationship] = set()
         self._tags = {'Element', 'Person'}.union(tags)
         self._label: Optional[str] = None
         self.model.id = GenerateId.for_element()
@@ -458,7 +487,7 @@ class Container(DslElementRelationOverrides[
         return self._destinations
 
     @property
-    def relationships(self) -> Set[_Relationship]:
+    def relationships(self) -> Set[DslRelationship]:
         return self._relationships
 
     @property
@@ -472,7 +501,7 @@ class Container(DslElementRelationOverrides[
         self._children: Optional[List['Component']] = []
         self._sources: List[DslElement] = []
         self._destinations: List[DslElement] = []
-        self._relationships: Set[_Relationship] = set()
+        self._relationships: Set[DslRelationship] = set()
         self._tags = {'Element', 'Container'}.union(tags)
         self._dynamic_attrs: Dict[str, 'Component'] = {}
         self._label: Optional[str] = None
@@ -570,7 +599,7 @@ class Component(DslElementRelationOverrides[
         return self._destinations
 
     @property
-    def relationships(self) -> Set[_Relationship]:
+    def relationships(self) -> Set[DslRelationship]:
         return self._relationships
 
     @property
@@ -582,7 +611,7 @@ class Component(DslElementRelationOverrides[
         self._parent: Optional[Container] = None
         self._sources: List[DslElement] = []
         self._destinations: List[DslElement] = []
-        self._relationships: Set[_Relationship] = set()
+        self._relationships: Set[DslRelationship] = set()
         self._tags = {'Element', 'Component'}.union(tags)
         self._label: Optional[str] = None
         self.model.id = GenerateId.for_element()
@@ -738,30 +767,25 @@ def _auto_layout_to_model(auto_layout: _AutoLayout) -> buildzr.models.AutomaticL
 
 class SystemLandscapeView(DslViewElement):
 
-    from buildzr.dsl.expression import Expression, Element, Relationship
+    from buildzr.dsl.expression import Expression, WorkspaceExpression, ElementExpression, RelationshipExpression
 
     @property
     def model(self) -> buildzr.models.SystemLandscapeView:
         return self._m
 
-    @property
-    def parent(self) -> Optional['Views']:
-        return self._parent
-
     def __init__(
         self,
         key: str,
         description: str,
         auto_layout: _AutoLayout='tb',
         title: Optional[str]=None,
-        include_elements: List[Union[DslElement, Callable[[Workspace, Element], bool]]]=[],
-        exclude_elements: List[Union[DslElement, Callable[[Workspace, Element], bool]]]=[],
-        include_relationships: List[Union[DslElement, Callable[[Workspace, Relationship], bool]]]=[],
-        exclude_relationships: List[Union[DslElement, Callable[[Workspace, Relationship], bool]]]=[],
+        include_elements: List[Union[DslElement, Callable[[WorkspaceExpression, ElementExpression], bool]]]=[],
+        exclude_elements: List[Union[DslElement, Callable[[WorkspaceExpression, ElementExpression], bool]]]=[],
+        include_relationships: List[Union[DslElement, Callable[[WorkspaceExpression, RelationshipExpression], bool]]]=[],
+        exclude_relationships: List[Union[DslElement, Callable[[WorkspaceExpression, RelationshipExpression], bool]]]=[],
         properties: Optional[Dict[str, str]]=None,
     ) -> None:
         self._m = buildzr.models.SystemLandscapeView()
-        self._parent: Optional['Views'] = None
 
         self._m.key = key
         self._m.description = description
@@ -777,11 +801,11 @@ class SystemLandscapeView(DslViewElement):
 
         workspace = _current_workspace.get()
         if workspace is not None:
-            workspace.apply_views(self)
+            workspace.apply_view(self)
 
-    def _on_added(self) -> None:
+    def _on_added(self, workspace: Workspace) -> None:
 
-        from buildzr.dsl.expression import Expression, Element, Relationship
+        from buildzr.dsl.expression import Expression, WorkspaceExpression, ElementExpression, RelationshipExpression
         from buildzr.models import ElementView, RelationshipView
 
         expression = Expression(
@@ -791,19 +815,17 @@ class SystemLandscapeView(DslViewElement):
             exclude_relationships=self._exclude_relationships,
         )
 
-        workspace = self._parent._parent
-
-        include_view_elements_filter: List[Union[DslElement, Callable[[Workspace, Element], bool]]] = [
+        include_view_elements_filter: List[Union[DslElement, Callable[[WorkspaceExpression, ElementExpression], bool]]] = [
             lambda w, e: e.type == Person,
             lambda w, e: e.type == SoftwareSystem
         ]
 
-        exclude_view_elements_filter: List[Union[DslElement, Callable[[Workspace, Element], bool]]] = [
+        exclude_view_elements_filter: List[Union[DslElement, Callable[[WorkspaceExpression, ElementExpression], bool]]] = [
             lambda w, e: e.type == Container,
             lambda w, e: e.type == Component,
         ]
 
-        include_view_relationships_filter: List[Union[DslElement, Callable[[Workspace, Relationship], bool]]] = [
+        include_view_relationships_filter: List[Union[DslElement, Callable[[WorkspaceExpression, RelationshipExpression], bool]]] = [
             lambda w, r: r.source.type == Person,
             lambda w, r: r.source.type == SoftwareSystem,
             lambda w, r: r.destination.type == Person,
@@ -842,31 +864,26 @@ class SystemContextView(DslViewElement):
     relationship with the selected `SoftwareSystem`.
     """
 
-    from buildzr.dsl.expression import Expression, Element, Relationship
+    from buildzr.dsl.expression import Expression, WorkspaceExpression, ElementExpression, RelationshipExpression
 
     @property
     def model(self) -> buildzr.models.SystemContextView:
         return self._m
 
-    @property
-    def parent(self) -> Optional['Views']:
-        return self._parent
-
     def __init__(
         self,
-        software_system_selector: Union[SoftwareSystem, Callable[[Workspace], SoftwareSystem]],
+        software_system_selector: Union[SoftwareSystem, Callable[[WorkspaceExpression], SoftwareSystem]],
         key: str,
         description: str,
         auto_layout: _AutoLayout='tb',
         title: Optional[str]=None,
-        include_elements: List[Union[DslElement, Callable[[Workspace, Element], bool]]]=[],
-        exclude_elements: List[Union[DslElement, Callable[[Workspace, Element], bool]]]=[],
-        include_relationships: List[Union[DslElement, Callable[[Workspace, Relationship], bool]]]=[],
-        exclude_relationships: List[Union[DslElement, Callable[[Workspace, Relationship], bool]]]=[],
+        include_elements: List[Union[DslElement, Callable[[WorkspaceExpression, ElementExpression], bool]]]=[],
+        exclude_elements: List[Union[DslElement, Callable[[WorkspaceExpression, ElementExpression], bool]]]=[],
+        include_relationships: List[Union[DslElement, Callable[[WorkspaceExpression, RelationshipExpression], bool]]]=[],
+        exclude_relationships: List[Union[DslElement, Callable[[WorkspaceExpression, RelationshipExpression], bool]]]=[],
         properties: Optional[Dict[str, str]]=None,
     ) -> None:
         self._m = buildzr.models.SystemContextView()
-        self._parent: Optional['Views'] = None
 
         self._m.key = key
         self._m.description = description
@@ -883,25 +900,25 @@ class SystemContextView(DslViewElement):
 
         workspace = _current_workspace.get()
         if workspace is not None:
-            workspace.apply_views(self)
+            workspace.apply_view(self)
 
-    def _on_added(self) -> None:
+    def _on_added(self, workspace: Workspace) -> None:
 
-        from buildzr.dsl.expression import Expression, Element, Relationship
+        from buildzr.dsl.expression import Expression, WorkspaceExpression, ElementExpression, RelationshipExpression
         from buildzr.models import ElementView, RelationshipView
 
         if isinstance(self._selector, SoftwareSystem):
             software_system = self._selector
         else:
-            software_system = self._selector(self._parent._parent)
+            software_system = self._selector(WorkspaceExpression(workspace))
         self._m.softwareSystemId = software_system.model.id
-        view_elements_filter: List[Union[DslElement, Callable[[Workspace, Element], bool]]] = [
+        view_elements_filter: List[Union[DslElement, Callable[[WorkspaceExpression, ElementExpression], bool]]] = [
             lambda w, e: e == software_system,
             lambda w, e: software_system.model.id in e.sources.ids,
             lambda w, e: software_system.model.id in e.destinations.ids,
         ]
 
-        view_relationships_filter: List[Union[DslElement, Callable[[Workspace, Relationship], bool]]] = [
+        view_relationships_filter: List[Union[DslElement, Callable[[WorkspaceExpression, RelationshipExpression], bool]]] = [
             lambda w, r: software_system == r.source,
             lambda w, r: software_system == r.destination,
         ]
@@ -913,8 +930,6 @@ class SystemContextView(DslViewElement):
             exclude_relationships=self._exclude_relationships,
         )
 
-        workspace = self._parent._parent
-
         element_ids = map(
             lambda x: str(x.model.id),
             expression.elements(workspace)
@@ -935,31 +950,26 @@ class SystemContextView(DslViewElement):
 
 class ContainerView(DslViewElement):
 
-    from buildzr.dsl.expression import Expression, Element, Relationship
+    from buildzr.dsl.expression import Expression, WorkspaceExpression, ElementExpression, RelationshipExpression
 
     @property
     def model(self) -> buildzr.models.ContainerView:
         return self._m
 
-    @property
-    def parent(self) -> Optional['Views']:
-        return self._parent
-
     def __init__(
         self,
-        software_system_selector: Union[SoftwareSystem, Callable[[Workspace], SoftwareSystem]],
+        software_system_selector: Union[SoftwareSystem, Callable[[WorkspaceExpression], SoftwareSystem]],
         key: str,
         description: str,
         auto_layout: _AutoLayout='tb',
         title: Optional[str]=None,
-        include_elements: List[Union[DslElement, Callable[[Workspace, Element], bool]]]=[],
-        exclude_elements: List[Union[DslElement, Callable[[Workspace, Element], bool]]]=[],
-        include_relationships: List[Union[DslElement, Callable[[Workspace, Relationship], bool]]]=[],
-        exclude_relationships: List[Union[DslElement, Callable[[Workspace, Relationship], bool]]]=[],
+        include_elements: List[Union[DslElement, Callable[[WorkspaceExpression, ElementExpression], bool]]]=[],
+        exclude_elements: List[Union[DslElement, Callable[[WorkspaceExpression, ElementExpression], bool]]]=[],
+        include_relationships: List[Union[DslElement, Callable[[WorkspaceExpression, RelationshipExpression], bool]]]=[],
+        exclude_relationships: List[Union[DslElement, Callable[[WorkspaceExpression, RelationshipExpression], bool]]]=[],
         properties: Optional[Dict[str, str]]=None,
     ) -> None:
         self._m = buildzr.models.ContainerView()
-        self._parent: Optional['Views'] = None
 
         self._m.key = key
         self._m.description = description
@@ -976,28 +986,28 @@ class ContainerView(DslViewElement):
 
         workspace = _current_workspace.get()
         if workspace is not None:
-            workspace.apply_views(self)
+            workspace.apply_view(self)
 
-    def _on_added(self) -> None:
+    def _on_added(self, workspace: Workspace) -> None:
 
-        from buildzr.dsl.expression import Expression, Element, Relationship
+        from buildzr.dsl.expression import Expression, WorkspaceExpression, ElementExpression, RelationshipExpression
         from buildzr.models import ElementView, RelationshipView
 
         if isinstance(self._selector, SoftwareSystem):
             software_system = self._selector
         else:
-            software_system = self._selector(self._parent._parent)
+            software_system = self._selector(WorkspaceExpression(workspace))
         self._m.softwareSystemId = software_system.model.id
 
         container_ids = { container.model.id for container in software_system.children}
 
-        view_elements_filter: List[Union[DslElement, Callable[[Workspace, Element], bool]]] = [
+        view_elements_filter: List[Union[DslElement, Callable[[WorkspaceExpression, ElementExpression], bool]]] = [
             lambda w, e: e.parent == software_system,
             lambda w, e: any(container_ids.intersection({ id for id in e.sources.ids })),
             lambda w, e: any(container_ids.intersection({ id for id in e.destinations.ids })),
         ]
 
-        view_relationships_filter: List[Union[DslElement, Callable[[Workspace, Relationship], bool]]] = [
+        view_relationships_filter: List[Union[DslElement, Callable[[WorkspaceExpression, RelationshipExpression], bool]]] = [
             lambda w, r: software_system == r.source.parent,
             lambda w, r: software_system == r.destination.parent,
         ]
@@ -1009,8 +1019,6 @@ class ContainerView(DslViewElement):
             exclude_relationships=self._exclude_relationships,
         )
 
-        workspace = self._parent._parent
-
         element_ids = map(
             lambda x: str(x.model.id),
             expression.elements(workspace)
@@ -1031,31 +1039,26 @@ class ContainerView(DslViewElement):
 
 class ComponentView(DslViewElement):
 
-    from buildzr.dsl.expression import Expression, Element, Relationship
+    from buildzr.dsl.expression import Expression, WorkspaceExpression, ElementExpression, RelationshipExpression
 
     @property
     def model(self) -> buildzr.models.ComponentView:
         return self._m
 
-    @property
-    def parent(self) -> Optional['Views']:
-        return self._parent
-
     def __init__(
         self,
-        container_selector: Union[Container, Callable[[Workspace], Container]],
+        container_selector: Union[Container, Callable[[WorkspaceExpression], Container]],
         key: str,
         description: str,
         auto_layout: _AutoLayout='tb',
         title: Optional[str]=None,
-        include_elements: List[Union[DslElement, Callable[[Workspace, Element], bool]]]=[],
-        exclude_elements: List[Union[DslElement, Callable[[Workspace, Element], bool]]]=[],
-        include_relationships: List[Union[DslElement, Callable[[Workspace, Relationship], bool]]]=[],
-        exclude_relationships: List[Union[DslElement, Callable[[Workspace, Relationship], bool]]]=[],
+        include_elements: List[Union[DslElement, Callable[[WorkspaceExpression, ElementExpression], bool]]]=[],
+        exclude_elements: List[Union[DslElement, Callable[[WorkspaceExpression, ElementExpression], bool]]]=[],
+        include_relationships: List[Union[DslElement, Callable[[WorkspaceExpression, RelationshipExpression], bool]]]=[],
+        exclude_relationships: List[Union[DslElement, Callable[[WorkspaceExpression, RelationshipExpression], bool]]]=[],
         properties: Optional[Dict[str, str]]=None,
     ) -> None:
         self._m = buildzr.models.ComponentView()
-        self._parent: Optional['Views'] = None
 
         self._m.key = key
         self._m.description = description
@@ -1072,28 +1075,28 @@ class ComponentView(DslViewElement):
 
         workspace = _current_workspace.get()
         if workspace is not None:
-            workspace.apply_views(self)
+            workspace.apply_view(self)
 
-    def _on_added(self) -> None:
+    def _on_added(self, workspace: Workspace) -> None:
 
-        from buildzr.dsl.expression import Expression, Element, Relationship
+        from buildzr.dsl.expression import Expression, WorkspaceExpression, ElementExpression, RelationshipExpression
         from buildzr.models import ElementView, RelationshipView
 
         if isinstance(self._selector, Container):
             container = self._selector
         else:
-            container = self._selector(self._parent._parent)
+            container = self._selector(WorkspaceExpression(workspace))
         self._m.containerId = container.model.id
 
         component_ids = { component.model.id for component in container.children }
 
-        view_elements_filter: List[Union[DslElement, Callable[[Workspace, Element], bool]]] = [
+        view_elements_filter: List[Union[DslElement, Callable[[WorkspaceExpression, ElementExpression], bool]]] = [
             lambda w, e: e.parent == container,
             lambda w, e: any(component_ids.intersection({ id for id in e.sources.ids })),
             lambda w, e: any(component_ids.intersection({ id for id in e.destinations.ids })),
         ]
 
-        view_relationships_filter: List[Union[DslElement, Callable[[Workspace, Relationship], bool]]] = [
+        view_relationships_filter: List[Union[DslElement, Callable[[WorkspaceExpression, RelationshipExpression], bool]]] = [
             lambda w, r: container == r.source.parent,
             lambda w, r: container == r.destination.parent,
         ]
@@ -1105,8 +1108,6 @@ class ComponentView(DslViewElement):
             exclude_relationships=self._exclude_relationships,
         )
 
-        workspace = self._parent._parent
-
         element_ids = map(
             lambda x: str(x.model.id),
             expression.elements(workspace)
@@ -1125,73 +1126,9 @@ class ComponentView(DslViewElement):
         for relationship_id in relationship_ids:
             self._m.relationships.append(RelationshipView(id=relationship_id))
 
-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
-
-    @property
-    def parent(self) -> Optional[Workspace]:
-        return self._parent
-
-    def __init__(
-        self,
-        workspace: Workspace,
-    ) -> None:
-        self._m = buildzr.models.Views()
-        self._parent = workspace
-        self._parent._m.views = self._m
-
-    def add_views(
-        self,
-        *views: DslViewElement
-    ) -> None:
-
-        for view in views:
-            if isinstance(view, SystemLandscapeView):
-                view._parent = self
-                view._on_added()
-                if self._m.systemLandscapeViews:
-                    self._m.systemLandscapeViews.append(view.model)
-                else:
-                    self._m.systemLandscapeViews = [view.model]
-            elif isinstance(view, SystemContextView):
-                view._parent = self
-                view._on_added()
-                if self._m.systemContextViews:
-                    self._m.systemContextViews.append(view.model)
-                else:
-                    self._m.systemContextViews = [view.model]
-            elif isinstance(view, ContainerView):
-                view._parent = self
-                view._on_added()
-                if self._m.containerViews:
-                    self._m.containerViews.append(view.model)
-                else:
-                    self._m.containerViews = [view.model]
-            elif isinstance(view, ComponentView):
-                view._parent = self
-                view._on_added()
-                if self._m.componentViews:
-                    self._m.componentViews.append(view.model)
-                else:
-                    self._m.componentViews = [view.model]
-            else:
-                raise NotImplementedError("The view {0} is currently not supported", type(view))
-
-    def get_workspace(self) -> Workspace:
-        """
-        Get the `Workspace` which contain this views definition.
-        """
-        return self._parent
-
 class StyleElements:
 
-    from buildzr.dsl.expression import Element
+    from buildzr.dsl.expression import WorkspaceExpression, ElementExpression
 
     Shapes = Union[
         Literal['Box'],
@@ -1224,7 +1161,7 @@ class StyleElements:
             on: List[Union[
                 DslElement,
                 Group,
-                Callable[[Workspace, Element], bool],
+                Callable[[WorkspaceExpression, ElementExpression], bool],
                 Type[Union['Person', 'SoftwareSystem', 'Container', 'Component']],
                 str
             ]],
@@ -1267,7 +1204,7 @@ class StyleElements:
         # item, not for each of `StyleElements` instance. This makes the styling
         # makes more concise and flexible.
 
-        from buildzr.dsl.expression import Element
+        from buildzr.dsl.expression import ElementExpression
         from uuid import uuid4
 
         if background:
@@ -1340,7 +1277,7 @@ class StyleElements:
             elif isinstance(element, str):
                 element_style.tag = element
             elif callable(element):
-                from buildzr.dsl.expression import Element, Expression
+                from buildzr.dsl.expression import ElementExpression, Expression
                 if self._parent:
                     matched_elems = Expression(include_elements=[element]).elements(self._parent)
                     for e in matched_elems:
@@ -1356,7 +1293,7 @@ class StyleElements:
 
 class StyleRelationships:
 
-    from buildzr.dsl.expression import Relationship
+    from buildzr.dsl.expression import WorkspaceExpression, RelationshipExpression
 
     @property
     def model(self) -> List[buildzr.models.RelationshipStyle]:
@@ -1371,7 +1308,7 @@ class StyleRelationships:
         on: Optional[List[Union[
             DslRelationship,
             Group,
-            Callable[[Workspace, Relationship], bool],
+            Callable[[WorkspaceExpression, RelationshipExpression], bool],
             str
         ]]]=None,
         thickness: Optional[int]=None,

{buildzr-0.0.11 → buildzr-0.0.13}/buildzr/dsl/explorer.py

@@ -14,12 +14,17 @@ from typing import (
     Union,
     Generator,
     Iterable,
+    cast,
 )
 
 from buildzr.dsl.dsl import (
     Workspace,
 )
 
+from buildzr.dsl.interfaces import (
+    DslRelationship,
+)
+
 class Explorer:
 
     def __init__(self, workspace_or_element: Union[Workspace, Person, SoftwareSystem, Container, Component]):
@@ -32,7 +37,7 @@ class Explorer:
                 yield child
                 yield from explorer
 
-    def walk_relationships(self) -> Generator[_Relationship, None, None]:
+    def walk_relationships(self) -> Generator[DslRelationship, None, None]:
 
         if self._workspace_or_element.children:
 
@@ -40,7 +45,7 @@ class Explorer:
 
                 if child.relationships:
                     for relationship in child.relationships:
-                        yield relationship
+                        yield cast(_Relationship, relationship) # TODO: Temporary fix. Use a better approach - Generics?
 
                 explorer = Explorer(child).walk_relationships()
                 yield from explorer

{buildzr-0.0.11 → buildzr-0.0.13}/buildzr/dsl/expression.py

@@ -10,6 +10,7 @@ from buildzr.dsl.dsl import (
     SoftwareSystem,
     Container,
     Component,
+    TypedDynamicAttribute,
 )
 
 from buildzr.dsl.relations import _Relationship
@@ -47,12 +48,37 @@ class FlattenElement:
             all_tags = all_tags.union(tags)
         return all_tags
 
-class Element:
+class WorkspaceExpression:
+
+    """
+    A class used to filter the allowable methods and properties of the
+    `Structurizr DSL` workspace. This is used to filter the elements and
+    relationships in the workspace.
+    """
+
+    def __init__(self, workspace: Workspace):
+        self._workspace = workspace
+        self._dynamic_attributes = self._workspace._dynamic_attrs
+
+    def software_system(self) -> TypedDynamicAttribute['SoftwareSystem']:
+        """
+        Returns the software system of the workspace. This is used to filter the
+        elements and relationships in the workspace.
+        """
+        return TypedDynamicAttribute['SoftwareSystem'](self._dynamic_attributes)
+
+    def person(self) -> TypedDynamicAttribute['Person']:
+        """
+        Returns the person of the workspace. This is used to filter the elements
+        and relationships in the workspace.
+        """
+        return TypedDynamicAttribute['Person'](self._dynamic_attributes)
+
+class ElementExpression:
 
     def __init__(self, element: DslElement):
         self._element = element
 
-    # TODO: Make a test for this in `tests/test_expression.py`
     @property
     def id(self) -> str:
         return cast(str, self._element.model.id)
@@ -102,9 +128,9 @@ class Element:
         return isinstance(element, type(self._element)) and\
                element.model.id == self._element.model.id
 
-class Relationship:
+class RelationshipExpression:
 
-    def __init__(self, relationship: _Relationship):
+    def __init__(self, relationship: DslRelationship):
         self._relationship = relationship
 
     # TODO: Make a test for this in `tests/test_expression.py`
@@ -121,12 +147,12 @@ class Relationship:
         return self._relationship.model.technology
 
     @property
-    def source(self) -> Element:
-        return Element(self._relationship.source)
+    def source(self) -> ElementExpression:
+        return ElementExpression(self._relationship.source)
 
     @property
-    def destination(self) -> Element:
-        return Element(self._relationship.destination)
+    def destination(self) -> ElementExpression:
+        return ElementExpression(self._relationship.destination)
 
     @property
     def properties(self) -> Dict[str, Any]:
@@ -146,10 +172,10 @@ class Expression:
 
     def __init__(
         self,
-        include_elements: Iterable[Union[DslElement, Callable[[Workspace, Element], bool]]]=[lambda w, e: True],
-        exclude_elements: Iterable[Union[DslElement, Callable[[Workspace, Element], bool]]]=[],
-        include_relationships: Iterable[Union[DslElement, Callable[[Workspace, Relationship], bool]]]=[lambda w, e: True],
-        exclude_relationships: Iterable[Union[DslElement, Callable[[Workspace, Relationship], bool]]]=[],
+        include_elements: Iterable[Union[DslElement, Callable[[WorkspaceExpression, ElementExpression], bool]]]=[lambda w, e: True],
+        exclude_elements: Iterable[Union[DslElement, Callable[[WorkspaceExpression, ElementExpression], bool]]]=[],
+        include_relationships: Iterable[Union[DslElement, Callable[[WorkspaceExpression, RelationshipExpression], bool]]]=[lambda w, e: True],
+        exclude_relationships: Iterable[Union[DslElement, Callable[[WorkspaceExpression, RelationshipExpression], bool]]]=[],
     ) -> 'None':
         self._include_elements = include_elements
         self._exclude_elements = exclude_elements
@@ -171,12 +197,12 @@ class Expression:
                 if isinstance(f, DslElement):
                     includes.append(f == element)
                 else:
-                    includes.append(f(workspace, Element(element)))
+                    includes.append(f(WorkspaceExpression(workspace), ElementExpression(element)))
             for f in self._exclude_elements:
                 if isinstance(f, DslElement):
                     excludes.append(f == element)
                 else:
-                    excludes.append(f(workspace, Element(element)))
+                    excludes.append(f(WorkspaceExpression(workspace), ElementExpression(element)))
             if any(includes) and not any(excludes):
                 filtered_elements.append(element)
 
@@ -198,9 +224,9 @@ class Expression:
         filtered_relationships: List[DslRelationship] = []
 
         def _is_relationship_of_excluded_elements(
-            workspace: Workspace,
-            relationship: Relationship,
-            exclude_element_predicates: Iterable[Union[DslElement, Callable[[Workspace, Element], bool]]],
+            workspace: WorkspaceExpression,
+            relationship: RelationshipExpression,
+            exclude_element_predicates: Iterable[Union[DslElement, Callable[[WorkspaceExpression, ElementExpression], bool]]],
         ) -> bool:
             for f in exclude_element_predicates:
                 if isinstance(f, DslElement):
@@ -222,20 +248,20 @@ class Expression:
                 if isinstance(f, DslElement):
                     includes.append(f == relationship)
                 else:
-                    includes.append(f(workspace, Relationship(relationship)))
+                    includes.append(f(WorkspaceExpression(workspace), RelationshipExpression(relationship)))
 
             for f in self._exclude_relationships:
                 if isinstance(f, DslElement):
                     excludes.append(f == relationship)
                 else:
-                    excludes.append(f(workspace, Relationship(relationship)))
+                    excludes.append(f(WorkspaceExpression(workspace), RelationshipExpression(relationship)))
 
             # Also exclude relationships whose source or destination elements
             # are excluded.
             excludes.append(
                 _is_relationship_of_excluded_elements(
-                    workspace,
-                    Relationship(relationship),
+                    WorkspaceExpression(workspace),
+                    RelationshipExpression(relationship),
                     self._exclude_elements,
                 )
             )

{buildzr-0.0.11 → buildzr-0.0.13}/buildzr/dsl/interfaces/__init__.py

@@ -3,7 +3,6 @@ from .interfaces import (
     DslRelationship,
     DslWorkspaceElement,
     DslViewElement,
-    DslViewsElement,
     BindLeft,
     BindRight,
     BindLeftLate,

{buildzr-0.0.11 → buildzr-0.0.13}/buildzr/dsl/interfaces/interfaces.py

@@ -205,31 +205,4 @@ class DslViewElement(ABC):
     @property
     @abstractmethod
     def model(self) -> ViewModel:
-        pass
-
-    @property
-    @abstractmethod
-    def parent(self) -> 'DslViewsElement':
-        pass
-
-    def _on_added(self) -> None:
-        pass
-
-class DslViewsElement(ABC):
-
-    @property
-    @abstractmethod
-    def model(self) -> buildzr.models.Views:
-        pass
-
-    @property
-    @abstractmethod
-    def parent(self) -> DslWorkspaceElement:
-        pass
-
-    @abstractmethod
-    def add_views(
-        self,
-        *views: Union[DslViewElement],
-    ) -> None:
         pass

{buildzr-0.0.11 → buildzr-0.0.13}/tests/samples/component_view.py

@@ -20,7 +20,7 @@ class SampleComponentView(AbstractBuilder):
                 db = Container("Database")
                 web_app.component_2 >> "Reads from and writes to" >> db
             user >> "Uses" >> c1
-            w.apply_views(
+            w.apply_view(
                 ComponentView(
                     container_selector=lambda w: w.software_system().software_system.web_application,
                     key="web_application_container_00",

{buildzr-0.0.11 → buildzr-0.0.13}/tests/samples/container_view.py

@@ -19,7 +19,7 @@ class SampleContainerView(AbstractBuilder):
             user >> "Uses" >> web_application
             user >> "Hacks" >> git_repo
             git_repo >> "Uses" >> external_system
-            w.apply_views(
+            w.apply_view(
                 ContainerView(
                     software_system_selector=lambda w: w.software_system().app,
                     key="ss_business_app",

buildzr-0.0.13/tests/samples/groups.py

@@ -0,0 +1,44 @@
+import buildzr
+from buildzr.dsl import *
+from typing import cast
+from ..abstract_builder import AbstractBuilder
+
+class GroupsSample(AbstractBuilder):
+
+    def build(self) -> buildzr.models.Workspace:
+        with Workspace("w", scope=None) as w:
+            with Group("Company 1"):
+                with SoftwareSystem("A") as a:
+                    Container("a1")
+                    Container("a2")
+            with Group("Company 2"):
+                with SoftwareSystem("B") as b:
+                    Container("b1")
+                    with Container("b2") as b2:
+                        Component("c1")
+            c = SoftwareSystem("C")
+            a >> "Uses" >> b
+            a.a1 >> "Uses" >> b.b1
+            a >> "Uses" >> c
+
+            SystemLandscapeView(
+                key='groups-sample',
+                description="Groups Sample"
+            )
+            SystemContextView(
+                key='groups-sample-a',
+                software_system_selector=lambda w: w.software_system().a,
+                description="Groups Sample - Software System A"
+            )
+            SystemContextView(
+                key='groups-sample-b',
+                software_system_selector=lambda w: w.software_system().b,
+                description="Groups Sample - Software System B"
+            )
+            ContainerView(
+                key='groups-sample-b2',
+                software_system_selector=lambda w: w.software_system().b,
+                description="Groups Sample - Container B2"
+            )
+
+        return w.model

{buildzr-0.0.11 → buildzr-0.0.13}/tests/samples/implied_relationships.py

@@ -21,10 +21,10 @@ class SampleImpliedRelationships(AbstractBuilder):
                 database = Container("database")
                 ui_layer >> "Uses" >> database
             u >> "Runs SQL queries" >> database
-            w.apply_views(
+            w.apply_view(
                 SystemContextView(
                     key='sample-implied-relationships',
-                    software_system_selector=lambda w: cast(SoftwareSystem, w.s),
+                    software_system_selector=lambda w: w.software_system().s,
                     description="Sample Implied Relationships"
                 )
             )

{buildzr-0.0.11 → buildzr-0.0.13}/tests/samples/nested_groups.py

@@ -21,8 +21,6 @@ class NestedGroups(AbstractBuilder):
             c >> d
             b >> c
 
-            # TODO: Ensure multiple views work.
-
             SystemLandscapeView(
                 key='nested-groups',
                 description="Nested Groups Sample"

{buildzr-0.0.11 → buildzr-0.0.13}/tests/samples/system_context_view.py

@@ -19,7 +19,7 @@ class SystemContextViewSample(AbstractBuilder):
             email_system = SoftwareSystem('email_system')
             user >> "uses" >> web_app
             web_app >> "sends notification using" >> email_system
-            w.apply_views(
+            w.apply_view(
                 SystemContextView(
                     lambda w: w.software_system().web_app,
                     key='web_app_system_context_00',

{buildzr-0.0.11 → buildzr-0.0.13}/tests/samples/system_landscape_view.py

@@ -32,7 +32,7 @@ class SystemLandscapeViewSample(AbstractBuilder):
             internet_banking_system >> "Gets account information from, and makes payments using" >> mainframe_banking_system
             internet_banking_system >> "Sends e-mail using" >> email_system
 
-            w.apply_views(
+            w.apply_view(
                 SystemLandscapeView(
                     key='landscape_00',
                     description="System Landscape",

{buildzr-0.0.11 → buildzr-0.0.13}/tests/test_views.py

@@ -34,7 +34,7 @@ def test_system_landscape_view(use_context: bool) -> Optional[None]:
             )
 
     if not use_context:
-        w.apply_views(
+        w.apply_view(
             SystemLandscapeView(
                 key="system_landscape_view_00",
                 description="System Landscape View Test",
@@ -48,8 +48,8 @@ def test_system_landscape_view(use_context: bool) -> Optional[None]:
     system_a = w.software_system().system_a
     system_b = w.software_system().system_b
 
-    element_ids = list(map(lambda x: x.id, w.model.views.systemLandscapeViews[0].elements))
-    relationship_ids = list(map(lambda x: x.id, w.model.views.systemLandscapeViews[0].relationships))
+    element_ids = [x.id for x in w.model.views.systemLandscapeViews[0].elements]
+    relationship_ids = [x.id for x in w.model.views.systemLandscapeViews[0].relationships]
 
     assert len(element_ids) == 3
     assert {
@@ -91,7 +91,7 @@ def test_system_context_view(use_context: bool) -> Optional[None]:
             )
 
     if not use_context:
-        w.apply_views(
+        w.apply_view(
             SystemContextView(
                 software_system_selector=lambda w: w.software_system().business_app,
                 key="ss_business_app",
@@ -99,8 +99,8 @@ def test_system_context_view(use_context: bool) -> Optional[None]:
             )
         )
 
-    element_ids =  list(map(lambda x: x.id, w.model.views.systemContextViews[0].elements))
-    relationship_ids =  list(map(lambda x: x.id, w.model.views.systemContextViews[0].relationships))
+    element_ids =  [x.id for x in w.model.views.systemContextViews[0].elements]
+    relationship_ids =  [x.id for x in w.model.views.systemContextViews[0].relationships]
 
     print('element ids:', element_ids)
     print('person id:', w.person().u.model.id)
@@ -157,7 +157,7 @@ def test_system_context_view_with_exclude_user(use_context: bool) -> Optional[No
             )
 
     if not use_context:
-        w.apply_views(
+        w.apply_view(
             SystemContextView(
                 software_system_selector=lambda w: w.software_system().business_app,
                 key="ss_business_app",
@@ -168,8 +168,8 @@ def test_system_context_view_with_exclude_user(use_context: bool) -> Optional[No
             )
         )
 
-    element_ids =  list(map(lambda x: x.id, w.model.views.systemContextViews[0].elements))
-    relationship_ids =  list(map(lambda x: x.id, w.model.views.systemContextViews[0].relationships))
+    element_ids = [x.id for x in w.model.views.systemContextViews[0].elements]
+    relationship_ids = [x.id for x in w.model.views.systemContextViews[0].relationships]
 
     print('element ids:', element_ids)
     print('person id:', w.person().u.model.id)
@@ -221,7 +221,7 @@ def test_container_view(use_context: bool) -> Optional[None]:
             )
 
     if not use_context:
-        w.apply_views(
+        w.apply_view(
             ContainerView(
                 software_system_selector=lambda w: w.software_system().app,
                 key="ss_business_app",
@@ -229,8 +229,8 @@ def test_container_view(use_context: bool) -> Optional[None]:
             )
         )
 
-    element_ids =  list(map(lambda x: x.id, w.model.views.containerViews[0].elements))
-    relationship_ids =  list(map(lambda x: x.id, w.model.views.containerViews[0].relationships))
+    element_ids = [x.id for x in w.model.views.containerViews[0].elements]
+    relationship_ids = [x.id for x in w.model.views.containerViews[0].relationships]
 
     print('element ids:', element_ids)
     print('person id:', w.person().user.model.id)
@@ -272,7 +272,7 @@ def test_component_view(use_context: bool) -> Optional[None]:
             )
 
     if not use_context:
-        w.apply_views(
+        w.apply_view(
             ComponentView(
                 container_selector=lambda w: w.software_system().software_system.web_application,
                 key="web_application_container_00",
@@ -280,8 +280,8 @@ def test_component_view(use_context: bool) -> Optional[None]:
             )
         )
 
-    element_ids =  list(map(lambda x: x.id, w.model.views.componentViews[0].elements))
-    relationship_ids =  list(map(lambda x: x.id, w.model.views.componentViews[0].relationships))
+    element_ids = [x.id for x in w.model.views.componentViews[0].elements]
+    relationship_ids = [x.id for x in w.model.views.componentViews[0].relationships]
 
     print("user id:", w.person().user.model.id)
     print("software system id", w.software_system().software_system.model.id)
@@ -330,7 +330,7 @@ def test_component_view_with_exclude_user(use_context: bool) -> Optional[None]:
             )
 
     if not use_context:
-        w.apply_views(
+        w.apply_view(
             ComponentView(
                 container_selector=lambda w: w.software_system().software_system.web_application,
                 key="web_application_container_00",
@@ -341,8 +341,8 @@ def test_component_view_with_exclude_user(use_context: bool) -> Optional[None]:
             )
         )
 
-    element_ids =  list(map(lambda x: x.id, w.model.views.componentViews[0].elements))
-    relationship_ids =  list(map(lambda x: x.id, w.model.views.componentViews[0].relationships))
+    element_ids = [x.id for x in w.model.views.componentViews[0].elements]
+    relationship_ids = [x.id for x in w.model.views.componentViews[0].relationships]
 
     print("user id:", w.person().user.model.id)
     print("software system id", w.software_system().software_system.model.id)
@@ -384,7 +384,7 @@ def test_container_view_with_multiple_software_systems(use_context: bool) -> Opt
             )
 
     if not use_context:
-        w.apply_views(
+        w.apply_view(
             ContainerView(
                 key="container_view_00",
                 description="Container View Test",
@@ -400,8 +400,8 @@ def test_container_view_with_multiple_software_systems(use_context: bool) -> Opt
     c1 = app1.c1
     c2 = app2.c2
 
-    element_ids =  list(map(lambda x: x.id, w.model.views.containerViews[0].elements))
-    relationship_ids =  list(map(lambda x: x.id, w.model.views.containerViews[0].relationships))
+    element_ids = [x.id for x in w.model.views.containerViews[0].elements]
+    relationship_ids = [x.id for x in w.model.views.containerViews[0].relationships]
 
     assert len(element_ids) == 2
     assert {
@@ -414,9 +414,72 @@ def test_container_view_with_multiple_software_systems(use_context: bool) -> Opt
         c1.model.relationships[0].id,
     }.issubset(set(relationship_ids))
 
-# TODO: Soon.
 def test_multiple_views() -> Optional[None]:
-    pass
+
+    with Workspace("w", scope='landscape', group_separator="/") as w:
+        with Group("Company 1") as company1:
+            with Group("Department 1"):
+                a = SoftwareSystem("A")
+            with Group("Department 2") as c1d2:
+                b = SoftwareSystem("B")
+        with Group("Company 2") as company2:
+            with Group("Department 1"):
+                c = SoftwareSystem("C")
+            with Group("Department 2") as c2d2:
+                d = SoftwareSystem("D")
+        a >> b
+        c >> d
+        b >> c
+
+        SystemLandscapeView(
+            key='nested-groups',
+            description="Nested Groups Sample"
+        )
+
+        SystemContextView(
+            software_system_selector=b,
+            key='nested-groups-context-0',
+            description="Nested Groups Sample Context",
+            include_elements=[c, d],
+        )
+
+        SystemContextView(
+            software_system_selector=c,
+            key='nested-groups-context-1',
+            description="Nested Groups Sample Context",
+            include_elements=[b, d],
+        )
+
+        StyleElements(
+            on=[a, b],
+            shape='Box',
+        )
+
+        StyleElements(
+            on=[c, d],
+            shape='RoundedBox',
+        )
+
+        StyleElements(
+            on=[company1],
+            stroke='yellow',
+            border='dotted',
+        )
+
+        StyleElements(
+            on=[c1d2, c2d2],
+            color='green',
+        )
+
+    assert w.model.views.systemLandscapeViews is not None
+    assert w.model.views.systemContextViews is not None
+
+    assert len(w.model.views.systemLandscapeViews) == 1
+    assert len(w.model.views.systemContextViews) == 2
+
+    assert w.model.views.systemLandscapeViews[0].key == 'nested-groups'
+    assert w.model.views.systemContextViews[0].key == 'nested-groups-context-0'
+    assert w.model.views.systemContextViews[1].key == 'nested-groups-context-1'
 
 def test_style_elements_on_dslelements() -> Optional[None]:
 

buildzr-0.0.11/buildzr/__about__.py

@@ -1 +0,0 @@
-VERSION = "0.0.11"

buildzr-0.0.11/tests/samples/groups.py

@@ -1,44 +0,0 @@
-import buildzr
-from buildzr.dsl import *
-from typing import cast
-from ..abstract_builder import AbstractBuilder
-
-class GroupsSample(AbstractBuilder):
-
-    def build(self) -> buildzr.models.Workspace:
-        with Workspace("w", scope=None) as w:
-            with Group("Company 1"):
-                with SoftwareSystem("A") as a:
-                    Container("a1")
-                    Container("a2")
-            with Group("Company 2"):
-                with SoftwareSystem("B") as b:
-                    Container("b1")
-                    with Container("b2") as b2:
-                        Component("c1")
-            c = SoftwareSystem("C")
-            a >> "Uses" >> b
-            a.a1 >> "Uses" >> b.b1
-            a >> "Uses" >> c
-            w.apply_views(
-                SystemLandscapeView(
-                    key='groups-sample',
-                    description="Groups Sample"
-                ),
-                SystemContextView(
-                    key='groups-sample-a',
-                    software_system_selector=lambda w: cast(SoftwareSystem, w.a),
-                    description="Groups Sample - Software System A"
-                ),
-                SystemContextView(
-                    key='groups-sample-b',
-                    software_system_selector=lambda w: cast(SoftwareSystem, w.b),
-                    description="Groups Sample - Software System B"
-                ),
-                ContainerView(
-                    key='groups-sample-b2',
-                    software_system_selector=lambda w: w.software_system().b,
-                    description="Groups Sample - Container B2"
-                ),
-            )
-        return w.model